@zat-design/sisyphus-react 4.0.0-beta.6 → 4.0.0-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.
- package/es/ProAction/index.js +3 -6
- package/es/ProConfigProvider/index.js +2 -3
- package/es/ProDownload/index.js +2 -3
- package/es/ProDownload/utils.js +3 -4
- package/es/ProDrawerForm/components/ProDrawer/index.js +5 -10
- package/es/ProDrawerForm/components/ProModal/index.js +5 -10
- package/es/ProEditLabel/components/RenderProForm.js +2 -3
- package/es/ProEditLabel/index.js +6 -13
- package/es/ProEditTable/components/ActionButton/index.js +5 -8
- package/es/ProEditTable/components/RcTable/BaseTable.js +3 -6
- package/es/ProEditTable/components/RcTable/DraggableTable.js +2 -3
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +5 -8
- package/es/ProEditTable/components/RenderField/index.js +4 -5
- package/es/ProEditTable/components/RenderToolbar/index.js +2 -3
- package/es/ProEditTable/components/Summary/index.js +5 -8
- package/es/ProEditTable/components/Validator/index.js +3 -6
- package/es/ProEditTable/index.js +5 -10
- package/es/ProEditTable/utils/config.js +4 -5
- package/es/ProEditTable/utils/index.js +3 -6
- package/es/ProEnum/index.js +10 -17
- package/es/ProForm/components/Container.js +2 -3
- package/es/ProForm/components/FormFooter/index.js +4 -7
- package/es/ProForm/components/base/Checkbox/index.js +3 -4
- package/es/ProForm/components/base/DatePicker/index.js +2 -3
- package/es/ProForm/components/base/Input/index.js +2 -3
- package/es/ProForm/components/base/InputNumber/index.js +3 -6
- package/es/ProForm/components/base/Radio/index.js +3 -4
- package/es/ProForm/components/base/RangePicker/index.js +3 -3
- package/es/ProForm/components/base/Select/index.js +2 -3
- package/es/ProForm/components/base/Switch/index.js +2 -3
- package/es/ProForm/components/base/SwitchCheckbox/index.js +2 -3
- package/es/ProForm/components/base/TextArea/index.js +2 -3
- package/es/ProForm/components/base/TimePicker/index.js +2 -3
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +8 -13
- package/es/ProForm/components/combination/FormList/components/BlockFields.js +3 -6
- package/es/ProForm/components/combination/FormList/components/Empty.js +2 -3
- package/es/ProForm/components/combination/FormList/components/LineFields.js +2 -3
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +5 -8
- package/es/ProForm/components/combination/FormList/index.js +2 -3
- package/es/ProForm/components/combination/Group/index.js +3 -4
- package/es/ProForm/components/combination/Group/utils.js +3 -4
- package/es/ProForm/components/combination/ProCascader/index.js +5 -10
- package/es/ProForm/components/combination/ProModalSelect/index.js +9 -22
- package/es/ProForm/components/combination/ProNumberRange/index.js +12 -19
- package/es/ProForm/components/combination/ProRangeLimit/index.js +4 -9
- package/es/ProForm/components/combination/ProTimeLimit/index.js +4 -9
- package/es/ProForm/components/render/ChangedWrapper.js +5 -8
- package/es/ProForm/components/render/ConfirmWrapper.js +3 -4
- package/es/ProForm/components/render/Render.js +12 -19
- package/es/ProForm/index.js +8 -15
- package/es/ProForm/utils/useForm.js +2 -3
- package/es/ProIcon/index.js +6 -11
- package/es/ProLayout/components/Layout/Menu/FoldMenu/index.js +3 -6
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -3
- package/es/ProLayout/components/ProCollapse/index.js +5 -10
- package/es/ProLayout/components/ProFooter/index.js +2 -3
- package/es/ProLayout/components/ProHeader/components/Copy/index.js +2 -3
- package/es/ProLayout/components/ProHeader/components/ProBackBtn/index.js +2 -3
- package/es/ProLayout/components/ProHeader/index.js +16 -25
- package/es/ProLayout/index.js +2 -3
- package/es/ProSelect/components/AdaptiveTooltip.js +2 -3
- package/es/ProSelect/index.js +7 -14
- package/es/ProStep/components/Anchor/index.js +2 -3
- package/es/ProTable/components/FormatColumn/index.js +9 -10
- package/es/ProTable/components/RcTable/components/BaseTable/index.js +2 -3
- package/es/ProTable/components/RcTable/components/DraggableTable/index.js +2 -3
- package/es/ProTable/components/RenderColumn/index.js +10 -15
- package/es/ProTable/components/RenderSummary/index.js +4 -5
- package/es/ProTable/components/RenderTableHeader/index.js +3 -4
- package/es/ProTable/components/RenderTabs/index.js +3 -6
- package/es/ProTable/components/TooltipTitle/index.js +2 -3
- package/es/ProTable/hooks/useAntdTable.js +3 -6
- package/es/ProTabs/components/Card/index.js +5 -10
- package/es/ProTabs/index.js +2 -3
- package/es/ProThemeTools/component/ProTools/index.js +12 -19
- package/es/ProThemeTools/index.js +2 -3
- package/es/ProTooltip/index.js +4 -5
- package/es/ProTree/components/AdaptiveTooltip.js +2 -3
- package/es/ProTree/components/List.js +3 -4
- package/es/ProTree/components/ProTree.js +5 -12
- package/es/ProTree/components/ProTreeSelect/index.js +9 -16
- package/es/ProTree/components/Tree.js +3 -6
- package/es/ProTreeModal/components/Cascader.js +3 -4
- package/es/ProTreeModal/components/List.js +9 -14
- package/es/ProTreeModal/components/SortableItem.js +2 -3
- package/es/ProTreeModal/components/Tree.js +3 -4
- package/es/ProTreeModal/components/Trigger.js +6 -11
- package/es/ProTreeModal/index.js +9 -16
- package/es/ProUpload/components/ButtonRender.js +3 -6
- package/es/ProUpload/components/DragRender.js +2 -3
- package/es/ProUpload/components/FileItem.js +10 -15
- package/es/ProUpload/components/ImageRender.js +8 -17
- package/es/ProUpload/index.js +3 -4
- package/es/ProViewer/index.js +4 -9
- package/es/ProViewer/propsType.js +3 -0
- package/es/ProWaterMark/index.js +2 -3
- package/lib/ProAction/index.js +3 -6
- package/lib/ProConfigProvider/index.js +2 -3
- package/lib/ProDownload/index.js +2 -3
- package/lib/ProDownload/utils.js +3 -4
- package/lib/ProDrawerForm/components/ProDrawer/index.js +5 -10
- package/lib/ProDrawerForm/components/ProModal/index.js +5 -10
- package/lib/ProEditLabel/components/RenderProForm.js +2 -3
- package/lib/ProEditLabel/index.js +6 -13
- package/lib/ProEditTable/components/ActionButton/index.js +5 -8
- package/lib/ProEditTable/components/RcTable/BaseTable.js +3 -6
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +2 -3
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +5 -8
- package/lib/ProEditTable/components/RenderField/index.js +4 -5
- package/lib/ProEditTable/components/RenderToolbar/index.js +2 -3
- package/lib/ProEditTable/components/Summary/index.js +5 -9
- package/lib/ProEditTable/components/Validator/index.js +3 -7
- package/lib/ProEditTable/index.js +5 -10
- package/lib/ProEditTable/utils/config.js +4 -5
- package/lib/ProEditTable/utils/index.js +3 -6
- package/lib/ProEnum/index.js +10 -17
- package/lib/ProForm/components/Container.js +2 -3
- package/lib/ProForm/components/FormFooter/index.js +4 -7
- package/lib/ProForm/components/base/Checkbox/index.js +3 -4
- package/lib/ProForm/components/base/DatePicker/index.js +2 -3
- package/lib/ProForm/components/base/Input/index.js +2 -3
- package/lib/ProForm/components/base/InputNumber/index.js +3 -6
- package/lib/ProForm/components/base/Radio/index.js +3 -4
- package/lib/ProForm/components/base/RangePicker/index.js +2 -3
- package/lib/ProForm/components/base/Select/index.js +2 -3
- package/lib/ProForm/components/base/Switch/index.js +2 -3
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +2 -3
- package/lib/ProForm/components/base/TextArea/index.js +2 -3
- package/lib/ProForm/components/base/TimePicker/index.js +2 -3
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +8 -13
- package/lib/ProForm/components/combination/FormList/components/BlockFields.js +4 -7
- package/lib/ProForm/components/combination/FormList/components/Empty.js +2 -3
- package/lib/ProForm/components/combination/FormList/components/LineFields.js +2 -3
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +4 -7
- package/lib/ProForm/components/combination/FormList/index.js +2 -3
- package/lib/ProForm/components/combination/Group/index.js +3 -4
- package/lib/ProForm/components/combination/Group/utils.js +3 -4
- package/lib/ProForm/components/combination/ProCascader/index.js +5 -10
- package/lib/ProForm/components/combination/ProModalSelect/index.js +9 -22
- package/lib/ProForm/components/combination/ProNumberRange/index.js +12 -19
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +4 -9
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +4 -9
- package/lib/ProForm/components/render/ChangedWrapper.js +5 -8
- package/lib/ProForm/components/render/ConfirmWrapper.js +3 -4
- package/lib/ProForm/components/render/Render.js +12 -19
- package/lib/ProForm/index.js +8 -15
- package/lib/ProForm/utils/useForm.js +2 -3
- package/lib/ProIcon/index.js +6 -11
- package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +3 -6
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -3
- package/lib/ProLayout/components/ProCollapse/index.js +5 -10
- package/lib/ProLayout/components/ProFooter/index.js +2 -3
- package/lib/ProLayout/components/ProHeader/components/Copy/index.js +2 -3
- package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +2 -3
- package/lib/ProLayout/components/ProHeader/index.js +15 -24
- package/lib/ProLayout/index.js +2 -3
- package/lib/ProSelect/components/AdaptiveTooltip.js +2 -3
- package/lib/ProSelect/index.js +7 -14
- package/lib/ProStep/components/Anchor/index.js +2 -3
- package/lib/ProTable/components/FormatColumn/index.js +9 -10
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +2 -3
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +2 -3
- package/lib/ProTable/components/RenderColumn/index.js +10 -15
- package/lib/ProTable/components/RenderSummary/index.js +4 -6
- package/lib/ProTable/components/RenderTableHeader/index.js +3 -5
- package/lib/ProTable/components/RenderTabs/index.js +3 -6
- package/lib/ProTable/components/TooltipTitle/index.js +2 -3
- package/lib/ProTable/hooks/useAntdTable.js +3 -6
- package/lib/ProTabs/components/Card/index.js +5 -11
- package/lib/ProTabs/index.js +2 -3
- package/lib/ProThemeTools/component/ProTools/index.js +12 -19
- package/lib/ProThemeTools/index.js +2 -3
- package/lib/ProTooltip/index.js +4 -5
- package/lib/ProTree/components/AdaptiveTooltip.js +2 -4
- package/lib/ProTree/components/List.js +3 -4
- package/lib/ProTree/components/ProTree.js +5 -12
- package/lib/ProTree/components/ProTreeSelect/index.js +9 -16
- package/lib/ProTree/components/Tree.js +3 -6
- package/lib/ProTreeModal/components/Cascader.js +3 -4
- package/lib/ProTreeModal/components/List.js +9 -14
- package/lib/ProTreeModal/components/SortableItem.js +2 -3
- package/lib/ProTreeModal/components/Tree.js +3 -4
- package/lib/ProTreeModal/components/Trigger.js +6 -11
- package/lib/ProTreeModal/index.js +9 -16
- package/lib/ProUpload/components/ButtonRender.js +3 -6
- package/lib/ProUpload/components/DragRender.js +2 -3
- package/lib/ProUpload/components/FileItem.js +10 -15
- package/lib/ProUpload/components/ImageRender.js +8 -17
- package/lib/ProUpload/index.js +3 -4
- package/lib/ProViewer/index.js +4 -9
- package/lib/ProViewer/propsType.js +3 -1
- package/lib/ProWaterMark/index.js +2 -3
- package/package.json +1 -1
@@ -1,9 +1,8 @@
|
|
1
|
-
import "antd/es/button/style";
|
2
|
-
import _Button from "antd/es/button";
|
3
1
|
/* eslint-disable no-lonely-if */
|
4
2
|
|
5
3
|
import { isFunction } from 'lodash';
|
6
4
|
import { validate } from '@zat-design/utils';
|
5
|
+
import { Button } from 'antd';
|
7
6
|
import valueTypeMap from "../../../utils/valueType";
|
8
7
|
import { jsx as _jsx } from "react/jsx-runtime";
|
9
8
|
/**
|
@@ -38,7 +37,7 @@ export var insertSeparator = (columns, space) => {
|
|
38
37
|
if (index === separatorIndex) {
|
39
38
|
result.push({
|
40
39
|
separator: true,
|
41
|
-
component: /*#__PURE__*/_jsx(
|
40
|
+
component: /*#__PURE__*/_jsx(Button, {
|
42
41
|
className: "group-separator",
|
43
42
|
children: space.separator
|
44
43
|
}),
|
@@ -53,7 +52,7 @@ export var insertSeparator = (columns, space) => {
|
|
53
52
|
if (index < array.length - 1) {
|
54
53
|
result.push({
|
55
54
|
separator: true,
|
56
|
-
component: /*#__PURE__*/_jsx(
|
55
|
+
component: /*#__PURE__*/_jsx(Button, {
|
57
56
|
className: "group-separator",
|
58
57
|
children: space.separator
|
59
58
|
}),
|
@@ -1,14 +1,9 @@
|
|
1
|
-
import "antd/es/tooltip/style";
|
2
|
-
import _Tooltip from "antd/es/tooltip";
|
3
|
-
import "antd/es/cascader/style";
|
4
|
-
import _Cascader from "antd/es/cascader";
|
5
|
-
import "antd/es/message/style";
|
6
|
-
import _message from "antd/es/message";
|
7
1
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
8
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
9
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
10
4
|
var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
|
11
5
|
import { useEffect, useState, memo, useMemo, useCallback } from 'react';
|
6
|
+
import { Cascader, Tooltip, message } from 'antd';
|
12
7
|
import { omit, find as _find, isBoolean, isEqual } from 'lodash';
|
13
8
|
import { useRequest as useRequestFunc, useDeepCompareEffect } from 'ahooks';
|
14
9
|
import { transformDataName } from "./utils/index";
|
@@ -130,7 +125,7 @@ var ProCascader = props => {
|
|
130
125
|
msg = _ref4.message,
|
131
126
|
data = _ref4.data;
|
132
127
|
if (status !== 200) {
|
133
|
-
|
128
|
+
message.error(msg);
|
134
129
|
return;
|
135
130
|
}
|
136
131
|
var newData = data;
|
@@ -157,7 +152,7 @@ var ProCascader = props => {
|
|
157
152
|
msg = _ref5.message,
|
158
153
|
data = _ref5.data;
|
159
154
|
if (status !== 200) {
|
160
|
-
|
155
|
+
message.error(msg);
|
161
156
|
return;
|
162
157
|
}
|
163
158
|
return data;
|
@@ -313,7 +308,7 @@ var ProCascader = props => {
|
|
313
308
|
children: viewValue
|
314
309
|
}) : /*#__PURE__*/_jsxs("div", {
|
315
310
|
className: `pro-address ${className}`,
|
316
|
-
children: [/*#__PURE__*/_jsx(
|
311
|
+
children: [/*#__PURE__*/_jsx(Cascader, _objectSpread({
|
317
312
|
className: hasDetail ? '' : 'no-detail',
|
318
313
|
placeholder: locale === null || locale === void 0 || (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
|
319
314
|
value: addressValue,
|
@@ -329,7 +324,7 @@ var ProCascader = props => {
|
|
329
324
|
getPopupContainer: trigger => {
|
330
325
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
331
326
|
}
|
332
|
-
}, omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/_jsx(
|
327
|
+
}, omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/_jsx(Tooltip, {
|
333
328
|
title: detail,
|
334
329
|
children: /*#__PURE__*/_jsx("span", {
|
335
330
|
className: "pro-address-detail",
|
@@ -1,27 +1,14 @@
|
|
1
|
-
import "antd/es/space/style";
|
2
|
-
import _Space from "antd/es/space";
|
3
|
-
import "antd/es/button/style";
|
4
|
-
import _Button from "antd/es/button";
|
5
|
-
import "antd/es/tooltip/style";
|
6
|
-
import _Tooltip from "antd/es/tooltip";
|
7
|
-
import "antd/es/input/style";
|
8
|
-
import _Input from "antd/es/input";
|
9
|
-
import "antd/es/spin/style";
|
10
|
-
import _Spin from "antd/es/spin";
|
11
|
-
import "antd/es/message/style";
|
12
|
-
import _message from "antd/es/message";
|
13
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
14
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
15
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
16
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
17
|
-
import "antd/es/form/style";
|
18
|
-
import _Form from "antd/es/form";
|
19
5
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
20
6
|
var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "mode", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "tooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
|
21
7
|
_excluded2 = ["onOk"],
|
22
8
|
_excluded3 = ["rowKey", "columns", "rowSelection"];
|
23
9
|
import { SearchOutlined } from '@ant-design/icons';
|
24
10
|
import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
|
11
|
+
import { Form, message, Input, Tooltip, Space, Button, Spin } from 'antd';
|
25
12
|
import { debounce, isArray, isBoolean, isEqual, isFunction, isObject } from 'lodash';
|
26
13
|
import classNames from 'classnames';
|
27
14
|
import { ReactSVG } from 'react-svg';
|
@@ -72,7 +59,7 @@ var ProModalSelect = (props, ref) => {
|
|
72
59
|
}
|
73
60
|
return mode;
|
74
61
|
}, [mode, readOnly]);
|
75
|
-
var contentForm =
|
62
|
+
var contentForm = Form.useFormInstance();
|
76
63
|
if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
|
77
64
|
throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
|
78
65
|
}
|
@@ -147,7 +134,7 @@ var ProModalSelect = (props, ref) => {
|
|
147
134
|
_selectedRows = _useSetState2$.selectedRows,
|
148
135
|
_selectedRowKeys = _useSetState2$.selectedRowKeys,
|
149
136
|
setState = _useSetState2[1];
|
150
|
-
var _Form$useForm =
|
137
|
+
var _Form$useForm = Form.useForm(searchForm),
|
151
138
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
152
139
|
form = _Form$useForm2[0];
|
153
140
|
var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
|
@@ -355,7 +342,7 @@ var ProModalSelect = (props, ref) => {
|
|
355
342
|
_context2.next = 4;
|
356
343
|
break;
|
357
344
|
}
|
358
|
-
|
345
|
+
message.error(locale.ProModalSelect.checkMsg);
|
359
346
|
return _context2.abrupt("return", false);
|
360
347
|
case 4:
|
361
348
|
nextSelectedRows = selectedRows;
|
@@ -753,7 +740,7 @@ var ProModalSelect = (props, ref) => {
|
|
753
740
|
}, [value, _value]);
|
754
741
|
|
755
742
|
// 加个中间状态Input
|
756
|
-
var initRender = /*#__PURE__*/_jsxs(
|
743
|
+
var initRender = /*#__PURE__*/_jsxs(Space.Compact, {
|
757
744
|
style: {
|
758
745
|
width: '100%'
|
759
746
|
},
|
@@ -769,7 +756,7 @@ var ProModalSelect = (props, ref) => {
|
|
769
756
|
optionRender: optionRender,
|
770
757
|
scrollFollowParent: false,
|
771
758
|
mode: isMultiple ? 'multiple' : undefined,
|
772
|
-
notFoundContent: selectLoading ? /*#__PURE__*/_jsx(
|
759
|
+
notFoundContent: selectLoading ? /*#__PURE__*/_jsx(Spin, {
|
773
760
|
size: "small"
|
774
761
|
}) : null,
|
775
762
|
onFocus: handleSelectFocus,
|
@@ -778,17 +765,17 @@ var ProModalSelect = (props, ref) => {
|
|
778
765
|
style: {
|
779
766
|
width: isView || disabled ? '100%' : 'calc(100% - 30px)'
|
780
767
|
}
|
781
|
-
}, restProps)) : /*#__PURE__*/_jsx(
|
768
|
+
}, restProps)) : /*#__PURE__*/_jsx(Tooltip, {
|
782
769
|
title: _tooltip ? viewText : null,
|
783
770
|
placement: "topLeft",
|
784
|
-
children: /*#__PURE__*/_jsx(
|
771
|
+
children: /*#__PURE__*/_jsx(Input, _objectSpread({
|
785
772
|
value: viewText,
|
786
773
|
onChange: handleChangeValue,
|
787
774
|
disabled: disabled,
|
788
775
|
autoComplete: "off",
|
789
776
|
allowClear: true
|
790
777
|
}, restProps))
|
791
|
-
}), isView || disabled ? null : /*#__PURE__*/_jsx(
|
778
|
+
}), isView || disabled ? null : /*#__PURE__*/_jsx(Button, {
|
792
779
|
onClick: handleClick,
|
793
780
|
icon: /*#__PURE__*/_jsx(ReactSVG, {
|
794
781
|
className: "viewSvg",
|
@@ -1,14 +1,7 @@
|
|
1
|
-
import "antd/es/input/style";
|
2
|
-
import _Input from "antd/es/input";
|
3
|
-
import "antd/es/button/style";
|
4
|
-
import _Button from "antd/es/button";
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
6
|
-
import "antd/es/input-number/style";
|
7
|
-
import _InputNumber from "antd/es/input-number";
|
8
|
-
import "antd/es/space/style";
|
9
|
-
import _Space from "antd/es/space";
|
10
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
3
|
import { useSetState, useDeepCompareEffect } from 'ahooks';
|
4
|
+
import { Button, Input, InputNumber, Space } from 'antd';
|
12
5
|
import { isEqual, isEmpty } from 'lodash';
|
13
6
|
import { memo } from 'react';
|
14
7
|
import classnames from 'classnames';
|
@@ -102,7 +95,7 @@ var ProNumberRange = props => {
|
|
102
95
|
case 'percentage':
|
103
96
|
return /*#__PURE__*/_jsx(Container, {
|
104
97
|
viewEmpty: viewEmpty,
|
105
|
-
children: /*#__PURE__*/_jsxs(
|
98
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
106
99
|
split: split,
|
107
100
|
children: [/*#__PURE__*/_jsx("span", {
|
108
101
|
children: formatAmount(value[0], precision || decimal)
|
@@ -115,7 +108,7 @@ var ProNumberRange = props => {
|
|
115
108
|
case 'permillage':
|
116
109
|
return /*#__PURE__*/_jsx(Container, {
|
117
110
|
viewEmpty: viewEmpty,
|
118
|
-
children: /*#__PURE__*/_jsxs(
|
111
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
119
112
|
split: split,
|
120
113
|
children: [/*#__PURE__*/_jsx("span", {
|
121
114
|
children: formatAmount(value[0], precision || decimal)
|
@@ -129,7 +122,7 @@ var ProNumberRange = props => {
|
|
129
122
|
case 'thousandth':
|
130
123
|
return /*#__PURE__*/_jsx(Container, {
|
131
124
|
viewEmpty: viewEmpty,
|
132
|
-
children: /*#__PURE__*/_jsxs(
|
125
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
133
126
|
split: split,
|
134
127
|
children: [/*#__PURE__*/_jsx("span", {
|
135
128
|
children: formatAmount(value[0], precision || decimal)
|
@@ -141,7 +134,7 @@ var ProNumberRange = props => {
|
|
141
134
|
default:
|
142
135
|
return /*#__PURE__*/_jsx(Container, {
|
143
136
|
viewEmpty: viewEmpty,
|
144
|
-
children: /*#__PURE__*/_jsxs(
|
137
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
145
138
|
split: split,
|
146
139
|
children: [/*#__PURE__*/_jsx("span", {
|
147
140
|
children: value[0] || '-'
|
@@ -203,10 +196,10 @@ var ProNumberRange = props => {
|
|
203
196
|
}
|
204
197
|
return result;
|
205
198
|
};
|
206
|
-
return /*#__PURE__*/_jsx(
|
199
|
+
return /*#__PURE__*/_jsx(Space, {
|
207
200
|
className: cls,
|
208
|
-
children: /*#__PURE__*/_jsxs(
|
209
|
-
children: [/*#__PURE__*/_jsx(
|
201
|
+
children: /*#__PURE__*/_jsxs(Space.Compact, {
|
202
|
+
children: [/*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
|
210
203
|
id: id,
|
211
204
|
className: "range-left",
|
212
205
|
value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
|
@@ -219,18 +212,18 @@ var ProNumberRange = props => {
|
|
219
212
|
}, valueProps), {}, {
|
220
213
|
min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
|
221
214
|
max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
|
222
|
-
}, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? /*#__PURE__*/_jsx(
|
215
|
+
}, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? /*#__PURE__*/_jsx(Button, {
|
223
216
|
disabled: true,
|
224
217
|
className: "range-addon-before",
|
225
218
|
children: addonBefore
|
226
|
-
}) : null, /*#__PURE__*/_jsx(
|
219
|
+
}) : null, /*#__PURE__*/_jsx(Input, {
|
227
220
|
className: classnames({
|
228
221
|
'range-split': true,
|
229
222
|
'range-split-disabled': !!disabled
|
230
223
|
}),
|
231
224
|
placeholder: split,
|
232
225
|
disabled: true
|
233
|
-
}), /*#__PURE__*/_jsx(
|
226
|
+
}), /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
|
234
227
|
className: "range-right",
|
235
228
|
value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
|
236
229
|
placeholder: `${locale.ProForm.inputPlaceholder}`,
|
@@ -242,7 +235,7 @@ var ProNumberRange = props => {
|
|
242
235
|
}, valueProps), {}, {
|
243
236
|
min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
|
244
237
|
max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
|
245
|
-
}, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? /*#__PURE__*/_jsx(
|
238
|
+
}, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? /*#__PURE__*/_jsx(Button, {
|
246
239
|
disabled: true,
|
247
240
|
className: "range-addon-after",
|
248
241
|
children: addonAfter
|
@@ -1,14 +1,9 @@
|
|
1
|
-
import "antd/es/space/style";
|
2
|
-
import _Space from "antd/es/space";
|
3
|
-
import "antd/es/checkbox/style";
|
4
|
-
import _Checkbox from "antd/es/checkbox";
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
6
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
7
|
-
import "antd/es/date-picker/style";
|
8
|
-
import _DatePicker from "antd/es/date-picker";
|
9
3
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
10
4
|
var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
|
11
5
|
import React, { useMemo, useState } from 'react';
|
6
|
+
import { DatePicker, Checkbox, Space } from 'antd';
|
12
7
|
import { omit, isFunction, uniq, isObject } from 'lodash';
|
13
8
|
import classNames from 'classnames';
|
14
9
|
import dayjs from 'dayjs';
|
@@ -46,7 +41,7 @@ var useControlled = props => {
|
|
46
41
|
// @ts-ignore
|
47
42
|
return [value, setValue];
|
48
43
|
};
|
49
|
-
var RangePicker =
|
44
|
+
var RangePicker = DatePicker.RangePicker;
|
50
45
|
var ProRangeLimit = props => {
|
51
46
|
var disabled = props.disabled,
|
52
47
|
_props$foreverText = props.foreverText,
|
@@ -191,7 +186,7 @@ var ProRangeLimit = props => {
|
|
191
186
|
if (isObject(_rest.showTime)) {
|
192
187
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
193
188
|
}
|
194
|
-
return /*#__PURE__*/_jsxs(
|
189
|
+
return /*#__PURE__*/_jsxs(Space.Compact, {
|
195
190
|
className: "pro-range-limit",
|
196
191
|
children: [/*#__PURE__*/_jsx(RangePicker, _objectSpread(_objectSpread(_objectSpread({
|
197
192
|
allowClear: true,
|
@@ -203,7 +198,7 @@ var ProRangeLimit = props => {
|
|
203
198
|
onChange: handleRangeChange
|
204
199
|
})), limit && /*#__PURE__*/_jsx("div", {
|
205
200
|
className: className,
|
206
|
-
children: /*#__PURE__*/_jsx(
|
201
|
+
children: /*#__PURE__*/_jsx(Checkbox, {
|
207
202
|
checked: _isForever,
|
208
203
|
disabled: _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
|
209
204
|
onChange: handleForeverChange,
|
@@ -1,14 +1,9 @@
|
|
1
|
-
import "antd/es/space/style";
|
2
|
-
import _Space from "antd/es/space";
|
3
|
-
import "antd/es/checkbox/style";
|
4
|
-
import _Checkbox from "antd/es/checkbox";
|
5
|
-
import "antd/es/date-picker/style";
|
6
|
-
import _DatePicker from "antd/es/date-picker";
|
7
1
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
8
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
9
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
10
4
|
var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
|
11
5
|
_excluded2 = ["mode"];
|
6
|
+
import { Checkbox, DatePicker, Space } from 'antd';
|
12
7
|
import classNames from 'classnames';
|
13
8
|
import { omit, isObject, uniq, isFunction } from 'lodash';
|
14
9
|
import dayjs from 'dayjs';
|
@@ -137,9 +132,9 @@ export var ProTimeLimit = props => {
|
|
137
132
|
'ant-input-disabled': disabled,
|
138
133
|
'forever-checkbox': true
|
139
134
|
});
|
140
|
-
return /*#__PURE__*/_jsxs(
|
135
|
+
return /*#__PURE__*/_jsxs(Space.Compact, {
|
141
136
|
className: "pro-time-limit",
|
142
|
-
children: [/*#__PURE__*/_jsx(
|
137
|
+
children: [/*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread(_objectSpread({
|
143
138
|
defaultPickerValue: dayjs(),
|
144
139
|
disabled: disabled || isForever
|
145
140
|
}, initialConfig), omit(_rest, ['placeholder'])), {}, {
|
@@ -148,7 +143,7 @@ export var ProTimeLimit = props => {
|
|
148
143
|
onChange: onChange
|
149
144
|
})), limit && /*#__PURE__*/_jsx("div", {
|
150
145
|
className: className,
|
151
|
-
children: /*#__PURE__*/_jsx(
|
146
|
+
children: /*#__PURE__*/_jsx(Checkbox, {
|
152
147
|
checked: isForever,
|
153
148
|
disabled: disabled,
|
154
149
|
onChange: foreverChange,
|
@@ -1,10 +1,7 @@
|
|
1
|
-
import "antd/es/tooltip/style";
|
2
|
-
import _Tooltip from "antd/es/tooltip";
|
3
|
-
import "antd/es/space/style";
|
4
|
-
import _Space from "antd/es/space";
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
6
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
7
3
|
var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
|
4
|
+
import { Space, Tooltip } from 'antd';
|
8
5
|
import classNames from 'classnames';
|
9
6
|
import { get } from 'lodash';
|
10
7
|
import React, { useMemo } from 'react';
|
@@ -108,7 +105,7 @@ var ChangedWrapper = props => {
|
|
108
105
|
var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
|
109
106
|
scrollFollowParent
|
110
107
|
} : {};
|
111
|
-
return /*#__PURE__*/_jsx(
|
108
|
+
return /*#__PURE__*/_jsx(Tooltip, {
|
112
109
|
open: open,
|
113
110
|
getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
|
114
111
|
classNames: {
|
@@ -116,14 +113,14 @@ var ChangedWrapper = props => {
|
|
116
113
|
},
|
117
114
|
placement: "topLeft",
|
118
115
|
autoAdjustOverflow: false,
|
119
|
-
title: /*#__PURE__*/_jsxs(
|
116
|
+
title: /*#__PURE__*/_jsxs(Space, {
|
120
117
|
direction: "vertical",
|
121
118
|
className: "changed-tooltip",
|
122
|
-
children: [/*#__PURE__*/_jsxs(
|
119
|
+
children: [/*#__PURE__*/_jsxs(Space, {
|
123
120
|
align: "start",
|
124
121
|
className: "original-value-container",
|
125
122
|
children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
|
126
|
-
}), _showEllipse && /*#__PURE__*/_jsxs(
|
123
|
+
}), _showEllipse && /*#__PURE__*/_jsxs(Space, {
|
127
124
|
className: "current-value-container",
|
128
125
|
children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
|
129
126
|
isView: true
|
@@ -1,12 +1,11 @@
|
|
1
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
2
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
3
|
-
import "antd/es/modal/style";
|
4
|
-
import _Modal from "antd/es/modal";
|
5
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
6
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
7
5
|
var _excluded = ["onChange", "children", "confirm", "otherProps"];
|
8
6
|
import { isFunction, isObject } from 'lodash';
|
9
7
|
import React from 'react';
|
8
|
+
import { Modal } from 'antd';
|
10
9
|
import ProForm from "../../index";
|
11
10
|
import { Fragment as _Fragment } from "react/jsx-runtime";
|
12
11
|
import { jsx as _jsx } from "react/jsx-runtime";
|
@@ -63,12 +62,12 @@ var ConfirmWrapper = props => {
|
|
63
62
|
onChange === null || onChange === void 0 || onChange(_value, ...other);
|
64
63
|
}
|
65
64
|
if (confirmProps === true) {
|
66
|
-
|
65
|
+
Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
|
67
66
|
onOk: () => onChange === null || onChange === void 0 ? void 0 : onChange(_value, ...other)
|
68
67
|
}));
|
69
68
|
}
|
70
69
|
if (isObject(confirmProps)) {
|
71
|
-
|
70
|
+
Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
|
72
71
|
onOk: function () {
|
73
72
|
var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
74
73
|
var _confirmProps$onOk;
|
@@ -1,17 +1,10 @@
|
|
1
|
-
import "antd/es/col/style";
|
2
|
-
import _Col from "antd/es/col";
|
3
|
-
import "antd/es/space/style";
|
4
|
-
import _Space from "antd/es/space";
|
5
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
6
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
7
|
-
import "antd/es/form/style";
|
8
|
-
import _Form from "antd/es/form";
|
9
|
-
import "antd/es/input/style";
|
10
|
-
import _Input from "antd/es/input";
|
11
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
12
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
13
5
|
var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
|
14
6
|
/* eslint-disable prefer-destructuring */
|
7
|
+
import { Col, Form, Input, Space } from 'antd';
|
15
8
|
import React, { useMemo } from 'react';
|
16
9
|
import classNames from 'classnames';
|
17
10
|
import { ReactSVG } from 'react-svg';
|
@@ -194,7 +187,7 @@ var Render = props => {
|
|
194
187
|
});
|
195
188
|
if (formItemProps.hidden === true || _show === false) {
|
196
189
|
// 为了监听shouldUpdate 必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
|
197
|
-
return /*#__PURE__*/_jsx(
|
190
|
+
return /*#__PURE__*/_jsx(Form.Item, {
|
198
191
|
name: _otherFormItemProps.name || 'proFormItemHidden',
|
199
192
|
shouldUpdate: _otherFormItemProps.shouldUpdate,
|
200
193
|
className: _className,
|
@@ -203,7 +196,7 @@ var Render = props => {
|
|
203
196
|
rules: [{
|
204
197
|
required: false
|
205
198
|
}],
|
206
|
-
children: /*#__PURE__*/_jsx(
|
199
|
+
children: /*#__PURE__*/_jsx(Input, {})
|
207
200
|
});
|
208
201
|
}
|
209
202
|
|
@@ -370,7 +363,7 @@ var Render = props => {
|
|
370
363
|
var internalItemRender = {
|
371
364
|
mark: 'pro_table_render',
|
372
365
|
render: (inputProps, doms) => /*#__PURE__*/_jsxs(_Fragment, {
|
373
|
-
children: [/*#__PURE__*/_jsx(
|
366
|
+
children: [/*#__PURE__*/_jsx(Space, {
|
374
367
|
size: 0,
|
375
368
|
style: {
|
376
369
|
marginTop: 8
|
@@ -392,7 +385,7 @@ var Render = props => {
|
|
392
385
|
},
|
393
386
|
children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
|
394
387
|
}) : null]
|
395
|
-
}), /*#__PURE__*/_jsx(
|
388
|
+
}), /*#__PURE__*/_jsx(Space, {
|
396
389
|
size: 0,
|
397
390
|
style: {
|
398
391
|
marginTop: 8
|
@@ -452,11 +445,11 @@ var Render = props => {
|
|
452
445
|
colProps = _objectSpread(_objectSpread({}, colProps), {}, {
|
453
446
|
span: lessMode ? colProps.span : 24 // 默认占一行
|
454
447
|
});
|
455
|
-
return /*#__PURE__*/_jsx(
|
448
|
+
return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
|
456
449
|
// @ts-ignore
|
457
450
|
_internalItemRender: internalItemRender,
|
458
451
|
className: _className,
|
459
|
-
children: /*#__PURE__*/_jsx(
|
452
|
+
children: /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
|
460
453
|
name: _otherFormItemProps.name
|
461
454
|
}, omit(_otherFormItemProps, ['rules'])), {}, {
|
462
455
|
children: (fields, operation, meta) => {
|
@@ -503,7 +496,7 @@ var Render = props => {
|
|
503
496
|
children: child
|
504
497
|
});
|
505
498
|
}
|
506
|
-
return /*#__PURE__*/_jsx(
|
499
|
+
return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
|
507
500
|
// @ts-ignore
|
508
501
|
_internalItemRender: internalItemRender,
|
509
502
|
className: _className,
|
@@ -514,22 +507,22 @@ var Render = props => {
|
|
514
507
|
children: [_otherFormItemProps.shouldUpdate ?
|
515
508
|
/*#__PURE__*/
|
516
509
|
// 空标签防止气泡不显示
|
517
|
-
_jsx(
|
510
|
+
_jsx(Form.Item, {
|
518
511
|
shouldUpdate: _otherFormItemProps.shouldUpdate,
|
519
512
|
noStyle: true,
|
520
513
|
children: () => renderItem()
|
521
514
|
}) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names3 = otherProps.names) !== null && _otherProps$names3 !== void 0 && _otherProps$names3.length ? otherProps.names.map(name => {
|
522
|
-
return /*#__PURE__*/_jsx(
|
515
|
+
return /*#__PURE__*/_jsx(Form.Item, {
|
523
516
|
hidden: true,
|
524
517
|
name: name,
|
525
|
-
children: /*#__PURE__*/_jsx(
|
518
|
+
children: /*#__PURE__*/_jsx(Input, {})
|
526
519
|
}, name);
|
527
520
|
}) : null]
|
528
521
|
});
|
529
522
|
if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
|
530
523
|
return FormItem;
|
531
524
|
}
|
532
|
-
return /*#__PURE__*/_jsx(
|
525
|
+
return /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
|
533
526
|
children: FormItem
|
534
527
|
}));
|
535
528
|
};
|
package/es/ProForm/index.js
CHANGED
@@ -1,16 +1,9 @@
|
|
1
|
-
import "antd/es/form/style";
|
2
|
-
import _Form from "antd/es/form";
|
3
|
-
import "antd/es/row/style";
|
4
|
-
import _Row from "antd/es/row";
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
6
|
-
import "antd/es/col/style";
|
7
|
-
import _Col from "antd/es/col";
|
8
|
-
import "antd/es/space/style";
|
9
|
-
import _Space from "antd/es/space";
|
10
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
12
4
|
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", "stopOnFirstError", "shouldUpdateDebounce"];
|
13
5
|
import { DoubleLeftOutlined } from '@ant-design/icons';
|
6
|
+
import { Col, Form, Row, Space } from 'antd';
|
14
7
|
import classnames from 'classnames';
|
15
8
|
import React, { forwardRef, useImperativeHandle, useMemo, useEffect } from 'react';
|
16
9
|
import { isObject, merge, omit } from 'lodash';
|
@@ -133,12 +126,12 @@ var ProForm = (props, ref) => {
|
|
133
126
|
return !!expand && columns.length > Number(expand) && /*#__PURE__*/_jsx("div", {
|
134
127
|
className: "expand-button",
|
135
128
|
onClick: expandHandle,
|
136
|
-
children: !openState ? /*#__PURE__*/_jsxs(
|
129
|
+
children: !openState ? /*#__PURE__*/_jsxs(Space, {
|
137
130
|
align: "center",
|
138
131
|
children: [locale.ProForm.unfold, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
|
139
132
|
className: "rotate-to-bottom"
|
140
133
|
})]
|
141
|
-
}) : /*#__PURE__*/_jsxs(
|
134
|
+
}) : /*#__PURE__*/_jsxs(Space, {
|
142
135
|
align: "center",
|
143
136
|
children: [locale.ProForm.packUp, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
|
144
137
|
className: "rotate-to-top"
|
@@ -211,9 +204,9 @@ var ProForm = (props, ref) => {
|
|
211
204
|
// 展开折叠按钮
|
212
205
|
var expandEle = expandRender();
|
213
206
|
var hasElement = footerEle || expandEle;
|
214
|
-
return hasElement ? /*#__PURE__*/_jsx(
|
207
|
+
return hasElement ? /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
|
215
208
|
className: footerCls,
|
216
|
-
children: /*#__PURE__*/_jsxs(
|
209
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
217
210
|
align: "center",
|
218
211
|
children: [footerEle, expandEle]
|
219
212
|
})
|
@@ -230,7 +223,7 @@ var ProForm = (props, ref) => {
|
|
230
223
|
otherProps.layout = otherProps.layout || 'vertical';
|
231
224
|
}
|
232
225
|
}
|
233
|
-
return /*#__PURE__*/_jsxs(
|
226
|
+
return /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
234
227
|
onKeyPress: event => {
|
235
228
|
if (!submitOnEnter) return;
|
236
229
|
if (event.key === 'Enter') {
|
@@ -244,7 +237,7 @@ var ProForm = (props, ref) => {
|
|
244
237
|
onValuesChange: handleValuesChange,
|
245
238
|
onFinish: handleFinish,
|
246
239
|
initialValues: _initialValues,
|
247
|
-
children: [/*#__PURE__*/_jsxs(
|
240
|
+
children: [/*#__PURE__*/_jsxs(Row, _objectSpread(_objectSpread({
|
248
241
|
gutter: 24
|
249
242
|
}, rowProps), {}, {
|
250
243
|
children: [/*#__PURE__*/_jsx(RenderFields, {
|
@@ -306,7 +299,7 @@ export var ProFormProvider = props => {
|
|
306
299
|
// @ts-ignore
|
307
300
|
onFormChange(formName, info);
|
308
301
|
};
|
309
|
-
return /*#__PURE__*/_jsx(
|
302
|
+
return /*#__PURE__*/_jsx(Form.Provider, {
|
310
303
|
onFormChange: onFormChange ? handleFormChange : undefined,
|
311
304
|
onFormFinish: onFormFinish,
|
312
305
|
children: children
|
@@ -2,9 +2,8 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
3
3
|
import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
|
4
4
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
5
|
-
import "antd/es/form/style";
|
6
|
-
import _Form from "antd/es/form";
|
7
5
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
6
|
+
import { Form } from 'antd';
|
8
7
|
import { useContext } from 'react';
|
9
8
|
import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from "./index";
|
10
9
|
import { handleScrollToError as handleScrollToErrorProEditTable } from "../../ProEditTable/utils/tools";
|
@@ -25,7 +24,7 @@ export var useForm = function useForm(originForm, options) {
|
|
25
24
|
|
26
25
|
// formKey全局共享逻辑
|
27
26
|
var forms = useContext(FormsContext);
|
28
|
-
var _ref2 =
|
27
|
+
var _ref2 = Form.useForm(forms[formKey] || _originForm),
|
29
28
|
_ref3 = _slicedToArray(_ref2, 1),
|
30
29
|
form = _ref3[0];
|
31
30
|
if (formKey && forms[formKey] !== form) {
|