@zat-design/sisyphus-react 3.13.7 → 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/components/CheckModalContent/index.css +22 -0
- package/es/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/es/ProAction/components/CheckModalContent/index.js +38 -0
- package/es/ProAction/components/CheckModalContent/index.less +28 -0
- package/es/ProAction/index.js +39 -41
- package/es/ProAction/index.less +5 -6
- package/es/ProAction/propsType.d.ts +8 -6
- 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/components/CheckModalContent/index.css +22 -0
- package/lib/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/lib/ProAction/components/CheckModalContent/index.js +45 -0
- package/lib/ProAction/components/CheckModalContent/index.less +28 -0
- package/lib/ProAction/index.js +45 -44
- package/lib/ProAction/index.less +5 -6
- package/lib/ProAction/propsType.d.ts +8 -6
- 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
@@ -1,8 +1,9 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
3
|
+
import _isEqual from "lodash/isEqual";
|
4
|
+
import _cloneDeep from "lodash/cloneDeep";
|
3
5
|
/* eslint-disable no-lonely-if */
|
4
6
|
import { useRef } from 'react';
|
5
|
-
import { cloneDeep, isEqual } from 'lodash';
|
6
7
|
import { useDeepCompareMemo } from '../../../../utils/useDeepCompareMemo';
|
7
8
|
import { difference } from '../../../../../ProEditTable/utils/tools';
|
8
9
|
import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from '../utils';
|
@@ -103,7 +104,7 @@ export var useTransformColumns = function useTransformColumns(params) {
|
|
103
104
|
}
|
104
105
|
internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
|
105
106
|
var values = form.getFieldValue(namePath);
|
106
|
-
var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ?
|
107
|
+
var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? _cloneDeep(values) : undefined;
|
107
108
|
onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
|
108
109
|
onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
|
109
110
|
index: outerIndex,
|
@@ -112,7 +113,7 @@ export var useTransformColumns = function useTransformColumns(params) {
|
|
112
113
|
option: args === null || args === void 0 ? void 0 : args[1]
|
113
114
|
});
|
114
115
|
// 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
|
115
|
-
if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !
|
116
|
+
if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !_isEqual(originRow, values)) {
|
116
117
|
var _Object$keys, _Object$keys$map;
|
117
118
|
form.setFieldValue(namePath, values);
|
118
119
|
var diff = difference(originRow, values) || {};
|
@@ -3,9 +3,9 @@ import "antd/es/space/style";
|
|
3
3
|
import _Space from "antd/es/space";
|
4
4
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
5
5
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
6
|
+
import _omit from "lodash/omit";
|
6
7
|
import { jsx as _jsx } from "react/jsx-runtime";
|
7
8
|
import React from 'react';
|
8
|
-
import { omit } from 'lodash';
|
9
9
|
import classnames from 'classnames';
|
10
10
|
import { insertSeparator } from './utils';
|
11
11
|
import { useTransformColumns } from './hooks';
|
@@ -89,7 +89,7 @@ var Group = function Group(props) {
|
|
89
89
|
})
|
90
90
|
}) : _jsx(_Space, _objectSpread(_objectSpread({
|
91
91
|
align: "start"
|
92
|
-
},
|
92
|
+
}, _omit(space, ['separator', 'compact'])), {}, {
|
93
93
|
children: columns.map(function (column, index) {
|
94
94
|
column.otherProps = otherProps;
|
95
95
|
if (column === null || column === void 0 ? void 0 : column.separator) {
|
@@ -2,8 +2,8 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
2
2
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
3
3
|
import "antd/es/button/style";
|
4
4
|
import _Button from "antd/es/button";
|
5
|
+
import _isFunction from "lodash/isFunction";
|
5
6
|
import { jsx as _jsx } from "react/jsx-runtime";
|
6
|
-
import { isFunction } from 'lodash';
|
7
7
|
import { validate } from '@zat-design/utils';
|
8
8
|
import valueTypeMap from '../../../utils/valueType';
|
9
9
|
/**
|
@@ -117,27 +117,27 @@ export var getReactiveProps = function getReactiveProps(params) {
|
|
117
117
|
fieldProps = params.fieldProps,
|
118
118
|
desensitization = params.desensitization;
|
119
119
|
var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
|
120
|
-
var _disabled =
|
120
|
+
var _disabled = _isFunction(disabled) ? disabled(values, {
|
121
121
|
form: form,
|
122
122
|
index: index,
|
123
123
|
namePath: namePath
|
124
124
|
}) : disabled;
|
125
|
-
var _show =
|
125
|
+
var _show = _isFunction(show) ? show(values, {
|
126
126
|
form: form,
|
127
127
|
index: index,
|
128
128
|
namePath: namePath
|
129
129
|
}) : show;
|
130
|
-
var _component =
|
130
|
+
var _component = _isFunction(component) ? component(values, {
|
131
131
|
form: form,
|
132
132
|
index: index,
|
133
133
|
namePath: namePath
|
134
134
|
}) : component;
|
135
|
-
var _fieldProps =
|
135
|
+
var _fieldProps = _isFunction(fieldProps) ? fieldProps(values, {
|
136
136
|
form: form,
|
137
137
|
index: index,
|
138
138
|
namePath: namePath
|
139
139
|
}) : fieldProps;
|
140
|
-
var _desensitization =
|
140
|
+
var _desensitization = _isFunction(desensitization) ? desensitization(values, {
|
141
141
|
form: form,
|
142
142
|
index: index,
|
143
143
|
namePath: namePath
|
@@ -11,10 +11,12 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
11
11
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
12
12
|
import "antd/es/typography/style";
|
13
13
|
import _Typography from "antd/es/typography";
|
14
|
+
import _isBoolean from "lodash/isBoolean";
|
15
|
+
import _find2 from "lodash/find";
|
16
|
+
import _omit from "lodash/omit";
|
14
17
|
var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
|
15
18
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
16
19
|
import { useEffect, useState, memo, useMemo } from 'react';
|
17
|
-
import { omit, find as _find, isBoolean } from 'lodash';
|
18
20
|
import { transformDataName } from './utils/index';
|
19
21
|
import { useProConfig } from '../../../../ProConfigProvider';
|
20
22
|
import Input from '../../base/Input';
|
@@ -113,7 +115,7 @@ var ProCascader = function ProCascader(props) {
|
|
113
115
|
return result;
|
114
116
|
}, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
|
115
117
|
var lastDisabled = useMemo(function () {
|
116
|
-
if (
|
118
|
+
if (_isBoolean(disabled) || disabled === undefined) {
|
117
119
|
return [disabled, disabled];
|
118
120
|
}
|
119
121
|
return disabled;
|
@@ -233,7 +235,7 @@ var ProCascader = function ProCascader(props) {
|
|
233
235
|
}
|
234
236
|
// 尝试在当前层级的选项中查找匹配的 _value
|
235
237
|
var currentValue = _value[0];
|
236
|
-
var foundOption =
|
238
|
+
var foundOption = _find2(options, {
|
237
239
|
value: currentValue
|
238
240
|
});
|
239
241
|
if (foundOption) {
|
@@ -285,7 +287,7 @@ var ProCascader = function ProCascader(props) {
|
|
285
287
|
getPopupContainer: function getPopupContainer(trigger) {
|
286
288
|
return scrollFollowParent ? trigger.parentElement : document.body;
|
287
289
|
}
|
288
|
-
},
|
290
|
+
}, _omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
|
289
291
|
title: detail,
|
290
292
|
children: _jsx("span", {
|
291
293
|
className: "pro-address-detail",
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
3
|
+
import _omit from "lodash/omit";
|
3
4
|
var _excluded = ["label", "value", "children"];
|
4
|
-
import { omit } from 'lodash';
|
5
5
|
export var transformDataName = function transformDataName(dataSource, fieldNames) {
|
6
6
|
var label = fieldNames.label,
|
7
7
|
value = fieldNames.value,
|
@@ -22,7 +22,7 @@ export var transformDataName = function transformDataName(dataSource, fieldNames
|
|
22
22
|
if (children && Array.isArray(node[children])) {
|
23
23
|
newNode.children = node[children].map(transformNode);
|
24
24
|
}
|
25
|
-
return _objectSpread(_objectSpread({}, newNode),
|
25
|
+
return _objectSpread(_objectSpread({}, newNode), _omit(node, Object.values(fieldNames)));
|
26
26
|
}
|
27
27
|
var transformData = function transformData(data) {
|
28
28
|
return data.map(transformNode);
|
@@ -2,8 +2,8 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
4
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
5
|
+
import _isEqual from "lodash/isEqual";
|
5
6
|
import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
|
6
|
-
import { isEqual } from 'lodash';
|
7
7
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
8
8
|
import locale, { formatMessage } from '../../../../../locale';
|
9
9
|
var defaultPage = {
|
@@ -79,7 +79,7 @@ export function useRequestList(service, options, useRequestOptions) {
|
|
79
79
|
}),
|
80
80
|
queryList = _useDebounceFn.run;
|
81
81
|
useEffect(function () {
|
82
|
-
if (prevParams && !
|
82
|
+
if (prevParams && !_isEqual(prevParams, params)) {
|
83
83
|
queryList();
|
84
84
|
}
|
85
85
|
}, [params, prevParams, queryList]);
|
@@ -91,7 +91,7 @@ export function useRequestList(service, options, useRequestOptions) {
|
|
91
91
|
});
|
92
92
|
}, [onPageChange]);
|
93
93
|
var onSearch = useCallback(function (values) {
|
94
|
-
if (!
|
94
|
+
if (!_isEqual(searchValues, values)) {
|
95
95
|
onChange(defaultPage.pageNum, defaultPage.pageSize);
|
96
96
|
setSearchValues(values);
|
97
97
|
}
|
@@ -19,13 +19,16 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
19
19
|
import "antd/es/form/style";
|
20
20
|
import _Form from "antd/es/form";
|
21
21
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
22
|
+
import _isFunction from "lodash/isFunction";
|
23
|
+
import _isEqual from "lodash/isEqual";
|
24
|
+
import _isArray from "lodash/isArray";
|
25
|
+
import _debounce from "lodash/debounce";
|
22
26
|
var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
|
23
27
|
_excluded2 = ["onOk"],
|
24
28
|
_excluded3 = ["rowKey", "columns", "rowSelection"];
|
25
29
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
26
30
|
import { SearchOutlined } from '@ant-design/icons';
|
27
31
|
import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
|
28
|
-
import { debounce, isArray, isEqual, isFunction } from 'lodash';
|
29
32
|
import classNames from 'classnames';
|
30
33
|
import { ReactSVG } from 'react-svg';
|
31
34
|
import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
|
@@ -206,7 +209,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
206
209
|
label: data[labelKey]
|
207
210
|
}));
|
208
211
|
}
|
209
|
-
return
|
212
|
+
return _isArray(data) ? data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
|
210
213
|
return handleFormat(_objectSpread(_objectSpread({}, item), {}, {
|
211
214
|
value: item[valueKey],
|
212
215
|
label: item[labelKey]
|
@@ -383,7 +386,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
383
386
|
// 更新内部展示值
|
384
387
|
setState({
|
385
388
|
_value: record,
|
386
|
-
options:
|
389
|
+
options: _isArray(record) ? record : [record]
|
387
390
|
});
|
388
391
|
handleClose();
|
389
392
|
}
|
@@ -638,7 +641,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
638
641
|
nextState.selectedRowKeys = [getRowKey(value)];
|
639
642
|
nextState.selectedRows = [value];
|
640
643
|
}
|
641
|
-
if (
|
644
|
+
if (_isArray(value)) {
|
642
645
|
nextState.selectedRowKeys = value.map(function (item) {
|
643
646
|
return getRowKey(item);
|
644
647
|
});
|
@@ -665,7 +668,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
665
668
|
}
|
666
669
|
}, [JSON.stringify(value), visible, isInit]);
|
667
670
|
useDebounceEffect(function () {
|
668
|
-
if (value && !visible && readOnly && (!
|
671
|
+
if (value && !visible && readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
|
669
672
|
var _options$some;
|
670
673
|
preValue.current = value;
|
671
674
|
var _data3 = labelInValue ? value[valueKey] : value;
|
@@ -699,7 +702,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
699
702
|
} : queryBean;
|
700
703
|
var nextParams = transformParams ? transformParams(params) : params;
|
701
704
|
// 减少请求条件一致时,且请求过时,focus的重复请求
|
702
|
-
if (!
|
705
|
+
if (!_isEqual(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
|
703
706
|
run(nextParams); // 触发 run 请求
|
704
707
|
defaultParamsRef.current = queryBean; // 更新缓存
|
705
708
|
}
|
@@ -708,7 +711,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
708
711
|
});
|
709
712
|
}
|
710
713
|
};
|
711
|
-
var handleSelectSearch =
|
714
|
+
var handleSelectSearch = _debounce(function (val) {
|
712
715
|
if (useRequest) {
|
713
716
|
var queryBean = _objectSpread(_objectSpread({}, defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
|
714
717
|
var params = withPagination ? {
|
@@ -733,14 +736,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
733
736
|
}
|
734
737
|
}
|
735
738
|
if (!readOnly) {
|
736
|
-
if (labelInValue && _value && !
|
739
|
+
if (labelInValue && _value && !_isEqual(value, _value)) {
|
737
740
|
setState({
|
738
741
|
_value: value,
|
739
742
|
selectedRowKeys: [],
|
740
743
|
selectedRows: []
|
741
744
|
});
|
742
745
|
}
|
743
|
-
if (!labelInValue && !
|
746
|
+
if (!labelInValue && !_isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
|
744
747
|
setState({
|
745
748
|
_value: value,
|
746
749
|
selectedRowKeys: [],
|
@@ -841,7 +844,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
841
844
|
if (!((_formColumns$2 = formColumns[0]) === null || _formColumns$2 === void 0 ? void 0 : _formColumns$2.fieldProps)) {
|
842
845
|
formColumns[0].fieldProps = {};
|
843
846
|
}
|
844
|
-
if (!
|
847
|
+
if (!_isFunction(formColumns[0].fieldProps) && !(formColumns === null || formColumns === void 0 ? void 0 : (_formColumns$3 = formColumns[0]) === null || _formColumns$3 === void 0 ? void 0 : (_formColumns$3$fieldP = _formColumns$3.fieldProps) === null || _formColumns$3$fieldP === void 0 ? void 0 : _formColumns$3$fieldP.suffix)) {
|
845
848
|
formColumns[0].fieldProps.suffix = _jsx(SearchOutlined, {
|
846
849
|
onClick: handleSearch
|
847
850
|
});
|
@@ -9,9 +9,9 @@ import "antd/es/space/style";
|
|
9
9
|
import _Space from "antd/es/space";
|
10
10
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
11
11
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
12
|
+
import _isEmpty from "lodash/isEmpty";
|
12
13
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
13
14
|
import { useSetState, useDeepCompareEffect } from 'ahooks';
|
14
|
-
import { isEmpty } from 'lodash';
|
15
15
|
import classnames from 'classnames';
|
16
16
|
import { tools } from '@zat-design/utils';
|
17
17
|
import Container from '../../Container';
|
@@ -95,7 +95,7 @@ var ProNumberRange = function ProNumberRange(props) {
|
|
95
95
|
});
|
96
96
|
// 查看模式
|
97
97
|
if (isView || props.isView) {
|
98
|
-
if (
|
98
|
+
if (_isEmpty(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
|
99
99
|
return typeof item !== 'number';
|
100
100
|
}))) {
|
101
101
|
return viewEmpty;
|
@@ -8,10 +8,13 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
|
|
8
8
|
import "antd/es/date-picker/style";
|
9
9
|
import _DatePicker from "antd/es/date-picker";
|
10
10
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
|
+
import _isObject from "lodash/isObject";
|
12
|
+
import _uniq from "lodash/uniq";
|
13
|
+
import _isFunction from "lodash/isFunction";
|
14
|
+
import _omit from "lodash/omit";
|
11
15
|
var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
|
12
16
|
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
13
17
|
import { useMemo, useState } from 'react';
|
14
|
-
import { omit, isFunction, uniq, isObject } from 'lodash';
|
15
18
|
import classNames from 'classnames';
|
16
19
|
import moment from 'moment';
|
17
20
|
import { useProConfig } from '../../../../ProConfigProvider';
|
@@ -95,10 +98,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
95
98
|
}
|
96
99
|
var _viewFormat = Array.isArray(format) ? format[0] : format;
|
97
100
|
var tempFormat = Array.isArray(format) ? format : [format];
|
98
|
-
if (
|
101
|
+
if (_isFunction(format)) {
|
99
102
|
tempFormat = [];
|
100
103
|
}
|
101
|
-
var _format =
|
104
|
+
var _format = _uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
|
102
105
|
return !!formatKey;
|
103
106
|
});
|
104
107
|
var _defaultShowTime = {
|
@@ -162,7 +165,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
162
165
|
if (_rest.showTime === true) {
|
163
166
|
_rest.showTime = _objectSpread({}, _defaultShowTime);
|
164
167
|
}
|
165
|
-
if (
|
168
|
+
if (_isObject(_rest.showTime)) {
|
166
169
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
167
170
|
}
|
168
171
|
return _jsxs(_Input.Group, {
|
@@ -172,7 +175,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
|
|
172
175
|
allowClear: true,
|
173
176
|
disabled: [_disabled === null || _disabled === void 0 ? void 0 : _disabled[0], (_disabled === null || _disabled === void 0 ? void 0 : _disabled[1]) || _isForever],
|
174
177
|
defaultPickerValue: defaultPickerValue
|
175
|
-
}, initialConfig),
|
178
|
+
}, initialConfig), _omit(_rest, ['placeholder', 'separator'])), {}, {
|
176
179
|
format: _format,
|
177
180
|
value: value,
|
178
181
|
onChange: handleRangeChange
|
@@ -8,11 +8,14 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
8
8
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
9
9
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
10
10
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
11
|
+
import _isFunction from "lodash/isFunction";
|
12
|
+
import _uniq from "lodash/uniq";
|
13
|
+
import _isObject from "lodash/isObject";
|
14
|
+
import _omit from "lodash/omit";
|
11
15
|
var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
|
12
16
|
_excluded2 = ["mode"];
|
13
17
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
14
18
|
import classNames from 'classnames';
|
15
|
-
import { omit, isObject, uniq, isFunction } from 'lodash';
|
16
19
|
import moment from 'moment';
|
17
20
|
import { useMemo } from 'react';
|
18
21
|
import { useProConfig } from '../../../../ProConfigProvider';
|
@@ -44,10 +47,10 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
44
47
|
var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
|
45
48
|
var _viewFormat = Array.isArray(format) ? format[0] : format;
|
46
49
|
var tempFormat = Array.isArray(format) ? format : [format];
|
47
|
-
if (
|
50
|
+
if (_isFunction(format)) {
|
48
51
|
tempFormat = [];
|
49
52
|
}
|
50
|
-
var _format =
|
53
|
+
var _format = _uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
|
51
54
|
return !!formatKey;
|
52
55
|
});
|
53
56
|
// dateTime模式下默认开启time选择
|
@@ -80,7 +83,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
80
83
|
value = _useControlled2[0],
|
81
84
|
onChange = _useControlled2[1];
|
82
85
|
var isForever = useMemo(function () {
|
83
|
-
if (
|
86
|
+
if (_isObject(value)) {
|
84
87
|
return foreverMoment.format(format) === value.format(format);
|
85
88
|
}
|
86
89
|
return false;
|
@@ -100,7 +103,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
100
103
|
children: foreverText
|
101
104
|
});
|
102
105
|
}
|
103
|
-
if (
|
106
|
+
if (_isObject(value)) {
|
104
107
|
return _jsx(Container, {
|
105
108
|
viewEmpty: viewEmpty,
|
106
109
|
children: value.format(_viewFormat)
|
@@ -114,7 +117,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
114
117
|
if (_rest.showTime === true) {
|
115
118
|
_rest.showTime = _objectSpread({}, _defaultShowTime);
|
116
119
|
}
|
117
|
-
if (
|
120
|
+
if (_isObject(_rest.showTime)) {
|
118
121
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
119
122
|
}
|
120
123
|
var className = classNames({
|
@@ -127,7 +130,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
|
|
127
130
|
className: "pro-time-limit",
|
128
131
|
children: [_jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({
|
129
132
|
disabled: disabled || isForever
|
130
|
-
}, initialConfig),
|
133
|
+
}, initialConfig), _omit(_rest, ['placeholder'])), {}, {
|
131
134
|
format: _format,
|
132
135
|
value: value,
|
133
136
|
onChange: onChange
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
2
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
3
3
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
4
|
+
import _isEqual from "lodash/isEqual";
|
4
5
|
import { usePrevious, useRequest } from 'ahooks';
|
5
|
-
import { isEqual } from 'lodash';
|
6
6
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
7
7
|
var defaultTransform = function defaultTransform(data) {
|
8
8
|
return data === null || data === void 0 ? void 0 : data.list;
|
@@ -57,7 +57,7 @@ export default function useRequestList(service, options, useRequestOptions) {
|
|
57
57
|
var prevParams = usePrevious(params);
|
58
58
|
var prevSearchValues = usePrevious(searchValues);
|
59
59
|
useEffect(function () {
|
60
|
-
if (prevParams && !
|
60
|
+
if (prevParams && !_isEqual(prevParams, params)) {
|
61
61
|
// @ts-ignore
|
62
62
|
run(params);
|
63
63
|
}
|
@@ -70,7 +70,7 @@ export default function useRequestList(service, options, useRequestOptions) {
|
|
70
70
|
});
|
71
71
|
}, [onPageChange]);
|
72
72
|
var onSearch = useCallback(function (values) {
|
73
|
-
if (!
|
73
|
+
if (!_isEqual(prevSearchValues, values)) {
|
74
74
|
setSearchValues(function (p) {
|
75
75
|
return _objectSpread(_objectSpread(_objectSpread({}, p), values), {}, {
|
76
76
|
timestamp: Date.now()
|
@@ -9,13 +9,13 @@ import "antd/es/form/style";
|
|
9
9
|
import _Form from "antd/es/form";
|
10
10
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
11
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
12
|
+
import _cloneDeep from "lodash/cloneDeep";
|
12
13
|
var _excluded = ["value", "onChange", "disabled", "readOnly", "suffix", "handleFormat", "configOption", "proformmode"],
|
13
14
|
_excluded2 = ["title", "onOk"],
|
14
15
|
_excluded3 = ["rowKey", "columns"];
|
15
16
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
16
17
|
import { CloseOutlined } from '@ant-design/icons';
|
17
18
|
import { useSetState } from 'ahooks';
|
18
|
-
import { cloneDeep } from 'lodash';
|
19
19
|
import { forwardRef, useEffect } from 'react';
|
20
20
|
import { ReactSVG } from 'react-svg';
|
21
21
|
import ProForm from '../../../../ProForm';
|
@@ -137,8 +137,8 @@ var EnumSelect = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
137
137
|
// 点击行进行勾选
|
138
138
|
var handleClickRow = function handleClickRow(record) {
|
139
139
|
var selectedValue = record[rowKey];
|
140
|
-
var tempSelectedRows =
|
141
|
-
var tempSelectedRowKeys =
|
140
|
+
var tempSelectedRows = _cloneDeep(state.selectedRows);
|
141
|
+
var tempSelectedRowKeys = _cloneDeep(state.selectedRowKeys);
|
142
142
|
if (isMultiple) {
|
143
143
|
var rowIndex = tempSelectedRows.findIndex(function (item) {
|
144
144
|
return item[rowKey] === selectedValue;
|
@@ -6,10 +6,10 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
8
8
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
9
|
+
import _get from "lodash/get";
|
9
10
|
var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
|
10
11
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
11
12
|
import classNames from 'classnames';
|
12
|
-
import { get } from 'lodash';
|
13
13
|
import React, { useMemo } from 'react';
|
14
14
|
import { diffOriginal } from '../../utils/diffOriginal';
|
15
15
|
import { useProConfig } from '../../../ProConfigProvider';
|
@@ -41,8 +41,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
|
|
41
41
|
var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
|
42
42
|
var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
|
43
43
|
var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
|
44
|
-
return
|
45
|
-
}) :
|
44
|
+
return _get(originalValues, name);
|
45
|
+
}) : _get(originalValues, name);
|
46
46
|
var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
|
47
47
|
var diffType = useMemo(function () {
|
48
48
|
if (!isWatch || noChange) return 'same';
|
@@ -4,9 +4,10 @@ import "antd/es/modal/style";
|
|
4
4
|
import _Modal from "antd/es/modal";
|
5
5
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
6
6
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
7
|
+
import _isObject from "lodash/isObject";
|
8
|
+
import _isFunction from "lodash/isFunction";
|
7
9
|
var _excluded = ["onChange", "children", "confirm", "otherProps"];
|
8
10
|
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
9
|
-
import { isFunction, isObject } from 'lodash';
|
10
11
|
import React from 'react';
|
11
12
|
import ProForm from '../../index';
|
12
13
|
var defaultConfirmProps = {
|
@@ -36,7 +37,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
|
|
36
37
|
other[_key - 1] = _args2[_key];
|
37
38
|
}
|
38
39
|
_value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
|
39
|
-
if (!
|
40
|
+
if (!_isFunction(confirm)) {
|
40
41
|
_context2.next = 8;
|
41
42
|
break;
|
42
43
|
}
|
@@ -68,7 +69,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
|
|
68
69
|
}
|
69
70
|
}));
|
70
71
|
}
|
71
|
-
if (
|
72
|
+
if (_isObject(confirmProps)) {
|
72
73
|
_Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
|
73
74
|
onOk: function () {
|
74
75
|
var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
@@ -12,6 +12,11 @@ import _Form from "antd/es/form";
|
|
12
12
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
13
13
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
14
14
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
15
|
+
import _debounce from "lodash/debounce";
|
16
|
+
import _set from "lodash/set";
|
17
|
+
import _omit from "lodash/omit";
|
18
|
+
import _isString from "lodash/isString";
|
19
|
+
import _isFunction from "lodash/isFunction";
|
15
20
|
var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
|
16
21
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
17
22
|
/* eslint-disable prefer-destructuring */
|
@@ -19,7 +24,6 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
19
24
|
import React, { useMemo } from 'react';
|
20
25
|
import classNames from 'classnames';
|
21
26
|
import { ReactSVG } from 'react-svg';
|
22
|
-
import { isFunction, isString, omit, set, debounce } from 'lodash';
|
23
27
|
import useShouldUpdate from '../../utils/useShouldUpdate';
|
24
28
|
import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../utils/index';
|
25
29
|
import { useProConfig } from '../../../ProConfigProvider';
|
@@ -131,7 +135,7 @@ var Render = function Render(props) {
|
|
131
135
|
return {};
|
132
136
|
}
|
133
137
|
var params = _objectSpread(_objectSpread({}, otherProps), otherFormItemProps);
|
134
|
-
return
|
138
|
+
return _isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
|
135
139
|
};
|
136
140
|
/**
|
137
141
|
* transform对象
|
@@ -171,7 +175,7 @@ var Render = function Render(props) {
|
|
171
175
|
};
|
172
176
|
}
|
173
177
|
/** 移除多余参数,防止透传给formItem报错 */
|
174
|
-
var _otherFormItemProps =
|
178
|
+
var _otherFormItemProps = _omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
|
175
179
|
/**
|
176
180
|
* 最新fieldProps: 更新后的组件Props
|
177
181
|
*/
|
@@ -259,7 +263,7 @@ var Render = function Render(props) {
|
|
259
263
|
// FormList 和 Group场景 对比值改变的话, 回显到表单上
|
260
264
|
if (inList && changeKey === 'onFieldChange') {
|
261
265
|
var values = form.getFieldsValue();
|
262
|
-
var newValues =
|
266
|
+
var newValues = _set(values, _otherFormItemProps.namePath, _args[1]);
|
263
267
|
form.setFieldsValue(newValues);
|
264
268
|
}
|
265
269
|
// Group默认校验, 延时与重新setFieldValue,为了解决校验值未同步最新的问题,
|
@@ -277,7 +281,7 @@ var Render = function Render(props) {
|
|
277
281
|
}
|
278
282
|
(_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
|
279
283
|
};
|
280
|
-
var debouncedHandleChange =
|
284
|
+
var debouncedHandleChange = _debounce(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
|
281
285
|
var handleChange = function handleChange() {
|
282
286
|
for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
283
287
|
args[_key2] = arguments[_key2];
|
@@ -335,7 +339,7 @@ var Render = function Render(props) {
|
|
335
339
|
// 移除多余字段,group保留onFieldChange
|
336
340
|
var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
|
337
341
|
// 表单渲染 start
|
338
|
-
var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props),
|
342
|
+
var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), _omit(lastComponentProps, lastComponentPropsFilter)), {}, {
|
339
343
|
// @ts-ignore
|
340
344
|
otherProps: otherProps,
|
341
345
|
onChange: handleChange,
|
@@ -384,7 +388,7 @@ var Render = function Render(props) {
|
|
384
388
|
if (originComponent) {
|
385
389
|
delete childProps.otherProps;
|
386
390
|
}
|
387
|
-
var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({},
|
391
|
+
var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, _omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
|
388
392
|
otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
|
389
393
|
show: show,
|
390
394
|
disabled: lastDisabled,
|
@@ -403,8 +407,8 @@ var Render = function Render(props) {
|
|
403
407
|
// 表单提示
|
404
408
|
if (tooltip) {
|
405
409
|
_otherFormItemProps.tooltip = {
|
406
|
-
title:
|
407
|
-
icon:
|
410
|
+
title: _isString(tooltip) ? tooltip : tooltip.title,
|
411
|
+
icon: _isString(tooltip) ? _jsx(ReactSVG, {
|
408
412
|
className: "pro-icon-tip",
|
409
413
|
src: tipSvg
|
410
414
|
}) : tooltip.icon
|
@@ -418,15 +422,15 @@ var Render = function Render(props) {
|
|
418
422
|
colProps = _objectSpread(_objectSpread({}, colProps), {}, {
|
419
423
|
span: lessMode ? colProps.span : 24 // 默认占一行
|
420
424
|
});
|
421
|
-
return _jsx(_Form.Item, _objectSpread(_objectSpread({},
|
425
|
+
return _jsx(_Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
|
422
426
|
// @ts-ignore
|
423
427
|
_internalItemRender: internalItemRender,
|
424
428
|
className: _className,
|
425
429
|
children: _jsx(_Form.List, _objectSpread(_objectSpread({
|
426
430
|
name: _otherFormItemProps.name
|
427
|
-
},
|
431
|
+
}, _omit(_otherFormItemProps, ['rules'])), {}, {
|
428
432
|
children: function children(fields, operation, meta) {
|
429
|
-
return _jsx(AutoComponent, _objectSpread(_objectSpread({},
|
433
|
+
return _jsx(AutoComponent, _objectSpread(_objectSpread({}, _omit(lastComponentProps, lastComponentPropsFilter)), {}, {
|
430
434
|
otherProps: otherProps,
|
431
435
|
fields: fields,
|
432
436
|
operation: operation,
|
@@ -460,7 +464,7 @@ var Render = function Render(props) {
|
|
460
464
|
children: child
|
461
465
|
});
|
462
466
|
}
|
463
|
-
return _jsx(_Form.Item, _objectSpread(_objectSpread({},
|
467
|
+
return _jsx(_Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
|
464
468
|
// @ts-ignore
|
465
469
|
_internalItemRender: internalItemRender,
|
466
470
|
className: _className,
|