@zgfe/modules-dm 1.0.23-idMapping.1 → 1.0.24-idmapping.0

package/es/constants/api.js

@@ -1,30 +1,30 @@
 var apis = {
   // 埋点管理 - 事件列表
-  queryCollectionEventList: '/zg/web/v2/data/queryEventMetasOfGroup.jsp',
+  queryCollectionEventList: '/analysis/api/common/proxy/data/queryEventMetasOfGroup.jsp',
   // 埋点管理 - 事件列表 - 修改别名 | 修改显示状态 | 修改采集状态
-  updateEventInfo: '/zg/web/v2/data/updateEventInfo.jsp',
+  updateEventInfo: '/analysis/api/common/proxy/data/updateEventInfo.jsp',
   // 埋点管理 - 事件列表 - 创建分组 | 修改分组
   upsertEventGroup: '/zg/web/v2/event/eventGroup/upsertEventGroup',
   // 埋点管理 - 事件列表 - 删除分组
   deleteEventGroup: '/zg/web/v2/event/eventGroup/deleteEventGroup',
   // 埋点管理 - 事件列表 - 删除事件
-  deleteEventMeta: '/zg/web/v2/data/deleteEventMeta.jsp',
+  deleteEventMeta: '/analysis/api/common/proxy/data/deleteEventMeta.jsp',
   // 埋点管理 - 修改事件属性值状态
-  updateEventAttr: '/zg/web/v2/data/updateEventAttr.jsp',
+  updateEventAttr: '/analysis/api/common/proxy/data/updateEventAttr.jsp',
   // 埋点管理 - 移入到组、移出分组、复制到组
   operateGroupRelations: '/zg/web/v2/event/eventGroup/operateGroupRelations',
   // 用户属性列表 - 获取用户信息
-  getUserPropMeta: '/zg/web/v2/appusergroup/getUserPropMeta.jsp',
+  getUserPropMeta: '/analysis/api/common/proxy/appusergroup/getUserPropMeta.jsp',
   // 用户属性列表 - 修改：属性名别 | 数值类型 | 显示状态 | 加密类型
-  updateUserAttr: '/zg/web/v2/data/updateUserAttr.jsp',
+  updateUserAttr: '/analysis/api/common/proxy/data/updateUserAttr.jsp',
   // 用户属性文件上传
-  propUpload: '/zg/web/v2/user/propUpload.jsp',
+  propUpload: '/analysis/api/common/proxy/user/propUpload.jsp',
   // 埋点管理&埋点方案管理 基础数据
   queryPlan: '/analysis/api/managementPlan/queryPlan',
   // 添加&修改用户属性值别名
-  addPropDict: '/zg/web/v2/user/addPropDict.jsp',
+  addPropDict: '/analysis/api/common/proxy/user/addPropDict.jsp',
   // 获取已设置的属性值别名列表
-  queryPropDict: '/zg/web/v2/user/queryPropDict.jsp',
+  queryPropDict: '/analysis/api/common/proxy/user/queryPropDict.jsp',
   // 埋点方案管理-查询所有埋点方案
   getAllPlan: '/zg/web/v2/managementPlan/getAllPlan',
   // 埋点方案管理-查询埋点方案详情

package/es/modules/dataCollection/collectionEventList.js

@@ -115,7 +115,7 @@ var CollectionEventList = function CollectionEventList(props) {
   };
   var queryList = function queryList(refreshFlag) {
     request(apis.queryCollectionEventList, {
-      method: 'post',
+      method: 'get',
       params: {
         app_id: getAppID(currentApp),
         platform: 0,

package/es/modules/dataCollection/index.js

@@ -5,7 +5,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { Tabs } from 'antd';
+import { Radio } from 'antd';
 import React, { useState, useContext, useEffect } from 'react';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
@@ -23,8 +23,8 @@ var DataCollection = function DataCollection(props) {
     _useState2 = _slicedToArray(_useState, 2),
     listTab = _useState2[0],
     setListTab = _useState2[1];
-  var tabsChange = function tabsChange(activeKey) {
-    setListTab(Number(activeKey));
+  var tabsChange = function tabsChange(e) {
+    setListTab(Number(e.target.value));
   };
   // 判断埋点方案开关是否打开
   var _useState3 = useState(0),
@@ -63,16 +63,23 @@ var DataCollection = function DataCollection(props) {
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(Tabs, {
-    defaultActiveKey: "1",
-    onChange: tabsChange
-  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
-    tab: "\u4E8B\u4EF6\u5217\u8868",
-    key: "1"
-  }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
-    tab: "\u7528\u6237\u5C5E\u6027\u5217\u8868",
-    key: "2"
-  })), listTab == 1 && /*#__PURE__*/React.createElement(EventList, {
+  }, /*#__PURE__*/React.createElement(Radio.Group, {
+    onChange: tabsChange,
+    value: listTab,
+    style: {
+      marginBottom: 16
+    }
+  }, /*#__PURE__*/React.createElement(Radio.Button, {
+    style: {
+      borderRadius: '4px 0 0 4px'
+    },
+    value: 1
+  }, "\u4E8B\u4EF6\u5217\u8868"), /*#__PURE__*/React.createElement(Radio.Button, {
+    style: {
+      borderRadius: '0 4px 4px 0'
+    },
+    value: 2
+  }, "\u7528\u6237\u5C5E\u6027\u5217\u8868")), listTab == 1 && /*#__PURE__*/React.createElement(EventList, {
     isOpen: isOpen,
     queryPlanData: queryPlanData
   }), listTab == 2 && /*#__PURE__*/React.createElement(CollectionAttributeList, {

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

@@ -2,9 +2,7 @@
 .data-collection {
   position: relative;
   height: 100%;
-  margin-right: 24px;
   padding: 24px;
-  padding-top: 10px;
   background: #fff;
   border-radius: 8px;
   .loading {

package/es/modules/dataManage/index.js

@@ -4,8 +4,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Tabs, Popover } from 'antd';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
+import { Tabs } from 'antd';
 import React, { useState, useContext, useEffect } from 'react';
 import './styles/index.less';
 import { DmContext, upDatedDmFun } from '../../store';
@@ -14,8 +14,7 @@ import PlanList from '../dataPlan';
 import DataCollection from '../dataCollection';
 var DataManage = function DataManage(props) {
   var _useContext = useContext(BizGlobalDataContext),
-    isDemo = _useContext.isDemo,
-    envs = _useContext.envs;
+    isDemo = _useContext.isDemo;
   var classPrefix = 'data-manage';
   var updateEventMetas = props.updateEventMetas,
     showPlan = props.showPlan;
@@ -47,50 +46,17 @@ var DataManage = function DataManage(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "tabs-box ".concat(collapsed && 'tabs-collapsed')
   }, /*#__PURE__*/React.createElement(Tabs, {
     className: "tabs ".concat(isDemo && 'tabs-demo'),
     defaultActiveKey: "0",
-    tabPosition: "left",
     onChange: tabsChange
   }, /*#__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"
-    })), !collapsed && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
-      type: "maidianguanli"
-    }), "\u57CB\u70B9\u7BA1\u7406")),
+    tab: "\u57CB\u70B9\u7BA1\u7406",
     key: "0"
   }), showPlan && /*#__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"
-    })), !collapsed && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
-      type: "maidianfanganguanli"
-    }), "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406")),
+    tab: "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406",
     key: "1"
   })), /*#__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))));
 };

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

@@ -1,57 +1,18 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .data-manage {
   position: relative;
-  display: flex;
   min-height: 100%;
-  background: #f5f5f5;
-  .tabs-box {
-    position: relative;
-    min-width: 240px;
-    margin-right: 24px;
-    background: #fff;
-    .tabs {
-      min-width: 240px;
-      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-content-holder {
-        display: none;
-      }
-    }
-    .tabs-demo {
-      top: 86px !important;
+  background: #fafafb;
+  .tabs {
+    height: 48px;
+    .ant-tabs-tab-btn {
+      font-size: 16px !important;
     }
-    .zhidie-botton {
-      position: absolute;
-      bottom: 0;
-      left: -10px;
-      width: 100%;
-      height: 40px;
-      font-size: 24px !important;
-      border-top: 1px solid #e8efff;
-      .bsicon {
-        margin-left: 19px;
+    .ant-tabs-nav {
+      height: 48px;
+      background: #fff;
+      .ant-tabs-tab {
+        margin: 0 0 0 24px !important;
       }
     }
   }
@@ -68,10 +29,8 @@
     }
   }
   .dmcontent {
-    width: calc(100% - 264px);
-    padding: 16px 0 24px 0;
-  }
-  .dmcontent-collapsed {
-    width: calc(100% - 104px);
+    height: calc(100vh - 48px);
+    padding: 16px;
+    background: #fafafb;
   }
 }

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

@@ -2,8 +2,7 @@
 .plan-list {
   position: relative;
   height: 100%;
-  margin-right: 24px;
-  padding: 20px 24px 24px 24px;
+  padding: 24px;
   background: #fff;
   border-radius: 8px;
   .clearfix:after {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.23-idMapping.1",
+  "version": "1.0.24-idmapping.0",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -49,7 +49,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2a12352b0d095f950bb262070ce73ad54f207634",
+  "gitHead": "5a1b59d91fab3d0b11c4297ac4063f5d44100070",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }