@zgfe/modules-dm 1.0.2-dm.9 → 1.0.2-y.1

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) {
@@ -24,8 +25,9 @@ var PlanList = function PlanList(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo; // 查看方案
+      isDemo = _useContext.isDemo;
 
+  console.log('②埋点方案管理', currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, getAppID(currentApp)); // 查看方案
 
   var tableSee = function tableSee(data) {
     setDetailId(data.id);
@@ -35,6 +37,11 @@ var PlanList = function PlanList(props) {
 
 
   var tableDel = function tableDel(data) {
+    if (isDemo) {
+      message.error('demo环境，无法删除');
+      return;
+    }
+
     Modal.confirm({
       centered: true,
       title: '是否确认删除方案？',
@@ -45,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) {
@@ -117,11 +124,10 @@ 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) {
-      if (!res) throw new Error();
-      setListData(res.data.planList);
+      res.data && res.data.planList && setListData(res.data.planList);
     }).catch(function (err) {
       console.error('查询列表失败', err);
     }).finally(function () {});
@@ -158,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;
@@ -176,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) {
@@ -194,17 +200,26 @@ var PlanList = function PlanList(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, !drawerShow && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     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",
     checked: isOpen
   })), /*#__PURE__*/React.createElement(Button, {
+    disabled: isDemo,
     onClick: function onClick() {
+      if (listData.length >= 10) {
+        return message.error('最多创建10个埋点方案');
+      }
+
       setDrawerShow(true);
     },
     type: "primary",
@@ -213,7 +228,7 @@ var PlanList = function PlanList(props) {
     type: "tianjia",
     style: {
       marginRight: '5px',
-      verticalAlign: '-2px'
+      verticalAlign: '-1px'
     }
   }), "\u65B0\u589E\u57CB\u70B9\u65B9\u6848")), /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
@@ -222,7 +237,7 @@ var PlanList = function PlanList(props) {
     dataSource: listData,
     // onChange={onChange}
     pagination: false
-  })), /*#__PURE__*/React.createElement(AddPlan, {
+  }), /*#__PURE__*/React.createElement(AddPlan, {
     listData: listData,
     detailName: detailName,
     drawerShow: drawerShow,

package/es/modules/dataPlan/search.d.ts

@@ -6,6 +6,7 @@ interface PropsType {
     searchData: string;
     setSearchData: Function;
     setVisible: Function;
+    isDemo?: boolean;
 }
 declare const Search: React.FC<PropsType>;
 export default Search;

package/es/modules/dataPlan/search.js

@@ -23,15 +23,16 @@ var Search = function Search(props) {
     })
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-text")
-  }, "\u5171", /*#__PURE__*/React.createElement("span", null, props.total), "\u6761 / \u4E0A\u9650500\u6761"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u5171 ", /*#__PURE__*/React.createElement("span", null, props.total), " \u6761 / \u4E0A\u9650500\u6761"), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(IconFont, {
       type: "tianjia",
       style: {
         marginRight: '5px',
-        verticalAlign: '-2px'
+        verticalAlign: '-1px'
       }
     }),
     type: "primary",
+    disabled: props.isDemo,
     className: "".concat(classPrefix, "-add-button"),
     onClick: function onClick() {
       props.setVisible(true);

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

@@ -1,11 +1,11 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .plan-list {
   position: relative;
-  width: calc(100% - 264px);
   height: 100%;
-  margin-top: 16px;
-  padding: 24px;
+  margin-right: 24px;
+  padding: 20px 24px 24px 24px;
   background: #fff;
+  border-radius: 8px;
   .clearfix:after {
     display: block;
     clear: both;
@@ -42,12 +42,17 @@
     // border-top: 1px solid #e8efff;
     .switch-div {
       float: left;
+      .ant-switch {
+        width: 24px;
+        margin-top: -2px;
+      }
       span {
         margin-right: 20px;
       }
     }
     .add {
       float: right;
+      line-height: 20px;
     }
   }
   &-table-see {
@@ -76,6 +81,23 @@
 .add-plan {
   position: relative;
   height: 100%;
+  &-drawer {
+    .ant-drawer-header-title {
+      height: 20px;
+      .ant-drawer-close {
+        position: absolute;
+        right: 6px;
+      }
+    }
+    .ant-drawer-mask {
+      background: rgba(0, 0, 0, 0.8);
+    }
+  }
+  .spin {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+  }
   .point-active,
   .point-active-null {
     display: inline-block;
@@ -94,7 +116,7 @@
   &-top {
     position: relative;
     display: flex;
-    margin-bottom: 30px;
+    margin-top: -8px;
     .input-waring {
       position: absolute;
       bottom: -30px;
@@ -107,6 +129,8 @@
     .plan-name-div {
       display: flex;
       height: 32px;
+      margin-top: -10px;
+      margin-bottom: -8px;
       color: #242541;
       font-weight: 500;
       font-size: 16px;
@@ -131,8 +155,8 @@
   }
   &-tabs {
     position: relative;
-    display: flex;
-    margin-bottom: 15px;
+    // display: flex;
+    // margin-bottom: 15px;
     > :nth-child(1) {
       border-radius: 4px 0 0 4px !important;
     }
@@ -141,8 +165,8 @@
     }
     .handle-box {
       position: absolute;
-      top: 14px;
-      right: 20px;
+      top: 5px;
+      right: 0;
       .bsicon {
         margin-right: 10px;
       }
@@ -158,15 +182,22 @@
     }
   }
   &-table-header {
-    display: flex;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    background: #fff;
-    li {
-      width: 25%;
-      padding: 16px;
-      border: 1px solid #e8efff;
+    .ant-table-tbody {
+      display: none;
+    }
+    .ant-table {
+      border-radius: 8px 8px 0 0 !important;
+    }
+  }
+  &-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,
@@ -209,6 +240,10 @@
       .ant-table-thead {
         display: none;
       }
+      .ant-table {
+        border: none;
+        border-radius: 0;
+      }
     }
     // &-table-header {
     //   display: flex;
@@ -235,6 +270,17 @@
     }
   }
   .add-event {
+    .set-del {
+      margin-left: 15px;
+      color: #021429;
+    }
+    .set-del-err {
+      color: #cacdd4;
+      cursor: not-allowed;
+    }
+    .ant-modal-body {
+      padding: 5px 24px 24px 24px;
+    }
     .ant-form-item {
       margin: 0;
     }
@@ -259,11 +305,13 @@
     &-text {
       span {
         color: @primary-color;
+        font-weight: bold;
       }
     }
     &-add-button {
       position: absolute;
-      right: 20px;
+      right: 0;
+      line-height: 20px;
     }
   }
 }

package/es/modules/dataPlan/userAttributeList.js

@@ -1,31 +1,11 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 import { Select, Table, Checkbox } from 'antd';
 var Option = Select.Option;
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import './styles/index.less';
 
 var UserAttributeList = function UserAttributeList(props) {
   var classPrefix = 'user-list'; // console.log('userAttrData', props.userAttrData);
-
-  var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      renderData = _useState2[0],
-      setRenderData = _useState2[1];
-
-  useEffect(function () {
-    setRenderData(props.userAttrData);
-  }, [props.userAttrData]); // 表格列
+  // 表格列
 
   var columns = [{
     title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Checkbox, {
@@ -68,8 +48,7 @@ var UserAttributeList = function UserAttributeList(props) {
   }, /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
-    dataSource: renderData,
-    bordered: true,
+    dataSource: props.userAttrData,
     pagination: false
   }));
 };

package/es/store/index.js

@@ -10,18 +10,23 @@ 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/store/state.js

@@ -1,6 +1,4 @@
 export var initState = {
   // 更新主应用回调
-  updateEventMetas: function updateEventMetas() {
-    console.log('1更新主应用回调');
-  }
+  updateEventMetas: function updateEventMetas() {}
 };

package/es/utils/index.d.ts

@@ -0,0 +1,7 @@
+export declare const getAppID: (currentApp: any) => any;
+/**
+ * 获取第一个表格的可视化高度
+ * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)
+ * @param {*} id 当前页面中有多个table时需要制定table的id
+ */
+export declare function getTableScroll(extraHeight?: any, id?: any): string;

package/es/utils/index.js

@@ -0,0 +1,43 @@
+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;
+  }
+};
+/**
+ * 获取第一个表格的可视化高度
+ * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)
+ * @param {*} id 当前页面中有多个table时需要制定table的id
+ */
+
+export function getTableScroll(extraHeight, id) {
+  if (typeof extraHeight == 'undefined') {
+    //  默认底部分页64 + 边距10
+    extraHeight = 74;
+  }
+
+  var tHeader = null;
+
+  if (id) {
+    var _document$getElementB;
+
+    tHeader = document.getElementById(id) ? (_document$getElementB = document.getElementById(id)) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.getElementsByClassName('ant-table-thead')[0] : null;
+  } else {
+    tHeader = document.getElementsByClassName('ant-table-thead')[0];
+  } //表格内容距离顶部的距离
+
+
+  var tHeaderBottom = 0;
+
+  if (tHeader) {
+    tHeaderBottom = tHeader.getBoundingClientRect().bottom;
+  } //窗体高度-表格内容顶部的高度-表格内容底部的高度
+  // let height = document.body.clientHeight - tHeaderBottom - extraHeight
+
+
+  var height = "calc(100vh - ".concat(tHeaderBottom + extraHeight, "px)");
+  return height;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.9",
+  "version": "1.0.2-y.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.7-dmd.1",
+    "@zgfe/business-lib": "1.1.7-dmd2.8",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d8ae6500f3351c63b291bbadcae1b688d4a3e8e1",
+  "gitHead": "370c8eb31239d14d50c9a08c37fc8ec45b461ff0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }