@zgfe/modules-dm 1.0.57-zhongyuan.10 → 1.0.57-zhongyuan.11

package/es/modules/clearRule/index.js

@@ -329,7 +329,11 @@ var ClearRule = function ClearRule() {
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        if (res.data.data == 0) {
+        if (res.data == 0) {
+          handleOpenRuleStatus(ruleRow);
+          return;
+        }
+        if (res.data == 3) {
           UseModal({
             onOk: function onOk() {
               return handleOpenRuleStatus(ruleRow);
@@ -338,6 +342,11 @@ var ClearRule = function ClearRule() {
             title: '警告',
             content: '该规则与已开启规则可能产生冲突，请确认是否继续开启'.concat(" ")
           });
+          return;
+        }
+        if (res.data == 2 || res.data == 3) {
+          message.error(res.msg);
+          return;
         }
       } else {
         message.error('查询列表失败！');

package/es/modules/formulateRule/addFormulate.js

@@ -199,11 +199,14 @@ var AddFormulate = function AddFormulate(_ref) {
   // 回显
   useEffect(function () {
     if (detailData) {
-      var _detailData$rinseObje, _detailData$rinseShif;
+      var _detailData$rinseObje2, _detailData$rinseShif;
       ruleForm.setFieldsValue({
         name: detailData.ruleName,
         description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
-        target: detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0],
+        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 = [];

package/es/modules/formulateRule/index.js

@@ -109,8 +109,7 @@ var FormulateRule = function FormulateRule() {
         if (res.data.data == 1) {
           UseModal({
             onOk: function onOk() {
-              setDetailData(ruleObj);
-              setOpenAddDraw(true);
+              getDetail(ruleObj.ruleId);
             },
             okText: '去修改',
             title: '自定义校验规则已删除',
@@ -153,6 +152,8 @@ var FormulateRule = function FormulateRule() {
           return;
         }
         endOpen(ruleObj);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -168,6 +169,8 @@ var FormulateRule = function FormulateRule() {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         message.success("".concat(ruleObj.status ? '关闭' : '开启', "\u6210\u529F\uFF01"));
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -192,6 +195,8 @@ var FormulateRule = function FormulateRule() {
           return;
         }
         getDetail(ruleId);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -327,6 +332,8 @@ var FormulateRule = function FormulateRule() {
         message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
         setAllOpenRule(value);
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     }).finally(function () {
       setStatusLoading(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.10",
+  "version": "1.0.57-zhongyuan.11",
   "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": "46311c056ac9e09a0b2296223d81d9f60b21258f",
+  "gitHead": "89a73c012b336ac25db06ea6b16ebd5460bad587",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }