@zgfe/modules-dm 1.0.57-zhongyuan.45 → 1.0.57-zhongyuan.47

package/es/modules/clearRule/addRule.d.ts

@@ -6,6 +6,6 @@ declare const AddRule: React.FC<{
     onSetclose: Function;
     currentRuleDetail: RuleDetailType | undefined | null;
     getList: Function;
-    ruleRowEdit?: number;
+    ruleRowView?: boolean;
 }>;
 export default AddRule;

package/es/modules/clearRule/addRule.js

@@ -28,7 +28,7 @@ var AddRule = function AddRule(_ref) {
     onSetclose = _ref.onSetclose,
     currentRuleDetail = _ref.currentRuleDetail,
     getList = _ref.getList,
-    ruleRowEdit = _ref.ruleRowEdit;
+    ruleRowView = _ref.ruleRowView;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   // 规则启用
@@ -68,6 +68,10 @@ var AddRule = function AddRule(_ref) {
       message.error('请选择事件或者属性！');
       return;
     }
+    if (optionsRule.length == 0) {
+      message.error('请添加规则');
+      return;
+    }
     if (hasEvent) {
       message.error('该属性的规则已存在，请重新选择属性！');
       return;
@@ -391,13 +395,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"), (ruleRowEdit == undefined || ruleRowEdit === 0) && (/*#__PURE__*/React.createElement(Button, {
+    }, "\u53D6\u6D88"), ruleRowView == false && (/*#__PURE__*/React.createElement(Button, {
       type: "primary",
       onClick: handleSave
     }, "\u786E\u5B9A"))))
   }, /*#__PURE__*/React.createElement(Form, {
     form: ruleForm,
-    disabled: ruleRowEdit === 1,
+    disabled: ruleRowView,
     labelCol: {
       span: 4
     },

package/es/modules/clearRule/index.js

@@ -77,11 +77,15 @@ var ClearRule = function ClearRule() {
         onChange: function onChange(e) {
           return _onChange(e, record);
         }
-      })), authority[170928557412] && (/*#__PURE__*/React.createElement("a", {
+      })), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleEditRule(record);
         }
-      }, record.status == 1 ? '查看' : '编辑')), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          return handleViewRule(record);
+        }
+      }, "\u67E5\u770B"), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleDeleteRule(record === null || record === void 0 ? void 0 : record.ruleId);
         }
@@ -111,7 +115,7 @@ var ClearRule = function ClearRule() {
     ruleRowEdit = _useState10[0],
     setRuleRowEdit = _useState10[1];
   var handleEditRule = function handleEditRule(ruleRow) {
-    setRuleRowEdit(ruleRow);
+    setRuleRowEdit(undefined);
     request(apis.rule.checkRule, {
       method: 'post',
       data: {
@@ -144,6 +148,33 @@ 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);
+    });
+  };
   var getDetail = function getDetail(ruleId) {
     setEditStatus(true);
     request(apis.rule.getRuleDetail, {
@@ -332,6 +363,7 @@ var ClearRule = function ClearRule() {
     });
   };
   var handleDeleteRule = function handleDeleteRule(ruleId) {
+    setRuleRowEdit(undefined);
     UseModal({
       onOk: function onOk() {
         return handleDeleteMap(ruleId);
@@ -490,7 +522,7 @@ var ClearRule = function ClearRule() {
     onChange: handlePage
   }), addruleShow && (/*#__PURE__*/React.createElement(AddRule, {
     addruleShow: addruleShow,
-    ruleRowEdit: ruleRowEdit === null || ruleRowEdit === void 0 ? void 0 : ruleRowEdit.status,
+    ruleRowView: ruleRowEdit ? true : false,
     currentRuleDetail: editStatus ? ruleDetail : null,
     getList: function getList() {
       return _getList(ruleSearchName);

package/es/modules/formulateRule/addFormulate.d.ts

@@ -16,5 +16,6 @@ declare const AddFormulate: React.FC<{
     addruleShow: boolean;
     onSetclose: Function;
     detailData: Result | null;
+    ruleRowView?: boolean;
 }>;
 export default AddFormulate;

package/es/modules/formulateRule/addFormulate.js

@@ -22,7 +22,8 @@ var TextArea = Input.TextArea;
 var AddFormulate = function AddFormulate(_ref) {
   var addruleShow = _ref.addruleShow,
     onSetclose = _ref.onSetclose,
-    detailData = _ref.detailData;
+    detailData = _ref.detailData,
+    ruleRowView = _ref.ruleRowView;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   // 关闭抽屉框
@@ -243,12 +244,13 @@ var AddFormulate = function AddFormulate(_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
     },
@@ -329,6 +331,7 @@ var AddFormulate = function AddFormulate(_ref) {
   }, "*\u6CE8\uFF1A\u6E05\u6D17\u53EA\u9488\u5BF9\u6CA1\u901A\u8FC7\u81EA\u5B9A\u4E49\u6821\u9A8C\u89C4\u5219\u7684\u6570\u636E\u8FDB\u884C\u6E05\u6D17\uFF0C\u4E0D\u4F1A\u5BF9\u5DF2\u5165\u5E93\u6570\u636E\u8FDB\u884C\u6E05\u6D17")), openRule && (/*#__PURE__*/React.createElement(AddRule, {
     addruleShow: openRule,
     oneRow: oneRow,
+    allDataSource: dataSource,
     currentBizAttributeSelectorValue: currentBizAttributeSelectorValue,
     editStatus: dataSourceItemEdit,
     onSetclose: function onSetclose() {

package/es/modules/formulateRule/addRule.d.ts

@@ -16,5 +16,6 @@ declare const AddRule: React.FC<{
     oneRow: null | TypeRule;
     editStatus: boolean;
     currentBizAttributeSelectorValue?: any;
+    allDataSource?: TypeRule[];
 }>;
 export default AddRule;

package/es/modules/formulateRule/addRule.js

@@ -26,7 +26,8 @@ var AddRule = function AddRule(_ref) {
     onSave = _ref.onSave,
     oneRow = _ref.oneRow,
     editStatus = _ref.editStatus,
-    currentBizAttributeSelectorValue = _ref.currentBizAttributeSelectorValue;
+    currentBizAttributeSelectorValue = _ref.currentBizAttributeSelectorValue,
+    allDataSource = _ref.allDataSource;
   var _useState = useState(addruleShow),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -46,10 +47,34 @@ var AddRule = function AddRule(_ref) {
   var _Form$useForm9 = Form.useForm(),
     _Form$useForm10 = _slicedToArray(_Form$useForm9, 1),
     addRuleForm = _Form$useForm10[0];
+  // 选中的值类型
   var _useState3 = useState((oneRow === null || oneRow === void 0 ? void 0 : oneRow.currentType) || 1),
     _useState4 = _slicedToArray(_useState3, 2),
     currentType = _useState4[0],
     setCurrentType = _useState4[1];
+  // 值类型选择限制
+  var _useState5 = useState(typeArr),
+    _useState6 = _slicedToArray(_useState5, 2),
+    prohibitionType = _useState6[0],
+    setProhibitionType = _useState6[1];
+  useEffect(function () {
+    var arr = prohibitionType === null || prohibitionType === void 0 ? void 0 : prohibitionType.map(function (o) {
+      if (allDataSource === null || allDataSource === void 0 ? void 0 : allDataSource.find(function (k) {
+        return k.currentType == o.value;
+      })) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          disabled: true
+        });
+      }
+      return o;
+    });
+    setProhibitionType(_toConsumableArray(arr));
+    setCurrentType(function () {
+      return arr.filter(function (o) {
+        return !o.disabled;
+      })[0].value;
+    });
+  }, [allDataSource]);
   var handleRule = function handleRule(value) {
     setCurrentType(value);
     // 清除其他选项的所有值
@@ -71,10 +96,10 @@ var AddRule = function AddRule(_ref) {
       onSetclose();
     }, 1000);
   };
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    errorTip = _useState6[0],
-    setErrorTip = _useState6[1]; // 值变换的提示信息
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    errorTip = _useState8[0],
+    setErrorTip = _useState8[1]; // 值变换的提示信息
   var handleSave = function handleSave() {
     if (hasDuplicate(dataSource).duplicateObjs.length >= 1) {
       var resultaArr = hasDuplicate(dataSource).duplicateObjs;
@@ -165,10 +190,10 @@ var AddRule = function AddRule(_ref) {
     });
   };
   // 值变换
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    dataSource = _useState8[0],
-    setDataSoure = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    dataSource = _useState10[0],
+    setDataSoure = _useState10[1];
   var columns = [{
     title: '原始值',
     dataIndex: 'sourceValue',
@@ -317,17 +342,17 @@ var AddRule = function AddRule(_ref) {
     }
   };
   // 日期转换
-  var _useState9 = useState(undefined),
-    _useState10 = _slicedToArray(_useState9, 2),
-    currentSoutceDate = _useState10[0],
-    setCurrentSourceDate = _useState10[1];
+  var _useState11 = useState(undefined),
+    _useState12 = _slicedToArray(_useState11, 2),
+    currentSoutceDate = _useState12[0],
+    setCurrentSourceDate = _useState12[1];
   var handleSelectSoutceDate = function handleSelectSoutceDate(value) {
     setCurrentSourceDate(value);
   };
-  var _useState11 = useState(undefined),
-    _useState12 = _slicedToArray(_useState11, 2),
-    currentTargetDate = _useState12[0],
-    setCurrentTargetDate = _useState12[1];
+  var _useState13 = useState(undefined),
+    _useState14 = _slicedToArray(_useState13, 2),
+    currentTargetDate = _useState14[0],
+    setCurrentTargetDate = _useState14[1];
   var handleSelectTargetDate = function handleSelectTargetDate(value) {
     setCurrentTargetDate(value);
   };
@@ -644,7 +669,9 @@ var AddRule = function AddRule(_ref) {
     },
     form: addRuleForm,
     initialValues: {
-      currentType: 1
+      currentType: prohibitionType.filter(function (o) {
+        return !o.disabled;
+      })[0].value
     }
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6E05\u6D17\u89C4\u5219",
@@ -658,7 +685,7 @@ var AddRule = function AddRule(_ref) {
     disabled: editStatus,
     onChange: handleRule,
     placeholder: "\u8BF7\u9009\u62E9\u6E05\u6D17\u89C4\u5219",
-    options: typeArr
+    options: prohibitionType
   }))), component);
 };
 export default AddRule;

package/es/modules/formulateRule/data.js

@@ -1,6 +1,9 @@
 export var typeArr = [{
   value: 1,
   label: '值变换'
+}, {
+  value: 2,
+  label: '日期转换'
 }, {
   value: 3,
   label: '类型转换'

package/es/modules/formulateRule/index.js

@@ -82,20 +82,29 @@ var FormulateRule = function FormulateRule() {
         onClick: function onClick() {
           handleEdit(record.ruleId);
         }
-      }, "\u7F16\u8F91")), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91")), /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          handleView(record.ruleId);
+        }
+      }, "\u67E5\u770B"), authority[170928557423] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return handleDetale(record.ruleId);
         }
       }, "\u5220\u9664"));
     }
   }];
+  // 查看的数据
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    ruleRowEdit = _useState2[0],
+    setRuleRowEdit = _useState2[1]; // 查看ruleRowEdit有值，否则无值
   /**
    * 规则开启  修改规则  删除规则
    *  */
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    openAddDraw = _useState2[0],
-    setOpenAddDraw = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    openAddDraw = _useState4[0],
+    setOpenAddDraw = _useState4[1];
   var handleOpenStatus = function handleOpenStatus(ruleObj) {
     request(apis.clearRule.checkStatus, {
       method: 'post',
@@ -178,6 +187,7 @@ var FormulateRule = function FormulateRule() {
     });
   };
   var handleEdit = function handleEdit(ruleId) {
+    setRuleRowEdit(undefined);
     request(apis.clearRule.checkRule, {
       method: 'post',
       data: {
@@ -203,7 +213,33 @@ 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);
+    });
+  };
   var handleDetale = function handleDetale(ruleId) {
+    setRuleRowEdit(undefined);
     UseModal({
       onOk: function onOk() {
         return endDetale(ruleId);
@@ -228,10 +264,10 @@ var FormulateRule = function FormulateRule() {
     });
   };
   // 规则中自定义规则事件列表查看
-  var _useState3 = useState(null),
-    _useState4 = _slicedToArray(_useState3, 2),
-    detailData = _useState4[0],
-    setDetailData = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    detailData = _useState6[0],
+    setDetailData = _useState6[1];
   var getDetail = function getDetail(ruleId) {
     request(apis.clearRule.getDetail, {
       method: 'post',
@@ -249,22 +285,22 @@ var FormulateRule = function FormulateRule() {
   /**
    * 规则列表， 搜索名称， 分页, 所有状态
    */
-  var _useState5 = useState({
+  var _useState7 = useState({
       current: 1,
       pageSize: 10,
       total: 0
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    tableParams = _useState6[0],
-    setTableParams = _useState6[1];
-  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    ruleList = _useState8[0],
-    setRuleList = _useState8[1];
-  var _useState9 = useState(''),
+    tableParams = _useState8[0],
+    setTableParams = _useState8[1];
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    ruleSearchName = _useState10[0],
-    setRuleSearchName = _useState10[1];
+    ruleList = _useState10[0],
+    setRuleList = _useState10[1];
+  var _useState11 = useState(''),
+    _useState12 = _slicedToArray(_useState11, 2),
+    ruleSearchName = _useState12[0],
+    setRuleSearchName = _useState12[1];
   useEffect(function () {
     getList();
   }, []);
@@ -316,14 +352,14 @@ var FormulateRule = function FormulateRule() {
     onPointerEnterCapture: undefined,
     onPointerLeaveCapture: undefined
   });
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    allOpenRule = _useState12[0],
-    setAllOpenRule = _useState12[1];
   var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    statusLoading = _useState14[0],
-    setStatusLoading = _useState14[1];
+    allOpenRule = _useState14[0],
+    setAllOpenRule = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    statusLoading = _useState16[0],
+    setStatusLoading = _useState16[1];
   var handleAllOpenStatus = function handleAllOpenStatus(value) {
     setStatusLoading(true);
     request(apis.clearRule.allOpenStatus, {
@@ -346,14 +382,14 @@ var FormulateRule = function FormulateRule() {
     });
   };
   // 下载报告
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    isModalOpen = _useState16[0],
-    setIsModalOpen = _useState16[1];
-  var _useState17 = useState([]),
+  var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    downloadDate = _useState18[0],
-    setDownloadDate = _useState18[1];
+    isModalOpen = _useState18[0],
+    setIsModalOpen = _useState18[1];
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    downloadDate = _useState20[0],
+    setDownloadDate = _useState20[1];
   var handleSelectDate = function handleSelectDate(date) {
     setDownloadDate(date);
   };
@@ -432,6 +468,7 @@ var FormulateRule = function FormulateRule() {
   }), openAddDraw && (/*#__PURE__*/React.createElement(AddFormulate, {
     addruleShow: openAddDraw,
     detailData: detailData,
+    ruleRowView: ruleRowEdit ? true : false,
     onSetclose: function onSetclose() {
       setOpenAddDraw(false);
       getList(ruleSearchName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.45",
+  "version": "1.0.57-zhongyuan.47",
   "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": "db3d0cdbcb3ce312ab08166988f614460dfb8066",
+  "gitHead": "371e3d10dfef743258b3649a534945f270873328",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }