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

package/es/modules/clearRule/importMetaDialog/styles/index.less

@@ -1,91 +1,91 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.import-meta-modal {
-  &-icon-file {
-    color: @primary-color;
-    font-size: 48px !important;
-  }
-  &-icon-export {
-    margin-right: @margin-xss;
-  }
-  &-export-btn {
-    display: block;
-    width: fit-content;
-    // margin-top: @margin-md;
-  }
-  .ant-upload.ant-upload-drag {
-    background: #fafafb;
-    /* io/中性/N2-置灰信息 */
-    border: 1px dashed #ccd0d4;
-  }
-  .ant-upload.ant-upload-drag .ant-upload {
-    padding: 40px 0;
-  }
-  &-export-container {
-    border-radius: 4px;
-    &-h1 {
-      margin-top: -8px;
-      margin-bottom: 4px;
-    }
-    &-h2 {
-      color: @text-color-secondary;
-      font-size: 12px;
-    }
-  }
-
-  &-show-container {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 24px;
-    background: #fafafb;
-    /* io/中性/N1-按钮边框 线色 */
-    border: 1px solid #e6e7ea;
-    border-radius: 4px;
-    &-content {
-      display: flex;
-      align-items: center;
-      &-icon {
-        margin-right: 12px;
-        color: @primary-color;
-        font-size: 40px !important;
-      }
-      &-file {
-        &-title {
-          font-size: 16px;
-        }
-        &-size {
-          color: @text-color-secondary;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-
-  &-spin {
-    background: #fafafb;
-    border: 1px solid #e6e7ea;
-    border-radius: 4px;
-    &-icon.anticon {
-      color: @primary-color;
-      font-size: 24px;
-    }
-    .ant-spin-text {
-      margin-top: @margin-xs;
-    }
-  }
-
-  &-upload-txt {
-    font-size: 16px;
-  }
-
-  .ant-modal-body {
-    padding-top: 8px !important;
-  }
-  &-footer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.import-meta-modal {
+  &-icon-file {
+    color: @primary-color;
+    font-size: 48px !important;
+  }
+  &-icon-export {
+    margin-right: @margin-xss;
+  }
+  &-export-btn {
+    display: block;
+    width: fit-content;
+    // margin-top: @margin-md;
+  }
+  .ant-upload.ant-upload-drag {
+    background: #fafafb;
+    /* io/中性/N2-置灰信息 */
+    border: 1px dashed #ccd0d4;
+  }
+  .ant-upload.ant-upload-drag .ant-upload {
+    padding: 40px 0;
+  }
+  &-export-container {
+    border-radius: 4px;
+    &-h1 {
+      margin-top: -8px;
+      margin-bottom: 4px;
+    }
+    &-h2 {
+      color: @text-color-secondary;
+      font-size: 12px;
+    }
+  }
+
+  &-show-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24px;
+    background: #fafafb;
+    /* io/中性/N1-按钮边框 线色 */
+    border: 1px solid #e6e7ea;
+    border-radius: 4px;
+    &-content {
+      display: flex;
+      align-items: center;
+      &-icon {
+        margin-right: 12px;
+        color: @primary-color;
+        font-size: 40px !important;
+      }
+      &-file {
+        &-title {
+          font-size: 16px;
+        }
+        &-size {
+          color: @text-color-secondary;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+
+  &-spin {
+    background: #fafafb;
+    border: 1px solid #e6e7ea;
+    border-radius: 4px;
+    &-icon.anticon {
+      color: @primary-color;
+      font-size: 24px;
+    }
+    .ant-spin-text {
+      margin-top: @margin-xs;
+    }
+  }
+
+  &-upload-txt {
+    font-size: 16px;
+  }
+
+  .ant-modal-body {
+    padding-top: 8px !important;
+  }
+  &-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
+}

package/es/modules/clearRule/index.js

@@ -27,7 +27,8 @@ var className = 'clearRule';
 var ClearRule = function ClearRule() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var columns = [{
     title: '规则名',
     dataIndex: 'ruleName',
@@ -68,23 +69,32 @@ 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) {
           return _onChange(e, record);
         }
-      })), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
+      })), authority[170928557412] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
-          return handleEditRule(record);
+          handleEditRule(record);
         }
-      }, "\u7F16\u8F91"), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91")), /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          return handleViewRule(record);
+        }
+      }, "\u67E5\u770B"), authority[170928557413] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           return handleDeleteRule(record === null || record === void 0 ? void 0 : record.ruleId);
         }
-      }, "\u5220\u9664"));
+      }, "\u5220\u9664")));
     }
   }];
   // 编辑规则
@@ -104,7 +114,13 @@ var ClearRule = function ClearRule() {
     _useState8 = _slicedToArray(_useState7, 2),
     isCheckRuleModalOpen = _useState8[0],
     setIsCheckRuleModalOpen = _useState8[1];
+  // 行数据 修改查看时需要
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    ruleRowEdit = _useState10[0],
+    setRuleRowEdit = _useState10[1];
   var handleEditRule = function handleEditRule(ruleRow) {
+    setRuleRowEdit(undefined);
     request(apis.rule.checkRule, {
       method: 'post',
       data: {
@@ -133,10 +149,14 @@ var ClearRule = function ClearRule() {
         }
         getDetail(ruleRow.ruleId);
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
+  var handleViewRule = function handleViewRule(ruleRow) {
+    setRuleRowEdit(ruleRow);
+    getDetail(ruleRow.ruleId);
+  };
   var getDetail = function getDetail(ruleId) {
     setEditStatus(true);
     request(apis.rule.getRuleDetail, {
@@ -159,23 +179,24 @@ var ClearRule = function ClearRule() {
     setIsCheckRuleModalOpen(false);
   };
   // 新建规则显示
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    addruleShow = _useState10[0],
-    setAddruleshow = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    addruleShow = _useState12[0],
+    setAddruleshow = _useState12[1];
   var handleAddRule = function handleAddRule() {
+    setRuleRowEdit(undefined);
     setAddruleshow(true);
     setEditStatus(false);
   };
   // 下载报告
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isModalOpen = _useState12[0],
-    setIsModalOpen = _useState12[1];
-  var _useState13 = useState([]),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    downloadDate = _useState14[0],
-    setDownloadDate = _useState14[1];
+    isModalOpen = _useState14[0],
+    setIsModalOpen = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    downloadDate = _useState16[0],
+    setDownloadDate = _useState16[1];
   var handleSelectDate = function handleSelectDate(date) {
     setDownloadDate(date);
   };
@@ -197,22 +218,24 @@ var ClearRule = function ClearRule() {
     setIsModalOpen(false);
   };
   // 导入规则
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    openImportModal = _useState16[0],
-    setOpenImportModal = _useState16[1];
   var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    openImportModalResult = _useState18[0],
-    setOpenImportModalResult = _useState18[1];
-  var _useState19 = useState(),
+    openImportModal = _useState18[0],
+    setOpenImportModal = _useState18[1];
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    errorRule = _useState20[0],
-    setErrorRule = _useState20[1];
+    openImportModalResult = _useState20[0],
+    setOpenImportModalResult = _useState20[1];
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    errorRule = _useState22[0],
+    setErrorRule = _useState22[1];
   var handleImportResultOk = function handleImportResultOk() {
     setOpenImportModal(false);
     setOpenImportModalResult(false);
     setErrorRule(undefined);
+    // 刷新列表
+    _getList(ruleSearchName);
   };
   // 导出规则
   var handleDownLoadRuleFile = function handleDownLoadRuleFile() {
@@ -225,47 +248,87 @@ var ClearRule = function ClearRule() {
       fileName: "\u89C4\u5219\u5217\u8868_".concat(moment().format('YYYYMMDD'))
     }).then(function (res) {});
   };
+  // 总状态
+  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
+    style: {
+      fontSize: 24
+    },
+    spin: true,
+    onPointerEnterCapture: undefined,
+    onPointerLeaveCapture: undefined
+  });
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    allOpenRule = _useState24[0],
+    setAllOpenRule = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    statusLoading = _useState26[0],
+    setStatusLoading = _useState26[1];
+  var handleAllOpenStatus = function handleAllOpenStatus(value) {
+    setStatusLoading(true);
+    request(apis.rule.allOpenStatus, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        status: value ? 1 : 0
+      }
+    }).then(function (res) {
+      if (!res) return;
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
+        setAllOpenRule(value);
+        _getList(ruleSearchName);
+      }
+    }).finally(function () {
+      setStatusLoading(false);
+    });
+  };
   /**
    * 规则列表， 搜索名称， 规则列表状态开启/关闭， 删除规则
    */
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    ruleList = _useState22[0],
-    setRuleList = _useState22[1];
-  var _useState23 = useState(''),
-    _useState24 = _slicedToArray(_useState23, 2),
-    ruleSearchName = _useState24[0],
-    setRuleSearchName = _useState24[1];
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    ruleList = _useState28[0],
+    setRuleList = _useState28[1];
+  var _useState29 = useState(''),
+    _useState30 = _slicedToArray(_useState29, 2),
+    ruleSearchName = _useState30[0],
+    setRuleSearchName = _useState30[1];
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
+    _getList(_value);
   };
   var handleSearch = function handleSearch() {
     _getList(ruleSearchName);
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    _getList(ruleSearchName);
+    _getList(ruleSearchName, pagination);
   };
-  var _useState25 = useState({
+  var _useState31 = useState({
       current: 1,
       pageSize: 10,
-      total: 0
+      total: 0,
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
-    _useState26 = _slicedToArray(_useState25, 2),
-    tableParams = _useState26[0],
-    setTableParams = _useState26[1];
+    _useState32 = _slicedToArray(_useState31, 2),
+    tableParams = _useState32[0],
+    setTableParams = _useState32[1];
   useEffect(function () {
     _getList();
   }, []);
   var _getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.rule.getRuleList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
@@ -278,12 +341,14 @@ var ClearRule = function ClearRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }
     });
   };
   var handleDeleteRule = function handleDeleteRule(ruleId) {
+    setRuleRowEdit(undefined);
     UseModal({
       onOk: function onOk() {
         return handleDeleteMap(ruleId);
@@ -306,73 +371,92 @@ var ClearRule = function ClearRule() {
         message.success("\u5220\u9664\u89C4\u5219\u6210\u529F\uFF01");
         handleSearch();
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
-  var _onChange = function _onChange(value, ruleRow) {
-    UseModal({
-      onOk: function onOk() {
-        return handleOpenRuleStatus(ruleRow);
-      },
-      okText: "".concat(ruleRow.status == 0 ? '仍然开启' : '仍然关闭'),
-      title: '警告',
-      content: "".concat(ruleRow.status == 0 ? '该规则与已开启规则可能产生冲突，请确认是否继续开启' : '该规则与开始运行现在关闭可能产生冲突，请确认是否关闭', " ")
-    });
-  };
-  var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
-    request(apis.rule.openRuleStatus, {
+  var statusCheck = function statusCheck(ruleRow) {
+    // 可直接关闭
+    if (ruleRow.status == 1) {
+      handleOpenRuleStatus(ruleRow);
+      return;
+    }
+    request(apis.rule.checkStatus, {
       method: 'post',
       data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         ruleId: ruleRow.ruleId,
         status: ruleRow.status ? 0 : 1
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
-        handleSearch();
+        if (res.data == 0) {
+          handleOpenRuleStatus(ruleRow);
+          return;
+        }
+        if (res.data == 3) {
+          UseModal({
+            onOk: function onOk() {
+              return handleOpenRuleStatus(ruleRow);
+            },
+            okText: "\u4ECD\u7136\u5F00\u542F",
+            title: '警告',
+            content: '该规则与已开启规则可能产生冲突，请确认是否继续开启'.concat(" ")
+          });
+          return;
+        }
+        if (res.data == 2 || res.data == 3) {
+          message.error(res.msg);
+          return;
+        }
       } else {
-        message.error('规则修改失败，请联系管理员');
+        message.error(res.msg);
       }
     });
   };
-  // 总状态
-  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
-    style: {
-      fontSize: 24
-    },
-    spin: true,
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  });
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    allOpenRule = _useState28[0],
-    setAllOpenRule = _useState28[1];
-  var _useState29 = useState(false),
-    _useState30 = _slicedToArray(_useState29, 2),
-    statusLoading = _useState30[0],
-    setStatusLoading = _useState30[1];
-  var handleAllOpenStatus = function handleAllOpenStatus(value) {
-    setStatusLoading(true);
-    request(apis.rule.allOpenStatus, {
+  var _onChange = function _onChange(value, ruleRow) {
+    statusCheck(ruleRow);
+  };
+  var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
+    request(apis.rule.openRuleStatus, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        status: value ? 1 : 0
+        ruleId: ruleRow.ruleId,
+        status: ruleRow.status ? 0 : 1
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
-        setAllOpenRule(value);
-        _getList(ruleSearchName);
+        message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
+        handleSearch();
+      } else {
+        if (res.data == 1) {
+          // getDetail(ruleRow.ruleId)
+          // setEditStatus(true)
+          UseModal({
+            onOk: function onOk() {},
+            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"
+          });
+          return;
+        }
+        message.error(res.msg);
       }
-    }).finally(function () {
-      setStatusLoading(false);
     });
   };
+  // 选择近两年数据
+  var disabledDate = function disabledDate(current) {
+    var isAfterToday = current && current > moment().endOf('day');
+    var twoYearsAgo = moment().subtract(2, 'year').startOf('day');
+    var isBeforeTwoYearsAgo = current && current < twoYearsAgo;
+    // 1. 计算上一年的年份（如当前是 2025，则上一年是 2024）
+    var lastYear = moment().year() - 1;
+    // 2. 上一年的时间边界：开始（1月1日 00:00:00）、结束（12月31日 23:59:59）
+    var lastYearStart = moment("".concat(lastYear, "-01-01")).startOf('day'); // 上一年1月1日 00:00
+    return isAfterToday || current < lastYearStart;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(className)
   }, /*#__PURE__*/React.createElement("div", {
@@ -392,7 +476,7 @@ var ClearRule = function ClearRule() {
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: allOpenRule,
     onChange: handleAllOpenStatus
-  }))), authority[170928557418] && (/*#__PURE__*/React.createElement(Button, {
+  }))), authority[170928557418] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -400,7 +484,7 @@ var ClearRule = function ClearRule() {
     onClick: function onClick() {
       return setIsModalOpen(true);
     }
-  }, "\u751F\u6210\u62A5\u544A")), authority[170928557417] && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u751F\u6210\u62A5\u544A")), authority[170928557417] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DownloadOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -410,7 +494,7 @@ var ClearRule = function ClearRule() {
     type: "primary",
     onClick: handleAddRule,
     disabled: !authority[170928557411]
-  }, "\u65B0\u5EFA\u89C4\u5219"), authority[170928557415] && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u65B0\u5EFA\u89C4\u5219"), authority[170928557415] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setOpenImportModal(true);
@@ -423,6 +507,7 @@ var ClearRule = function ClearRule() {
     onChange: handlePage
   }), addruleShow && (/*#__PURE__*/React.createElement(AddRule, {
     addruleShow: addruleShow,
+    ruleRowView: ruleRowEdit ? true : false,
     currentRuleDetail: editStatus ? ruleDetail : null,
     getList: function getList() {
       return _getList(ruleSearchName);
@@ -454,6 +539,7 @@ var ClearRule = function ClearRule() {
   }, /*#__PURE__*/React.createElement("div", null, "\u9009\u62E9\u65F6\u95F4\u8303\u56F4\u751F\u6210\u62A5\u544A"), /*#__PURE__*/React.createElement(RangePicker, {
     open: true,
     placement: "topRight",
+    disabledDate: disabledDate,
     onChange: handleSelectDate,
     getPopupContainer: function getPopupContainer(trigger) {
       var parent = trigger.parentElement;

package/es/modules/dataManage/collectionAttributeList.d.ts

@@ -12,6 +12,8 @@ interface PropsType {
         event_id: number;
         event_name: string;
         owner?: string;
+        newOwner?: string;
+        attr_name: string;
     };
     isOpen: number;
     queryPlanData: queryPlanType;