@zgfe/modules-dm 1.0.34-heyh.10 → 1.0.34-heyh.13

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: {
@@ -444,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

@@ -48,7 +48,16 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     submitData = _useState8[0],
     setSubmitData = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    selectList = _useState10[0],
+    setSelectList = _useState10[1];
   var onValuesChange = function onValuesChange(data, allData) {
+    var _selectList = [];
+    allData.eventJson.map(function (item) {
+      if (item === null || item === void 0 ? void 0 : item.eventId) _selectList.push(item.eventId);
+    });
+    setSelectList(_selectList);
     setFormSubmit(eventJsonHandle(allData));
   };
   // 保存
@@ -159,7 +168,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     name: "aliasName",
     rules: [{
       required: true,
-      message: '请输入虚拟事件名称'
+      message: '请输入虚拟事件别名'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     maxLength: 20
@@ -194,7 +203,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")

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,7 @@ var EventFilter = function EventFilter(props) {
   var onAdd = function onAdd() {
     // 最多可添加5条属性筛选
     if (count >= 5) {
+      message.error('最多可添加5条属性筛选');
       return;
     }
     setIsAdd(true);
@@ -103,6 +105,7 @@ var EventFilter = function EventFilter(props) {
     popupContainer: false,
     defaultSelectAble: false,
     disableVirtualEventShow: true,
+    selectList: selectList,
     value: event && event.eventId ? {
       event: {
         id: event.eventId,
@@ -127,6 +130,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

@@ -15,7 +15,7 @@ import { Input, Modal, message, Drawer, Popover, Checkbox, Select, Button } from
 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';
@@ -103,7 +103,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         }).then(function (res) {
           if (res) {
             message.success('删除成功');
-            groupDeleteData(groupId, groupingData, setGroupingData);
+            queryList();
+            refresh();
           }
         });
       }
@@ -120,6 +121,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           hidden: type,
           ids: ids
         }
+      }).then(function () {
+        refresh();
       });
     }
   };
@@ -170,6 +173,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }).then(function (res) {
       if (res.code == '00') {
         queryList();
+        refresh();
       }
     }).finally(function () {
       setEventMoveShow(undefined);
@@ -234,8 +238,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();
       }
     });
@@ -253,7 +258,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     onClose: function onClose() {
       setEventGroupingShow(false);
       setEventMoveShow(undefined);
-      refresh();
     },
     destroyOnClose: true,
     open: eventGroupingShow,
@@ -311,7 +315,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');
@@ -332,8 +336,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() {
@@ -343,7 +350,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);
           }
@@ -375,7 +382,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/sortableComponnet.js

@@ -51,6 +51,10 @@ var SortableComponnet = function SortableComponnet(props) {
       }
     }, 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", {

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;
     }
   }
 }
@@ -391,6 +391,15 @@
 }
 
 .create-virtual-drawer {
+  &-add {
+    color: #165dff;
+    &-icon {
+      margin-right: 8px;
+      font-weight: 900;
+      font-size: 18px !important;
+      vertical-align: -2px;
+    }
+  }
   &-see-box {
     > div {
       display: flex;
@@ -497,28 +506,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 {
-            user-select: none;
             display: -webkit-box;
             max-width: 100%;
             overflow: hidden;
             cursor: pointer;
+            user-select: none;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 1;
           }
         }
       }
-      .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;
       }
@@ -685,3 +705,9 @@
 .sortable-componnet-sortableList {
   z-index: 9999;
 }
+
+.not-operable {
+  color: #ccd0d4;
+  cursor: not-allowed !important;
+  user-select: none;
+}

package/es/utils/index.d.ts

@@ -22,10 +22,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;
 /**
  * 指标分组管理：分组展开与关闭
  */

package/es/utils/index.js

@@ -150,21 +150,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 +224,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) {
+      if (!_open) {
+        _open = true;
+        item.open = true;
+      }
+      item.eventList = item.eventList.filter(function (_item) {
+        return _item.is_delete === 0;
+      });
+    }
   });
 };
 // 获取appId，为了解决之前遇到切换应用但是currentApp里面的appId不更新的问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.10",
+  "version": "1.0.34-heyh.13",
   "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": "11760c86c52f86c0564a186a2c0e3922b2429b0e",
+  "gitHead": "52f4872f5221c23f28f81e37835b21023df2ba96",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }