@zgfe/modules-dm 1.0.56-zhongyuan.13 → 1.0.56-zhongyuan.15

package/es/modules/dataManage/components/tablePlus.js

@@ -749,30 +749,22 @@ var TablePlus = function TablePlus(props) {
     key: 'platformStr',
     width: 260,
     render: function render(text, record) {
-      if (text) {
-        return /*#__PURE__*/React.createElement("div", {
-          className: "event_attrs"
-        }, text.split(',').map(function (item, index) {
-          return /*#__PURE__*/React.createElement(Tag, {
-            key: index
-          }, maidianList.filter(function (obj) {
-            return obj.value == item;
-          })[0].label);
-        }), /*#__PURE__*/React.createElement(IconFont, {
-          type: "bianji1",
-          onClick: function onClick() {
-            if (!authority[1000003]) {
-              message.error('无修改权限');
-              return;
-            }
-            setIsMaidianModal(true);
-            setCurrentMaidian(text.split(','));
-            setCurrentRow(record);
-          }
-        }));
-      } else {
-        return text;
-      }
+      return /*#__PURE__*/React.createElement("div", {
+        className: "event_attrs"
+      }, text && text.split(',').map(function (item, index) {
+        return /*#__PURE__*/React.createElement(Tag, {
+          key: index
+        }, maidianList.filter(function (obj) {
+          return obj.value == item;
+        })[0].label);
+      }), /*#__PURE__*/React.createElement(IconFont, {
+        type: "bianji1",
+        onClick: function onClick() {
+          setIsMaidianModal(true);
+          text && setCurrentMaidian(text.split(','));
+          setCurrentRow(record);
+        }
+      }));
     }
   }, {
     title: '末次上报时间',

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

@@ -178,16 +178,19 @@
 .mapSetting .ant-dropdown-trigger.biz-select-handle.biz-condition-item-single-select {
   position: relative;
   background-color: transparent;
+  pointer-events: none;
 }
 .mapSetting .ant-dropdown-trigger.biz-select-handle.biz-condition-item-single-select::after {
   position: absolute;
   top: 0px;
-  left: 0;
+  left: -10px;
   display: inline-block;
-  width: 100%;
+  width: 120%;
+  height: 112%;
   padding-top: 8px;
   text-align: center;
   vertical-align: middle;
   background-color: white;
   content: '是';
+  border-radius: 4px;
 }

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

@@ -1,210 +1,213 @@
-.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: '是';
-    }
-  }
-}
+.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;
+    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

@@ -73,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({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.13",
+  "version": "1.0.56-zhongyuan.15",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d2dfa3c7a8f86fea47c792a28e9597a5801e4551",
+  "gitHead": "ad148dbfe4f04a198584fcde6056119e5196cdf4",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }