@zgfe/modules-dm 1.0.56-zhongyuan.16 → 1.0.56-zhongyuan.17

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

@@ -452,7 +452,7 @@ var CreateMeta = function CreateMeta(props) {
     validateStatus: validateContainsUnderscore(inputText) ? '' : 'error',
     help: validateContainsUnderscore(inputText) ? '' : inputText == '' ? '请输入事件名称' : "\u8BF7\u6839\u636E\u9875\u9762\u5C42\u7EA7\u547D\u540D\uFF0C\u5982\uFF1A".concat(props.selectTreeName)
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0",
+    placeholder: "".concat(props.selectTreeName ? "\u8BF7\u6839\u636E\u9875\u9762\u5C42\u7EA7\u547D\u540D\uFF0C\u5982\uFF1A".concat(props.selectTreeName) : '请输入事件名称'),
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {

package/es/modules/dataMap/component/rightDetail.js

@@ -553,7 +553,6 @@ var RightDetail = function RightDetail(props) {
       message: '请输入页面名称'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    disabled: true,
     showCount: true,
     maxLength: 20
   })), /*#__PURE__*/React.createElement(Form.Item, {
@@ -563,9 +562,7 @@ var RightDetail = function RightDetail(props) {
       required: true,
       message: '请输入备注名称'
     }]
-  }, /*#__PURE__*/React.createElement(Input, {
-    disabled: true
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u9875\u9762\u5C55\u793A"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Upload, {
     listType: "picture-card",
@@ -608,7 +605,7 @@ var RightDetail = function RightDetail(props) {
     onPointerLeaveCapture: undefined
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(pageName, "_echartDiv_leftText")
-  }, "\u6309\u94AE\u70B9\u51FB\u4E8B\u4EF6\u5206\u6790")), /*#__PURE__*/React.createElement("a", {
+  }, "\u9875\u9762\u5206\u6790\u8BE6\u60C5")), /*#__PURE__*/React.createElement("a", {
     className: "".concat(pageName, "_echartDiv_view"),
     onClick: function onClick() {
       return handleButtonPage('buttonAnalyzeParams');

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

@@ -14,7 +14,7 @@
   margin-bottom: 16px;
 }
 .mapSetting_search_input {
-  width: 320px;
+  width: 320px !important;
   margin: 0px 10px 0px 0px;
 }
 .mapSetting .ant-page-header {
@@ -191,6 +191,6 @@
   text-align: center;
   vertical-align: middle;
   background-color: white;
-  content: '是';
   border-radius: 4px;
+  content: '是';
 }

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

@@ -1,213 +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;
-    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: '是';
-    }
-  }
-}
+.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/dataReal/index1.js

@@ -32,15 +32,18 @@ var DataRealView = function DataRealView() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser;
-  var textStatus = useRef(false);
-  var _useState = useState([]),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    oldList = _useState2[0],
-    setOldList = _useState2[1]; // 未筛选的数据
+    textStatus = _useState2[0],
+    setTextStatus = _useState2[1];
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    list = _useState4[0],
-    setList = _useState4[1]; // 表格筛选完成的数据
+    oldList = _useState4[0],
+    setOldList = _useState4[1]; // 未筛选的数据
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    list = _useState6[0],
+    setList = _useState6[1]; // 表格筛选完成的数据
   var ws = useRef(null);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -49,10 +52,10 @@ var DataRealView = function DataRealView() {
   var eventName = Form.useWatch('eventName', form);
   var searchUserId = Form.useWatch('searchUserId', form);
   var filterData = Form.useWatch('filterData', form);
-  var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    currentMessageObj = _useState6[0],
-    setCurrentMessageObj = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    currentMessageObj = _useState8[0],
+    setCurrentMessageObj = _useState8[1];
   var initWebsocket = function initWebsocket(params) {
     // 创建 WebSocket 连接
     var socket = new WebSocket(webSocketUrl);
@@ -142,28 +145,25 @@ var DataRealView = function DataRealView() {
   };
   var handleRefresh = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _ws$current, params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            textStatus.current = !textStatus.current;
-            if (textStatus.current) {
-              _context.next = 5;
-              break;
-            }
-            (_ws$current = ws.current) === null || _ws$current === void 0 ? void 0 : _ws$current.close(); // 停止刷新 关闭链接
-            ws.current = null;
-            return _context.abrupt("return");
-          case 5:
-            // const data = form.getFieldsValue(true); // 表单数据
-            // 假设你要传递的参数 现在不需要参数了searchUserId
-            params = {
-              appId: getAppID(currentApp),
-              userId: currentUser === null || currentUser === void 0 ? void 0 : currentUser.userId,
-              appKey: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appKey
-            };
-            initWebsocket(params);
-          case 7:
+            setTextStatus(function (pre) {
+              if (pre) {
+                var _ws$current;
+                (_ws$current = ws.current) === null || _ws$current === void 0 ? void 0 : _ws$current.close(); // 停止刷新 关闭链接
+                ws.current = null;
+                return false;
+              }
+              var params = {
+                appId: getAppID(currentApp),
+                userId: currentUser === null || currentUser === void 0 ? void 0 : currentUser.userId,
+                appKey: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appKey
+              };
+              initWebsocket(params);
+              return !pre;
+            });
+          case 1:
           case "end":
             return _context.stop();
         }
@@ -180,24 +180,21 @@ var DataRealView = function DataRealView() {
       // 模拟异步保存数据到本地存储
       var unloadWs = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          var _ws$current2;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.prev = 0;
-                _context2.next = 3;
-                return handleRefresh();
-              case 3:
-                _context2.next = 8;
-                break;
-              case 5:
-                _context2.prev = 5;
-                _context2.t0 = _context2["catch"](0);
-                console.error('websocket:', _context2.t0);
-              case 8:
+                try {
+                  (_ws$current2 = ws.current) === null || _ws$current2 === void 0 ? void 0 : _ws$current2.close(); // 停止刷新 关闭链接
+                  ws.current = null;
+                } catch (error) {
+                  console.error('websocket:', error);
+                }
+              case 1:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[0, 5]]);
+          }, _callee2);
         }));
         return function unloadWs() {
           return _ref2.apply(this, arguments);
@@ -287,12 +284,12 @@ var DataRealView = function DataRealView() {
   }))), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: handleRefresh,
-    icon: textStatus.current ? /*#__PURE__*/React.createElement(IconFont, {
+    icon: textStatus ? /*#__PURE__*/React.createElement(IconFont, {
       type: "zanting"
     }) : /*#__PURE__*/React.createElement(IconFont, {
       type: "bofang"
     })
-  }, textStatus.current ? '停止刷新' : '开始刷新')), /*#__PURE__*/React.createElement("div", {
+  }, textStatus ? '停止刷新' : '开始刷新')), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classNameBase, "_table")
   }, /*#__PURE__*/React.createElement("h4", {
     className: "".concat(classNameBase, "_table_tip")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.16",
+  "version": "1.0.56-zhongyuan.17",
   "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": "cf1ddfc62eca28fb1a72b46209bb5778aede1b1c",
+  "gitHead": "8a5e9f3df4613e312ec87f2d66911511156de122",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }