@zat-design/sisyphus-react 3.13.8 → 3.13.9
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 +2 -2
- package/es/ProDownload/index.js +4 -3
- package/es/ProDownload/utils.js +5 -4
- package/es/ProDrawerForm/components/ProDrawer/index.js +2 -2
- package/es/ProDrawerForm/components/ProModal/index.js +2 -2
- package/es/ProEditLabel/components/RenderProForm.js +3 -3
- package/es/ProEditLabel/index.js +2 -2
- package/es/ProEditTable/components/ActionButton/index.js +9 -8
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +6 -6
- package/es/ProEditTable/components/RenderField/index.js +20 -16
- package/es/ProEditTable/index.js +10 -7
- package/es/ProEditTable/utils/config.js +3 -3
- package/es/ProEditTable/utils/diffOriginal.js +6 -4
- package/es/ProEditTable/utils/getDefaultProps.js +8 -7
- package/es/ProEditTable/utils/index.js +21 -18
- package/es/ProEditTable/utils/tools.js +32 -24
- package/es/ProEditTable/utils/useEditTableError.js +2 -2
- package/es/ProEnum/index.js +16 -11
- package/es/ProEnum/utils/eventCenter.js +2 -2
- package/es/ProEnum/utils/getEnumLabel.js +5 -4
- package/es/ProEnum/utils/index.js +3 -2
- package/es/ProForm/components/base/DatePicker/index.js +11 -8
- package/es/ProForm/components/base/Input/index.js +3 -3
- package/es/ProForm/components/base/InputNumber/index.js +6 -4
- package/es/ProForm/components/base/RangePicker/index.js +12 -8
- package/es/ProForm/components/base/Select/index.js +2 -2
- package/es/ProForm/components/base/Switch/index.js +3 -2
- package/es/ProForm/components/base/SwitchCheckbox/index.js +3 -2
- package/es/ProForm/components/base/TextArea/index.js +2 -2
- package/es/ProForm/components/combination/Container/index.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +7 -6
- package/es/ProForm/components/combination/FormList/components/BlockFields.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +5 -4
- package/es/ProForm/components/combination/FormList/index.js +2 -2
- package/es/ProForm/components/combination/FormList/utils.js +2 -2
- package/es/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/es/ProForm/components/combination/Group/index.js +2 -2
- package/es/ProForm/components/combination/Group/utils.js +6 -6
- package/es/ProForm/components/combination/ProCascader/index.js +6 -4
- package/es/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/combination/ProModalSelect/index.js +13 -10
- package/es/ProForm/components/combination/ProNumberRange/index.js +2 -2
- package/es/ProForm/components/combination/ProRangeLimit/index.js +8 -5
- package/es/ProForm/components/combination/ProTimeLimit/index.js +10 -7
- package/es/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/old/EnumSelect/index.js +3 -3
- package/es/ProForm/components/render/ChangedWrapper.js +3 -3
- package/es/ProForm/components/render/ConfirmWrapper.js +4 -3
- package/es/ProForm/components/render/Render.js +17 -13
- package/es/ProForm/components/render/RenderFields.js +9 -6
- package/es/ProForm/index.js +6 -4
- package/es/ProForm/utils/_useChanged.js +3 -3
- package/es/ProForm/utils/_useListChanged.js +6 -6
- package/es/ProForm/utils/diffOriginal.js +6 -4
- package/es/ProForm/utils/getDefaultProps.js +7 -6
- package/es/ProForm/utils/index.js +20 -15
- package/es/ProForm/utils/rulesCreator.js +4 -3
- package/es/ProForm/utils/transformNames.js +2 -2
- package/es/ProForm/utils/transformValue.js +3 -3
- package/es/ProForm/utils/useDeepCompareMemo.js +2 -2
- package/es/ProForm/utils/useRules.js +4 -3
- package/es/ProForm/utils/useShouldUpdate.js +23 -21
- package/es/ProForm/utils/useWatch.js +2 -2
- package/es/ProForm/utils/valueType.js +2 -2
- package/es/ProIcon/index.js +2 -2
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -2
- package/es/ProLayout/components/ProCollapse/index.js +2 -2
- package/es/ProLayout/components/ProHeader/index.js +12 -9
- package/es/ProLayout/utils/index.js +3 -2
- package/es/ProSelect/index.js +11 -7
- package/es/ProSelect/utils/index.js +5 -3
- package/es/ProStep/components/Item/index.js +2 -2
- package/es/ProStep/components/Listener/index.js +2 -2
- package/es/ProStep/components/Step/index.js +2 -2
- package/es/ProStep/index.js +2 -2
- package/es/ProStep/utils/index.js +4 -3
- package/es/ProStepTab/index.js +3 -3
- package/es/ProTable/components/FormatColumn/index.js +16 -12
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/es/ProTable/components/RenderColumn/index.js +2 -2
- package/es/ProTable/components/RenderSummary/index.js +3 -3
- package/es/ProTable/hooks/useAntdTable.js +15 -10
- package/es/ProTable/index.js +12 -7
- package/es/ProTable/utils/index.js +5 -4
- package/es/ProTabs/index.js +2 -2
- package/es/ProThemeTools/index.js +2 -2
- package/es/ProTree/components/ProTree.js +5 -4
- package/es/ProTree/components/ProTreeSelect/index.js +6 -5
- package/es/ProTreeModal/index.js +5 -4
- package/es/ProUpload/components/ImageRender.js +2 -2
- package/es/ProUpload/index.js +5 -4
- package/es/old/ProEditableTable/index.js +7 -7
- package/es/old/ProEditableTable/utils.js +2 -2
- package/lib/ProAction/index.js +8 -5
- package/lib/ProConfigProvider/index.js +3 -2
- package/lib/ProDownload/index.js +7 -6
- package/lib/ProDownload/utils.js +9 -7
- package/lib/ProDrawerForm/components/ProDrawer/index.js +12 -7
- package/lib/ProDrawerForm/components/ProModal/index.js +12 -7
- package/lib/ProEditLabel/components/RenderProForm.js +6 -5
- package/lib/ProEditLabel/index.js +15 -8
- package/lib/ProEditTable/components/ActionButton/index.js +15 -11
- package/lib/ProEditTable/components/RcTable/BaseTable.js +6 -3
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +3 -2
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +14 -11
- package/lib/ProEditTable/components/RenderField/index.js +25 -20
- package/lib/ProEditTable/components/RenderToolbar/index.js +3 -2
- package/lib/ProEditTable/components/Summary/index.js +8 -5
- package/lib/ProEditTable/components/Validator/index.js +7 -3
- package/lib/ProEditTable/index.js +20 -12
- package/lib/ProEditTable/utils/config.js +8 -7
- package/lib/ProEditTable/utils/diffOriginal.js +7 -4
- package/lib/ProEditTable/utils/getDefaultProps.js +8 -7
- package/lib/ProEditTable/utils/index.js +27 -21
- package/lib/ProEditTable/utils/tools.js +32 -24
- package/lib/ProEditTable/utils/useEditTableError.js +2 -2
- package/lib/ProEnum/index.js +31 -19
- package/lib/ProEnum/utils/eventCenter.js +2 -2
- package/lib/ProEnum/utils/getEnumLabel.js +5 -4
- package/lib/ProEnum/utils/index.js +3 -2
- package/lib/ProForm/components/Container.js +3 -2
- package/lib/ProForm/components/FormFooter/index.js +7 -4
- package/lib/ProForm/components/base/Checkbox/index.js +4 -3
- package/lib/ProForm/components/base/DatePicker/index.js +14 -10
- package/lib/ProForm/components/base/Input/index.js +6 -5
- package/lib/ProForm/components/base/InputNumber/index.js +12 -7
- package/lib/ProForm/components/base/Radio/index.js +4 -3
- package/lib/ProForm/components/base/RangePicker/index.js +15 -10
- package/lib/ProForm/components/base/Select/index.js +5 -4
- package/lib/ProForm/components/base/Switch/index.js +6 -4
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +6 -4
- package/lib/ProForm/components/base/TextArea/index.js +5 -4
- package/lib/ProForm/components/base/TimePicker/index.js +3 -2
- package/lib/ProForm/components/combination/Container/index.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +16 -10
- package/lib/ProForm/components/combination/FormList/components/BlockFields.js +8 -5
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/LineFields.js +3 -2
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +10 -6
- package/lib/ProForm/components/combination/FormList/index.js +5 -4
- package/lib/ProForm/components/combination/FormList/utils.js +2 -2
- package/lib/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/lib/ProForm/components/combination/Group/index.js +6 -5
- package/lib/ProForm/components/combination/Group/utils.js +10 -9
- package/lib/ProForm/components/combination/ProCascader/index.js +14 -7
- package/lib/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/lib/ProForm/components/combination/ProCombination/index.js +9 -4
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/combination/ProModalSelect/index.js +35 -19
- package/lib/ProForm/components/combination/ProNumberRange/index.js +17 -10
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +17 -9
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +19 -11
- package/lib/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/old/EnumSelect/index.js +15 -8
- package/lib/ProForm/components/old/InputRange/index.js +8 -5
- package/lib/ProForm/components/old/InputWithSuffix/index.js +4 -3
- package/lib/ProForm/components/old/ProAddress/index.js +18 -11
- package/lib/ProForm/components/old/ProCertNo/index.js +12 -7
- package/lib/ProForm/components/old/ProCertValidity/index.js +11 -6
- package/lib/ProForm/components/old/ProRangeBox/index.js +21 -12
- package/lib/ProForm/components/render/ChangedWrapper.js +11 -8
- package/lib/ProForm/components/render/ConfirmWrapper.js +8 -6
- package/lib/ProForm/components/render/Render.js +34 -23
- package/lib/ProForm/components/render/RenderFields.js +9 -6
- package/lib/ProForm/index.js +21 -12
- package/lib/ProForm/utils/_useChanged.js +7 -5
- package/lib/ProForm/utils/_useListChanged.js +10 -8
- package/lib/ProForm/utils/diffOriginal.js +7 -4
- package/lib/ProForm/utils/getDefaultProps.js +8 -6
- package/lib/ProForm/utils/index.js +20 -15
- package/lib/ProForm/utils/rulesCreator.js +4 -3
- package/lib/ProForm/utils/transformNames.js +3 -2
- package/lib/ProForm/utils/transformValue.js +3 -3
- package/lib/ProForm/utils/useDeepCompareMemo.js +3 -2
- package/lib/ProForm/utils/useForm.js +3 -2
- package/lib/ProForm/utils/useRules.js +4 -3
- package/lib/ProForm/utils/useShouldUpdate.js +23 -21
- package/lib/ProForm/utils/useWatch.js +2 -2
- package/lib/ProForm/utils/valueType.js +2 -2
- package/lib/ProIcon/index.js +13 -8
- package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +6 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +5 -4
- package/lib/ProLayout/components/ProCollapse/index.js +13 -8
- package/lib/ProLayout/components/ProFooter/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/Copy/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/index.js +37 -25
- package/lib/ProLayout/index.js +3 -2
- package/lib/ProLayout/utils/index.js +2 -2
- package/lib/ProSelect/components/AdaptiveTooltip.js +3 -2
- package/lib/ProSelect/index.js +25 -14
- package/lib/ProSelect/utils/index.js +4 -4
- package/lib/ProStep/components/Anchor/index.js +3 -2
- package/lib/ProStep/components/Item/index.js +2 -2
- package/lib/ProStep/components/Listener/index.js +2 -2
- package/lib/ProStep/components/Step/index.js +2 -2
- package/lib/ProStep/index.js +2 -2
- package/lib/ProStep/utils/index.js +4 -3
- package/lib/ProStepTab/index.js +3 -3
- package/lib/ProTable/components/FormatColumn/index.js +26 -21
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +3 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +3 -2
- package/lib/ProTable/components/RenderColumn/index.js +17 -12
- package/lib/ProTable/components/RenderSummary/index.js +8 -7
- package/lib/ProTable/components/RenderTableHeader/index.js +5 -3
- package/lib/ProTable/components/RenderTabs/index.js +6 -3
- package/lib/ProTable/components/TooltipTitle/index.js +3 -2
- package/lib/ProTable/hooks/useAntdTable.js +21 -13
- package/lib/ProTable/index.js +12 -7
- package/lib/ProTable/utils/index.js +5 -4
- package/lib/ProTabs/components/Card/index.js +11 -5
- package/lib/ProTabs/index.js +5 -4
- package/lib/ProThemeTools/component/ProTools/index.js +19 -12
- package/lib/ProThemeTools/index.js +12 -9
- package/lib/ProThemeTools/utils/index.js +3 -2
- package/lib/ProTooltip/index.js +5 -4
- package/lib/ProTree/components/AdaptiveTooltip.js +4 -2
- package/lib/ProTree/components/List.js +4 -3
- package/lib/ProTree/components/ProTree.js +17 -9
- package/lib/ProTree/components/ProTreeSelect/index.js +22 -14
- package/lib/ProTree/components/Tree.js +6 -3
- package/lib/ProTreeModal/components/Cascader.js +4 -3
- package/lib/ProTreeModal/components/List.js +14 -9
- package/lib/ProTreeModal/components/SortableItem.js +3 -2
- package/lib/ProTreeModal/components/Tree.js +4 -3
- package/lib/ProTreeModal/components/Trigger.js +11 -6
- package/lib/ProTreeModal/index.js +21 -13
- package/lib/ProUpload/components/ButtonRender.js +6 -3
- package/lib/ProUpload/components/DragRender.js +3 -2
- package/lib/ProUpload/components/FileItem.js +15 -10
- package/lib/ProUpload/components/ImageRender.js +19 -10
- package/lib/ProUpload/index.js +9 -7
- package/lib/ProViewer/index.js +9 -4
- package/lib/old/ProCertValidity/index.js +11 -6
- package/lib/old/ProEditableTable/index.js +36 -23
- package/lib/old/ProEditableTable/utils.js +35 -18
- package/package.json +2 -1
@@ -6,15 +6,24 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = ProRangeBox;
|
9
|
+
require("antd/es/col/style");
|
10
|
+
var _col = _interopRequireDefault(require("antd/es/col"));
|
11
|
+
require("antd/es/select/style");
|
12
|
+
var _select = _interopRequireDefault(require("antd/es/select"));
|
13
|
+
require("antd/es/input-number/style");
|
14
|
+
var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
|
9
15
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
16
|
+
require("antd/es/form/style");
|
17
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
18
|
+
require("antd/es/input/style");
|
19
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
10
20
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
|
-
var _antd = require("antd");
|
12
21
|
var _react = _interopRequireWildcard(require("react"));
|
13
22
|
function ProRangeBox(_ref) {
|
14
23
|
var _ref$configOption = _ref.configOption,
|
15
24
|
configOption = _ref$configOption === void 0 ? [] : _ref$configOption;
|
16
25
|
var CutMiddle = function CutMiddle() {
|
17
|
-
return (0, _jsxRuntime.jsx)(
|
26
|
+
return (0, _jsxRuntime.jsx)(_input.default, {
|
18
27
|
className: "site-input-split",
|
19
28
|
style: {
|
20
29
|
width: 40,
|
@@ -26,7 +35,7 @@ function ProRangeBox(_ref) {
|
|
26
35
|
disabled: true
|
27
36
|
});
|
28
37
|
};
|
29
|
-
return (0, _jsxRuntime.jsx)(
|
38
|
+
return (0, _jsxRuntime.jsx)(_input.default.Group, {
|
30
39
|
style: {
|
31
40
|
display: 'flex'
|
32
41
|
},
|
@@ -34,7 +43,7 @@ function ProRangeBox(_ref) {
|
|
34
43
|
children: configOption === null || configOption === void 0 ? void 0 : configOption.map(function (_item, ind) {
|
35
44
|
if (_item === null || _item === void 0 ? void 0 : _item.component) {
|
36
45
|
return (0, _jsxRuntime.jsxs)(_react.default.Fragment, {
|
37
|
-
children: [(0, _jsxRuntime.jsx)(
|
46
|
+
children: [(0, _jsxRuntime.jsx)(_form.default.Item, {
|
38
47
|
noStyle: true,
|
39
48
|
name: _item === null || _item === void 0 ? void 0 : _item.name,
|
40
49
|
rules: _item === null || _item === void 0 ? void 0 : _item.rules,
|
@@ -46,11 +55,11 @@ function ProRangeBox(_ref) {
|
|
46
55
|
}
|
47
56
|
if ((_item === null || _item === void 0 ? void 0 : _item.type) === 'inputNumber') {
|
48
57
|
return (0, _jsxRuntime.jsxs)(_react.default.Fragment, {
|
49
|
-
children: [(0, _jsxRuntime.jsx)(
|
58
|
+
children: [(0, _jsxRuntime.jsx)(_form.default.Item, {
|
50
59
|
noStyle: true,
|
51
60
|
name: _item === null || _item === void 0 ? void 0 : _item.name,
|
52
61
|
rules: _item === null || _item === void 0 ? void 0 : _item.rules,
|
53
|
-
children: (0, _jsxRuntime.jsx)(
|
62
|
+
children: (0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)({
|
54
63
|
styles: {
|
55
64
|
width: '100%'
|
56
65
|
}
|
@@ -60,11 +69,11 @@ function ProRangeBox(_ref) {
|
|
60
69
|
}
|
61
70
|
if ((_item === null || _item === void 0 ? void 0 : _item.type) === 'Select') {
|
62
71
|
return (0, _jsxRuntime.jsxs)(_react.default.Fragment, {
|
63
|
-
children: [(0, _jsxRuntime.jsx)(
|
72
|
+
children: [(0, _jsxRuntime.jsx)(_form.default.Item, {
|
64
73
|
noStyle: true,
|
65
74
|
name: _item === null || _item === void 0 ? void 0 : _item.name,
|
66
75
|
rules: _item === null || _item === void 0 ? void 0 : _item.rules,
|
67
|
-
children: (0, _jsxRuntime.jsx)(
|
76
|
+
children: (0, _jsxRuntime.jsx)(_select.default, (0, _objectSpread2.default)({
|
68
77
|
allowClear: true,
|
69
78
|
style: {
|
70
79
|
width: '100%'
|
@@ -74,12 +83,12 @@ function ProRangeBox(_ref) {
|
|
74
83
|
}, ind);
|
75
84
|
}
|
76
85
|
return (0, _jsxRuntime.jsxs)(_react.default.Fragment, {
|
77
|
-
children: [(0, _jsxRuntime.jsx)(
|
78
|
-
children: (0, _jsxRuntime.jsx)(
|
86
|
+
children: [(0, _jsxRuntime.jsx)(_col.default, {
|
87
|
+
children: (0, _jsxRuntime.jsx)(_form.default.Item, {
|
79
88
|
noStyle: true,
|
80
89
|
name: _item === null || _item === void 0 ? void 0 : _item.name,
|
81
90
|
rules: _item === null || _item === void 0 ? void 0 : _item.rules,
|
82
|
-
children: (0, _jsxRuntime.jsx)(
|
91
|
+
children: (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
83
92
|
style: {
|
84
93
|
width: '100%'
|
85
94
|
}
|
@@ -87,7 +96,7 @@ function ProRangeBox(_ref) {
|
|
87
96
|
rules: _item === null || _item === void 0 ? void 0 : _item.rules
|
88
97
|
}))
|
89
98
|
})
|
90
|
-
}, _item === null || _item === void 0 ? void 0 : _item.id), ind === 0 && (0, _jsxRuntime.jsx)(
|
99
|
+
}, _item === null || _item === void 0 ? void 0 : _item.id), ind === 0 && (0, _jsxRuntime.jsx)(_col.default, {
|
91
100
|
children: (0, _jsxRuntime.jsx)(CutMiddle, {})
|
92
101
|
})]
|
93
102
|
}, ind);
|
@@ -6,14 +6,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
|
+
require("antd/es/space/style");
|
10
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
11
|
+
require("antd/es/tooltip/style");
|
12
|
+
var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
|
9
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
10
14
|
var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
15
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
12
16
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
17
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
13
18
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
|
-
var _antd = require("antd");
|
15
19
|
var _classnames = _interopRequireDefault(require("classnames"));
|
16
|
-
var _lodash = require("lodash");
|
17
20
|
var _react = _interopRequireWildcard(require("react"));
|
18
21
|
var _diffOriginal = require("../../utils/diffOriginal");
|
19
22
|
var _ProConfigProvider = require("../../../ProConfigProvider");
|
@@ -46,8 +49,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
46
49
|
var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
|
47
50
|
var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
|
48
51
|
var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
|
49
|
-
return (0,
|
50
|
-
}) : (0,
|
52
|
+
return (0, _get2.default)(originalValues, name);
|
53
|
+
}) : (0, _get2.default)(originalValues, name);
|
51
54
|
var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
|
52
55
|
var diffType = (0, _react.useMemo)(function () {
|
53
56
|
if (!isWatch || noChange) return 'same';
|
@@ -110,7 +113,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
110
113
|
var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
|
111
114
|
scrollFollowParent: scrollFollowParent
|
112
115
|
} : {};
|
113
|
-
return (0, _jsxRuntime.jsx)(
|
116
|
+
return (0, _jsxRuntime.jsx)(_tooltip.default, {
|
114
117
|
open: open,
|
115
118
|
getPopupContainer: function getPopupContainer(trigger) {
|
116
119
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
@@ -118,14 +121,14 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
118
121
|
overlayClassName: "original-value-tooltip",
|
119
122
|
placement: "topLeft",
|
120
123
|
autoAdjustOverflow: false,
|
121
|
-
title: (0, _jsxRuntime.jsxs)(
|
124
|
+
title: (0, _jsxRuntime.jsxs)(_space.default, {
|
122
125
|
direction: "vertical",
|
123
126
|
className: "changed-tooltip",
|
124
|
-
children: [(0, _jsxRuntime.jsxs)(
|
127
|
+
children: [(0, _jsxRuntime.jsxs)(_space.default, {
|
125
128
|
align: "start",
|
126
129
|
className: "original-value-container",
|
127
130
|
children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
|
128
|
-
}), _showEllipse && (0, _jsxRuntime.jsxs)(
|
131
|
+
}), _showEllipse && (0, _jsxRuntime.jsxs)(_space.default, {
|
129
132
|
className: "current-value-container",
|
130
133
|
children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
|
131
134
|
isView: true
|
@@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
exports.default = void 0;
|
8
8
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
|
+
require("antd/es/modal/style");
|
11
|
+
var _modal = _interopRequireDefault(require("antd/es/modal"));
|
10
12
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
13
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
14
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
15
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
12
16
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
|
-
var _lodash = require("lodash");
|
14
17
|
var _react = _interopRequireDefault(require("react"));
|
15
|
-
var _antd = require("antd");
|
16
18
|
var _index = _interopRequireDefault(require("../../index"));
|
17
19
|
var _excluded = ["onChange", "children", "confirm", "otherProps"];
|
18
20
|
var defaultConfirmProps = {
|
@@ -42,7 +44,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
|
|
42
44
|
other[_key - 1] = _args2[_key];
|
43
45
|
}
|
44
46
|
_value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
|
45
|
-
if (!(0,
|
47
|
+
if (!(0, _isFunction2.default)(confirm)) {
|
46
48
|
_context2.next = 8;
|
47
49
|
break;
|
48
50
|
}
|
@@ -68,14 +70,14 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
|
|
68
70
|
onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
|
69
71
|
}
|
70
72
|
if (confirmProps === true) {
|
71
|
-
|
73
|
+
_modal.default.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
|
72
74
|
onOk: function onOk() {
|
73
75
|
return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
|
74
76
|
}
|
75
77
|
}));
|
76
78
|
}
|
77
|
-
if ((0,
|
78
|
-
|
79
|
+
if ((0, _isObject2.default)(confirmProps)) {
|
80
|
+
_modal.default.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
|
79
81
|
onOk: function () {
|
80
82
|
var _onOk = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
81
83
|
var _confirmProps$onOk;
|
@@ -6,18 +6,29 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
|
+
require("antd/es/col/style");
|
10
|
+
var _col = _interopRequireDefault(require("antd/es/col"));
|
11
|
+
require("antd/es/space/style");
|
12
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
9
13
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
15
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
16
|
+
require("antd/es/input/style");
|
17
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
18
|
+
require("antd/es/form/style");
|
19
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
12
20
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
13
21
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
14
22
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
23
|
+
var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
|
24
|
+
var _set2 = _interopRequireDefault(require("lodash/set"));
|
25
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
26
|
+
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
27
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
15
28
|
var _jsxRuntime = require("react/jsx-runtime");
|
16
|
-
var _antd = require("antd");
|
17
29
|
var _react = _interopRequireWildcard(require("react"));
|
18
30
|
var _classnames = _interopRequireDefault(require("classnames"));
|
19
31
|
var _reactSvg = require("react-svg");
|
20
|
-
var _lodash = require("lodash");
|
21
32
|
var _useShouldUpdate2 = _interopRequireDefault(require("../../utils/useShouldUpdate"));
|
22
33
|
var _index = require("../../utils/index");
|
23
34
|
var _ProConfigProvider = require("../../../ProConfigProvider");
|
@@ -131,7 +142,7 @@ var Render = function Render(props) {
|
|
131
142
|
return {};
|
132
143
|
}
|
133
144
|
var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
|
134
|
-
return (0,
|
145
|
+
return (0, _isFunction2.default)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
|
135
146
|
};
|
136
147
|
/**
|
137
148
|
* transform对象
|
@@ -171,7 +182,7 @@ var Render = function Render(props) {
|
|
171
182
|
};
|
172
183
|
}
|
173
184
|
/** 移除多余参数,防止透传给formItem报错 */
|
174
|
-
var _otherFormItemProps = (0,
|
185
|
+
var _otherFormItemProps = (0, _omit2.default)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
|
175
186
|
/**
|
176
187
|
* 最新fieldProps: 更新后的组件Props
|
177
188
|
*/
|
@@ -182,7 +193,7 @@ var Render = function Render(props) {
|
|
182
193
|
var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
|
183
194
|
if (formItemProps.hidden === true || _show === false) {
|
184
195
|
// 为了监听shouldUpdate 必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
|
185
|
-
return (0, _jsxRuntime.jsx)(
|
196
|
+
return (0, _jsxRuntime.jsx)(_form.default.Item, {
|
186
197
|
name: _otherFormItemProps.name || 'proFormItemHidden',
|
187
198
|
shouldUpdate: _otherFormItemProps.shouldUpdate,
|
188
199
|
className: _className,
|
@@ -191,7 +202,7 @@ var Render = function Render(props) {
|
|
191
202
|
rules: [{
|
192
203
|
required: false
|
193
204
|
}],
|
194
|
-
children: (0, _jsxRuntime.jsx)(
|
205
|
+
children: (0, _jsxRuntime.jsx)(_input.default, {})
|
195
206
|
});
|
196
207
|
}
|
197
208
|
/**
|
@@ -259,7 +270,7 @@ var Render = function Render(props) {
|
|
259
270
|
// FormList 和 Group场景 对比值改变的话, 回显到表单上
|
260
271
|
if (inList && changeKey === 'onFieldChange') {
|
261
272
|
var values = form.getFieldsValue();
|
262
|
-
var newValues = (0,
|
273
|
+
var newValues = (0, _set2.default)(values, _otherFormItemProps.namePath, _args[1]);
|
263
274
|
form.setFieldsValue(newValues);
|
264
275
|
}
|
265
276
|
// Group默认校验, 延时与重新setFieldValue,为了解决校验值未同步最新的问题,
|
@@ -277,7 +288,7 @@ var Render = function Render(props) {
|
|
277
288
|
}
|
278
289
|
(_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
|
279
290
|
};
|
280
|
-
var debouncedHandleChange = (0,
|
291
|
+
var debouncedHandleChange = (0, _debounce2.default)(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
|
281
292
|
var handleChange = function handleChange() {
|
282
293
|
for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
283
294
|
args[_key2] = arguments[_key2];
|
@@ -335,7 +346,7 @@ var Render = function Render(props) {
|
|
335
346
|
// 移除多余字段,group保留onFieldChange
|
336
347
|
var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
|
337
348
|
// 表单渲染 start
|
338
|
-
var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0,
|
349
|
+
var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _omit2.default)(lastComponentProps, lastComponentPropsFilter)), {}, {
|
339
350
|
// @ts-ignore
|
340
351
|
otherProps: otherProps,
|
341
352
|
onChange: handleChange,
|
@@ -348,7 +359,7 @@ var Render = function Render(props) {
|
|
348
359
|
mark: 'pro_table_render',
|
349
360
|
render: function render(inputProps, doms) {
|
350
361
|
return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
351
|
-
children: [(0, _jsxRuntime.jsx)(
|
362
|
+
children: [(0, _jsxRuntime.jsx)(_space.default, {
|
352
363
|
size: 0,
|
353
364
|
style: {
|
354
365
|
marginTop: 8
|
@@ -370,7 +381,7 @@ var Render = function Render(props) {
|
|
370
381
|
},
|
371
382
|
children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
|
372
383
|
}) : null]
|
373
|
-
}), (0, _jsxRuntime.jsx)(
|
384
|
+
}), (0, _jsxRuntime.jsx)(_space.default, {
|
374
385
|
size: 0,
|
375
386
|
style: {
|
376
387
|
marginTop: 8
|
@@ -384,7 +395,7 @@ var Render = function Render(props) {
|
|
384
395
|
if (originComponent) {
|
385
396
|
delete childProps.otherProps;
|
386
397
|
}
|
387
|
-
var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0,
|
398
|
+
var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
|
388
399
|
otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
389
400
|
show: show,
|
390
401
|
disabled: lastDisabled,
|
@@ -403,8 +414,8 @@ var Render = function Render(props) {
|
|
403
414
|
// 表单提示
|
404
415
|
if (tooltip) {
|
405
416
|
_otherFormItemProps.tooltip = {
|
406
|
-
title: (0,
|
407
|
-
icon: (0,
|
417
|
+
title: (0, _isString2.default)(tooltip) ? tooltip : tooltip.title,
|
418
|
+
icon: (0, _isString2.default)(tooltip) ? (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
|
408
419
|
className: "pro-icon-tip",
|
409
420
|
src: _tip.default
|
410
421
|
}) : tooltip.icon
|
@@ -418,15 +429,15 @@ var Render = function Render(props) {
|
|
418
429
|
colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
|
419
430
|
span: lessMode ? colProps.span : 24 // 默认占一行
|
420
431
|
});
|
421
|
-
return (0, _jsxRuntime.jsx)(
|
432
|
+
return (0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
|
422
433
|
// @ts-ignore
|
423
434
|
_internalItemRender: internalItemRender,
|
424
435
|
className: _className,
|
425
|
-
children: (0, _jsxRuntime.jsx)(
|
436
|
+
children: (0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
426
437
|
name: _otherFormItemProps.name
|
427
|
-
}, (0,
|
438
|
+
}, (0, _omit2.default)(_otherFormItemProps, ['rules'])), {}, {
|
428
439
|
children: function children(fields, operation, meta) {
|
429
|
-
return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0,
|
440
|
+
return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(lastComponentProps, lastComponentPropsFilter)), {}, {
|
430
441
|
otherProps: otherProps,
|
431
442
|
fields: fields,
|
432
443
|
operation: operation,
|
@@ -460,7 +471,7 @@ var Render = function Render(props) {
|
|
460
471
|
children: child
|
461
472
|
});
|
462
473
|
}
|
463
|
-
return (0, _jsxRuntime.jsx)(
|
474
|
+
return (0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
|
464
475
|
// @ts-ignore
|
465
476
|
_internalItemRender: internalItemRender,
|
466
477
|
className: _className,
|
@@ -471,7 +482,7 @@ var Render = function Render(props) {
|
|
471
482
|
children: [_otherFormItemProps.shouldUpdate ?
|
472
483
|
// 空标签防止气泡不显示
|
473
484
|
(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
474
|
-
children: (0, _jsxRuntime.jsx)(
|
485
|
+
children: (0, _jsxRuntime.jsx)(_form.default.Item, {
|
475
486
|
shouldUpdate: _otherFormItemProps.shouldUpdate,
|
476
487
|
noStyle: true,
|
477
488
|
children: function children() {
|
@@ -479,17 +490,17 @@ var Render = function Render(props) {
|
|
479
490
|
}
|
480
491
|
})
|
481
492
|
}) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
|
482
|
-
return (0, _jsxRuntime.jsx)(
|
493
|
+
return (0, _jsxRuntime.jsx)(_form.default.Item, {
|
483
494
|
hidden: true,
|
484
495
|
name: name,
|
485
|
-
children: (0, _jsxRuntime.jsx)(
|
496
|
+
children: (0, _jsxRuntime.jsx)(_input.default, {})
|
486
497
|
}, name);
|
487
498
|
}) : null]
|
488
499
|
});
|
489
500
|
if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
|
490
501
|
return FormItem;
|
491
502
|
}
|
492
|
-
return (0, _jsxRuntime.jsx)(
|
503
|
+
return (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
|
493
504
|
children: FormItem
|
494
505
|
}));
|
495
506
|
};
|
@@ -8,9 +8,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
exports.default = void 0;
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
11
|
+
var _isString2 = _interopRequireDefault(require("lodash/isString"));
|
12
|
+
var _union2 = _interopRequireDefault(require("lodash/union"));
|
13
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
14
|
+
var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
|
11
15
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
16
|
var _react = _interopRequireDefault(require("react"));
|
13
|
-
var _lodash = require("lodash");
|
14
17
|
var _Render = _interopRequireDefault(require("./Render"));
|
15
18
|
var _getDefaultProps = require("../../utils/getDefaultProps");
|
16
19
|
var componentMap = _interopRequireWildcard(require("../index"));
|
@@ -112,7 +115,7 @@ var RenderFields = function RenderFields(props) {
|
|
112
115
|
// FormList场景
|
113
116
|
if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && (column === null || column === void 0 ? void 0 : (_column$namePath = column.namePath) === null || _column$namePath === void 0 ? void 0 : _column$namePath.length)) {
|
114
117
|
// @ts-ignore
|
115
|
-
value = form.getFieldValue((0,
|
118
|
+
value = form.getFieldValue((0, _union2.default)(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
|
116
119
|
record = form.getFieldValue(column.namePath);
|
117
120
|
index = column === null || column === void 0 ? void 0 : column.index;
|
118
121
|
}
|
@@ -150,13 +153,13 @@ var RenderFields = function RenderFields(props) {
|
|
150
153
|
type: _type
|
151
154
|
});
|
152
155
|
var placeholderHandle = function placeholderHandle() {
|
153
|
-
var _label = (0,
|
154
|
-
var _formLabel = (0,
|
156
|
+
var _label = (0, _isString2.default)(label) ? label : '';
|
157
|
+
var _formLabel = (0, _isString2.default)(formLabel) ? formLabel : '';
|
155
158
|
return placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
|
156
159
|
};
|
157
160
|
// 表单组件Props 兼容2.0版本
|
158
161
|
var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
|
159
|
-
if ((0,
|
162
|
+
if ((0, _isBoolean2.default)(formDisabled)) {
|
160
163
|
_fieldProps.disabled = formDisabled;
|
161
164
|
}
|
162
165
|
var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
@@ -223,7 +226,7 @@ var RenderFields = function RenderFields(props) {
|
|
223
226
|
colProps: _colProps,
|
224
227
|
componentProps: componentProps,
|
225
228
|
otherProps: otherProps,
|
226
|
-
fieldProps: (0,
|
229
|
+
fieldProps: (0, _isFunction2.default)(fieldProps) ? fieldProps : null,
|
227
230
|
isSelect: _isSelect,
|
228
231
|
diffConfig: diffConfig,
|
229
232
|
onDiff: onDiff,
|
package/lib/ProForm/index.js
CHANGED
@@ -6,17 +6,26 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = exports.ProFormProvider = void 0;
|
9
|
+
require("antd/es/row/style");
|
10
|
+
var _row = _interopRequireDefault(require("antd/es/row"));
|
11
|
+
require("antd/es/form/style");
|
12
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
9
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
14
|
+
require("antd/es/col/style");
|
15
|
+
var _col = _interopRequireDefault(require("antd/es/col"));
|
10
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
11
17
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
18
|
+
require("antd/es/space/style");
|
19
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
12
20
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
13
21
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
22
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
23
|
+
var _merge2 = _interopRequireDefault(require("lodash/merge"));
|
24
|
+
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
14
25
|
var _jsxRuntime = require("react/jsx-runtime");
|
15
26
|
var _icons = require("@ant-design/icons");
|
16
|
-
var _antd = require("antd");
|
17
27
|
var _classnames2 = _interopRequireDefault(require("classnames"));
|
18
28
|
var _react = _interopRequireWildcard(require("react"));
|
19
|
-
var _lodash = require("lodash");
|
20
29
|
var _components = require("./components");
|
21
30
|
var _RenderFields = _interopRequireDefault(require("./components/render/RenderFields"));
|
22
31
|
var _ProConfigProvider = require("../ProConfigProvider");
|
@@ -132,12 +141,12 @@ var ProForm = function ProForm(props, ref) {
|
|
132
141
|
return !!expand && columns.length > Number(expand) && (0, _jsxRuntime.jsx)("div", {
|
133
142
|
className: "expand-button",
|
134
143
|
onClick: expandHandle,
|
135
|
-
children: !openState ? (0, _jsxRuntime.jsxs)(
|
144
|
+
children: !openState ? (0, _jsxRuntime.jsxs)(_space.default, {
|
136
145
|
align: "center",
|
137
146
|
children: [_locale.default.ProForm.unfold, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
|
138
147
|
className: "rotate-to-bottom"
|
139
148
|
})]
|
140
|
-
}) : (0, _jsxRuntime.jsxs)(
|
149
|
+
}) : (0, _jsxRuntime.jsxs)(_space.default, {
|
141
150
|
align: "center",
|
142
151
|
children: [_locale.default.ProForm.packUp, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
|
143
152
|
className: "rotate-to-top"
|
@@ -179,7 +188,7 @@ var ProForm = function ProForm(props, ref) {
|
|
179
188
|
}
|
180
189
|
return {};
|
181
190
|
});
|
182
|
-
onValuesChange((0, _index.filterInternalFields)(
|
191
|
+
onValuesChange((0, _index.filterInternalFields)(_merge2.default.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), optimize), form.getFieldsValue());
|
183
192
|
}
|
184
193
|
};
|
185
194
|
// 包装一层兼容 names 改变
|
@@ -201,16 +210,16 @@ var ProForm = function ProForm(props, ref) {
|
|
201
210
|
} else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
|
202
211
|
// 传入组件渲染组件
|
203
212
|
footerEle = footer;
|
204
|
-
} else if (footer === undefined || footer || (0,
|
213
|
+
} else if (footer === undefined || footer || (0, _isObject2.default)(footer)) {
|
205
214
|
// 不传或者传入对象 渲染默认
|
206
215
|
footerEle = defaultFooter(footer);
|
207
216
|
}
|
208
217
|
// 展开折叠按钮
|
209
218
|
var expandEle = expandRender();
|
210
219
|
var hasElement = footerEle || expandEle;
|
211
|
-
return hasElement ? (0, _jsxRuntime.jsx)(
|
220
|
+
return hasElement ? (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
|
212
221
|
className: footerCls,
|
213
|
-
children: (0, _jsxRuntime.jsxs)(
|
222
|
+
children: (0, _jsxRuntime.jsxs)(_space.default, {
|
214
223
|
align: "center",
|
215
224
|
children: [footerEle, expandEle]
|
216
225
|
})
|
@@ -226,7 +235,7 @@ var ProForm = function ProForm(props, ref) {
|
|
226
235
|
otherProps.layout = otherProps.layout || 'vertical';
|
227
236
|
}
|
228
237
|
}
|
229
|
-
return (0, _jsxRuntime.jsxs)(
|
238
|
+
return (0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
230
239
|
onKeyPress: function onKeyPress(event) {
|
231
240
|
if (!submitOnEnter) return;
|
232
241
|
if (event.key === 'Enter') {
|
@@ -235,7 +244,7 @@ var ProForm = function ProForm(props, ref) {
|
|
235
244
|
},
|
236
245
|
className: cls,
|
237
246
|
form: form
|
238
|
-
}, formProps), (0,
|
247
|
+
}, formProps), (0, _omit2.default)(config, ['isDiffAll'])), otherProps), {}, {
|
239
248
|
labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
|
240
249
|
onValuesChange: handleValuesChange,
|
241
250
|
onFinish: handleFinish,
|
@@ -244,7 +253,7 @@ var ProForm = function ProForm(props, ref) {
|
|
244
253
|
block: 'center',
|
245
254
|
behavior: 'smooth'
|
246
255
|
},
|
247
|
-
children: [(0, _jsxRuntime.jsxs)(
|
256
|
+
children: [(0, _jsxRuntime.jsxs)(_row.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
248
257
|
gutter: 24
|
249
258
|
}, rowProps), {}, {
|
250
259
|
children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
|
@@ -298,7 +307,7 @@ var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props)
|
|
298
307
|
// @ts-ignore
|
299
308
|
onFormChange(formName, info);
|
300
309
|
};
|
301
|
-
return (0, _jsxRuntime.jsx)(
|
310
|
+
return (0, _jsxRuntime.jsx)(_form.default.Provider, {
|
302
311
|
onFormChange: onFormChange ? handleFormChange : undefined,
|
303
312
|
onFormFinish: onFormFinish,
|
304
313
|
children: children
|
@@ -1,11 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.useChanged = void 0;
|
7
|
-
|
8
|
-
var
|
8
|
+
require("antd/es/form/style");
|
9
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
10
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
9
11
|
var _diffOriginal = require("./diffOriginal");
|
10
12
|
var useChanged = exports.useChanged = function useChanged(_ref) {
|
11
13
|
var name = _ref.name,
|
@@ -15,11 +17,11 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
|
|
15
17
|
form = _ref.form,
|
16
18
|
onDiff = _ref.onDiff;
|
17
19
|
var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
|
18
|
-
return (0,
|
19
|
-
}) : (0,
|
20
|
+
return (0, _get2.default)(originalValues, name);
|
21
|
+
}) : (0, _get2.default)(originalValues, name);
|
20
22
|
var notWatch = !onDiff && (!originalValues || originalValue === undefined);
|
21
23
|
if (notWatch) return [false];
|
22
|
-
var value =
|
24
|
+
var value = _form.default.useWatch(namesStr || name, form);
|
23
25
|
var changed = (0, _diffOriginal.diffOriginal)({
|
24
26
|
originalValue: originalValue,
|
25
27
|
value: value,
|
@@ -1,11 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.useListChanged = void 0;
|
7
|
-
|
8
|
-
var
|
8
|
+
require("antd/es/form/style");
|
9
|
+
var _form2 = _interopRequireDefault(require("antd/es/form"));
|
10
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
9
11
|
var _diffOriginal = require("./diffOriginal");
|
10
12
|
var toNamePath = function toNamePath(name) {
|
11
13
|
if (Array.isArray(name)) {
|
@@ -35,14 +37,14 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
35
37
|
if (!rowValue) return undefined;
|
36
38
|
var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
|
37
39
|
if (!keyValue) return undefined;
|
38
|
-
var originalValueList = (0,
|
40
|
+
var originalValueList = (0, _get2.default)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
|
39
41
|
var originalValueRow = originalValueList.find(function (item) {
|
40
42
|
return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
|
41
43
|
});
|
42
44
|
var originalValue;
|
43
45
|
if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
|
44
46
|
var originalNamesValue = originalNames.map(function (originalName) {
|
45
|
-
return (0,
|
47
|
+
return (0, _get2.default)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
|
46
48
|
});
|
47
49
|
// 有可能出现数组中全是undefined的情况 视为没有值
|
48
50
|
var fillUndefined = originalNamesValue.every(function (valItem) {
|
@@ -50,14 +52,14 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
50
52
|
});
|
51
53
|
originalValue = fillUndefined ? undefined : originalNamesValue;
|
52
54
|
} else {
|
53
|
-
originalValue = (0,
|
55
|
+
originalValue = (0, _get2.default)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
|
54
56
|
}
|
55
57
|
return originalValue;
|
56
58
|
}
|
57
59
|
// 这个方法是给editTable专用的 暂时不存在不传rowKey的情况
|
58
60
|
return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
|
59
|
-
return (0,
|
60
|
-
}) : (0,
|
61
|
+
return (0, _get2.default)(originalValues, originalName);
|
62
|
+
}) : (0, _get2.default)(originalValues, originalName);
|
61
63
|
};
|
62
64
|
var useListChanged = exports.useListChanged = function useListChanged(params) {
|
63
65
|
var name = params.name,
|
@@ -86,7 +88,7 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
|
|
86
88
|
var noChange = !onDiff && (!originalValues || originalValue === undefined);
|
87
89
|
var _form = form;
|
88
90
|
if (notWatch || noChange) return [false];
|
89
|
-
var value =
|
91
|
+
var value = _form2.default.useWatch(namePath, _form);
|
90
92
|
var changed = (0, _diffOriginal.diffOriginal)({
|
91
93
|
value: value,
|
92
94
|
originalValue: originalValue,
|