@zat-design/sisyphus-react 3.12.0 → 3.12.1

package/README.md

@@ -1,3 +1,7 @@
+# 西西弗组件库预览地址
+
+[西西弗组件库预览地址](https://procomponents.zhongan.io/)
+
 ## 快速上手
 
 西西弗基于 antd@4 版本开发

package/es/ProAction/index.js

@@ -41,8 +41,8 @@ var ProAction = function ProAction(props) {
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
-      var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
-      var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
+      var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
+      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -67,34 +67,35 @@ var ProAction = function ProAction(props) {
             service = _ref2.service;
             options = _ref2.options;
             transformResponse = _ref2.transformResponse;
-            _context.next = 14;
-            return service === null || service === void 0 ? void 0 : service(options === null || options === void 0 ? void 0 : options.defaultParams);
-          case 14:
+            params = Array.isArray(options === null || options === void 0 ? void 0 : options.defaultParams) ? options === null || options === void 0 ? void 0 : (_options$defaultParam = options.defaultParams) === null || _options$defaultParam === void 0 ? void 0 : _options$defaultParam[0] : (options === null || options === void 0 ? void 0 : options.defaultParams) || {};
+            _context.next = 15;
+            return service === null || service === void 0 ? void 0 : service(params);
+          case 15:
             _context.t1 = _context.sent;
             if (_context.t1) {
-              _context.next = 17;
+              _context.next = 18;
               break;
             }
             _context.t1 = {};
-          case 17:
+          case 18:
             res = _context.t1;
             if (!(transformResponse && isFunction(transformResponse))) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
-            _context.next = 21;
+            _context.next = 22;
             return transformResponse(res);
-          case 21:
+          case 22:
             data = _context.sent;
             newServicesArray[currentIndex] = data;
-            _context.next = 26;
+            _context.next = 27;
             break;
-          case 25:
+          case 26:
             if (res.status === 200) {
               newServicesArray[currentIndex] = res.data;
             }
-          case 26:
-            options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, newServicesArray[currentIndex], options === null || options === void 0 ? void 0 : options.defaultParams);
+          case 27:
+            options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, newServicesArray[currentIndex], params);
             if (!service) {
               newServicesArray[currentIndex] = null;
             }
@@ -105,7 +106,7 @@ var ProAction = function ProAction(props) {
               open: open
             });
             if (!open) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
             list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : (_newServicesArray$cur5 = _newServicesArray$cur4.list) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.join('\n')) || [];
@@ -118,23 +119,23 @@ var ProAction = function ProAction(props) {
               loading: false
             });
             return _context.abrupt("return");
-          case 36:
-            _context.next = 38;
+          case 37:
+            _context.next = 39;
             return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$onAction = actionProps.onAction) === null || _actionProps$onAction === void 0 ? void 0 : _actionProps$onAction.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray, currentIndex);
-          case 38:
-            _context.next = 40;
+          case 39:
+            _context.next = 41;
             return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$continue = actionProps.continue) === null || _actionProps$continue === void 0 ? void 0 : _actionProps$continue.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray);
-          case 40:
+          case 41:
             isContinue = _context.sent;
             if (!(isContinue === false)) {
-              _context.next = 44;
+              _context.next = 45;
               break;
             }
             setState({
               loading: false
             });
             return _context.abrupt("return", false);
-          case 44:
+          case 45:
             if (currentIndex + 1 < length) {
               _onActionRun(currentIndex + 1, newServicesArray);
             } else {
@@ -142,7 +143,7 @@ var ProAction = function ProAction(props) {
                 loading: false
               });
             }
-          case 45:
+          case 46:
           case "end":
             return _context.stop();
         }

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -101,7 +101,7 @@ var ProDrawer = function ProDrawer(_ref) {
     }, _callee);
   })), [onCancel, modalRef.current, ref.current]);
   var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, _error$errorFields, _error$errorFields$;
+    var values;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -160,7 +160,17 @@ var ProDrawer = function ProDrawer(_ref) {
         case 26:
           _context2.prev = 26;
           _context2.t4 = _context2["catch"](0);
-          form.scrollToField(_context2.t4 === null || _context2.t4 === void 0 ? void 0 : (_error$errorFields = _context2.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name);
+          /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
+          setTimeout(function () {
+            var _ref$current, _error$errorFields;
+            var errorElement = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector('[class*="form-item-has-error"]');
+            if (errorElement && (_context2.t4 === null || _context2.t4 === void 0 ? void 0 : (_error$errorFields = _context2.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+              errorElement.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center'
+              });
+            }
+          }, 100);
         case 29:
           _context2.prev = 29;
           toggleLoading(false);

package/es/ProDrawerForm/components/ProModal/index.js

@@ -54,7 +54,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-footer-shadow': height >= 450
   }]);
   var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var values, _error$errorFields, _error$errorFields$;
+    var values;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -113,7 +113,17 @@ var ProModal = function ProModal(_ref) {
         case 26:
           _context.prev = 26;
           _context.t4 = _context["catch"](0);
-          form.scrollToField(_context.t4 === null || _context.t4 === void 0 ? void 0 : (_error$errorFields = _context.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name);
+          /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
+          setTimeout(function () {
+            var _ref$current2, _error$errorFields;
+            var errorElement = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.querySelector('[class*="form-item-has-error"]');
+            if (errorElement && (_context.t4 === null || _context.t4 === void 0 ? void 0 : (_error$errorFields = _context.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+              errorElement.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center'
+              });
+            }
+          }, 100);
         case 29:
           _context.prev = 29;
           toggleLoading(false);

package/es/ProDrawerForm/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 import { FormInstance } from 'antd/es/form/Form';
+export declare const useProDrawerFormContext: () => any;
 declare const ProDrawerForm: React.ForwardRefExoticComponent<import("./propsType").ProDrawerFormPropsType & React.RefAttributes<FormInstance<any>>>;
 export default ProDrawerForm;

package/es/ProDrawerForm/index.js

@@ -1,12 +1,16 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _locale$ProDrawerForm3;
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useImperativeHandle, useMemo } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from './components';
 import ProForm from '../ProForm';
 import { transformBySize } from './utils';
 import locale from '../locale';
+var ProDrawerFormContext = /*#__PURE__*/createContext(null);
+export var useProDrawerFormContext = function useProDrawerFormContext() {
+  return useContext(ProDrawerFormContext);
+};
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
   var visible = props.visible,
@@ -51,7 +55,10 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
       Modal: ProModal
     }[showType];
   }, [showType]);
-  return _jsx(_Fragment, {
+  return _jsx(ProDrawerFormContext.Provider, {
+    value: {
+      source: 'ProDrawerForm'
+    },
     children: visible ? _jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
       isView: isView,
       visible: visible,

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

@@ -45,7 +45,7 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys, }: {
     selectedRowKeys: Key[];
 }) => void;
 /**
- * 获取最终的disabled, 两张模式【子级优先，全局优先
+ * 获取最终的disabled, 两种模式【子级优先，全局优先】
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
  * @param params 禁用参数

package/es/ProEditTable/utils/tools.js

@@ -106,7 +106,7 @@ export var onDelete = function onDelete(_ref) {
   }
 };
 /**
- * 获取最终的disabled, 两张模式【子级优先，全局优先
+ * 获取最终的disabled, 两种模式【子级优先，全局优先】
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
  * @param params 禁用参数
@@ -154,6 +154,18 @@ export var getDisabled = function getDisabled(_ref2) {
   if (rowDisabled === 'empty') {
     return false;
   }
+  // 日期范围选择器和数字范围选择器
+  if (['RangePicker', 'ProNumberRange', 'Group'].includes(column.type)) {
+    if (Array.isArray(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+      return columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled;
+    }
+    if (Array.isArray(column === null || column === void 0 ? void 0 : column.disabled)) {
+      return column.disabled;
+    }
+    if (isFunction(column === null || column === void 0 ? void 0 : column.disabled)) {
+      return column === null || column === void 0 ? void 0 : column.disabled.apply(column, _toConsumableArray(params));
+    }
+  }
   // 当表单含有diabled属性时，优先使用表单的disabled
   if (isFunction(rowDisabled) && noColumnDisabled()) {
     return rowDisabled(params[1]);
@@ -182,11 +194,11 @@ export var getDisabled = function getDisabled(_ref2) {
  */
 export var handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
-    var errorDom = document.querySelector('.ant-form-item-has-error');
+    var errorDom = document.querySelector('[class*="form-item-has-error"]');
     if (errorDom) {
-      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-      var tableCell = errorDom.closest('.ant-table-cell');
-      var tableRow = errorDom.closest('.ant-table-row');
+      var tableBody = errorDom.closest('[class*="table-content"]') || errorDom.closest('[class*="table-body"]');
+      var tableCell = errorDom.closest('[class*="table-cell"]');
+      var tableRow = errorDom.closest('[class*="table-row"]');
       if (tableBody && tableCell) {
         var previousSibling = tableCell.previousElementSibling;
         var childOffsetLeft = 0;

package/es/ProForm/components/base/Input/index.js

@@ -27,6 +27,19 @@ var Input = function Input(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Input');
   if (isView) {
+    if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
+      var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+      if (isDesensit === 'ON') {
+        if (typeof rest.value === 'number') {
+          var _rest$value, _rest$value$toString;
+          rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        }
+        return _jsx(Container, {
+          viewEmpty: viewEmpty,
+          children: maskStringRangeWithRegex(rest.value, desensitization)
+        });
+      }
+    }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: rest.value
@@ -39,11 +52,11 @@ var Input = function Input(props) {
   }, omit(initialConfig, ['trim'])), rest));
   // 仅查看模式下进行数据脱敏
   if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
-    var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
-    if (isDesensit === 'ON') {
+    var _isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+    if (_isDesensit === 'ON') {
       if (typeof rest.value === 'number') {
-        var _rest$value, _rest$value$toString;
-        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        var _rest$value2, _rest$value2$toString;
+        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value2 = rest.value) === null || _rest$value2 === void 0 ? void 0 : (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
       }
       return /*#__PURE__*/React.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
         allowClear: true,

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -15,7 +15,7 @@ import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { isFunction, omit } from 'lodash';
 import { useMemo } from 'react';
-import { CopyOutlined, DownSquareOutlined, PlusSquareOutlined, UpSquareOutlined } from '@ant-design/icons';
+import { CopyOutlined, PlusSquareOutlined, ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons';
 import ProIcon from '../../../../../ProIcon';
 import locale from '../../../../../locale';
 var filterKeys = ['actionType'];
@@ -40,7 +40,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         var remove = operation.remove;
         remove(index);
       },
-      label: "".concat(locale.ProForm.formListActions[1]),
+      label: locale.ProForm.formListActions[1],
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
         className: "single-delete",
@@ -58,7 +58,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(record, index + 1);
       },
-      label: "".concat(locale.ProForm.formListActions[2]),
+      label: locale.ProForm.formListActions[2],
       icon: _jsx(CopyOutlined, {})
     },
     moveUp: {
@@ -69,8 +69,8 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index - 1);
       },
-      label: "".concat(locale.ProForm.formListActions[3]),
-      icon: _jsx(UpSquareOutlined, {})
+      label: locale.ProForm.formListActions[3],
+      icon: _jsx(ArrowUpOutlined, {})
     },
     moveDown: {
       onClick: function onClick(record, _ref5) {
@@ -80,8 +80,8 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index + 1);
       },
-      label: "".concat(locale.ProForm.formListActions[4]),
-      icon: _jsx(DownSquareOutlined, {})
+      label: locale.ProForm.formListActions[4],
+      icon: _jsx(ArrowDownOutlined, {})
     }
   };
   if (mode === 'block') {

package/es/ProForm/index.js

@@ -20,6 +20,7 @@ import { isObject, merge, omit } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig } from '../ProConfigProvider';
+import { useProDrawerFormContext } from '../ProDrawerForm';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
@@ -27,7 +28,7 @@ import locale from '../locale';
 import useWatch from './utils/useWatch';
 import FormsProvider, { useContextForms, useForms } from '../FormsProvider';
 var ProForm = function ProForm(props, ref) {
-  var _localStorage, _ref;
+  var _localStorage, _ref2;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -73,10 +74,15 @@ var ProForm = function ProForm(props, ref) {
     desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     otherProps = _objectWithoutProperties(props, _excluded);
   var config = useProConfig('ProForm');
+  // source: 用于区分是哪个组件调用，用于错误提示
+  var _ref = useProDrawerFormContext() || {},
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? '' : _ref$source;
   var _useForm = useForm(originForm, {
       scrollToError: scrollToError,
       optimize: optimize,
-      formKey: formKey
+      formKey: formKey,
+      source: source || 'ProForm'
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
@@ -214,7 +220,7 @@ var ProForm = function ProForm(props, ref) {
     className: cls,
     form: form
   }, formProps), omit(config, ['isDiffAll'])), otherProps), {}, {
-    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
+    labelAlign: (_ref2 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

package/es/ProForm/utils/useForm.d.ts

@@ -12,5 +12,6 @@ export interface FormInstanceOption {
     scrollToError?: boolean;
     optimize?: boolean;
     formKey?: string;
+    source?: string;
 }
 export declare const useForm: <T>(originForm?: ModifiedFormInstance<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstance<T>];

package/es/ProForm/utils/useForm.js

@@ -20,7 +20,8 @@ export var useForm = function useForm(originForm, options) {
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
     optimize = _ref.optimize,
-    formKey = _ref.formKey;
+    formKey = _ref.formKey,
+    source = _ref.source;
   // formKey全局共享逻辑
   var forms = useContext(FormsContext);
   var _Form$useForm = _Form.useForm(forms[formKey] || _originForm),
@@ -114,7 +115,7 @@ export var useForm = function useForm(originForm, options) {
           case 18:
             _context.prev = 18;
             _context.t0 = _context["catch"](0);
-            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length) && source === 'ProForm') {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'

package/es/ProSelect/index.js

@@ -23,7 +23,7 @@ import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
-  var _selectProps$showCode, _useRequest$options, _locale$ProSelect;
+  var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -102,9 +102,12 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     return data;
   }, []);
-  var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
+  var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
     manual: true,
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     onSuccess: function onSuccess(data) {
+      var _useRequest$options, _useRequest$options$o, _useRequest$options2;
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
         setSelectList(responseData);
@@ -112,10 +115,11 @@ export var ProSelect = function ProSelect(props, ref) {
         // 接口写死了，无法复用
         updateDataSource ? updateDataSource(data, setSelectList) : defaultOnSuccessFun(data);
       }
-    },
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
-  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
+      // 执行传入onSuccess
+      useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 ? void 0 : _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+    }
+  }));
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   var getValueObject = function getValueObject(input) {
     if (Array.isArray(input) && input.length) {
       var resArr = [];
@@ -141,9 +145,9 @@ export var ProSelect = function ProSelect(props, ref) {
     setSelectList(dataSource);
   }, [dataSource]);
   useDeepCompareEffect(function () {
-    var _useRequest$options2;
+    var _useRequest$options4;
     // 设置cacheKey后使用缓存的数据
-    if (!(selectList === null || selectList === void 0 ? void 0 : selectList.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey)) {
+    if (!(selectList === null || selectList === void 0 ? void 0 : selectList.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.cacheKey)) {
       if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
         setSelectList(cacheList);
       }

package/lib/ProAction/index.js

@@ -45,8 +45,8 @@ var ProAction = function ProAction(props) {
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
-      var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
-      var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
+      var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
+      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -71,34 +71,35 @@ var ProAction = function ProAction(props) {
             service = _ref2.service;
             options = _ref2.options;
             transformResponse = _ref2.transformResponse;
-            _context.next = 14;
-            return service === null || service === void 0 ? void 0 : service(options === null || options === void 0 ? void 0 : options.defaultParams);
-          case 14:
+            params = Array.isArray(options === null || options === void 0 ? void 0 : options.defaultParams) ? options === null || options === void 0 ? void 0 : (_options$defaultParam = options.defaultParams) === null || _options$defaultParam === void 0 ? void 0 : _options$defaultParam[0] : (options === null || options === void 0 ? void 0 : options.defaultParams) || {};
+            _context.next = 15;
+            return service === null || service === void 0 ? void 0 : service(params);
+          case 15:
             _context.t1 = _context.sent;
             if (_context.t1) {
-              _context.next = 17;
+              _context.next = 18;
               break;
             }
             _context.t1 = {};
-          case 17:
+          case 18:
             res = _context.t1;
             if (!(transformResponse && (0, _lodash.isFunction)(transformResponse))) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
-            _context.next = 21;
+            _context.next = 22;
             return transformResponse(res);
-          case 21:
+          case 22:
             data = _context.sent;
             newServicesArray[currentIndex] = data;
-            _context.next = 26;
+            _context.next = 27;
             break;
-          case 25:
+          case 26:
             if (res.status === 200) {
               newServicesArray[currentIndex] = res.data;
             }
-          case 26:
-            options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, newServicesArray[currentIndex], options === null || options === void 0 ? void 0 : options.defaultParams);
+          case 27:
+            options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, newServicesArray[currentIndex], params);
             if (!service) {
               newServicesArray[currentIndex] = null;
             }
@@ -109,7 +110,7 @@ var ProAction = function ProAction(props) {
               open: open
             });
             if (!open) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
             list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : (_newServicesArray$cur5 = _newServicesArray$cur4.list) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.join('\n')) || [];
@@ -122,23 +123,23 @@ var ProAction = function ProAction(props) {
               loading: false
             });
             return _context.abrupt("return");
-          case 36:
-            _context.next = 38;
+          case 37:
+            _context.next = 39;
             return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$onAction = actionProps.onAction) === null || _actionProps$onAction === void 0 ? void 0 : _actionProps$onAction.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray, currentIndex);
-          case 38:
-            _context.next = 40;
+          case 39:
+            _context.next = 41;
             return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$continue = actionProps.continue) === null || _actionProps$continue === void 0 ? void 0 : _actionProps$continue.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray);
-          case 40:
+          case 41:
             isContinue = _context.sent;
             if (!(isContinue === false)) {
-              _context.next = 44;
+              _context.next = 45;
               break;
             }
             setState({
               loading: false
             });
             return _context.abrupt("return", false);
-          case 44:
+          case 45:
             if (currentIndex + 1 < length) {
               _onActionRun(currentIndex + 1, newServicesArray);
             } else {
@@ -146,7 +147,7 @@ var ProAction = function ProAction(props) {
                 loading: false
               });
             }
-          case 45:
+          case 46:
           case "end":
             return _context.stop();
         }

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -104,7 +104,7 @@ var ProDrawer = function ProDrawer(_ref) {
     }, _callee);
   })), [onCancel, modalRef.current, ref.current]);
   var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-    var values, _error$errorFields, _error$errorFields$;
+    var values;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -163,7 +163,17 @@ var ProDrawer = function ProDrawer(_ref) {
         case 26:
           _context2.prev = 26;
           _context2.t4 = _context2["catch"](0);
-          form.scrollToField(_context2.t4 === null || _context2.t4 === void 0 ? void 0 : (_error$errorFields = _context2.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name);
+          /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
+          setTimeout(function () {
+            var _ref$current, _error$errorFields;
+            var errorElement = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector('[class*="form-item-has-error"]');
+            if (errorElement && (_context2.t4 === null || _context2.t4 === void 0 ? void 0 : (_error$errorFields = _context2.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+              errorElement.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center'
+              });
+            }
+          }, 100);
         case 29:
           _context2.prev = 29;
           toggleLoading(false);

package/lib/ProDrawerForm/components/ProModal/index.js

@@ -57,7 +57,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-footer-shadow': height >= 450
   }]);
   var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var values, _error$errorFields, _error$errorFields$;
+    var values;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -116,7 +116,17 @@ var ProModal = function ProModal(_ref) {
         case 26:
           _context.prev = 26;
           _context.t4 = _context["catch"](0);
-          form.scrollToField(_context.t4 === null || _context.t4 === void 0 ? void 0 : (_error$errorFields = _context.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name);
+          /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
+          setTimeout(function () {
+            var _ref$current2, _error$errorFields;
+            var errorElement = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.querySelector('[class*="form-item-has-error"]');
+            if (errorElement && (_context.t4 === null || _context.t4 === void 0 ? void 0 : (_error$errorFields = _context.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+              errorElement.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center'
+              });
+            }
+          }, 100);
         case 29:
           _context.prev = 29;
           toggleLoading(false);

package/lib/ProDrawerForm/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 import { FormInstance } from 'antd/es/form/Form';
+export declare const useProDrawerFormContext: () => any;
 declare const ProDrawerForm: React.ForwardRefExoticComponent<import("./propsType").ProDrawerFormPropsType & React.RefAttributes<FormInstance<any>>>;
 export default ProDrawerForm;

package/lib/ProDrawerForm/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.useProDrawerFormContext = exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -14,6 +14,10 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
 var _locale$ProDrawerForm3;
+var ProDrawerFormContext = /*#__PURE__*/(0, _react.createContext)(null);
+var useProDrawerFormContext = exports.useProDrawerFormContext = function useProDrawerFormContext() {
+  return (0, _react.useContext)(ProDrawerFormContext);
+};
 var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
   var visible = props.visible,
@@ -58,7 +62,10 @@ var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       Modal: _components.ProModal
     }[showType];
   }, [showType]);
-  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+  return (0, _jsxRuntime.jsx)(ProDrawerFormContext.Provider, {
+    value: {
+      source: 'ProDrawerForm'
+    },
     children: visible ? (0, _jsxRuntime.jsx)(Com, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
       isView: isView,
       visible: visible,

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

@@ -45,7 +45,7 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys, }: {
     selectedRowKeys: Key[];
 }) => void;
 /**
- * 获取最终的disabled, 两张模式【子级优先，全局优先
+ * 获取最终的disabled, 两种模式【子级优先，全局优先】
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
  * @param params 禁用参数

package/lib/ProEditTable/utils/tools.js

@@ -115,7 +115,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
   }
 };
 /**
- * 获取最终的disabled, 两张模式【子级优先，全局优先
+ * 获取最终的disabled, 两种模式【子级优先，全局优先】
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
  * @param params 禁用参数
@@ -163,6 +163,18 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
   if (rowDisabled === 'empty') {
     return false;
   }
+  // 日期范围选择器和数字范围选择器
+  if (['RangePicker', 'ProNumberRange', 'Group'].includes(column.type)) {
+    if (Array.isArray(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+      return columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled;
+    }
+    if (Array.isArray(column === null || column === void 0 ? void 0 : column.disabled)) {
+      return column.disabled;
+    }
+    if ((0, _lodash.isFunction)(column === null || column === void 0 ? void 0 : column.disabled)) {
+      return column === null || column === void 0 ? void 0 : column.disabled.apply(column, (0, _toConsumableArray2.default)(params));
+    }
+  }
   // 当表单含有diabled属性时，优先使用表单的disabled
   if ((0, _lodash.isFunction)(rowDisabled) && noColumnDisabled()) {
     return rowDisabled(params[1]);
@@ -191,11 +203,11 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
  */
 var handleScrollToError = exports.handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
-    var errorDom = document.querySelector('.ant-form-item-has-error');
+    var errorDom = document.querySelector('[class*="form-item-has-error"]');
     if (errorDom) {
-      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-      var tableCell = errorDom.closest('.ant-table-cell');
-      var tableRow = errorDom.closest('.ant-table-row');
+      var tableBody = errorDom.closest('[class*="table-content"]') || errorDom.closest('[class*="table-body"]');
+      var tableCell = errorDom.closest('[class*="table-cell"]');
+      var tableRow = errorDom.closest('[class*="table-row"]');
       if (tableBody && tableCell) {
         var previousSibling = tableCell.previousElementSibling;
         var childOffsetLeft = 0;

package/lib/ProForm/components/base/Input/index.js

@@ -33,6 +33,19 @@ var Input = function Input(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.useProConfig)('Input');
   if (isView) {
+    if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
+      var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+      if (isDesensit === 'ON') {
+        if (typeof rest.value === 'number') {
+          var _rest$value, _rest$value$toString;
+          rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        }
+        return (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
+        });
+      }
+    }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
       children: rest.value
@@ -45,11 +58,11 @@ var Input = function Input(props) {
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest));
   // 仅查看模式下进行数据脱敏
   if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
-    var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
-    if (isDesensit === 'ON') {
+    var _isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+    if (_isDesensit === 'ON') {
       if (typeof rest.value === 'number') {
-        var _rest$value, _rest$value$toString;
-        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        var _rest$value2, _rest$value2$toString;
+        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value2 = rest.value) === null || _rest$value2 === void 0 ? void 0 : (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
       }
       return /*#__PURE__*/_react.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
         allowClear: true,

package/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -41,7 +41,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         var remove = operation.remove;
         remove(index);
       },
-      label: "".concat(_locale.default.ProForm.formListActions[1]),
+      label: _locale.default.ProForm.formListActions[1],
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
         className: "single-delete",
@@ -59,7 +59,7 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(record, index + 1);
       },
-      label: "".concat(_locale.default.ProForm.formListActions[2]),
+      label: _locale.default.ProForm.formListActions[2],
       icon: (0, _jsxRuntime.jsx)(_icons.CopyOutlined, {})
     },
     moveUp: {
@@ -70,8 +70,8 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index - 1);
       },
-      label: "".concat(_locale.default.ProForm.formListActions[3]),
-      icon: (0, _jsxRuntime.jsx)(_icons.UpSquareOutlined, {})
+      label: _locale.default.ProForm.formListActions[3],
+      icon: (0, _jsxRuntime.jsx)(_icons.ArrowUpOutlined, {})
     },
     moveDown: {
       onClick: function onClick(record, _ref5) {
@@ -81,8 +81,8 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index + 1);
       },
-      label: "".concat(_locale.default.ProForm.formListActions[4]),
-      icon: (0, _jsxRuntime.jsx)(_icons.DownSquareOutlined, {})
+      label: _locale.default.ProForm.formListActions[4],
+      icon: (0, _jsxRuntime.jsx)(_icons.ArrowDownOutlined, {})
     }
   };
   if (mode === 'block') {

package/lib/ProForm/index.js

@@ -20,6 +20,7 @@ var _lodash = require("lodash");
 var _components = require("./components");
 var _RenderFields = _interopRequireDefault(require("./components/render/RenderFields"));
 var _ProConfigProvider = require("../ProConfigProvider");
+var _ProDrawerForm = require("../ProDrawerForm");
 var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
@@ -28,7 +29,7 @@ var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey"];
 var ProForm = function ProForm(props, ref) {
-  var _localStorage, _ref;
+  var _localStorage, _ref2;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -74,10 +75,15 @@ var ProForm = function ProForm(props, ref) {
     desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var config = (0, _ProConfigProvider.useProConfig)('ProForm');
+  // source: 用于区分是哪个组件调用，用于错误提示
+  var _ref = (0, _ProDrawerForm.useProDrawerFormContext)() || {},
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? '' : _ref$source;
   var _useForm = (0, _useForm3.useForm)(originForm, {
       scrollToError: scrollToError,
       optimize: optimize,
-      formKey: formKey
+      formKey: formKey,
+      source: source || 'ProForm'
     }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
@@ -215,7 +221,7 @@ var ProForm = function ProForm(props, ref) {
     className: cls,
     form: form
   }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), otherProps), {}, {
-    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
+    labelAlign: (_ref2 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

package/lib/ProForm/utils/useForm.d.ts

@@ -12,5 +12,6 @@ export interface FormInstanceOption {
     scrollToError?: boolean;
     optimize?: boolean;
     formKey?: string;
+    source?: string;
 }
 export declare const useForm: <T>(originForm?: ModifiedFormInstance<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstance<T>];

package/lib/ProForm/utils/useForm.js

@@ -26,7 +26,8 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
     optimize = _ref.optimize,
-    formKey = _ref.formKey;
+    formKey = _ref.formKey,
+    source = _ref.source;
   // formKey全局共享逻辑
   var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
   var _Form$useForm = _antd.Form.useForm(forms[formKey] || _originForm),
@@ -120,7 +121,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
           case 18:
             _context.prev = 18;
             _context.t0 = _context["catch"](0);
-            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length) && source === 'ProForm') {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'

package/lib/ProSelect/index.js

@@ -24,7 +24,7 @@ require("./index.less");
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
-  var _selectProps$showCode, _useRequest$options, _locale$ProSelect;
+  var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -103,9 +103,12 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
     return data;
   }, []);
-  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
+  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     manual: true,
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     onSuccess: function onSuccess(data) {
+      var _useRequest$options, _useRequest$options$o, _useRequest$options2;
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
         setSelectList(responseData);
@@ -113,10 +116,11 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
         // 接口写死了，无法复用
         updateDataSource ? updateDataSource(data, setSelectList) : defaultOnSuccessFun(data);
       }
-    },
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
-  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
+      // 执行传入onSuccess
+      useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 ? void 0 : _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+    }
+  }));
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   var getValueObject = function getValueObject(input) {
     if (Array.isArray(input) && input.length) {
       var resArr = [];
@@ -142,9 +146,9 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     setSelectList(dataSource);
   }, [dataSource]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    var _useRequest$options2;
+    var _useRequest$options4;
     // 设置cacheKey后使用缓存的数据
-    if (!(selectList === null || selectList === void 0 ? void 0 : selectList.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey)) {
+    if (!(selectList === null || selectList === void 0 ? void 0 : selectList.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.cacheKey)) {
       if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
         setSelectList(cacheList);
       }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
+  "homepage": "https://procomponents.zhongan.io/",
   "scripts": {
     "analyze": "ANALYZE=1 dumi build",
     "build": "npm run build-lib && npm run build-es && npm run build-dist",