@zgfe/modules-dm 1.0.2-dm.2 → 1.0.2-dm.5

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,15 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           setAttrExcelData(res.values);
         }
       }).catch(function (err) {
-        message.success('上传失败');
+        message.error('上传失败');
       });
     }
   }; // 清空属性值别名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 +360,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         setAttrAliasNameShow(false);
       }
     }).catch(function (err) {
-      message.success('操作失败');
+      message.error('操作失败');
     });
   }; // 获取已设置的属性值别名列表
 

package/es/modules/dataCollection/collectionEventList.js

@@ -174,8 +174,10 @@ var CollectionEventList = function CollectionEventList(props) {
         queryList();
       }
     }).catch(function (err) {
-      message.success('创建失败');
-    }).finally(function () {});
+      message.error('创建失败');
+    }).finally(function () {
+      setEventNameInput('');
+    });
   }; // 筛选：显示状态 | 采集状态
 
 
@@ -311,13 +313,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/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;
@@ -204,6 +209,9 @@
           cursor: pointer;
           user-select: none;
         }
+        .set-error {
+          color: #86909c;
+        }
       }
     }
   }

package/es/modules/dataCollection/tablePlus.js

@@ -59,10 +59,13 @@ var TablePlus = function TablePlus(props) {
     }).then(function (res) {
       if (res) {
         message.success('修改成功');
+        props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
-    }).finally(function () {});
+      message.error('修改失败');
+    }).finally(function () {
+      setAliasFocusData('');
+    });
   }; // 表格class处理
 
 
@@ -110,7 +113,7 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 删除分组
 
@@ -140,7 +143,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -168,7 +171,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -210,7 +213,7 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 复制事件名称
 
@@ -276,7 +279,7 @@ var TablePlus = function TablePlus(props) {
         platform: 0,
         hasPublicAttrView: true,
         eventIds: groupCheckedData[data.groupId].join(','),
-        oldEventGroupId: data.groupId
+        oldEventGroupId: type == 'copy' ? null : data.groupId
       }, _temp)
     }).then(function (res) {
       message.success('成功');
@@ -286,7 +289,7 @@ var TablePlus = function TablePlus(props) {
       delete _groupCheckedData[eventGroupId];
       setGroupCheckedData({});
     }).catch(function (err) {
-      message.success('失败');
+      message.error('失败');
     }).finally(function () {
       props.Refresh();
     });
@@ -338,9 +341,15 @@ var TablePlus = function TablePlus(props) {
           className: "group-box"
         }, /*#__PURE__*/React.createElement(IconFont, {
           type: "left"
-        }), /*#__PURE__*/React.createElement("span", {
+        }), /*#__PURE__*/React.createElement(Popover, {
+          content: function content() {
+            return record.groupId == -1 ? '未分组' : record.groupName;
+          },
+          trigger: "hover",
+          placement: "top"
+        }, /*#__PURE__*/React.createElement("span", {
           className: "group-text"
-        }, record.groupId == -1 ? '未分组' : record.groupName), ((_groupCheckedData$rec = groupCheckedData[record.groupId]) === null || _groupCheckedData$rec === void 0 ? void 0 : _groupCheckedData$rec.length) > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popover, {
+        }, record.groupId == -1 ? '未分组' : record.groupName)), ((_groupCheckedData$rec = groupCheckedData[record.groupId]) === null || _groupCheckedData$rec === void 0 ? void 0 : _groupCheckedData$rec.length) > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popover, {
           content: function content() {
             return groupPopoverContent(record, 'move-in');
           },
@@ -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/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

@@ -58,7 +58,7 @@ var AddPlan = function AddPlan(props) {
         // console.log('获取详情', res.data);
         tableDataHandle(res.data, res.data.propPlanAndRealDataDiff, 'detail');
       }).catch(function (err) {
-        message.success('获取详情数据失败');
+        message.error('获取详情数据失败');
       });
     }
   }, [props.detailId]); // 方案名称
@@ -74,6 +74,11 @@ var AddPlan = function AddPlan(props) {
       setPlanName = _useState4[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;
@@ -168,12 +173,26 @@ 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('上传失败');
       });
     }
   }; // 事件列表-渲染数据
@@ -357,8 +376,21 @@ var AddPlan = function AddPlan(props) {
     });
 
     setEventListData(_temp_tableHandleData);
-  }; // 保存方案
+  }; // 保存方案按钮是否置灰
+
+
+  var _useState21 = useState(false),
+      _useState22 = _slicedToArray(_useState21, 2),
+      saveDisabled = _useState22[0],
+      setSaveDisabled = _useState22[1];
 
+  useEffect(function () {
+    if (JSON.stringify(eventListData).indexOf('eventName') == -1) {
+      setSaveDisabled(true);
+    } else {
+      setSaveDisabled(false);
+    }
+  }, [eventListData]); // 保存方案
 
   var savePlanData = function savePlanData() {
     if (planName == '') {
@@ -366,8 +398,15 @@ 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);
 
@@ -410,15 +449,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 _useState23 = useState([]),
+      _useState24 = _slicedToArray(_useState23, 2),
+      selectedRowKeys = _useState24[0],
+      setSelectedRowKeys = _useState24[1];
 
   var tableCheck = function tableCheck(e, record) {
     // console.log(e.target.checked, record.key);
@@ -503,20 +542,20 @@ var AddPlan = function AddPlan(props) {
 
     setEditOperate(true);
     setSelectedRowKeys([]);
-    message.success('删除成功');
+    message.error('删除成功');
   }; // 是否有编辑操作
 
 
-  var _useState23 = useState(false),
-      _useState24 = _slicedToArray(_useState23, 2),
-      editOperate = _useState24[0],
-      setEditOperate = _useState24[1]; // 保存时，方案名称若为空，Input显示校验提示
+  var _useState25 = useState(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      editOperate = _useState26[0],
+      setEditOperate = _useState26[1]; // 保存时，方案名称若为空，Input显示校验提示
 
 
-  var _useState25 = useState(''),
-      _useState26 = _slicedToArray(_useState25, 2),
-      planNameInputStatus = _useState26[0],
-      setplanNameInputStatus = _useState26[1]; // 检索条数
+  var _useState27 = useState(''),
+      _useState28 = _slicedToArray(_useState27, 2),
+      planNameInputStatus = _useState28[0],
+      setplanNameInputStatus = _useState28[1]; // 检索条数
 
 
   useEffect(function () {
@@ -535,10 +574,10 @@ var AddPlan = function AddPlan(props) {
     }
   }, [listTab, eventListData, userAttrData]);
 
-  var _useState27 = useState('导出'),
-      _useState28 = _slicedToArray(_useState27, 2),
-      exportValue = _useState28[0],
-      setExportValue = _useState28[1];
+  var _useState29 = useState('导出'),
+      _useState30 = _slicedToArray(_useState29, 2),
+      exportValue = _useState30[0],
+      setExportValue = _useState30[1];
 
   return /*#__PURE__*/React.createElement(Drawer, {
     width: '70%',
@@ -574,6 +613,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", {

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 () {});
       }
     });
@@ -223,6 +223,7 @@ var PlanList = function PlanList(props) {
     // onChange={onChange}
     pagination: false
   })), /*#__PURE__*/React.createElement(AddPlan, {
+    listData: listData,
     detailName: detailName,
     drawerShow: drawerShow,
     drawerClose: drawerClose,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.2",
+  "version": "1.0.2-dm.5",
   "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": "67f8d1ed5d82858a8d44153a22b41cad2a1fe6c8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }