@zgfe/modules-dm 1.0.57-zhongyuan.31 → 1.0.57-zhongyuan.33

package/es/modules/clearRule/addRule.js

@@ -20,6 +20,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import { BizEventSelector, BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
 import './css/index.less';
 import request from '../../utils/ajax';
+import { generateUniqueId } from '../../utils/index';
 import apis from '../../constants/api';
 var TextArea = Input.TextArea;
 var AddRule = function AddRule(_ref) {
@@ -61,7 +62,7 @@ var AddRule = function AddRule(_ref) {
     }, 300);
   };
   var onFinish = function onFinish(values) {
-    console.log('Success:', values);
+    console.log('Success:', values, optionsRule);
     if (currentRuleDetail) {
       // currentRuleDetail 有值为修改状态
       request(apis.rule.updateRule, {
@@ -170,25 +171,28 @@ var AddRule = function AddRule(_ref) {
     if (type === 3) {
       setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
         ruleType: type,
-        content: '(1,1)'
+        content: '(1,1)',
+        uniqueId: generateUniqueId()
       }]));
       return;
     }
     if (type === 1) {
       setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
         ruleType: type,
-        content: bizAttributeSelectorValue.type
+        content: bizAttributeSelectorValue.type,
+        uniqueId: generateUniqueId()
       }]));
       return;
     }
     setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
       ruleType: type,
-      content: undefined
+      content: undefined,
+      uniqueId: generateUniqueId()
     }]));
   };
-  var handleRuleDel = function handleRuleDel(index) {
+  var handleRuleDel = function handleRuleDel(uniqueId) {
     setOptionsRule(optionsRule.filter(function (o, i) {
-      return i !== index;
+      return o.uniqueId !== uniqueId;
     }));
   };
   // 校验对象的类型 eventProp：事件校验    user：用户校验
@@ -238,12 +242,12 @@ var AddRule = function AddRule(_ref) {
         value: _value
       }));
       // 初始化属性基础类型
-      var newArr = optionsRule.map(function (o) {
-        if (o.ruleType == 1) {
-          o.content = attr.type;
-        }
-      });
-      setOptionsRule(newArr);
+      // const newArr = optionsRule.map((o) => {
+      //   if (o.ruleType == 1) {
+      //     o.content = attr.type;
+      //   }
+      // });
+      // setOptionsRule(newArr);
       setOptions(attr.type != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
@@ -386,13 +390,14 @@ 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,
+      id: o.uniqueId,
       editStatus: currentRuleDetail ? true : false
     }), /*#__PURE__*/React.createElement("div", {
       style: {
         cursor: 'pointer'
       },
       onClick: function onClick() {
-        return handleRuleDel(index);
+        return handleRuleDel(o.uniqueId);
       }
     }, "X"));
   }))), /*#__PURE__*/React.createElement(Space, null, options.map(function (item, index) {
@@ -422,9 +427,11 @@ function parseRange(str) {
   };
 }
 var TypeComponent = function TypeComponent(_ref2) {
+  var _optionsValue$find;
   var type = _ref2.type,
     optionsValue = _ref2.optionsValue,
-    editStatus = _ref2.editStatus;
+    editStatus = _ref2.editStatus,
+    id = _ref2.id;
   // type:1 string    2:正则   3：数字区间 4：枚举
   var Component = null;
   var _useContext2 = useContext(BizGlobalDataContext),
@@ -437,7 +444,7 @@ var TypeComponent = function TypeComponent(_ref2) {
   var handleEnumChange = function handleEnumChange(value) {
     setEnumValue(value);
     optionsValue.filter(function (r) {
-      return r.ruleType == type;
+      return r.uniqueId == id;
     })[0].content = value;
   };
   // 区间
@@ -485,9 +492,6 @@ var TypeComponent = function TypeComponent(_ref2) {
   useEffect(function () {
     if (editStatus) {
       var _optionsValue$filter, _optionsValue$filter$;
-      console.log(optionsValue, 'optionsValue', optionsValue.filter(function (o) {
-        return o.ruleType == 3;
-      }));
       if ((_optionsValue$filter = optionsValue.filter(function (o) {
         return o.ruleType == 3;
       })) === null || _optionsValue$filter === void 0 ? void 0 : (_optionsValue$filter$ = _optionsValue$filter[0]) === null || _optionsValue$filter$ === void 0 ? void 0 : _optionsValue$filter$.content) {
@@ -505,12 +509,16 @@ var TypeComponent = function TypeComponent(_ref2) {
       getDictList();
     }
   }, []);
+  var _useState27 = useState((_optionsValue$find = optionsValue.find(function (o) {
+      return o.uniqueId == id;
+    })) === null || _optionsValue$find === void 0 ? void 0 : _optionsValue$find.content),
+    _useState28 = _slicedToArray(_useState27, 2),
+    typeValue = _useState28[0],
+    setTypeValue = _useState28[1];
   switch (type) {
     case 1:
       Component = /*#__PURE__*/React.createElement(Select, {
-        value: Number(optionsValue.filter(function (r) {
-          return r.ruleType == type;
-        })[0].content),
+        value: Number(typeValue),
         // disabled={true}
         options: [{
           value: 1,
@@ -523,8 +531,9 @@ var TypeComponent = function TypeComponent(_ref2) {
           label: '日期类型'
         }],
         onChange: function onChange(value) {
+          setTypeValue(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = value;
         }
       });
@@ -533,11 +542,11 @@ var TypeComponent = function TypeComponent(_ref2) {
       Component = /*#__PURE__*/React.createElement(Input, {
         placeholder: "\u8BF7\u8F93\u5165\u6B63\u5219\u8868\u5355\u5F0F",
         value: optionsValue.filter(function (r) {
-          return r.ruleType == type;
+          return r.uniqueId == id;
         })[0].content,
         onChange: function onChange(event) {
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = event.target.value;
         }
       });
@@ -554,7 +563,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onClick: function onClick() {
           setIncludedMinState(function (pre) {
             optionsValue.filter(function (r) {
-              return r.ruleType == type;
+              return r.uniqueId == id;
             })[0].content = "".concat(!includedMinState ? '[' : '(').concat(minNum, ",").concat(maxNum).concat(includedMaxState ? ']' : ')');
             return !pre;
           });
@@ -566,7 +575,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onChange: function onChange(value) {
           setMinNum(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = "".concat(includedMinState ? '[' : '(').concat(value, ",").concat(maxNum).concat(includedMaxState ? ']' : ')');
         }
       }), "-", /*#__PURE__*/React.createElement(InputNumber, {
@@ -576,7 +585,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onChange: function onChange(value) {
           setMaxNum(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = "".concat(includedMinState ? '[' : '(').concat(minNum, ",").concat(value).concat(includedMaxState ? ']' : ')');
         }
       }), /*#__PURE__*/React.createElement(Tooltip, {
@@ -588,7 +597,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         onClick: function onClick() {
           setIncludedMaxState(function (pre) {
             optionsValue.filter(function (r) {
-              return r.ruleType == type;
+              return r.uniqueId == id;
             })[0].content = "".concat(includedMinState ? '[' : '(').concat(minNum, ",").concat(maxNum).concat(!includedMaxState ? ']' : ')');
             return !pre;
           });
@@ -603,25 +612,23 @@ var TypeComponent = function TypeComponent(_ref2) {
         },
         placeholder: "\u8BF7\u8F93\u5165",
         value: optionsValue.filter(function (r) {
-          return r.ruleType == type;
+          return r.uniqueId == id;
         })[0].content,
         onChange: handleEnumChange,
         options: optionsEnum
       });
       break;
     case 6:
-      Component = /*#__PURE__*/React.createElement(Select
-      //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
-      , {
-        //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
-        value: optionsValue.filter(function (r) {
-          return r.ruleType == type;
-        })[0].content,
+      Component = /*#__PURE__*/React.createElement(Select, {
+        defaultValue: Number(optionsValue.filter(function (r) {
+          return r.uniqueId == id;
+        })[0].content),
+        // value={optionsValue.filter((r) => r.ruleType == type)[0].content}
         placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
         options: dictList,
         onChange: function onChange(value) {
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = value;
         }
       });