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

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';
@@ -20,9 +20,8 @@ import PlanList from '../dataPlan';
 import DataCollection from '../dataCollection';
 
 var DataManage = function DataManage(props) {
-  console.log('DataManage-key', 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),
@@ -38,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,
@@ -76,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",
@@ -85,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.27",
+  "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": "40b9ba4db922193b4bd91f814850a1e67a484c48",
+  "gitHead": "cc080cf3bbabd5ba7eb4c88bb49695de615f63a7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }