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

package/es/modules/dataCollection/components/createVirtualDrawer.js

@@ -38,6 +38,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     formSubmitData = _useState4[0],
     setFormSubmitData = _useState4[1];
+  var attrMaxLength = 100;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList;
@@ -69,7 +70,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   // 保存
   var onFinish = function onFinish(data) {
     var _data = getDelectAttributesData(_.cloneDeep(data.eventJson), eventGroupList);
-    if (_data[0] && _data[0].attrList && _data[0].attrList.length > 100) {
+    if (_data[0] && _data[0].attrList && _data[0].attrList.length > attrMaxLength) {
       setSubmitData(data);
       setSelectAttributesData(_data);
       setSelectAttributesShow(true);
@@ -263,7 +264,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     selectAttributesShow: selectAttributesShow,
     setSelectAttributesShow: setSelectAttributesShow,
     selectAttributesData: selectAttributesData,
-    selectAttributesHandle: selectAttributesHandle
+    selectAttributesHandle: selectAttributesHandle,
+    attrMaxLength: attrMaxLength
   })));
 };
 export default CreateVirtualDrawer;

package/es/modules/dataCollection/components/eventGroupingDrawer.js

@@ -30,22 +30,19 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     _useState2 = _slicedToArray(_useState, 2),
     groupingData = _useState2[0],
     setGroupingData = _useState2[1];
-  var _useState3 = useState([]),
+  // const [initialData, setInitialData] = useState([]);
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    groupingDataOriginal = _useState4[0],
-    setGroupingDataOriginal = _useState4[1];
-  var _useState5 = useState(false),
+    isDragDisabled = _useState4[0],
+    setIsDragDisabled = _useState4[1];
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    isDragDisabled = _useState6[0],
-    setIsDragDisabled = _useState6[1];
-  var _useState7 = useState(''),
+    searchData = _useState6[0],
+    setSearchData = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    searchData = _useState8[0],
-    setSearchData = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
+    loading = _useState8[0],
+    setLoading = _useState8[1];
   var queryList = function queryList() {
     setLoading(true);
     request(apis.queryCollectionEventList, {
@@ -57,9 +54,10 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
       }
     }).then(function (res) {
       if (res && res.data) {
-        eventListHandle(res.data);
-        setGroupingDataOriginal(res.data);
-        setGroupingData(eventShow(_.cloneDeep(res.data), searchData));
+        var _data = eventListHandle(res.data);
+        // setInitialData(_data);
+        // setGroupingData(eventShow(_.cloneDeep(_data), searchData));
+        setGroupingData(_data);
       }
       setLoading(false);
     });
@@ -67,14 +65,17 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
   useEffect(function () {
     if (eventGroupingShow) queryList();
   }, [eventGroupingShow]);
+  // 搜索
   var onSearchChange = function onSearchChange(e) {
     var _value = e.currentTarget.value;
     setSearchData(_value);
-    setGroupingData(eventShow(_.cloneDeep(groupingDataOriginal), _value));
+    setGroupingData(eventShow(_.cloneDeep(groupingData), _value));
   };
+  // 全选&取消全选
   var onChangeAll = function onChangeAll(groupId) {
     setGroupingData(_.cloneDeep(eventCheckedAll(groupId, groupingData)));
   };
+  // 展开&收起
   var openChange = function openChange(groupId) {
     setGroupingData(_.cloneDeep(openChangeData(groupId, groupingData)));
   };
@@ -91,6 +92,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           ids: ids
         }
       }).then(function () {
+        // queryList();
         refresh();
       });
     }
@@ -143,26 +145,26 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }
   };
   // 移动
-  var _useState11 = useState(undefined),
+  var _useState9 = useState(undefined),
+    _useState10 = _slicedToArray(_useState9, 2),
+    eventMoveShow = _useState10[0],
+    setEventMoveShow = _useState10[1];
+  var _useState11 = useState(-1),
     _useState12 = _slicedToArray(_useState11, 2),
-    eventMoveShow = _useState12[0],
-    setEventMoveShow = _useState12[1];
-  var _useState13 = useState(-1),
+    eventMoveChangeId = _useState12[0],
+    setEventMoveChangeId = _useState12[1];
+  var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventMoveChangeId = _useState14[0],
-    setEventMoveChangeId = _useState14[1];
-  var _useState15 = useState([]),
+    eventMoveOption = _useState14[0],
+    setEventMoveOption = _useState14[1];
+  var _useState15 = useState(0),
     _useState16 = _slicedToArray(_useState15, 2),
-    eventMoveOption = _useState16[0],
-    setEventMoveOption = _useState16[1];
-  var _useState17 = useState(0),
+    eventMoveLength = _useState16[0],
+    setEventMoveLength = _useState16[1];
+  var _useState17 = useState(''),
     _useState18 = _slicedToArray(_useState17, 2),
-    eventMoveLength = _useState18[0],
-    setEventMoveLength = _useState18[1];
-  var _useState19 = useState(''),
-    _useState20 = _slicedToArray(_useState19, 2),
-    eventMoveIds = _useState20[0],
-    setEventMoveIds = _useState20[1];
+    eventMoveIds = _useState18[0],
+    setEventMoveIds = _useState18[1];
   var eventMove = function eventMove(groupId) {
     var data = eventMoveData(groupId, groupingData, setGroupingData);
     setEventMoveOption(data.groupingOption);
@@ -220,18 +222,18 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }, "\u786E\u5B9A")));
   };
   // 创建分组 & 修改分组名
-  var _useState21 = useState(null),
+  var _useState19 = useState(null),
+    _useState20 = _slicedToArray(_useState19, 2),
+    createOrEditGrpup = _useState20[0],
+    setCreateOrEditGrpup = _useState20[1];
+  var _useState21 = useState(-1),
     _useState22 = _slicedToArray(_useState21, 2),
-    createOrEditGrpup = _useState22[0],
-    setCreateOrEditGrpup = _useState22[1];
-  var _useState23 = useState(-1),
+    grpupModalSelectGrpupId = _useState22[0],
+    setGrpupModalSelectGrpupId = _useState22[1];
+  var _useState23 = useState(''),
     _useState24 = _slicedToArray(_useState23, 2),
-    grpupModalSelectGrpupId = _useState24[0],
-    setGrpupModalSelectGrpupId = _useState24[1];
-  var _useState25 = useState(''),
-    _useState26 = _slicedToArray(_useState25, 2),
-    grpupNameInput = _useState26[0],
-    setGrpupNameInput = _useState26[1];
+    grpupNameInput = _useState24[0],
+    setGrpupNameInput = _useState24[1];
   var GrpupModalHandle = function GrpupModalHandle() {
     if (grpupNameInput === '') {
       message.error('请填写分组名');
@@ -285,7 +287,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
       }
     })
   }, /*#__PURE__*/React.createElement(BizLoading, {
-    spinning: loading
+    spinning: loading,
+    loadingText: ""
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-box")
   }, /*#__PURE__*/React.createElement(Input, {
@@ -343,9 +346,9 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
             setGrpupNameInput(item.groupName ? item.groupName : '未分组');
             setGrpupModalSelectGrpupId(item.groupId);
           }
-        })), /*#__PURE__*/React.createElement("div", null, item.eventList.length, "\u4E2A\u6307\u6807")), /*#__PURE__*/React.createElement("div", {
+        })), /*#__PURE__*/React.createElement("div", null, item.count, "\u4E2A\u6307\u6807")), /*#__PURE__*/React.createElement("div", {
           className: "operate-right"
-        }, item.eventList.length > 0 && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
+        }, item.count > 0 && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
           checked: item.checked,
           onChange: function onChange() {
             return onChangeAll(item.groupId);

package/es/modules/dataCollection/components/selectAttributes.js

@@ -17,7 +17,8 @@ var SelectAttributes = function SelectAttributes(props) {
   var selectAttributesShow = props.selectAttributesShow,
     setSelectAttributesShow = props.setSelectAttributesShow,
     selectAttributesData = props.selectAttributesData,
-    selectAttributesHandle = props.selectAttributesHandle;
+    selectAttributesHandle = props.selectAttributesHandle,
+    attrMaxLength = props.attrMaxLength;
   // 下拉菜单是否显示
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -65,7 +66,7 @@ var SelectAttributes = function SelectAttributes(props) {
         ofEventId: item.ofEventId
       });
       _attrShowList.push(item.label);
-      if (_selectValue.length < 100) {
+      if (_selectValue.length < attrMaxLength) {
         _selectValue.push(item.label);
       }
     });
@@ -81,7 +82,7 @@ var SelectAttributes = function SelectAttributes(props) {
   };
   // 保存
   var handleOk = function handleOk() {
-    if (selectValue.length > 100) {
+    if (selectValue.length > attrMaxLength) {
       message.error('最多可选择100个属性');
     } else {
       selectAttributesHandle(selectValue);
@@ -107,6 +108,10 @@ var SelectAttributes = function SelectAttributes(props) {
         return _label !== label;
       }));
     } else {
+      if (selectValue.length >= 100) {
+        message.error('限制最大勾选数量为100');
+        return;
+      }
       setSelectValue([].concat(_toConsumableArray(selectValue), [label]));
     }
   };
@@ -136,7 +141,7 @@ var SelectAttributes = function SelectAttributes(props) {
             onChange: function onChange() {
               return onSelectAttributesChange(_item.label);
             }
-          }, _item.label)) : null;
+          }, _item.alias ? "".concat(_item.alias, "(").concat(_item.label, ")") : _item.label)) : null;
         });
       }
     });
@@ -166,7 +171,7 @@ var SelectAttributes = function SelectAttributes(props) {
           onClick: function onClick() {
             return onSelectEventIdChange(item.id);
           }
-        }, /*#__PURE__*/React.createElement("span", null, item.name), /*#__PURE__*/React.createElement("span", null, item.attrList.length));
+        }, /*#__PURE__*/React.createElement("span", null, item.alias ? item.alias : item.name), /*#__PURE__*/React.createElement("span", null, item.attrList.length));
       })), /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-box-right")
       }, /*#__PURE__*/React.createElement(BizSearchInput, {
@@ -184,27 +189,31 @@ var SelectAttributes = function SelectAttributes(props) {
     },
     open: visible,
     onOpenChange: onVisibleChange,
-    getPopupContainer: props.popupContainer ? function () {
+    getPopupContainer: function getPopupContainer() {
       return document.getElementById("".concat(classPrefix, "-select"));
-    } : undefined,
+    },
     destroyPopupOnHide: props.defaultSelectAble
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-select"),
     id: "".concat(classPrefix, "-select")
-  }, /*#__PURE__*/React.createElement(Select, {
+  }, /*#__PURE__*/React.createElement("div", null, "\u5C5E\u6027\u6700\u591A\u5C55\u793A100\u4E2A\uFF0C\u8BF7\u9009\u62E9\u6240\u9700\u5C5E\u6027"), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-select")
+  }, /*#__PURE__*/React.createElement("div", null, "\u5C5E\u6027"), /*#__PURE__*/React.createElement(Select, {
     mode: "tags",
     maxTagCount: 3,
     maxTagTextLength: 5,
     style: {
       width: '100%'
     },
-    placeholder: "Please select",
+    placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
     getPopupContainer: function getPopupContainer() {
       return document.getElementById("".concat(classPrefix, "-select"));
     },
     value: selectValue,
+    onFocus: function onFocus() {
+      return setVisible(true);
+    },
     onChange: handleSelectChange,
     options: options
-  }))));
+  })))));
 };
 export default SelectAttributes;

package/es/modules/dataCollection/components/sortableComponnet.js

@@ -40,7 +40,7 @@ var SortableComponnet = function SortableComponnet(props) {
   var SortableItemNotDrag = function SortableItemNotDrag(data) {
     var item = data.item,
       index = data.index;
-    var name = item.alias_name ? item.alias_name : item.event_name;
+    var name = item.alias_name ? "".concat(item.alias_name, "(").concat(item.event_name, ")") : item.event_name;
     return /*#__PURE__*/React.createElement(Tooltip, {
       title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
       key: index
@@ -62,20 +62,24 @@ var SortableComponnet = function SortableComponnet(props) {
     return /*#__PURE__*/React.createElement("div", {
       key: componnetIndex
     }, componnetData.map(function (item, index) {
-      if (groupId !== -1 && searchData === "") {
-        return /*#__PURE__*/React.createElement(SortableItem, {
-          key: "item-".concat(index),
-          index: index,
-          value: {
+      if (item.searchShow === 1) {
+        if (groupId !== -1 && searchData === "") {
+          return /*#__PURE__*/React.createElement(SortableItem, {
+            key: "item-".concat(index),
+            index: index,
+            value: {
+              item: item,
+              index: index
+            }
+          });
+        } else {
+          return SortableItemNotDrag({
             item: item,
             index: index
-          }
-        });
+          });
+        }
       } else {
-        return SortableItemNotDrag({
-          item: item,
-          index: index
-        });
+        return null;
       }
     }));
   });

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

@@ -66,7 +66,9 @@ var TablePlus = function TablePlus(props) {
         eventId: aliasNameId
       }
     }).then(function (res) {
-      if (res) {
+      if (res.data === 0) {
+        message.error(res.msg);
+      } else {
         message.success('修改成功');
         props.Refresh();
       }

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

@@ -479,6 +479,9 @@
     background: #fff;
     border-top: 1px solid #f2f3f4;
   }
+  .ant-drawer-content{
+    overflow: unset!important;
+  }
 }
 
 .event-grouping-drawer {
@@ -557,12 +560,6 @@
             -webkit-line-clamp: 1;
           }
         }
-        .checkbox-item.show{
-          display: flex;
-        }
-        .checkbox-item.hidden{
-          display: none;
-        }
       }
       .event-hidden {
         color: #ccd0d4;
@@ -581,6 +578,9 @@
       border: none;
     }
   }
+  .ant-drawer-content{
+    overflow:unset!important;
+  }
   .ant-drawer-title {
     span {
       margin-left: 8px;
@@ -708,11 +708,25 @@
     }
   }
   &-select {
-    .ant-select-dropdown {
-      display: none !important;
+    margin-top: 16px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    gap: 10px;
+    >:nth-child(1){
+      width: 32px;
+      color: #5F6085;
     }
   }
   &-modal-box {
+    .ant-modal-header{
+      padding-bottom: 0!important;
+    }
+    .ant-modal-body{
+      >:nth-child(1){
+        color: #021429;
+      }
+    }
     .ant-modal-close-x {
       display: none;
     }
@@ -730,6 +744,11 @@
     }
   }
 }
+#select-attributes-select{
+  .ant-select-dropdown {
+    display: none !important;
+  }
+}
 
 .sortable-componnet-sortableList {
   z-index: 9999;

package/es/utils/index.d.ts

@@ -34,6 +34,10 @@ export declare const openChangeData: (groupId: number, groupingData: any) => any
  * 指标分组管理：事件全选处理
  */
 export declare const eventCheckedAll: (groupId: number, groupingData: any) => any;
+/**
+ * 指标分组管理：分组中事件列表初始化
+ */
+export declare const eventListHandle: (data: any) => any;
 /**
  * 指标分组管理：搜索事件名称或别名，判断是否展示
  */
@@ -46,10 +50,6 @@ export declare const eventChecked: (groupId: number, eventId: number, groupingDa
  * 指标分组管理：分组排序
  */
 export declare const groupListSort: (result: any, groupingData: any, setGroupingData: Function) => any;
-/**
- * 指标分组管理：分组中事件列表初始化
- */
-export declare const eventListHandle: (data: any) => void;
 export declare const getAppID: (currentApp: any) => any;
 export declare const nullToEmptyString: (data: any) => any;
 /**

package/es/utils/index.js

@@ -193,20 +193,61 @@ export var eventCheckedAll = function eventCheckedAll(groupId, groupingData) {
       item.checked = false;
     }
     item.eventList.map(function (_item) {
-      _item.checked = item.checked;
+      if (_item.searchShow === 1) _item.checked = item.checked;
     });
   });
   return groupingData;
 };
+/**
+ * 指标分组管理：分组中事件列表初始化
+ */
+export var eventListHandle = function eventListHandle(data) {
+  var _open = false;
+  data.map(function (item) {
+    item.checked = false;
+    item.open = false;
+    item.count = item.eventList.length;
+    if (item.eventList.length > 0) {
+      item.eventList = item.eventList.filter(function (_item) {
+        _item.searchShow = 1;
+        return _item.is_delete === 0;
+      });
+      if (item.eventList.length > 0 && !_open) {
+        _open = true;
+        item.open = true;
+      }
+    }
+  });
+  return data;
+};
 /**
  * 指标分组管理：搜索事件名称或别名，判断是否展示
  */
 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;
+    var count = 0; // 搜索实时展示的指标数量
+    var len = 0; // 当前选中的指标数量
+    item.eventList.map(function (_item) {
+      if (searchData === "") {
+        _item.searchShow = 1;
+        count++;
+      } else {
+        if (_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) {
+          _item.searchShow = 1;
+          count++;
+        } else {
+          _item.searchShow = 0;
+          _item.checked = false;
+        }
+      }
+      if (_item.checked) len++;
     });
+    if (count == len) {
+      item.checked = true;
+    } else {
+      item.checked = false;
+    }
+    item.count = count;
   });
   return data;
 };
@@ -253,25 +294,6 @@ export var groupListSort = function groupListSort(result, groupingData, setGroup
   setGroupingData(_groupingData);
   return ids.join(',');
 };
-/**
- * 指标分组管理：分组中事件列表初始化
- */
-export var eventListHandle = function eventListHandle(data) {
-  var _open = false;
-  data.map(function (item) {
-    item.checked = false;
-    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不更新的问题
 export var getAppID = function getAppID(currentApp) {
   var href = window.location.href;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.21",
+  "version": "1.0.34-heyh.22",
   "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": "714659e1b1b7197d934b8fab6cf79243f0894aa3",
+  "gitHead": "e8f2bba6c835cf6b57788d0feb48cf9ac4951032",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }