@zgfe/modules-dm 1.0.57-zhongyuan.6 → 1.0.57-zhongyuan.60

package/es/modules/clearRule/addRule.js

@@ -14,19 +14,22 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import { Drawer, Input, Button, Space, Form, Checkbox, Radio, message, Select, InputNumber, Tooltip } from 'antd';
+import { Drawer, Input, Button, Space, Form, Radio, message, Select, InputNumber, Tooltip } from 'antd';
 import { CloseOutlined } from '@ant-design/icons';
 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) {
+  var _currentRuleDetail$ve;
   var addruleShow = _ref.addruleShow,
     onSetclose = _ref.onSetclose,
     currentRuleDetail = _ref.currentRuleDetail,
-    getList = _ref.getList;
+    getList = _ref.getList,
+    ruleRowView = _ref.ruleRowView;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   // 规则启用
@@ -48,24 +51,8 @@ var AddRule = function AddRule(_ref) {
   var onClose = function onClose() {
     setOpen(false);
     ruleForm.resetFields(); // 表单重置
-    // conditionRef!.current!.deleteAll(); // 重置固定筛选数组
     // 清空属性的所有值
-    setOptionsRule([{
-      ruleType: 1,
-      content: undefined
-    }, {
-      ruleType: 2,
-      content: undefined
-    }, {
-      ruleType: 3,
-      content: undefined
-    }, {
-      ruleType: 4,
-      content: undefined
-    }, {
-      ruleType: 5,
-      content: undefined
-    }]);
+    setOptionsRule([]);
     setBizAttributeSelectorValue(undefined); // 清空属性
     setEvent({
       id: -100,
@@ -77,7 +64,19 @@ var AddRule = function AddRule(_ref) {
     }, 300);
   };
   var onFinish = function onFinish(values) {
-    console.log('Success:', values);
+    console.log('Success:', values, optionsRule);
+    if (event.id == -100 || !bizAttributeSelectorValue) {
+      message.error('请选择事件或者属性！');
+      return;
+    }
+    if (optionsRule.length == 0) {
+      message.error('请添加规则');
+      return;
+    }
+    if (!hasEvent) {
+      message.error('该属性的规则已存在，请重新选择属性！');
+      return;
+    }
     if (currentRuleDetail) {
       // currentRuleDetail 有值为修改状态
       request(apis.rule.updateRule, {
@@ -89,7 +88,9 @@ var AddRule = function AddRule(_ref) {
           ObjectType: selectType === 'eventProp' ? 1 : 2,
           event: selectType === 'eventProp' ? event.id : undefined,
           attr: bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.id,
-          verifyDetail: currentRule.indexOf(5) > -1 ? [{
+          verifyDetail: optionsRule.findIndex(function (a) {
+            return a.ruleType == 5;
+          }) > -1 ? [{
             ruleType: 5
           }].concat(_toConsumableArray(optionsRule.filter(function (o) {
             return o.content;
@@ -97,7 +98,9 @@ var AddRule = function AddRule(_ref) {
             return o.content;
           }),
           status: ruleStatus == true ? 1 : 0,
-          ruleType: currentRule,
+          ruleType: optionsRule.map(function (o) {
+            return o.ruleType;
+          }),
           appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           extraMes: JSON.stringify(bizAttributeSelectorValue)
         }
@@ -109,7 +112,7 @@ var AddRule = function AddRule(_ref) {
           // 刷新列表
           getList();
         } else {
-          message.error('修改规则失败！');
+          message.error(res.msg);
         }
       });
       return;
@@ -122,7 +125,9 @@ var AddRule = function AddRule(_ref) {
         ObjectType: selectType === 'eventProp' ? 1 : 2,
         event: selectType === 'eventProp' ? event.id : undefined,
         attr: bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.id,
-        verifyDetail: currentRule.indexOf(5) > -1 ? [{
+        verifyDetail: optionsRule.findIndex(function (a) {
+          return a.ruleType == 5;
+        }) > -1 ? [{
           ruleType: 5
         }].concat(_toConsumableArray(optionsRule.filter(function (o) {
           return o.content;
@@ -130,7 +135,9 @@ var AddRule = function AddRule(_ref) {
           return o.content;
         }),
         status: ruleStatus == true ? 1 : 0,
-        ruleType: currentRule,
+        ruleType: optionsRule.map(function (o) {
+          return o.ruleType;
+        }),
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         extraMes: JSON.stringify(bizAttributeSelectorValue)
       }
@@ -142,7 +149,7 @@ var AddRule = function AddRule(_ref) {
         // 刷新列表
         getList();
       } else {
-        message.error('添加规则失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -150,26 +157,11 @@ var AddRule = function AddRule(_ref) {
     ruleForm.submit();
   };
   /** 规则类型 */
-  var _useState5 = useState([{
-      ruleType: 1,
-      content: undefined
-    }, {
-      ruleType: 2,
-      content: undefined
-    }, {
-      ruleType: 3,
-      content: undefined
-    }, {
-      ruleType: 4,
-      content: undefined
-    }, {
-      ruleType: 5,
-      content: undefined
-    }]),
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
     optionsRule = _useState6[0],
     setOptionsRule = _useState6[1];
-  var options = [{
+  var initOptions = [{
     label: '属性类型',
     value: 1
   }, {
@@ -185,28 +177,37 @@ var AddRule = function AddRule(_ref) {
     label: '非空',
     value: 5
   }];
-  var _useState7 = useState([]),
+  var _useState7 = useState(initOptions),
     _useState8 = _slicedToArray(_useState7, 2),
-    currentRule = _useState8[0],
-    setCurrentRule = _useState8[1];
-  var onChangeType = function onChangeType(value) {
-    setCurrentRule(value);
-    // 再次点击清空数据
-    var newarr = optionsRule.map(function (o) {
-      // 先处理第一个map的逻辑
-      var baseItem = value.indexOf(o.ruleType) > -1 ? o : _objectSpread(_objectSpread({}, o), {}, {
-        content: undefined
-      });
-      // 再处理第二个map的逻辑
-      if (value.indexOf(1) > -1) {
-        return baseItem.ruleType === 1 ? {
-          ruleType: 1,
-          content: bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type
-        } : baseItem;
-      }
-      return baseItem;
-    });
-    setOptionsRule(newarr);
+    options = _useState8[0],
+    setOptions = _useState8[1];
+  var onChangeType = function onChangeType(type) {
+    if (type === 3) {
+      setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
+        ruleType: type,
+        content: '(1,1)',
+        uniqueId: generateUniqueId()
+      }]));
+      return;
+    }
+    if (type === 1) {
+      setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
+        ruleType: type,
+        content: bizAttributeSelectorValue.type,
+        uniqueId: generateUniqueId()
+      }]));
+      return;
+    }
+    setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
+      ruleType: type,
+      content: undefined,
+      uniqueId: generateUniqueId()
+    }]));
+  };
+  var handleRuleDel = function handleRuleDel(uniqueId) {
+    setOptionsRule(optionsRule.filter(function (o, i) {
+      return o.uniqueId !== uniqueId;
+    }));
   };
   // 校验对象的类型 eventProp：事件校验    user：用户校验
   var _useState9 = useState(currentRuleDetail ? (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.objectType) == 1 ? 'eventProp' : 'user' : 'eventProp'),
@@ -218,22 +219,7 @@ var AddRule = function AddRule(_ref) {
       return event.target.value;
     });
     // 清空属性的所有值
-    setOptionsRule([{
-      ruleType: 1,
-      content: undefined
-    }, {
-      ruleType: 2,
-      content: undefined
-    }, {
-      ruleType: 3,
-      content: undefined
-    }, {
-      ruleType: 4,
-      content: undefined
-    }, {
-      ruleType: 5,
-      content: undefined
-    }]);
+    setOptionsRule([]);
     setBizAttributeSelectorValue(undefined); // 清空属性
   };
   var _useState11 = useState(currentRuleDetail ? currentRuleDetail.objectType == 1 ? {
@@ -254,36 +240,53 @@ var AddRule = function AddRule(_ref) {
     setEvent(val === null || val === void 0 ? void 0 : val.event);
   };
   // 细分属性初始值
-  var _useState13 = useState(currentRuleDetail ? JSON.parse(currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.extraMes) : undefined),
+  var _useState13 = useState(true),
     _useState14 = _slicedToArray(_useState13, 2),
-    bizAttributeSelectorValue = _useState14[0],
-    setBizAttributeSelectorValue = _useState14[1];
+    hasEvent = _useState14[0],
+    setHasEvent = _useState14[1];
+  var _useState15 = useState(currentRuleDetail ? JSON.parse(currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.extraMes) : undefined),
+    _useState16 = _slicedToArray(_useState15, 2),
+    bizAttributeSelectorValue = _useState16[0],
+    setBizAttributeSelectorValue = _useState16[1];
   // 细分属性
   var onChangeAttr = function onChangeAttr(attr) {
     if (attr === undefined) {
       // 删除细分属性
       setBizAttributeSelectorValue(undefined);
+      setOptions([].concat(initOptions));
     } else {
+      // 先查询是否有属性规则一开启的
+      request(apis.rule.checkExists, {
+        method: 'post',
+        data: {
+          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+          event: event.id,
+          attr: attr === null || attr === void 0 ? void 0 : attr.id
+        }
+      }).then(function (res) {
+        setHasEvent((res === null || res === void 0 ? void 0 : res.code) == '100000' ? true : false);
+        if ((res === null || res === void 0 ? void 0 : res.code) != '100000') {
+          message.error(res.msg);
+          return;
+        }
+      });
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
-      setBizAttributeSelectorValue({
-        propCategory: attr.propCategory,
-        category: attr.category,
-        value: _value,
-        id: attr.id,
-        label: attr === null || attr === void 0 ? void 0 : attr.label,
-        name: attr === null || attr === void 0 ? void 0 : attr.name,
-        type: attr.type
+      setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
+        value: _value
+      }));
+      var arr = optionsRule.map(function (o) {
+        if (o.ruleType == 1) {
+          return _objectSpread(_objectSpread({}, o), {}, {
+            content: attr.type
+          });
+        }
+        return o;
       });
-      // 初始化属性基础类型
-      if (currentRule.includes(1)) {
-        var newArr = optionsRule;
-        newArr.map(function (o) {
-          if (o.ruleType == 1) {
-            o.content = attr.type;
-          }
-        });
-        setOptionsRule(newArr);
-      }
+      setOptionsRule(arr);
+      setOptions(attr.type != '3' ? [].concat(initOptions, [{
+        label: '字典校验',
+        value: 6
+      }]) : [].concat(initOptions));
     }
   };
   useEffect(function () {
@@ -293,10 +296,12 @@ var AddRule = function AddRule(_ref) {
         selectType: selectType,
         event: event,
         bizAttributeSelectorValue: bizAttributeSelectorValue,
-        currentRule: currentRule
+        currentRule: optionsRule.map(function (o) {
+          return o.ruleType;
+        })
       }
     });
-  }, [selectType, currentRule, event, bizAttributeSelectorValue]);
+  }, [selectType, optionsRule, event, bizAttributeSelectorValue]);
   /**
    * 修改时回显数据
    */
@@ -307,30 +312,59 @@ 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
       });
-      var newArr = optionsRule;
-      newArr.map(function (o) {
-        currentRuleDetail.verifyDetailVo.map(function (j) {
-          if (o.ruleType == j.ruleType) {
-            o.content = j.content;
-          }
-          // 这个为模拟的区间数据
-          if (o.ruleType == 3) {
-            o.content = '(4,8]';
-          }
+      var newarr = currentRuleDetail.verifyDetailVo.map(function (r) {
+        return _objectSpread(_objectSpread({}, r), {}, {
+          uniqueId: generateUniqueId()
         });
       });
-      var currentTypeArr = currentRuleDetail.verifyDetailVo.map(function (o) {
-        return o.ruleType;
-      });
-      setCurrentRule(currentTypeArr);
-      setOptionsRule(newArr);
+      setOptionsRule(newarr);
+      // 回显数据时要加入一个随机id
+      setOptions(newarr[0] && newarr[0].content != '3' ? [].concat(initOptions, [{
+        label: '字典校验',
+        value: 6
+      }]) : [].concat(initOptions));
     }
   }, []);
+  // 禁用按钮规则
+  // 1字符串类型  2数值类型  3日期类型
+  var handleDisabled = function handleDisabled(btnItem) {
+    var result = true;
+    // 数值类型只有  数值区间规则 / 枚举 / 字典 / 非空 /属性类型
+    if ((bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type) == 2 && (btnItem.value >= 3 || btnItem.value == 1)) {
+      result = false;
+    }
+    // 日期属性类型  非空/正则/属性类型
+    if ((bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type) == 3 && (btnItem.value == 2 || btnItem.value == 5 || btnItem.value == 1)) {
+      result = false;
+    }
+    //  字符串类型 正则 /枚举 / 非空/属性类型 / 字典
+    if ((bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.type) == 1 && (btnItem.value == 2 || btnItem.value == 5 || btnItem.value == 4 || btnItem.value == 1 || btnItem.value == 6)) {
+      result = false;
+    }
+    // 类型只能添加一个
+    if (optionsRule.find(function (o) {
+      return o.ruleType == btnItem.value;
+    })) {
+      result = true;
+    }
+    // 类型只能添加一个
+    if (optionsRule.find(function (o) {
+      return o.ruleType != 2;
+    }) && btnItem.value == 2) {
+      result = true;
+    }
+    if (optionsRule.find(function (o) {
+      return o.ruleType == 2;
+    }) && optionsRule.length >= 1) {
+      result = true;
+    }
+    return result;
+  };
   return /*#__PURE__*/React.createElement("div", {
     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, {
@@ -344,12 +378,13 @@ var AddRule = function AddRule(_ref) {
     width: "700px",
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       onClick: onClose
-    }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
+    }, "\u53D6\u6D88"), ruleRowView == false && (/*#__PURE__*/React.createElement(Button, {
       type: "primary",
       onClick: handleSave
-    }, "\u786E\u5B9A")))
+    }, "\u786E\u5B9A"))))
   }, /*#__PURE__*/React.createElement(Form, {
     form: ruleForm,
+    disabled: ruleRowView,
     labelCol: {
       span: 4
     },
@@ -359,7 +394,7 @@ var AddRule = function AddRule(_ref) {
     initialValues: {
       name: '',
       desctiption: '',
-      ruleobj: []
+      ruleobj: {}
     },
     onFinish: onFinish,
     labelAlign: "left"
@@ -386,16 +421,18 @@ var AddRule = function AddRule(_ref) {
     name: "ruleobj",
     rules: [{
       required: true,
-      message: '请寻找校验对象'
+      message: '请选择校验对象'
     }]
   }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Radio.Group, {
     onChange: onSelectType,
     value: selectType
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 'eventProp'
-  }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C"), /*#__PURE__*/React.createElement(Radio, {
-    value: 'user'
-  }, "\u7528\u6237\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\u540D\u79F0\uFF1A", currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : (_currentRuleDetail$ve = currentRuleDetail.verifyObject) === null || _currentRuleDetail$ve === void 0 ? void 0 : _currentRuleDetail$ve.split('|||')[0]), /*#__PURE__*/React.createElement(Button, {
+    type: "link"
+  }, "\u5C5E\u6027\u540D\u79F0\uFF1A", (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.name)))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
     className: "selectVent"
   }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
@@ -410,35 +447,49 @@ var AddRule = function AddRule(_ref) {
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   })), /*#__PURE__*/React.createElement(BizAttributeSelector, {
-    enableEventProp: true,
-    enableUserProp: selectType == 'user',
-    enableEnvProp: true,
+    enableEventProp: selectType == 'eventProp',
+    enableUserProp: false,
+    enableEnvProp: false,
     eventIdList: [event === null || event === void 0 ? void 0 : event.id],
     value: bizAttributeSelectorValue,
-    enableDelete: true,
+    enableDelete: false,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
       onChangeAttr(undefined);
     },
     placeholder: "\u8BF7\u9009\u62E9\u7EC6\u5206\u5C5E\u6027"
-  })), bizAttributeSelectorValue && (/*#__PURE__*/React.createElement("div", {
+  }))), bizAttributeSelectorValue && (/*#__PURE__*/React.createElement("div", {
     className: "attrValue"
-  }, currentRule.length > 1 && /*#__PURE__*/React.createElement("span", {
+  }, optionsRule.length > 1 && /*#__PURE__*/React.createElement("span", {
     className: "attrValue-styleLine"
-  }, "\u4E14"), currentRule.map(function (o, index) {
+  }, "\u4E14"), optionsRule.map(function (o, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "attrValue-list"
     }, /*#__PURE__*/React.createElement("div", null, (bizAttributeSelectorValue === null || bizAttributeSelectorValue === void 0 ? void 0 : bizAttributeSelectorValue.label) || bizAttributeSelectorValue.name), /*#__PURE__*/React.createElement(TypeComponent, {
-      type: o,
+      type: o.ruleType,
       optionsValue: optionsRule,
+      viewDisabled: ruleRowView,
+      id: o.uniqueId,
       editStatus: currentRuleDetail ? true : false
-    }));
-  }))), /*#__PURE__*/React.createElement(Checkbox.Group, {
-    options: options,
-    value: currentRule,
-    onChange: onChangeType
-  }))))));
+    }), /*#__PURE__*/React.createElement("div", {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return handleRuleDel(o.uniqueId);
+      }
+    }, "X"));
+  }))), /*#__PURE__*/React.createElement(Space, null, !ruleRowView && options.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(Button, {
+      key: index,
+      type: "primary",
+      disabled: handleDisabled(item),
+      onClick: function onClick() {
+        return onChangeType(item.value);
+      }
+    }, item.label);
+  })))))));
 };
 var optionsEnum = [];
 function parseRange(str) {
@@ -457,45 +508,75 @@ function parseRange(str) {
   };
 }
 var TypeComponent = function TypeComponent(_ref2) {
+  var _optionsValue$find, _optionsValue$find3;
   var type = _ref2.type,
     optionsValue = _ref2.optionsValue,
-    editStatus = _ref2.editStatus;
+    editStatus = _ref2.editStatus,
+    id = _ref2.id,
+    viewDisabled = _ref2.viewDisabled;
   // type:1 string    2:正则   3：数字区间 4：枚举
   var Component = null;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    currentApp = _useContext2.currentApp;
   // 枚举
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    enumValue = _useState16[0],
-    setEnumValue = _useState16[1];
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    enumValue = _useState18[0],
+    setEnumValue = _useState18[1];
   var handleEnumChange = function handleEnumChange(value) {
     setEnumValue(value);
     optionsValue.filter(function (r) {
-      return r.ruleType == type;
+      return r.uniqueId == id;
     })[0].content = value;
   };
   // 区间
-  var _useState17 = useState(1),
-    _useState18 = _slicedToArray(_useState17, 2),
-    minNum = _useState18[0],
-    setMinNum = _useState18[1];
   var _useState19 = useState(1),
     _useState20 = _slicedToArray(_useState19, 2),
-    maxNum = _useState20[0],
-    setMaxNum = _useState20[1];
-  var _useState21 = useState(false),
+    minNum = _useState20[0],
+    setMinNum = _useState20[1];
+  var _useState21 = useState(1),
     _useState22 = _slicedToArray(_useState21, 2),
-    includedMinState = _useState22[0],
-    setIncludedMinState = _useState22[1];
+    maxNum = _useState22[0],
+    setMaxNum = _useState22[1];
   var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    includedMaxState = _useState24[0],
-    setIncludedMaxState = _useState24[1];
+    includedMinState = _useState24[0],
+    setIncludedMinState = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    includedMaxState = _useState26[0],
+    setIncludedMaxState = _useState26[1];
+  //字典
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    dictList = _useState28[0],
+    setDictList = _useState28[1];
+  var getDictList = function getDictList() {
+    request(apis.dict.dictList, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        var _res$data;
+        setDictList((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
+          return {
+            label: item.dictName,
+            value: String(item.id),
+            id: String(item.id)
+          };
+        }));
+      }
+    });
+  };
   // 只会执行一次 区间回显
   useEffect(function () {
     if (editStatus) {
-      if (optionsValue.filter(function (o) {
+      var _optionsValue$filter, _optionsValue$filter$;
+      if ((_optionsValue$filter = optionsValue.filter(function (o) {
         return o.ruleType == 3;
-      })[0].content) {
+      })) === null || _optionsValue$filter === void 0 ? void 0 : (_optionsValue$filter$ = _optionsValue$filter[0]) === null || _optionsValue$filter$ === void 0 ? void 0 : _optionsValue$filter$.content) {
         var qujian = optionsValue.filter(function (o) {
           return o.ruleType === 3 && o.content;
         });
@@ -503,30 +584,59 @@ var TypeComponent = function TypeComponent(_ref2) {
         setMinNum(val.firstNumber);
         setMaxNum(val.secondNumber);
         setIncludedMinState(val.leftSymbol == '(' ? false : true);
-        setIncludedMaxState(val.rightSymbol == '(' ? false : true);
+        setIncludedMaxState(val.rightSymbol == ')' ? false : true);
       }
     }
+    if (type == 6) {
+      getDictList();
+    }
   }, []);
+  var _useState29 = useState((_optionsValue$find = optionsValue.find(function (o) {
+      return o.uniqueId == id;
+    })) === null || _optionsValue$find === void 0 ? void 0 : _optionsValue$find.content),
+    _useState30 = _slicedToArray(_useState29, 2),
+    typeValue = _useState30[0],
+    setTypeValue = _useState30[1];
+  useEffect(function () {
+    var _optionsValue$find2;
+    setTypeValue((_optionsValue$find2 = optionsValue.find(function (o) {
+      return o.uniqueId == id;
+    })) === null || _optionsValue$find2 === void 0 ? void 0 : _optionsValue$find2.content);
+  }, [(_optionsValue$find3 = optionsValue.find(function (o) {
+    return o.uniqueId == id;
+  })) === null || _optionsValue$find3 === void 0 ? void 0 : _optionsValue$find3.content]);
+  var _useState31 = useState(optionsValue.filter(function (r) {
+      return r.uniqueId == id;
+    })[0].content),
+    _useState32 = _slicedToArray(_useState31, 2),
+    testValue = _useState32[0],
+    setTestValue = _useState32[1];
+  var _useState33 = useState(optionsValue.filter(function (r) {
+      return r.uniqueId == id;
+    })[0].content),
+    _useState34 = _slicedToArray(_useState33, 2),
+    ziduanValue = _useState34[0],
+    setZiduanValue = _useState34[1];
+  // 域分类：零售、公司、同业、风险、内部管理、其他
   switch (type) {
     case 1:
       Component = /*#__PURE__*/React.createElement(Select, {
-        value: Number(optionsValue.filter(function (r) {
-          return r.ruleType == type;
-        })[0].content),
-        // disabled={true}
+        value: String(typeValue),
+        disabled: true,
         options: [{
-          value: 1,
+          value: '1',
           label: '字符串类型'
         }, {
-          value: 2,
-          label: '数字类型'
+          value: '2',
+          label: '数值类型'
         }, {
-          value: 3,
+          value: '3',
           label: '日期类型'
         }],
         onChange: function onChange(value) {
+          setTypeValue(value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = value;
         }
       });
@@ -534,12 +644,12 @@ 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.ruleType == type;
-        })[0].content,
+        value: testValue,
+        disabled: viewDisabled,
         onChange: function onChange(event) {
+          setTestValue(event.target.value);
           optionsValue.filter(function (r) {
-            return r.ruleType == type;
+            return r.uniqueId == id;
           })[0].content = event.target.value;
         }
       });
@@ -548,12 +658,16 @@ var TypeComponent = function TypeComponent(_ref2) {
       Component = /*#__PURE__*/React.createElement("div", {
         className: "attrValue-list-right"
       }, /*#__PURE__*/React.createElement(Tooltip, {
-        title: "\u70B9\u51FB\u5207\u6362[\u5F00\u542F/\u5173\u95ED]\u533A\u95F4"
+        title: "\u70B9\u51FB\u5207\u6362[\u5F00/\u95ED]\u533A\u95F4"
       }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          cursor: 'pointer'
+        },
         onClick: function onClick() {
+          if (viewDisabled) return;
           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;
           });
@@ -561,30 +675,36 @@ var TypeComponent = function TypeComponent(_ref2) {
       }, includedMinState ? '[' : '(')), /*#__PURE__*/React.createElement(InputNumber, {
         min: 1,
         max: 100000,
+        disabled: viewDisabled,
         value: minNum,
         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, {
         min: 1,
         max: 100000,
+        disabled: viewDisabled,
         value: maxNum,
         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, {
-        title: "\u70B9\u51FB\u5207\u6362[\u5F00\u542F/\u5173\u95ED]\u533A\u95F4"
+        title: "\u70B9\u51FB\u5207\u6362[\u5F00/\u95ED]\u533A\u95F4"
       }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          cursor: 'pointer'
+        },
         onClick: function onClick() {
+          if (viewDisabled) return;
           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;
           });
@@ -598,13 +718,31 @@ var TypeComponent = function TypeComponent(_ref2) {
           width: '100%'
         },
         placeholder: "\u8BF7\u8F93\u5165",
+        disabled: viewDisabled,
         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={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,
+        disabled: viewDisabled,
+        onChange: function onChange(value) {
+          setZiduanValue(value);
+          optionsValue.filter(function (r) {
+            return r.uniqueId == id;
+          })[0].content = value;
+        }
+      });
+      break;
     default:
       Component = /*#__PURE__*/React.createElement("div", null, "\u5FC5\u586B");
       break;