@zgfe/modules-dm 1.0.34-heyh.25 → 1.0.34-heyh.27

package/es/components/demo.js

@@ -16,7 +16,7 @@ var DemoWrapper2 = function DemoWrapper2(props) {
     }
   }, /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 314
+    defaultApp: 318
   }, props.children)));
 };
 export default DemoWrapper2;

package/es/modules/dataCollection/styles/index.less

@@ -479,8 +479,9 @@
     background: #fff;
     border-top: 1px solid #f2f3f4;
   }
-  .ant-drawer-content{
-    overflow: unset!important;
+  .ant-drawer-content,
+  .ant-drawer-wrapper-body {
+    overflow: hidden !important;
   }
 }
 
@@ -578,8 +579,9 @@
       border: none;
     }
   }
-  .ant-drawer-content{
-    overflow:unset!important;
+  .ant-drawer-content,
+  .ant-drawer-wrapper-body {
+    overflow: hidden !important;
   }
   .ant-drawer-title {
     span {
@@ -708,22 +710,22 @@
     }
   }
   &-select {
-    margin-top: 16px;
     display: flex;
-    justify-content: flex-start;
-    align-items: center;
     gap: 10px;
-    >:nth-child(1){
+    align-items: center;
+    justify-content: flex-start;
+    margin-top: 16px;
+    > :nth-child(1) {
       width: 32px;
-      color: #5F6085;
+      color: #5f6085;
     }
   }
   &-modal-box {
-    .ant-modal-header{
-      padding-bottom: 0!important;
+    .ant-modal-header {
+      padding-bottom: 0 !important;
     }
-    .ant-modal-body{
-      >:nth-child(1){
+    .ant-modal-body {
+      > :nth-child(1) {
         color: #021429;
       }
     }
@@ -744,7 +746,7 @@
     }
   }
 }
-#select-attributes-select{
+#select-attributes-select {
   .ant-select-dropdown {
     display: none !important;
   }

package/es/utils/index.js

@@ -2,6 +2,37 @@
  * 虚拟事件编辑 判断内容是否有改动；有改动返回true
  */
 export var getVirtualContentChange = function getVirtualContentChange(oldData, newData) {
+  var eventJson = function eventJson(_old, _new) {
+    var flag = 0;
+    if (_old.length !== _new.length) {
+      return true;
+    }
+    _old.map(function (item, index) {
+      var _new$index, _new$index2;
+      if (item.eventId !== _new[index].eventId) {
+        flag++;
+        return;
+      }
+      if ((item === null || item === void 0 ? void 0 : item.filters) === undefined && ((_new$index = _new[index]) === null || _new$index === void 0 ? void 0 : _new$index.filters) !== undefined || (item === null || item === void 0 ? void 0 : item.filters) !== undefined && ((_new$index2 = _new[index]) === null || _new$index2 === void 0 ? void 0 : _new$index2.filters) === undefined) {
+        flag++;
+        return;
+      }
+      if ((item === null || item === void 0 ? void 0 : item.filters) && (item === null || item === void 0 ? void 0 : item.filters.conditions)) {
+        var _new$index3;
+        if ((item === null || item === void 0 ? void 0 : item.filters.conditions.length) !== ((_new$index3 = _new[index]) === null || _new$index3 === void 0 ? void 0 : _new$index3.filters.conditions.length)) {
+          flag++;
+          return;
+        }
+        item === null || item === void 0 ? void 0 : item.filters.conditions.map(function (_item, _index) {
+          var _new$index4, _new$index5, _new$index6;
+          if (_item.attrId !== ((_new$index4 = _new[index]) === null || _new$index4 === void 0 ? void 0 : _new$index4.filters.conditions[_index].attrId) || JSON.stringify(_item.values) !== JSON.stringify((_new$index5 = _new[index]) === null || _new$index5 === void 0 ? void 0 : _new$index5.filters.conditions[_index].values) || _item.operator !== ((_new$index6 = _new[index]) === null || _new$index6 === void 0 ? void 0 : _new$index6.filters.conditions[_index].operator)) {
+            flag++;
+          }
+        });
+      }
+    });
+    return flag === 0 ? false : true;
+  };
   if (oldData.aliasName != newData.aliasName) {
     return true;
   }
@@ -14,7 +45,7 @@ export var getVirtualContentChange = function getVirtualContentChange(oldData, n
   if (nullToEmptyString(oldData.description) != nullToEmptyString(newData.desc)) {
     return true;
   }
-  if (JSON.stringify(oldData.eventJson) !== JSON.stringify(newData.eventJson)) {
+  if (eventJson(oldData.eventJson, newData.eventJson)) {
     return true;
   }
   return false;
@@ -228,7 +259,7 @@ export var eventShow = function eventShow(data, searchData) {
     var count = 0; // 搜索实时展示的指标数量
     var len = 0; // 当前选中的指标数量
     item.eventList.map(function (_item) {
-      if (searchData === "") {
+      if (searchData === '') {
         _item.searchShow = 1;
         count++;
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.25",
+  "version": "1.0.34-heyh.27",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -52,7 +52,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f86fb2a9e8ba519bb444006244b229eefcb4efe9",
+  "gitHead": "11f61f53db098861540aee50849107ad907d66fd",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }