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

package/es/modules/clearRule/addRule.js

@@ -338,11 +338,6 @@ var AddRule = function AddRule(_ref) {
     }
   }, []);
   // 禁用按钮规则
-  //   { label: '属性类型', value: 1 },
-  // { label: '正则匹配', value: 2 },
-  // { label: '数值区间', value: 3 },
-  // { label: '枚举', value: 4 },
-  // { label: '非空', value: 5 },
   // 1字符串类型  2数值类型  3日期类型
   var handleDisabled = function handleDisabled(btnItem) {
     var result = true;
@@ -381,7 +376,7 @@ var AddRule = function AddRule(_ref) {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {
     className: "addRuleForm",
-    title: /*#__PURE__*/React.createElement("div", null, currentRuleDetail ? '修改' : '新增', "\u81EA\u5B9A\u4E49\u5165\u5E93\u6821\u9A8C\u89C4\u5219", /*#__PURE__*/React.createElement("div", {
+    title: /*#__PURE__*/React.createElement("div", null, ruleRowView ? '查看' : currentRuleDetail ? '修改' : '新增', "\u81EA\u5B9A\u4E49\u5165\u5E93\u6821\u9A8C\u89C4\u5219", /*#__PURE__*/React.createElement("div", {
       className: "drawerCloseIcon",
       onClick: onClose
     }, /*#__PURE__*/React.createElement(CloseOutlined, {
@@ -445,7 +440,11 @@ var AddRule = function AddRule(_ref) {
     value: selectType
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 'eventProp'
-  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
+  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), ruleRowView && (/*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
+    type: "link"
+  }, "\u4E8B\u4EF6\u5C5E\u6027\uFF1A\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C"), /*#__PURE__*/React.createElement(Button, {
+    type: "link"
+  }, "\u7EC6\u5206\u5C5E\u6027\uFF1A\u89D2\u8272\u5C5E\u6027\u6821\u9A8C"))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
     className: "selectVent"
   }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
@@ -471,7 +470,7 @@ var AddRule = function AddRule(_ref) {
       onChangeAttr(undefined);
     },
     placeholder: "\u8BF7\u9009\u62E9\u7EC6\u5206\u5C5E\u6027"
-  })), bizAttributeSelectorValue && (/*#__PURE__*/React.createElement("div", {
+  }))), bizAttributeSelectorValue && (/*#__PURE__*/React.createElement("div", {
     className: "attrValue"
   }, optionsRule.length > 1 && /*#__PURE__*/React.createElement("span", {
     className: "attrValue-styleLine"
@@ -482,6 +481,7 @@ var AddRule = function AddRule(_ref) {
     }, /*#__PURE__*/React.createElement("div", null, (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || bizAttributeSelectorValue.name), /*#__PURE__*/React.createElement(TypeComponent, {
       type: o.ruleType,
       optionsValue: optionsRule,
+      viewDisabled: ruleRowView,
       id: o.uniqueId,
       editStatus: currentRuleDetail ? true : false
     }), /*#__PURE__*/React.createElement("div", {
@@ -492,7 +492,7 @@ var AddRule = function AddRule(_ref) {
         return handleRuleDel(o.uniqueId);
       }
     }, "X"));
-  }))), /*#__PURE__*/React.createElement(Space, null, options.map(function (item, index) {
+  }))), /*#__PURE__*/React.createElement(Space, null, !ruleRowView && options.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Button, {
       key: index,
       type: "primary",
@@ -524,7 +524,8 @@ var TypeComponent = function TypeComponent(_ref2) {
   var type = _ref2.type,
     optionsValue = _ref2.optionsValue,
     editStatus = _ref2.editStatus,
-    id = _ref2.id;
+    id = _ref2.id,
+    viewDisabled = _ref2.viewDisabled;
   // type:1 string    2:正则   3：数字区间 4：枚举
   var Component = null;
   var _useContext2 = useContext(BizGlobalDataContext),
@@ -656,6 +657,7 @@ var TypeComponent = function TypeComponent(_ref2) {
       Component = /*#__PURE__*/React.createElement(Input, {
         placeholder: "\u8BF7\u8F93\u5165\u6B63\u5219\u8868\u5355\u5F0F",
         value: testValue,
+        disabled: viewDisabled,
         onChange: function onChange(event) {
           setTestValue(event.target.value);
           optionsValue.filter(function (r) {
@@ -674,6 +676,7 @@ var TypeComponent = function TypeComponent(_ref2) {
           cursor: 'pointer'
         },
         onClick: function onClick() {
+          if (viewDisabled) return;
           setIncludedMinState(function (pre) {
             optionsValue.filter(function (r) {
               return r.uniqueId == id;
@@ -684,6 +687,7 @@ var TypeComponent = function TypeComponent(_ref2) {
       }, includedMinState ? '[' : '(')), /*#__PURE__*/React.createElement(InputNumber, {
         min: 1,
         max: 100000,
+        disabled: viewDisabled,
         value: minNum,
         onChange: function onChange(value) {
           setMinNum(value);
@@ -694,6 +698,7 @@ var TypeComponent = function TypeComponent(_ref2) {
       }), "-", /*#__PURE__*/React.createElement(InputNumber, {
         min: 1,
         max: 100000,
+        disabled: viewDisabled,
         value: maxNum,
         onChange: function onChange(value) {
           setMaxNum(value);
@@ -708,6 +713,7 @@ var TypeComponent = function TypeComponent(_ref2) {
           cursor: 'pointer'
         },
         onClick: function onClick() {
+          if (viewDisabled) return;
           setIncludedMaxState(function (pre) {
             optionsValue.filter(function (r) {
               return r.uniqueId == id;
@@ -724,6 +730,7 @@ var TypeComponent = function TypeComponent(_ref2) {
           width: '100%'
         },
         placeholder: "\u8BF7\u8F93\u5165",
+        disabled: viewDisabled,
         value: optionsValue.filter(function (r) {
           return r.uniqueId == id;
         })[0].content,
@@ -739,6 +746,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         value: ziduanValue,
         placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
         options: dictList,
+        disabled: viewDisabled,
         onChange: function onChange(value) {
           setZiduanValue(value);
           optionsValue.filter(function (r) {

package/es/modules/clearRule/index.js

@@ -83,7 +83,11 @@ var ClearRule = function ClearRule() {
         onClick: function onClick() {
           handleEditRule(record);
         }
-      }, "\u7F16\u8F91")), authority[170928557413] && (/*#__PURE__*/React.createElement(Button, {
+      }, "\u7F16\u8F91")), /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          return handleViewRule(record);
+        }
+      }, "\u67E5\u770B"), authority[170928557413] && (/*#__PURE__*/React.createElement(Button, {
         type: "link",
         disabled: record.status == 1,
         onClick: function onClick() {
@@ -202,6 +206,7 @@ var ClearRule = function ClearRule() {
     addruleShow = _useState12[0],
     setAddruleshow = _useState12[1];
   var handleAddRule = function handleAddRule() {
+    setRuleRowEdit(undefined);
     setAddruleshow(true);
     setEditStatus(false);
   };

package/es/modules/formulateRule/addFormulate.js

@@ -1,3 +1,5 @@
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -77,9 +79,6 @@ var AddFormulate = function AddFormulate(_ref) {
       }
     });
   };
-  var handleSave = function handleSave() {
-    ruleForm.submit();
-  };
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     dataSource = _useState4[0],
@@ -88,7 +87,19 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     dataSourceItemEdit = _useState6[0],
     setDataSoureItemEdit = _useState6[1];
-  var columns = [{
+  var columns = ruleRowView ? [{
+    title: '类型',
+    dataIndex: 'currentTypeName',
+    key: 'currentTypeName'
+  }, {
+    title: '原属性',
+    dataIndex: 'sourceValue',
+    key: 'sourceValue'
+  }, {
+    title: '清洗后属性',
+    dataIndex: 'targetValue',
+    key: 'targetValue'
+  }] : [{
     title: '类型',
     dataIndex: 'currentTypeName',
     key: 'currentTypeName'
@@ -142,7 +153,7 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     openRule = _useState10[0],
     setOpenRule = _useState10[1];
-  var _useState11 = useState([]),
+  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
     ruleList = _useState12[0],
     setRuleList = _useState12[1];
@@ -161,6 +172,9 @@ var AddFormulate = function AddFormulate(_ref) {
     //类型转换
     if (detailRow.ruleType == 3) {
       var _shuzhiArr$find;
+      if (!detailRow.sourceValue || !detailRow.targetValue) {
+        return str;
+      }
       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;
@@ -194,6 +208,7 @@ var AddFormulate = function AddFormulate(_ref) {
             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) {
+            var _shuzhiArr$find2, _shuzhiArr$find3;
             return {
               currentType: o.ruleType,
               currentTypeName: typeArr.filter(function (j) {
@@ -201,6 +216,12 @@ var AddFormulate = function AddFormulate(_ref) {
               })[0].label,
               sourceValue: o.ruleType == 5 ? '' : typeValue(o, 1),
               targetValue: typeValue(o, 2),
+              sourceValueId: o.ruleType == 3 && ((_shuzhiArr$find2 = shuzhiArr.find(function (j) {
+                return j.value == o.sourceValue;
+              })) === null || _shuzhiArr$find2 === void 0 ? void 0 : _shuzhiArr$find2.value),
+              targetValueId: o.ruleType == 3 && ((_shuzhiArr$find3 = shuzhiArr.find(function (j) {
+                return j.value == o.targetValue;
+              })) === null || _shuzhiArr$find3 === void 0 ? void 0 : _shuzhiArr$find3.value),
               key: o.id
             };
           });
@@ -239,11 +260,61 @@ var AddFormulate = function AddFormulate(_ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     currentBizAttributeSelectorValue = _useState16[0],
     setCurrentBizAttributeSelectorValue = _useState16[1];
+  // 判断是否都包含
+  var isAllTypeIncluded = function isAllTypeIncluded(arrA, arrB) {
+    // 边界处理：arrA 为空数组 → 默认全包含（无需要检查的 type）
+    if (!arrA || arrA.length === 0) return true;
+    // 边界处理：arrB 为空数组 → 不可能包含任何 type → 返回 false
+    if (!arrB || arrB.length === 0) return false;
+    // 步骤 1：提取 arrA 中所有不重复的 type（去重后检查更高效）
+    var arrATypes = new Set(arrA.map(function (item) {
+      return item;
+    })); // 去重，避免重复检查
+    // 步骤 2：提取 arrB 中所有的“有效对比值”（支持 arrB 是字符串数组或对象数组）
+    var arrBValues = new Set(arrB.map(function (item) {
+      // 若 arrB 元素是对象，取其 type 属性；若为字符串，直接用元素本身
+      return _typeof(item) === 'object' && item !== null ? item.currentType : item;
+    }));
+    // 步骤 3：检查 arrA 的每个 type 是否都在 arrB 的值中
+    var _iterator = _createForOfIteratorHelper(arrATypes),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var type = _step.value;
+        if (!arrBValues.has(type)) {
+          return false; // 找到一个不包含的 type，直接返回 false
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return true; // 所有 type 都包含，返回 true
+  };
+  // 添加校验规则按钮禁用状态
+  var addBtndisabled = function addBtndisabled() {
+    var type = [1, 2, 3, 4];
+    // 查看数据时禁用按钮
+    if (ruleRowView) {
+      return true;
+    }
+    if (dataSource.length >= 1 && dataSource.find(function (j) {
+      return j.currentType == 5;
+    })) {
+      return true;
+    }
+    // 值类型也限制了
+    // if (isAllTypeIncluded(type, dataSource)) {
+    //   return true;
+    // }
+    return false;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {
     className: "addRuleForm",
-    title: /*#__PURE__*/React.createElement("div", null, detailData ? '修改自定义校验规则清洗' : '新建自定义校验规则清洗', /*#__PURE__*/React.createElement("div", {
+    title: /*#__PURE__*/React.createElement("div", null, ruleRowView ? '查看自定义校验规则清洗' : detailData ? '修改自定义校验规则清洗' : '新建自定义校验规则清洗', /*#__PURE__*/React.createElement("div", {
       className: "drawerCloseIcon",
       onClick: onClose
     }, /*#__PURE__*/React.createElement(CloseOutlined, {
@@ -259,7 +330,9 @@ var AddFormulate = function AddFormulate(_ref) {
       onClick: onClose
     }, "\u53D6\u6D88"), ruleRowView === false && (/*#__PURE__*/React.createElement(Button, {
       type: "primary",
-      onClick: handleSave
+      onClick: function onClick() {
+        return ruleForm.submit();
+      }
     }, "\u786E\u5B9A"))))
   }, /*#__PURE__*/React.createElement(Form, {
     form: ruleForm,
@@ -309,7 +382,7 @@ var AddFormulate = function AddFormulate(_ref) {
       width: '320px'
     },
     onChange: function onChange(value) {
-      setCurrentBizAttributeSelectorValue(JSON.parse(ruleList.find(function (o) {
+      setCurrentBizAttributeSelectorValue(JSON.parse(ruleList === null || ruleList === void 0 ? void 0 : ruleList.find(function (o) {
         return o.ruleId == value;
       }).extraMes));
     },
@@ -330,9 +403,7 @@ var AddFormulate = function AddFormulate(_ref) {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
     }),
-    disabled: dataSource.length >= 1 && dataSource.find(function (j) {
-      return j.currentType == 5;
-    }) ? true : false,
+    disabled: addBtndisabled(),
     type: "link",
     onClick: function onClick() {
       setOpenRule(true);

package/es/modules/formulateRule/addRule.js

@@ -76,9 +76,9 @@ var AddRule = function AddRule(_ref) {
           disabled: true
         });
       }
-      if (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (k) {
+      if ((allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (k) {
         return k.currentType == o.value;
-      })) {
+      })) && o.value != 1) {
         return _objectSpread(_objectSpread({}, o), {}, {
           disabled: true
         });
@@ -118,6 +118,7 @@ var AddRule = function AddRule(_ref) {
     errorTip = _useState8[0],
     setErrorTip = _useState8[1]; // 值变换的提示信息
   var handleSave = function handleSave() {
+    // 原表格值变换校验
     if (hasDuplicate(dataSource).duplicateObjs.length >= 1) {
       var resultaArr = hasDuplicate(dataSource).duplicateObjs;
       var arr = dataSource.map(function (o) {
@@ -131,6 +132,7 @@ var AddRule = function AddRule(_ref) {
       message.error('有原始值相同');
       return;
     }
+    // 原始值和目标值空值
     if (dataSource.find(function (o) {
       return !o.sourceValue;
     }) || dataSource.find(function (o) {
@@ -144,6 +146,13 @@ var AddRule = function AddRule(_ref) {
         var _SelectValueForm$getF = SelectValueForm.getFieldsValue(),
           sourceValue = _SelectValueForm$getF.sourceValue,
           targetValue = _SelectValueForm$getF.targetValue;
+        // 修改状态下 原始值不能相同
+        if (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (o) {
+          return o.sourceValue == sourceValue && o.key != (oneRow === null || oneRow === void 0 ? void 0 : oneRow.key);
+        })) {
+          message.error('有原始值相同');
+          return;
+        }
         onSave({
           key: oneRow === null || oneRow === void 0 ? void 0 : oneRow.key,
           sourceValue: sourceValue,
@@ -332,7 +341,11 @@ var AddRule = function AddRule(_ref) {
       setDataSoure(_toConsumableArray(arr));
       return;
     }
-    setDataSoure([].concat(_toConsumableArray(dataSource), [{
+    setDataSoure([].concat(_toConsumableArray(dataSource.map(function (o) {
+      return _objectSpread(_objectSpread({}, o), {}, {
+        status: 'success'
+      });
+    })), [{
       key: getKey(),
       sourceValue: '',
       targetValue: '',
@@ -597,7 +610,7 @@ var AddRule = function AddRule(_ref) {
           span: 19
         },
         initialValues: {
-          sourceValueId: (currentBizAttributeSelectorValue === null || currentBizAttributeSelectorValue === void 0 ? void 0 : currentBizAttributeSelectorValue.type) || 1,
+          sourceValueId: undefined,
           targetValueId: undefined
         },
         onFinish: onShuzhiFinish
@@ -609,6 +622,7 @@ var AddRule = function AddRule(_ref) {
           message: '请选择属性原类型'
         }]
       }, /*#__PURE__*/React.createElement(Select, {
+        defaultValue: currentBizAttributeSelectorValue === null || currentBizAttributeSelectorValue === void 0 ? void 0 : currentBizAttributeSelectorValue.type,
         options: shuzhiArr,
         disabled: true
       })), /*#__PURE__*/React.createElement(Form.Item, {

package/es/modules/formulateRule/index.js

@@ -84,7 +84,11 @@ var FormulateRule = function FormulateRule() {
         onClick: function onClick() {
           handleEdit(record.ruleId);
         }
-      }, "\u7F16\u8F91")), authority[170928557423] && (/*#__PURE__*/React.createElement(Button, {
+      }, "\u7F16\u8F91")), /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          handleView(record.ruleId);
+        }
+      }, "\u67E5\u770B"), authority[170928557423] && (/*#__PURE__*/React.createElement(Button, {
         type: "link",
         disabled: record.status == 1,
         onClick: function onClick() {
@@ -458,6 +462,7 @@ var FormulateRule = function FormulateRule() {
     onClick: function onClick() {
       setOpenAddDraw(true);
       setDetailData(null);
+      setRuleRowEdit(undefined);
     }
   }, "\u521B\u5EFA\u6E05\u6D17\u8F6C\u6362\u4EFB\u52A1"))), /*#__PURE__*/React.createElement(Table, {
     rowKey: "ruleId",

package/package.json

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