diff --git a/mock/menu.js b/mock/menu.js index 7a51311..e4f3e0d 100644 --- a/mock/menu.js +++ b/mock/menu.js @@ -50,14 +50,14 @@ let database = [ icon: 'heart-o', route: '/UIElement/iconfont', }, - // { - // id: '42', - // bpid: '4', - // mpid: '4', - // name: 'DataTable', - // icon: 'database', - // route: '/UIElement/dataTable', - // }, + { + id: '42', + bpid: '4', + mpid: '4', + name: 'DataTable', + icon: 'database', + route: '/UIElement/dataTable', + }, { id: '43', bpid: '4', @@ -74,22 +74,22 @@ let database = [ icon: 'search', route: '/UIElement/search', }, - // { - // id: '45', - // bpid: '4', - // mpid: '4', - // name: '56pxor', - // icon: 'edit', - // route: '/UIElement/editor', - // }, - // { - // id: '46', - // bpid: '4', - // mpid: '4', - // name: 'layer (Function)', - // icon: 'credit-card', - // route: '/UIElement/layer', - // }, + { + id: '45', + bpid: '4', + mpid: '4', + name: '56pxor', + icon: 'edit', + route: '/UIElement/editor', + }, + { + id: '46', + bpid: '4', + mpid: '4', + name: 'layer (Function)', + icon: 'credit-card', + route: '/UIElement/layer', + }, { id: '5', bpid: '1', diff --git a/package.json b/package.json index 1714944..e112f97 100644 --- a/package.json +++ b/package.json @@ -3,16 +3,16 @@ "name": "antd-admin", "version": "5.0.0-beta", "dependencies": { - "@babel/polyfill": "^7.0.0-rc.2", - "antd": "^3.8.2", + "@babel/polyfill": "^7.0.0", + "antd": "^3.9.0", "axios": "^0.18.0", - "classnames": "^2.2.5", - "d3-shape": "^1.2.0", + "classnames": "^2.2.6", + "d3-shape": "^1.2.2", "draftjs-to-html": "^0.8.4", "draftjs-to-markdown": "^0.5.1", "dva-model-extend": "^0.1.2", "echarts": "^4.1.0", - "echarts-for-react": "^2.0.11", + "echarts-for-react": "^2.0.14", "echarts-gl": "^1.1.1", "echarts-liquidfill": "^2.0.2", "highcharts-exporting": "^0.1.7", @@ -21,8 +21,8 @@ "lodash.clonedeep": "^4.5.0", "lodash.isequal": "^4.5.0", "nprogress": "^0.2.0", - "path-to-regexp": "^2.3.0", - "prop-types": "^15.6.1", + "path-to-regexp": "^2.4.0", + "prop-types": "^15.6.2", "qs": "^6.5.2", "query-string": "^6.1.0", "rc-tween-one": "^2.2.3", @@ -35,20 +35,20 @@ }, "devDependencies": { "babel-plugin-dev-expression": "^0.2.1", - "babel-plugin-module-resolver": "^3.1.0", - "cross-env": "^5.1.6", - "eslint": "^5.4.0", - "eslint-config-umi": "^0.1.4", - "eslint-plugin-flowtype": "^2.48.0", - "eslint-plugin-import": "^2.12.0", - "eslint-plugin-jsx-a11y": "^6.0.3", - "eslint-plugin-react": "^7.8.2", - "js-beautify": "^1.7.5", - "less-vars-to-js": "^1.1.2", + "babel-plugin-module-resolver": "^3.1.1", + "cross-env": "^5.2.0", + "eslint": "^5.5.0", + "eslint-config-umi": "^0.1.5", + "eslint-plugin-flowtype": "^2.50.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-jsx-a11y": "^6.1.1", + "eslint-plugin-react": "^7.11.1", + "js-beautify": "^1.8.1", + "less-vars-to-js": "^1.3.0", "mockjs": "^1.0.1-beta3", "svg-sprite-loader": "^3.9.2", - "umi": "^2.0.0-beta.17", - "umi-plugin-react": "^1.0.0-beta.17" + "umi": "^2.0.0", + "umi-plugin-react": "^1.0.0" }, "pre-commit": [ "lint" diff --git a/src/pages/UIElement/dataTable/index.js b/src/pages/UIElement/dataTable/index.js index 28da4ff..5ee906d 100644 --- a/src/pages/UIElement/dataTable/index.js +++ b/src/pages/UIElement/dataTable/index.js @@ -45,7 +45,7 @@ class DataTablePage extends React.Component { { title: 'Phone', dataIndex: 'phone' }, { title: 'Gender', dataIndex: 'gender' }, ], - rowKey: 'registered', + rowKey: 'email', } const caseChangeDataTableProps = { @@ -63,7 +63,7 @@ class DataTablePage extends React.Component { { title: 'Phone', dataIndex: 'phone' }, { title: 'Gender', dataIndex: 'gender' }, ], - rowKey: 'registered', + rowKey: 'email', } return (
usage