@zgfe/modules-dm 1.0.2-dm.1 → 1.0.2-dm.11

package/es/modules/dataCollection/collectionAttributeList.js

@@ -38,7 +38,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
-      setLoading = _useState2[1]; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示,true异常
+      setLoading = _useState2[1]; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
 
 
   var rowRenderHandle = function rowRenderHandle(name) {
@@ -47,13 +47,17 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
 
       return (queryPlanData === null || queryPlanData === void 0 ? void 0 : (_queryPlanData$unexpe = queryPlanData.unexpectedPropList) === null || _queryPlanData$unexpe === void 0 ? void 0 : _queryPlanData$unexpe.indexOf(name)) != -1 && isOpen == 1 ? true : false;
     } else {
-      var _temp2, _temp2$attrList;
-
-      var _temp = {};
-      queryPlanData.eventPlanAndRealDataDiff.map(function (item) {
-        if (item.eventName == (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name)) _temp = item;
-      });
-      return Object.keys(_temp).length <= 0 ? true : ((_temp2 = _temp) === null || _temp2 === void 0 ? void 0 : (_temp2$attrList = _temp2.attrList) === null || _temp2$attrList === void 0 ? void 0 : _temp2$attrList.indexOf(name)) == -1 && isOpen == 1 ? true : false;
+      if (isOpen != 1) {
+        return false;
+      } else {
+        var _temp2, _temp2$attrList;
+
+        var _temp = {};
+        queryPlanData.eventPlanAndRealDataDiff.map(function (item) {
+          if (item.eventName == (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name)) _temp = item;
+        });
+        return Object.keys(_temp).length <= 0 ? true : ((_temp2 = _temp) === null || _temp2 === void 0 ? void 0 : (_temp2$attrList = _temp2.attrList) === null || _temp2$attrList === void 0 ? void 0 : _temp2$attrList.indexOf(name)) == -1 ? true : false;
+      }
     }
   }; // 用户属性列表
 
@@ -97,17 +101,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       setUserAttrData(_temp);
       setLoading(false);
     }
-  }, [source]); // 方案名称
-
-  var _useState5 = useState(''),
-      _useState6 = _slicedToArray(_useState5, 2),
-      planName = _useState6[0],
-      setPlanName = _useState6[1];
-
-  var PlanNameChange = function PlanNameChange(e) {
-    setPlanName(e.currentTarget.value);
-  }; // 复制属性名称
-
+  }, [source]); // 复制属性名称
 
   var copyAttrName = function copyAttrName(name) {
     navigator.clipboard.writeText(name);
@@ -115,10 +109,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   }; // 别名foucs
 
 
-  var _useState7 = useState(''),
-      _useState8 = _slicedToArray(_useState7, 2),
-      aliasFocusData = _useState8[0],
-      setAliasFocusData = _useState8[1];
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      aliasFocusData = _useState6[0],
+      setAliasFocusData = _useState6[1];
 
   var aliasFocus = function aliasFocus(e) {
     setAliasFocusData(e.currentTarget.value);
@@ -141,7 +135,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         message.success('修改成功');
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 表格列
 
@@ -292,25 +286,25 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     dataIndex: 'mapping_value'
   }];
 
-  var _useState9 = useState([]),
+  var _useState7 = useState([]),
+      _useState8 = _slicedToArray(_useState7, 2),
+      attrExcelData = _useState8[0],
+      setAttrExcelData = _useState8[1];
+
+  var _useState9 = useState(false),
       _useState10 = _slicedToArray(_useState9, 2),
-      attrExcelData = _useState10[0],
-      setAttrExcelData = _useState10[1];
+      attrAliasNameShow = _useState10[0],
+      setAttrAliasNameShow = _useState10[1];
 
-  var _useState11 = useState(false),
+  var _useState11 = useState(0),
       _useState12 = _slicedToArray(_useState11, 2),
-      attrAliasNameShow = _useState12[0],
-      setAttrAliasNameShow = _useState12[1];
+      attrId = _useState12[0],
+      setattrId = _useState12[1];
 
   var _useState13 = useState(0),
       _useState14 = _slicedToArray(_useState13, 2),
-      attrId = _useState14[0],
-      setattrId = _useState14[1];
-
-  var _useState15 = useState(0),
-      _useState16 = _slicedToArray(_useState15, 2),
-      batchId = _useState16[0],
-      setBatchId = _useState16[1];
+      batchId = _useState14[0],
+      setBatchId = _useState14[1];
 
   var uploadProps = {
     maxCount: 1,
@@ -333,15 +327,16 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           setAttrExcelData(res.values);
         }
       }).catch(function (err) {
-        message.success('上传失败');
+        message.error('上传失败');
       });
+      return false;
     }
   }; // 清空属性值别名excel数据
 
-  var _useState17 = useState(false),
-      _useState18 = _slicedToArray(_useState17, 2),
-      clearFlag = _useState18[0],
-      setClearFlag = _useState18[1];
+  var _useState15 = useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      clearFlag = _useState16[0],
+      setClearFlag = _useState16[1];
 
   var clearData = function clearData() {
     setAttrExcelData([]);
@@ -366,7 +361,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         setAttrAliasNameShow(false);
       }
     }).catch(function (err) {
-      message.success('操作失败');
+      message.error('操作失败');
     });
   }; // 获取已设置的属性值别名列表
 

package/es/modules/dataCollection/collectionEventList.js

@@ -24,7 +24,8 @@ var CollectionEventList = function CollectionEventList(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo;
+      isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
+
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -150,6 +151,11 @@ var CollectionEventList = function CollectionEventList(props) {
 
 
   var createEventGroup = function createEventGroup() {
+    if (eventNameInput == '') {
+      message.error('请输入分组名称');
+      return;
+    }
+
     if (eventNameInput.length > 20) {
       message.error('名称不可超过20字符');
       return;
@@ -169,8 +175,10 @@ var CollectionEventList = function CollectionEventList(props) {
         queryList();
       }
     }).catch(function (err) {
-      message.success('创建失败');
-    }).finally(function () {});
+      message.error('创建失败');
+    }).finally(function () {
+      setEventNameInput('');
+    });
   }; // 筛选：显示状态 | 采集状态
 
 
@@ -306,13 +314,16 @@ var CollectionEventList = function CollectionEventList(props) {
     setEventAttrListShow: setEventAttrListShow
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
+    destroyOnClose: true,
     visible: eventNameShow,
     onOk: createEventGroup,
     onCancel: function onCancel() {
-      return setEventNameShow(false);
+      setEventNameShow(false);
+      setEventNameInput('');
     }
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
+    value: eventNameInput,
     onChange: function onChange(e) {
       return setEventNameInput(e.currentTarget.value);
     }

package/es/modules/dataCollection/index.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
-declare const DataCollection: React.FC;
+interface DataCollectionProps {
+}
+declare const DataCollection: React.FC<DataCollectionProps>;
 export default DataCollection;

package/es/modules/dataCollection/index.js

@@ -23,7 +23,8 @@ var DataCollection = function DataCollection(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo;
+      isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
+
 
   var _useState = useState(1),
       _useState2 = _slicedToArray(_useState, 2),

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

@@ -81,6 +81,11 @@
             display: inline-block !important;
           }
         }
+        .alias_name_popover {
+          width: 200px;
+          word-break: break-all;
+          background: red;
+        }
         .alias_name {
           background: #fff !important;
           border: none;
@@ -94,6 +99,16 @@
         }
         .group-row {
           border-top: 12px solid #f5f5f5;
+          .ant-table-cell-fix-left {
+            left: 0px;
+            display: block;
+            width: 500px;
+            background: #fff;
+          }
+          .ant-table-cell-fix-left-first::after,
+          .ant-table-cell-fix-left-last::after {
+            box-shadow: none;
+          }
           td {
             padding: 6px 16px;
           }
@@ -106,7 +121,7 @@
         }
         .group-box {
           display: flex;
-          width: 500px;
+          width: 800px;
           line-height: 30px;
           .ant-input {
             width: 150px;
@@ -116,13 +131,13 @@
             margin-right: 4px;
             font-size: 18px !important;
           }
-          .group-text {
-            display: -webkit-box;
-            width: 120px;
-            overflow: hidden;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-          }
+          // .group-text {
+          //   display: -webkit-box;
+          //   width: 120px;
+          //   overflow: hidden;
+          //   -webkit-box-orient: vertical;
+          //   -webkit-line-clamp: 1;
+          // }
           .group-handle {
             margin-left: 30px;
             cursor: pointer;
@@ -204,6 +219,9 @@
           cursor: pointer;
           user-select: none;
         }
+        .set-error {
+          color: #86909c;
+        }
       }
     }
   }

package/es/modules/dataCollection/tablePlus.js

@@ -24,6 +24,7 @@ var Option = Select.Option;
 import React, { useState, useContext } from 'react';
 import './styles/index.less';
 import _ from 'lodash';
+import { DmContext } from '../../store';
 
 var TablePlus = function TablePlus(props) {
   var classPrefix = 'table-plus';
@@ -33,7 +34,10 @@ var TablePlus = function TablePlus(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo; // 别名foucs
+      isDemo = _useContext.isDemo;
+
+  var _useContext2 = useContext(DmContext),
+      state = _useContext2.state; // 别名foucs
 
 
   var _useState = useState(''),
@@ -58,11 +62,16 @@ var TablePlus = function TablePlus(props) {
       }
     }).then(function (res) {
       if (res) {
-        message.success('修改成功');
+        message.success('修改成功'); // props.Refresh();
+
+        console.log(state.updateEventMetas);
+        state.updateEventMetas ? state.updateEventMetas() : props.Refresh(); // 更新store
       }
     }).catch(function (err) {
-      message.success('修改失败');
-    }).finally(function () {});
+      message.error('修改失败');
+    }).finally(function () {
+      setAliasFocusData('');
+    });
   }; // 表格class处理
 
 
@@ -110,7 +119,7 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 删除分组
 
@@ -140,7 +149,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -168,7 +177,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -205,12 +214,10 @@ 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.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 复制事件名称
 
@@ -269,14 +276,16 @@ var TablePlus = function TablePlus(props) {
     if (eventGroupId != undefined) _temp = {
       eventGroupId: eventGroupId
     };
+    if (type != 'copy') _temp = _objectSpread(_objectSpread({}, _temp), {}, {
+      oldEventGroupId: data.groupId
+    });
     request(apis.operateGroupRelations, {
       method: 'post',
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0,
         hasPublicAttrView: true,
-        eventIds: groupCheckedData[data.groupId].join(','),
-        oldEventGroupId: data.groupId
+        eventIds: groupCheckedData[data.groupId].join(',')
       }, _temp)
     }).then(function (res) {
       message.success('成功');
@@ -286,7 +295,7 @@ var TablePlus = function TablePlus(props) {
       delete _groupCheckedData[eventGroupId];
       setGroupCheckedData({});
     }).catch(function (err) {
-      message.success('失败');
+      message.error('失败');
     }).finally(function () {
       props.Refresh();
     });
@@ -401,7 +410,16 @@ var TablePlus = function TablePlus(props) {
     key: 'alias_name',
     width: 167,
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement(Input, {
+      return /*#__PURE__*/React.createElement(Popover, {
+        content: /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '200px',
+            wordBreak: 'break-all'
+          }
+        }, record.alias_name),
+        trigger: "hover",
+        placement: "top"
+      }, /*#__PURE__*/React.createElement(Input, {
         className: "alias_name",
         placeholder: "\u7F16\u8F91\u522B\u540D",
         defaultValue: record.alias_name,
@@ -409,7 +427,7 @@ var TablePlus = function TablePlus(props) {
         onBlur: function onBlur(e) {
           aliasNameBlur(e, record);
         }
-      });
+      }));
     }
   }, {
     title: '首次上报时间',
@@ -553,6 +571,7 @@ var TablePlus = function TablePlus(props) {
               groupName: record.groupName,
               groupId: record.groupId
             });
+            setEventNameInput(record.groupName);
             setEventNameShow(true);
           },
           type: "bianji"
@@ -564,9 +583,9 @@ var TablePlus = function TablePlus(props) {
         }));
       } else {
         return /*#__PURE__*/React.createElement("div", {
-          className: "set",
+          className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
           onClick: function onClick() {
-            return eventItemDel(record.event_id);
+            record.owner != 'zg_abp' ? eventItemDel(record.event_id) : message.error('内置事件无法删除');
           }
         }, "\u5220\u9664");
       }
@@ -590,6 +609,7 @@ var TablePlus = function TablePlus(props) {
     pagination: false
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u4FEE\u6539\u5206\u7EC4\u540D",
+    destroyOnClose: true,
     visible: eventNameShow,
     onOk: eventNameEdit,
     onCancel: function onCancel() {
@@ -597,6 +617,7 @@ var TablePlus = function TablePlus(props) {
     }
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
+    value: eventNameInput,
     onChange: function onChange(e) {
       return setEventNameInput(e.currentTarget.value);
     }

package/es/modules/dataManage/index.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import './styles/index.less';
-declare const DataManage: React.FC;
+interface DataManageProps {
+    updateEventMetas: Function;
+}
+declare const DataManage: React.FC<DataManageProps>;
 export default DataManage;

package/es/modules/dataManage/index.js

@@ -12,15 +12,30 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { IconFont } from '@zgfe/business-lib';
 import { Menu } from 'antd';
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import './styles/index.less'; // import EventList from './eventList';
 // import UserAttributeList from './userAttributeList';
 
+import { DmContext, upDatedDmFun } from '../../store';
+import { ActionType } from '../../store/action';
 import PlanList from '../dataPlan';
 import DataCollection from '../dataCollection';
 
 var DataManage = function DataManage(props) {
   var classPrefix = 'data-manage';
+  var updateEventMetas = props.updateEventMetas; // const { state, dispatch } = useContext(DmContext);
+
+  var _upDatedDmFun = upDatedDmFun(),
+      _upDatedDmFun2 = _slicedToArray(_upDatedDmFun, 2),
+      state = _upDatedDmFun2[0],
+      dispatch = _upDatedDmFun2[1];
+
+  useEffect(function () {
+    dispatch({
+      type: ActionType.SET_GLOBAL,
+      payload: updateEventMetas
+    });
+  }, []);
 
   var _useState = useState('0'),
       _useState2 = _slicedToArray(_useState, 2),
@@ -44,7 +59,12 @@ var DataManage = function DataManage(props) {
       type: "maidianfanganguanli"
     })
   }];
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(DmContext.Provider, {
+    value: {
+      state: state,
+      dispatch: dispatch
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-menu")
@@ -52,7 +72,11 @@ var DataManage = function DataManage(props) {
     defaultSelectedKeys: ['0'],
     onSelect: onSelect,
     items: items
-  })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null));
+  })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
 };
 
-export default DataManage;
+export default DataManage; // export default forwardRef<{}, DataManageProps>((props, ref) => (
+//   <DmProvider>
+//     <DataManage {...props} />
+//   </DmProvider>
+// ));

package/es/modules/dataPlan/addEventOrUser.js

@@ -212,17 +212,19 @@ var addEventOrUser = function addEventOrUser(props) {
     dataIndex: 'propName',
     key: 'propName',
     align: 'center'
-  }, {
-    title: '值',
-    dataIndex: 'value',
-    key: 'value',
-    align: 'center'
-  }, {
-    title: '调用identify接口的时机',
-    dataIndex: 'callTime',
-    key: 'callTime',
-    align: 'center'
-  }, {
+  }, // {
+  //   title: '值',
+  //   dataIndex: 'value',
+  //   key: 'value',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '调用identify接口的时机',
+  //   dataIndex: 'callTime',
+  //   key: 'callTime',
+  //   align: 'center',
+  // },
+  {
     title: '操作',
     dataIndex: 'set',
     align: 'center'

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

@@ -5,6 +5,7 @@ interface PropsType {
     detailId: number;
     detailName: string;
     drawerShow: boolean;
+    listData: [];
 }
 declare const AddPlan: React.FC<PropsType>;
 export default AddPlan;

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: {
@@ -58,22 +65,29 @@ var AddPlan = function AddPlan(props) {
         // console.log('获取详情', res.data);
         tableDataHandle(res.data, res.data.propPlanAndRealDataDiff, 'detail');
       }).catch(function (err) {
-        message.success('获取详情数据失败');
+        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) {
+      message.error('最多可输入20个字符');
+      return;
+    }
+
     setPlanName(e.currentTarget.value);
     setEditOperate(true);
     e.currentTarget.value != '' ? setplanNameInputStatus('') : null;
@@ -100,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);
@@ -116,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) {
@@ -146,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;
       }
 
@@ -168,38 +183,55 @@ var AddPlan = function AddPlan(props) {
         method: 'post',
         data: data
       }).then(function (res) {
+        console.log('111', res);
+
+        if (res == null) {
+          // 接口处理表格异常处理
+          message.error('上传失败');
+          return;
+        }
+
+        if (Object.keys(res.data).length <= 0) {
+          // 破损表格，异常处理
+          message.error('上传失败');
+          return;
+        }
+
         message.success('上传成功');
         tableDataHandle(res.data.eventPlanDataStatusList, res.data.userPropPlanList, 'add');
         setEditOperate(true);
         setListTab('1');
       }).catch(function (err) {
-        message.success('上传失败');
+        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) {
@@ -357,8 +389,21 @@ var AddPlan = function AddPlan(props) {
     });
 
     setEventListData(_temp_tableHandleData);
-  }; // 保存方案
+  }; // 保存方案按钮是否置灰
+
+
+  var _useState23 = useState(false),
+      _useState24 = _slicedToArray(_useState23, 2),
+      saveDisabled = _useState24[0],
+      setSaveDisabled = _useState24[1];
 
+  useEffect(function () {
+    if (JSON.stringify(eventListData).indexOf('eventName') == -1) {
+      setSaveDisabled(true);
+    } else {
+      setSaveDisabled(false);
+    }
+  }, [eventListData]); // 保存方案
 
   var savePlanData = function savePlanData() {
     if (planName == '') {
@@ -366,15 +411,22 @@ var AddPlan = function AddPlan(props) {
       return;
     }
 
-    if (JSON.stringify(eventListData).indexOf('eventName') == -1) {
-      message.error('请添加事件相关数据');
+    var planNameFlag = false;
+    props.listData.map(function (item) {
+      if (item.planName == planName && item.id != props.detailId) {
+        planNameFlag = true;
+      }
+    });
+
+    if (planNameFlag) {
+      message.error('方案名称与现有方案重复');
       return;
     } // console.log('保存', planName, eventListData, userAttrData);
 
 
     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) {
@@ -391,7 +443,7 @@ var AddPlan = function AddPlan(props) {
         _loop2(key);
       }
     });
-    userAttrData.map(function (item) {
+    userAttrDataCopy.map(function (item) {
       userPropPlanList.push(item);
     });
     var ManagementPlan = {
@@ -401,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)
@@ -410,15 +476,15 @@ var AddPlan = function AddPlan(props) {
         closeDrawer('save');
       }
     }).catch(function (err) {
-      message.success('保存失败');
+      message.error('保存失败');
     });
   }; // 存储选中的keys
 
 
-  var _useState21 = useState([]),
-      _useState22 = _slicedToArray(_useState21, 2),
-      selectedRowKeys = _useState22[0],
-      setSelectedRowKeys = _useState22[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);
@@ -463,60 +529,74 @@ 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(_data4, function (x) {
+      _.remove(data, function (x) {
         return selectedRowKeys.indexOf(x.key) != -1;
       });
 
-      setUserAttrData(_data4);
+      setUserAttrData(data);
+
+      var dataCopy = _.cloneDeep(userAttrDataCopy);
+
+      _.remove(dataCopy, function (x) {
+        return selectedRowKeys.indexOf(x.key) != -1;
+      });
+
+      setUserAttrDataCopy(dataCopy); // 备份
     }
 
     setEditOperate(true);
     setSelectedRowKeys([]);
-    message.success('删除成功');
+    message.error('删除成功');
   }; // 是否有编辑操作
 
 
-  var _useState23 = useState(false),
-      _useState24 = _slicedToArray(_useState23, 2),
-      editOperate = _useState24[0],
-      setEditOperate = _useState24[1]; // 保存时，方案名称若为空，Input显示校验提示
+  var _useState27 = useState(false),
+      _useState28 = _slicedToArray(_useState27, 2),
+      editOperate = _useState28[0],
+      setEditOperate = _useState28[1]; // 保存时，方案名称若为空，Input显示校验提示
 
 
-  var _useState25 = useState(''),
-      _useState26 = _slicedToArray(_useState25, 2),
-      planNameInputStatus = _useState26[0],
-      setplanNameInputStatus = _useState26[1]; // 检索条数
+  var _useState29 = useState(''),
+      _useState30 = _slicedToArray(_useState29, 2),
+      planNameInputStatus = _useState30[0],
+      setplanNameInputStatus = _useState30[1]; // 检索条数
 
 
   useEffect(function () {
@@ -535,10 +615,10 @@ var AddPlan = function AddPlan(props) {
     }
   }, [listTab, eventListData, userAttrData]);
 
-  var _useState27 = useState('导出'),
-      _useState28 = _slicedToArray(_useState27, 2),
-      exportValue = _useState28[0],
-      setExportValue = _useState28[1];
+  var _useState31 = useState('导出'),
+      _useState32 = _slicedToArray(_useState31, 2),
+      exportValue = _useState32[0],
+      setExportValue = _useState32[1];
 
   return /*#__PURE__*/React.createElement(Drawer, {
     width: '70%',
@@ -574,6 +654,7 @@ var AddPlan = function AddPlan(props) {
       return closeDrawer('close');
     }
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
+    disabled: saveDisabled,
     onClick: savePlanData,
     type: "primary"
   }, "\u4FDD\u5B58"))), /*#__PURE__*/React.createElement("div", {
@@ -651,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

@@ -52,7 +52,7 @@ var PlanList = function PlanList(props) {
           message.success('删除成功');
           queryList();
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -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",
@@ -223,6 +227,7 @@ var PlanList = function PlanList(props) {
     // onChange={onChange}
     pagination: false
   })), /*#__PURE__*/React.createElement(AddPlan, {
+    listData: listData,
     detailName: detailName,
     drawerShow: drawerShow,
     drawerClose: drawerClose,

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/es/store/action.d.ts

@@ -0,0 +1,7 @@
+export interface Action {
+    type: ActionType;
+    payload: any;
+}
+export declare enum ActionType {
+    SET_GLOBAL = "SET_GLOBAL"
+}

package/es/store/action.js

@@ -0,0 +1,5 @@
+export var ActionType;
+
+(function (ActionType) {
+  ActionType["SET_GLOBAL"] = "SET_GLOBAL";
+})(ActionType || (ActionType = {}));

package/es/store/index.d.ts

@@ -0,0 +1,8 @@
+import { Dispatch } from 'react';
+import { State } from './state';
+import { Action } from './action';
+export declare const DmContext: import("react").Context<{
+    state: State;
+    dispatch: Dispatch<Action>;
+}>;
+export declare const upDatedDmFun: () => [state: State, dispatch: Dispatch<Action>];

package/es/store/index.js

@@ -0,0 +1,42 @@
+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 { useReducer, createContext } from 'react';
+import { initState } from './state';
+import { ActionType } from './action';
+
+var DmReducer = function DmReducer(prevState, action) {
+  console.log('DmReducer', prevState, action);
+
+  switch (action.type) {
+    case ActionType.SET_GLOBAL:
+      return {
+        updateEventMetas: action.payload
+      };
+
+    default:
+      return initState;
+  }
+};
+
+export var DmContext = /*#__PURE__*/createContext({
+  state: initState,
+  dispatch: function dispatch() {}
+});
+export var upDatedDmFun = function upDatedDmFun() {
+  var _useReducer = useReducer(DmReducer, initState),
+      _useReducer2 = _slicedToArray(_useReducer, 2),
+      state = _useReducer2[0],
+      dispatch = _useReducer2[1];
+
+  return [state, dispatch];
+};

package/es/store/state.d.ts

@@ -0,0 +1,4 @@
+export declare const initState: State;
+export interface State {
+    updateEventMetas: Function;
+}

package/es/store/state.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.1",
+  "version": "1.0.2-dm.11",
   "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": "21b241c8db6f499daff43a19cbea9bdae598bd2f",
+  "gitHead": "08d7837b3958c7d3406a407298bad9d326672ecf",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }