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

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';
@@ -26,7 +26,8 @@ var className = 'formulateRule';
 var FormulateRule = function FormulateRule() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var columns = [{
     title: '任务名',
     dataIndex: 'ruleName',
@@ -68,35 +69,48 @@ var FormulateRule = function FormulateRule() {
   }, {
     title: '操作',
     key: 'action',
-    width: 200,
+    width: 240,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
-        size: "middle"
-      }, /*#__PURE__*/React.createElement(Switch, {
+        size: 4
+      }, authority[170928557425] && (/*#__PURE__*/React.createElement(Switch, {
         checked: record.status == 0 ? false : true,
         onChange: function onChange() {
           return handleOpenStatus(record);
         }
-      }), authority[170928557422] && (/*#__PURE__*/React.createElement("a", {
+      })), authority[170928557422] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         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(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           return handleDetale(record.ruleId);
         }
-      }, "\u5220\u9664"));
+      }, "\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.checkStatis, {
+    request(apis.clearRule.checkStatus, {
       method: 'post',
       data: {
         ruleId: ruleObj.ruleId,
@@ -104,13 +118,11 @@ var FormulateRule = function FormulateRule() {
         status: ruleObj.status ? 0 : 1
       }
     }).then(function (res) {
-      if (!res) return;
-      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        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() {
-              setDetailData(ruleObj);
-              setOpenAddDraw(true);
+              getDetail(ruleObj.ruleId);
             },
             okText: '去修改',
             title: '自定义校验规则已删除',
@@ -118,7 +130,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);
@@ -129,7 +141,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);
@@ -141,7 +153,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);
@@ -152,8 +164,13 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
+        return;
+      }
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         endOpen(ruleObj);
+        return;
       }
+      message.error(res.msg);
     });
   };
   var endOpen = function endOpen(ruleObj) {
@@ -161,17 +178,20 @@ 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) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         message.success("".concat(ruleObj.status ? '关闭' : '开启', "\u6210\u529F\uFF01"));
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     });
   };
   var handleEdit = function handleEdit(ruleId) {
+    setRuleRowEdit(undefined);
     request(apis.clearRule.checkRule, {
       method: 'post',
       data: {
@@ -182,18 +202,27 @@ var FormulateRule = function FormulateRule() {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         if (res.data == 1) {
           UseModal({
-            onOk: function onOk() {},
-            okText: '确定',
+            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"
           });
           return;
         }
         getDetail(ruleId);
+      } else {
+        message.error(res.msg);
       }
     });
   };
+  var handleView = function handleView(ruleId) {
+    setRuleRowEdit(ruleId);
+    getDetail(ruleId);
+  };
   var handleDetale = function handleDetale(ruleId) {
+    setRuleRowEdit(undefined);
     UseModal({
       onOk: function onOk() {
         return endDetale(ruleId);
@@ -218,10 +247,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',
@@ -239,33 +268,36 @@ var FormulateRule = function FormulateRule() {
   /**
    * 规则列表， 搜索名称， 分页, 所有状态
    */
-  var _useState5 = useState({
+  var _useState7 = useState({
       current: 1,
       pageSize: 10,
-      total: 0
+      total: 0,
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
-    _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();
   }, []);
   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.clearRule.getList, {
       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,6 +310,7 @@ var FormulateRule = function FormulateRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }
@@ -286,13 +319,14 @@ var FormulateRule = function FormulateRule() {
   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 antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
@@ -303,14 +337,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, {
@@ -325,20 +359,22 @@ var FormulateRule = function FormulateRule() {
         message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
         setAllOpenRule(value);
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     }).finally(function () {
       setStatusLoading(false);
     });
   };
   // 下载报告
-  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);
   };
@@ -359,6 +395,17 @@ var FormulateRule = function FormulateRule() {
     setDownloadDate([]);
     setIsModalOpen(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: "clearRule"
   }, /*#__PURE__*/React.createElement("div", {
@@ -372,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
-  }))), /*#__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
@@ -386,7 +427,7 @@ var FormulateRule = function FormulateRule() {
     onClick: function onClick() {
       return setIsModalOpen(true);
     }
-  }, "\u751F\u6210\u62A5\u544A"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u751F\u6210\u62A5\u544A")), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -396,6 +437,7 @@ var FormulateRule = function FormulateRule() {
     onClick: function onClick() {
       setOpenAddDraw(true);
       setDetailData(null);
+      setRuleRowEdit(undefined);
     }
   }, "\u521B\u5EFA\u6E05\u6D17\u8F6C\u6362\u4EFB\u52A1"))), /*#__PURE__*/React.createElement(Table, {
     rowKey: "ruleId",
@@ -406,6 +448,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);
@@ -434,6 +477,7 @@ var FormulateRule = function FormulateRule() {
   }, /*#__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/utils/index.d.ts

@@ -1,3 +1,5 @@
+/**随机id */
+export declare const generateUniqueId: () => string;
 /**
  * 虚拟事件编辑 判断内容是否有改动；有改动返回true
  */

package/es/utils/index.js

@@ -1,3 +1,12 @@
+/**随机id */
+export var generateUniqueId = function generateUniqueId() {
+  // 时间戳（毫秒级，确保随时间递增）
+  var timestamp = Date.now().toString(36); // 转为36进制，缩短长度
+  // 随机数（36进制，6位，约100万种可能）
+  var random = Math.random().toString(36).substring(2, 8);
+  // 拼接为唯一ID（如："1h8z5a-xyz789"）
+  return "".concat(timestamp, "-").concat(random);
+};
 /**
  * 虚拟事件编辑 判断内容是否有改动；有改动返回true
  */

package/package.json

@@ -1,64 +1,64 @@
-{
-  "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.6",
-  "license": "ISC",
-  "module": "es/index.js",
-  "typings": "es/index.d.ts",
-  "files": [
-    "es"
-  ],
-  "scripts": {
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "prepublishOnly": "npm run build",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "pub": "lerna publish",
-    "start": "dumi dev",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@types/lodash-es": "^4.17.12",
-    "@visactor/react-vtable": "^1.12.0",
-    "@visactor/vtable": "^1.12.0",
-    "array-move": "^4.0.0",
-    "echarts": "^5.6.0",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "moment": "^2.30.1",
-    "react": "^16.12.0 || ^17.0.0",
-    "react-sortable-hoc": "^2.0.0"
-  },
-  "devDependencies": {
-    "@testing-library/jest-dom": "^5.15.1",
-    "@testing-library/react": "^12.1.2",
-    "@types/jest": "^27.0.3",
-    "@types/lodash": "^4.14.182",
-    "@umijs/fabric": "^2.8.1",
-    "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.1",
-    "antd": "4.24.10",
-    "dumi": "^1.1.0",
-    "father-build": "^1.17.2",
-    "gh-pages": "^3.0.0",
-    "lerna": "^4.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^2.2.1",
-    "umi-request": "^1.4.0",
-    "yorkie": "^2.0.0"
-  },
-  "gitHead": "4cd164cffdc1b9cf867e4dba929d3d8433bd16c2",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  }
-}
+{
+  "name": "@zgfe/modules-dm",
+  "version": "1.0.57-zhongyuan.61",
+  "license": "ISC",
+  "module": "es/index.js",
+  "typings": "es/index.d.ts",
+  "files": [
+    "es"
+  ],
+  "scripts": {
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "prepublishOnly": "npm run build",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "pub": "lerna publish",
+    "start": "dumi dev",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@types/lodash-es": "^4.17.12",
+    "@visactor/react-vtable": "^1.12.0",
+    "@visactor/vtable": "^1.12.0",
+    "array-move": "^4.0.0",
+    "echarts": "^5.6.0",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "moment": "^2.30.1",
+    "react": "^16.12.0 || ^17.0.0",
+    "react-sortable-hoc": "^2.0.0"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^5.15.1",
+    "@testing-library/react": "^12.1.2",
+    "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.182",
+    "@umijs/fabric": "^2.8.1",
+    "@umijs/test": "^3.0.5",
+    "@zgfe/business-lib": "1.2.70-hxd.1",
+    "antd": "4.24.10",
+    "dumi": "^1.1.0",
+    "father-build": "^1.17.2",
+    "gh-pages": "^3.0.0",
+    "lerna": "^4.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^2.2.1",
+    "umi-request": "^1.4.0",
+    "yorkie": "^2.0.0"
+  },
+  "gitHead": "905ecff762ea92767eb01747faa2f261e947fde5",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  }
+}