From 0d9143c61182b86c5a43afea73108b5f043c5fba Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Sat, 11 Jan 2020 14:42:05 +0800 Subject: [PATCH] update static table --- public/react/src/AppConfig.js | 2 +- .../src/modules/paths/statics/DisplayTableData.js | 6 +++--- public/react/src/modules/paths/statics/mockData.js | 13 ++++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 5f870b683..526b380d6 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -83,7 +83,7 @@ export function initAxiosInterceptors(props) { //proxy="http://47.96.87.25:48080" proxy="https://pre-newweb.educoder.net" proxy="https://test-newweb.educoder.net" - //proxy="https://test-jupyterweb.educoder.net" + // proxy="https://test-jupyterweb.educoder.net" //proxy="http://192.168.2.63:3001" // 在这里使用requestMap控制,避免用户通过双击等操作发出重复的请求; diff --git a/public/react/src/modules/paths/statics/DisplayTableData.js b/public/react/src/modules/paths/statics/DisplayTableData.js index 3e4bcb665..3d9f1aa82 100644 --- a/public/react/src/modules/paths/statics/DisplayTableData.js +++ b/public/react/src/modules/paths/statics/DisplayTableData.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2020-01-10 13:46:30 * @LastEditors : tangjiang - * @LastEditTime : 2020-01-11 11:20:50 + * @LastEditTime : 2020-01-11 14:02:32 */ import 'antd-table-infinity/dist/index.css'; import 'antd-table-infinity/index.css'; @@ -60,8 +60,8 @@ const DisplayTableData = ({ sumData={sumData} scroll={{ y: 450 }} dataSource={data} - bordered - debug + // bordered + // debug /> ); } diff --git a/public/react/src/modules/paths/statics/mockData.js b/public/react/src/modules/paths/statics/mockData.js index bf505ffb5..def1e904b 100644 --- a/public/react/src/modules/paths/statics/mockData.js +++ b/public/react/src/modules/paths/statics/mockData.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2020-01-11 10:55:33 * @LastEditors : tangjiang - * @LastEditTime : 2020-01-11 11:58:08 + * @LastEditTime : 2020-01-11 14:01:49 */ import { random } from 'lodash'; @@ -31,6 +31,8 @@ const fetchData = (startIndex = 0) => name: 'John Brown', age: 32, address: 'New York No. 1 Lake Park', + address2: 'address2', + address3: 'address3' }; }), ); @@ -42,7 +44,7 @@ const columns = [ title: '序号', dataIndex: 'index', render: text => text, - width: 50, + width: 80, }, { title: '使用单位', @@ -62,22 +64,23 @@ const columns = [ { title: '选用实训/个', // width: 200, - dataIndex: 'address', + dataIndex: 'address2', }, { title: '选用实训/个', // width: 200, - dataIndex: 'address', + dataIndex: 'address3', } ]; const sumData = [ { index: '合计', - key: ',4', name: 'Disabled User', age: 99, address: 'Sidney No. 1 Lake Park', + address2: 'address2', + addrexs3: 'address3' }, ];