@zgfe/modules-dm 1.0.40 → 1.0.42-alpha.10

package/es/components/demo.js

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

package/es/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference path="../typings.d.ts" />
-import DataCollection from './modules/dataCollection';
-import PlanList from './modules/dataPlan';
 import DataManage from './modules/dataManage';
-export { PlanList, DataCollection, DataManage };
+import PlanList from './modules/dataPlan';
+export { PlanList, DataManage };

package/es/index.js

@@ -1,5 +1,4 @@
 /// <reference path="../typings.d.ts" />
-import DataCollection from './modules/dataCollection';
-import PlanList from './modules/dataPlan';
 import DataManage from './modules/dataManage';
-export { PlanList, DataCollection, DataManage };
+import PlanList from './modules/dataPlan';
+export { PlanList, DataManage };

package/es/modules/{dataCollection → dataManage}/collectionEventList.js

@@ -337,16 +337,25 @@ var CollectionEventList = function CollectionEventList(props) {
       count = 0;
       arr = [];
     }
+    // 当前页需要展示的数据
     var _renderData = paginationData[pageNumber - 1];
-    // console.log('_renderData', pageNumber, pageSize, tableHandleData, _renderData);
+    // 临时数组，搜索时使用，存储已添加的分组id
+    var _tempGroupIdList = [];
+    // 临时渲染数据，搜索时使用，存放处理后的数据（含分组信息）
+    var _tempRenderData = [];
+    // console.log('_renderData', tableHandleData, _renderData, groupData);
     if (_renderData && _renderData.length > 0 && _renderData[0].groupId == undefined) {
-      groupData.map(function (item) {
-        if (item.groupId == _renderData[0]._groupId) {
-          _renderData.unshift(item);
-        }
+      _renderData.map(function (item) {
+        groupData.map(function (_item) {
+          if (_item.groupId === item._groupId && _tempGroupIdList.indexOf(item._groupId) === -1) {
+            _tempGroupIdList.push(item._groupId);
+            _tempRenderData.push(_item);
+          }
+        });
+        _tempRenderData.push(item);
       });
     }
-    setTableRenderData(_renderData);
+    setTableRenderData(_tempRenderData.length > 0 ? _tempRenderData : _renderData);
   }, [pageNumber, pageSize, tableHandleData]);
   // 分页处理
   var onPaginationChange = function onPaginationChange(pageNumber, pageSize) {

package/es/modules/{dataCollection → dataManage}/components/createVirtualDrawer.js

@@ -120,7 +120,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     }
   };
   var onClose = function onClose() {
-    if (virtualDrawerType === "edit") {
+    if (virtualDrawerType === 'edit') {
       if (formSubmit && getVirtualContentChange(_.cloneDeep(editVirtualEventData), _.cloneDeep(formSubmitData))) {
         Modal.confirm({
           centered: true,

package/es/modules/{dataCollection → dataManage}/components/eventFilter/styles/index.less

@@ -66,7 +66,7 @@
   }
   .delete-box:hover {
     .shanchu {
-      color: #FB5547;
+      color: #fb5547;
     }
   }
 }

package/es/modules/{dataCollection → dataManage}/components/eventGroupingDrawer.js

@@ -328,17 +328,17 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         }
       }
     }, "\u79FB\u52A8")), /*#__PURE__*/React.createElement("span", {
-      className: 'handle',
+      className: "handle",
       onClick: function onClick() {
         return eventShowOrHidden(0, item.groupId);
       }
     }, "\u663E\u793A"), /*#__PURE__*/React.createElement("span", {
-      className: 'handle',
+      className: "handle",
       onClick: function onClick() {
         return eventShowOrHidden(1, item.groupId);
       }
     }, "\u9690\u85CF")), item.groupName && /*#__PURE__*/React.createElement("span", {
-      className: 'handle-delete',
+      className: "handle-delete",
       onClick: function onClick() {
         return groupDelete(item.groupId);
       }

package/es/modules/{dataCollection → dataManage}/components/tablePlus.js

@@ -417,7 +417,7 @@ var TablePlus = function TablePlus(props) {
         trigger: "hover",
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
-        className: 'alias_name_text'
+        className: "alias_name_text"
       }, record.alias_name)), /*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {

package/es/modules/{dataCollection → dataManage}/components/virtualTablePlus.js

@@ -213,7 +213,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
         trigger: "hover",
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
-        className: 'alias_name_text'
+        className: "alias_name_text"
       }, record.aliasName)));
     }
   }, {
@@ -256,7 +256,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
         trigger: "hover",
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
-        className: 'description'
+        className: "description"
       }, text)));
     }
   }, {
@@ -275,7 +275,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
         trigger: "hover",
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
-        className: 'bind-event'
+        className: "bind-event"
       }, text)));
     }
   }, {

package/es/modules/dataManage/demo/index.js

@@ -23,7 +23,6 @@ export default (function () {
     //     children: <div>aaa</div>,
     //   },
     // ]}
-    extraSubTabs: subTabs,
-    activeSubTab: "session"
+    extraSubTabs: subTabs
   }));
 });

package/es/modules/dataManage/index.d.ts

@@ -1,12 +1,6 @@
 import React from 'react';
-import './styles/index.less';
 interface DataManageProps {
     updateEventMetas: Function;
-    /**
-     * 是否展示埋点方案
-     * default: true
-     */
-    showPlan?: boolean;
     /**
      * 拓展的一级菜单
      */
@@ -16,19 +10,10 @@ interface DataManageProps {
         children: React.ReactNode;
         [other: string]: any;
     }[];
-    /**
-     * 拓展的二级菜单
-     */
-    extraSubTabs?: {
-        key: string;
-        label: string;
-        children: React.ReactNode;
-        [other: string]: any;
-    }[];
     /**
      * 默认选中菜单
      */
-    activeSubTab?: number | string;
+    activeTab?: number | string;
 }
 declare const DataManage: React.FC<DataManageProps>;
 export default DataManage;

package/es/modules/dataManage/index.js

@@ -10,18 +10,18 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { Tabs } from 'antd';
-import React, { useContext, useEffect } from 'react';
-import './styles/index.less';
 import { DmContext, upDatedDmFun } from '../../store';
 import { ActionType } from '../../store/action';
-import PlanList from '../dataPlan';
-import DataCollection from '../dataCollection';
+import React, { useState, useContext, useEffect } from 'react';
+import request from '../../utils/ajax';
+import apis from '../../constants/api';
+import { getAppID } from '../../utils';
+import EventList from './collectionEventList';
+import CollectionAttributeList from './collectionAttributeList';
+import VirtualEventList from './virtualEventList';
 var DataManage = function DataManage(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-    authority = _useContext.authority;
   var classPrefix = 'data-manage';
-  var updateEventMetas = props.updateEventMetas,
-    showPlan = props.showPlan;
+  var updateEventMetas = props.updateEventMetas;
   var _upDatedDmFun = upDatedDmFun(),
     _upDatedDmFun2 = _slicedToArray(_upDatedDmFun, 2),
     state = _upDatedDmFun2[0],
@@ -32,6 +32,49 @@ var DataManage = function DataManage(props) {
       payload: updateEventMetas
     });
   }, []);
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp,
+    authority = _useContext.authority;
+  // const [listTab, setListTab] = useState<string | number>(props.activeTab || 1);
+  // const tabsChange = (e: RadioChangeEvent) => {
+  //   setListTab(e.target.value);
+  // };
+  // 判断埋点方案开关是否打开
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    isOpen = _useState2[0],
+    setIsOpen = _useState2[1];
+  var queryControlSwitch = function queryControlSwitch() {
+    request(apis.queryControlSwitch, {
+      method: 'get',
+      params: {
+        appId: getAppID(currentApp)
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setIsOpen(res.data.isOpen);
+    });
+  };
+  // 不在方案中的数据
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    queryPlanData = _useState4[0],
+    setqueryPlanData = _useState4[1];
+  var queryPlan = function queryPlan() {
+    request(apis.queryPlan, {
+      method: 'post',
+      data: {
+        appId: getAppID(currentApp)
+      }
+    }).then(function (res) {
+      setqueryPlanData(res.data);
+    });
+  };
+  // 初始化数据
+  useEffect(function () {
+    queryControlSwitch();
+    queryPlan();
+  }, []);
   return /*#__PURE__*/React.createElement(DmContext.Provider, {
     value: {
       state: state,
@@ -42,22 +85,27 @@ var DataManage = function DataManage(props) {
   }, /*#__PURE__*/React.createElement(Tabs, {
     className: "tabs",
     defaultActiveKey: "0",
-    items: [authority[10018] && {
-      key: '0',
-      label: '埋点管理',
-      children: /*#__PURE__*/React.createElement(DataCollection, {
-        activeTab: props.activeSubTab,
-        extraTabs: props.extraSubTabs
-      })
-    }, authority[10019] && {
+    destroyInactiveTabPane: true,
+    items: [authority[100020] && {
       key: '1',
-      label: '埋点方案管理',
-      disabled: !showPlan,
-      children: /*#__PURE__*/React.createElement(PlanList, null)
+      label: '元事件',
+      children: /*#__PURE__*/React.createElement(EventList, {
+        isOpen: isOpen,
+        queryPlanData: queryPlanData
+      })
+    }, authority[1700559695] && {
+      key: '3',
+      label: '虚拟事件',
+      children: /*#__PURE__*/React.createElement(VirtualEventList, null)
+    }, authority[100021] && {
+      key: '2',
+      label: '用户属性管理',
+      children: /*#__PURE__*/React.createElement(CollectionAttributeList, {
+        isOpen: isOpen,
+        queryPlanData: queryPlanData,
+        source: "user"
+      })
     }].concat(_toConsumableArray(props.extraTabs || []))
   })));
 };
-DataManage.defaultProps = {
-  showPlan: true
-};
 export default DataManage;