@zgfe/modules-dm 1.0.22 → 1.0.23-alpha.0

package/es/modules/dataCollection/collectionEventList.js

@@ -144,7 +144,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

@@ -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 { 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';
@@ -32,8 +32,8 @@ var DataCollection = function DataCollection(props) {
       listTab = _useState2[0],
       setListTab = _useState2[1];
 
-  var tabsChange = function tabsChange(activeKey) {
-    setListTab(Number(activeKey));
+  var tabsChange = function tabsChange(e) {
+    setListTab(Number(e.target.value));
   }; // 判断埋点方案开关是否打开
 
 
@@ -77,16 +77,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

@@ -10,8 +10,8 @@ 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 { 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';
@@ -21,8 +21,7 @@ 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,
@@ -61,50 +60,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,58 +1,12 @@
 @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;
+  .tabs {
+    height: 48px;
+    margin-left: 16px;
+    .ant-tabs-nav {
       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;
-    }
-    .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;
-      }
     }
   }
   .tabs-collapsed {
@@ -68,10 +22,7 @@
     }
   }
   .dmcontent {
-    width: calc(100% - 264px);
-    padding: 16px 0 24px 0;
-  }
-  .dmcontent-collapsed {
-    width: calc(100% - 104px);
+    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.22",
+  "version": "1.0.23-alpha.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": "531aff3fe40b4f7edddb551c5aec5e3acc206344",
+  "gitHead": "d926bebd72831d45cf7f0f66e4e2d755d8eb5672",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }