This commit is contained in:
afc163 2015-11-04 14:46:41 +08:00
parent 7f596286d4
commit 15cef16368
3 changed files with 10 additions and 5 deletions

View File

@ -93,7 +93,7 @@
"precommit-hook": "^1.0.7",
"react": "~0.14.1",
"react-addons-test-utils": "~0.14.1",
"react-clipboard.js": "^0.1.4",
"react-clip": "^0.1.4",
"react-dom": "~0.14.1",
"react-router": "1.0.0-rc3",
"webpack": "^1.10.1",
@ -108,7 +108,8 @@
"just-deploy": "npm run clean && webpack --config webpack.deploy.config.js && NODE_ENV=PRODUCTION nico build && node scripts/deploy.js",
"lint": "eslint components index.js --ext '.js,.jsx'",
"lesslint": "lesslint style",
"test": "npm run lint && webpack && jest",
"test": "npm run lint && webpack && npm run jest",
"jest": "jest",
"pub": "sh ./scripts/publish.sh",
"webpack": "webpack",
"beta": "sh ./scripts/publish.sh --tag beta"
@ -122,6 +123,10 @@
"unmockedModulePathPatterns": [
"<rootDir>/node_modules/*"
],
"testPathIgnorePatterns": [
"/node_modules/",
"/_site/"
],
"scriptPreprocessor": "<rootDir>/node_modules/webpack-babel-jest",
"testDirectoryName": "tests",
"preprocessCachingDisabled": false

View File

@ -1,6 +1,6 @@
window['css-animation'] = require('css-animation');
window['react-router'] = require('react-router');
window.ClipboardButton = require('react-clipboard.js');
window.Clip = require('react-clip');
var antd = require('../index');
var React = require('react');
var ReactDOM = require('react-dom');

View File

@ -252,9 +252,9 @@ let TintShadeTool = React.createClass({
render() {
return <div style={{margin: '40px 0'}}>
<div>
<ClipboardButton onSuccess={this.copySuccess} data-clipboard-text={this.state.result} style={{border: 0, background: '#fff'}}>
<Clip onSuccess={this.copySuccess} data-clipboard-text={this.state.result} style={{border: 0, background: '#fff'}}>
<div style={{width: 60, borderRadius: 6, height:28, backgroundColor: this.state.result, display: 'inline-block', verticalAlign: 'middle', marginRight: 8}}></div>
</ClipboardButton>
</Clip>
<Tooltip title="点击左边色块复制色值">
<span style={{marginRight: 140, fontFamily: 'Consolas'}}>{this.state.result}</span>
</Tooltip>