@zgfe/modules-dm 1.0.57-zhongyuan.25 → 1.0.57-zhongyuan.28

package/es/modules/clearRule/addRule.js

@@ -14,7 +14,7 @@ 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';
@@ -48,27 +48,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
-    }, {
-      ruleType: 6,
-      content: undefined
-    }]);
+    setOptionsRule([]);
     setBizAttributeSelectorValue(undefined); // 清空属性
     setEvent({
       id: -100,
@@ -92,7 +73,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;
@@ -100,7 +83,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)
         }
@@ -125,7 +110,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;
@@ -133,7 +120,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)
       }
@@ -153,25 +142,7 @@ 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
-    }, {
-      ruleType: 6,
-      content: undefined
-    }]),
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
     optionsRule = _useState6[0],
     setOptionsRule = _useState6[1];
@@ -195,61 +166,45 @@ var AddRule = function AddRule(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     options = _useState8[0],
     setOptions = _useState8[1];
-  var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    currentRule = _useState10[0],
-    setCurrentRule = _useState10[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);
+  var onChangeType = function onChangeType(type) {
+    if (type === 3) {
+      setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
+        ruleType: type,
+        content: '(1,1)'
+      }]));
+      return;
+    }
+    if (type === 1) {
+      setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
+        ruleType: type,
+        content: bizAttributeSelectorValue.type
+      }]));
+      return;
+    }
+    setOptionsRule([].concat(_toConsumableArray(optionsRule), [{
+      ruleType: type,
+      content: undefined
+    }]));
+  };
+  var handleRuleDel = function handleRuleDel(index) {
+    setOptionsRule(optionsRule.filter(function (o, i) {
+      return i !== index;
+    }));
   };
   // 校验对象的类型 eventProp：事件校验    user：用户校验
-  var _useState11 = useState(currentRuleDetail ? (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.objectType) == 1 ? 'eventProp' : 'user' : 'eventProp'),
-    _useState12 = _slicedToArray(_useState11, 2),
-    selectType = _useState12[0],
-    setSelectType = _useState12[1];
+  var _useState9 = useState(currentRuleDetail ? (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.objectType) == 1 ? 'eventProp' : 'user' : 'eventProp'),
+    _useState10 = _slicedToArray(_useState9, 2),
+    selectType = _useState10[0],
+    setSelectType = _useState10[1];
   var onSelectType = function onSelectType(event) {
     setSelectType(function (pre) {
       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
-    }, {
-      ruleType: 6,
-      content: undefined
-    }]);
+    setOptionsRule([]);
     setBizAttributeSelectorValue(undefined); // 清空属性
   };
-  var _useState13 = useState(currentRuleDetail ? currentRuleDetail.objectType == 1 ? {
+  var _useState11 = useState(currentRuleDetail ? currentRuleDetail.objectType == 1 ? {
       id: (currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.event) || -100
     } : {
       id: -100,
@@ -258,19 +213,19 @@ var AddRule = function AddRule(_ref) {
       id: -100,
       name: '事件概览'
     }),
-    _useState14 = _slicedToArray(_useState13, 2),
-    event = _useState14[0],
-    setEvent = _useState14[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    event = _useState12[0],
+    setEvent = _useState12[1];
   var onChangeEvent = function onChangeEvent(val) {
     // 删除细分属性  重新选择细分
     setBizAttributeSelectorValue(undefined);
     setEvent(val === null || val === void 0 ? void 0 : val.event);
   };
   // 细分属性初始值
-  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 _useState13 = useState(currentRuleDetail ? JSON.parse(currentRuleDetail === null || currentRuleDetail === void 0 ? void 0 : currentRuleDetail.extraMes) : undefined),
+    _useState14 = _slicedToArray(_useState13, 2),
+    bizAttributeSelectorValue = _useState14[0],
+    setBizAttributeSelectorValue = _useState14[1];
   // 细分属性
   var onChangeAttr = function onChangeAttr(attr) {
     if (attr === undefined) {
@@ -283,15 +238,12 @@ var AddRule = function AddRule(_ref) {
         value: _value
       }));
       // 初始化属性基础类型
-      if (currentRule.includes(1)) {
-        var newArr = optionsRule;
-        newArr.map(function (o) {
-          if (o.ruleType == 1) {
-            o.content = attr.type;
-          }
-        });
-        setOptionsRule(newArr);
-      }
+      var newArr = optionsRule.map(function (o) {
+        if (o.ruleType == 1) {
+          o.content = attr.type;
+        }
+      });
+      setOptionsRule(newArr);
       setOptions(attr.type != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
@@ -305,10 +257,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]);
   /**
    * 修改时回显数据
    */
@@ -319,23 +273,11 @@ 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;
-          }
-        });
-      });
-      setOptions(newArr[0].content != '3' ? [].concat(initOptions, [{
+      setOptionsRule(currentRuleDetail.verifyDetailVo);
+      setOptions(optionsRule[0].content != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
       }]) : [].concat(initOptions));
-      var currentTypeArr = currentRuleDetail.verifyDetailVo.map(function (o) {
-        return o.ruleType;
-      });
-      setCurrentRule(currentTypeArr);
-      setOptionsRule(newArr);
     }
   }, []);
   return /*#__PURE__*/React.createElement("div", {
@@ -435,22 +377,33 @@ var AddRule = function AddRule(_ref) {
     placeholder: "\u8BF7\u9009\u62E9\u7EC6\u5206\u5C5E\u6027"
   })), 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,
       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(index);
+      }
+    }, "X"));
+  }))), /*#__PURE__*/React.createElement(Space, null, options.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(Button, {
+      key: index,
+      type: "primary",
+      onClick: function onClick() {
+        return onChangeType(item.value);
+      }
+    }, item.label);
+  })))))));
 };
 var optionsEnum = [];
 function parseRange(str) {
@@ -477,10 +430,10 @@ var TypeComponent = function TypeComponent(_ref2) {
   var _useContext2 = useContext(BizGlobalDataContext),
     currentApp = _useContext2.currentApp;
   // 枚举
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    enumValue = _useState18[0],
-    setEnumValue = _useState18[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    enumValue = _useState16[0],
+    setEnumValue = _useState16[1];
   var handleEnumChange = function handleEnumChange(value) {
     setEnumValue(value);
     optionsValue.filter(function (r) {
@@ -488,27 +441,27 @@ var TypeComponent = function TypeComponent(_ref2) {
     })[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),
-    minNum = _useState20[0],
-    setMinNum = _useState20[1];
-  var _useState21 = useState(1),
+    maxNum = _useState20[0],
+    setMaxNum = _useState20[1];
+  var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    maxNum = _useState22[0],
-    setMaxNum = _useState22[1];
+    includedMinState = _useState22[0],
+    setIncludedMinState = _useState22[1];
   var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    includedMinState = _useState24[0],
-    setIncludedMinState = _useState24[1];
-  var _useState25 = useState(false),
-    _useState26 = _slicedToArray(_useState25, 2),
-    includedMaxState = _useState26[0],
-    setIncludedMaxState = _useState26[1];
+    includedMaxState = _useState24[0],
+    setIncludedMaxState = _useState24[1];
   //字典
-  var _useState27 = useState([]),
-    _useState28 = _slicedToArray(_useState27, 2),
-    dictList = _useState28[0],
-    setDictList = _useState28[1];
+  var _useState25 = useState([]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    dictList = _useState26[0],
+    setDictList = _useState26[1];
   var getDictList = function getDictList() {
     request(apis.dict.dictList, {
       method: 'post',
@@ -521,7 +474,7 @@ 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,
+            value: item.id + '',
             id: item.id
           };
         }));
@@ -531,9 +484,13 @@ var TypeComponent = function TypeComponent(_ref2) {
   // 只会执行一次 区间回显
   useEffect(function () {
     if (editStatus) {
-      if (optionsValue.filter(function (o) {
+      var _optionsValue$filter, _optionsValue$filter$;
+      console.log(optionsValue, 'optionsValue', optionsValue.filter(function (o) {
         return o.ruleType == 3;
-      })[0].content) {
+      }));
+      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) {
         var qujian = optionsValue.filter(function (o) {
           return o.ruleType === 3 && o.content;
         });
@@ -544,7 +501,9 @@ var TypeComponent = function TypeComponent(_ref2) {
         setIncludedMaxState(val.rightSymbol == ')' ? false : true);
       }
     }
-    getDictList();
+    if (type == 6) {
+      getDictList();
+    }
   }, []);
   switch (type) {
     case 1:

package/es/modules/clearRule/css/index.css

@@ -67,6 +67,7 @@
 .addRuleForm .ant-checkbox-wrapper {
   position: relative;
   margin-right: 8px;
+  margin-bottom: 8px;
   padding: 4px 15px;
   color: #333;
   vertical-align: middle;
@@ -125,7 +126,7 @@
 .addRuleForm .attrValue-list {
   display: grid;
   grid-gap: 20px;
-  grid-template-columns: 120px 1fr;
+  grid-template-columns: 120px 1fr 50px;
   align-items: center;
   justify-content: space-between;
   margin: 20px 0px;

package/es/modules/clearRule/css/index.less

@@ -134,7 +134,7 @@
     &-list {
       display: grid;
       grid-gap: 20px;
-      grid-template-columns: 120px 1fr;
+      grid-template-columns: 120px 1fr 50px;
       align-items: center;
       justify-content: space-between;
       margin: 20px 0px;

package/es/modules/formulateRule/index.js

@@ -104,8 +104,8 @@ var FormulateRule = function FormulateRule() {
         status: ruleObj.status ? 0 : 1
       }
     }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.code) == '100001') {
-        if (res.data.data == 1) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '110000') {
+        if ((res === null || res === void 0 ? void 0 : res.data.data) == 1) {
           UseModal({
             onOk: function onOk() {
               getDetail(ruleObj.ruleId);
@@ -116,7 +116,7 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
-        if (res.data.data == 2) {
+        if ((res === null || res === void 0 ? void 0 : res.data.data) == 2) {
           UseModal({
             onOk: function onOk() {
               return endOpen(ruleObj);
@@ -127,7 +127,7 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
-        if (res.data.data == 3) {
+        if ((res === null || res === void 0 ? void 0 : res.data.data) == 3) {
           UseModal({
             onOk: function onOk() {
               return endOpen(ruleObj);
@@ -139,7 +139,7 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
-        if (res.data.data == 4) {
+        if ((res === null || res === void 0 ? void 0 : res.data.data) == 4) {
           UseModal({
             onOk: function onOk() {
               return endOpen(ruleObj);
@@ -405,7 +405,7 @@ var FormulateRule = function FormulateRule() {
       onPointerLeaveCapture: undefined
     }),
     type: "primary",
-    disabled: !authority[170928557421],
+    // disabled={!authority[170928557421]}
     onClick: function onClick() {
       setOpenAddDraw(true);
       setDetailData(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.25",
+  "version": "1.0.57-zhongyuan.28",
   "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": "57bc943a6369d57afdb953bf41032a3951842614",
+  "gitHead": "2ff5bb2b1c4c01ddae567c8e84744eedc70c26d3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }