fix: 项目添加提示错误bug

This commit is contained in:
suxiaoxin 2017-09-25 13:30:52 +08:00
parent 7784f46eb2
commit f1dd86ff51
2 changed files with 31 additions and 30 deletions

View File

@ -108,11 +108,12 @@ class ProjectList extends Component {
</Col>
<Col>
<Tooltip title="您没有权限,请联系该分组组长或管理员">
{ /(admin)|(owner)|(dev)/.test(this.props.currGroup.role) ?
<Button type="primary" ><Link to="/add-project">添加项目</Link></Button> :
<Button type="primary" disabled >添加项目</Button>}
</Tooltip>
{/(admin)|(owner)|(dev)/.test(this.props.currGroup.role) ?
<Button type="primary" ><Link to="/add-project">添加项目</Link></Button> :
<Tooltip title="您没有权限,请联系该分组组长或管理员">
<Button type="primary" disabled >添加项目</Button>
</Tooltip>}
</Col>

50
npm-shrinkwrap.json generated
View File

@ -3176,12 +3176,12 @@
},
"disposables": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/disposables/-/disposables-1.0.1.tgz",
"integrity": "sha1-BkcnoltU9QK9griaot+4358bOeM="
},
"dnd-core": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.5.1.tgz",
"resolved": "https://registry.npm.taobao.org/dnd-core/-/dnd-core-2.5.1.tgz",
"integrity": "sha1-F49a1lJs4C3VlQjxFVNfe/wM6U4=",
"requires": {
"asap": "2.0.6",
@ -11361,7 +11361,7 @@
},
"react-dnd": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.5.1.tgz",
"resolved": "https://registry.npm.taobao.org/react-dnd/-/react-dnd-2.5.1.tgz",
"integrity": "sha1-7O8dnYR4y3av1Zdc1RI+98O+v+U=",
"requires": {
"disposables": "1.0.1",
@ -11374,7 +11374,7 @@
},
"react-dnd-html5-backend": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.1.tgz",
"resolved": "https://registry.npm.taobao.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.1.tgz",
"integrity": "sha1-02VuUUsMRpkCpIX/+nX4aE4hx3c=",
"requires": {
"lodash": "4.17.4"
@ -12126,12 +12126,12 @@
},
"reactabular-dnd": {
"version": "8.9.0",
"resolved": "https://registry.npmjs.org/reactabular-dnd/-/reactabular-dnd-8.9.0.tgz",
"resolved": "https://registry.npm.taobao.org/reactabular-dnd/-/reactabular-dnd-8.9.0.tgz",
"integrity": "sha1-B5LeSto2H5Qlj4pqGg1svYPSpaA="
},
"reactabular-table": {
"version": "8.9.0",
"resolved": "https://registry.npmjs.org/reactabular-table/-/reactabular-table-8.9.0.tgz",
"resolved": "https://registry.npm.taobao.org/reactabular-table/-/reactabular-table-8.9.0.tgz",
"integrity": "sha1-RvbO9jnNm9SyuvHxTiaG+ys14oQ=",
"requires": {
"classnames": "2.2.5"
@ -13602,7 +13602,7 @@
},
"table-resolver": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/table-resolver/-/table-resolver-3.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/table-resolver/-/table-resolver-3.2.0.tgz",
"integrity": "sha512-DQrDHFdJPnvIhyjAcTqF4vhu/Uhp5eNRst9Url9KmBNqxYSMrPXOJoxhU7HPCd3efi1Hua7lMIDnBAphsdhPQw=="
},
"tapable": {
@ -14383,7 +14383,7 @@
},
"webpack": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-2.7.0.tgz",
"resolved": "https://registry.npm.taobao.org/webpack/-/webpack-2.7.0.tgz",
"integrity": "sha512-MjAA0ZqO1ba7ZQJRnoCdbM56mmFpipOPUv/vQpwwfSI42p5PVDdoiuK2AL2FwFUVgT859Jr43bFZXRg/LNsqvg==",
"requires": {
"acorn": "5.1.1",
@ -14411,7 +14411,7 @@
"dependencies": {
"cliui": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/cliui/-/cliui-2.1.0.tgz",
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"requires": {
"center-align": "0.1.3",
@ -14421,12 +14421,12 @@
},
"has-flag": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/has-flag/-/has-flag-1.0.0.tgz",
"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"requires": {
"graceful-fs": "4.1.11",
@ -14438,7 +14438,7 @@
},
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"requires": {
"graceful-fs": "4.1.11",
@ -14448,7 +14448,7 @@
},
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"requires": {
"load-json-file": "1.1.0",
@ -14458,7 +14458,7 @@
},
"read-pkg-up": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"requires": {
"find-up": "1.1.2",
@ -14467,7 +14467,7 @@
},
"strip-bom": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"requires": {
"is-utf8": "0.2.1"
@ -14475,7 +14475,7 @@
},
"supports-color": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
"resolved": "https://registry.npm.taobao.org/supports-color/-/supports-color-3.2.3.tgz",
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"requires": {
"has-flag": "1.0.0"
@ -14483,7 +14483,7 @@
},
"uglify-js": {
"version": "2.8.29",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
"resolved": "https://registry.npm.taobao.org/uglify-js/-/uglify-js-2.8.29.tgz",
"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
"requires": {
"source-map": "0.5.7",
@ -14493,7 +14493,7 @@
"dependencies": {
"yargs": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"requires": {
"camelcase": "1.2.1",
@ -14506,7 +14506,7 @@
},
"webpack-sources": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
"integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
"requires": {
"source-list-map": "2.0.0",
@ -14515,12 +14515,12 @@
},
"wordwrap": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/wordwrap/-/wordwrap-0.0.2.tgz",
"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
},
"yargs": {
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/-/yargs-6.6.0.tgz",
"integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
"requires": {
"camelcase": "3.0.0",
@ -14540,12 +14540,12 @@
"dependencies": {
"camelcase": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
},
"cliui": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/cliui/-/cliui-3.2.0.tgz",
"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"requires": {
"string-width": "1.0.2",
@ -14557,7 +14557,7 @@
},
"yargs-parser": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
"resolved": "https://registry.npm.taobao.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
"integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
"requires": {
"camelcase": "3.0.0"
@ -14565,7 +14565,7 @@
"dependencies": {
"camelcase": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
}
}