@zgfe/modules-dm 1.0.57-zhongyuan.47 → 1.0.57-zhongyuan.49

package/es/modules/clearRule/index.js

@@ -77,19 +77,19 @@ var ClearRule = function ClearRule() {
         onChange: function onChange(e) {
           return _onChange(e, record);
         }
-      })), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
+      })), authority[170928557412] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
-          return handleEditRule(record);
+          handleEditRule(record);
         }
-      }, "\u7F16\u8F91"), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
-        onClick: function onClick() {
-          return handleViewRule(record);
-        }
-      }, "\u67E5\u770B"), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
+      }, "\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);
         }
-      }, "\u5220\u9664"));
+      }, "\u5220\u9664")));
     }
   }];
   // 编辑规则

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,25 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     tableParams = _useState14[0],
     setTableParams = _useState14[1];
+  var typeValue = function typeValue(detailRow, tag) {
+    var str = '';
+    //类型转换
+    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) {
+      var _tianchongArr$find;
+      str = (_tianchongArr$find = tianchongArr.find(function (o) {
+        return o.value == detailRow.ruleType;
+      })) === null || _tianchongArr$find === void 0 ? void 0 : _tianchongArr$find.label;
+    }
+    str = tag == 1 ? detailRow.sourceValue : detailRow.targetValue;
+    return str;
+  };
   var getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     request(apis.rule.getRuleList, {
@@ -188,12 +207,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 || [];
+          });
         }
       }
     });
@@ -260,7 +281,8 @@ var AddFormulate = function AddFormulate(_ref) {
     initialValues: {
       name: '',
       desctiption: '',
-      ruleobj: []
+      ruleobj: [],
+      target: ''
     },
     onFinish: onFinish,
     labelAlign: "left"

package/es/modules/formulateRule/index.js

@@ -78,19 +78,19 @@ var FormulateRule = function FormulateRule() {
         onChange: function onChange() {
           return handleOpenStatus(record);
         }
-      })), authority[170928557422] && (/*#__PURE__*/React.createElement("a", {
+      })), authority[170928557422] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           handleEdit(record.ruleId);
         }
-      }, "\u7F16\u8F91")), /*#__PURE__*/React.createElement("a", {
-        onClick: function onClick() {
-          handleView(record.ruleId);
-        }
-      }, "\u67E5\u770B"), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91")), authority[170928557423] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           return handleDetale(record.ruleId);
         }
-      }, "\u5220\u9664"));
+      }, "\u5220\u9664")));
     }
   }];
   // 查看的数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.47",
+  "version": "1.0.57-zhongyuan.49",
   "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": "371e3d10dfef743258b3649a534945f270873328",
+  "gitHead": "b22d7f9056bdabebe6d4e7735daf349d9bd6517d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }