@zat-design/sisyphus-react 3.13.8 → 3.13.10-deta.1
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 +4 -3
package/es/ProAction/index.js
CHANGED
@@ -7,10 +7,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
7
7
|
import "antd/es/form/style";
|
8
8
|
import _Form from "antd/es/form";
|
9
9
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
10
|
+
import _isFunction from "lodash/isFunction";
|
10
11
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
11
12
|
import React from 'react';
|
12
13
|
import { useSetState } from 'ahooks';
|
13
|
-
import { isFunction } from 'lodash';
|
14
14
|
import CheckModalContent from './components/CheckModalContent';
|
15
15
|
import { ProDrawerForm } from '../index';
|
16
16
|
import locale from '../locale';
|
@@ -82,7 +82,7 @@ var ProAction = function ProAction(props) {
|
|
82
82
|
_context.t1 = {};
|
83
83
|
case 18:
|
84
84
|
res = _context.t1;
|
85
|
-
if (!(transformResponse &&
|
85
|
+
if (!(transformResponse && _isFunction(transformResponse))) {
|
86
86
|
_context.next = 26;
|
87
87
|
break;
|
88
88
|
}
|
package/es/ProDownload/index.js
CHANGED
@@ -5,11 +5,12 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
5
5
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
6
6
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
7
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
8
|
+
import _isBoolean from "lodash/isBoolean";
|
9
|
+
import _isFunction from "lodash/isFunction";
|
8
10
|
var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
|
9
11
|
import { jsx as _jsx } from "react/jsx-runtime";
|
10
12
|
import { useSetState } from 'ahooks';
|
11
13
|
import classNames from 'classnames';
|
12
|
-
import _, { isFunction } from 'lodash';
|
13
14
|
import { BlobMakeFile, DownloadRequest } from './utils';
|
14
15
|
import { useProConfig } from '../ProConfigProvider';
|
15
16
|
var ProDownload = function ProDownload(props) {
|
@@ -68,7 +69,7 @@ var ProDownload = function ProDownload(props) {
|
|
68
69
|
loading: true
|
69
70
|
});
|
70
71
|
_params = params;
|
71
|
-
if (!
|
72
|
+
if (!_isFunction(params)) {
|
72
73
|
_context.next = 14;
|
73
74
|
break;
|
74
75
|
}
|
@@ -136,7 +137,7 @@ var ProDownload = function ProDownload(props) {
|
|
136
137
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
137
138
|
while (1) switch (_context3.prev = _context3.next) {
|
138
139
|
case 0:
|
139
|
-
if (!(
|
140
|
+
if (!(_isBoolean(beforeDownload) && !beforeDownload)) {
|
140
141
|
_context3.next = 2;
|
141
142
|
break;
|
142
143
|
}
|
package/es/ProDownload/utils.js
CHANGED
@@ -4,9 +4,10 @@ import _message from "antd/es/message";
|
|
4
4
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
5
5
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
6
6
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
7
|
+
import _get from "lodash/get";
|
8
|
+
import _isFunction from "lodash/isFunction";
|
7
9
|
/* eslint-disable no-empty */
|
8
10
|
/* eslint-disable prefer-promise-reject-errors */
|
9
|
-
import { isFunction, get } from 'lodash';
|
10
11
|
import locale from '../locale';
|
11
12
|
var stringify = function stringify(data) {
|
12
13
|
var result = '';
|
@@ -126,7 +127,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
|
|
126
127
|
onError && onError(_data);
|
127
128
|
return _context.abrupt("return", Promise.reject(errorMsg));
|
128
129
|
case 12:
|
129
|
-
if (!
|
130
|
+
if (!_isFunction(transformResponse)) {
|
130
131
|
_context.next = 14;
|
131
132
|
break;
|
132
133
|
}
|
@@ -159,12 +160,12 @@ export var DownloadRequest = /*#__PURE__*/function () {
|
|
159
160
|
res = _context2.sent;
|
160
161
|
data = null;
|
161
162
|
contentFileName = '';
|
162
|
-
if (
|
163
|
+
if (_isFunction(transformResponse)) {
|
163
164
|
data = res;
|
164
165
|
} else {
|
165
166
|
// 优先获取Content-Disposition中filename
|
166
167
|
contentFileName = getFilenameFromContentDisposition(res.headers.get('Content-Disposition'));
|
167
|
-
data =
|
168
|
+
data = _get(res, 'data');
|
168
169
|
}
|
169
170
|
if (!data) {
|
170
171
|
_context2.next = 15;
|
@@ -8,10 +8,10 @@ import "antd/es/modal/style";
|
|
8
8
|
import _Modal from "antd/es/modal";
|
9
9
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
10
10
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
|
+
import _isArray from "lodash/isArray";
|
11
12
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
12
13
|
import React, { useCallback, useState, useRef, useEffect } from 'react';
|
13
14
|
import { useScroll } from 'ahooks';
|
14
|
-
import { isArray } from 'lodash';
|
15
15
|
import { ReactSVG } from 'react-svg';
|
16
16
|
import closeSvg from '../../../assets/close.svg';
|
17
17
|
import locale from '../../../locale';
|
@@ -208,7 +208,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
208
208
|
children: footer
|
209
209
|
});
|
210
210
|
}
|
211
|
-
if (
|
211
|
+
if (_isArray(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
|
212
212
|
return _jsx("div", {
|
213
213
|
className: "pro-drawer-footer",
|
214
214
|
children: footer.map(function (item) {
|
@@ -8,11 +8,11 @@ import _Space from "antd/es/space";
|
|
8
8
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
9
9
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
10
10
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
11
|
+
import _isArray from "lodash/isArray";
|
11
12
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
12
13
|
import React, { useCallback, useState, useRef } from 'react';
|
13
14
|
import { useScroll, useSize } from 'ahooks';
|
14
15
|
import classnames from 'classnames';
|
15
|
-
import { isArray } from 'lodash';
|
16
16
|
import { ReactSVG } from 'react-svg';
|
17
17
|
import closeSvg from '../../../assets/close.svg';
|
18
18
|
/**
|
@@ -163,7 +163,7 @@ var ProModal = function ProModal(_ref) {
|
|
163
163
|
children: footer
|
164
164
|
});
|
165
165
|
}
|
166
|
-
if (
|
166
|
+
if (_isArray(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
|
167
167
|
return _jsx("div", {
|
168
168
|
className: "pro-drawer-footer",
|
169
169
|
children: footer.map(function (item) {
|
@@ -1,9 +1,9 @@
|
|
1
1
|
import "antd/es/space/style";
|
2
2
|
import _Space from "antd/es/space";
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
4
|
+
import _omit from "lodash/omit";
|
4
5
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
5
6
|
import { useEffect } from 'react';
|
6
|
-
import { omit } from 'lodash';
|
7
7
|
import { InfoCircleOutlined } from '@ant-design/icons';
|
8
8
|
import { ProForm } from '../../index';
|
9
9
|
import { matchFormValue } from '../utils';
|
@@ -26,7 +26,7 @@ var RenderProForm = function RenderProForm(props) {
|
|
26
26
|
}, []);
|
27
27
|
// 兼容老写法
|
28
28
|
if (!props.columns) {
|
29
|
-
columns[0] = _objectSpread(_objectSpread({},
|
29
|
+
columns[0] = _objectSpread(_objectSpread({}, _omit(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode'])), {}, {
|
30
30
|
name: props.type || 'Input'
|
31
31
|
});
|
32
32
|
_props = {
|
@@ -35,7 +35,7 @@ var RenderProForm = function RenderProForm(props) {
|
|
35
35
|
isView: props.isView
|
36
36
|
};
|
37
37
|
} else {
|
38
|
-
_props = _objectSpread({},
|
38
|
+
_props = _objectSpread({}, _omit(props, ['onChange', 'isNode']));
|
39
39
|
}
|
40
40
|
if ((_props3 = _props) === null || _props3 === void 0 ? void 0 : _props3.isView) {
|
41
41
|
var _props4, _props4$columns;
|
package/es/ProEditLabel/index.js
CHANGED
@@ -12,13 +12,13 @@ import "antd/es/form/style";
|
|
12
12
|
import _Form from "antd/es/form";
|
13
13
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
14
14
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
15
|
+
import _omit from "lodash/omit";
|
15
16
|
var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
|
16
17
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
17
18
|
import { EditOutlined } from '@ant-design/icons';
|
18
19
|
import { useToggle, useSetState } from 'ahooks';
|
19
20
|
import classnames from 'classnames';
|
20
21
|
import React, { useEffect, useRef } from 'react';
|
21
|
-
import { omit } from 'lodash';
|
22
22
|
import RenderProForm from './components/RenderProForm';
|
23
23
|
import { matchFormValue } from './utils';
|
24
24
|
var ProEditLabel = function ProEditLabel(_ref) {
|
@@ -273,7 +273,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
273
273
|
onOpenChange: function onOpenChange(open) {
|
274
274
|
_onOpenChange && _onOpenChange(open);
|
275
275
|
}
|
276
|
-
},
|
276
|
+
}, _omit(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), {}, {
|
277
277
|
children: labelRender()
|
278
278
|
}));
|
279
279
|
}
|
@@ -4,9 +4,10 @@ import "antd/es/popconfirm/style";
|
|
4
4
|
import _Popconfirm from "antd/es/popconfirm";
|
5
5
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
6
6
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
7
|
+
import _omit from "lodash/omit";
|
8
|
+
import _isFunction from "lodash/isFunction";
|
7
9
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
8
10
|
import React from 'react';
|
9
|
-
import { isFunction, omit } from 'lodash';
|
10
11
|
import { iconMap } from '../../utils/config';
|
11
12
|
import locale from '../../../locale';
|
12
13
|
// 渲染操作按钮
|
@@ -84,7 +85,7 @@ var ActionButton = function ActionButton(_ref) {
|
|
84
85
|
disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
|
85
86
|
});
|
86
87
|
// 当传入函数时,先转成reactNode
|
87
|
-
if (
|
88
|
+
if (_isFunction(btnConfig.label)) {
|
88
89
|
var addIndex = tableLength ? tableLength - 1 : 0;
|
89
90
|
var namePath = [].concat(_toConsumableArray(name), [addIndex]);
|
90
91
|
var addRecord = form.getFieldValue(namePath) || {};
|
@@ -116,17 +117,17 @@ var ActionButton = function ActionButton(_ref) {
|
|
116
117
|
disabled: isDisabled,
|
117
118
|
okText: locale.ProEditTable.confirm,
|
118
119
|
cancelText: locale.ProEditTable.cancel,
|
119
|
-
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({},
|
120
|
+
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
120
121
|
record: record,
|
121
122
|
index: index,
|
122
123
|
disabled: isDisabled
|
123
|
-
}))) : _jsx(_Button, _objectSpread(_objectSpread({},
|
124
|
+
}))) : _jsx(_Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
124
125
|
disabled: isDisabled,
|
125
126
|
type: "link",
|
126
127
|
children: btnConfig.label
|
127
128
|
}))
|
128
129
|
}) : _jsx(_Fragment, {
|
129
|
-
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({},
|
130
|
+
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
130
131
|
record: record,
|
131
132
|
index: index,
|
132
133
|
disabled: isDisabled,
|
@@ -140,7 +141,7 @@ var ActionButton = function ActionButton(_ref) {
|
|
140
141
|
selectedRows: selectedRows
|
141
142
|
});
|
142
143
|
}
|
143
|
-
}))) : _jsx(_Button, _objectSpread(_objectSpread({},
|
144
|
+
}))) : _jsx(_Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
144
145
|
disabled: isDisabled,
|
145
146
|
type: "link",
|
146
147
|
onClick: function onClick() {
|
@@ -157,12 +158,12 @@ var ActionButton = function ActionButton(_ref) {
|
|
157
158
|
}))
|
158
159
|
})
|
159
160
|
}) : _jsx(_Fragment, {
|
160
|
-
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({},
|
161
|
+
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, _omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
161
162
|
record: record,
|
162
163
|
index: index
|
163
164
|
}))) : _jsx(_Button, _objectSpread(_objectSpread({
|
164
165
|
className: "action-button"
|
165
|
-
},
|
166
|
+
}, _omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
166
167
|
type: "link",
|
167
168
|
icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : iconMap[btnConfig.type],
|
168
169
|
children: btnConfig.label
|
@@ -5,11 +5,11 @@ import _Tooltip from "antd/es/tooltip";
|
|
5
5
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
8
|
+
import _get from "lodash/get";
|
8
9
|
var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
|
9
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
10
11
|
import React, { useMemo } from 'react';
|
11
12
|
import classnames from 'classnames';
|
12
|
-
import { get } from 'lodash';
|
13
13
|
import { diffOriginal } from '../../utils/diffOriginal';
|
14
14
|
import { useProConfig } from '../../../ProConfigProvider';
|
15
15
|
import { isEmpty } from '../../../utils';
|
@@ -42,14 +42,14 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
42
42
|
if (!rowValue) return undefined;
|
43
43
|
var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
|
44
44
|
if (!keyValue) return undefined;
|
45
|
-
var originalValueList =
|
45
|
+
var originalValueList = _get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
|
46
46
|
originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
|
47
47
|
return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
|
48
48
|
});
|
49
49
|
var originalValue;
|
50
50
|
if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
|
51
51
|
var originalNamesValue = originalNames.map(function (originalName) {
|
52
|
-
return
|
52
|
+
return _get(originRecord, originalName.slice(rowKeyPath.length - 1));
|
53
53
|
});
|
54
54
|
// 有可能出现数组中全是undefined的情况 视为没有值
|
55
55
|
var fillUndefined = originalNamesValue.every(function (valItem) {
|
@@ -57,7 +57,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
57
57
|
});
|
58
58
|
originalValue = fillUndefined ? undefined : originalNamesValue;
|
59
59
|
} else {
|
60
|
-
originalValue =
|
60
|
+
originalValue = _get(originRecord, originalName.slice(rowKeyPath.length - 1));
|
61
61
|
}
|
62
62
|
return {
|
63
63
|
originalValue: originalValue,
|
@@ -68,8 +68,8 @@ var getOriginalValue = function getOriginalValue(_ref) {
|
|
68
68
|
// 这个方法是给editTable专用的 暂时不存在不传rowKey的情况
|
69
69
|
return {
|
70
70
|
originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
|
71
|
-
return
|
72
|
-
}) :
|
71
|
+
return _get(originalValues, originalName);
|
72
|
+
}) : _get(originalValues, originalName),
|
73
73
|
originRecord: originRecord
|
74
74
|
};
|
75
75
|
};
|
@@ -6,13 +6,17 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
8
8
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
9
|
+
import _isFunction from "lodash/isFunction";
|
10
|
+
import _omit from "lodash/omit";
|
11
|
+
import _debounce from "lodash/debounce";
|
12
|
+
import _isEqual from "lodash/isEqual";
|
13
|
+
import _cloneDeep from "lodash/cloneDeep";
|
9
14
|
var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
|
10
15
|
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
11
16
|
/* eslint-disable prefer-destructuring */
|
12
17
|
/* eslint-disable prefer-const */
|
13
18
|
import React, { useEffect } from 'react';
|
14
19
|
import classNames from 'classnames';
|
15
|
-
import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
|
16
20
|
import valueTypeMap from '../../../ProForm/utils/valueType';
|
17
21
|
import transformMap from '../../utils/transform';
|
18
22
|
import { getNamePath, difference, getDisabled } from '../../utils/tools';
|
@@ -86,7 +90,7 @@ var RenderField = function RenderField(_ref) {
|
|
86
90
|
var _desensitization = desensitization || [];
|
87
91
|
var isCell = mode === 'cell';
|
88
92
|
if (isCell) {
|
89
|
-
record['is-view'] = !
|
93
|
+
record['is-view'] = !_isEqual(cellNamePath, cellName);
|
90
94
|
}
|
91
95
|
// type类型 首字母转大写
|
92
96
|
type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
|
@@ -108,19 +112,19 @@ var RenderField = function RenderField(_ref) {
|
|
108
112
|
// 行参数
|
109
113
|
var rowParams = [currentValue, rowData, options];
|
110
114
|
// required & rules & fieldProps & disabled & valueType 函数化处理
|
111
|
-
if (
|
115
|
+
if (_isFunction(required)) {
|
112
116
|
_required = required.apply(void 0, rowParams);
|
113
117
|
}
|
114
|
-
if (
|
118
|
+
if (_isFunction(fieldProps)) {
|
115
119
|
_fieldProps = fieldProps.apply(void 0, rowParams);
|
116
120
|
}
|
117
|
-
if (
|
121
|
+
if (_isFunction(rules)) {
|
118
122
|
_rules = rules.apply(void 0, rowParams);
|
119
123
|
}
|
120
|
-
if (
|
124
|
+
if (_isFunction(valueType)) {
|
121
125
|
_valueType = valueType.apply(void 0, rowParams);
|
122
126
|
}
|
123
|
-
if (
|
127
|
+
if (_isFunction(desensitization)) {
|
124
128
|
_desensitization = desensitization.apply(void 0, rowParams);
|
125
129
|
}
|
126
130
|
// 获取最终的disabled
|
@@ -205,7 +209,7 @@ var RenderField = function RenderField(_ref) {
|
|
205
209
|
var params = _objectSpread(_objectSpread({}, column), {}, {
|
206
210
|
mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
|
207
211
|
});
|
208
|
-
return
|
212
|
+
return _isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
|
209
213
|
};
|
210
214
|
if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
|
211
215
|
// 支持names配置,临时生成对应的formItem,用来存储单个对应的值
|
@@ -305,7 +309,7 @@ var RenderField = function RenderField(_ref) {
|
|
305
309
|
}, 100);
|
306
310
|
};
|
307
311
|
// 单元格更新数据时,加个防抖,防止更新频率过快,卡顿
|
308
|
-
var _onChange =
|
312
|
+
var _onChange = _debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
309
313
|
var _len2,
|
310
314
|
args,
|
311
315
|
_key2,
|
@@ -349,7 +353,7 @@ var RenderField = function RenderField(_ref) {
|
|
349
353
|
return _context.abrupt("return", null);
|
350
354
|
case 6:
|
351
355
|
row = form.getFieldValue(rowPath, true);
|
352
|
-
orgRow =
|
356
|
+
orgRow = _cloneDeep(row);
|
353
357
|
if (!onFieldChange) {
|
354
358
|
_context.next = 21;
|
355
359
|
break;
|
@@ -395,7 +399,7 @@ var RenderField = function RenderField(_ref) {
|
|
395
399
|
// 判断属性是否变动
|
396
400
|
form.setFieldValue(rowPath, row);
|
397
401
|
if (validateTrigger && validateTrigger.includes('onChange')) {
|
398
|
-
if (!
|
402
|
+
if (!_isEqual(orgRow, row)) {
|
399
403
|
diff = difference(row, orgRow) || {};
|
400
404
|
_validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
|
401
405
|
return [].concat(_toConsumableArray(rowPath), [key]);
|
@@ -448,7 +452,7 @@ var RenderField = function RenderField(_ref) {
|
|
448
452
|
_args = formatArgs([].concat(args));
|
449
453
|
rowPath = [].concat(_toConsumableArray(namePath), [index]);
|
450
454
|
row = form.getFieldValue(rowPath, true);
|
451
|
-
orgRow =
|
455
|
+
orgRow = _cloneDeep(row);
|
452
456
|
_args[1] = row;
|
453
457
|
_context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
|
454
458
|
if (!_context2.t0) {
|
@@ -469,7 +473,7 @@ var RenderField = function RenderField(_ref) {
|
|
469
473
|
// 判断属性是否变动
|
470
474
|
form.setFieldValue(rowPath, row);
|
471
475
|
if (validateTrigger && validateTrigger.includes('onBlur')) {
|
472
|
-
if (!
|
476
|
+
if (!_isEqual(orgRow, row)) {
|
473
477
|
diff = difference(row, orgRow) || {};
|
474
478
|
validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
|
475
479
|
return [].concat(_toConsumableArray(rowPath), [key]);
|
@@ -529,7 +533,7 @@ var RenderField = function RenderField(_ref) {
|
|
529
533
|
desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
|
530
534
|
}
|
531
535
|
});
|
532
|
-
componentProps =
|
536
|
+
componentProps = _omit(componentProps, ['onFieldChange', 'namePath', 'index']);
|
533
537
|
// 单元格编辑时,设置各个单元格disabled属性
|
534
538
|
if (isCell) {
|
535
539
|
record["".concat(dataIndex, "-Disabled")] = _disabled;
|
@@ -588,7 +592,7 @@ var RenderField = function RenderField(_ref) {
|
|
588
592
|
}
|
589
593
|
FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
|
590
594
|
validateFirst: true
|
591
|
-
},
|
595
|
+
}, _omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
|
592
596
|
className: _className,
|
593
597
|
name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
|
594
598
|
children: FieldComponent
|
@@ -598,7 +602,7 @@ var RenderField = function RenderField(_ref) {
|
|
598
602
|
if (type === 'FormList') {
|
599
603
|
FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
|
600
604
|
name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
|
601
|
-
},
|
605
|
+
}, _omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
|
602
606
|
children: function children(fields, operation, meta) {
|
603
607
|
return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
|
604
608
|
otherProps: otherProps,
|
package/es/ProEditTable/index.js
CHANGED
@@ -11,10 +11,13 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
11
11
|
import "antd/es/form/style";
|
12
12
|
import _Form from "antd/es/form";
|
13
13
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
14
|
+
import _set from "lodash/set";
|
15
|
+
import _isBoolean from "lodash/isBoolean";
|
16
|
+
import _isArray from "lodash/isArray";
|
17
|
+
import _get from "lodash/get";
|
14
18
|
var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
|
15
19
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
16
20
|
import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
|
17
|
-
import { get, isArray, isBoolean, set } from 'lodash';
|
18
21
|
import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks';
|
19
22
|
import classnames from 'classnames';
|
20
23
|
import { transformColumns } from './utils';
|
@@ -112,7 +115,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
112
115
|
selectedRowKeys = state.selectedRowKeys,
|
113
116
|
selectedRows = state.selectedRows,
|
114
117
|
page = state.page;
|
115
|
-
var virtualRowName = getNamePath(
|
118
|
+
var virtualRowName = getNamePath(_isArray(name) ? name : [name], virtualKey);
|
116
119
|
// 样式处理
|
117
120
|
var _className = classnames({
|
118
121
|
'pro-edit-table': true,
|
@@ -132,7 +135,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
132
135
|
var _originalArr$every, _originalArr$some;
|
133
136
|
var nextOriginalValues;
|
134
137
|
// 原始值也需要设置对应的rowkey,后续比对通过rowkey对比
|
135
|
-
var originalArr =
|
138
|
+
var originalArr = _get(resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues, name);
|
136
139
|
var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
|
137
140
|
return item.rowKey;
|
138
141
|
}) : true;
|
@@ -148,13 +151,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
148
151
|
}
|
149
152
|
if (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) {
|
150
153
|
nextOriginalValues = {};
|
151
|
-
|
154
|
+
_set(nextOriginalValues, name, originalArr);
|
152
155
|
}
|
153
156
|
return nextOriginalValues;
|
154
157
|
}, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
|
155
158
|
var getIsNew = function getIsNew(record) {
|
156
159
|
var _originalArr$find;
|
157
|
-
var originalArr =
|
160
|
+
var originalArr = _get(originalValues, name);
|
158
161
|
if (!(originalArr === null || originalArr === void 0 ? void 0 : originalArr.length)) {
|
159
162
|
return false;
|
160
163
|
}
|
@@ -235,7 +238,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
235
238
|
mulDeletePoConfirmMsg: mulDeletePoConfirmMsg,
|
236
239
|
virtualKey: virtualKey,
|
237
240
|
requiredAlign: requiredAlign,
|
238
|
-
name:
|
241
|
+
name: _isArray(name) ? name : [name],
|
239
242
|
namePath: namePath,
|
240
243
|
tableRef: tableRef,
|
241
244
|
max: max,
|
@@ -390,7 +393,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
390
393
|
};
|
391
394
|
}
|
392
395
|
}, [toolbarSticky]);
|
393
|
-
var _toolbarSticky =
|
396
|
+
var _toolbarSticky = _isBoolean(toolbarSticky) ? {} : toolbarSticky;
|
394
397
|
var _summary = _typeof(summary) === 'object' ? function (data) {
|
395
398
|
return _jsx(Summary, {
|
396
399
|
data: data,
|
@@ -5,10 +5,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
5
5
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
6
6
|
import "antd/es/message/style";
|
7
7
|
import _message from "antd/es/message";
|
8
|
+
import _set from "lodash/set";
|
8
9
|
import { jsx as _jsx } from "react/jsx-runtime";
|
9
10
|
import { PlusOutlined } from '@ant-design/icons';
|
10
11
|
import { tools } from '@zat-design/utils';
|
11
|
-
import { set } from 'lodash';
|
12
12
|
import { onDelete, getRandom } from './tools';
|
13
13
|
import locale from '../../locale';
|
14
14
|
export var defaultBtnNameMap = {
|
@@ -85,7 +85,7 @@ export var actions = {
|
|
85
85
|
}
|
86
86
|
// 防止value引用不变, 值不更新 - (自定义组件)
|
87
87
|
values = form.getFieldsValue();
|
88
|
-
|
88
|
+
_set(values, rowName, record);
|
89
89
|
form.setFieldsValue(values);
|
90
90
|
setState({
|
91
91
|
editingKeys: nextEditingKeys
|
@@ -132,7 +132,7 @@ export var actions = {
|
|
132
132
|
} else {
|
133
133
|
// 防止value引用不变, 值不更新 - (自定义组件)
|
134
134
|
var values = form.getFieldsValue();
|
135
|
-
|
135
|
+
_set(values, virtualRowName, record);
|
136
136
|
form.setFieldsValue(values);
|
137
137
|
}
|
138
138
|
},
|
@@ -1,10 +1,12 @@
|
|
1
|
-
import
|
1
|
+
import _isObject from "lodash/isObject";
|
2
|
+
import _isFunction from "lodash/isFunction";
|
3
|
+
import _isEqual from "lodash/isEqual";
|
2
4
|
import { validate } from '@zat-design/utils';
|
3
5
|
var isEmpty = validate.isEmpty;
|
4
6
|
// 过滤对象中undefined字段
|
5
7
|
// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
|
6
8
|
var filterObject = function filterObject(data) {
|
7
|
-
if (!
|
9
|
+
if (!_isObject(data) || data === null) return data;
|
8
10
|
// ['1', undefined] ['1', ''] 视为相等
|
9
11
|
if (Array.isArray(data)) {
|
10
12
|
// 数组中全是empty值的话 视为null
|
@@ -36,7 +38,7 @@ export var diffOriginal = function diffOriginal(params) {
|
|
36
38
|
record = params.record,
|
37
39
|
index = params.index;
|
38
40
|
// 支持传入自定义比较事件
|
39
|
-
if (
|
41
|
+
if (_isFunction(onDiff)) {
|
40
42
|
var diffRes = onDiff({
|
41
43
|
originValue: originalValue,
|
42
44
|
originRecord: originRecord,
|
@@ -60,5 +62,5 @@ export var diffOriginal = function diffOriginal(params) {
|
|
60
62
|
if (isEmptyOrg && isEmptyVal) return 'same';
|
61
63
|
// 如果原始值为空 且当前有值的话 视为新增
|
62
64
|
if (isEmptyOrg && !isEmptyVal) return 'add';
|
63
|
-
return
|
65
|
+
return _isEqual(_value, _originalValue) ? 'same' : 'changed';
|
64
66
|
};
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
2
|
-
import
|
2
|
+
import _isEqual from "lodash/isEqual";
|
3
|
+
import _get from "lodash/get";
|
3
4
|
var defaultPropsMap = {
|
4
5
|
ProSelect: function ProSelect(props) {
|
5
6
|
var fieldProps = props.fieldProps,
|
@@ -12,14 +13,14 @@ var defaultPropsMap = {
|
|
12
13
|
if (filterInList && namePath && name) {
|
13
14
|
var _namePath = _toConsumableArray(namePath).splice(2, namePath.length - 1);
|
14
15
|
defaultProps.shouldUpdate = function (preValues, curValues) {
|
15
|
-
var
|
16
|
-
var preListValue = (
|
17
|
-
return
|
16
|
+
var _get2, _get2$map, _get3, _get3$map;
|
17
|
+
var preListValue = (_get2 = _get(preValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
|
18
|
+
return _get(item, _namePath);
|
18
19
|
});
|
19
|
-
var curListValue = (
|
20
|
-
return
|
20
|
+
var curListValue = (_get3 = _get(curValues, name)) === null || _get3 === void 0 ? void 0 : (_get3$map = _get3.map) === null || _get3$map === void 0 ? void 0 : _get3$map.call(_get3, function (item) {
|
21
|
+
return _get(item, _namePath);
|
21
22
|
});
|
22
|
-
return !
|
23
|
+
return !_isEqual(preListValue, curListValue);
|
23
24
|
};
|
24
25
|
}
|
25
26
|
return defaultProps;
|