@zgfe/modules-dm 1.0.2-dm.15 → 1.0.2-dm.17

package/es/modules/dataCollection/collectionAttributeList.js

@@ -22,6 +22,7 @@ import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
+import { DmContext } from '../../store';
 
 var CollectionAttributeList = function CollectionAttributeList(props) {
   var classPrefix = 'attr-list';
@@ -38,7 +39,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
-      setLoading = _useState2[1]; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
+      setLoading = _useState2[1];
+
+  var _useContext2 = useContext(DmContext),
+      state = _useContext2.state; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
 
 
   var rowRenderHandle = function rowRenderHandle(name) {
@@ -138,6 +142,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         if (source == 'user') {
           queryUserPropMeta();
         }
+
+        state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
     }).catch(function (err) {
       message.error('修改失败');

package/es/modules/dataCollection/tablePlus.js

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

package/es/modules/dataPlan/addPlan.js

@@ -163,11 +163,13 @@ var AddPlan = function AddPlan(props) {
 
       if (fileType[fileType.length - 1] != 'xlsx' && fileType[fileType.length - 1] != 'xsl') {
         message.error('仅支持excel(xsl、xlsx)格式文件，请检查后重新上传');
+        setSpinning(false);
         return;
       }
 
       if (file.size > 5 * 1024 * 1024) {
         message.error('文件大小支持5M以内，请检查后重新上传');
+        setSpinning(false);
         return;
       }
 
@@ -184,12 +186,14 @@ var AddPlan = function AddPlan(props) {
         if (res == null) {
           // 接口处理表格异常处理
           message.error('上传失败');
+          setSpinning(false);
           return;
         }
 
         if (Object.keys(res.data).length <= 0) {
           // 破损表格，异常处理
           message.error('上传失败');
+          setSpinning(false);
           return;
         }
 
@@ -399,7 +403,24 @@ var AddPlan = function AddPlan(props) {
     } else {
       setSaveDisabled(false);
     }
-  }, [eventListData]); // 保存方案
+  }, [eventListData]);
+
+  var _useState25 = useState(0),
+      _useState26 = _slicedToArray(_useState25, 2),
+      eventCount = _useState26[0],
+      setEventCount = _useState26[1];
+
+  useEffect(function () {
+    var _eventCount = 0;
+    eventListDataCopy.map(function (_item, index) {
+      for (var key in _item) {
+        _item[key].map(function (item) {
+          _eventCount++;
+        });
+      }
+    });
+    setEventCount(_eventCount);
+  }, [eventListDataCopy]); // 保存方案
 
   var savePlanData = function savePlanData() {
     if (planName == '') {
@@ -454,14 +475,6 @@ 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条数据，请修改后重新保存');
@@ -482,10 +495,10 @@ var AddPlan = function AddPlan(props) {
   }; // 存储选中的keys
 
 
-  var _useState25 = useState([]),
-      _useState26 = _slicedToArray(_useState25, 2),
-      selectedRowKeys = _useState26[0],
-      setSelectedRowKeys = _useState26[1];
+  var _useState27 = useState([]),
+      _useState28 = _slicedToArray(_useState27, 2),
+      selectedRowKeys = _useState28[0],
+      setSelectedRowKeys = _useState28[1];
 
   var tableCheck = function tableCheck(e, record) {
     // console.log(e.target.checked, record.key);
@@ -498,8 +511,13 @@ var AddPlan = function AddPlan(props) {
   }; // 选中当前页面全部数据
 
 
-  var allCheck = function allCheck(e) {
-    if (e.target.checked) {
+  var _useState29 = useState(false),
+      _useState30 = _slicedToArray(_useState29, 2),
+      tableAllchecked = _useState30[0],
+      setTableAllchecked = _useState30[1];
+
+  useEffect(function () {
+    if (tableAllchecked) {
       var _tempData = [];
 
       if (listTab == '1') {
@@ -524,11 +542,29 @@ var AddPlan = function AddPlan(props) {
     } else {
       setSelectedRowKeys([]);
     }
-  }; // useEffect(() => {
-  //   console.log('最近selectedRowKeys', selectedRowKeys);
-  // }, [selectedRowKeys]);
-  // 批量删除
+  }, [tableAllchecked]);
 
+  var allCheck = function allCheck(e) {
+    setTableAllchecked(e.target.checked);
+  };
+
+  var _useState31 = useState(''),
+      _useState32 = _slicedToArray(_useState31, 2),
+      allCheckedClassName = _useState32[0],
+      setAllCheckedClassName = _useState32[1];
+
+  useEffect(function () {
+    if (selectedRowKeys.length == eventCount && eventCount != 0) {
+      setAllCheckedClassName('ant-checkbox-checked');
+      setTableAllchecked(true);
+    } else if (selectedRowKeys.length <= 0) {
+      setAllCheckedClassName('');
+      setTableAllchecked(false);
+    } else {
+      setAllCheckedClassName('ant-checkbox-indeterminate');
+    } // console.log('最近selectedRowKeys', selectedRowKeys, eventCount);
+
+  }, [selectedRowKeys]); // 批量删除
 
   var deteleDataHandle = function deteleDataHandle(data) {
     var _tempData = [];
@@ -588,16 +624,16 @@ var AddPlan = function AddPlan(props) {
   }; // 是否有编辑操作
 
 
-  var _useState27 = useState(false),
-      _useState28 = _slicedToArray(_useState27, 2),
-      editOperate = _useState28[0],
-      setEditOperate = _useState28[1]; // 保存时，方案名称若为空，Input显示校验提示
+  var _useState33 = useState(false),
+      _useState34 = _slicedToArray(_useState33, 2),
+      editOperate = _useState34[0],
+      setEditOperate = _useState34[1]; // 保存时，方案名称若为空，Input显示校验提示
 
 
-  var _useState29 = useState(''),
-      _useState30 = _slicedToArray(_useState29, 2),
-      planNameInputStatus = _useState30[0],
-      setplanNameInputStatus = _useState30[1]; // 检索条数
+  var _useState35 = useState(''),
+      _useState36 = _slicedToArray(_useState35, 2),
+      planNameInputStatus = _useState36[0],
+      setplanNameInputStatus = _useState36[1]; // 检索条数
 
 
   useEffect(function () {
@@ -616,10 +652,10 @@ var AddPlan = function AddPlan(props) {
     }
   }, [listTab, eventListData, userAttrData]);
 
-  var _useState31 = useState('导出'),
-      _useState32 = _slicedToArray(_useState31, 2),
-      exportValue = _useState32[0],
-      setExportValue = _useState32[1];
+  var _useState37 = useState('导出'),
+      _useState38 = _slicedToArray(_useState37, 2),
+      exportValue = _useState38[0],
+      setExportValue = _useState38[1];
 
   return /*#__PURE__*/React.createElement(Drawer, {
     width: '70%',
@@ -702,6 +738,8 @@ var AddPlan = function AddPlan(props) {
   }), listTab == '1' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("ul", {
     className: "".concat(classPrefix, "-table-header")
   }, /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement(Checkbox, {
+    className: allCheckedClassName,
+    checked: tableAllchecked,
     style: {
       marginRight: '10px'
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.15",
+  "version": "1.0.2-dm.17",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.7-dmd.3",
+    "@zgfe/business-lib": "1.1.7-dmd2.4",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "902963ef4406214d81eac7e4529a96b7806797c7",
+  "gitHead": "e6087adb66fa4579b8c91d6d540b06fd7d2c183d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }