@zat-design/sisyphus-react 3.5.4-beta.5 → 3.5.4-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/es/ProForm/index.d.ts +2 -1
  2. package/es/ProForm/index.js +6 -2
  3. package/es/ProForm/propsType.d.ts +1 -0
  4. package/es/ProForm/utils/useForm.d.ts +4 -1
  5. package/es/ProForm/utils/useForm.js +7 -4
  6. package/lib/ProForm/index.d.ts +2 -1
  7. package/lib/ProForm/index.js +6 -2
  8. package/lib/ProForm/propsType.d.ts +1 -0
  9. package/lib/ProForm/utils/useForm.d.ts +4 -1
  10. package/lib/ProForm/utils/useForm.js +7 -4
  11. package/package.json +1 -1
package/es/ProForm/index.d.ts CHANGED
@@ -2,8 +2,9 @@ import { Form, FormInstance } from 'antd';
2
2
  import React, { ForwardRefRenderFunction } from 'react';
3
3
  import { FormProviderProps } from 'antd/es/form/context';
4
4
  import { ProFormProps } from './propsType';
5
+ import { useForm } from './utils/useForm';
5
6
  interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
6
- useForm: typeof Form.useForm;
7
+ useForm: typeof useForm;
7
8
  useWatch: typeof Form.useWatch;
8
9
  [key: string]: any;
9
10
  }
package/es/ProForm/index.js CHANGED
@@ -11,7 +11,7 @@ import _Space from "antd/es/space";
11
11
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
12
12
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
13
13
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
14
- 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"];
14
+ 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"];
15
15
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
16
16
  import { DoubleLeftOutlined } from '@ant-design/icons';
17
17
  import classnames from 'classnames';
@@ -65,13 +65,17 @@ var ProForm = function ProForm(props, ref) {
65
65
  originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
66
66
  formKey = props.formKey,
67
67
  globalControl = props.globalControl,
68
+ _props$scrollToError = props.scrollToError,
69
+ scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
68
70
  otherProps = _objectWithoutProperties(props, _excluded);
69
71
  var _useProConfig = useProConfig(),
70
72
  state = _useProConfig.state,
71
73
  dispatch = _useProConfig.dispatch;
72
74
  var config = state.ProForm,
73
75
  forms = state.forms;
74
- var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
76
+ var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
77
+ scrollToError: scrollToError
78
+ }),
75
79
  _useForm2 = _slicedToArray(_useForm, 1),
76
80
  form = _useForm2[0];
77
81
  var _useControlled = useControlled({
package/es/ProForm/propsType.d.ts CHANGED
@@ -75,6 +75,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
75
75
  formId?: string;
76
76
  required?: boolean | boolean[];
77
77
  originalDiffTip?: boolean;
78
+ scrollToError?: boolean;
78
79
  }
79
80
  export interface Transform<T = any> {
80
81
  normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;
package/es/ProForm/utils/useForm.d.ts CHANGED
@@ -2,5 +2,8 @@ import { FormInstance } from 'antd';
2
2
  type ModifiedFormInstance<T> = FormInstance<T> & {
3
3
  isModified?: boolean;
4
4
  };
5
- export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
5
+ interface FormInstanceOption {
6
+ scrollToError?: boolean;
7
+ }
8
+ export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
6
9
  export {};
package/es/ProForm/utils/useForm.js CHANGED
@@ -6,7 +6,10 @@ import _Form from "antd/es/form";
6
6
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
7
7
  import { filterInternalFields } from './index';
8
8
  import { handleScrollToError } from '../../ProEditTable/utils/tools';
9
- export var useForm = function useForm(originForm) {
9
+ export var useForm = function useForm(originForm, options) {
10
+ var _ref = options || {},
11
+ _ref$scrollToError = _ref.scrollToError,
12
+ scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError;
10
13
  var _Form$useForm = _Form.useForm(originForm),
11
14
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
12
15
  form = _Form$useForm2[0];
@@ -24,7 +27,7 @@ export var useForm = function useForm(originForm) {
24
27
  return getFieldsValue(nameList, filterFunc);
25
28
  };
26
29
  var _validateFields = /*#__PURE__*/function () {
27
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
30
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
28
31
  var _rest$,
29
32
  _len,
30
33
  rest,
@@ -81,7 +84,7 @@ export var useForm = function useForm(originForm) {
81
84
  case 17:
82
85
  _context.prev = 17;
83
86
  _context.t0 = _context["catch"](0);
84
- 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) {
87
+ 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)) {
85
88
  form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
86
89
  block: 'center',
87
90
  behavior: 'smooth'
@@ -96,7 +99,7 @@ export var useForm = function useForm(originForm) {
96
99
  }, _callee, null, [[0, 17]]);
97
100
  }));
98
101
  return function _validateFields(_x) {
99
- return _ref.apply(this, arguments);
102
+ return _ref2.apply(this, arguments);
100
103
  };
101
104
  }();
102
105
  form.getFieldsValue = _getFieldsValue;
package/lib/ProForm/index.d.ts CHANGED
@@ -2,8 +2,9 @@ import { Form, FormInstance } from 'antd';
2
2
  import React, { ForwardRefRenderFunction } from 'react';
3
3
  import { FormProviderProps } from 'antd/es/form/context';
4
4
  import { ProFormProps } from './propsType';
5
+ import { useForm } from './utils/useForm';
5
6
  interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
6
- useForm: typeof Form.useForm;
7
+ useForm: typeof useForm;
7
8
  useWatch: typeof Form.useWatch;
8
9
  [key: string]: any;
9
10
  }
package/lib/ProForm/index.js CHANGED
@@ -24,7 +24,7 @@ var _index = require("./utils/index");
24
24
  var _useForm3 = require("./utils/useForm");
25
25
  var _useFieldProps = require("./utils/useFieldProps");
26
26
  var _locale = _interopRequireDefault(require("../locale"));
27
- 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"];
27
+ 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"];
28
28
  var ProForm = function ProForm(props, ref) {
29
29
  var _forms$formKey, _localStorage, _ref;
30
30
  var _props$mode = props.mode,
@@ -66,13 +66,17 @@ var ProForm = function ProForm(props, ref) {
66
66
  originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
67
67
  formKey = props.formKey,
68
68
  globalControl = props.globalControl,
69
+ _props$scrollToError = props.scrollToError,
70
+ scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError,
69
71
  otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
70
72
  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
71
73
  state = _useProConfig.state,
72
74
  dispatch = _useProConfig.dispatch;
73
75
  var config = state.ProForm,
74
76
  forms = state.forms;
75
- var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
77
+ var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
78
+ scrollToError: scrollToError
79
+ }),
76
80
  _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
77
81
  form = _useForm2[0];
78
82
  var _useControlled = (0, _index.useControlled)({
package/lib/ProForm/propsType.d.ts CHANGED
@@ -75,6 +75,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
75
75
  formId?: string;
76
76
  required?: boolean | boolean[];
77
77
  originalDiffTip?: boolean;
78
+ scrollToError?: boolean;
78
79
  }
79
80
  export interface Transform<T = any> {
80
81
  normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;
package/lib/ProForm/utils/useForm.d.ts CHANGED
@@ -2,5 +2,8 @@ import { FormInstance } from 'antd';
2
2
  type ModifiedFormInstance<T> = FormInstance<T> & {
3
3
  isModified?: boolean;
4
4
  };
5
- export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
5
+ interface FormInstanceOption {
6
+ scrollToError?: boolean;
7
+ }
8
+ export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
6
9
  export {};
package/lib/ProForm/utils/useForm.js CHANGED
@@ -12,7 +12,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
12
12
  var _antd = require("antd");
13
13
  var _index = require("./index");
14
14
  var _tools = require("../../ProEditTable/utils/tools");
15
- var useForm = exports.useForm = function useForm(originForm) {
15
+ var useForm = exports.useForm = function useForm(originForm, options) {
16
+ var _ref = options || {},
17
+ _ref$scrollToError = _ref.scrollToError,
18
+ scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError;
16
19
  var _Form$useForm = _antd.Form.useForm(originForm),
17
20
  _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
18
21
  form = _Form$useForm2[0];
@@ -30,7 +33,7 @@ var useForm = exports.useForm = function useForm(originForm) {
30
33
  return getFieldsValue(nameList, filterFunc);
31
34
  };
32
35
  var _validateFields = /*#__PURE__*/function () {
33
- var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
36
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
34
37
  var _rest$,
35
38
  _len,
36
39
  rest,
@@ -87,7 +90,7 @@ var useForm = exports.useForm = function useForm(originForm) {
87
90
  case 17:
88
91
  _context.prev = 17;
89
92
  _context.t0 = _context["catch"](0);
90
- 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) {
93
+ 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)) {
91
94
  form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
92
95
  block: 'center',
93
96
  behavior: 'smooth'
@@ -102,7 +105,7 @@ var useForm = exports.useForm = function useForm(originForm) {
102
105
  }, _callee, null, [[0, 17]]);
103
106
  }));
104
107
  return function _validateFields(_x) {
105
- return _ref.apply(this, arguments);
108
+ return _ref2.apply(this, arguments);
106
109
  };
107
110
  }();
108
111
  form.getFieldsValue = _getFieldsValue;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.5.4-beta.5",
3
+ "version": "3.5.4-beta.7",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",