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

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, tianchongArr, shuzhiArr } from './data';
+import { typeArr, shuzhiArr } from './data';
 var TextArea = Input.TextArea;
 var AddFormulate = function AddFormulate(_ref) {
   var addruleShow = _ref.addruleShow,
@@ -157,7 +157,7 @@ var AddFormulate = function AddFormulate(_ref) {
     tableParams = _useState14[0],
     setTableParams = _useState14[1];
   var typeValue = function typeValue(detailRow, tag) {
-    var str = '';
+    var str = tag == 1 ? detailRow.sourceValue : detailRow.targetValue;
     //类型转换
     if (detailRow.ruleType == 3) {
       var _shuzhiArr$find;
@@ -165,14 +165,6 @@ var AddFormulate = function AddFormulate(_ref) {
         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() {
@@ -338,6 +330,9 @@ var AddFormulate = function AddFormulate(_ref) {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
     }),
+    disabled: dataSource.length >= 1 && dataSource.find(function (j) {
+      return j.currentType == 5;
+    }) ? true : false,
     type: "link",
     onClick: function onClick() {
       setOpenRule(true);

package/es/modules/formulateRule/addRule.js

@@ -52,13 +52,30 @@ var AddRule = function AddRule(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentType = _useState4[0],
     setCurrentType = _useState4[1];
-  // 值类型选择限制
+  // 值类型选择限制  选择替换为空值，其他规则选项禁用；选择其他规则后，替换为空值禁用 并且已经选过的也禁用
   var _useState5 = useState(typeArr),
     _useState6 = _slicedToArray(_useState5, 2),
     prohibitionType = _useState6[0],
     setProhibitionType = _useState6[1];
   useEffect(function () {
+    if (editStatus) {
+      return;
+    }
     var arr = prohibitionType === null || prohibitionType === void 0 ? void 0 : prohibitionType.map(function (o) {
+      if (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (j) {
+        return j.currentType == 5;
+      })) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          disabled: true
+        });
+      }
+      if (allDataSource && (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.length) >= 1 && (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (j) {
+        return j.currentType != 5;
+      })) && o.value == 5) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          disabled: true
+        });
+      }
       if (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (k) {
         return k.currentType == o.value;
       })) {

package/es/modules/formulateRule/index.js

@@ -69,7 +69,7 @@ var FormulateRule = function FormulateRule() {
   }, {
     title: '操作',
     key: 'action',
-    width: 200,
+    width: 240,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
         size: "middle"

package/package.json

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