@zat-design/sisyphus-react 3.11.6 → 3.11.7

package/es/ProForm/components/render/propsType.d.ts

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 列宽占比 */
+    span?: number;
     /** 依赖刷新字段列表 */
     dependNames?: NamePath[];
     /**
@@ -265,6 +267,8 @@ export interface RenderProps<Values = any> {
         disabledStrictly?: boolean;
         [name: string]: any;
     };
+    /** 列宽占比 */
+    span?: number;
     show?: boolean | ((values: Values, { form, index, namePath, }: {
         form: FormInstance<Values>;
         index?: number;

package/es/ProSelect/index.js

@@ -160,7 +160,8 @@ export var ProSelect = function ProSelect(props, ref) {
     if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
       return;
     }
-    fetchFunction.run(defaultParams);
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
+    fetchFunction.run(params);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {

package/es/ProTable/hooks/useAntdTable.js

@@ -117,8 +117,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraParams]);
   // 调接口
   var result = useRequest(service, _objectSpread(_objectSpread({
-    debounceWait: 300,
-    refreshDeps: [curService, curExtraParams]
+    debounceWait: 300
   }, useRequestOptions), {}, {
     defaultParams: [getTransformParams()],
     onSuccess: function onSuccess(res, params) {
@@ -151,6 +150,14 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   }, []);
+  /**
+   * 手动触发时，手动调用run
+   */
+  useEffect(function () {
+    if (!(useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual)) {
+      run(getTransformParams());
+    }
+  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
   useDeepCompareEffect(function () {
     if (allSelected) {
       var filterList = data.filter(function (item) {

package/es/ProTabs/index.js

@@ -85,10 +85,11 @@ var ProTabs = function ProTabs(props, ref) {
     var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref.defaultParams,
       manual = _ref.manual;
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     if (manual || !useRequest) {
       return;
     }
-    fetchFunction.run(defaultParams);
+    fetchFunction.run(params);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   useImperativeHandle(ref, function () {
     return {

package/es/ProTree/components/ProTree.js

@@ -174,11 +174,12 @@ var ProTree = function ProTree(props) {
     var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref.defaultParams,
       manual = _ref.manual;
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     if (manual) {
       return;
     }
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
-    fetchFunction.run(defaultParams);
+    fetchFunction.run(params);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var handleSignalSelect = function handleSignalSelect(value) {
     var checkedValues = [];

package/es/ProTree/components/ProTreeSelect/index.js

@@ -219,8 +219,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     // 如果配置手动加载，不执行请求
     var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref4.defaultParams;
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
-    fetchFunction.run(defaultParams);
+    fetchFunction.run(params);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {

package/es/ProTreeModal/index.js

@@ -166,11 +166,12 @@ var ProTreeModal = function ProTreeModal(props) {
     var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref.defaultParams,
       manual = _ref.manual;
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     if (manual) {
       return;
     }
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
-    fetchFunction.run(defaultParams);
+    fetchFunction.run(params);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   useEffect(function () {
     setState({

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/ProEnum/hooks/useEnumRequest.js

@@ -263,11 +263,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
       var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
         defaultParams = _ref4.defaultParams;
+      var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
       if (requestRefresh) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
       }
-      enumRes.run(defaultParams);
+      enumRes.run(params);
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {

package/lib/ProEnum/index.js

@@ -128,8 +128,9 @@ var ProEnum = function ProEnum(props) {
   (0, _ahooks.useDeepCompareEffect)(function () {
     var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref3.defaultParams;
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
-      run(defaultParams);
+      run(params);
     }
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var enumLists = (0, _react.useMemo)(function () {

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -58,6 +58,7 @@ function useRequestList(service, options, useRequestOptions) {
     transformResponse = _useDefaultOptions.transformResponse;
   var _ref2 = useRequestOptions || {},
     defaultParams = _ref2.defaultParams;
+  var _defaultParams = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
   // 搜索表单里的值
   var _useState3 = (0, _react.useState)(),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
@@ -65,7 +66,7 @@ function useRequestList(service, options, useRequestOptions) {
     setSearchValues = _useState4[1];
   // 当次执行service的请求,包括page参数
   var params = (0, _react.useMemo)(function () {
-    var _condition = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParams), searchValues);
+    var _condition = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultParams), searchValues);
     var tempParams = withPagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
       queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
     }) : _condition;