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

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"

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

@@ -1,8 +1,8 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .data-collection {
   position: relative;
-  width: calc(100% - 264px);
-  height: 100%;
+  // width: calc(100% - 288px);
+  // height: 100%;
   margin-top: 16px;
   margin-right: 24px;
   margin-bottom: 24px;
@@ -23,282 +23,302 @@
       padding: 3px 20px 20px 20px;
     }
   }
-  .attr-list,
-  .event-list {
-    position: relative;
-    min-height: 550px;
-    &-back {
-      margin-bottom: 10px;
-      cursor: pointer;
-      user-select: none;
+}
+
+.attr-list,
+.event-list {
+  position: relative;
+  min-height: 550px;
+  &-back {
+    margin-bottom: 10px;
+    cursor: pointer;
+    user-select: none;
+  }
+  .hidden-box {
+    display: none;
+  }
+  .error-row {
+    color: #fb5547;
+  }
+  .fuzhi {
+    display: none;
+    margin-left: 10px;
+    color: #666;
+    font-size: 16px !important;
+    &:hover {
+      color: @primary-color;
     }
-    .hidden-box {
-      display: none;
+  }
+}
+
+.event-list {
+  &-top-box {
+    position: relative;
+    display: flex;
+    margin-bottom: 17px;
+    .top-select {
+      width: 264px;
+      margin-right: 12px;
     }
-    .error-row {
-      color: #fb5547;
+    .top-input {
+      width: 264px;
+      margin-right: 12px;
+      .ant-input-prefix {
+        margin-right: 20px;
+        transform: scale(1.5);
+      }
     }
-    .fuzhi {
-      display: none;
-      margin-left: 10px;
-      color: #666;
-      font-size: 16px !important;
-      &:hover {
+    .top-total {
+      line-height: 32px;
+      span {
+        margin: 0 4px;
         color: @primary-color;
+        font-weight: bold;
       }
     }
+    .top-button {
+      position: absolute;
+      top: 0;
+      right: 0;
+      line-height: 100%;
+    }
   }
-  .event-list {
-    &-top-box {
-      position: relative;
-      display: flex;
-      margin-bottom: 17px;
-      .top-select {
-        width: 264px;
-        margin-right: 12px;
-      }
-      .top-input {
-        width: 264px;
-        margin-right: 12px;
-        .ant-input-prefix {
-          margin-right: 20px;
-          transform: scale(1.5);
+  .table-plus {
+    &-table {
+      .ant-table {
+        .ant-table-tbody {
+          // height: 500px;
+        }
+        table {
+          border-collapse: collapse;
         }
       }
-      .top-total {
-        line-height: 32px;
-        span {
-          margin: 0 4px;
-          color: @primary-color;
-          font-weight: bold;
+      .ant-table-cell-row-hover {
+        .bsicon {
+          display: inline-block !important;
         }
       }
-      .top-button {
-        position: absolute;
-        top: 0;
-        right: 0;
-        line-height: 100%;
+      .alias_name_popover {
+        width: 200px;
+        word-break: break-all;
+        background: red;
       }
-    }
-    .table-plus {
-      &-table {
-        .ant-table {
-          .ant-table-tbody {
-            // height: 500px;
-          }
-          table {
-            border-collapse: collapse;
-          }
+      .alias_name {
+        background: #fff !important;
+        border: none;
+        cursor: pointer;
+      }
+      .ant-input:focus,
+      .ant-input-focused {
+        background-color: #fff !important;
+        border-bottom: 1px solid @primary-color;
+        border-radius: 0 !important;
+        box-shadow: none !important;
+      }
+      .group-row {
+        border-top: 12px solid #f5f5f5;
+        .ant-table-cell-fix-left {
+          left: 0px;
+          display: block;
+          width: 500px;
+          background: #fff;
         }
-        .ant-table-cell-row-hover {
-          .bsicon {
-            display: inline-block !important;
-          }
+        .ant-table-cell-fix-left-first::after,
+        .ant-table-cell-fix-left-last::after {
+          box-shadow: none;
+        }
+        td {
+          padding: 6px 16px;
         }
-        .alias_name_popover {
-          width: 200px;
-          word-break: break-all;
-          background: red;
+        :last-child {
+          padding: 0;
         }
-        .alias_name {
-          background: #fff !important;
+        td:not(:first-child, :last-child) > * {
+          display: none;
+        }
+      }
+      .group-box {
+        display: flex;
+        width: 800px;
+        line-height: 30px;
+        .ant-input {
+          width: 150px;
           border: none;
-          cursor: pointer;
         }
-        .ant-input:focus,
-        .ant-input-focused {
-          background-color: #fff !important;
-          border-bottom: 1px solid @primary-color;
-          border-radius: 0 !important;
-          box-shadow: none !important;
+        .bsicon {
+          margin-right: 4px;
+          font-size: 18px !important;
         }
-        .group-row {
-          border-top: 12px solid #f5f5f5;
-          .ant-table-cell-fix-left {
-            left: 0px;
-            display: block;
-            width: 500px;
-            background: #fff;
-          }
-          .ant-table-cell-fix-left-first::after,
-          .ant-table-cell-fix-left-last::after {
-            box-shadow: none;
-          }
-          td {
-            padding: 6px 16px;
-          }
-          :last-child {
-            padding: 0;
-          }
-          td:not(:first-child, :last-child) > * {
-            display: none;
-          }
+        // .group-text {
+        //   display: -webkit-box;
+        //   width: 120px;
+        //   overflow: hidden;
+        //   -webkit-box-orient: vertical;
+        //   -webkit-line-clamp: 1;
+        // }
+        .group-handle {
+          margin-left: 30px;
+          cursor: pointer;
+          user-select: none;
         }
-        .group-box {
-          display: flex;
-          width: 800px;
-          line-height: 30px;
-          .ant-input {
-            width: 150px;
-            border: none;
-          }
-          .bsicon {
-            margin-right: 4px;
-            font-size: 18px !important;
-          }
-          // .group-text {
-          //   display: -webkit-box;
-          //   width: 120px;
-          //   overflow: hidden;
-          //   -webkit-box-orient: vertical;
-          //   -webkit-line-clamp: 1;
-          // }
-          .group-handle {
-            margin-left: 30px;
-            cursor: pointer;
-            user-select: none;
-          }
+      }
+      .edit-del {
+        .bsicon {
+          margin-left: 15px;
+          font-size: 16px !important;
+          cursor: pointer;
         }
-        .edit-del {
-          .bsicon {
-            margin-left: 15px;
-            font-size: 16px !important;
-            cursor: pointer;
-          }
-          :first-child:hover {
-            color: @primary-color;
-          }
-          :last-child:hover {
-            color: red;
-          }
+        :first-child:hover {
+          color: @primary-color;
         }
-        .select-style {
-          width: 126px;
-          .ant-select-selection-item {
-            color: #021429;
-            font-weight: 500;
-          }
+        :last-child:hover {
+          color: red;
         }
-        .event_attrs {
-          .bsicon {
-            margin-left: 12px;
-            font-size: 16px !important;
-            &:hover {
-              color: @primary-color;
-            }
-          }
+      }
+      .select-style {
+        width: 126px;
+        .ant-select-selection-item {
+          color: #021429;
+          font-weight: 500;
         }
-        .event_name {
-          display: flex;
-          cursor: pointer;
-          .event_name-text {
-            display: -webkit-box;
-            width: 120px;
-            overflow: hidden;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-          }
-          .copy-text {
-            display: none;
-            margin-left: 10px;
-            font-size: 16px !important;
-          }
-          .copy-text:hover {
+      }
+      .event_attrs {
+        .bsicon {
+          margin-left: 12px;
+          font-size: 16px !important;
+          &:hover {
             color: @primary-color;
           }
-          .collect-icon,
-          .collect-icon-active {
-            margin: 0 4px;
-            font-size: 16px !important;
-          }
-          .collect-icon {
-            color: #999;
-            opacity: 0;
-          }
-          .collect-icon:hover {
-            color: #f2d074;
-          }
-          .collect-icon-active {
-            color: #fd9f41;
-          }
-          .ant-checkbox-wrapper {
-            align-items: center;
-            margin-top: -6px;
-          }
         }
-        .ant-table-row:hover {
-          .collect-icon {
-            opacity: 1;
-          }
-          .copy-text {
-            display: block;
-          }
+      }
+      .event_name {
+        display: flex;
+        cursor: pointer;
+        .event_name-text {
+          display: -webkit-box;
+          width: 120px;
+          overflow: hidden;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+        }
+        .copy-text {
+          display: none;
+          margin-left: 10px;
+          font-size: 16px !important;
         }
-        .set {
+        .copy-text:hover {
           color: @primary-color;
-          text-align: center;
-          cursor: pointer;
-          user-select: none;
         }
-        .set-error {
-          color: #86909c;
+        .collect-icon,
+        .collect-icon-active {
+          margin: 0 4px;
+          font-size: 16px !important;
+        }
+        .collect-icon {
+          color: #999;
+          opacity: 0;
+        }
+        .collect-icon:hover {
+          color: #f2d074;
+        }
+        .collect-icon-active {
+          color: #fd9f41;
+        }
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -6px;
         }
       }
-    }
-  }
-  .attr-list {
-    .attr-name {
-      display: flex;
-      .attr-name-text {
-        display: -webkit-box;
-        width: 120px;
-        overflow: hidden;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1;
+      .ant-table-row:hover {
+        .collect-icon {
+          opacity: 1;
+        }
+        .copy-text {
+          display: block;
+        }
       }
-      .tishiicon {
-        margin-right: 6px;
+      .set {
+        color: @primary-color;
+        text-align: center;
+        cursor: pointer;
+        user-select: none;
       }
-      &:hover {
-        .fuzhi {
-          display: inline-block;
-          cursor: pointer;
-        }
+      .set-error {
+        color: #86909c;
       }
     }
-    .alias_name {
-      background: #fff !important;
-      border: none;
-      cursor: pointer;
+  }
+}
+
+.attr-list {
+  .attr-name {
+    display: flex;
+    .attr-name-text {
+      display: -webkit-box;
+      width: 120px;
+      overflow: hidden;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
     }
-    .ant-input:focus,
-    .ant-input-focused {
-      background-color: #fff !important;
-      border-bottom: 1px solid @primary-color;
-      border-radius: 0 !important;
-      box-shadow: none !important;
+    .tishiicon {
+      margin-right: 6px;
     }
-    .attr_alias_name {
-      cursor: pointer;
-      user-select: none;
-      &:hover {
-        color: @primary-color;
+    &:hover {
+      .fuzhi {
+        display: inline-block;
+        cursor: pointer;
       }
     }
-    .button-box {
-      display: flex;
-      margin-bottom: 10px;
-      .ant-btn {
-        margin-right: 20px;
-      }
-      .bsicon {
-        margin-right: 6px;
-      }
+  }
+  .alias_name {
+    background: #fff !important;
+    border: none;
+    cursor: pointer;
+  }
+  .ant-input:focus,
+  .ant-input-focused {
+    background-color: #fff !important;
+    border-bottom: 1px solid @primary-color;
+    border-radius: 0 !important;
+    box-shadow: none !important;
+  }
+  .attr_alias_name {
+    cursor: pointer;
+    user-select: none;
+    &:hover {
+      color: @primary-color;
+    }
+  }
+  .button-box {
+    display: flex;
+    margin-top: -24px;
+    margin-bottom: 14px;
+    .ant-btn {
+      margin-right: 20px;
     }
-    .clearData {
-      text-align: right;
-      cursor: pointer;
-      user-select: none;
+    .bsicon {
+      margin-right: 6px;
     }
   }
+  .clearData {
+    position: absolute;
+    top: 75px;
+    right: 26px;
+    text-align: right;
+    cursor: pointer;
+    user-select: none;
+  }
+}
+
+.event-list-drawer {
+  .ant-drawer-header-title {
+    height: 20px;
+    .ant-drawer-close {
+      position: absolute;
+      right: 24px;
+    }
+  }
+  .ant-drawer-mask {
+    background: rgba(0, 0, 0, 0.8);
+  }
 }

package/es/modules/dataCollection/tablePlus.js

@@ -24,6 +24,7 @@ var Option = Select.Option;
 import React, { useState, useContext } from 'react';
 import './styles/index.less';
 import _ from 'lodash';
+import { getAppID } from '../../utils';
 import { DmContext } from '../../store';
 
 var TablePlus = function TablePlus(props) {
@@ -57,7 +58,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.updateEventInfo, {
       method: 'post',
       params: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        app_id: getAppID(currentApp),
         alias_name: value,
         event_id: record.event_id
       }
@@ -109,7 +110,7 @@ var TablePlus = function TablePlus(props) {
       data: {
         eventGroupName: eventNameInput,
         eventGroupId: eventNameData.groupId,
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: getAppID(currentApp),
         platform: 0
       }
     }).then(function (res) {
@@ -140,7 +141,7 @@ var TablePlus = function TablePlus(props) {
         request(apis.deleteEventGroup, {
           method: 'post',
           data: {
-            appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+            appId: getAppID(currentApp),
             eventGroupId: eventGroupId
           }
         }).then(function (res) {
@@ -168,7 +169,7 @@ var TablePlus = function TablePlus(props) {
         request(apis.deleteEventMeta, {
           method: 'post',
           params: {
-            app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+            app_id: getAppID(currentApp),
             event_id: event_id
           }
         }).then(function (res) {
@@ -210,7 +211,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.updateEventInfo, {
       method: 'post',
       params: _objectSpread({
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        app_id: getAppID(currentApp),
         event_id: record.event_id
       }, _temp)
     }).then(function (res) {
@@ -283,7 +284,7 @@ var TablePlus = function TablePlus(props) {
     request(apis.operateGroupRelations, {
       method: 'post',
       data: _objectSpread({
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: getAppID(currentApp),
         platform: 0,
         hasPublicAttrView: true,
         eventIds: groupCheckedData[data.groupId].join(',')
@@ -637,8 +638,12 @@ var TablePlus = function TablePlus(props) {
     pagination: false
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u4FEE\u6539\u5206\u7EC4\u540D",
+    bodyStyle: {
+      padding: '0 24px 24px 24px'
+    },
     destroyOnClose: true,
     visible: eventNameShow,
+    getContainer: false,
     onOk: eventNameEdit,
     onCancel: function onCancel() {
       return setEventNameShow(false);

package/es/modules/dataManage/index.js

@@ -11,7 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { IconFont } from '@zgfe/business-lib';
-import { Tabs } from 'antd';
+import { Tabs, Popover } from 'antd';
 import React, { useState, useEffect } from 'react';
 import './styles/index.less';
 import { DmContext, upDatedDmFun } from '../../store';
@@ -21,7 +21,7 @@ import DataCollection from '../dataCollection';
 
 var DataManage = function DataManage(props) {
   var classPrefix = 'data-manage';
-  var updateEventMetas = props.updateEventMetas; // const { state, dispatch } = useContext(DmContext);
+  var updateEventMetas = props.updateEventMetas;
 
   var _upDatedDmFun = upDatedDmFun(),
       _upDatedDmFun2 = _slicedToArray(_upDatedDmFun, 2),
@@ -37,36 +37,18 @@ var DataManage = function DataManage(props) {
 
   var _useState = useState('0'),
       _useState2 = _slicedToArray(_useState, 2),
-      menuTab = _useState2[0],
-      setMenuTab = _useState2[1];
-
-  var onSelect = function onSelect(e) {
-    setMenuTab(e.key);
-  };
-
-  var items = [{
-    label: '埋点管理',
-    key: '0',
-    icon: /*#__PURE__*/React.createElement(IconFont, {
-      type: "maidianguanli"
-    })
-  }, {
-    label: '埋点方案管理',
-    key: '1',
-    icon: /*#__PURE__*/React.createElement(IconFont, {
-      type: "maidianfanganguanli"
-    })
-  }];
-
-  var _useState3 = useState('0'),
-      _useState4 = _slicedToArray(_useState3, 2),
-      listTab = _useState4[0],
-      setListTab = _useState4[1];
+      listTab = _useState2[0],
+      setListTab = _useState2[1];
 
   var tabsChange = function tabsChange(activeKey) {
     setListTab(activeKey);
   };
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      collapsed = _useState4[0],
+      setCollapsed = _useState4[1];
+
   return /*#__PURE__*/React.createElement(DmContext.Provider, {
     value: {
       state: state,
@@ -75,7 +57,7 @@ var DataManage = function DataManage(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
-    className: "tabs-box"
+    className: "tabs-box ".concat(collapsed && 'tabs-collapsed')
   }, /*#__PURE__*/React.createElement(Tabs, {
     className: "tabs",
     defaultActiveKey: "0",
@@ -84,18 +66,42 @@ var DataManage = function DataManage(props) {
   }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: /*#__PURE__*/React.createElement("div", {
       className: "tab"
+    }, collapsed && /*#__PURE__*/React.createElement(Popover, {
+      content: "\u57CB\u70B9\u7BA1\u7406",
+      placement: "right"
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "maidianguanli"
-    }), "\u57CB\u70B9\u7BA1\u7406"),
+    })), !collapsed && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
+      type: "maidianguanli"
+    }), "\u57CB\u70B9\u7BA1\u7406")),
     key: "0"
   }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: /*#__PURE__*/React.createElement("div", {
       className: "tab"
+    }, collapsed && /*#__PURE__*/React.createElement(Popover, {
+      content: "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406",
+      placement: "right"
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "maidianfanganguanli"
-    }), "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406"),
+    })), !collapsed && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
+      type: "maidianfanganguanli"
+    }), "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406")),
     key: "1"
-  }))), listTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), listTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "zhidie-botton"
+  }, !collapsed && /*#__PURE__*/React.createElement(IconFont, {
+    type: "zhedie",
+    onClick: function onClick() {
+      setCollapsed(!collapsed);
+    }
+  }), collapsed && /*#__PURE__*/React.createElement(IconFont, {
+    type: "zhankai",
+    onClick: function onClick() {
+      setCollapsed(!collapsed);
+    }
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "dmcontent ".concat(collapsed && 'dmcontent-collapsed')
+  }, listTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), listTab == '1' && /*#__PURE__*/React.createElement(PlanList, null))));
 };
 
 export default DataManage;

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

@@ -17,43 +17,75 @@
 .data-manage {
   position: relative;
   display: flex;
-  height: 100%;
   background: #f5f5f5;
   .tabs-box {
     position: relative;
     min-width: 240px;
     margin-right: 24px;
     background: #fff;
-  }
-  .tabs {
-    position: fixed;
-    top: 48px;
-    left: 0;
-    min-width: 240px;
-    margin-right: 24px;
-    padding-top: 16px;
-    background: #fff;
-    .ant-tabs-nav {
-      width: 100%;
-      .ant-tabs-tab {
-        padding-left: 0;
+    .tabs {
+      position: fixed;
+      top: 48px;
+      left: 0;
+      min-width: 240px;
+      margin-right: 24px;
+      padding-top: 16px;
+      background: #fff;
+      .ant-tabs-nav {
+        width: 100%;
+        .ant-tabs-tab {
+          padding: 7px 0;
+        }
+        .ant-tabs-tab + .ant-tabs-tab {
+          margin: 0;
+        }
+        .ant-tabs-tab-active {
+          background: #e8efff;
+        }
+        .ant-tabs-tab-btn {
+          width: 100%;
+          font-size: 16px;
+          text-align: left;
+          .bsicon {
+            margin-right: 12px;
+            margin-left: 19px;
+            font-size: 20px !important;
+          }
+        }
       }
-      .ant-tabs-tab-active {
-        background: #e8efff;
+      .ant-tabs-content-holder {
+        display: none;
       }
-      .ant-tabs-tab-btn {
-        width: 100%;
-        font-size: 16px;
-        text-align: left;
+    }
+    .zhidie-botton {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 40px;
+      font-size: 24px !important;
+      border-top: 1px solid #e8efff;
+      .bsicon {
+        margin-left: 19px;
+      }
+    }
+  }
+  .tabs-collapsed {
+    min-width: 80px;
+    .tabs {
+      min-width: 80px;
+      .tab {
+        text-align: center;
         .bsicon {
-          margin-right: 15px;
-          margin-left: 19px;
-          font-size: 20px !important;
+          margin: 0 !important;
         }
       }
     }
-    .ant-tabs-content-holder {
-      display: none;
-    }
+  }
+  .dmcontent {
+    width: calc(100% - 264px);
+  }
+  .dmcontent-collapsed {
+    width: calc(100% - 104px);
   }
 }

package/es/modules/dataPlan/addEventOrUser.js

@@ -21,7 +21,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, Table, Modal, Form, message } from 'antd';
+import { Input, Button, Select, Table, Modal, Form, message, Popover } from 'antd';
 var Option = Select.Option;
 import React, { useEffect, useState } from 'react';
 import './styles/index.less';
@@ -152,14 +152,24 @@ var addEventOrUser = function addEventOrUser(props) {
 
     var tableColumnsPropsRender = function tableColumnsPropsRender(item) {
       var render = function render(text, record, index) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, item.dataIndex == 'set' ? /*#__PURE__*/React.createElement(IconFont, {
-          className: "set-del ".concat(tableRowData.length <= 1 ? 'set-del-err' : ''),
+        return /*#__PURE__*/React.createElement(React.Fragment, null, item.dataIndex == 'set' ? /*#__PURE__*/React.createElement(React.Fragment, null, tableRowData.length <= 1 ? /*#__PURE__*/React.createElement(IconFont, {
+          className: "set-del set-del-err",
           disabled: true,
           type: "shanchu1",
           onClick: function onClick() {
             handleRow('del', record);
           }
-        }) : /*#__PURE__*/React.createElement(Form.Item, {
+        }) : /*#__PURE__*/React.createElement(Popover, {
+          content: "\u5220\u9664",
+          placement: "right"
+        }, /*#__PURE__*/React.createElement(IconFont, {
+          className: "set-del",
+          disabled: true,
+          type: "shanchu1",
+          onClick: function onClick() {
+            handleRow('del', record);
+          }
+        }))) : /*#__PURE__*/React.createElement(Form.Item, {
           name: "".concat(item.dataIndex, "-").concat(record.key),
           rules: rulesData(item)
         }, /*#__PURE__*/React.createElement(Input, null)));

package/es/modules/dataPlan/addPlan.js

@@ -162,8 +162,8 @@ var AddPlan = function AddPlan(props) {
       setSpinning(true);
       var fileType = file.name.split('.');
 
-      if (fileType[fileType.length - 1] != 'xlsx' && fileType[fileType.length - 1] != 'xsl') {
-        message.error('仅支持excel(xsl、xlsx)格式文件，请检查后重新上传');
+      if (fileType[fileType.length - 1] != 'xlsx' && fileType[fileType.length - 1] != 'xls') {
+        message.error('仅支持excel(xls、xlsx)格式文件，请检查后重新上传');
         setSpinning(false);
         return;
       }

package/es/modules/dataPlan/index.js

@@ -17,6 +17,7 @@ import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
+import { getAppID } from '../../utils';
 import AddPlan from './addPlan';
 
 var PlanList = function PlanList(props) {
@@ -26,7 +27,7 @@ var PlanList = function PlanList(props) {
       currentApp = _useContext.currentApp,
       isDemo = _useContext.isDemo;
 
-  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 tableSee = function tableSee(data) {
     setDetailId(data.id);
@@ -51,7 +52,7 @@ var PlanList = function PlanList(props) {
         request(apis.deletePlan, {
           method: 'post',
           data: {
-            appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+            appId: getAppID(currentApp),
             planName: data
           }
         }).then(function (res) {
@@ -123,7 +124,7 @@ var PlanList = function PlanList(props) {
     request(apis.getAllPlan, {
       method: 'get',
       params: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+        appId: getAppID(currentApp)
       }
     }).then(function (res) {
       res.data && res.data.planList && setListData(res.data.planList);
@@ -163,7 +164,7 @@ var PlanList = function PlanList(props) {
     request(apis.queryControlSwitch, {
       method: 'get',
       params: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+        appId: getAppID(currentApp)
       }
     }).then(function (res) {
       var _res$data;
@@ -181,7 +182,7 @@ var PlanList = function PlanList(props) {
     request(apis.updateControlSwitch, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: getAppID(currentApp),
         isOpen: !isOpen ? '1' : '0'
       }
     }).then(function (res) {
@@ -203,7 +204,11 @@ var PlanList = function PlanList(props) {
     className: "".concat(classPrefix, "-switchbox clearfix")
   }, /*#__PURE__*/React.createElement("div", {
     className: "switch-div"
-  }, /*#__PURE__*/React.createElement("span", null, "\u57CB\u70B9\u65B9\u6848\u63A7\u5236"), /*#__PURE__*/React.createElement(Switch, {
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      lineHeight: '32px'
+    }
+  }, "\u57CB\u70B9\u65B9\u6848\u63A7\u5236"), /*#__PURE__*/React.createElement(Switch, {
     onChange: isOpenChang,
     checkedChildren: "\u5F00",
     unCheckedChildren: "\u5173",

package/es/modules/dataPlan/search.js

@@ -28,7 +28,7 @@ var Search = function Search(props) {
       type: "tianjia",
       style: {
         marginRight: '5px',
-        verticalAlign: '-2px'
+        verticalAlign: '-1px'
       }
     }),
     type: "primary",

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

@@ -1,12 +1,12 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .plan-list {
   position: relative;
-  width: calc(100% - 264px);
+  // width: calc(100% - 264px);
   height: 100%;
   margin-top: 16px;
   margin-right: 24px;
   margin-bottom: 24px;
-  padding: 24px;
+  padding: 20px 24px 24px 24px;
   background: #fff;
   border-radius: 8px;
   .clearfix:after {
@@ -47,6 +47,7 @@
       float: left;
       .ant-switch {
         width: 24px;
+        margin-top: -2px;
       }
       span {
         margin-right: 20px;
@@ -157,7 +158,7 @@
   &-tabs {
     position: relative;
     // display: flex;
-    margin-bottom: 15px;
+    // margin-bottom: 15px;
     > :nth-child(1) {
       border-radius: 4px 0 0 4px !important;
     }
@@ -167,7 +168,7 @@
     .handle-box {
       position: absolute;
       top: 5px;
-      right: 20px;
+      right: 0;
       .bsicon {
         margin-right: 10px;
       }
@@ -189,21 +190,17 @@
     .ant-table {
       border-radius: 8px 8px 0 0 !important;
     }
-    // display: flex;
-    // margin: 0;
-    // padding: 0;
-    // list-style-type: none;
-    // background: #fff;
-    // li {
-    //   width: 25%;
-    //   padding: 16px;
-    //   border: 1px solid #e8efff;
-    // }
   }
   &-table-header.empty {
+    .ant-table {
+      border-radius: 8px !important;
+    }
     .ant-table-tbody {
       display: contents;
     }
+    .ant-table-tbody > tr > td {
+      border-bottom: 0px solid #e8efff;
+    }
   }
   .user-list,
   .event-list {
@@ -281,6 +278,7 @@
     }
     .set-del-err {
       color: #cacdd4;
+      cursor: not-allowed;
     }
     .ant-modal-body {
       padding: 5px 24px 24px 24px;
@@ -314,7 +312,8 @@
     }
     &-add-button {
       position: absolute;
-      right: 20px;
+      right: 0;
+      line-height: 20px;
     }
   }
 }

package/es/modules/dataPlan/userAttributeList.js

@@ -49,7 +49,6 @@ var UserAttributeList = function UserAttributeList(props) {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     dataSource: props.userAttrData,
-    bordered: true,
     pagination: false
   }));
 };

package/es/store/index.js

@@ -10,17 +10,24 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import { useReducer, createContext } from 'react';
 import { initState } from './state';
 import { ActionType } from './action';
 
 var DmReducer = function DmReducer(prevState, action) {
-  // console.log('DmReducer', prevState, action);
+  console.log('DmReducer', prevState, action);
+
   switch (action.type) {
     case ActionType.SET_GLOBAL:
-      return {
+      return _objectSpread(_objectSpread({}, prevState), {}, {
         updateEventMetas: action.payload
-      };
+      });
 
     default:
       return initState;

package/es/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const getAppID: (currentApp: any) => any;

package/es/utils/index.js

@@ -0,0 +1,9 @@
+export var getAppID = function getAppID(currentApp) {
+  var href = window.location.href;
+
+  if (href.indexOf('/app/') != -1 && href.indexOf('localhost') == -1) {
+    return href.split('/app/')[1].split('/')[0];
+  } else {
+    return currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId;
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.28",
+  "version": "1.0.2-dm.29",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "92b2df999c88d9b40535ec116e0fec60affe197c",
+  "gitHead": "cc080cf3bbabd5ba7eb4c88bb49695de615f63a7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }