@zgfe/modules-dm 1.0.56-zhongyuan.12 → 1.0.56-zhongyuan.14

package/es/modules/dataMap/css/index.less

@@ -1,177 +1,210 @@
-.maidianMapIndex {
-  height: 100%;
-  .info-upload-tip {
-    color: var(--io-N4-, #9aa1a9);
-  }
-}
-.mapSetting {
-  &_search {
-    display: grid;
-    grid-template-columns: 1fr 100px;
-    justify-content: space-between;
-    margin-bottom: 16px;
-    &_input {
-      width: 320px;
-      margin: 0px 10px 0px 0px;
-    }
-  }
-  .ant-page-header {
-    padding-top: 0px;
-    padding-left: 0px;
-  }
-  &_addMap {
-    &_tip {
-      padding: 0px 0px 0px 16px;
-      color: #67727f;
-      line-height: 44px;
-      background: #f2f3f4;
-    }
-    &_propTitle {
-      padding: 0px 0px 0px 16px;
-      color: #67727f;
-      color: #354354;
-      font-size: 14px;
-      line-height: 32px;
-      background: #f2f3f4;
-    }
-    &_propTitleLeft {
-      display: inline-block;
-      width: 58%;
-      text-align: left;
-    }
-    &_propTitleRight {
-      display: inline-block;
-      width: 42%;
-      text-align: left;
-    }
-    &_propValueList {
-      display: flex;
-      align-items: center;
-      width: 100%;
-      margin-top: 8px;
-      .ant-form-item {
-        margin: 0px;
-      }
-    }
-    &_propValueflag {
-      display: inline-block;
-      margin: 0px 8px;
-    }
-    &_content {
-      display: grid;
-      grid-template-columns: 1fr 30px 1fr;
-    }
-  }
-  &_footer {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
-  &_closeIco {
-    margin: '0px 8px ';
-    color: '#9aa1a9';
-    vertical-align: 'middle';
-    &:hover {
-      color: red;
-    }
-  }
-}
-
-.leftTreePage {
-  background-color: white;
-  &_selectMap {
-    display: grid;
-    grid-gap: 10px;
-    grid-template-columns: 75px 1fr 60px;
-    align-items: center;
-    margin: 0px 0px 24px;
-  }
-  &_selectMap_setting {
-    margin-left: 10px;
-    color: #165dff;
-    cursor: pointer;
-  }
-  &_searchBtn {
-    width: 100%;
-    padding: 6px 0px;
-    background-color: transparent;
-    border: 1px solid #ddd;
-    cursor: pointer;
-  }
-  &_searchBtn:hover {
-    color: #165dff;
-    border: 1px solid #165dff;
-  }
-}
-
-.dataMapDetail_echartDiv {
-  display: grid;
-  flex-wrap: wrap;
-  grid-gap: 20px;
-  grid-template-columns: repeat(2, 1fr);
-  align-items: center;
-  margin-top: 24px;
-  &_item {
-    display: grid;
-    grid-template-columns: 1fr 60px;
-    align-items: center;
-    padding: 16px;
-    background-color: #fafafb;
-    border: 1px solid #eee;
-  }
-  &_leftText {
-    display: inline-block;
-    margin-left: 8px;
-    color: #354354;
-  }
-  &_view {
-    color: #165dff;
-  }
-}
-.biz-attr-select-handle {
-  width: 100%;
-  max-width: 100%;
-  margin-bottom: 2px;
-  padding: 0;
-}
-.empty {
-  height: 100%;
-  color: #67727f;
-  text-align: center;
-  .empty-img {
-    display: block;
-    width: 200px;
-    margin: 0px auto;
-  }
-}
-
-.mapSetting_addMap_form {
-  .biz-attr-condition-group-handle {
-    display: none;
-  }
-}
-.ziBackground {
-  .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
-    padding: 2px 3px;
-    background-color: #bad8ff7d;
-  }
-}
-
-.mapSetting {
-  .ant-dropdown-trigger.biz-select-handle.biz-condition-item-single-select {
-    position: relative;
-    background-color: transparent;
-    &::after {
-      position: absolute;
-      top: 0px;
-      left: 0;
-      display: inline-block;
-      width: 100%;
-      padding-top: 8px;
-      text-align: center;
-      vertical-align: middle;
-      background-color: white;
-      content: '是';
-    }
-  }
-}
+.maidianMapIndex {
+  height: 100%;
+  .info-upload-tip {
+    color: var(--io-N4-, #9aa1a9);
+  }
+}
+.mapSetting {
+  .ant-input[disabled] {
+    background-color: #fafafb !important;
+  }
+  &_search {
+    display: grid;
+    grid-template-columns: 1fr 100px;
+    justify-content: space-between;
+    margin-bottom: 16px;
+    &_input {
+      width: 320px;
+      margin: 0px 10px 0px 0px;
+    }
+  }
+  .ant-page-header {
+    padding-top: 0px;
+    padding-left: 0px;
+  }
+  &_addMap {
+    &_tip {
+      padding: 0px 0px 0px 16px;
+      color: #67727f;
+      line-height: 44px;
+      background: #f2f3f4;
+    }
+    &_propTitle {
+      padding: 0px 0px 0px 16px;
+      color: #67727f;
+      color: #354354;
+      font-size: 14px;
+      line-height: 32px;
+      background: #f2f3f4;
+    }
+    &_propTitleLeft {
+      display: inline-block;
+      width: 58%;
+      text-align: left;
+    }
+    &_propTitleRight {
+      display: inline-block;
+      width: 42%;
+      text-align: left;
+    }
+    &_propContent {
+      padding: 0px 0px 0px 0px;
+      color: #67727f;
+      color: #354354;
+      font-size: 14px;
+      line-height: 32px;
+    }
+    &_propContentLeft {
+      display: inline-block;
+      width: 50%;
+      text-align: left;
+    }
+    &_propContentRight {
+      display: inline-block;
+      width: 40%;
+      text-align: left;
+    }
+    &_propContentC {
+      display: inline-block;
+      width: 10%;
+      text-align: center;
+    }
+    &_propValueList {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      margin-top: 8px;
+      .ant-form-item {
+        margin: 0px;
+      }
+    }
+    &_propValueflag {
+      display: inline-block;
+      margin: 0px 8px;
+    }
+    &_content {
+      display: grid;
+      grid-template-columns: 1fr 30px 1fr;
+    }
+  }
+  &_footer {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  &_closeIco {
+    margin: '0px 8px ';
+    color: '#9aa1a9';
+    vertical-align: 'middle';
+    &:hover {
+      color: red;
+    }
+  }
+}
+
+.leftTreePage {
+  display: flex;
+  flex-direction: column;
+  background-color: white;
+  &-top {
+    flex: 1;
+  }
+  &-tree {
+    // max-height: 100%;
+  }
+  &_selectMap {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: 75px 1fr 60px;
+    align-items: center;
+    margin: 0px 0px 24px;
+  }
+  &_selectMap_setting {
+    margin-left: 10px;
+    color: #165dff;
+    cursor: pointer;
+  }
+  &_searchBtn {
+    width: 100%;
+    padding: 6px 0px;
+    background-color: transparent;
+    border: 1px solid #ddd;
+    cursor: pointer;
+  }
+  &_searchBtn:hover {
+    color: #165dff;
+    border: 1px solid #165dff;
+  }
+}
+
+.dataMapDetail_echartDiv {
+  display: grid;
+  flex-wrap: wrap;
+  grid-gap: 20px;
+  grid-template-columns: repeat(2, 1fr);
+  align-items: center;
+  margin-top: 24px;
+  &_item {
+    display: grid;
+    grid-template-columns: 1fr 60px;
+    align-items: center;
+    padding: 20px;
+    background-color: #fafafb;
+    border: 1px solid #eee;
+  }
+  &_leftText {
+    display: inline-block;
+    margin-left: 8px;
+    color: #354354;
+  }
+  &_view {
+    color: #165dff;
+  }
+}
+.biz-attr-select-handle {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 2px;
+  padding: 0;
+}
+.empty {
+  height: 100%;
+  color: #67727f;
+  text-align: center;
+  .empty-img {
+    display: block;
+    width: 200px;
+    margin: 0px auto;
+  }
+}
+
+.mapSetting_addMap_form {
+  .biz-attr-condition-group-handle {
+    display: none;
+  }
+}
+.ziBackground {
+  .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
+    padding: 2px 3px;
+    background-color: #bad8ff7d;
+  }
+}
+
+.mapSetting {
+  .ant-dropdown-trigger.biz-select-handle.biz-condition-item-single-select {
+    position: relative;
+    background-color: transparent;
+    &::after {
+      position: absolute;
+      top: 0px;
+      left: 0;
+      display: inline-block;
+      width: 100%;
+      padding-top: 8px;
+      text-align: center;
+      vertical-align: middle;
+      background-color: white;
+      content: '是';
+    }
+  }
+}

package/es/modules/dataMap/mapDetail.js

@@ -23,6 +23,13 @@ var MapDetail = function MapDetail() {
   var onCurrentMap = function onCurrentMap(value) {
     setCurrentMap(value);
   };
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    filterValue = _useState6[0],
+    setFilterValue = _useState6[1];
+  var onFilterValue = function onFilterValue(searchValue) {
+    setFilterValue(searchValue);
+  };
   return /*#__PURE__*/React.createElement(Row, {
     gutter: 24
   }, /*#__PURE__*/React.createElement(Col, {
@@ -33,12 +40,14 @@ var MapDetail = function MapDetail() {
     }
   }, /*#__PURE__*/React.createElement(LeftTree, {
     onChangeTree: onChangeTree,
-    onCurrentMap: onCurrentMap
+    onCurrentMap: onCurrentMap,
+    onFilterValue: onFilterValue
   })), /*#__PURE__*/React.createElement(Col, {
     span: 16
   }, /*#__PURE__*/React.createElement(RightDetail, {
     currentTreeData: currentTreeData && JSON.stringify(currentTreeData) != '{}' && currentTreeData,
-    currentMap: currentMap
+    currentMap: currentMap,
+    filterValue: filterValue
   })));
 };
 export default MapDetail;

package/es/modules/dataMap/mapSetting.js

@@ -9,6 +9,7 @@ import { LeftOutlined, SearchOutlined } from '@ant-design/icons';
 import React, { useEffect, useState, useRef, useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import DrawerAdd from './component/drawerAdd';
+import ViewMapSetting from './component/viewMapSetting';
 import './css/index.less';
 import apis from '../../constants/api';
 import request from '../../utils/ajax';
@@ -29,9 +30,7 @@ var MapSetting = function MapSetting(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     openMapAdd = _useState4[0],
     setOpenMapAdd = _useState4[1];
-  var currentMap = useRef({
-    id: 0
-  });
+  var currentMap = useRef(undefined);
   var onChange = function onChange(e) {
     setSearchName(e.currentTarget.value);
   };
@@ -90,6 +89,7 @@ var MapSetting = function MapSetting(props) {
   }, [searchName]);
   var handleClose = function handleClose() {
     setOpenMapAdd(false);
+    currentMap.current = undefined;
     props.getList(searchName);
   };
   // 删除
@@ -110,6 +110,14 @@ var MapSetting = function MapSetting(props) {
       }
     });
   };
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    openMapView = _useState6[0],
+    setOpenMapView = _useState6[1];
+  var handleViewClose = function handleViewClose() {
+    setOpenMapView(false);
+    currentMap.current = undefined;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: pageClassName
   }, /*#__PURE__*/React.createElement(PageHeader, {
@@ -151,6 +159,10 @@ var MapSetting = function MapSetting(props) {
   }), /*#__PURE__*/React.createElement(DrawerAdd, {
     open: openMapAdd,
     handleClose: handleClose
+  }), /*#__PURE__*/React.createElement(ViewMapSetting, {
+    open: openMapView,
+    handleClose: handleViewClose,
+    currentMap: currentMap.current
   }));
 };
 export default MapSetting;

package/es/modules/dataReal/index1.js

@@ -179,6 +179,19 @@ var DataRealView = function DataRealView() {
       return _ref.apply(this, arguments);
     };
   }();
+  useEffect(function () {
+    // 组件挂载时执行的操作
+    console.log('组件挂载');
+    // 返回一个清理函数，在组件卸载时执行
+    return function () {
+      if (textStatus) {
+        setTextStatus(false);
+        ws === null || ws === void 0 ? void 0 : ws.close(); // 停止刷新 关闭链接
+        setWs(null);
+        return;
+      }
+    };
+  }, []);
   useMemo(function () {
     if (currentMessageObj) {
       var _currentMessageObj$ev, _currentMessageObj$us, _currentMessageObj$us2;

package/package.json

@@ -1,64 +1,64 @@
-{
-  "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.12",
-  "license": "ISC",
-  "module": "es/index.js",
-  "typings": "es/index.d.ts",
-  "files": [
-    "es"
-  ],
-  "scripts": {
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "prepublishOnly": "npm run build",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "pub": "lerna publish",
-    "start": "dumi dev",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@types/lodash-es": "^4.17.12",
-    "@visactor/react-vtable": "^1.12.0",
-    "@visactor/vtable": "^1.12.0",
-    "array-move": "^4.0.0",
-    "echarts": "^5.6.0",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "moment": "^2.30.1",
-    "react": "^16.12.0 || ^17.0.0",
-    "react-sortable-hoc": "^2.0.0"
-  },
-  "devDependencies": {
-    "@testing-library/jest-dom": "^5.15.1",
-    "@testing-library/react": "^12.1.2",
-    "@types/jest": "^27.0.3",
-    "@types/lodash": "^4.14.182",
-    "@umijs/fabric": "^2.8.1",
-    "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.1",
-    "antd": "4.24.10",
-    "dumi": "^1.1.0",
-    "father-build": "^1.17.2",
-    "gh-pages": "^3.0.0",
-    "lerna": "^4.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^2.2.1",
-    "umi-request": "^1.4.0",
-    "yorkie": "^2.0.0"
-  },
-  "gitHead": "a3715c35687d884e78285bd1de9d5d68fefee0fe",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  }
-}
+{
+  "name": "@zgfe/modules-dm",
+  "version": "1.0.56-zhongyuan.14",
+  "license": "ISC",
+  "module": "es/index.js",
+  "typings": "es/index.d.ts",
+  "files": [
+    "es"
+  ],
+  "scripts": {
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "prepublishOnly": "npm run build",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "pub": "lerna publish",
+    "start": "dumi dev",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@types/lodash-es": "^4.17.12",
+    "@visactor/react-vtable": "^1.12.0",
+    "@visactor/vtable": "^1.12.0",
+    "array-move": "^4.0.0",
+    "echarts": "^5.6.0",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "moment": "^2.30.1",
+    "react": "^16.12.0 || ^17.0.0",
+    "react-sortable-hoc": "^2.0.0"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^5.15.1",
+    "@testing-library/react": "^12.1.2",
+    "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.182",
+    "@umijs/fabric": "^2.8.1",
+    "@umijs/test": "^3.0.5",
+    "@zgfe/business-lib": "1.2.70-hxd.1",
+    "antd": "4.24.10",
+    "dumi": "^1.1.0",
+    "father-build": "^1.17.2",
+    "gh-pages": "^3.0.0",
+    "lerna": "^4.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^2.2.1",
+    "umi-request": "^1.4.0",
+    "yorkie": "^2.0.0"
+  },
+  "gitHead": "e721bdffa17795e757afb2127814661d403da45a",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  }
+}