@zgfe/modules-dm 1.0.2-dm.28 → 1.0.2-dm.30

package/es/modules/dataCollection/collectionAttributeList.d.ts

@@ -11,10 +11,10 @@ interface PropsType {
         event_attrs: [];
         event_id: number;
         event_name: string;
+        owner?: string;
     };
     isOpen: number;
     queryPlanData: queryPlanType;
-    setEventAttrListShow?: Function;
     Refresh?: Function;
 }
 declare const CollectionAttributeList: React.FC<PropsType>;

package/es/modules/dataCollection/collectionAttributeList.js

@@ -23,6 +23,7 @@ import './styles/index.less';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import { DmContext } from '../../store';
+import { getAppID } from '../../utils';
 
 var CollectionAttributeList = function CollectionAttributeList(props) {
   var classPrefix = 'attr-list';
@@ -46,6 +47,11 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
 
 
   var rowRenderHandle = function rowRenderHandle(name) {
+    if (source == 'event' && eventAttrsData.owner == 'zg_abp') {
+      // 内置事件属性
+      return false;
+    }
+
     if (source == 'user') {
       var _queryPlanData$unexpe;
 
@@ -75,7 +81,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     request(apis.getUserPropMeta, {
       method: 'post',
       params: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        app_id: getAppID(currentApp),
         platform: 0
       }
     }).then(function (res) {
@@ -132,7 +138,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     request(source == 'event' ? apis.updateEventAttr : apis.updateUserAttr, {
       method: 'post',
       params: (_params = {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        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) {
@@ -357,7 +363,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       var data = new FormData();
       data.append('upload', file);
       data.append('attr_id', attrId);
-      data.append('app_id', currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+      data.append('app_id', getAppID(currentApp));
       source == 'event' ? data.append('event_id', eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id) : null;
       request(apis.propUpload, {
         method: 'post',
@@ -390,7 +396,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     request(apis.addPropDict, {
       method: 'post',
       params: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        app_id: getAppID(currentApp),
         attr_id: attrId,
         batch_id: batchId,
         event_id: source == 'event' ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id : null,
@@ -412,7 +418,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     request(apis.queryPropDict, {
       method: 'post',
       params: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        app_id: getAppID(currentApp),
         attr_id: attrId,
         event_id: source == 'event' ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id : null
       }
@@ -430,14 +436,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   }, [attrId]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, source == 'event' && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-back"),
-    onClick: function onClick() {
-      return props.setEventAttrListShow(false);
-    }
-  }, /*#__PURE__*/React.createElement(IconFont, {
-    type: "fanhuiicon"
-  }), "\u8FD4\u56DE"), /*#__PURE__*/React.createElement(Table, {
+  }, /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     rowKey: "name",
@@ -461,7 +460,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "button-box"
   }, /*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
     size: "small",
     icon: /*#__PURE__*/React.createElement(IconFont, {
       type: "daochu1"
@@ -470,7 +468,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     icon: /*#__PURE__*/React.createElement(IconFont, {
       type: "xiazai1"
     }),
-    type: "primary",
     size: "small",
     onClick: function onClick() {
       return window.location.href = "/analysis/api/utm/template?fileName=".concat(source == 'user' ? '用户' : '事件', "\u5C5E\u6027\u503C\u6A21\u677F.xlsx");

package/es/modules/dataCollection/collectionEventList.js

@@ -19,13 +19,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, Modal, message } from 'antd';
+import { Input, Button, Select, Modal, message, Drawer } from 'antd';
 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 _ from 'lodash';
+import { getAppID } from '../../utils';
 import CollectionAttributeList from './collectionAttributeList';
 
 var CollectionEventList = function CollectionEventList(props) {
@@ -136,7 +137,7 @@ var CollectionEventList = function CollectionEventList(props) {
     request(apis.queryCollectionEventList, {
       method: 'post',
       params: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        app_id: getAppID(currentApp),
         platform: 0,
         is_all: true
       }
@@ -179,7 +180,7 @@ var CollectionEventList = function CollectionEventList(props) {
       method: 'post',
       data: {
         eventGroupName: eventNameInput,
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: getAppID(currentApp),
         platform: 0
       }
     }).then(function (res) {
@@ -387,14 +388,21 @@ var CollectionEventList = function CollectionEventList(props) {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
     eventAttrDataHandle: eventAttrDataHandle
-  })), eventAttrListShow && /*#__PURE__*/React.createElement(CollectionAttributeList, {
+  })), /*#__PURE__*/React.createElement(Drawer, {
+    className: "".concat(classPrefix, "-drawer"),
+    width: '70%',
+    placement: "right",
+    destroyOnClose: true,
+    onClose: function onClose() {
+      return setEventAttrListShow(false);
+    },
+    visible: eventAttrListShow
+  }, /*#__PURE__*/React.createElement(CollectionAttributeList, {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
     eventAttrsData: eventAttrsData,
-    // Refresh={refreshHandle}
-    source: "event",
-    setEventAttrListShow: setEventAttrListShow
-  }), /*#__PURE__*/React.createElement(Modal, {
+    source: "event"
+  })), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
     className: "creact-group",
     destroyOnClose: true,

package/es/modules/dataCollection/index.js

@@ -15,18 +15,18 @@ import { Tabs } from 'antd';
 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 UserAttributeList from './collectionAttributeList';
+import CollectionAttributeList from './collectionAttributeList';
 
 var DataCollection = function DataCollection(props) {
-  var classPrefix = 'data-collection';
-
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
+      isDemo = _useContext.isDemo;
 
+  var classPrefix = 'data-collection'; // const { updateEventMetas } = props;
 
-  console.log('①埋点方案', currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+  console.log('①埋点方案', currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, getAppID(currentApp));
 
   var _useState = useState(1),
       _useState2 = _slicedToArray(_useState, 2),
@@ -47,7 +47,7 @@ var DataCollection = function DataCollection(props) {
     request(apis.queryControlSwitch, {
       method: 'get',
       params: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+        appId: getAppID(currentApp)
       }
     }).then(function (res) {
       setIsOpen(res.data.isOpen);
@@ -64,7 +64,7 @@ var DataCollection = function DataCollection(props) {
     request(apis.queryPlan, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+        appId: getAppID(currentApp)
       }
     }).then(function (res) {
       setqueryPlanData(res.data);
@@ -90,7 +90,7 @@ var DataCollection = function DataCollection(props) {
   })), listTab == 1 && /*#__PURE__*/React.createElement(EventList, {
     isOpen: isOpen,
     queryPlanData: queryPlanData
-  }), listTab == 2 && /*#__PURE__*/React.createElement(UserAttributeList, {
+  }), listTab == 2 && /*#__PURE__*/React.createElement(CollectionAttributeList, {
     isOpen: isOpen,
     queryPlanData: queryPlanData,
     source: "user"