@zgfe/modules-dm 1.0.2-dm.10 → 1.0.2-dm.12

package/es/modules/dataCollection/tablePlus.js

@@ -214,10 +214,8 @@ var TablePlus = function TablePlus(props) {
         event_id: event_id
       }, _temp)
     }).then(function (res) {
-      if (res) {
-        message.success('修改成功');
-        props.Refresh();
-      }
+      message.success('修改成功');
+      state.updateEventMetas ? state.updateEventMetas() : props.Refresh(); // 更新store
     }).catch(function (err) {
       message.error('修改失败');
     }).finally(function () {});

package/es/modules/dataManage/index.js

@@ -37,7 +37,7 @@ var DataManage = function DataManage(props) {
     });
   }, []);
 
-  var _useState = useState('0'),
+  var _useState = useState('1'),
       _useState2 = _slicedToArray(_useState, 2),
       menuTab = _useState2[0],
       setMenuTab = _useState2[1];
@@ -69,7 +69,7 @@ var DataManage = function DataManage(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-menu")
   }, /*#__PURE__*/React.createElement(Menu, {
-    defaultSelectedKeys: ['0'],
+    defaultSelectedKeys: ['1'],
     onSelect: onSelect,
     items: items
   })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));

package/es/modules/dataPlan/addPlan.js

@@ -17,7 +17,7 @@ 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, Tabs, Drawer, Upload, message, Checkbox, Empty } from 'antd';
+import { Input, Button, Select, Tabs, Drawer, Upload, message, Checkbox, Empty, Spin } from 'antd';
 var Option = Select.Option;
 import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
@@ -41,13 +41,20 @@ var AddPlan = function AddPlan(props) {
       currentApp = _useContext.currentApp,
       isDemo = _useContext.isDemo;
 
-  console.log('isDemo', isDemo); // console.log('detailId', props.detailId, props.detailName);
+  console.log('isDemo', isDemo);
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      spinning = _useState2[0],
+      setSpinning = _useState2[1]; // console.log('detailId', props.detailId, props.detailName);
+
 
   useEffect(function () {
     setPlanName(props.detailName);
   }, [props.detailName]);
   useEffect(function () {
     if (props.detailId != -1) {
+      setSpinning(true);
       request(apis.queryPlanDetail, {
         method: 'get',
         params: {
@@ -59,19 +66,21 @@ var AddPlan = function AddPlan(props) {
         tableDataHandle(res.data, res.data.propPlanAndRealDataDiff, 'detail');
       }).catch(function (err) {
         message.error('获取详情数据失败');
+      }).finally(function () {
+        setSpinning(false);
       });
     }
   }, [props.detailId]); // 方案名称
 
-  var _useState = useState('input'),
-      _useState2 = _slicedToArray(_useState, 2),
-      detailNameShow = _useState2[0],
-      setDetailNameShow = _useState2[1];
-
-  var _useState3 = useState(''),
+  var _useState3 = useState('input'),
       _useState4 = _slicedToArray(_useState3, 2),
-      planName = _useState4[0],
-      setPlanName = _useState4[1];
+      detailNameShow = _useState4[0],
+      setDetailNameShow = _useState4[1];
+
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      planName = _useState6[0],
+      setPlanName = _useState6[1];
 
   var PlanNameChange = function PlanNameChange(e) {
     if (e.currentTarget.value.length > 20) {
@@ -105,15 +114,15 @@ var AddPlan = function AddPlan(props) {
     setExportValue('导出');
   };
 
-  var _useState5 = useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      visible = _useState6[0],
-      setVisible = _useState6[1];
-
-  var _useState7 = useState('1'),
+  var _useState7 = useState(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      listTab = _useState8[0],
-      setListTab = _useState8[1];
+      visible = _useState8[0],
+      setVisible = _useState8[1];
+
+  var _useState9 = useState('1'),
+      _useState10 = _slicedToArray(_useState9, 2),
+      listTab = _useState10[0],
+      setListTab = _useState10[1];
 
   var tabsChange = function tabsChange(activeKey) {
     setListTab(activeKey);
@@ -121,15 +130,15 @@ var AddPlan = function AddPlan(props) {
     setSelectedRowKeys([]);
   };
 
-  var _useState9 = useState(0),
-      _useState10 = _slicedToArray(_useState9, 2),
-      searchTotal = _useState10[0],
-      setSearchTotal = _useState10[1];
-
-  var _useState11 = useState(''),
+  var _useState11 = useState(0),
       _useState12 = _slicedToArray(_useState11, 2),
-      searchData = _useState12[0],
-      setSearchData = _useState12[1]; // 关闭抽屉
+      searchTotal = _useState12[0],
+      setSearchTotal = _useState12[1];
+
+  var _useState13 = useState(''),
+      _useState14 = _slicedToArray(_useState13, 2),
+      searchData = _useState14[0],
+      setSearchData = _useState14[1]; // 关闭抽屉
 
 
   var closeDrawer = function closeDrawer(type) {
@@ -151,15 +160,16 @@ var AddPlan = function AddPlan(props) {
     showUploadList: false,
     beforeUpload: function beforeUpload(file) {
       console.log(file);
+      setSpinning(true);
       var fileType = file.name.split('.');
 
       if (fileType[fileType.length - 1] != 'xlsx' && fileType[fileType.length - 1] != 'xsl') {
-        message.error('上传仅支持xlsx或xsl格式的文件');
+        message.error('仅支持excel(xsl、xlsx)格式文件，请检查后重新上传');
         return;
       }
 
       if (file.size > 5 * 1024 * 1024) {
-        message.error('最大支持上传5M的文件');
+        message.error('文件大小支持5M以内，请检查后重新上传');
         return;
       }
 
@@ -193,33 +203,35 @@ var AddPlan = function AddPlan(props) {
         setListTab('1');
       }).catch(function (err) {
         message.error('上传失败');
+      }).finally(function () {
+        setSpinning(false);
       });
       return false;
     }
   }; // 事件列表-渲染数据
 
-  var _useState13 = useState([]),
-      _useState14 = _slicedToArray(_useState13, 2),
-      eventListData = _useState14[0],
-      setEventListData = _useState14[1]; // 事件列表-原数据
-
-
   var _useState15 = useState([]),
       _useState16 = _slicedToArray(_useState15, 2),
-      eventListDataCopy = _useState16[0],
-      setEventListDataCopy = _useState16[1]; // 用户属性列表-渲染数据
+      eventListData = _useState16[0],
+      setEventListData = _useState16[1]; // 事件列表-原数据
 
 
   var _useState17 = useState([]),
       _useState18 = _slicedToArray(_useState17, 2),
-      userAttrData = _useState18[0],
-      setUserAttrData = _useState18[1]; // 用户属性列表-原数据
+      eventListDataCopy = _useState18[0],
+      setEventListDataCopy = _useState18[1]; // 用户属性列表-渲染数据
 
 
   var _useState19 = useState([]),
       _useState20 = _slicedToArray(_useState19, 2),
-      userAttrDataCopy = _useState20[0],
-      setUserAttrDataCopy = _useState20[1]; // 手动添加事件或属性
+      userAttrData = _useState20[0],
+      setUserAttrData = _useState20[1]; // 用户属性列表-原数据
+
+
+  var _useState21 = useState([]),
+      _useState22 = _slicedToArray(_useState21, 2),
+      userAttrDataCopy = _useState22[0],
+      setUserAttrDataCopy = _useState22[1]; // 手动添加事件或属性
 
 
   var addEventOrUserFun = function addEventOrUserFun(data) {
@@ -380,10 +392,10 @@ var AddPlan = function AddPlan(props) {
   }; // 保存方案按钮是否置灰
 
 
-  var _useState21 = useState(false),
-      _useState22 = _slicedToArray(_useState21, 2),
-      saveDisabled = _useState22[0],
-      setSaveDisabled = _useState22[1];
+  var _useState23 = useState(false),
+      _useState24 = _slicedToArray(_useState23, 2),
+      saveDisabled = _useState24[0],
+      setSaveDisabled = _useState24[1];
 
   useEffect(function () {
     if (JSON.stringify(eventListData).indexOf('eventName') == -1) {
@@ -414,7 +426,7 @@ var AddPlan = function AddPlan(props) {
 
     var eventPlanList = [];
     var userPropPlanList = [];
-    eventListData.map(function (_item) {
+    eventListDataCopy.map(function (_item) {
       var _loop2 = function _loop2(key) {
         _item[key].map(function (item) {
           item.attributeName.map(function (_item) {
@@ -431,7 +443,7 @@ var AddPlan = function AddPlan(props) {
         _loop2(key);
       }
     });
-    userAttrData.map(function (item) {
+    userAttrDataCopy.map(function (item) {
       userPropPlanList.push(item);
     });
     var ManagementPlan = {
@@ -441,6 +453,20 @@ var AddPlan = function AddPlan(props) {
       eventPlanList: eventPlanList,
       userPropPlanList: userPropPlanList
     };
+    var eventCount = 0;
+    eventListDataCopy.map(function (_item, index) {
+      for (var key in _item) {
+        _item[key].map(function (item) {
+          eventCount++;
+        });
+      }
+    });
+
+    if (eventCount > 500) {
+      message.error('每个方案最多保存500条数据，请修改后重新保存');
+      return;
+    }
+
     request(apis.savePlan, {
       method: 'post',
       data: _objectSpread({}, ManagementPlan)
@@ -455,10 +481,10 @@ var AddPlan = function AddPlan(props) {
   }; // 存储选中的keys
 
 
-  var _useState23 = useState([]),
-      _useState24 = _slicedToArray(_useState23, 2),
-      selectedRowKeys = _useState24[0],
-      setSelectedRowKeys = _useState24[1];
+  var _useState25 = useState([]),
+      _useState26 = _slicedToArray(_useState25, 2),
+      selectedRowKeys = _useState26[0],
+      setSelectedRowKeys = _useState26[1];
 
   var tableCheck = function tableCheck(e, record) {
     // console.log(e.target.checked, record.key);
@@ -503,42 +529,56 @@ var AddPlan = function AddPlan(props) {
   // 批量删除
 
 
-  var batchDetele = function batchDetele() {
-    if (listTab == '1') {
-      var data = _.cloneDeep(eventListData);
+  var deteleDataHandle = function deteleDataHandle(data) {
+    var _tempData = [];
+    data.map(function (_item, index) {
+      var _jsop = {};
 
-      var _tempData = [];
-      data.map(function (_item, index) {
-        var _jsop = {};
+      var _loop3 = function _loop3(key) {
+        var _data = [];
 
-        var _loop3 = function _loop3(key) {
-          var _data = [];
+        _item[key].map(function (item) {
+          selectedRowKeys.indexOf(item.key) == -1 ? _data.push(item) : null;
+        });
 
-          _item[key].map(function (item) {
-            selectedRowKeys.indexOf(item.key) == -1 ? _data.push(item) : null;
-          });
+        if (_data.length > 0) {
+          _jsop[key] = _data;
+        }
+      };
 
-          if (_data.length > 0) {
-            _jsop[key] = _data;
-          }
-        };
+      for (var key in _item) {
+        _loop3(key);
+      }
 
-        for (var key in _item) {
-          _loop3(key);
-        }
+      _tempData.push(_jsop);
+    });
+    return _tempData;
+  };
+
+  var batchDetele = function batchDetele() {
+    if (listTab == '1') {
+      var _tempData = deteleDataHandle(_.cloneDeep(eventListData));
+
+      var _tempDataCopy = deteleDataHandle(_.cloneDeep(eventListDataCopy));
 
-        _tempData.push(_jsop);
-      });
       setEventListData(_tempData);
-      setEventListDataCopy(_tempData); // 备份
+      setEventListDataCopy(_tempDataCopy); // 备份
     } else {
-      var _data4 = _.cloneDeep(userAttrData);
+      var data = _.cloneDeep(userAttrData);
+
+      _.remove(data, function (x) {
+        return selectedRowKeys.indexOf(x.key) != -1;
+      });
 
-      _.remove(_data4, function (x) {
+      setUserAttrData(data);
+
+      var dataCopy = _.cloneDeep(userAttrDataCopy);
+
+      _.remove(dataCopy, function (x) {
         return selectedRowKeys.indexOf(x.key) != -1;
       });
 
-      setUserAttrData(_data4);
+      setUserAttrDataCopy(dataCopy); // 备份
     }
 
     setEditOperate(true);
@@ -547,16 +587,16 @@ var AddPlan = function AddPlan(props) {
   }; // 是否有编辑操作
 
 
-  var _useState25 = useState(false),
-      _useState26 = _slicedToArray(_useState25, 2),
-      editOperate = _useState26[0],
-      setEditOperate = _useState26[1]; // 保存时，方案名称若为空，Input显示校验提示
+  var _useState27 = useState(false),
+      _useState28 = _slicedToArray(_useState27, 2),
+      editOperate = _useState28[0],
+      setEditOperate = _useState28[1]; // 保存时，方案名称若为空，Input显示校验提示
 
 
-  var _useState27 = useState(''),
-      _useState28 = _slicedToArray(_useState27, 2),
-      planNameInputStatus = _useState28[0],
-      setplanNameInputStatus = _useState28[1]; // 检索条数
+  var _useState29 = useState(''),
+      _useState30 = _slicedToArray(_useState29, 2),
+      planNameInputStatus = _useState30[0],
+      setplanNameInputStatus = _useState30[1]; // 检索条数
 
 
   useEffect(function () {
@@ -575,10 +615,10 @@ var AddPlan = function AddPlan(props) {
     }
   }, [listTab, eventListData, userAttrData]);
 
-  var _useState29 = useState('导出'),
-      _useState30 = _slicedToArray(_useState29, 2),
-      exportValue = _useState30[0],
-      setExportValue = _useState30[1];
+  var _useState31 = useState('导出'),
+      _useState32 = _slicedToArray(_useState31, 2),
+      exportValue = _useState32[0],
+      setExportValue = _useState32[1];
 
   return /*#__PURE__*/React.createElement(Drawer, {
     width: '70%',
@@ -692,6 +732,10 @@ var AddPlan = function AddPlan(props) {
     type: listTab == '1' ? 'event' : 'user',
     visible: visible,
     setVisible: setVisible
+  }), /*#__PURE__*/React.createElement(Spin, {
+    size: "large",
+    spinning: spinning,
+    className: "spin"
   })));
 };
 

package/es/modules/dataPlan/index.js

@@ -205,6 +205,10 @@ var PlanList = function PlanList(props) {
     checked: isOpen
   })), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
+      if (listData.length >= 10) {
+        return message.error('最多创建10个埋点方案');
+      }
+
       setDrawerShow(true);
     },
     type: "primary",

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

@@ -76,6 +76,11 @@
 .add-plan {
   position: relative;
   height: 100%;
+  .spin {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+  }
   .point-active,
   .point-active-null {
     display: inline-block;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.10",
+  "version": "1.0.2-dm.12",
   "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": "99ea80ca260424d957ab32ecbac64e20a8aebfe3",
+  "gitHead": "b45f54ede05d8585062a2131b48eeefd22543bd0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }