@zgfe/modules-dm 1.0.34-heyh.20 → 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: 279
+    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

@@ -365,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"
     })

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, 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';
@@ -30,14 +30,22 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     _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),
-    loading = _useState6[0],
-    setLoading = _useState6[1];
+    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, {
@@ -50,7 +58,8 @@ 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);
     });
@@ -58,6 +67,11 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
   useEffect(function () {
     if (eventGroupingShow) queryList();
   }, [eventGroupingShow]);
+  var onSearchChange = function onSearchChange(e) {
+    var _value = e.currentTarget.value;
+    setSearchData(_value);
+    setGroupingData(eventShow(_.cloneDeep(groupingDataOriginal), _value));
+  };
   var onChangeAll = function onChangeAll(groupId) {
     setGroupingData(_.cloneDeep(eventCheckedAll(groupId, groupingData)));
   };
@@ -129,26 +143,26 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }
   };
   // 移动
-  var _useState7 = useState(undefined),
-    _useState8 = _slicedToArray(_useState7, 2),
-    eventMoveShow = _useState8[0],
-    setEventMoveShow = _useState8[1];
-  var _useState9 = useState(-1),
-    _useState10 = _slicedToArray(_useState9, 2),
-    eventMoveChangeId = _useState10[0],
-    setEventMoveChangeId = _useState10[1];
-  var _useState11 = useState([]),
+  var _useState11 = useState(undefined),
     _useState12 = _slicedToArray(_useState11, 2),
-    eventMoveOption = _useState12[0],
-    setEventMoveOption = _useState12[1];
-  var _useState13 = useState(0),
+    eventMoveShow = _useState12[0],
+    setEventMoveShow = _useState12[1];
+  var _useState13 = useState(-1),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventMoveLength = _useState14[0],
-    setEventMoveLength = _useState14[1];
-  var _useState15 = useState(''),
+    eventMoveChangeId = _useState14[0],
+    setEventMoveChangeId = _useState14[1];
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    eventMoveIds = _useState16[0],
-    setEventMoveIds = _useState16[1];
+    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);
@@ -206,18 +220,18 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }, "\u786E\u5B9A")));
   };
   // 创建分组 & 修改分组名
-  var _useState17 = useState(null),
-    _useState18 = _slicedToArray(_useState17, 2),
-    createOrEditGrpup = _useState18[0],
-    setCreateOrEditGrpup = _useState18[1];
-  var _useState19 = useState(-1),
-    _useState20 = _slicedToArray(_useState19, 2),
-    grpupModalSelectGrpupId = _useState20[0],
-    setGrpupModalSelectGrpupId = _useState20[1];
-  var _useState21 = useState(''),
+  var _useState21 = useState(null),
     _useState22 = _slicedToArray(_useState21, 2),
-    grpupNameInput = _useState22[0],
-    setGrpupNameInput = _useState22[1];
+    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('请填写分组名');
@@ -263,22 +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(BizLoading, {
     spinning: loading
-  }, /*#__PURE__*/React.createElement(DragDropContext, {
+  }, /*#__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, {
@@ -366,7 +385,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           groupId: item.groupId,
           groupingData: groupingData,
           setGroupingData: setGroupingData,
-          refresh: refresh
+          refresh: refresh,
+          searchData: searchData
         }))));
       }));
     });

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

@@ -16,7 +16,8 @@ var SortableComponnet = function SortableComponnet(props) {
     groupId = props.groupId,
     groupingData = props.groupingData,
     setGroupingData = props.setGroupingData,
-    refresh = props.refresh;
+    refresh = props.refresh,
+    searchData = props.searchData;
   // 需要拖动的元素的容器
   var SortableItem = SortableElement(function (data) {
     var _data$value = data.value,
@@ -61,7 +62,7 @@ var SortableComponnet = function SortableComponnet(props) {
     return /*#__PURE__*/React.createElement("div", {
       key: componnetIndex
     }, componnetData.map(function (item, index) {
-      if (groupId !== -1) {
+      if (groupId !== -1 && searchData === "") {
         return /*#__PURE__*/React.createElement(SortableItem, {
           key: "item-".concat(index),
           index: index,

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

@@ -251,7 +251,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
       }, text)));
     }
   }, {
-    title: '包含埋点事件',
+    title: '包含元事件',
     dataIndex: 'bindEvent',
     key: 'bindEvent',
     width: 187,

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

@@ -469,15 +469,15 @@
   }
   &-formSubmit {
     position: absolute;
-    background: #fff;
-    width: 100%;
-    border-top: 1px solid #F2F3F4;
     right: 0;
     bottom: 0;
-    padding: 24px;
     display: flex;
     gap: 16px;
     justify-content: end;
+    width: 100%;
+    padding: 24px;
+    background: #fff;
+    border-top: 1px solid #f2f3f4;
   }
 }
 
@@ -557,14 +557,13 @@
             -webkit-line-clamp: 1;
           }
         }
+        .checkbox-item.show{
+          display: flex;
+        }
+        .checkbox-item.hidden{
+          display: none;
+        }
       }
-      // .checkbox-item {
-      //   display: flex;
-      //   flex-shrink: 0;
-      //   align-items: center;
-      //   height: 40px;
-      //   margin: 0;
-      // }
       .event-hidden {
         color: #ccd0d4;
       }
@@ -573,6 +572,15 @@
       display: none;
     }
   }
+  &-top-box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .ant-input {
+      width: 374px;
+      border: none;
+    }
+  }
   .ant-drawer-title {
     span {
       margin-left: 8px;
@@ -584,11 +592,6 @@
     display: none;
   }
   .ant-drawer-extra {
-    display: flex;
-    justify-content: center;
-    > :nth-child(1) {
-      margin-right: 15px;
-    }
     .qingchu {
       font-size: 20px !important;
       cursor: pointer;

package/es/modules/dataCollection/virtualEventList.js

@@ -254,7 +254,7 @@ var VirtualEventList = function VirtualEventList() {
   }), /*#__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"
     })

package/es/utils/index.d.ts

@@ -34,6 +34,10 @@ export declare const openChangeData: (groupId: number, groupingData: any) => any
  * 指标分组管理：事件全选处理
  */
 export declare const eventCheckedAll: (groupId: number, groupingData: any) => any;
+/**
+ * 指标分组管理：搜索事件名称或别名，判断是否展示
+ */
+export declare const eventShow: (data: any, searchData: string) => any;
 /**
  * 指标分组管理：单个事件选中处理
  */

package/es/utils/index.js

@@ -198,6 +198,18 @@ export var eventCheckedAll = function eventCheckedAll(groupId, groupingData) {
   });
   return groupingData;
 };
+/**
+ * 指标分组管理：搜索事件名称或别名，判断是否展示
+ */
+export var eventShow = function eventShow(data, searchData) {
+  console.log('判断是否展示: ', data, searchData);
+  data.map(function (item) {
+    item.eventList = item.eventList.filter(function (_item) {
+      return _item.event_name.indexOf(searchData) !== -1 || (_item === null || _item === void 0 ? void 0 : _item.alias_name) && (_item === null || _item === void 0 ? void 0 : _item.alias_name.indexOf(searchData)) !== -1;
+    });
+  });
+  return data;
+};
 /**
  * 指标分组管理：单个事件选中处理
  */

package/package.json

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