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

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

@@ -150,6 +150,11 @@ var CollectionEventList = function CollectionEventList(props) {
 
 
   var createEventGroup = function createEventGroup() {
+    if (eventNameInput == '') {
+      message.error('请输入分组名称');
+      return;
+    }
+
     if (eventNameInput.length > 20) {
       message.error('名称不可超过20字符');
       return;
@@ -169,7 +174,7 @@ var CollectionEventList = function CollectionEventList(props) {
         queryList();
       }
     }).catch(function (err) {
-      message.success('创建失败');
+      message.error('创建失败');
     }).finally(function () {});
   }; // 筛选：显示状态 | 采集状态
 

package/es/modules/dataCollection/tablePlus.js

@@ -61,7 +61,7 @@ var TablePlus = function TablePlus(props) {
         message.success('修改成功');
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 表格class处理
 
@@ -110,7 +110,7 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 删除分组
 
@@ -140,7 +140,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -168,7 +168,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -210,7 +210,7 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 复制事件名称
 
@@ -286,7 +286,7 @@ var TablePlus = function TablePlus(props) {
       delete _groupCheckedData[eventGroupId];
       setGroupCheckedData({});
     }).catch(function (err) {
-      message.success('失败');
+      message.error('失败');
     }).finally(function () {
       props.Refresh();
     });

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.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]); // 方案名称
@@ -168,12 +168,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('上传失败');
       });
     }
   }; // 事件列表-渲染数据
@@ -410,7 +424,7 @@ var AddPlan = function AddPlan(props) {
         closeDrawer('save');
       }
     }).catch(function (err) {
-      message.success('保存失败');
+      message.error('保存失败');
     });
   }; // 存储选中的keys
 
@@ -503,7 +517,7 @@ var AddPlan = function AddPlan(props) {
 
     setEditOperate(true);
     setSelectedRowKeys([]);
-    message.success('删除成功');
+    message.error('删除成功');
   }; // 是否有编辑操作
 
 

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 () {});
       }
     });

package/package.json

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