@zgfe/modules-dm 1.0.57-zhongyuan.48 → 1.0.57-zhongyuan.50

package/es/modules/clearRule/index.js

@@ -85,6 +85,7 @@ var ClearRule = function ClearRule() {
         }
       }, "\u7F16\u8F91")), authority[170928557413] && (/*#__PURE__*/React.createElement(Button, {
         type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           return handleDeleteRule(record === null || record === void 0 ? void 0 : record.ruleId);
         }

package/es/modules/formulateRule/addFormulate.js

@@ -17,7 +17,7 @@ import AddRule from './addRule';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import UseModal from '../CutsModal';
-import { typeArr } from './data';
+import { typeArr, tianchongArr, shuzhiArr } from './data';
 var TextArea = Input.TextArea;
 var AddFormulate = function AddFormulate(_ref) {
   var addruleShow = _ref.addruleShow,
@@ -45,8 +45,8 @@ var AddFormulate = function AddFormulate(_ref) {
     var arr = dataSource.map(function (o) {
       return {
         ruleType: o.currentType,
-        sourceValue: o.sourceValueId || o.sourceValue,
-        targetValue: o.targetValueId || o.sourceValue
+        sourceValue: o.currentType == 3 ? o.sourceValueId : o.sourceValue,
+        targetValue: o.currentType == 3 ? o.targetValueId : o.targetValue
       };
     });
     var api = detailData ? apis.clearRule.modifyRule : apis.clearRule.addRule;
@@ -156,6 +156,24 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     tableParams = _useState14[0],
     setTableParams = _useState14[1];
+  var typeValue = function typeValue(detailRow, tag) {
+    var str = tag == 1 ? detailRow.sourceValue : detailRow.targetValue;
+    //类型转换
+    if (detailRow.ruleType == 3) {
+      var _shuzhiArr$find;
+      str = (_shuzhiArr$find = shuzhiArr.find(function (o) {
+        return o.value == (tag == 1 ? detailRow.sourceValue : detailRow.targetValue);
+      })) === null || _shuzhiArr$find === void 0 ? void 0 : _shuzhiArr$find.label;
+    }
+    // 替换缺失值
+    if (detailRow.ruleType == 4 && tag == 1) {
+      var _tianchongArr$find;
+      str = (_tianchongArr$find = tianchongArr.find(function (o) {
+        return o.value == detailRow.sourceValue;
+      })) === null || _tianchongArr$find === void 0 ? void 0 : _tianchongArr$find.label;
+    }
+    return str;
+  };
   var getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     request(apis.rule.getRuleList, {
@@ -188,12 +206,14 @@ var AddFormulate = function AddFormulate(_ref) {
               currentTypeName: typeArr.filter(function (j) {
                 return j.value == o.ruleType;
               })[0].label,
-              sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
-              targetValue: o.targetValue,
+              sourceValue: o.ruleType == 5 ? '' : typeValue(o, 1),
+              targetValue: typeValue(o, 2),
               key: o.id
             };
           });
-          setDataSoure(arr || []);
+          setDataSoure(function () {
+            return arr || [];
+          });
         }
       }
     });

package/es/modules/formulateRule/index.js

@@ -86,6 +86,7 @@ var FormulateRule = function FormulateRule() {
         }
       }, "\u7F16\u8F91")), authority[170928557423] && (/*#__PURE__*/React.createElement(Button, {
         type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           return handleDetale(record.ruleId);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.48",
+  "version": "1.0.57-zhongyuan.50",
   "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": "749bf2cf22caed09f9bdd2bd2cd9377f5d40bae3",
+  "gitHead": "e01d0f0851652d7b35f5a4745dd1fa87c68da2a3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }