依赖修改提交

.stylelintignore

@@ -3,4 +3,5 @@ lib
 libs
 *.js
 *.md
-*.scss
+src/styles/**/*.scss
+src/view/**/*.scss

package.json

@@ -29,25 +29,25 @@
     ]
   },
   "dependencies": {
-    "amos-3d": "^2.1.5",
+    "amos-3d": "^2.x",
     "amos-amap": "~1.0.9",
-    "amos-antd": "^2.1.4",
+    "amos-antd": "^2.x",
     "amos-devgrid": "^1.0.10",
-    "amos-dll": "^2.0.2",
+    "amos-dll": "^3.x",
     "amos-gojs": "^2.0.15",
-    "amos-icon": "^1.0.3",
-    "amos-mqtt": "^1.0.1",
-    "amos-pluggable": "^1.0.6",
+    "amos-icon": "^1.x",
+    "amos-mqtt": "^1.x",
+    "amos-pluggable": "^1.x",
     "amos-processor": "^2.x",
     "amos-richtext": "^1.0.1",
     "amos-rules-config": "^1.0.6",
-    "amos-security": "^2.1.1",
+    "amos-security": "^3.x",
     "amos-tool": "^1.x",
     "amos-viz": "^1.x",
-    "amos-websocket": "^1.0.3",
+    "amos-websocket": "^1.x",
     "classnames": "^2.2.5",
     "dt2react": "^1.x",
-    "ray-code-split": "^1.0.1",
+    "ray-code-split": "^2.x",
     "ray-eventpool": "^1.0.0",
     "ray-mediaquery": "^1.0.0",
     "ray-progress": "^1.0.0",
@@ -55,11 +55,11 @@
     "react-dom": "~16.3.3"
   },
   "devDependencies": {
-    "amos-build": "3.1.4",
-    "amos-designer": "^1.0.2",
-    "amos-framework": "^1.2.2",
-    "amos-iot-3dgraph": "^1.0.0",
-    "amos-iot-webstudio": "1.0.4",
+    "amos-build": "5.x",
+    "amos-designer": "^1.x",
+    "amos-framework": "^1.x",
+    "amos-iot-3dgraph": "^1.0.8",
+    "amos-iot-webstudio": "1.x",
     "eslint-config-ray": "^1.0.26",
     "mockjs": "^1.0.1-beta3",
     "ray-build": "^2.0.2",

src/base.scss

+.tsts {
+  overflow: auto;
+}

src/utils/processor.js

 import * as utils from 'amos-processor/lib/utils';
+import * as bitUtils from './../view/bizview/common/tableComponent/tool';
 
 const { renderSimpleTime } = utils.tool;
 
@@ -23,6 +24,7 @@ const trimFormData = function(form) {
 };
 
 export default {
+  tool: { ...bitUtils },
   ...utils,
   renderTimeValue,
   trimFormData

src/view/bizview/checkManage/checkDetail/CheckDetailNew.js

@@ -8,7 +8,7 @@ import { fetchCheckDetailById, fetchCheckInputByIdNew, fetchShortByCheckIdAndChe
 import CheckDetailTable from './CheckDetailTable';
 import CheckInputTable from './CheckInputTable';
 import { XJBaseURI } from './../../../../consts/urlConsts';
-import { tool } from './../../../../utils/processor';
+import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
 import Picture from './Picture';
 import { pathMapping } from './../../../../routes/customRoutes';
 import { Table } from 'amos-antd/lib';
@@ -16,7 +16,6 @@ import './cdn.scss';
 
 const CheckListPath = () => pathMapping.checkDetail;
 
-const { renderLongTime } = tool;
 
 const checkDetailHeaderResult = checkDetail => {
   let checkTime = '巡检时间';

src/view/bizview/checkManage/checkDetail/index.js

@@ -9,14 +9,14 @@ import CheckDetailTable from './CheckDetailTable';
 import CheckInputTable from './CheckInputTable';
 import './../../../../styles/view/biz/checkDetail/checkDetail.scss';
 import { XJBaseURI } from './../../../../consts/urlConsts';
-import { tool } from './../../../../utils/processor';
+import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
+
 import Picture from '../../../3dview/points/maxcontent/Picture';
 import { pathMapping } from './../../../../routes/customRoutes';
 import BizIcon from './../../../common/icon/BizIcon';
 
 const CheckListPath = () => pathMapping.pointCheckList;
 
-const { renderLongTime } = tool;
 
 const checkDetailHeaderResult = checkDetail => {
   let checkTime;

src/view/bizview/task/taskList.js

@@ -4,7 +4,7 @@ import dt2react from 'dt2react';
 import { fetchTaskListAction } from './../../../services/checkInfoService';
 import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
 import { pathMapping } from './../../../routes/customRoutes';
-import {renderLongTime} from './../../bizview/common/tableComponent/tool';
+import { renderLongTime } from './../../bizview/common/tableComponent/tool';
 import TaskSearch from './taskSearch'
 
 // const CheckListPath = pathMapping.pointCheckList;