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

package/es/components/demo.js

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

package/es/constants/api.js

@@ -67,7 +67,7 @@ var apis = {
   orderEvent: '/zg/web/v2/event/orderEvent',
   // 新增批量隐藏事件.
   hiddenEvent: '/zg/web/v2/event/hiddenEvent',
-  // 删除埋点事件返回是否在虚拟事件中使用.
+  // 元事件是否在虚拟事件中使用
   checkEventStatus: '/zg/web/v2/event/checkEventStatus',
   // 收藏虚拟事件.
   updateVirtualEventStatus: '/zg/web/v2/event/virtual/updateVirtualEventStatus'

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: {
@@ -369,7 +365,7 @@ var CollectionEventList = function CollectionEventList(props) {
   }), /*#__PURE__*/React.createElement(Input, {
     className: "top-input",
     onChange: eventNameChange,
-    placeholder: "\u641C\u7D22\u4E8B\u4EF6\u540D\u79F0",
+    placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0\u6216\u522B\u540D",
     prefix: /*#__PURE__*/React.createElement(IconFont, {
       type: "sousuo"
     })
@@ -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,30 +10,44 @@ 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, eventShow } 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([]),
     _useState2 = _slicedToArray(_useState, 2),
     groupingData = _useState2[0],
     setGroupingData = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    isDragDisabled = _useState4[0],
-    setIsDragDisabled = _useState4[1];
+    groupingDataOriginal = _useState4[0],
+    setGroupingDataOriginal = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isDragDisabled = _useState6[0],
+    setIsDragDisabled = _useState6[1];
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    searchData = _useState8[0],
+    setSearchData = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
   var queryList = function queryList() {
+    setLoading(true);
     request(apis.queryCollectionEventList, {
       method: 'post',
       data: {
@@ -44,13 +58,20 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }).then(function (res) {
       if (res && res.data) {
         eventListHandle(res.data);
-        setGroupingData(res.data);
+        setGroupingDataOriginal(res.data);
+        setGroupingData(eventShow(_.cloneDeep(res.data), searchData));
       }
+      setLoading(false);
     });
   };
   useEffect(function () {
     if (eventGroupingShow) queryList();
   }, [eventGroupingShow]);
+  var onSearchChange = function onSearchChange(e) {
+    var _value = e.currentTarget.value;
+    setSearchData(_value);
+    setGroupingData(eventShow(_.cloneDeep(groupingDataOriginal), _value));
+  };
   var onChangeAll = function onChangeAll(groupId) {
     setGroupingData(_.cloneDeep(eventCheckedAll(groupId, groupingData)));
   };
@@ -69,6 +90,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           appId: getAppID(currentApp),
           ids: ids
         }
+      }).then(function () {
+        refresh();
       });
     }
     setIsDragDisabled(false);
@@ -96,7 +119,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         }).then(function (res) {
           if (res) {
             message.success('删除成功');
-            groupDeleteData(groupId, groupingData, setGroupingData);
+            queryList();
+            refresh();
           }
         });
       }
@@ -113,30 +137,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),
-    _useState8 = _slicedToArray(_useState7, 2),
-    eventMoveChangeId = _useState8[0],
-    setEventMoveChangeId = _useState8[1];
-  var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    eventMoveOption = _useState10[0],
-    setEventMoveOption = _useState10[1];
-  var _useState11 = useState(0),
+  var _useState11 = useState(undefined),
     _useState12 = _slicedToArray(_useState11, 2),
-    eventMoveLength = _useState12[0],
-    setEventMoveLength = _useState12[1];
-  var _useState13 = useState(''),
+    eventMoveShow = _useState12[0],
+    setEventMoveShow = _useState12[1];
+  var _useState13 = useState(-1),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventMoveIds = _useState14[0],
-    setEventMoveIds = _useState14[1];
+    eventMoveChangeId = _useState14[0],
+    setEventMoveChangeId = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventMoveOption = _useState16[0],
+    setEventMoveOption = _useState16[1];
+  var _useState17 = useState(0),
+    _useState18 = _slicedToArray(_useState17, 2),
+    eventMoveLength = _useState18[0],
+    setEventMoveLength = _useState18[1];
+  var _useState19 = useState(''),
+    _useState20 = _slicedToArray(_useState19, 2),
+    eventMoveIds = _useState20[0],
+    setEventMoveIds = _useState20[1];
   var eventMove = function eventMove(groupId) {
     var data = eventMoveData(groupId, groupingData, setGroupingData);
     setEventMoveOption(data.groupingOption);
@@ -163,6 +189,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }).then(function (res) {
       if (res.code == '00') {
         queryList();
+        refresh();
       }
     }).finally(function () {
       setEventMoveShow(undefined);
@@ -193,18 +220,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),
-    _useState18 = _slicedToArray(_useState17, 2),
-    grpupModalSelectGrpupId = _useState18[0],
-    setGrpupModalSelectGrpupId = _useState18[1];
-  var _useState19 = useState(''),
-    _useState20 = _slicedToArray(_useState19, 2),
-    grpupNameInput = _useState20[0],
-    setGrpupNameInput = _useState20[1];
+  var _useState21 = useState(null),
+    _useState22 = _slicedToArray(_useState21, 2),
+    createOrEditGrpup = _useState22[0],
+    setCreateOrEditGrpup = _useState22[1];
+  var _useState23 = useState(-1),
+    _useState24 = _slicedToArray(_useState23, 2),
+    grpupModalSelectGrpupId = _useState24[0],
+    setGrpupModalSelectGrpupId = _useState24[1];
+  var _useState25 = useState(''),
+    _useState26 = _slicedToArray(_useState25, 2),
+    grpupNameInput = _useState26[0],
+    setGrpupNameInput = _useState26[1];
   var GrpupModalHandle = function GrpupModalHandle() {
     if (grpupNameInput === '') {
       message.error('请填写分组名');
@@ -227,8 +254,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 +268,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() {
@@ -249,20 +277,27 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     },
     destroyOnClose: true,
     open: eventGroupingShow,
-    extra: /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Button, {
-      type: "primary",
-      size: "small",
-      onClick: function onClick() {
-        setCreateOrEditGrpup('create');
-      }
-    }, "\u521B\u5EFA\u5206\u7EC4"), /*#__PURE__*/React.createElement(IconFont, {
+    extra: /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu",
       onClick: function onClick() {
         setEventGroupingShow(false);
         setEventMoveShow(undefined);
       }
-    }))
-  }, /*#__PURE__*/React.createElement(DragDropContext, {
+    })
+  }, /*#__PURE__*/React.createElement(BizLoading, {
+    spinning: loading
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-box")
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0\u6216\u522B\u540D",
+    onChange: onSearchChange
+  }), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    size: "small",
+    onClick: function onClick() {
+      setCreateOrEditGrpup('create');
+    }
+  }, "\u521B\u5EFA\u5206\u7EC4")), /*#__PURE__*/React.createElement(DragDropContext, {
     onDragEnd: onDragEnd
   }, groupingData.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Droppable, {
@@ -301,7 +336,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 +357,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 +371,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 +384,13 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           componnetIndex: index,
           groupId: item.groupId,
           groupingData: groupingData,
-          setGroupingData: setGroupingData
+          setGroupingData: setGroupingData,
+          refresh: refresh,
+          searchData: searchData
         }))));
       }));
     });
-  }))), /*#__PURE__*/React.createElement(Modal, {
+  })))), /*#__PURE__*/React.createElement(Modal, {
     wrapClassName: "create-or-edit-grpup-modal",
     title: "".concat(createOrEditGrpup === 'create' ? '创建分组' : '修改分组名'),
     bodyStyle: {
@@ -365,7 +405,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