1.修改table 为 amos-pro

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireEquipment/FireEquipment3dSimpleView.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
+import { AmosGridTable }  from 'amos-pro';
 import { CONSTS } from './../../../../consts/storageConsts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
 import FireEquipmentToolBar from './FireEquipmentToolBar';
 import { tirggerTransTopic } from './../../../dataProcessor';
 

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireEquipment/MonitorPointConfig.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import { Form, Input, AmosAlert, Button, Select, Modal } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import {
   getMonitorPointListAction,
   saveMonitorPointAction,
@@ -99,7 +99,7 @@ class MonitorPointConfig extends Component {
         code: [
           { required: true, message: '请输入点位编号' },
           { pattern: new RegExp(/[^\u4e00-\u9fa5]+$/), message: '编号不能包含中文' },
-          { pattern: new RegExp(/^[^ ]+$/), message: '编号不能为空或含有空格' } 
+          { pattern: new RegExp(/^[^ ]+$/), message: '编号不能为空或含有空格' }
         ],
         name: [
           { required: true, message: '请输入名称' }

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireEquipment/index.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import { Modal, AmosAlert, Button } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import MonitorPointConfig from './MonitorPointConfig';
 import { deleteFireEquipmentAction, addFireEquipmentAction } from './../../../../services/ledgerService';
 import FireEquipmentModel from './FireEquipmentModel';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireStation/FireStation3dSimpleView.js

@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, AmosAlert } from 'amos-framework';
 import { browserHistory } from 'amos-react-router';
+import { AmosGridTable }  from 'amos-pro';
 import { CONSTS } from './../../../../consts/storageConsts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
 import FireStationDetail from './FireStationDetail';
 import FireStatioinToolBar from './fireStatioinToolBar';
 import { pathMapping } from './../../../../consts/pathMapping';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireStation/fireStation.js

@@ -4,7 +4,7 @@ import { Modal, Button, AmosAlert } from 'amos-framework';
 import { browserHistory } from 'amos-react-router';
 import _amosTool from 'amos-tool';
 import SysConsts from 'amos-processor/lib/config/consts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import FireStationDetail from './FireStationDetail';
 import FireStationEdit from './FireStationEdit';
 import FireStationAdd from './FireStationAdd';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireStrength/FireStrength.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Modal, Button, AmosAlert } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import FireStrengthDetail from './FireStrengthDetail';
 import FireStrengthEdit from './FireStrengthEdit';
 import FireStrengthAdd from './FireStrengthAdd';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireStrength/FireStrength3dSimpleView.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Input, Button } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import {
   getFireStrengthAction
 } from '../../../../services/ledgerService';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireTruck/FireTruck3dSimpleView.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { AmosGridTable }  from 'amos-pro';
 import { CONSTS } from './../../../../consts/storageConsts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
 import FireTruckToolBar from './fireTruckToolBar';
 import { tirggerTransTopic } from './../../../dataProcessor';
 

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireTruck/index.js

@@ -2,9 +2,9 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { AmosAlert, Button } from 'amos-framework';
 import { browserHistory } from 'amos-react-router';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import FireTruckToolBar from './fireTruckToolBar';
-import { deleteFireTruckAction, addFireTruckAction } from './../../../../services/ledgerService';
+import { deleteFireTruckAction } from './../../../../services/ledgerService';
 import { pathMapping } from './../../../../consts/pathMapping';
 
 const fireTruckInfoPath = pathMapping.firetruckinfo;

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/fireDetector/FireDetector3dSimpleView.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
+import { AmosGridTable }  from 'amos-pro';
 import { CONSTS } from './../../../../consts/storageConsts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+
+
 import FireEquipmentToolBar from './FireEquipmentToolBar';
 import { tirggerTransTopic } from './../../../../3dview/dataProcessor';
 

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/fireDetector/index.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import { Modal, AmosAlert, Button } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import { deleteFireEquipmentAction, addFireEquipmentAction, getFireDetectorListAction } from './../../../../services/ledgerService';
 import FireDetectorModel from './FireDetectorModel';
 import FireDetectorToolBar from './FireDetectorToolBar';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/fireFoam/FireFoam3dSimpleView.js

@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { AmosAlert } from 'amos-framework';
 import { browserHistory } from 'amos-react-router';
+import { AmosGridTable }  from 'amos-pro';
 import { CONSTS } from './../../../../consts/storageConsts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
 import { getFireStationAction } from '../../../../services/ledgerService';
 import FireFoamToolBar from './fireFoamToolBar';
 import { pathMapping } from './../../../../consts/pathMapping';

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/fireFoam/fireFoam.js

@@ -4,7 +4,7 @@ import { Modal, Button, AmosAlert } from 'amos-framework';
 import { browserHistory } from 'amos-react-router';
 import _amosTool from 'amos-tool';
 import SysConsts from 'amos-processor/lib/config/consts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import FireReourceDetail from './FireFoamDetail';
 import FireReourceEdit from './FireFoamEdit';
 import FireReourceAdd from './FireFoamAdd';
@@ -322,7 +322,7 @@ class FireFoamable extends Component {
       that.setState({ isClick: true });   // 将isClick设置为true
       }, 4000);
     }
-   
+
   }
 
   saveFireStation(station) {

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/matchEquipment/FireStationMatches.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { browserHistory } from 'amos-react-router';
 import { AmosAlert, Modal, Button } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import {
   getMatchesFireEquipmentListAction,
   deleteFireStationMatchesAction,
@@ -13,11 +13,8 @@ import {
 } from './../../../../../services/ledgerService';
 import FireStationMatchesAddView from './FireStationMatchesAddView';
 import BizIcon from './../../../../common/icon/BizIcon';
-import { pathMapping } from './../../../../../routes/customRoutes';
 
 const EquipClassifyEnum = { 0: '设备类', 1: '耗材类', 2: '视频监控', 3: '灭火器材' };
-// const stationMatchesPath = pathMapping.stationMatches;
-
 const matchEquipmentTableColumns = self => {
   return [
     {
@@ -181,7 +178,7 @@ class FireStationMatches extends Component {
         });
       });
     }
-   
+
   };
 
   getPanelHeight = () => {
@@ -269,7 +266,7 @@ class FireStationMatches extends Component {
               }
             );
           }
-         
+
         }
       }
     });
@@ -302,7 +299,7 @@ class FireStationMatches extends Component {
     let bindObj = [];
     for (let i = 0; i < selectedRowKeys.length; i++) {
       let obj = {};
-     
+
       type==='fireStation'?obj.fireStationId = fireStationId:obj.waterResourceId = fireStationId;
       obj.fireEquipmentId = selectedRowKeys[i];
       obj.number = numberInStation[obj.fireEquipmentId] ? numberInStation[obj.fireEquipmentId] : 1;
@@ -331,7 +328,7 @@ class FireStationMatches extends Component {
           }
         );
       }
-      
+
     }
     this.setState({
       enableAddOp: false

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/matchEquipment/FireStationMatchesAddView.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Select, Input, Button } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { Select, Input } from 'amos-framework';
+import { AmosGridTable }  from 'amos-pro';
 import { getFireEquipmentListAction } from './../../../../../services/ledgerService';
 import EditableCell from './../../../common/editableCell/EditableCell';
 

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/water/Water3dSimpleView.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, AmosAlert } from 'amos-framework';
+import { AmosGridTable }  from 'amos-pro';
 import { CONSTS } from './../../../../consts/storageConsts';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
 import FireWaterToolBar from './FireWaterToolBar';
 import { tirggerTransTopic } from './../../../dataProcessor';
 

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/water/water.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Modal, Button, AmosAlert } from 'amos-framework';
-import AmosGridTable from './../../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import FireWaterDetail from './FireWaterDetail';
 import FireWaterEdit from './FireWaterEdit';
 import FireWaterAdd from './FireWaterAdd';
 import FireWaterToolBar from './FireWaterToolBar';
-// import { pathMapping } from './../../../../../routes/customRoutes';
 import { pathMapping } from './../../../../consts/pathMapping';
 import { browserHistory } from 'amos-react-router';
 import { deleteFireWaterDataAction, newFireWaterDataAction, editFireWaterDataAction, getFireWaterAction } from '../../../../services/ledgerService';
@@ -352,7 +351,7 @@ class WaterView extends Component {
       that.setState({ isClick: true });   // 将isClick设置为true
       }, 3000);
 	  }
-    
+
   }
 
   add = () => {

mods/components/3dviewConvertor/view/points/dialogModel/RiskContentTable.js

 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { Row, Col } from 'amos-framework';
-import AmosGridTable from './../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 
 const checkListColumns = (self) => {
   return [
@@ -29,7 +27,6 @@ const checkListColumns = (self) => {
       key: 'userName',
       width: '12%'
     },
-    ,
     {
       title: '巡检时间',
       dataIndex: 'checkTime',

mods/components/3dviewConvertor/view/points/dialogModel/RiskWarnModal.js

 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { Row, Col } from 'amos-framework';
-import AmosGridTable from './../../common/tableComponent/table/AmosGridTable';
+import { AmosGridTable }  from 'amos-pro';
 import { queryRiskSoureWarningAction } from '../../../services/checkService';
 
 const checkListColumns = (self) => {

mods/components/3dviewConvertor/view/searchPane/index.js

@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { SidePane, Tabs, message } from 'amos-framework';
 import Icon from 'amos-icon';
+import { AmosGridTable }  from 'amos-pro';
 import ParamsHeader from './paramsHeader';
-import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
 import { update3DViewData } from './../dataProcessor';
 import { operateTypes } from './../consts';
 import {

package.json

@@ -24,8 +24,8 @@
     "ray-code-split": "^1.0.1",
     "ray-mediaquery": "^1.0.0",
     "ray-progress": "^1.0.0",
-    "react": "~16.0.0",
-    "react-dom": "~16.0.0",
+    "react": "~16.3.2",
+    "react-dom": "~16.3.3",
     "stylelint-config-ray": "^2.0.0"
   },
   "dependencies": {