@zgfe/modules-dm 1.0.57-zhongyuan.38 → 1.0.57-zhongyuan.39

package/es/modules/clearRule/addRule.js

@@ -246,11 +246,14 @@ var AddRule = function AddRule(_ref) {
           attr: attr === null || attr === void 0 ? void 0 : attr.id
         }
       }).then(function (res) {
-        if (!res) return;
-        if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-          // 判断属性是否已经存在
-          var exists = res.data; // 假设后端返回的数据结构中有一个字段表示是否存在
-          !exists && message.error('该属性的规则已存在，请重新选择属性！');
+        // if (res?.code == '100000') {
+        //   // 判断属性是否已经存在
+        //   const exists = res.data; // 假设后端返回的数据结构中有一个字段表示是否存在
+        //   !exists && message.error('该属性的规则已存在，请重新选择属性！');
+        //   return;
+        // }
+        if ((res === null || res === void 0 ? void 0 : res.code) != '100000') {
+          message.error(res.msg);
           return;
         }
       });
@@ -258,13 +261,6 @@ var AddRule = function AddRule(_ref) {
       setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
         value: _value
       }));
-      // 初始化属性基础类型
-      // const newArr = optionsRule.map((o) => {
-      //   if (o.ruleType == 1) {
-      //     o.content = attr.type;
-      //   }
-      // });
-      // setOptionsRule(newArr);
       setOptions(attr.type != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
@@ -294,8 +290,20 @@ var AddRule = function AddRule(_ref) {
         description: currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.ruleDescription,
         status: (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.status) == 1 ? true : false
       });
-      setOptionsRule(currentRuleDetail.verifyDetailVo);
-      setOptions(currentRuleDetail.verifyDetailVo[0] && currentRuleDetail.verifyDetailVo[0].content != '3' ? [].concat(initOptions, [{
+      // setOptionsRule(currentRuleDetail.verifyDetailVo);
+      // setOptions(
+      //   currentRuleDetail.verifyDetailVo[0] && currentRuleDetail.verifyDetailVo[0].content != '3'
+      //     ? [...initOptions, { label: '字典校验', value: 6 }]
+      //     : [...initOptions],
+      // );
+      var newarr = currentRuleDetail.verifyDetailVo.map(function (r) {
+        return _objectSpread(_objectSpread({}, r), {}, {
+          uniqueId: generateUniqueId()
+        });
+      });
+      setOptionsRule(newarr);
+      // 回显数据时要加入一个随机id
+      setOptions(newarr[0] && newarr[0].content != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
       }]) : [].concat(initOptions));
@@ -496,8 +504,8 @@ var TypeComponent = function TypeComponent(_ref2) {
         setDictList((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
           return {
             label: item.dictName,
-            value: item.id + '',
-            id: item.id
+            value: String(item.id),
+            id: String(item.id)
           };
         }));
       }
@@ -530,19 +538,32 @@ var TypeComponent = function TypeComponent(_ref2) {
     _useState28 = _slicedToArray(_useState27, 2),
     typeValue = _useState28[0],
     setTypeValue = _useState28[1];
+  var _useState29 = useState(optionsValue.filter(function (r) {
+      return r.uniqueId == id;
+    })[0].content),
+    _useState30 = _slicedToArray(_useState29, 2),
+    testValue = _useState30[0],
+    setTestValue = _useState30[1];
+  var _useState31 = useState(optionsValue.filter(function (r) {
+      return r.uniqueId == id;
+    })[0].content),
+    _useState32 = _slicedToArray(_useState31, 2),
+    ziduanValue = _useState32[0],
+    setZiduanValue = _useState32[1];
+  // 域分类：零售、公司、同业、风险、内部管理、其他
   switch (type) {
     case 1:
       Component = /*#__PURE__*/React.createElement(Select, {
-        value: Number(typeValue),
+        value: String(typeValue),
         // disabled={true}
         options: [{
-          value: 1,
+          value: '1',
           label: '字符串类型'
         }, {
-          value: 2,
+          value: '2',
           label: '数值类型'
         }, {
-          value: 3,
+          value: '3',
           label: '日期类型'
         }],
         onChange: function onChange(value) {
@@ -556,10 +577,9 @@ var TypeComponent = function TypeComponent(_ref2) {
     case 2:
       Component = /*#__PURE__*/React.createElement(Input, {
         placeholder: "\u8BF7\u8F93\u5165\u6B63\u5219\u8868\u5355\u5F0F",
-        value: optionsValue.filter(function (r) {
-          return r.uniqueId == id;
-        })[0].content,
+        value: testValue,
         onChange: function onChange(event) {
+          setTestValue(event.target.value);
           optionsValue.filter(function (r) {
             return r.uniqueId == id;
           })[0].content = event.target.value;
@@ -634,14 +654,15 @@ var TypeComponent = function TypeComponent(_ref2) {
       });
       break;
     case 6:
-      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}
+      Component = /*#__PURE__*/React.createElement(Select
+      // defaultValue={optionsValue.filter((r) => r.uniqueId == id)[0].content}
+      , {
+        // defaultValue={optionsValue.filter((r) => r.uniqueId == id)[0].content}
+        value: ziduanValue,
         placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
         options: dictList,
         onChange: function onChange(value) {
+          setZiduanValue(value);
           optionsValue.filter(function (r) {
             return r.uniqueId == id;
           })[0].content = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.38",
+  "version": "1.0.57-zhongyuan.39",
   "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": "905d25ce59c27bb99555fbd6f7ec1e1754df5ea1",
+  "gitHead": "40d86e8f09a9f47055ddce2c669f04a04ce88f9d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }