@zat-design/sisyphus-react 3.11.6-beta.4 → 3.11.6-beta.6

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -3,10 +3,12 @@ import _Badge from "antd/es/badge";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/table/style";
 import _Table from "antd/es/table";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["tableProps"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { memo } from 'react';
+import useEditTableError from '../../utils/useEditTableError';
 var BaseTable = function BaseTable(_ref) {
   var _value$;
   var tableProps = _ref.tableProps,
@@ -29,8 +31,14 @@ var BaseTable = function BaseTable(_ref) {
     page = tableProps.page,
     formatMessage = tableProps.formatMessage,
     locale = tableProps.locale,
-    handlePageChange = tableProps.handlePageChange,
-    pageErrorNum = tableProps.pageErrorNum;
+    handlePageChange = tableProps.handlePageChange;
+  var _useEditTableError = useEditTableError({
+      containerNode: tableRef.current,
+      className: 'ant-form-item-explain-error',
+      isEnabled: pagination // 分页时启用
+    }),
+    _useEditTableError2 = _slicedToArray(_useEditTableError, 1),
+    errorLength = _useEditTableError2[0];
   return _jsxs(_Fragment, {
     children: [headerRender ? _jsx("div", {
       className: "pro-edit-table-header",
@@ -51,10 +59,9 @@ var BaseTable = function BaseTable(_ref) {
         };
       }
     }, resetProps), {}, {
-      pagination: pagination ? _objectSpread({
-        current: page.pageNum,
-        pageSize: page.pageSize,
-        showSizeChanger: false,
+      pagination: pagination ? _objectSpread(_objectSpread({
+        showSizeChanger: true,
+        pageSizeOptions: [5, 10, 20, 50],
         showQuickJumper: true,
         total: value === null || value === void 0 ? void 0 : value.length,
         showTotal: function showTotal(total) {
@@ -65,15 +72,18 @@ var BaseTable = function BaseTable(_ref) {
           });
         },
         itemRender: function itemRender(index, type, originalElement) {
-          return type === 'page' && page.pageNum === index && pageErrorNum ? _jsxs("div", {
+          return type === 'page' && page.pageNum === index && errorLength ? _jsxs("div", {
             className: "pro-edit-table-pagination-item-badge",
             children: [_jsx(_Badge, {
-              count: pageErrorNum
+              count: errorLength
             }), originalElement]
           }) : originalElement;
         },
         onChange: handlePageChange
-      }, pagination) : false,
+      }, pagination), {}, {
+        current: page.pageNum,
+        pageSize: page.pageSize
+      }) : false,
       rowKey: "rowKey",
       scroll: {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x,

package/es/ProEditTable/index.js

@@ -99,8 +99,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       page: {
         pageNum: 1,
         pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10
-      },
-      pageErrorNum: 0
+      }
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -111,8 +110,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     virtualKey = state.virtualKey,
     selectedRowKeys = state.selectedRowKeys,
     selectedRows = state.selectedRows,
-    page = state.page,
-    pageErrorNum = state.pageErrorNum;
+    page = state.page;
   var virtualRowName = getNamePath(isArray(name) ? name : [name], virtualKey);
   // 样式处理
   var _className = classnames({
@@ -171,32 +169,44 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           case 0:
             _context.prev = 0;
             if (!pagination) {
+              _context.next = 8;
+              break;
+            }
+            if (!(pageSize !== page.pageSize)) {
               _context.next = 5;
               break;
             }
-            _context.next = 4;
+            setState({
+              page: {
+                pageNum: current,
+                pageSize: pageSize
+              }
+            });
+            return _context.abrupt("return");
+          case 5:
+            _context.next = 7;
             return form.validateFields([name], {
               recursive: true
             });
-          case 4:
+          case 7:
             setState({
               page: {
                 pageNum: current,
                 pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
               }
             });
-          case 5:
-            _context.next = 10;
+          case 8:
+            _context.next = 13;
             break;
-          case 7:
-            _context.prev = 7;
+          case 10:
+            _context.prev = 10;
             _context.t0 = _context["catch"](0);
             handleScrollToError();
-          case 10:
+          case 13:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 7]]);
+      }, _callee, null, [[0, 10]]);
     }));
     return function (_x, _x2) {
       return _ref4.apply(this, arguments);
@@ -413,7 +423,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           page: page,
           formatMessage: formatMessage,
           locale: locale,
-          pageErrorNum: pageErrorNum,
           handlePageChange: handlePageChange
         }
       })), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? _jsx(_Affix, _objectSpread(_objectSpread({
@@ -439,9 +448,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             columns: columns,
             page: page,
             pagination: pagination,
-            setState: setState,
             isView: isView,
-            disabled: disabled
+            disabled: disabled,
+            setState: setState
           });
         }
       }) : null]

package/es/ProEditTable/propsType.d.ts

@@ -124,7 +124,6 @@ export interface State {
         pageNum: number;
         pageSize: number;
     };
-    pageErrorNum: number;
 }
 export interface ProEditTableRefProps {
     getInternalState: () => State;

package/es/ProEditTable/utils/tools.d.ts

@@ -38,14 +38,14 @@ export declare function cloneDeepFilterNode(value: any): any;
 /**
  * 分页校验
  */
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView, disabled }: {
+export declare const onPageCheck: ({ form, name, value, columns, setState, page, pagination, isView, disabled }: {
     form: any;
     name: any;
     value: any;
     columns: any;
+    setState: any;
     page: any;
     pagination: any;
-    setState: any;
     isView: any;
     disabled: any;
 }) => Promise<void>;

package/es/ProEditTable/utils/tools.js

@@ -339,13 +339,13 @@ var handleCheckCellValue = /*#__PURE__*/function () {
  */
 export var onPageCheck = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, setState, page, pagination, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView, disabled = _ref7.disabled;
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, setState = _ref7.setState, page = _ref7.page, pagination = _ref7.pagination, isView = _ref7.isView, disabled = _ref7.disabled;
           if (!(pagination && !isView && !disabled)) {
-            _context2.next = 75;
+            _context2.next = 72;
             break;
           }
           pageNum = page.pageNum, pageSize = page.pageSize;
@@ -447,7 +447,7 @@ export var onPageCheck = /*#__PURE__*/function () {
           break;
         case 60:
           if (!(flag && errorNum > 0)) {
-            _context2.next = 74;
+            _context2.next = 72;
             break;
           }
           nextState = {
@@ -473,13 +473,6 @@ export var onPageCheck = /*#__PURE__*/function () {
           _context2.t3 = _context2["catch"](64);
           handleScrollToError();
         case 72:
-          _context2.next = 75;
-          break;
-        case 74:
-          setState({
-            pageErrorNum: 0
-          });
-        case 75:
         case "end":
           return _context2.stop();
       }

package/es/ProEditTable/utils/useEditTableError.d.ts

@@ -0,0 +1,7 @@
+interface UseEditTableErrorProps {
+    containerNode: HTMLElement | null;
+    className: string;
+    isEnabled: boolean;
+}
+declare const useEditTableError: ({ containerNode, className, isEnabled }: UseEditTableErrorProps) => [number];
+export default useEditTableError;

package/es/ProEditTable/utils/useEditTableError.js

@@ -0,0 +1,81 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useState, useEffect } from 'react';
+import { debounce } from 'lodash';
+var useEditTableError = function useEditTableError(_ref) {
+  var containerNode = _ref.containerNode,
+    className = _ref.className,
+    isEnabled = _ref.isEnabled;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    errorLength = _useState2[0],
+    setErrorLength = _useState2[1];
+  useEffect(function () {
+    // 如果 isEnabled 为 false 或容器节点不存在，直接跳过监听
+    if (!isEnabled || !containerNode) {
+      return; // 如果未启用监听或容器节点不存在，直接返回
+    }
+    // 防抖处理：将 setErrorLength 函数进行防抖
+    var debouncedSetErrorLength = debounce(function (errorCount) {
+      setErrorLength(errorCount); // 更新错误数量
+    }, 300); // 300ms 后更新状态
+    var observer = new MutationObserver(function (mutations) {
+      mutations.forEach(function (mutation) {
+        // 只处理节点的 class 属性变化
+        if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
+          var target = mutation.target;
+          // 检查目标节点是否包含指定的类
+          if (target.classList.contains(className)) {
+            // 查找所有包含 className 的节点
+            var errorNodes = containerNode.querySelectorAll(".".concat(className));
+            // debugger;
+            // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
+            var validErrorNodes = Array.from(errorNodes).filter(function (node) {
+              return node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error');
+            });
+            if (errorLength === 0) {
+              debouncedSetErrorLength(0);
+            }
+            if (errorLength === validErrorNodes.length) {
+              return;
+            }
+            // 使用防抖后的方法更新错误数量
+            debouncedSetErrorLength(validErrorNodes.length);
+          }
+        }
+        // 监听子节点的添加或删除
+        if (mutation.type === 'childList') {
+          // 检查删除的节点是否包含指定的类名
+          mutation.removedNodes.forEach(function (removedNode) {
+            if (removedNode instanceof HTMLElement && removedNode.classList.contains('ant-table-row')) {
+              // 更新错误数量
+              var _errorNodes = containerNode.querySelectorAll(".".concat(className));
+              if (errorLength === 0) {
+                debouncedSetErrorLength(0);
+              }
+              if (errorLength === _errorNodes.length) {
+                return;
+              }
+              // 使用防抖后的方法更新错误数量
+              debouncedSetErrorLength(_errorNodes.length);
+            }
+          });
+        }
+      });
+    });
+    var config = {
+      attributes: true,
+      subtree: true,
+      attributeFilter: ['class'],
+      childList: true
+    };
+    // 启动 MutationObserver
+    observer.observe(containerNode.querySelector('tbody'), config);
+    // 清理 MutationObserver 和防抖定时器
+    return function () {
+      observer.disconnect();
+      debouncedSetErrorLength.cancel(); // 取消防抖定时器
+    };
+  }, [containerNode, className, isEnabled]); // 当 isEnabled 改变时会重新启动或取消监听
+  return [errorLength];
+};
+export default useEditTableError;

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -34,7 +34,7 @@ import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
 import locale from '../../../../locale';
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options, _useRequest$options10, _formColumns$;
+  var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -107,7 +107,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = _objectWithoutProperties(_ref4, _excluded3);
   var preValue = useRef(value);
-  var defaultParamsRef = useRef(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams); // 缓存 defaultParams 的引用
+  var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
+  var defaultParamsRef = useRef(defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = useSetState({
       _value: value,
       isInit: true,
@@ -317,7 +318,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleClose = function handleClose() {
-    var _useRequest$options2;
+    var _useRequest$options4;
     form.resetFields();
     setState({
       onOff: false,
@@ -325,7 +326,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.manual) {
+    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) {
       mutate(function () {
         return [];
       });
@@ -472,7 +473,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _useRequest$options3, _useRequest$options4, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -480,11 +481,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams), initParams || {});
+            queryBean = _objectSpread(_objectSpread({}, defaultParams), initParams || {});
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -533,12 +534,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _useRequest$options5, _useRequest$options6;
+      var _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = _objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams);
+            queryBean = _objectSpread({}, defaultParams);
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
@@ -669,22 +670,20 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       if (useRequest) {
         // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(function () {
-          var _useRequest$options8, _useRequest$options9;
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), initParams);
+            queryBean: _objectSpread(_objectSpread({}, defaultParams), initParams)
+          } : _objectSpread(_objectSpread({}, defaultParams), initParams);
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   var handleSelectFocus = function handleSelectFocus() {
     if (useRequest) {
-      var _useRequest$options11;
-      var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
+      var queryBean = defaultParams || {};
       var params = withPagination ? {
         pageNum: 1,
         pageSize: 50,
@@ -703,8 +702,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectSearch = debounce(function (val) {
     if (useRequest) {
-      var _useRequest$options12;
-      var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var queryBean = _objectSpread(_objectSpread({}, defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
       var params = withPagination ? {
         pageNum: 1,
         pageSize: 50,

package/lib/ProEditTable/components/RcTable/BaseTable.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
+var _useEditTableError3 = _interopRequireDefault(require("../../utils/useEditTableError"));
 var _excluded = ["tableProps"];
 var BaseTable = function BaseTable(_ref) {
   var _value$;
@@ -33,8 +35,14 @@ var BaseTable = function BaseTable(_ref) {
     page = tableProps.page,
     formatMessage = tableProps.formatMessage,
     locale = tableProps.locale,
-    handlePageChange = tableProps.handlePageChange,
-    pageErrorNum = tableProps.pageErrorNum;
+    handlePageChange = tableProps.handlePageChange;
+  var _useEditTableError = (0, _useEditTableError3.default)({
+      containerNode: tableRef.current,
+      className: 'ant-form-item-explain-error',
+      isEnabled: pagination // 分页时启用
+    }),
+    _useEditTableError2 = (0, _slicedToArray2.default)(_useEditTableError, 1),
+    errorLength = _useEditTableError2[0];
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [headerRender ? (0, _jsxRuntime.jsx)("div", {
       className: "pro-edit-table-header",
@@ -55,10 +63,9 @@ var BaseTable = function BaseTable(_ref) {
         };
       }
     }, resetProps), {}, {
-      pagination: pagination ? (0, _objectSpread2.default)({
-        current: page.pageNum,
-        pageSize: page.pageSize,
-        showSizeChanger: false,
+      pagination: pagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        showSizeChanger: true,
+        pageSizeOptions: [5, 10, 20, 50],
         showQuickJumper: true,
         total: value === null || value === void 0 ? void 0 : value.length,
         showTotal: function showTotal(total) {
@@ -69,15 +76,18 @@ var BaseTable = function BaseTable(_ref) {
           });
         },
         itemRender: function itemRender(index, type, originalElement) {
-          return type === 'page' && page.pageNum === index && pageErrorNum ? (0, _jsxRuntime.jsxs)("div", {
+          return type === 'page' && page.pageNum === index && errorLength ? (0, _jsxRuntime.jsxs)("div", {
             className: "pro-edit-table-pagination-item-badge",
             children: [(0, _jsxRuntime.jsx)(_antd.Badge, {
-              count: pageErrorNum
+              count: errorLength
             }), originalElement]
           }) : originalElement;
         },
         onChange: handlePageChange
-      }, pagination) : false,
+      }, pagination), {}, {
+        current: page.pageNum,
+        pageSize: page.pageSize
+      }) : false,
       rowKey: "rowKey",
       scroll: {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x,

package/lib/ProEditTable/index.js

@@ -102,8 +102,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       page: {
         pageNum: 1,
         pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10
-      },
-      pageErrorNum: 0
+      }
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -114,8 +113,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     virtualKey = state.virtualKey,
     selectedRowKeys = state.selectedRowKeys,
     selectedRows = state.selectedRows,
-    page = state.page,
-    pageErrorNum = state.pageErrorNum;
+    page = state.page;
   var virtualRowName = (0, _tools.getNamePath)((0, _lodash.isArray)(name) ? name : [name], virtualKey);
   // 样式处理
   var _className = (0, _classnames.default)({
@@ -174,32 +172,44 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           case 0:
             _context.prev = 0;
             if (!pagination) {
+              _context.next = 8;
+              break;
+            }
+            if (!(pageSize !== page.pageSize)) {
               _context.next = 5;
               break;
             }
-            _context.next = 4;
+            setState({
+              page: {
+                pageNum: current,
+                pageSize: pageSize
+              }
+            });
+            return _context.abrupt("return");
+          case 5:
+            _context.next = 7;
             return form.validateFields([name], {
               recursive: true
             });
-          case 4:
+          case 7:
             setState({
               page: {
                 pageNum: current,
                 pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
               }
             });
-          case 5:
-            _context.next = 10;
+          case 8:
+            _context.next = 13;
             break;
-          case 7:
-            _context.prev = 7;
+          case 10:
+            _context.prev = 10;
             _context.t0 = _context["catch"](0);
             (0, _tools.handleScrollToError)();
-          case 10:
+          case 13:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 7]]);
+      }, _callee, null, [[0, 10]]);
     }));
     return function (_x, _x2) {
       return _ref4.apply(this, arguments);
@@ -416,7 +426,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           page: page,
           formatMessage: _locale.formatMessage,
           locale: _locale.default,
-          pageErrorNum: pageErrorNum,
           handlePageChange: handlePageChange
         }
       })), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? (0, _jsxRuntime.jsx)(_antd.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -442,9 +451,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             columns: columns,
             page: page,
             pagination: pagination,
-            setState: setState,
             isView: isView,
-            disabled: disabled
+            disabled: disabled,
+            setState: setState
           });
         }
       }) : null]

package/lib/ProEditTable/propsType.d.ts

@@ -124,7 +124,6 @@ export interface State {
         pageNum: number;
         pageSize: number;
     };
-    pageErrorNum: number;
 }
 export interface ProEditTableRefProps {
     getInternalState: () => State;

package/lib/ProEditTable/utils/tools.d.ts

@@ -38,14 +38,14 @@ export declare function cloneDeepFilterNode(value: any): any;
 /**
  * 分页校验
  */
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView, disabled }: {
+export declare const onPageCheck: ({ form, name, value, columns, setState, page, pagination, isView, disabled }: {
     form: any;
     name: any;
     value: any;
     columns: any;
+    setState: any;
     page: any;
     pagination: any;
-    setState: any;
     isView: any;
     disabled: any;
 }) => Promise<void>;

package/lib/ProEditTable/utils/tools.js

@@ -348,13 +348,13 @@ var handleCheckCellValue = /*#__PURE__*/function () {
  */
 var onPageCheck = exports.onPageCheck = /*#__PURE__*/function () {
   var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, setState, page, pagination, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView, disabled = _ref7.disabled;
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, setState = _ref7.setState, page = _ref7.page, pagination = _ref7.pagination, isView = _ref7.isView, disabled = _ref7.disabled;
           if (!(pagination && !isView && !disabled)) {
-            _context2.next = 75;
+            _context2.next = 72;
             break;
           }
           pageNum = page.pageNum, pageSize = page.pageSize;
@@ -456,7 +456,7 @@ var onPageCheck = exports.onPageCheck = /*#__PURE__*/function () {
           break;
         case 60:
           if (!(flag && errorNum > 0)) {
-            _context2.next = 74;
+            _context2.next = 72;
             break;
           }
           nextState = {
@@ -482,13 +482,6 @@ var onPageCheck = exports.onPageCheck = /*#__PURE__*/function () {
           _context2.t3 = _context2["catch"](64);
           handleScrollToError();
         case 72:
-          _context2.next = 75;
-          break;
-        case 74:
-          setState({
-            pageErrorNum: 0
-          });
-        case 75:
         case "end":
           return _context2.stop();
       }

package/lib/ProEditTable/utils/useEditTableError.d.ts

@@ -0,0 +1,7 @@
+interface UseEditTableErrorProps {
+    containerNode: HTMLElement | null;
+    className: string;
+    isEnabled: boolean;
+}
+declare const useEditTableError: ({ containerNode, className, isEnabled }: UseEditTableErrorProps) => [number];
+export default useEditTableError;

package/lib/ProEditTable/utils/useEditTableError.js

@@ -0,0 +1,88 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _lodash = require("lodash");
+var useEditTableError = function useEditTableError(_ref) {
+  var containerNode = _ref.containerNode,
+    className = _ref.className,
+    isEnabled = _ref.isEnabled;
+  var _useState = (0, _react.useState)(0),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    errorLength = _useState2[0],
+    setErrorLength = _useState2[1];
+  (0, _react.useEffect)(function () {
+    // 如果 isEnabled 为 false 或容器节点不存在，直接跳过监听
+    if (!isEnabled || !containerNode) {
+      return; // 如果未启用监听或容器节点不存在，直接返回
+    }
+    // 防抖处理：将 setErrorLength 函数进行防抖
+    var debouncedSetErrorLength = (0, _lodash.debounce)(function (errorCount) {
+      setErrorLength(errorCount); // 更新错误数量
+    }, 300); // 300ms 后更新状态
+    var observer = new MutationObserver(function (mutations) {
+      mutations.forEach(function (mutation) {
+        // 只处理节点的 class 属性变化
+        if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
+          var target = mutation.target;
+          // 检查目标节点是否包含指定的类
+          if (target.classList.contains(className)) {
+            // 查找所有包含 className 的节点
+            var errorNodes = containerNode.querySelectorAll(".".concat(className));
+            // debugger;
+            // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
+            var validErrorNodes = Array.from(errorNodes).filter(function (node) {
+              return node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error');
+            });
+            if (errorLength === 0) {
+              debouncedSetErrorLength(0);
+            }
+            if (errorLength === validErrorNodes.length) {
+              return;
+            }
+            // 使用防抖后的方法更新错误数量
+            debouncedSetErrorLength(validErrorNodes.length);
+          }
+        }
+        // 监听子节点的添加或删除
+        if (mutation.type === 'childList') {
+          // 检查删除的节点是否包含指定的类名
+          mutation.removedNodes.forEach(function (removedNode) {
+            if (removedNode instanceof HTMLElement && removedNode.classList.contains('ant-table-row')) {
+              // 更新错误数量
+              var _errorNodes = containerNode.querySelectorAll(".".concat(className));
+              if (errorLength === 0) {
+                debouncedSetErrorLength(0);
+              }
+              if (errorLength === _errorNodes.length) {
+                return;
+              }
+              // 使用防抖后的方法更新错误数量
+              debouncedSetErrorLength(_errorNodes.length);
+            }
+          });
+        }
+      });
+    });
+    var config = {
+      attributes: true,
+      subtree: true,
+      attributeFilter: ['class'],
+      childList: true
+    };
+    // 启动 MutationObserver
+    observer.observe(containerNode.querySelector('tbody'), config);
+    // 清理 MutationObserver 和防抖定时器
+    return function () {
+      observer.disconnect();
+      debouncedSetErrorLength.cancel(); // 取消防抖定时器
+    };
+  }, [containerNode, className, isEnabled]); // 当 isEnabled 改变时会重新启动或取消监听
+  return [errorLength];
+};
+var _default = exports.default = useEditTableError;

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options, _useRequest$options10, _formColumns$;
+  var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -102,7 +102,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
   var preValue = (0, _react.useRef)(value);
-  var defaultParamsRef = (0, _react.useRef)(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams); // 缓存 defaultParams 的引用
+  var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
+  var defaultParamsRef = (0, _react.useRef)(defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = (0, _ahooks.useSetState)({
       _value: value,
       isInit: true,
@@ -312,7 +313,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleClose = function handleClose() {
-    var _useRequest$options2;
+    var _useRequest$options4;
     form.resetFields();
     setState({
       onOff: false,
@@ -320,7 +321,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.manual) {
+    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) {
       mutate(function () {
         return [];
       });
@@ -467,7 +468,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _useRequest$options3, _useRequest$options4, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -475,11 +476,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams), initParams || {});
+            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams || {});
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
             params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -528,12 +529,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
-      var _useRequest$options5, _useRequest$options6;
+      var _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams);
+            queryBean = (0, _objectSpread3.default)({}, defaultParams);
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
@@ -664,22 +665,20 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       if (useRequest) {
         // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(function () {
-          var _useRequest$options8, _useRequest$options9;
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams)
-          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), initParams);
+            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams)
+          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams);
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   var handleSelectFocus = function handleSelectFocus() {
     if (useRequest) {
-      var _useRequest$options11;
-      var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
+      var queryBean = defaultParams || {};
       var params = withPagination ? {
         pageNum: 1,
         pageSize: 50,
@@ -698,8 +697,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectSearch = (0, _lodash.debounce)(function (val) {
     if (useRequest) {
-      var _useRequest$options12;
-      var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
       var params = withPagination ? {
         pageNum: 1,
         pageSize: 50,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.6-beta.4",
+  "version": "3.11.6-beta.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",