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

package/es/components/demo.js

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

package/es/modules/dataCollection/collectionEventList.js

@@ -148,10 +148,6 @@ var CollectionEventList = function CollectionEventList(props) {
       message.error('请输入分组名称');
       return;
     }
-    if (eventNameInput.length > 20) {
-      message.error('名称不可超过20字符');
-      return;
-    }
     request(apis.upsertEventGroup, {
       method: 'post',
       data: {
@@ -428,7 +424,8 @@ var CollectionEventList = function CollectionEventList(props) {
     Refresh: refreshHandle
   })), /*#__PURE__*/React.createElement(EventGroupingDrawer, {
     eventGroupingShow: eventGroupingShow,
-    setEventGroupingShow: setEventGroupingShow
+    setEventGroupingShow: setEventGroupingShow,
+    refresh: refreshHandle
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
     className: "creact-group",
@@ -443,6 +440,7 @@ var CollectionEventList = function CollectionEventList(props) {
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
     value: eventNameInput,
+    maxLength: 20,
     onChange: function onChange(e) {
       return setEventNameInput(e.currentTarget.value);
     }

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

@@ -11,13 +11,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, Drawer, Form } from 'antd';
+import { Input, Button, Select, Drawer, Form, message, Modal } from 'antd';
 import { Fragment } from 'react';
+import moment from 'moment';
 var TextArea = Input.TextArea;
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import React, { useContext, useState } from 'react';
-import { eventJsonHandle, getDelectAttributesData, getSubmitHandleData, getAppID } from '../../../utils';
+import { eventJsonHandle, getDelectAttributesData, getSubmitHandleData, getAppID, getVirtualContentChange } from '../../../utils';
 import EventFilter from './eventFilter';
 import SelectAttributes from './selectAttributes';
 import _ from 'lodash';
@@ -33,22 +34,36 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     _useState2 = _slicedToArray(_useState, 2),
     formSubmit = _useState2[0],
     setFormSubmit = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formSubmitData = _useState4[0],
+    setFormSubmitData = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList;
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectAttributesShow = _useState4[0],
-    setSelectAttributesShow = _useState4[1];
-  var _useState5 = useState({}),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectAttributesData = _useState6[0],
-    setSelectAttributesData = _useState6[1];
+    selectAttributesShow = _useState6[0],
+    setSelectAttributesShow = _useState6[1];
   var _useState7 = useState({}),
     _useState8 = _slicedToArray(_useState7, 2),
-    submitData = _useState8[0],
-    setSubmitData = _useState8[1];
-  var onValuesChange = function onValuesChange(data, allData) {
+    selectAttributesData = _useState8[0],
+    setSelectAttributesData = _useState8[1];
+  var _useState9 = useState({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    submitData = _useState10[0],
+    setSubmitData = _useState10[1];
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    selectList = _useState12[0],
+    setSelectList = _useState12[1];
+  var onValuesChange = function onValuesChange(_, allData) {
+    var _selectList = [];
+    allData.eventJson.map(function (item) {
+      if (item === null || item === void 0 ? void 0 : item.eventId) _selectList.push(item.eventId);
+    });
+    setSelectList(_selectList);
+    setFormSubmitData(allData);
     setFormSubmit(eventJsonHandle(allData));
   };
   // 保存
@@ -76,9 +91,12 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
           platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
         }, data)
       }).then(function (res) {
-        if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
+        if ((res === null || res === void 0 ? void 0 : res.code) === '100000' && res.data === 1) {
+          message.success('编辑成功');
           refresh();
           setCreateVirtualShow(false);
+        } else {
+          message.error(res === null || res === void 0 ? void 0 : res.msg);
         }
       });
     } else {
@@ -89,13 +107,39 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
           platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
         }, data)
       }).then(function (res) {
-        if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
+        if ((res === null || res === void 0 ? void 0 : res.code) === '100000' && res.data === 1) {
+          message.success('创建成功');
           refresh();
           setCreateVirtualShow(false);
+        } else {
+          message.error(res === null || res === void 0 ? void 0 : res.msg);
         }
       });
     }
   };
+  var onClose = function onClose() {
+    if (virtualDrawerType === "edit") {
+      if (formSubmit && getVirtualContentChange(_.cloneDeep(editVirtualEventData), _.cloneDeep(formSubmitData))) {
+        Modal.confirm({
+          centered: true,
+          title: '内容发生了修改，请确认是否保存修改内容',
+          okText: '确认',
+          cancelText: '取消',
+          maskClosable: false,
+          onOk: function onOk() {
+            onFinish(formSubmitData);
+          },
+          onCancel: function onCancel() {
+            setCreateVirtualShow(false);
+          }
+        });
+      } else {
+        setCreateVirtualShow(false);
+      }
+    } else {
+      setCreateVirtualShow(false);
+    }
+  };
   var editGroupOptions = function editGroupOptions(eventGroupId) {
     var text = '';
     groupOptions.map(function (item) {
@@ -107,23 +151,19 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   };
   return /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
-    width: '60%',
+    width: 700,
     title: "".concat(virtualDrawerType === 'edit' ? '编辑' : virtualDrawerType === 'see' ? '查看' : '创建', "\u865A\u62DF\u4E8B\u4EF6"),
     placement: "right",
     destroyOnClose: true,
-    onClose: function onClose() {
-      return setCreateVirtualShow(false);
-    },
+    onClose: onClose,
     open: createVirtualShow,
     extra: /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu",
-      onClick: function onClick() {
-        setCreateVirtualShow(false);
-      }
+      onClick: onClose
     })
   }, /*#__PURE__*/React.createElement(Fragment, null, virtualDrawerType === 'see' && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-see-box")
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u540D\u79F0"), editVirtualEventData.eventName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u522B\u540D"), editVirtualEventData.aliasName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5206\u7EC4"), editGroupOptions(editVirtualEventData.eventGroupId)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5907\u6CE8"), editVirtualEventData.description), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u4EBA"), editVirtualEventData.createUser), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u65F6\u95F4"), editVirtualEventData.insertTime), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u66F4\u65B0\u65F6\u95F4"), editVirtualEventData.updateTime)), /*#__PURE__*/React.createElement(Form, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u540D\u79F0"), editVirtualEventData.eventName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u522B\u540D"), editVirtualEventData.aliasName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5206\u7EC4"), editGroupOptions((editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId) === null ? -1 : editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5907\u6CE8"), editVirtualEventData.description), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u4EBA"), editVirtualEventData.createUser), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u65F6\u95F4"), moment(editVirtualEventData.insertTime).format('YYYY-MM-DD HH:mm:ss')), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u66F4\u65B0\u65F6\u95F4"), moment(editVirtualEventData.updateTime).format('YYYY-MM-DD HH:mm:ss'))), /*#__PURE__*/React.createElement(Form, {
     name: "basic",
     labelCol: {
       span: 2
@@ -132,7 +172,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       span: 16
     },
     initialValues: _objectSpread(_objectSpread({}, editVirtualEventData), {}, {
-      desc: editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.description
+      desc: editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.description,
+      eventGroupId: (editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId) === null || (editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId) === undefined ? -1 : editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId
     }),
     onFinish: onFinish,
     onValuesChange: onValuesChange,
@@ -148,25 +189,29 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       message: '仅能输入英文、符号、数字'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    maxLength: 50
+    maxLength: 20,
+    disabled: virtualDrawerType === 'edit'
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u522B\u540D",
     name: "aliasName",
     rules: [{
       required: true,
-      message: '请输入虚拟事件名称'
+      message: '请输入虚拟事件别名'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    maxLength: 50
+    maxLength: 20
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u7EC4",
     name: "eventGroupId"
   }, /*#__PURE__*/React.createElement(Select, {
     defaultValue: -1,
-    options: groupOptions
+    options: groupOptions.filter(function (item) {
+      return item.value !== -999;
+    })
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5907\u6CE8",
-    name: "desc"
+    name: "desc",
+    className: "".concat(classPrefix, "-desc")
   }, /*#__PURE__*/React.createElement(TextArea, {
     rows: 4,
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8",
@@ -189,7 +234,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       }), /*#__PURE__*/React.createElement(EventFilter, {
         remove: remove,
         index: _index,
-        virtualDrawerType: virtualDrawerType
+        virtualDrawerType: virtualDrawerType,
+        selectList: selectList
       }));
     }), fields.length < 10 && virtualDrawerType !== 'see' && /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-add")
@@ -207,7 +253,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   }))), virtualDrawerType !== 'see' && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-formSubmit")
   }, /*#__PURE__*/React.createElement(Button, {
-    type: "default"
+    type: "default",
+    onClick: onClose
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit",

package/es/modules/dataCollection/components/eventFilter/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Tooltip } from 'antd';
+import { Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, BizAttrConditionGroup, IconFont } from '@zgfe/business-lib';
 import './styles/index.less';
@@ -18,7 +18,8 @@ var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
   var remove = props.remove,
     index = props.index,
-    virtualDrawerType = props.virtualDrawerType;
+    virtualDrawerType = props.virtualDrawerType,
+    selectList = props.selectList;
   // 筛选条件个数
   var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -56,6 +57,11 @@ var EventFilter = function EventFilter(props) {
   var onAdd = function onAdd() {
     // 最多可添加5条属性筛选
     if (count >= 5) {
+      message.error('最多可添加5条属性筛选');
+      return;
+    }
+    if (selectList.length <= 0) {
+      message.error('请选择事件');
       return;
     }
     setIsAdd(true);
@@ -103,6 +109,7 @@ var EventFilter = function EventFilter(props) {
     popupContainer: false,
     defaultSelectAble: false,
     disableVirtualEventShow: true,
+    selectList: selectList,
     value: event && event.eventId ? {
       event: {
         id: event.eventId,
@@ -115,7 +122,7 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 ? 'disable' : ''),
+    className: "".concat(count < 5 && selectList.length > 0 ? '' : 'disable'),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
@@ -127,6 +134,8 @@ var EventFilter = function EventFilter(props) {
     value: filter,
     onlyAnd: true,
     enableEventProp: true,
+    enableUserProp: false,
+    enableEnvProp: false,
     enableDelete: true,
     eventIdList: (event === null || event === void 0 ? void 0 : event.eventId) ? [event === null || event === void 0 ? void 0 : event.eventId] : [],
     onChange: onChangeFilters,

package/es/modules/dataCollection/components/eventFilter/types.d.ts

@@ -48,4 +48,5 @@ export interface EventFilterProps {
     remove: (index: number | number[]) => void;
     index: number;
     virtualDrawerType: string;
+    selectList: [];
 }

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

@@ -10,19 +10,20 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
+import { BizGlobalDataContext, IconFont, BizLoading } from '@zgfe/business-lib';
 import { Input, Modal, message, Drawer, Popover, Checkbox, Select, Button } from 'antd';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
-import { eventListHandle, groupListSort, eventCheckedAll, openChangeData, groupDeleteData, eventShowOrHiddenData, eventMoveData, getAppID } from '../../../utils/index';
+import { eventListHandle, groupListSort, eventCheckedAll, openChangeData, eventShowOrHiddenData, eventMoveData, getAppID } from '../../../utils/index';
 import React, { Fragment, useContext, useEffect, useState } from 'react';
 import _ from 'lodash';
 import SortableComponnet from './sortableComponnet';
 var EventGroupingDrawer = function EventGroupingDrawer(props) {
   var classPrefix = 'event-grouping-drawer';
   var eventGroupingShow = props.eventGroupingShow,
-    setEventGroupingShow = props.setEventGroupingShow;
+    setEventGroupingShow = props.setEventGroupingShow,
+    refresh = props.refresh;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useState = useState([]),
@@ -33,7 +34,12 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isDragDisabled = _useState4[0],
     setIsDragDisabled = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
   var queryList = function queryList() {
+    setLoading(true);
     request(apis.queryCollectionEventList, {
       method: 'post',
       data: {
@@ -46,6 +52,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         eventListHandle(res.data);
         setGroupingData(res.data);
       }
+      setLoading(false);
     });
   };
   useEffect(function () {
@@ -69,6 +76,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           appId: getAppID(currentApp),
           ids: ids
         }
+      }).then(function () {
+        refresh();
       });
     }
     setIsDragDisabled(false);
@@ -96,7 +105,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         }).then(function (res) {
           if (res) {
             message.success('删除成功');
-            groupDeleteData(groupId, groupingData, setGroupingData);
+            queryList();
+            refresh();
           }
         });
       }
@@ -113,30 +123,32 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           hidden: type,
           ids: ids
         }
+      }).then(function () {
+        refresh();
       });
     }
   };
   // 移动
-  var _useState5 = useState(undefined),
-    _useState6 = _slicedToArray(_useState5, 2),
-    eventMoveShow = _useState6[0],
-    setEventMoveShow = _useState6[1];
-  var _useState7 = useState(-1),
+  var _useState7 = useState(undefined),
     _useState8 = _slicedToArray(_useState7, 2),
-    eventMoveChangeId = _useState8[0],
-    setEventMoveChangeId = _useState8[1];
-  var _useState9 = useState([]),
+    eventMoveShow = _useState8[0],
+    setEventMoveShow = _useState8[1];
+  var _useState9 = useState(-1),
     _useState10 = _slicedToArray(_useState9, 2),
-    eventMoveOption = _useState10[0],
-    setEventMoveOption = _useState10[1];
-  var _useState11 = useState(0),
+    eventMoveChangeId = _useState10[0],
+    setEventMoveChangeId = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    eventMoveLength = _useState12[0],
-    setEventMoveLength = _useState12[1];
-  var _useState13 = useState(''),
+    eventMoveOption = _useState12[0],
+    setEventMoveOption = _useState12[1];
+  var _useState13 = useState(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventMoveIds = _useState14[0],
-    setEventMoveIds = _useState14[1];
+    eventMoveLength = _useState14[0],
+    setEventMoveLength = _useState14[1];
+  var _useState15 = useState(''),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventMoveIds = _useState16[0],
+    setEventMoveIds = _useState16[1];
   var eventMove = function eventMove(groupId) {
     var data = eventMoveData(groupId, groupingData, setGroupingData);
     setEventMoveOption(data.groupingOption);
@@ -163,6 +175,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }).then(function (res) {
       if (res.code == '00') {
         queryList();
+        refresh();
       }
     }).finally(function () {
       setEventMoveShow(undefined);
@@ -193,18 +206,18 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }, "\u786E\u5B9A")));
   };
   // 创建分组 & 修改分组名
-  var _useState15 = useState(null),
-    _useState16 = _slicedToArray(_useState15, 2),
-    createOrEditGrpup = _useState16[0],
-    setCreateOrEditGrpup = _useState16[1];
-  var _useState17 = useState(-1),
+  var _useState17 = useState(null),
     _useState18 = _slicedToArray(_useState17, 2),
-    grpupModalSelectGrpupId = _useState18[0],
-    setGrpupModalSelectGrpupId = _useState18[1];
-  var _useState19 = useState(''),
+    createOrEditGrpup = _useState18[0],
+    setCreateOrEditGrpup = _useState18[1];
+  var _useState19 = useState(-1),
     _useState20 = _slicedToArray(_useState19, 2),
-    grpupNameInput = _useState20[0],
-    setGrpupNameInput = _useState20[1];
+    grpupModalSelectGrpupId = _useState20[0],
+    setGrpupModalSelectGrpupId = _useState20[1];
+  var _useState21 = useState(''),
+    _useState22 = _slicedToArray(_useState21, 2),
+    grpupNameInput = _useState22[0],
+    setGrpupNameInput = _useState22[1];
   var GrpupModalHandle = function GrpupModalHandle() {
     if (grpupNameInput === '') {
       message.error('请填写分组名');
@@ -227,8 +240,9 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         message.error('事件组名称已存在');
       }
       if ((res === null || res === void 0 ? void 0 : res.code) == '00') {
-        message.success("".concat(createOrEditGrpup === 'create' ? '创建' : '编辑', "'\u6210\u529F'"));
+        message.success("".concat(createOrEditGrpup === 'create' ? '创建' : '编辑', "\u6210\u529F"));
         queryList();
+        refresh();
         GrpupModalClose();
       }
     });
@@ -240,7 +254,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
-    width: '60%',
+    width: 700,
     title: /*#__PURE__*/React.createElement("div", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406", /*#__PURE__*/React.createElement("span", null, "\u7EDF\u4E00\u7BA1\u7406\u57CB\u70B9\u4E8B\u4EF6\u548C\u865A\u62DF\u4E8B\u4EF6\u4E1A\u52A1\u5206\u7EC4\uFF0C\u652F\u6301\u5BF9\u4E8B\u4EF6\u8C03\u6574\u6392\u5E8F\u548C\u9690\u85CF")),
     placement: "right",
     onClose: function onClose() {
@@ -262,6 +276,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         setEventMoveShow(undefined);
       }
     }))
+  }, /*#__PURE__*/React.createElement(BizLoading, {
+    spinning: loading
   }, /*#__PURE__*/React.createElement(DragDropContext, {
     onDragEnd: onDragEnd
   }, groupingData.map(function (item, index) {
@@ -301,7 +317,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           onClick: function onClick() {
             return openChange(item.groupId);
           }
-        }), /*#__PURE__*/React.createElement("div", null, item.groupName ? item.groupName : '未分组'), /*#__PURE__*/React.createElement(IconFont, {
+        }), /*#__PURE__*/React.createElement("div", null, item.groupName ? item.groupName : '未分组'), item.groupName && /*#__PURE__*/React.createElement(IconFont, {
           type: "zhongmingming",
           onClick: function onClick() {
             setCreateOrEditGrpup('edit');
@@ -322,8 +338,11 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           title: null,
           content: moveContent
         }, /*#__PURE__*/React.createElement("span", {
+          className: "".concat(groupingData.length > 1 ? '' : 'not-operable'),
           onClick: function onClick() {
-            return eventMove(item.groupId);
+            if (groupingData.length > 1) {
+              eventMove(item.groupId);
+            }
           }
         }, "\u79FB\u52A8")), /*#__PURE__*/React.createElement("span", {
           onClick: function onClick() {
@@ -333,7 +352,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           onClick: function onClick() {
             return eventShowOrHidden(1, item.groupId);
           }
-        }, "\u9690\u85CF")), /*#__PURE__*/React.createElement("span", {
+        }, "\u9690\u85CF")), item.groupName && /*#__PURE__*/React.createElement("span", {
           onClick: function onClick() {
             return groupDelete(item.groupId);
           }
@@ -346,11 +365,12 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           componnetIndex: index,
           groupId: item.groupId,
           groupingData: groupingData,
-          setGroupingData: setGroupingData
+          setGroupingData: setGroupingData,
+          refresh: refresh
         }))));
       }));
     });
-  }))), /*#__PURE__*/React.createElement(Modal, {
+  })))), /*#__PURE__*/React.createElement(Modal, {
     wrapClassName: "create-or-edit-grpup-modal",
     title: "".concat(createOrEditGrpup === 'create' ? '创建分组' : '修改分组名'),
     bodyStyle: {
@@ -365,7 +385,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     onCancel: GrpupModalClose
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
-    value: grpupNameInput,
+    defaultValue: grpupNameInput,
     maxLength: 20,
     onChange: function onChange(e) {
       return setGrpupNameInput(e.currentTarget.value);

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

@@ -125,7 +125,7 @@ var SelectAttributes = function SelectAttributes(props) {
   }, [searchValue]);
   // 渲染属性列表
   var selectAttributesRender = function selectAttributesRender() {
-    return selectAttributesData.map(function (item, index) {
+    return selectAttributesData.map(function (item) {
       if (item.id === selectEventId) {
         return item.attrList.map(function (_item) {
           return attrShowList.indexOf(_item.label) !== -1 ? /*#__PURE__*/React.createElement("div", {
@@ -145,8 +145,11 @@ var SelectAttributes = function SelectAttributes(props) {
     title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       type: "tishi1"
     }), "\u63D0\u793A", /*#__PURE__*/React.createElement(IconFont, {
-      type: "qingchu"
+      type: "qingchu",
+      onClick: handleCancel
     })),
+    wrapClassName: "".concat(classPrefix, "-modal-box"),
+    closeIcon: null,
     open: selectAttributesShow,
     onOk: handleOk,
     onCancel: handleCancel

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

@@ -1,5 +1,5 @@
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { Checkbox } from 'antd';
+import { Checkbox, Tooltip } from 'antd';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import React, { useContext } from 'react';
@@ -15,34 +15,47 @@ var SortableComponnet = function SortableComponnet(props) {
     componnetIndex = props.componnetIndex,
     groupId = props.groupId,
     groupingData = props.groupingData,
-    setGroupingData = props.setGroupingData;
+    setGroupingData = props.setGroupingData,
+    refresh = props.refresh;
   // 需要拖动的元素的容器
   var SortableItem = SortableElement(function (data) {
     var _data$value = data.value,
       item = _data$value.item,
       index = _data$value.index;
-    return /*#__PURE__*/React.createElement(Checkbox, {
+    var name = item.alias_name ? item.alias_name : item.event_name;
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
+      key: index
+    }, /*#__PURE__*/React.createElement(Checkbox, {
       className: "checkbox-item ".concat(item.event_hidden ? 'event-hidden' : '', " column-").concat(groupId),
       checked: item.checked,
       key: index,
       onChange: function onChange() {
         return onChangeItem(groupId, item.event_id);
       }
-    }, item.alias_name ? item.alias_name : item.event_name);
+    }, name));
   });
   // 不可拖动的元素（未分组数据）
   var SortableItemNotDrag = function SortableItemNotDrag(data) {
     var item = data.item,
       index = data.index;
-    return /*#__PURE__*/React.createElement(Checkbox, {
+    var name = item.alias_name ? item.alias_name : item.event_name;
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
+      key: index
+    }, /*#__PURE__*/React.createElement(Checkbox, {
       className: "checkbox-item ".concat(item.event_hidden ? 'event-hidden' : '', " column-").concat(groupId),
       checked: item.checked,
       key: index,
       onChange: function onChange() {
         return onChangeItem(groupId, item.event_id);
       }
-    }, item.alias_name ? item.alias_name : item.event_name);
+    }, name));
   };
+  // const onScroll = (e: React.UIEvent<HTMLElement, UIEvent>) => {
+  //   if (e.currentTarget.scrollHeight - e.currentTarget.scrollTop === 400) {
+  //   }
+  // };
   // 整个元素排序的容器
   var SortableList = SortableContainer(function () {
     return /*#__PURE__*/React.createElement("div", {
@@ -89,7 +102,9 @@ var SortableComponnet = function SortableComponnet(props) {
         groupId: groupId,
         ids: ids.join(',')
       }
-    }).then(function () {});
+    }).then(function () {
+      refresh();
+    });
   };
   return /*#__PURE__*/React.createElement(SortableList, {
     distance: 5,

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

@@ -154,7 +154,7 @@ var TablePlus = function TablePlus(props) {
         }).then(function (res) {
           // 该事件在虚拟事件中有使用
           if (res.data === 1) {
-            eventDelModal(record.event_id, '检测到该事件在虚拟事件中使用');
+            eventDelModal(record.event_id, '检测到该事件在虚拟事件中使用, 删除后，将停止采集该事件数据，也将不在分析平台中显示！');
           } else {
             eventDelModal(record.event_id, '删除后，将停止采集该事件数据，也将不在分析平台中显示！');
           }
@@ -411,7 +411,9 @@ var TablePlus = function TablePlus(props) {
         }, record.alias_name),
         trigger: "hover",
         placement: "top"
-      }, /*#__PURE__*/React.createElement("div", null, record.alias_name)), /*#__PURE__*/React.createElement(IconFont, {
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'alias_name_text'
+      }, record.alias_name)), /*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
           setAliasNameInput(record.alias_name);

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

@@ -192,7 +192,9 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
     key: 'aliasName',
     width: 167,
     render: function render(_, record) {
-      return /*#__PURE__*/React.createElement(Popover, {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "alias_name"
+      }, /*#__PURE__*/React.createElement(Popover, {
         content: /*#__PURE__*/React.createElement("div", {
           style: {
             width: '200px',
@@ -201,7 +203,9 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
         }, record.aliasName),
         trigger: "hover",
         placement: "top"
-      }, /*#__PURE__*/React.createElement("div", null, record.aliasName));
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'alias_name_text'
+      }, record.aliasName)));
     }
   }, {
     title: '首次上报时间',
@@ -209,7 +213,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
     key: 'insertTime',
     width: 187,
     render: function render(text) {
-      return /*#__PURE__*/React.createElement("div", null, moment(text).format('YYYY-MM-DD HH:mm:ss'));
+      return /*#__PURE__*/React.createElement("div", null, text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '');
     }
   }, {
     title: '末次上报时间',
@@ -217,18 +221,54 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
     key: 'lastInsertTime',
     width: 187,
     render: function render(text) {
-      return /*#__PURE__*/React.createElement("div", null, moment(text).format('YYYY-MM-DD HH:mm:ss'));
+      return /*#__PURE__*/React.createElement("div", null, text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '');
+    }
+  }, {
+    title: '显示状态',
+    dataIndex: 'hidden',
+    key: 'hidden',
+    width: 187,
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", null, text === 0 ? '显示' : '隐藏');
     }
   }, {
     title: '描述',
     dataIndex: 'description',
     key: 'description',
-    width: 187
+    width: 187,
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Popover, {
+        content: /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '200px',
+            wordBreak: 'break-all'
+          }
+        }, text),
+        trigger: "hover",
+        placement: "top"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'description'
+      }, text)));
+    }
   }, {
     title: '包含埋点事件',
     dataIndex: 'bindEvent',
     key: 'bindEvent',
-    width: 187
+    width: 187,
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Popover, {
+        content: /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '200px',
+            wordBreak: 'break-all'
+          }
+        }, text),
+        trigger: "hover",
+        placement: "top"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'bind-event'
+      }, text)));
+    }
   }, {
     title: '创建人',
     dataIndex: 'createUser',

package/es/modules/dataCollection/index.js

@@ -19,7 +19,7 @@ var DataCollection = function DataCollection(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     authority = _useContext.authority;
-  var _useState = useState(3),
+  var _useState = useState(1),
     _useState2 = _slicedToArray(_useState, 2),
     listTab = _useState2[0],
     setListTab = _useState2[1];
@@ -72,7 +72,7 @@ var DataCollection = function DataCollection(props) {
     }
   }, authority[100020] && /*#__PURE__*/React.createElement(Radio.Button, {
     value: 1
-  }, "\u57CB\u70B9\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Radio.Button, {
+  }, "\u5143\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Radio.Button, {
     value: 3
   }, "\u865A\u62DF\u4E8B\u4EF6"), authority[100021] && /*#__PURE__*/React.createElement(Radio.Button, {
     value: 2

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

@@ -15,7 +15,7 @@
   }
   .creact-group {
     .ant-modal-body {
-      padding: 3px 20px 20px 20px;
+      padding: 3px 20px 20px 20px !important;
     }
   }
 }
@@ -115,10 +115,6 @@
         word-break: break-all;
         background: red;
       }
-      .alias_name {
-        border: none;
-        cursor: pointer;
-      }
       .ant-input:focus,
       .ant-input-focused {
         background-color: #fff !important;
@@ -260,6 +256,16 @@
       }
       .alias_name {
         display: flex;
+        border: none;
+        cursor: pointer;
+        .alias_name_text {
+          display: -webkit-box;
+          max-width: 167px;
+          overflow: hidden;
+          cursor: pointer;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+        }
         .edit-alias-name {
           display: none;
           margin-left: 10px;
@@ -269,6 +275,15 @@
           color: @primary-color;
         }
       }
+      .bind-event,
+      .description {
+        display: -webkit-box;
+        max-width: 180px;
+        overflow: hidden;
+        cursor: pointer;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+      }
       .ant-table-row:hover {
         .collect-icon {
           opacity: 1;
@@ -376,6 +391,26 @@
 }
 
 .create-virtual-drawer {
+  #basic {
+    padding-bottom: 100px;
+    .ant-input {
+      border: none;
+    }
+  }
+  &-desc {
+    .ant-form-item-control {
+      max-width: 100%;
+    }
+  }
+  &-add {
+    color: #165dff;
+    &-icon {
+      margin-right: 8px;
+      font-weight: 900;
+      font-size: 18px !important;
+      vertical-align: -2px;
+    }
+  }
   &-see-box {
     > div {
       display: flex;
@@ -384,6 +419,7 @@
       color: #021429;
       span {
         width: 84px;
+        min-width: 84px;
         color: #5f6085;
         text-align: right;
       }
@@ -402,6 +438,15 @@
     > :nth-child(2) {
       margin-top: 8px;
     }
+    > :nth-child(1)::before {
+      display: inline-block;
+      margin-right: 4px;
+      color: #ff4d4f;
+      font-size: 14px;
+      font-family: SimSun, sans-serif;
+      line-height: 1;
+      content: '*';
+    }
   }
   &-eventDataBox.see {
     > :nth-child(1) {
@@ -424,10 +469,15 @@
   }
   &-formSubmit {
     position: absolute;
-    right: 24px;
-    bottom: 24px;
+    background: #fff;
+    width: 100%;
+    border-top: 1px solid #F2F3F4;
+    right: 0;
+    bottom: 0;
+    padding: 24px;
     display: flex;
-    gap: 8px;
+    gap: 16px;
+    justify-content: end;
   }
 }
 
@@ -482,23 +532,39 @@
       > div {
         display: flex;
         flex-wrap: wrap;
+        gap: 12px;
         justify-content: flex-start;
         width: 100%;
         .checkbox-item {
-          width: 25%;
+          display: flex;
+          flex-shrink: 0;
+          align-items: center;
+          width: calc(25% - 9px);
+          height: 40px;
+          margin: 0;
+          padding: 9px 0 9px 16px;
+          background: #fafafb;
+          .ant-checkbox {
+            margin-top: -6px;
+          }
+          .ant-checkbox + span {
+            display: -webkit-box;
+            max-width: 100%;
+            overflow: hidden;
+            cursor: pointer;
+            user-select: none;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+          }
         }
-        // width: 25%;
-        // .ant-checkbox {
-        //   top: 0em;
-        // }
-      }
-      .checkbox-item {
-        display: flex;
-        flex-shrink: 0;
-        align-items: center;
-        height: 40px;
-        margin: 0;
       }
+      // .checkbox-item {
+      //   display: flex;
+      //   flex-shrink: 0;
+      //   align-items: center;
+      //   height: 40px;
+      //   margin: 0;
+      // }
       .event-hidden {
         color: #ccd0d4;
       }
@@ -542,13 +608,13 @@
     }
   }
   .ant-modal-confirm-title {
-    display: inline;
-    color: #021429;
+    display: inline !important;
+    color: #021429 !important;
     font-weight: 500;
-    font-size: 24px;
+    font-size: 24px !important;
   }
   .ant-modal-confirm-content {
-    margin-top: 20px;
+    margin-top: 20px !important;
   }
 }
 
@@ -579,68 +645,84 @@
 }
 
 .select-attributes {
-  &-select {
-    .ant-select-dropdown {
-      display: none !important;
-    }
-  }
-}
-
-.select-attributes-box {
-  display: flex;
-  width: 616px;
-  height: 380px;
-  background: #fff;
-  border-radius: 10px;
-  box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-  &-left {
+  &-box {
     display: flex;
-    flex-direction: column;
-    width: 205px;
+    width: 616px;
     height: 380px;
-    padding: 8px;
-    overflow-y: auto;
+    background: #fff;
+    border-radius: 10px;
     box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-    > div {
-      display: flex;
-      justify-content: space-between;
-      padding: 6px 12px;
-    }
-    .active {
-      color: #fff;
-      background: #165dff;
-      border-radius: 4px;
-      > :nth-child(2) {
-        padding: 0px 4px;
-        border: 1px solid #fff;
-        border-radius: 10px;
-      }
-    }
-  }
-  &-right {
-    width: 100%;
-    height: 380px;
-    padding: 8px;
-    > :nth-child(2) {
+    &-left {
       display: flex;
       flex-direction: column;
-      gap: 8px;
-      align-items: flex-start;
-      width: 100%;
-      height: 320px;
-      margin-top: 8px;
+      width: 205px;
+      height: 380px;
+      padding: 8px;
       overflow-y: auto;
+      box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
       > div {
         display: flex;
-        flex-shrink: 0;
-        gap: 10px;
-        align-items: center;
-        align-self: stretch;
-        height: 32px;
-        padding: 0px 16px;
+        justify-content: space-between;
+        padding: 6px 12px;
       }
       .active {
-        background: #e8efff;
+        color: #fff;
+        background: #165dff;
+        border-radius: 4px;
+        > :nth-child(2) {
+          padding: 0px 4px;
+          border: 1px solid #fff;
+          border-radius: 10px;
+        }
+      }
+    }
+    &-right {
+      width: 100%;
+      height: 380px;
+      padding: 8px;
+      > :nth-child(2) {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        align-items: flex-start;
+        width: 100%;
+        height: 320px;
+        margin-top: 8px;
+        overflow-y: auto;
+        > div {
+          display: flex;
+          flex-shrink: 0;
+          gap: 10px;
+          align-items: center;
+          align-self: stretch;
+          height: 32px;
+          padding: 0px 16px;
+        }
+        .active {
+          background: #e8efff;
+        }
+      }
+    }
+  }
+  &-select {
+    .ant-select-dropdown {
+      display: none !important;
+    }
+  }
+  &-modal-box {
+    .ant-modal-close-x {
+      display: none;
+    }
+    .ant-modal-title {
+      position: relative;
+      .tishi1 {
+        margin-right: 8px;
+        color: #fd9f41;
+      }
+      .qingchu {
+        position: absolute;
+        top: 0;
+        right: 0;
       }
     }
   }
@@ -649,3 +731,9 @@
 .sortable-componnet-sortableList {
   z-index: 9999;
 }
+
+.not-operable {
+  color: #ccd0d4;
+  cursor: not-allowed !important;
+  user-select: none;
+}

package/es/modules/dataCollection/types.d.ts

@@ -22,6 +22,7 @@ export interface eventJsonProps {
 }
 export interface VirtualEventProps extends VirtualEventBase {
     eventGroupId: number;
+    groupId?: number;
     eventJson: eventJsonProps[];
     id: number;
 }
@@ -72,4 +73,5 @@ export interface SubmitDataProps {
 export interface EventGroupingDrawerProps {
     eventGroupingShow: boolean;
     setEventGroupingShow: Function;
+    refresh: Function;
 }

package/es/modules/dataCollection/virtualEventList.js

@@ -120,10 +120,12 @@ var VirtualEventList = function VirtualEventList() {
   };
   // 筛选事件
   var eventNameChange = function eventNameChange(e) {
+    setPageNumber(1);
     setEventNameChangeData(e.currentTarget.value);
   };
   // 筛选收藏
   var markTypeFilter = function markTypeFilter(markActive) {
+    setPageNumber(1);
     setMarkTypeData(markActive ? 1 : 0);
   };
   // 获取虚拟事件列表
@@ -218,10 +220,6 @@ var VirtualEventList = function VirtualEventList() {
       message.error('请输入分组名称');
       return;
     }
-    if (eventNameInput.length > 20) {
-      message.error('名称不可超过20字符');
-      return;
-    }
     request(apis.upsertEventGroup, {
       method: 'post',
       data: {
@@ -298,8 +296,9 @@ var VirtualEventList = function VirtualEventList() {
       textAlign: 'right'
     },
     showQuickJumper: true,
-    showSizeChanger: total > 10,
+    showSizeChanger: total > pageSize,
     defaultCurrent: 1,
+    defaultPageSize: pageSize,
     current: pageNumber,
     total: total,
     onChange: onPaginationChange
@@ -312,7 +311,8 @@ var VirtualEventList = function VirtualEventList() {
     refresh: queryList
   }), /*#__PURE__*/React.createElement(EventGroupingDrawer, {
     eventGroupingShow: eventGroupingShow,
-    setEventGroupingShow: setEventGroupingShow
+    setEventGroupingShow: setEventGroupingShow,
+    refresh: queryList
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
     className: "creact-group",
@@ -327,6 +327,7 @@ var VirtualEventList = function VirtualEventList() {
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
     value: eventNameInput,
+    maxLength: 20,
     onChange: function onChange(e) {
       return setEventNameInput(e.currentTarget.value);
     }

package/es/utils/index.d.ts

@@ -1,3 +1,7 @@
+/**
+ * 虚拟事件编辑 判断内容是否有改动；有改动返回true
+ */
+export declare const getVirtualContentChange: (oldData: any, newData: any) => boolean;
 /**
  * 虚拟事件属性超过100个，选择属性后的回调，处理提交数据
  */
@@ -22,10 +26,6 @@ export declare const eventMoveData: (groupId: number, groupingData: any, setGrou
  * 指标分组管理：显示或隐藏
  */
 export declare const eventShowOrHiddenData: (type: number, groupId: number, groupingData: any, setGroupingData: Function) => any;
-/**
- * 指标分组管理：删除分组
- */
-export declare const groupDeleteData: (groupId: number, groupingData: any, setGroupingData: Function) => void;
 /**
  * 指标分组管理：分组展开与关闭
  */
@@ -47,6 +47,7 @@ export declare const groupListSort: (result: any, groupingData: any, setGrouping
  */
 export declare const eventListHandle: (data: any) => void;
 export declare const getAppID: (currentApp: any) => any;
+export declare const nullToEmptyString: (data: any) => any;
 /**
  * 获取第一个表格的可视化高度
  * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)

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);
-};
 /**
  * 指标分组管理：分组展开与关闭
  */
@@ -239,9 +245,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 +269,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.20",
   "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": "23102225c99fa4b4dbd948072bf3d943f2395d4a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }