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

package/es/modules/clearRule/addRule.js

@@ -63,6 +63,10 @@ var AddRule = function AddRule(_ref) {
   };
   var onFinish = function onFinish(values) {
     console.log('Success:', values, optionsRule);
+    if (hasEvent) {
+      message.error('该属性的规则已存在，请重新选择属性！');
+      return;
+    }
     if (currentRuleDetail) {
       // currentRuleDetail 有值为修改状态
       request(apis.rule.updateRule, {
@@ -226,12 +230,17 @@ 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(false),
     _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) {
+    setHasEvent(false);
     if (attr === undefined) {
       // 删除细分属性
       setBizAttributeSelectorValue(undefined);
@@ -246,11 +255,15 @@ 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);
+          setHasEvent(true);
           return;
         }
       });
@@ -258,13 +271,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,13 +300,54 @@ 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));
     }
   }, []);
+  // 禁用按钮规则
+  //   { 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;
+    // 数值类型只有  数值区间规则 / 枚举 / 字典 / 非空 /属性类型
+    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)) {
+      result = false;
+    }
+    // 类型只能添加一个
+    if (optionsRule.find(function (o) {
+      return o.ruleType == btnItem.value;
+    })) {
+      result = true;
+    }
+    return result;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {
@@ -419,6 +466,7 @@ var AddRule = function AddRule(_ref) {
     return /*#__PURE__*/React.createElement(Button, {
       key: index,
       type: "primary",
+      disabled: handleDisabled(item),
       onClick: function onClick() {
         return onChangeType(item.value);
       }
@@ -452,10 +500,10 @@ var TypeComponent = function TypeComponent(_ref2) {
   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) {
@@ -463,27 +511,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),
-    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];
-  //字典
-  var _useState25 = useState([]),
+    includedMinState = _useState24[0],
+    setIncludedMinState = _useState24[1];
+  var _useState25 = useState(false),
     _useState26 = _slicedToArray(_useState25, 2),
-    dictList = _useState26[0],
-    setDictList = _useState26[1];
+    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',
@@ -496,8 +544,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)
           };
         }));
       }
@@ -524,25 +572,38 @@ var TypeComponent = function TypeComponent(_ref2) {
       getDictList();
     }
   }, []);
-  var _useState27 = useState((_optionsValue$find = optionsValue.find(function (o) {
+  var _useState29 = 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];
+    _useState30 = _slicedToArray(_useState29, 2),
+    typeValue = _useState30[0],
+    setTypeValue = _useState30[1];
+  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(typeValue),
-        // disabled={true}
+        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 +617,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 +694,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/es/modules/dataManage/components/eventFilter/index.js

@@ -11,8 +11,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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 { Tooltip, message } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
-import { BizEventSelector, BizAttrConditionGroup, IconFont } from '@zgfe/business-lib';
+import React, { useEffect, useRef, useState, useContext } from 'react';
+import { BizEventSelector, BizAttrConditionGroup, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import './styles/index.less';
 var classPrefix = 'virtual-event-eventfilter-box';
 var EventFilter = function EventFilter(props) {
@@ -20,6 +20,8 @@ var EventFilter = function EventFilter(props) {
     index = props.index,
     virtualDrawerType = props.virtualDrawerType,
     selectList = props.selectList;
+  var _useContext = useContext(BizGlobalDataContext),
+    envs = _useContext.envs;
   // 筛选条件个数
   var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -56,8 +58,8 @@ var EventFilter = function EventFilter(props) {
   // 添加筛选
   var onAdd = function onAdd() {
     // 最多可添加5条属性筛选
-    if (count >= 5) {
-      message.error('最多可添加5条属性筛选');
+    if (count >= ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5)) {
+      message.error("\u6700\u591A\u53EF\u6DFB\u52A0".concat((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5, "\u6761\u5C5E\u6027\u7B5B\u9009"));
       return;
     }
     if (selectList.length <= 0) {
@@ -122,7 +124,7 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count < 5 && selectList.length > 0 ? '' : 'disable'),
+    className: "".concat(count < ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5) && selectList.length > 0 ? '' : 'disable'),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

package/es/modules/dataMap/component/drawerAdd.js

@@ -33,7 +33,8 @@ var DrawerAdd = function DrawerAdd(props) {
     name: ''
   };
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    envs = _useContext.envs;
   // 关闭抽屉并重置表单
   useEffect(function () {
     setIsOpen(props.open);
@@ -304,7 +305,7 @@ var DrawerAdd = function DrawerAdd(props) {
     eventIdList: [event.id],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  }), count < 10 ? (/*#__PURE__*/React.createElement(Link, {
+  }), count < ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10) ? (/*#__PURE__*/React.createElement(Link, {
     target: "_blank",
     onClick: function onClick() {
       return onAdd();

package/es/modules/formulateRule/index.js

@@ -165,7 +165,8 @@ var FormulateRule = function FormulateRule() {
       method: 'post',
       data: {
         ruleId: ruleObj.ruleId,
-        status: ruleObj.status ? 0 : 1
+        status: ruleObj.status ? 0 : 1,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.38",
+  "version": "1.0.57-zhongyuan.41",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -46,7 +46,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.31",
+    "@zgfe/business-lib": "1.2.70-hxd.1",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "905d25ce59c27bb99555fbd6f7ec1e1754df5ea1",
+  "gitHead": "a6a0e1f2cb0745c2000d35f02f15c63557f9a624",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }