From 0e7ad92b3570f1f61bcb1289187768787b0f328c Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 10 Jan 2020 14:08:47 +0800 Subject: [PATCH 01/88] add static --- public/react/package.json | 1 + public/react/src/modules/paths/Index.js | 10 +- .../modules/paths/statics/DisplayTableData.js | 26 ++++ .../paths/statics/StaticNumberAndTxt.js | 43 +++++ .../react/src/modules/paths/statics/index.js | 147 ++++++++++++++++++ .../src/modules/paths/statics/index.scss | 92 +++++++++++ 6 files changed, 316 insertions(+), 3 deletions(-) create mode 100644 public/react/src/modules/paths/statics/DisplayTableData.js create mode 100644 public/react/src/modules/paths/statics/StaticNumberAndTxt.js create mode 100644 public/react/src/modules/paths/statics/index.js create mode 100644 public/react/src/modules/paths/statics/index.scss diff --git a/public/react/package.json b/public/react/package.json index 6828a43c4..39067977d 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -71,6 +71,7 @@ "rc-tree": "^1.7.11", "rc-upload": "^2.5.1", "react": "^16.9.0", + "react-base-table": "^1.9.1", "react-beautiful-dnd": "^10.0.4", "react-codemirror": "^1.0.0", "react-codemirror2": "^6.0.0", diff --git a/public/react/src/modules/paths/Index.js b/public/react/src/modules/paths/Index.js index 7a1c3d301..67ef9125b 100644 --- a/public/react/src/modules/paths/Index.js +++ b/public/react/src/modules/paths/Index.js @@ -17,10 +17,14 @@ const PathsNew = Loadable({ loader: () => import('./PathNew'), loading:Loading, }) +// const Statistics = Loadable({ +// loader: () => import('./SchoolStatistics/Statistics'), +// loading:Loading +// }) const Statistics = Loadable({ - loader: () => import('./SchoolStatistics/Statistics'), - loading:Loading -}) + loader: () => import('./statics'), + loading: Loading +}); const ShixunPaths = Loadable({ loader: () => import('./ShixunPaths'), diff --git a/public/react/src/modules/paths/statics/DisplayTableData.js b/public/react/src/modules/paths/statics/DisplayTableData.js new file mode 100644 index 000000000..59c4f092a --- /dev/null +++ b/public/react/src/modules/paths/statics/DisplayTableData.js @@ -0,0 +1,26 @@ +/* + * @Description: 展示表格数据 + * @Author: tangjiang + * @Github: + * @Date: 2020-01-10 13:46:30 + * @LastEditors : tangjiang + * @LastEditTime : 2020-01-10 13:48:54 + */ +import React from 'react'; +// import { Table } from 'antd'; + +const DisplayTableData = ({ + columns, + datas +}) => { + + return ( +