@zgfe/modules-dm 1.0.34-qirui.1 → 1.0.35

package/es/components/demo.js

@@ -15,7 +15,8 @@ var DemoWrapper2 = function DemoWrapper2(props) {
       height: 800
     }
   }, /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true
+    needMeta: true,
+    defaultApp: 318
   }, props.children)));
 };
 export default DemoWrapper2;

package/es/constants/api.d.ts

@@ -25,5 +25,15 @@ declare let apis: {
     updateControlSwitch: string;
     exportPlanTmp: string;
     exportAliasTmp: string;
+    addVirtualEvent: string;
+    delVirtualEvent: string;
+    updateVirtualEvent: string;
+    queryVirtualEvent: string;
+    queryVirtualEventList: string;
+    orderEventGroup: string;
+    orderEvent: string;
+    hiddenEvent: string;
+    checkEventStatus: string;
+    updateVirtualEventStatus: string;
 };
 export default apis;

package/es/constants/api.js

@@ -1,16 +1,16 @@
 var apis = {
   // 埋点管理 - 事件列表
   queryCollectionEventList: '/zg/web/v2/data/queryEventMetasOfGroup',
-  // 埋点管理 - 事件列表 - 修改别名 | 修改显示状态 | 修改采集状态
-  updateEventInfo: '/analysis/api/common/proxy/data/updateEventInfo.jsp',
+  // 埋点管理 - 事件列表 - 修改别名 | 修改显示状态 | 修改采集状态 | 修改收藏状态
+  updateEventInfo: '/zg/web/v2/event/updateEventInfo',
   // 埋点管理 - 事件列表 - 创建分组 | 修改分组
   upsertEventGroup: '/zg/web/v2/event/eventGroup/upsertEventGroup',
   // 埋点管理 - 事件列表 - 删除分组
   deleteEventGroup: '/zg/web/v2/event/eventGroup/deleteEventGroup',
   // 埋点管理 - 事件列表 - 删除事件
-  deleteEventMeta: '/analysis/api/common/proxy/data/deleteEventMeta.jsp',
+  deleteEventMeta: '/zg/web/v2/event/deleteEventMeta',
   // 埋点管理 - 修改事件属性值状态
-  updateEventAttr: '/analysis/api/common/proxy/data/updateEventAttr.jsp',
+  updateEventAttr: '/zg/web/v2/event/updateEventAttr',
   // 埋点管理 - 移入到组、移出分组、复制到组
   operateGroupRelations: '/zg/web/v2/event/eventGroup/operateGroupRelations',
   // 用户属性列表 - 获取用户信息
@@ -50,13 +50,26 @@ var apis = {
   // 导出方案模板
   exportPlanTmp: '/zg/web/v2/managementPlan/downloadPlanTemplate',
   // 导出别名模板
-  exportAliasTmp: '/zg/web/v2/utm/template'
+  exportAliasTmp: '/zg/web/v2/utm/template',
+  // 创建虚拟事件.
+  addVirtualEvent: '/zg/web/v2/event/virtual/addVirtualEvent',
+  // 删除虚拟事件.
+  delVirtualEvent: '/zg/web/v2/event/virtual/delVirtualEvent',
+  // 修改虚拟事件.
+  updateVirtualEvent: '/zg/web/v2/event/virtual/updateVirtualEvent',
+  // 查看虚拟事件详情
+  queryVirtualEvent: '/zg/web/v2/event/virtual/queryVirtualEvent',
+  // 查看虚拟事件列表.
+  queryVirtualEventList: '/zg/web/v2/event/virtual/queryVirtualEventList',
+  // 新增事件组排序.
+  orderEventGroup: '/zg/web/v2/event/eventGroup/orderEventGroup',
+  // 新增事件排序.
+  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'
 };
-// for (const api in apis) {
-//   if (api != 'propUpload') {
-//     (apis as { [prop: string]: string })[api] = `/analysis/api/${
-//       (apis as { [prop: string]: string })[api]
-//     }`;
-//   }
-// }
 export default apis;

package/es/modules/dataCollection/collectionAttributeList.js

@@ -84,10 +84,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       });
       setUserAttrData(afterData);
       setLoading(false);
-    }).catch(function (err) {}).finally(function () {});
+    });
   };
   useEffect(function () {
-    // console.log('eventAttrsData', eventAttrsData);
     if (source == 'user') {
       queryUserPropMeta();
     } else {
@@ -126,25 +125,38 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   };
   // 修改属性
   var attrChangeHandle = function attrChangeHandle(value, record, type) {
-    var _params;
     if (aliasFocusData == value && type == 'alias_name') return; // 失焦判断，内容无修改不请求接口
-    request(source == 'event' ? apis.updateEventAttr : apis.updateUserAttr, {
-      method: 'post',
-      params: (_params = {
-        app_id: getAppID(currentApp),
-        attr_id: source == 'event' ? record.attr_id : record.id
-      }, _defineProperty(_params, type, value), _defineProperty(_params, "event_id", source == 'event' ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id : null), _params)
-    }).then(function (res) {
-      if (res) {
-        message.success('修改成功');
-        if (source == 'user') {
-          queryUserPropMeta();
-        } else {
+    if (source == 'event') {
+      var _data;
+      request(apis.updateEventAttr, {
+        method: 'post',
+        data: (_data = {
+          appId: getAppID(currentApp),
+          attrId: record.attr_id
+        }, _defineProperty(_data, type, value), _defineProperty(_data, "eventId", eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id), _data)
+      }).then(function (res) {
+        if (res) {
+          message.success('修改成功');
           props.Refresh();
+          state.updateEventMetas && state.updateEventMetas(); // 更新store
         }
-        state.updateEventMetas && state.updateEventMetas(); // 更新store
-      }
-    }).catch(function (err) {}).finally(function () {});
+      });
+    } else {
+      var _params;
+      request(apis.updateUserAttr, {
+        method: 'post',
+        params: (_params = {
+          app_id: getAppID(currentApp),
+          attr_id: record.id
+        }, _defineProperty(_params, type, value), _defineProperty(_params, "event_id", null), _params)
+      }).then(function (res) {
+        if (res) {
+          message.success('修改成功');
+          queryUserPropMeta();
+          state.updateEventMetas && state.updateEventMetas(); // 更新store
+        }
+      });
+    }
   };
   // 表格列
   var columns = [{
@@ -367,7 +379,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         } else {
           message.error(res.msg);
         }
-      }).catch(function (err) {});
+      });
       return false;
     }
   };
@@ -398,7 +410,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         message.success('操作成功');
         closeHandle();
       }
-    }).catch(function (err) {});
+    });
   };
   // 获取已设置的属性值别名列表
   var getAttrAliasList = function getAttrAliasList() {

package/es/modules/dataCollection/collectionEventList.js

@@ -14,10 +14,11 @@ import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
-import TablePlus from './tablePlus';
+import TablePlus from './components/tablePlus';
 import _ from 'lodash';
 import { getAppID } from '../../utils';
 import CollectionAttributeList from './collectionAttributeList';
+import EventGroupingDrawer from './components/eventGroupingDrawer';
 import { DmContext } from '../../store';
 var CollectionEventList = function CollectionEventList(props) {
   var classPrefix = 'event-list';
@@ -26,35 +27,35 @@ var CollectionEventList = function CollectionEventList(props) {
     authority = _useContext.authority;
   var _useContext2 = useContext(DmContext),
     state = _useContext2.state;
-  // const { updateEventMetas } = props;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     total = _useState2[0],
     setTotal = _useState2[1];
-  var _useState3 = useState(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    totalBasics = _useState4[0],
-    setTotalBasics = _useState4[1];
   // 加载中
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    loading = _useState6[0],
-    setLoading = _useState6[1];
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   // 渲染数据
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    tableHandleData = _useState6[0],
+    setTableHandleData = _useState6[1];
+  // 原数据
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    tableHandleData = _useState8[0],
-    setTableHandleData = _useState8[1];
-  // 原数据
+    tableHandleDataBasics = _useState8[0],
+    setTableHandleDataBasics = _useState8[1];
+  // 分组select数据
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    tableHandleDataBasics = _useState10[0],
-    setTableHandleDataBasics = _useState10[1];
-  // 分组select数据
-  var _useState11 = useState([]),
+    groupOptions = _useState10[0],
+    setgroupOptions = _useState10[1];
+  // 事件分组管理
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    groupOptions = _useState12[0],
-    setgroupOptions = _useState12[1];
+    eventGroupingShow = _useState12[0],
+    setEventGroupingShow = _useState12[1];
   // 分组元素有任意一个收藏，筛选收藏时保留分组标题
   var markTypeHandle = function markTypeHandle(item) {
     var _markTypeFlag = 0;
@@ -84,6 +85,7 @@ var CollectionEventList = function CollectionEventList(props) {
         event_attrs: [],
         event_id: index,
         is_delete: 0,
+        owner: '',
         mark_type: markTypeHandle(item)
       });
       _tempGroupOptions.push({
@@ -91,16 +93,17 @@ var CollectionEventList = function CollectionEventList(props) {
         label: item.groupName == null ? '未分组' : item.groupName
       });
       item.eventList.map(function (_item, _index) {
-        _item._groupId = item.groupId;
-        _item.key = index + '-' + _index;
-        if (_item.is_delete == 0) {
-          _tempArr.push(_item);
-          _tempTotal++;
+        if (_item.owner !== 'zg_vtl') {
+          _item._groupId = item.groupId;
+          _item.key = index + '-' + _index;
+          if (_item.is_delete == 0) {
+            _tempArr.push(_item);
+            _tempTotal++;
+          }
         }
       });
     });
     setTotal(_tempTotal);
-    setTotalBasics(_tempTotal);
     setgroupOptions(_tempGroupOptions);
     if (!refreshFlag) {
       setPageNumber(1);
@@ -124,7 +127,7 @@ var CollectionEventList = function CollectionEventList(props) {
     }).then(function (res) {
       if (!res) throw new Error();
       dataFinish(res.data, refreshFlag);
-    }).catch(function (err) {}).finally(function () {});
+    });
   };
   // 初始化列表
   useEffect(function () {
@@ -145,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: {
@@ -160,11 +159,10 @@ var CollectionEventList = function CollectionEventList(props) {
       if (res.code == '00') {
         message.success('创建成功');
         queryList();
+        setEventNameInput('');
+        setEventNameShow(false);
         state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
-    }).catch(function (err) {}).finally(function () {
-      setEventNameInput('');
-      setEventNameShow(false);
     });
   };
   // 筛选：显示状态 | 采集状态
@@ -308,49 +306,14 @@ var CollectionEventList = function CollectionEventList(props) {
     _useState26 = _slicedToArray(_useState25, 2),
     pageNumber = _useState26[0],
     setPageNumber = _useState26[1];
-  var _useState27 = useState(0),
+  var _useState27 = useState(10),
     _useState28 = _slicedToArray(_useState27, 2),
-    pageNumberIng = _useState28[0],
-    setpageNumberIng = _useState28[1];
-  var _useState29 = useState(10),
+    pageSize = _useState28[0],
+    setPageSize = _useState28[1];
+  var _useState29 = useState([]),
     _useState30 = _slicedToArray(_useState29, 2),
-    pageSize = _useState30[0],
-    setPageSize = _useState30[1];
-  var _useState31 = useState([]),
-    _useState32 = _slicedToArray(_useState31, 2),
-    tableRenderData = _useState32[0],
-    setTableRenderData = _useState32[1];
-  // useEffect(() => {
-  //   console.log('tableHandleData', tableHandleData);
-  //   if (tableHandleData.length <= 0) { //待完善，收藏为空会有显示问题
-  //     return;
-  //   }
-  //   if (pageNumber == pageNumberIng) {
-  //     return;
-  //   }
-  //   let paginationData: DataType[][] = [];
-  //   let arr: DataType[] = [];
-  //   let count = 0;
-  //   tableHandleData.map((item) => {
-  //     if (item._groupId != undefined) {
-  //       count++;
-  //     }
-  //     arr.push(item);
-  //     if (count == pageSize) {
-  //       paginationData.push(arr);
-  //       count = 0;
-  //       arr = [];
-  //     }
-  //   });
-  //   if (count != 0) {
-  //     paginationData.push(arr);
-  //     count = 0;
-  //     arr = [];
-  //   }
-  //   console.log('paginationData', tableRenderData, paginationData[pageNumber - 1]);
-  //   setTableRenderData([...tableRenderData, ...paginationData[pageNumber - 1]]);
-  //   setpageNumberIng(pageNumber);
-  // }, [pageNumber, pageNumberIng, tableHandleData]);
+    tableRenderData = _useState30[0],
+    setTableRenderData = _useState30[1];
   useEffect(function () {
     setPageNumber(1);
   }, [tableHandleData]);
@@ -398,31 +361,38 @@ var CollectionEventList = function CollectionEventList(props) {
     defaultValue: -999,
     className: "top-select",
     onChange: handleSelectChange,
-    options: groupOptions
+    options: groupOptions,
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#5f6085'
+      }
+    })
   }), /*#__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"
     })
   }), /*#__PURE__*/React.createElement("div", {
     className: "top-total"
-  }, "\u5171", /*#__PURE__*/React.createElement("span", null, total), "\u6761"), /*#__PURE__*/React.createElement(Button, {
-    className: "top-button",
+  }, "\u5171", /*#__PURE__*/React.createElement("span", null, total), "\u6761"), /*#__PURE__*/React.createElement("div", {
+    className: "top-button"
+  }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     shape: "round",
     disabled: !authority[1000002],
-    icon: /*#__PURE__*/React.createElement(IconFont, {
-      style: {
-        marginRight: '5px'
-      },
-      type: "tianjia"
-    }),
     onClick: function onClick() {
       return setEventNameShow(true);
     }
-  }, "\u521B\u5EFA\u4E8B\u4EF6\u5206\u7EC4")), /*#__PURE__*/React.createElement(TablePlus, {
+  }, "\u521B\u5EFA\u4E8B\u4EF6\u5206\u7EC4"), /*#__PURE__*/React.createElement(Button, {
+    shape: "round",
+    disabled: !authority[1700636282],
+    onClick: function onClick() {
+      return setEventGroupingShow(true);
+    }
+  }, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406"))), /*#__PURE__*/React.createElement(TablePlus, {
     loading: loading,
     tableHandleData: tableRenderData,
     Refresh: refreshHandle,
@@ -431,7 +401,6 @@ var CollectionEventList = function CollectionEventList(props) {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
     eventAttrDataHandle: eventAttrDataHandle,
-    // pageSizeChange={pageSizeChange}
     total: total,
     groupData: groupData
   }), /*#__PURE__*/React.createElement(Pagination, {
@@ -459,7 +428,12 @@ var CollectionEventList = function CollectionEventList(props) {
     eventAttrsData: eventAttrsData,
     source: "event",
     Refresh: refreshHandle
-  })), /*#__PURE__*/React.createElement(Modal, {
+  })), /*#__PURE__*/React.createElement(EventGroupingDrawer, {
+    eventGroupingShow: eventGroupingShow,
+    setEventGroupingShow: setEventGroupingShow,
+    refresh: refreshHandle,
+    source: 'collection'
+  }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
     className: "creact-group",
     destroyOnClose: true,
@@ -473,6 +447,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.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { CreateVirtualDrawerProps } from '../types';
+declare const CreateVirtualDrawer: React.FC<CreateVirtualDrawerProps>;
+export default CreateVirtualDrawer;