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

package/es/modules/dataCollection/collectionAttributeList.js

@@ -329,6 +329,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }).catch(function (err) {
         message.error('上传失败');
       });
+      return false;
     }
   }; // 清空属性值别名excel数据
 

package/es/modules/dataCollection/collectionEventList.js

@@ -175,7 +175,9 @@ var CollectionEventList = function CollectionEventList(props) {
       }
     }).catch(function (err) {
       message.error('创建失败');
-    }).finally(function () {});
+    }).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;
@@ -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;
           }
@@ -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

@@ -59,10 +59,13 @@ var TablePlus = function TablePlus(props) {
     }).then(function (res) {
       if (res) {
         message.success('修改成功');
+        props.Refresh();
       }
     }).catch(function (err) {
       message.error('修改失败');
-    }).finally(function () {});
+    }).finally(function () {
+      setAliasFocusData('');
+    });
   }; // 表格class处理
 
 
@@ -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('成功');
@@ -401,7 +404,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 +421,7 @@ var TablePlus = function TablePlus(props) {
         onBlur: function onBlur(e) {
           aliasNameBlur(e, record);
         }
-      });
+      }));
     }
   }, {
     title: '首次上报时间',
@@ -553,6 +565,7 @@ var TablePlus = function TablePlus(props) {
               groupName: record.groupName,
               groupId: record.groupId
             });
+            setEventNameInput(record.groupName);
             setEventNameShow(true);
           },
           type: "bianji"
@@ -564,9 +577,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 +603,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 +611,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/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

@@ -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;
@@ -189,6 +194,7 @@ var AddPlan = function AddPlan(props) {
       }).catch(function (err) {
         message.error('上传失败');
       });
+      return false;
     }
   }; // 事件列表-渲染数据
 
@@ -371,17 +377,37 @@ 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 == '') {
       setplanNameInputStatus('warning');
       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);
 
@@ -429,10 +455,10 @@ var AddPlan = function AddPlan(props) {
   }; // 存储选中的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);
@@ -521,16 +547,16 @@ var AddPlan = function AddPlan(props) {
   }; // 是否有编辑操作
 
 
-  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 () {
@@ -549,10 +575,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%',
@@ -588,6 +614,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

@@ -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.4",
+  "version": "1.0.2-dm.6",
   "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": "b9dac1031723bd7bc4385a71b225d159b2471341",
+  "gitHead": "a5df84fee76da638681affd4c57d4b27acdf91d8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }