@zat-design/sisyphus-react 3.5.4 → 3.5.5-beta.2

package/es/ProEditTable/components/RenderField/index.js

@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -29,8 +29,9 @@ import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
+import ConfirmWrapper from '@/ProForm/components/render/ConfirmWrapper';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -58,6 +59,7 @@ var RenderField = function RenderField(_ref) {
     equalWith = column.equalWith,
     className = column.className,
     trim = column.trim,
+    confirm = column.confirm,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -498,6 +500,7 @@ var RenderField = function RenderField(_ref) {
     onChange: _onChange,
     onBlur: _onblur,
     index: index,
+    confirm: confirm,
     otherProps: {
       form: form,
       names: names,
@@ -540,7 +543,9 @@ var RenderField = function RenderField(_ref) {
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+    children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+      children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+    })) : /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
@@ -570,7 +575,7 @@ var RenderField = function RenderField(_ref) {
     }))]
   }) : null;
   return _jsx(FieldProvider, {
-    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
+    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       placement: "topLeft",

package/es/ProEditTable/index.js

@@ -9,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -22,7 +22,7 @@ import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -54,6 +54,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
+    actionDirection = _ref.actionDirection,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -162,7 +163,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalValues: originalValues,
     originalDiffTip: originalDiffTip,
     prefixCls: prefixCls,
-    rowDisabled: rowDisabled
+    rowDisabled: rowDisabled,
+    actionDirection: actionDirection
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
@@ -279,9 +281,11 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   //   },
   // );
   useEffect(function () {
-    var _value$;
+    var isAllHasKey = value.every(function (item) {
+      return item.rowKey;
+    });
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
       var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
@@ -328,7 +332,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         }) : null, _jsx(_Table, _objectSpread(_objectSpread({
           ref: tableRef,
           className: _className,
-          dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
+          dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
           columns: _columns,
           rowSelection: renderRowSelection(),
           rowClassName: _rowClassName,
@@ -388,6 +392,7 @@ ForwardProEditTable.defaultProps = {
   type: 'multiple',
   mode: 'multiple',
   insertType: 'after',
+  actionDirection: 'horizontal',
   value: [],
   actionProps: [],
   toolbarProps: [],

package/es/ProEditTable/propsType.d.ts

@@ -257,4 +257,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     rowDraggable?: (record?: T) => string | boolean;
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
+    actionDirection?: 'vertical' | 'horizontal';
 }

package/es/ProEditTable/utils/index.js

@@ -33,7 +33,8 @@ var getActionColumn = function getActionColumn(config) {
     actionWidth = config.actionWidth,
     actionProps = config.actionProps,
     page = config.page,
-    rowDisabled = config.rowDisabled;
+    rowDisabled = config.rowDisabled,
+    actionDirection = config.actionDirection;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -155,7 +156,7 @@ var getActionColumn = function getActionColumn(config) {
     title: locale.ProEditTable.operation,
     key: 'action',
     fixed: 'right',
-    width: actionWidth || (virtualKey ? '120px' : '60px'),
+    width: actionWidth || (actionDirection === 'vertical' ? '60px' : virtualKey ? '120px' : '60px'),
     render: function render(text, record, index) {
       var _rowDisabled;
       var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
@@ -163,7 +164,8 @@ var getActionColumn = function getActionColumn(config) {
         return '';
       }
       return _jsx(_Space, {
-        size: "middle",
+        size: "small",
+        direction: actionDirection,
         children: actionBtns.map(function (btnConfig) {
           return _jsx(React.Fragment, {
             children: _jsx(ActionButton, _objectSpread({}, {

package/es/ProEnum/propsType.d.ts

@@ -49,7 +49,7 @@ export interface ProEnum {
     /** 用于自定义组件 */
     component?: ReactNode;
     /** 用于提交 code */
-    code: string | string[];
+    code?: string | string[];
     /** 字段别名 */
     fieldNames?: Record<string, string>;
     /** 是否查看模式 */

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

@@ -15,14 +15,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 
-import { isFunction, isString, isObject, uniq, isBoolean } from 'lodash';
+import { isFunction, isString, isObject, uniq } from 'lodash';
 import classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
 var DatePicker = function DatePicker(props) {
-  var _rest$showTime;
   var className = props.className,
     _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -68,13 +67,6 @@ var DatePicker = function DatePicker(props) {
   var _rest = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
-  if (_rest.showTime && !isBoolean(_rest.showTime) && !Reflect.ownKeys((_rest$showTime = _rest.showTime) !== null && _rest$showTime !== void 0 ? _rest$showTime : {}).includes('format')) {
-    var _rest$showTime2;
-    _rest.showTime = _objectSpread(_objectSpread({}, (_rest$showTime2 = _rest.showTime) !== null && _rest$showTime2 !== void 0 ? _rest$showTime2 : {}), _defaultShowTime);
-  }
-  if (isBoolean(_rest.showTime)) {
-    _rest.showTime = _objectSpread({}, _defaultShowTime);
-  }
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
     _rest.value = moment(_rest.value);
@@ -86,16 +78,12 @@ var DatePicker = function DatePicker(props) {
       _defaultShowTime: _defaultShowTime
     };
   }
-  if (isBoolean(_rest.showTime)) {
+  if (_rest.showTime === true) {
     _rest.showTime = _objectSpread({}, _defaultShowTime);
   }
   if (isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  // 传进来showTime权重最高
-  if (isBoolean(rest.showTime)) {
-    _rest.showTime = rest.showTime;
-  }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {

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

@@ -56,6 +56,9 @@ var RangePicker = function RangePicker(props) {
   var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
     return !!formatKey;
   });
+  var _defaultShowTime = {
+    format: 'YYYY-MM-DD HH:mm:ss'
+  };
   if (isView) {
     var _res$value = _res.value,
       value = _res$value === void 0 ? [] : _res$value;
@@ -80,6 +83,9 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
+  if (_res.showTime === true) {
+    _res.showTime = _objectSpread({}, _defaultShowTime);
+  }
   return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator), {}, {
     format: _format
   }));

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

@@ -137,7 +137,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         var _res$data;
         var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
-          options: list
+          options: transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list
         });
       }
     })),
@@ -301,7 +301,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
+            if (!(!(selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || !(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length))) {
               _context2.next = 4;
               break;
             }
@@ -434,7 +434,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, 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:
@@ -459,11 +459,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 8:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
-              list = [];
+              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
-              } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               if (_data) {
@@ -500,7 +498,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
+      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:
@@ -518,11 +516,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 6:
             res = _context5.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
-              list = [];
+              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
-              } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
@@ -604,9 +600,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        var _list$filter;
         var nextSelectedRowKeys = isMultiple ? value : [value];
         nextState.selectedRowKeys = nextSelectedRowKeys;
-        nextState.selectedRows = options.filter(function (item) {
+        var list = options !== null && options !== void 0 ? options : data;
+        nextState.selectedRows = list === null || list === void 0 ? void 0 : (_list$filter = list.filter) === null || _list$filter === void 0 ? void 0 : _list$filter.call(list, function (item) {
           return nextSelectedRowKeys.includes(item[valueKey]);
         });
       }
@@ -629,7 +627,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             pageSize: 50,
             queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
           } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
-          run(params);
+          var nextParams = transformParams ? transformParams(params) : params;
+          run(nextParams);
           setState({
             isInit: false
           });
@@ -693,7 +692,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             pageSize: 50,
             queryBean: queryBean
           } : queryBean;
-          run(params);
+          var nextParams = transformParams ? transformParams(params) : params;
+          run(nextParams);
           setState({
             isInit: false
           });
@@ -707,7 +707,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           pageSize: 50,
           queryBean: queryBean
         } : queryBean;
-        run(params);
+        var nextParams = transformParams ? transformParams(params) : params;
+        run(nextParams);
       }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'

package/es/ProForm/index.d.ts

@@ -2,8 +2,9 @@ import { Form, FormInstance } from 'antd';
 import React, { ForwardRefRenderFunction } from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
+import { useForm } from './utils/useForm';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
-    useForm: typeof Form.useForm;
+    useForm: typeof useForm;
     useWatch: typeof Form.useWatch;
     [key: string]: any;
 }

package/es/ProForm/index.js

@@ -11,7 +11,7 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
+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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl", "scrollToError"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -65,13 +65,17 @@ var ProForm = function ProForm(props, ref) {
     originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
+    _props$scrollToError = props.scrollToError,
+    scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig(),
     state = _useProConfig.state,
     dispatch = _useProConfig.dispatch;
   var config = state.ProForm,
     forms = state.forms;
-  var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
+  var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
+      scrollToError: scrollToError
+    }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = useControlled({

package/es/ProForm/propsType.d.ts

@@ -75,6 +75,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     formId?: string;
     required?: boolean | boolean[];
     originalDiffTip?: boolean;
+    scrollToError?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

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

@@ -2,5 +2,8 @@ import { FormInstance } from 'antd';
 type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
 };
-export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
+interface FormInstanceOption {
+    scrollToError?: boolean;
+}
+export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
 export {};

package/es/ProForm/utils/useForm.js

@@ -6,7 +6,10 @@ import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { filterInternalFields } from './index';
 import { handleScrollToError } from '../../ProEditTable/utils/tools';
-export var useForm = function useForm(originForm) {
+export var useForm = function useForm(originForm, options) {
+  var _ref = options || {},
+    _ref$scrollToError = _ref.scrollToError,
+    scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError;
   var _Form$useForm = _Form.useForm(originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -24,7 +27,7 @@ export var useForm = function useForm(originForm) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,
@@ -81,7 +84,7 @@ export var useForm = function useForm(originForm) {
           case 17:
             _context.prev = 17;
             _context.t0 = _context["catch"](0);
-            if (_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)) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
@@ -96,7 +99,7 @@ export var useForm = function useForm(originForm) {
       }, _callee, null, [[0, 17]]);
     }));
     return function _validateFields(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   form.getFieldsValue = _getFieldsValue;

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
-import { isFunction, isEqualWith } from 'lodash';
+import { isFunction, isEqualWith, isEqual } from 'lodash';
 import { customEqualForFun, equalDependencies } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
@@ -148,11 +148,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : rules;
-      var _component = isFunction(originComponent) ? originComponent(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
-      }) : newComponent;
+      // const _component = isFunction(originComponent)
+      //   ? originComponent(_currentValues, { form, index, namePath })
+      //   : newComponent;
       var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
@@ -161,7 +159,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names)) {
         if (_show === false) {
-          clearInterval(timerRef.current);
+          clearTimeout(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
               form.resetFields(names);
@@ -171,17 +169,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
             }
           }, 200);
         } else {
-          clearInterval(timerRef.current);
+          clearTimeout(timerRef.current);
         }
       }
-      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
-      // if (
-      //   _required !== requiredRef.current ||
-      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
-      // ) {
-      //   form.validateFields([name]);
-      // }
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) ||
+      // 值变更，需要同步更新函数式的fieldProps
+      isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
       equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;

package/es/ProStep/components/Listener/index.js

@@ -7,12 +7,16 @@ import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
+  var _children$props;
   var children = _ref.children,
     delayTime = _ref.delayTime,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
-    notify = _useStep.notify;
+    notify = _useStep.notify,
+    loading = _useStep.loading,
+    setLoading = _useStep.setLoading;
   return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
+    loading: loading || (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.loading),
     onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -24,10 +28,11 @@ export default (function (_ref) {
           case 3:
             values = _context.sent;
             setTimeout(function () {
+              setLoading(false);
               var localData = localStorage.getItem('cache-pro-step');
               if (localData !== 'false') {
-                var _children$props, _children$props$onCli;
-                children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);
+                var _children$props2, _children$props2$onCl;
+                children === null || children === void 0 ? void 0 : (_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : (_children$props2$onCl = _children$props2.onClick) === null || _children$props2$onCl === void 0 ? void 0 : _children$props2$onCl.call(_children$props2, values);
               }
             }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
           case 5:

package/es/ProStep/index.js

@@ -31,6 +31,10 @@ var ProStep = function ProStep(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     anchorIds = _useState2[0],
     setAnchorIds = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useLocalStorageState = useLocalStorageState('cache-pro-step'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
@@ -102,10 +106,11 @@ var ProStep = function ProStep(_ref) {
             case 10:
               values[id] = _context.sent;
             case 11:
-              _context.next = 19;
+              setErrorCollection(_defineProperty({}, id, 0));
+              _context.next = 21;
               break;
-            case 13:
-              _context.prev = 13;
+            case 14:
+              _context.prev = 14;
               _context.t0 = _context["catch"](1);
               num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
               if (num) {
@@ -113,14 +118,15 @@ var ProStep = function ProStep(_ref) {
                 console.error(_context.t0);
               }
               setErrorCollection(_defineProperty({}, id, num));
+              setLoading(false);
               return _context.abrupt("return", _context.t0);
-            case 19:
+            case 21:
               return _context.abrupt("return", values[id]);
-            case 20:
+            case 22:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[1, 13]]);
+        }, _callee, null, [[1, 14]]);
       }));
       return function subEvent() {
         return _ref5.apply(this, arguments);
@@ -137,11 +143,12 @@ var ProStep = function ProStep(_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            setLoading(true);
+            _context2.next = 3;
             return emitter.emit();
-          case 2:
-            return _context2.abrupt("return", values);
           case 3:
+            return _context2.abrupt("return", values);
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -232,7 +239,9 @@ var ProStep = function ProStep(_ref) {
       register: register,
       notify: notify,
       triggerTo: triggerTo,
-      handleScroll: handleScroll
+      handleScroll: handleScroll,
+      loading: loading,
+      setLoading: setLoading
     },
     children: _jsxs("div", {
       className: "pro-step-wrapper",

package/es/ProTable/utils.js

@@ -78,7 +78,6 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
   };
   // 后缀处理
   var suffixNode = function suffixNode(value, record, index) {
-    console.log('记录看下', suffix);
     if (isString(suffix) || /*#__PURE__*/isValidElement(suffix)) {
       return suffix;
     }

package/lib/ProEditTable/components/RenderField/index.js

@@ -29,11 +29,12 @@ var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
+var _ConfirmWrapper = _interopRequireDefault(require("@/ProForm/components/render/ConfirmWrapper"));
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -61,6 +62,7 @@ var RenderField = function RenderField(_ref) {
     equalWith = column.equalWith,
     className = column.className,
     trim = column.trim,
+    confirm = column.confirm,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -501,6 +503,7 @@ var RenderField = function RenderField(_ref) {
     onChange: _onChange,
     onBlur: _onblur,
     index: index,
+    confirm: confirm,
     otherProps: {
       form: form,
       names: names,
@@ -543,7 +546,9 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+    children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+    })) : /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
@@ -573,7 +578,7 @@ var RenderField = function RenderField(_ref) {
     }))]
   }) : null;
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
+    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       placement: "topLeft",

package/lib/ProEditTable/index.js

@@ -23,9 +23,9 @@ var _components = require("./components");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -57,6 +57,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
+    actionDirection = _ref.actionDirection,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -165,7 +166,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalValues: originalValues,
     originalDiffTip: originalDiffTip,
     prefixCls: prefixCls,
-    rowDisabled: rowDisabled
+    rowDisabled: rowDisabled,
+    actionDirection: actionDirection
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
@@ -282,9 +284,11 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   //   },
   // );
   (0, _react.useEffect)(function () {
-    var _value$;
+    var isAllHasKey = value.every(function (item) {
+      return item.rowKey;
+    });
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
       var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -331,7 +335,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         }) : null, (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           ref: tableRef,
           className: _className,
-          dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
+          dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
           columns: _columns,
           rowSelection: renderRowSelection(),
           rowClassName: _rowClassName,
@@ -391,6 +395,7 @@ ForwardProEditTable.defaultProps = {
   type: 'multiple',
   mode: 'multiple',
   insertType: 'after',
+  actionDirection: 'horizontal',
   value: [],
   actionProps: [],
   toolbarProps: [],

package/lib/ProEditTable/propsType.d.ts

@@ -257,4 +257,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     rowDraggable?: (record?: T) => string | boolean;
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
+    actionDirection?: 'vertical' | 'horizontal';
 }

package/lib/ProEditTable/utils/index.js

@@ -37,7 +37,8 @@ var getActionColumn = function getActionColumn(config) {
     actionWidth = config.actionWidth,
     actionProps = config.actionProps,
     page = config.page,
-    rowDisabled = config.rowDisabled;
+    rowDisabled = config.rowDisabled,
+    actionDirection = config.actionDirection;
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -159,7 +160,7 @@ var getActionColumn = function getActionColumn(config) {
     title: _locale.default.ProEditTable.operation,
     key: 'action',
     fixed: 'right',
-    width: actionWidth || (virtualKey ? '120px' : '60px'),
+    width: actionWidth || (actionDirection === 'vertical' ? '60px' : virtualKey ? '120px' : '60px'),
     render: function render(text, record, index) {
       var _rowDisabled;
       var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
@@ -167,7 +168,8 @@ var getActionColumn = function getActionColumn(config) {
         return '';
       }
       return (0, _jsxRuntime.jsx)(_antd.Space, {
-        size: "middle",
+        size: "small",
+        direction: actionDirection,
         children: actionBtns.map(function (btnConfig) {
           return (0, _jsxRuntime.jsx)(_react.default.Fragment, {
             children: (0, _jsxRuntime.jsx)(_components.ActionButton, (0, _objectSpread2.default)({}, {

package/lib/ProEnum/propsType.d.ts

@@ -49,7 +49,7 @@ export interface ProEnum {
     /** 用于自定义组件 */
     component?: ReactNode;
     /** 用于提交 code */
-    code: string | string[];
+    code?: string | string[];
     /** 字段别名 */
     fieldNames?: Record<string, string>;
     /** 是否查看模式 */

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

@@ -27,7 +27,6 @@ var _excluded = ["className", "format"];
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 var DatePicker = function DatePicker(props) {
-  var _rest$showTime;
   var className = props.className,
     _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -73,13 +72,6 @@ var DatePicker = function DatePicker(props) {
   var _rest = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
-  if (_rest.showTime && !(0, _lodash.isBoolean)(_rest.showTime) && !Reflect.ownKeys((_rest$showTime = _rest.showTime) !== null && _rest$showTime !== void 0 ? _rest$showTime : {}).includes('format')) {
-    var _rest$showTime2;
-    _rest.showTime = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_rest$showTime2 = _rest.showTime) !== null && _rest$showTime2 !== void 0 ? _rest$showTime2 : {}), _defaultShowTime);
-  }
-  if ((0, _lodash.isBoolean)(_rest.showTime)) {
-    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
-  }
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(_rest.value)) {
     _rest.value = (0, _moment.default)(_rest.value);
@@ -91,16 +83,12 @@ var DatePicker = function DatePicker(props) {
       _defaultShowTime: _defaultShowTime
     };
   }
-  if ((0, _lodash.isBoolean)(_rest.showTime)) {
+  if (_rest.showTime === true) {
     _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
   }
   if ((0, _lodash.isObject)(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  // 传进来showTime权重最高
-  if ((0, _lodash.isBoolean)(rest.showTime)) {
-    _rest.showTime = rest.showTime;
-  }
   return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {

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

@@ -61,6 +61,9 @@ var RangePicker = function RangePicker(props) {
   var _format = (0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
     return !!formatKey;
   });
+  var _defaultShowTime = {
+    format: 'YYYY-MM-DD HH:mm:ss'
+  };
   if (isView) {
     var _res$value = _res.value,
       value = _res$value === void 0 ? [] : _res$value;
@@ -85,6 +88,9 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
+  if (_res.showTime === true) {
+    _res.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  }
   return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])), rangeRegulator), {}, {
     format: _format
   }));

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

@@ -134,7 +134,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         var _res$data;
         var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
-          options: list
+          options: transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list
         });
       }
     })),
@@ -298,7 +298,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
+            if (!(!(selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || !(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length))) {
               _context2.next = 4;
               break;
             }
@@ -431,7 +431,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, 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:
@@ -456,11 +456,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 8:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
-              list = [];
+              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
-              } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               if (_data) {
@@ -497,7 +495,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
+      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:
@@ -515,11 +513,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 6:
             res = _context5.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
-              list = [];
+              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
-              } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
@@ -601,9 +597,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        var _list$filter;
         var nextSelectedRowKeys = isMultiple ? value : [value];
         nextState.selectedRowKeys = nextSelectedRowKeys;
-        nextState.selectedRows = options.filter(function (item) {
+        var list = options !== null && options !== void 0 ? options : data;
+        nextState.selectedRows = list === null || list === void 0 ? void 0 : (_list$filter = list.filter) === null || _list$filter === void 0 ? void 0 : _list$filter.call(list, function (item) {
           return nextSelectedRowKeys.includes(item[valueKey]);
         });
       }
@@ -626,7 +624,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             pageSize: 50,
             queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
           } : (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);
-          run(params);
+          var nextParams = transformParams ? transformParams(params) : params;
+          run(nextParams);
           setState({
             isInit: false
           });
@@ -690,7 +689,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             pageSize: 50,
             queryBean: queryBean
           } : queryBean;
-          run(params);
+          var nextParams = transformParams ? transformParams(params) : params;
+          run(nextParams);
           setState({
             isInit: false
           });
@@ -704,7 +704,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           pageSize: 50,
           queryBean: queryBean
         } : queryBean;
-        run(params);
+        var nextParams = transformParams ? transformParams(params) : params;
+        run(nextParams);
       }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'

package/lib/ProForm/index.d.ts

@@ -2,8 +2,9 @@ import { Form, FormInstance } from 'antd';
 import React, { ForwardRefRenderFunction } from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
+import { useForm } from './utils/useForm';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
-    useForm: typeof Form.useForm;
+    useForm: typeof useForm;
     useWatch: typeof Form.useWatch;
     [key: string]: any;
 }

package/lib/ProForm/index.js

@@ -24,7 +24,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
+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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl", "scrollToError"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
@@ -66,13 +66,17 @@ var ProForm = function ProForm(props, ref) {
     originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
+    _props$scrollToError = props.scrollToError,
+    scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
     state = _useProConfig.state,
     dispatch = _useProConfig.dispatch;
   var config = state.ProForm,
     forms = state.forms;
-  var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
+  var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
+      scrollToError: scrollToError
+    }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = (0, _index.useControlled)({

package/lib/ProForm/propsType.d.ts

@@ -75,6 +75,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     formId?: string;
     required?: boolean | boolean[];
     originalDiffTip?: boolean;
+    scrollToError?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

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

@@ -2,5 +2,8 @@ import { FormInstance } from 'antd';
 type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
 };
-export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
+interface FormInstanceOption {
+    scrollToError?: boolean;
+}
+export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
 export {};

package/lib/ProForm/utils/useForm.js

@@ -12,7 +12,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _antd = require("antd");
 var _index = require("./index");
 var _tools = require("../../ProEditTable/utils/tools");
-var useForm = exports.useForm = function useForm(originForm) {
+var useForm = exports.useForm = function useForm(originForm, options) {
+  var _ref = options || {},
+    _ref$scrollToError = _ref.scrollToError,
+    scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError;
   var _Form$useForm = _antd.Form.useForm(originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -30,7 +33,7 @@ var useForm = exports.useForm = function useForm(originForm) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,
@@ -87,7 +90,7 @@ var useForm = exports.useForm = function useForm(originForm) {
           case 17:
             _context.prev = 17;
             _context.t0 = _context["catch"](0);
-            if (_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)) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
@@ -102,7 +105,7 @@ var useForm = exports.useForm = function useForm(originForm) {
       }, _callee, null, [[0, 17]]);
     }));
     return function _validateFields(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   form.getFieldsValue = _getFieldsValue;

package/lib/ProForm/utils/useShouldUpdate.js

@@ -155,11 +155,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : rules;
-      var _component = (0, _lodash.isFunction)(originComponent) ? originComponent(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
-      }) : newComponent;
+      // const _component = isFunction(originComponent)
+      //   ? originComponent(_currentValues, { form, index, namePath })
+      //   : newComponent;
       var _fieldProps = (0, _lodash.isFunction)(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
@@ -168,7 +166,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names)) {
         if (_show === false) {
-          clearInterval(timerRef.current);
+          clearTimeout(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
               form.resetFields(names);
@@ -178,17 +176,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
             }
           }, 200);
         } else {
-          clearInterval(timerRef.current);
+          clearTimeout(timerRef.current);
         }
       }
-      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
-      // if (
-      //   _required !== requiredRef.current ||
-      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
-      // ) {
-      //   form.validateFields([name]);
-      // }
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) ||
+      // 值变更，需要同步更新函数式的fieldProps
+      (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) && !(0, _lodash.isEqual)(prevValues, currentValues) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
       (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;

package/lib/ProStep/components/Listener/index.js

@@ -14,12 +14,16 @@ var _react = _interopRequireDefault(require("react"));
 var _index = require("../../index");
 var _excluded = ["children", "delayTime"];
 var _default = exports.default = function _default(_ref) {
+  var _children$props;
   var children = _ref.children,
     delayTime = _ref.delayTime,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useStep = (0, _index.useStep)(),
-    notify = _useStep.notify;
+    notify = _useStep.notify,
+    loading = _useStep.loading,
+    setLoading = _useStep.setLoading;
   return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+    loading: loading || (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.loading),
     onClick: (0, _lodash.throttle)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -31,10 +35,11 @@ var _default = exports.default = function _default(_ref) {
           case 3:
             values = _context.sent;
             setTimeout(function () {
+              setLoading(false);
               var localData = localStorage.getItem('cache-pro-step');
               if (localData !== 'false') {
-                var _children$props, _children$props$onCli;
-                children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);
+                var _children$props2, _children$props2$onCl;
+                children === null || children === void 0 ? void 0 : (_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : (_children$props2$onCl = _children$props2.onClick) === null || _children$props2$onCl === void 0 ? void 0 : _children$props2$onCl.call(_children$props2, values);
               }
             }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
           case 5:

package/lib/ProStep/index.js

@@ -38,6 +38,10 @@ var ProStep = function ProStep(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     anchorIds = _useState2[0],
     setAnchorIds = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('cache-pro-step'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
@@ -109,10 +113,11 @@ var ProStep = function ProStep(_ref) {
             case 10:
               values[id] = _context.sent;
             case 11:
-              _context.next = 19;
+              setErrorCollection((0, _defineProperty2.default)({}, id, 0));
+              _context.next = 21;
               break;
-            case 13:
-              _context.prev = 13;
+            case 14:
+              _context.prev = 14;
               _context.t0 = _context["catch"](1);
               num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
               if (num) {
@@ -120,14 +125,15 @@ var ProStep = function ProStep(_ref) {
                 console.error(_context.t0);
               }
               setErrorCollection((0, _defineProperty2.default)({}, id, num));
+              setLoading(false);
               return _context.abrupt("return", _context.t0);
-            case 19:
+            case 21:
               return _context.abrupt("return", values[id]);
-            case 20:
+            case 22:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[1, 13]]);
+        }, _callee, null, [[1, 14]]);
       }));
       return function subEvent() {
         return _ref5.apply(this, arguments);
@@ -144,11 +150,12 @@ var ProStep = function ProStep(_ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            setLoading(true);
+            _context2.next = 3;
             return emitter.emit();
-          case 2:
-            return _context2.abrupt("return", values);
           case 3:
+            return _context2.abrupt("return", values);
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -239,7 +246,9 @@ var ProStep = function ProStep(_ref) {
       register: register,
       notify: notify,
       triggerTo: triggerTo,
-      handleScroll: _utils.handleScroll
+      handleScroll: _utils.handleScroll,
+      loading: loading,
+      setLoading: setLoading
     },
     children: (0, _jsxRuntime.jsxs)("div", {
       className: "pro-step-wrapper",

package/lib/ProTable/utils.js

@@ -85,7 +85,6 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
   };
   // 后缀处理
   var suffixNode = function suffixNode(value, record, index) {
-    console.log('记录看下', suffix);
     if ((0, _lodash.isString)(suffix) || /*#__PURE__*/(0, _react.isValidElement)(suffix)) {
       return suffix;
     }

package/package.json

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