@zgfe/modules-dm 1.0.34-heyh.2 → 1.0.34-heyh.21

package/es/utils/index.js

@@ -1,3 +1,24 @@
+/**
+ * 虚拟事件编辑 判断内容是否有改动；有改动返回true
+ */
+export var getVirtualContentChange = function getVirtualContentChange(oldData, newData) {
+  if (oldData.aliasName != newData.aliasName) {
+    return true;
+  }
+  if (oldData.eventName != newData.eventName) {
+    return true;
+  }
+  if (oldData.groupId != newData.eventGroupId) {
+    return true;
+  }
+  if (nullToEmptyString(oldData.description) != nullToEmptyString(newData.desc)) {
+    return true;
+  }
+  if (JSON.stringify(oldData.eventJson) !== JSON.stringify(newData.eventJson)) {
+    return true;
+  }
+  return false;
+};
 /**
  * 虚拟事件属性超过100个，选择属性后的回调，处理提交数据
  */
@@ -150,21 +171,6 @@ export var eventShowOrHiddenData = function eventShowOrHiddenData(type, groupId,
   setGroupingData(_groupingData);
   return ids.length > 0 ? ids.join(',') : '';
 };
-/**
- * 指标分组管理：删除分组
- */
-export var groupDeleteData = function groupDeleteData(groupId, groupingData, setGroupingData) {
-  groupingData.map(function (item, index) {
-    if (item.groupId === groupId) {
-      delete groupingData[index];
-    }
-  });
-  var _groupingData = [];
-  groupingData.map(function (item) {
-    _groupingData.push(item);
-  });
-  setGroupingData(_groupingData);
-};
 /**
  * 指标分组管理：分组展开与关闭
  */
@@ -192,6 +198,18 @@ export var eventCheckedAll = function eventCheckedAll(groupId, groupingData) {
   });
   return groupingData;
 };
+/**
+ * 指标分组管理：搜索事件名称或别名，判断是否展示
+ */
+export var eventShow = function eventShow(data, searchData) {
+  console.log('判断是否展示: ', data, searchData);
+  data.map(function (item) {
+    item.eventList = item.eventList.filter(function (_item) {
+      return _item.event_name.indexOf(searchData) !== -1 || (_item === null || _item === void 0 ? void 0 : _item.alias_name) && (_item === null || _item === void 0 ? void 0 : _item.alias_name.indexOf(searchData)) !== -1;
+    });
+  });
+  return data;
+};
 /**
  * 指标分组管理：单个事件选中处理
  */
@@ -239,9 +257,19 @@ export var groupListSort = function groupListSort(result, groupingData, setGroup
  * 指标分组管理：分组中事件列表初始化
  */
 export var eventListHandle = function eventListHandle(data) {
+  var _open = false;
   data.map(function (item) {
     item.checked = false;
-    item.open = true;
+    item.open = false;
+    if (item.eventList.length > 0) {
+      item.eventList = item.eventList.filter(function (_item) {
+        return _item.is_delete === 0;
+      });
+      if (item.eventList.length > 0 && !_open) {
+        _open = true;
+        item.open = true;
+      }
+    }
   });
 };
 // 获取appId，为了解决之前遇到切换应用但是currentApp里面的appId不更新的问题
@@ -253,6 +281,13 @@ export var getAppID = function getAppID(currentApp) {
     return currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId;
   }
 };
+// null 或 undefined 转为 空字符串
+export var nullToEmptyString = function nullToEmptyString(data) {
+  if (data === null || data === undefined) {
+    return '';
+  }
+  return data;
+};
 /**
  * 获取第一个表格的可视化高度
  * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.2",
+  "version": "1.0.34-heyh.21",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.98",
+    "@zgfe/business-lib": "1.2.3-heyh.1",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -52,7 +52,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9946c9d4ac13d31bfa3be622e1b5eae0a9447402",
+  "gitHead": "714659e1b1b7197d934b8fab6cf79243f0894aa3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }