@zgfe/modules-dm 1.0.56-zhongyuan.8 → 1.0.57-alpha.0

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

@@ -1,185 +1,213 @@
-.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 {
-  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: '是';
-    }
-  }
-}
+.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 !important;
+      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;
+    pointer-events: none;
+    &::after {
+      position: absolute;
+      top: 0px;
+      left: -10px;
+      display: inline-block;
+      width: 120%;
+      height: 112%;
+      padding-top: 8px;
+      text-align: center;
+      vertical-align: middle;
+      background-color: white;
+      border-radius: 4px;
+      content: '是';
+    }
+  }
+}

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);
   };
@@ -74,6 +73,11 @@ var MapSetting = function MapSetting(props) {
       return /*#__PURE__*/React.createElement(Space, {
         size: "middle"
       }, /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          currentMap.current = record;
+          setOpenMapView(true);
+        }
+      }, "\u67E5\u770B"), /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           currentMap.current = record;
           UseModal({
@@ -90,6 +94,7 @@ var MapSetting = function MapSetting(props) {
   }, [searchName]);
   var handleClose = function handleClose() {
     setOpenMapAdd(false);
+    currentMap.current = undefined;
     props.getList(searchName);
   };
   // 删除
@@ -110,6 +115,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, {
@@ -139,7 +152,7 @@ var MapSetting = function MapSetting(props) {
     value: searchName,
     allowClear: true,
     onChange: onChange
-  }), "\u517120\u6761"), /*#__PURE__*/React.createElement(Button, {
+  }), "\u5171 ", mapData === null || mapData === void 0 ? void 0 : mapData.length, " \u6761"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setOpenMapAdd(true);
@@ -151,6 +164,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/css/index.css

@@ -1,48 +1,50 @@
-.dataReal {
-  height: 100%;
-  padding: 24px;
-  background: #fff;
-  border-radius: 8px;
-}
-.dataReal_search {
-  display: grid;
-  grid-template-columns: 1fr 100px;
-  padding: 0px 0px 16px;
-  border-bottom: 1px solid #f2f3f4;
-}
-.dataReal_table {
-  margin: 16px 0px;
-}
-.dataReal_table_tip {
-  margin: 0px 0px 16px;
-  color: #021429;
-}
-.dataReal_table_tip span {
-  margin: 0px 0px 0px 6px;
-  color: #67727f;
-}
-.dataReal-infoData {
-  display: flex;
-  flex-wrap: wrap;
-  line-height: 26px;
-  white-space: normal;
-  /* 保留空白符序列，但是正常换行 */
-  word-break: break-all;
-  /* 允许在单词内换行 */
-}
-.dataReal-infoData-title {
-  display: inline-block;
-  color: #007eff;
-}
-.dataReal-infoData-item {
-  margin-right: 8px;
-}
-.dataReal-infoData-value {
-  color: #1baf3b;
-}
-.dataReal-canvasEmpty {
-  position: absolute;
-  bottom: 260px;
-  left: 50%;
-  transform: translateX(-50%);
-}
+.dataReal {
+  height: 100%;
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+}
+.dataReal_search {
+  display: grid;
+  grid-template-columns: 1fr 100px;
+  padding: 0px 0px 16px;
+  border-bottom: 1px solid #f2f3f4;
+}
+.dataReal_table {
+  margin: 16px 0px;
+}
+.dataReal_table_tip {
+  margin: 0px 0px 16px;
+  color: #021429;
+  font-weight: bold;
+}
+.dataReal_table_tip span {
+  margin: 0px 0px 0px 6px;
+  color: #67727f;
+  font-weight: 400;
+}
+.dataReal-infoData {
+  display: flex;
+  flex-wrap: wrap;
+  line-height: 26px;
+  white-space: normal;
+  /* 保留空白符序列，但是正常换行 */
+  word-break: break-all;
+  /* 允许在单词内换行 */
+}
+.dataReal-infoData-title {
+  display: inline-block;
+  color: #007eff;
+}
+.dataReal-infoData-item {
+  margin-right: 8px;
+}
+.dataReal-infoData-value {
+  color: #1baf3b;
+}
+.dataReal-canvasEmpty {
+  position: absolute;
+  bottom: 260px;
+  left: 50%;
+  transform: translateX(-50%);
+}

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

@@ -1,51 +1,53 @@
-.dataReal {
-  height: 100%;
-  padding: 24px;
-  background: #fff;
-  border-radius: 8px;
-  border-radius: 8px;
-  &_search {
-    display: grid;
-    grid-template-columns: 1fr 100px;
-    padding: 0px 0px 16px;
-    border-bottom: 1px solid #f2f3f4;
-  }
-  &_table {
-    margin: 16px 0px;
-    &_tip {
-      margin: 0px 0px 16px;
-      color: #021429;
-      span {
-        margin: 0px 0px 0px 6px;
-        color: #67727f;
-      }
-    }
-  }
-}
-.dataReal-infoData {
-  display: flex;
-  flex-wrap: wrap;
-  line-height: 26px;
-  white-space: normal; /* 保留空白符序列，但是正常换行 */
-  word-break: break-all; /* 允许在单词内换行 */
-}
-.dataReal-infoData-title {
-  display: inline-block;
-  color: #007eff;
-}
-.dataReal-infoData-item {
-  margin-right: 8px;
-}
-.dataReal-infoData-value {
-  color: #1baf3b;
-}
-.dataReal-canvasEmpty {
-  position: absolute;
-  bottom: 260px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-// .defineTooltip{
-//   color: #1baf3b;
-//   background-color: white;
-// }
+.dataReal {
+  height: 100%;
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+  border-radius: 8px;
+  &_search {
+    display: grid;
+    grid-template-columns: 1fr 100px;
+    padding: 0px 0px 16px;
+    border-bottom: 1px solid #f2f3f4;
+  }
+  &_table {
+    margin: 16px 0px;
+    &_tip {
+      margin: 0px 0px 16px;
+      color: #021429;
+      font-weight: bold;
+      span {
+        margin: 0px 0px 0px 6px;
+        color: #67727f;
+        font-weight: 400;
+      }
+    }
+  }
+}
+.dataReal-infoData {
+  display: flex;
+  flex-wrap: wrap;
+  line-height: 26px;
+  white-space: normal; /* 保留空白符序列，但是正常换行 */
+  word-break: break-all; /* 允许在单词内换行 */
+}
+.dataReal-infoData-title {
+  display: inline-block;
+  color: #007eff;
+}
+.dataReal-infoData-item {
+  margin-right: 8px;
+}
+.dataReal-infoData-value {
+  color: #1baf3b;
+}
+.dataReal-canvasEmpty {
+  position: absolute;
+  bottom: 260px;
+  left: 50%;
+  transform: translateX(-50%);
+}
+// .defineTooltip{
+//   color: #1baf3b;
+//   background-color: white;
+// }