@zgfe/modules-dm 1.0.34-heyh.26 → 1.0.34-heyh.28

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/components/eventGroupingDrawer.js

@@ -19,6 +19,7 @@ import { eventListHandle, groupListSort, eventCheckedAll, openChangeData, eventS
 import React, { Fragment, useContext, useEffect, useState } from 'react';
 import _ from 'lodash';
 import SortableComponnet from './sortableComponnet';
+var requestMove = false;
 import { DmContext } from '../../../store';
 var EventGroupingDrawer = function EventGroupingDrawer(props) {
   var classPrefix = 'event-grouping-drawer';
@@ -188,6 +189,11 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }
   };
   var eventMoveChange = function eventMoveChange() {
+    if (requestMove) {
+      console.log(11111111);
+      return;
+    }
+    requestMove = true;
     request(apis.operateGroupRelations, {
       method: 'post',
       data: {
@@ -205,6 +211,9 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
     }).finally(function () {
+      setTimeout(function () {
+        requestMove = false;
+      }, 1000);
       setEventMoveShow(undefined);
     });
   };

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.26",
+  "version": "1.0.34-heyh.28",
   "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": "e0eabbe9365f2536eb02a13a40460f3657fbfecc",
+  "gitHead": "8e420eed07c0b2c21a18d58d78d864d26f0c1efc",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }