@zgfe/modules-dm 1.0.57-zhongyuan.54 → 1.0.57-zhongyuan.56

package/es/modules/clearRule/addRule.js

@@ -24,6 +24,7 @@ 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,
@@ -72,7 +73,7 @@ var AddRule = function AddRule(_ref) {
       message.error('请添加规则');
       return;
     }
-    if (hasEvent) {
+    if (!hasEvent) {
       message.error('该属性的规则已存在，请重新选择属性！');
       return;
     }
@@ -264,15 +265,9 @@ var AddRule = function AddRule(_ref) {
           attr: attr === null || attr === void 0 ? void 0 : attr.id
         }
       }).then(function (res) {
-        // if (res?.code == '100000') {
-        //   // 判断属性是否已经存在
-        //   const exists = res.data; // 假设后端返回的数据结构中有一个字段表示是否存在
-        //   !exists && message.error('该属性的规则已存在，请重新选择属性！');
-        //   return;
-        // }
+        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);
-          setHasEvent(true);
           return;
         }
       });
@@ -318,12 +313,6 @@ 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'
-      //     ? [...initOptions, { label: '字典校验', value: 6 }]
-      //     : [...initOptions],
-      // );
       var newarr = currentRuleDetail.verifyDetailVo.map(function (r) {
         return _objectSpread(_objectSpread({}, r), {}, {
           uniqueId: generateUniqueId()
@@ -442,9 +431,9 @@ var AddRule = function AddRule(_ref) {
     value: 'eventProp'
   }, "\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\u5C5E\u6027\uFF1A\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C"), /*#__PURE__*/React.createElement(Button, {
+  }, "\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"
-  }, "\u7EC6\u5206\u5C5E\u6027\uFF1A\u89D2\u8272\u5C5E\u6027\u6821\u9A8C"))), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
+  }, "\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,

package/es/modules/clearRule/index.js

@@ -69,9 +69,10 @@ var ClearRule = function ClearRule() {
   }, {
     title: '操作',
     key: 'action',
+    width: 240,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
-        size: "middle"
+        size: 4
       }, authority[170928557414] && (/*#__PURE__*/React.createElement(Switch, {
         checked: record.status == 0 ? false : true,
         onChange: function onChange(e) {
@@ -154,30 +155,7 @@ var ClearRule = function ClearRule() {
   };
   var handleViewRule = function handleViewRule(ruleRow) {
     setRuleRowEdit(ruleRow);
-    request(apis.rule.checkRule, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        ruleId: ruleRow.ruleId
-      }
-    }).then(function (res) {
-      if (!res) return;
-      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        // 1: 已清洗并且有正在执行的列表   2: 元事件已被删除的提示  3:校验通过
-        if (res.data.update == '2') {
-          UseModal({
-            onOk: function onOk() {
-              return getDetail(ruleRow.ruleId);
-            },
-            okText: '确定',
-            title: '校验对象已被删除',
-            content: "\u6821\u9A8C\u5BF9\u8C61\u5DF2\u88AB\u5220\u9664\uFF0C\u5C06\u4E0D\u4F1A\u8FDB\u884C\u4F7F\u7528\uFF0C\u8BF7\u8FDB\u884C\u4FEE\u6539"
-          });
-        }
-      }
-    }).finally(function () {
-      getDetail(ruleRow.ruleId);
-    });
+    getDetail(ruleRow.ruleId);
   };
   var getDetail = function getDetail(ruleId) {
     setEditStatus(true);
@@ -332,7 +310,9 @@ var ClearRule = function ClearRule() {
   var _useState31 = useState({
       current: 1,
       pageSize: 10,
-      total: 0
+      total: 0,
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
     _useState32 = _slicedToArray(_useState31, 2),
     tableParams = _useState32[0],

package/es/modules/dataManage/components/tablePlus.js

@@ -1171,9 +1171,9 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
         return;
       }
-      notification.error({
-        message: res === null || res === void 0 ? void 0 : res.msg
-      });
+      // notification.error({
+      //   message: res?.msg,
+      // });
     });
   };
   var _useState57 = useState(''),

package/es/modules/formulateRule/addFormulate.js

@@ -172,11 +172,11 @@ var AddFormulate = function AddFormulate(_ref) {
     //类型转换
     if (detailRow.ruleType == 3) {
       var _shuzhiArr$find;
-      if (!detailRow.sourceValue || !detailRow.targetValue) {
-        return str;
-      }
+      // if (!detailRow.sourceValue || !detailRow.targetValue) {
+      //   return str;
+      // }
       str = (_shuzhiArr$find = shuzhiArr.find(function (o) {
-        return o.value == (tag == 1 ? detailRow.sourceValue : detailRow.targetValue);
+        return o.value == (tag == 1 ? detailRow === null || detailRow === void 0 ? void 0 : detailRow.sourceValue : detailRow === null || detailRow === void 0 ? void 0 : detailRow.targetValue);
       })) === null || _shuzhiArr$find === void 0 ? void 0 : _shuzhiArr$find.label;
     }
     return str;
@@ -198,15 +198,17 @@ var AddFormulate = function AddFormulate(_ref) {
         // 回显
         if (detailData) {
           var _detailData$rinseObje2, _detailData$rinseShif;
+          var currentTargetObj = res.data.data.find(function (o) {
+            var _detailData$rinseObje;
+            return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
+          });
           ruleForm.setFieldsValue({
             name: detailData.ruleName,
             description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
-            target: res.data.data.find(function (o) {
-              var _detailData$rinseObje;
-              return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
-            }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
+            target: currentTargetObj ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
             ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
           });
+          currentTargetObj && setCurrentBizAttributeSelectorValue(JSON.parse(currentTargetObj === null || currentTargetObj === void 0 ? void 0 : currentTargetObj.extraMes));
           var arr = detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
             var _shuzhiArr$find2, _shuzhiArr$find3;
             return {

package/es/modules/formulateRule/addRule.js

@@ -501,6 +501,11 @@ var AddRule = function AddRule(_ref) {
   //   });
   //   setShuzhiArr1(arr);
   // }, [shuzhisourceValueId]);
+  useEffect(function () {
+    shuzhiForm.setFieldsValue({
+      sourceValueId: currentBizAttributeSelectorValue === null || currentBizAttributeSelectorValue === void 0 ? void 0 : currentBizAttributeSelectorValue.type
+    });
+  }, []);
   var component = null;
   switch (currentType) {
     case 1:
@@ -610,7 +615,7 @@ var AddRule = function AddRule(_ref) {
           span: 19
         },
         initialValues: {
-          sourceValueId: undefined,
+          sourceValueId: currentBizAttributeSelectorValue === null || currentBizAttributeSelectorValue === void 0 ? void 0 : currentBizAttributeSelectorValue.type,
           targetValueId: undefined
         },
         onFinish: onShuzhiFinish

package/es/modules/formulateRule/index.js

@@ -10,7 +10,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 { Table, Input, Button, Space, Switch, Modal, message, Typography, Tooltip, DatePicker, Spin } from 'antd';
+import { Table, Input, Button, Space, Switch, Modal, message, Typography, Tooltip, DatePicker } from 'antd';
 import { SearchOutlined, DiffOutlined, PlusOutlined, DownloadOutlined, LoadingOutlined } from '@ant-design/icons';
 import React, { useContext, useEffect, useState } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
@@ -72,7 +72,7 @@ var FormulateRule = function FormulateRule() {
     width: 240,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
-        size: "middle"
+        size: 4
       }, authority[170928557425] && (/*#__PURE__*/React.createElement(Switch, {
         checked: record.status == 0 ? false : true,
         onChange: function onChange() {
@@ -219,28 +219,7 @@ var FormulateRule = function FormulateRule() {
   };
   var handleView = function handleView(ruleId) {
     setRuleRowEdit(ruleId);
-    request(apis.clearRule.checkRule, {
-      method: 'post',
-      data: {
-        ruleId: ruleId
-      }
-    }).then(function (res) {
-      if (!res) return;
-      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        if (res.data == 1) {
-          UseModal({
-            onOk: function onOk() {
-              getDetail(ruleId);
-            },
-            okText: '去修改',
-            title: '校验对象已被删除',
-            content: "\u6821\u9A8C\u5BF9\u8C61\u5DF2\u88AB\u5220\u9664\uFF0C\u5C06\u4E0D\u4F1A\u8FDB\u884C\u4F7F\u7528\uFF0C\u8BF7\u8FDB\u884C\u4FEE\u6539"
-          });
-        }
-      }
-    }).finally(function () {
-      getDetail(ruleId);
-    });
+    getDetail(ruleId);
   };
   var handleDetale = function handleDetale(ruleId) {
     setRuleRowEdit(undefined);
@@ -292,7 +271,9 @@ var FormulateRule = function FormulateRule() {
   var _useState7 = useState({
       current: 1,
       pageSize: 10,
-      total: 0
+      total: 0,
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
     _useState8 = _slicedToArray(_useState7, 2),
     tableParams = _useState8[0],
@@ -438,13 +419,7 @@ var FormulateRule = function FormulateRule() {
     onChange: searchChange,
     onBlur: handleSearch,
     value: ruleSearchName
-  }), /*#__PURE__*/React.createElement(Space, null, authority[170928557424] && (/*#__PURE__*/React.createElement(Spin, {
-    indicator: antIcon,
-    spinning: statusLoading
-  }, /*#__PURE__*/React.createElement(Switch, {
-    checked: allOpenRule,
-    onChange: handleAllOpenStatus
-  }))), authority[170928557426] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
+  }), /*#__PURE__*/React.createElement(Space, null, authority[170928557426] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -458,7 +433,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.54",
+  "version": "1.0.57-zhongyuan.56",
   "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": "9ead8ae23d0760c49387a7f3074d22ca05cfa51b",
+  "gitHead": "9a8408cc7ebc8420d74a165d996b819c99bac0b8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }