@zgfe/modules-dm 1.0.57-zhongyuan.14 → 1.0.57-zhongyuan.16

package/es/modules/clearRule/index.js

@@ -133,7 +133,7 @@ var ClearRule = function ClearRule() {
         }
         getDetail(ruleRow.ruleId);
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -248,7 +248,7 @@ var ClearRule = function ClearRule() {
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    _getList(ruleSearchName);
+    _getList(ruleSearchName, pagination);
   };
   var _useState25 = useState({
       current: 1,
@@ -263,12 +263,13 @@ var ClearRule = function ClearRule() {
   }, []);
   var _getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.rule.getRuleList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
@@ -309,7 +310,7 @@ var ClearRule = function ClearRule() {
         message.success("\u5220\u9664\u89C4\u5219\u6210\u529F\uFF01");
         handleSearch();
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -349,7 +350,7 @@ var ClearRule = function ClearRule() {
           return;
         }
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -369,7 +370,7 @@ var ClearRule = function ClearRule() {
         message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
         handleSearch();
       } else {
-        message.error('规则修改失败，请联系管理员');
+        message.error(res.msg);
       }
     });
   };

package/es/modules/formulateRule/addFormulate.js

@@ -169,6 +169,31 @@ var AddFormulate = function AddFormulate(_ref) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         setRuleList(res.data.data);
+        // 回显
+        if (detailData) {
+          var _detailData$rinseObje2, _detailData$rinseShif;
+          ruleForm.setFieldsValue({
+            name: detailData.ruleName,
+            description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
+            target: res.data.data.find(function (o) {
+              var _detailData$rinseObje;
+              return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
+            }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
+            ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
+          });
+          var arr = detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
+            return {
+              currentType: o.ruleType,
+              currentTypeName: typeArr.filter(function (j) {
+                return j.value == o.ruleType;
+              })[0].label,
+              sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
+              targetValue: o.targetValue,
+              key: o.id
+            };
+          });
+          setDataSoure(arr || []);
+        }
       }
     });
   };
@@ -196,34 +221,6 @@ var AddFormulate = function AddFormulate(_ref) {
       });
     }
   };
-  // 回显
-  useEffect(function () {
-    if (detailData) {
-      var _detailData$rinseObje2, _detailData$rinseShif;
-      ruleForm.setFieldsValue({
-        name: detailData.ruleName,
-        description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
-        target: ruleList.find(function (o) {
-          var _detailData$rinseObje;
-          return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
-        }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
-        ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
-      });
-      var arr = [];
-      arr = (detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails) && (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
-        return {
-          currentType: o.ruleType,
-          currentTypeName: typeArr.filter(function (j) {
-            return j.value == o.ruleType;
-          })[0].label,
-          sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
-          targetValue: o.targetValue,
-          key: o.id
-        };
-      }));
-      setDataSoure(arr);
-    }
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {

package/es/modules/formulateRule/index.js

@@ -77,11 +77,11 @@ var FormulateRule = function FormulateRule() {
         onChange: function onChange() {
           return handleOpenStatus(record);
         }
-      }), authority[170928557422] && (/*#__PURE__*/React.createElement("a", {
+      }), /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           handleEdit(record.ruleId);
         }
-      }, "\u7F16\u8F91")), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleDetale(record.ruleId);
         }
@@ -268,12 +268,13 @@ var FormulateRule = function FormulateRule() {
   }, []);
   var getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.clearRule.getList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
@@ -294,13 +295,14 @@ var FormulateRule = function FormulateRule() {
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
+    getList(_value);
   };
   var handleSearch = function handleSearch() {
     getList(ruleSearchName);
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    getList(ruleSearchName);
+    getList(ruleSearchName, pagination);
   };
   // 总状态
   var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.14",
+  "version": "1.0.57-zhongyuan.16",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e88f576663dcf1ac01bba04d6645e060efa1f0d5",
+  "gitHead": "ae5a4f3ac9e73ed587b1e684e9205131491f3afc",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }