@zat-design/sisyphus-react 4.0.0-beta.6 → 4.0.0-beta.8
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/dist/index.esm.css +1 -1
- package/dist/less.esm.css +1 -1
- package/es/ProAction/index.js +3 -6
- package/es/ProConfigProvider/index.js +2 -3
- package/es/ProDownload/index.js +2 -3
- package/es/ProDownload/utils.js +3 -4
- package/es/ProDrawerForm/components/ProDrawer/index.js +5 -10
- package/es/ProDrawerForm/components/ProModal/index.js +5 -10
- package/es/ProEditLabel/components/RenderProForm.js +2 -3
- package/es/ProEditLabel/index.js +6 -13
- package/es/ProEditTable/components/ActionButton/index.js +5 -8
- package/es/ProEditTable/components/RcTable/BaseTable.js +3 -6
- package/es/ProEditTable/components/RcTable/DraggableTable.js +2 -3
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +5 -8
- package/es/ProEditTable/components/RenderField/index.js +48 -14
- package/es/ProEditTable/components/RenderToolbar/index.js +2 -3
- package/es/ProEditTable/components/Summary/index.js +5 -8
- package/es/ProEditTable/components/Validator/index.js +3 -6
- package/es/ProEditTable/index.js +16 -19
- package/es/ProEditTable/propsType.d.ts +6 -0
- package/es/ProEditTable/utils/config.js +4 -5
- package/es/ProEditTable/utils/index.js +3 -6
- package/es/ProEditTable/utils/useShouldUpdateForTable.d.ts +15 -0
- package/es/ProEditTable/utils/useShouldUpdateForTable.js +132 -0
- package/es/ProEnum/index.js +10 -17
- package/es/ProForm/components/Container.js +2 -3
- package/es/ProForm/components/FormFooter/index.js +4 -7
- package/es/ProForm/components/base/Checkbox/index.js +3 -4
- package/es/ProForm/components/base/DatePicker/index.js +2 -3
- package/es/ProForm/components/base/Input/index.js +2 -3
- package/es/ProForm/components/base/InputNumber/index.js +3 -6
- package/es/ProForm/components/base/Radio/index.js +3 -4
- package/es/ProForm/components/base/RangePicker/index.js +3 -3
- package/es/ProForm/components/base/Select/index.js +2 -3
- package/es/ProForm/components/base/Switch/index.js +2 -3
- package/es/ProForm/components/base/SwitchCheckbox/index.js +2 -3
- package/es/ProForm/components/base/TextArea/index.js +2 -3
- package/es/ProForm/components/base/TimePicker/index.js +2 -3
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +8 -13
- package/es/ProForm/components/combination/FormList/components/BlockFields.js +3 -6
- package/es/ProForm/components/combination/FormList/components/Empty.js +2 -3
- package/es/ProForm/components/combination/FormList/components/LineFields.js +2 -3
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +5 -8
- package/es/ProForm/components/combination/FormList/index.js +2 -3
- package/es/ProForm/components/combination/Group/index.js +3 -4
- package/es/ProForm/components/combination/Group/utils.js +3 -4
- package/es/ProForm/components/combination/ProCascader/index.js +5 -10
- package/es/ProForm/components/combination/ProModalSelect/index.js +9 -22
- package/es/ProForm/components/combination/ProNumberRange/index.js +12 -19
- package/es/ProForm/components/combination/ProRangeLimit/index.js +4 -9
- package/es/ProForm/components/combination/ProTimeLimit/index.js +4 -9
- package/es/ProForm/components/render/ChangedWrapper.js +5 -8
- package/es/ProForm/components/render/ConfirmWrapper.js +3 -4
- package/es/ProForm/components/render/Render.js +12 -19
- package/es/ProForm/components/render/RenderFields.js +2 -1
- package/es/ProForm/index.js +9 -16
- package/es/ProForm/propsType.d.ts +1 -0
- package/es/ProForm/utils/useForm.js +2 -3
- package/es/ProForm/utils/useShouldUpdate.js +1 -2
- package/es/ProIcon/index.js +6 -11
- package/es/ProLayout/components/Layout/Menu/FoldMenu/index.js +3 -6
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -3
- package/es/ProLayout/components/ProCollapse/index.js +5 -10
- package/es/ProLayout/components/ProFooter/index.js +2 -3
- package/es/ProLayout/components/ProHeader/components/Copy/index.js +2 -3
- package/es/ProLayout/components/ProHeader/components/ProBackBtn/index.js +2 -3
- package/es/ProLayout/components/ProHeader/index.js +16 -25
- package/es/ProLayout/index.js +2 -3
- package/es/ProSelect/components/AdaptiveTooltip.js +2 -3
- package/es/ProSelect/index.js +7 -14
- package/es/ProStep/components/Anchor/index.js +2 -3
- package/es/ProTable/components/FormatColumn/index.js +9 -10
- package/es/ProTable/components/RcTable/components/BaseTable/index.js +2 -3
- package/es/ProTable/components/RcTable/components/DraggableTable/index.js +2 -3
- package/es/ProTable/components/RenderColumn/index.js +10 -15
- package/es/ProTable/components/RenderSummary/index.js +4 -5
- package/es/ProTable/components/RenderTableHeader/index.js +3 -4
- package/es/ProTable/components/RenderTabs/index.js +3 -6
- package/es/ProTable/components/TooltipTitle/index.js +2 -3
- package/es/ProTable/hooks/useAntdTable.js +3 -6
- package/es/ProTabs/components/Card/index.js +5 -10
- package/es/ProTabs/index.js +2 -3
- package/es/ProTabs/style/index.less +5 -1
- package/es/ProThemeTools/component/ProTools/index.js +12 -19
- package/es/ProThemeTools/index.js +2 -3
- package/es/ProTooltip/index.js +4 -5
- package/es/ProTree/components/AdaptiveTooltip.js +2 -3
- package/es/ProTree/components/List.js +3 -4
- package/es/ProTree/components/ProTree.js +5 -12
- package/es/ProTree/components/ProTreeSelect/index.js +9 -16
- package/es/ProTree/components/Tree.js +3 -6
- package/es/ProTreeModal/components/Cascader.js +3 -4
- package/es/ProTreeModal/components/List.js +9 -14
- package/es/ProTreeModal/components/SortableItem.js +2 -3
- package/es/ProTreeModal/components/Tree.js +3 -4
- package/es/ProTreeModal/components/Trigger.js +6 -11
- package/es/ProTreeModal/index.js +9 -16
- package/es/ProUpload/components/ButtonRender.js +3 -6
- package/es/ProUpload/components/DragRender.js +2 -3
- package/es/ProUpload/components/FileItem.js +10 -15
- package/es/ProUpload/components/ImageRender.js +8 -17
- package/es/ProUpload/index.js +3 -4
- package/es/ProViewer/index.js +4 -9
- package/es/ProViewer/propsType.js +3 -0
- package/es/ProWaterMark/index.js +2 -3
- package/es/utils/index.js +13 -1
- package/lib/ProAction/index.js +3 -6
- package/lib/ProConfigProvider/index.js +2 -3
- package/lib/ProDownload/index.js +2 -3
- package/lib/ProDownload/utils.js +3 -4
- package/lib/ProDrawerForm/components/ProDrawer/index.js +5 -10
- package/lib/ProDrawerForm/components/ProModal/index.js +5 -10
- package/lib/ProEditLabel/components/RenderProForm.js +2 -3
- package/lib/ProEditLabel/index.js +6 -13
- package/lib/ProEditTable/components/ActionButton/index.js +5 -8
- package/lib/ProEditTable/components/RcTable/BaseTable.js +3 -6
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +2 -3
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +5 -8
- package/lib/ProEditTable/components/RenderField/index.js +48 -14
- package/lib/ProEditTable/components/RenderToolbar/index.js +2 -3
- package/lib/ProEditTable/components/Summary/index.js +5 -9
- package/lib/ProEditTable/components/Validator/index.js +3 -7
- package/lib/ProEditTable/index.js +16 -19
- package/lib/ProEditTable/propsType.d.ts +6 -0
- package/lib/ProEditTable/utils/config.js +4 -5
- package/lib/ProEditTable/utils/index.js +3 -6
- package/lib/ProEditTable/utils/useShouldUpdateForTable.d.ts +15 -0
- package/lib/ProEditTable/utils/useShouldUpdateForTable.js +139 -0
- package/lib/ProEnum/index.js +10 -17
- package/lib/ProForm/components/Container.js +2 -3
- package/lib/ProForm/components/FormFooter/index.js +4 -7
- package/lib/ProForm/components/base/Checkbox/index.js +3 -4
- package/lib/ProForm/components/base/DatePicker/index.js +2 -3
- package/lib/ProForm/components/base/Input/index.js +2 -3
- package/lib/ProForm/components/base/InputNumber/index.js +3 -6
- package/lib/ProForm/components/base/Radio/index.js +3 -4
- package/lib/ProForm/components/base/RangePicker/index.js +2 -3
- package/lib/ProForm/components/base/Select/index.js +2 -3
- package/lib/ProForm/components/base/Switch/index.js +2 -3
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +2 -3
- package/lib/ProForm/components/base/TextArea/index.js +2 -3
- package/lib/ProForm/components/base/TimePicker/index.js +2 -3
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +8 -13
- package/lib/ProForm/components/combination/FormList/components/BlockFields.js +4 -7
- package/lib/ProForm/components/combination/FormList/components/Empty.js +2 -3
- package/lib/ProForm/components/combination/FormList/components/LineFields.js +2 -3
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +4 -7
- package/lib/ProForm/components/combination/FormList/index.js +2 -3
- package/lib/ProForm/components/combination/Group/index.js +3 -4
- package/lib/ProForm/components/combination/Group/utils.js +3 -4
- package/lib/ProForm/components/combination/ProCascader/index.js +5 -10
- package/lib/ProForm/components/combination/ProModalSelect/index.js +9 -22
- package/lib/ProForm/components/combination/ProNumberRange/index.js +12 -19
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +4 -9
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +4 -9
- package/lib/ProForm/components/render/ChangedWrapper.js +5 -8
- package/lib/ProForm/components/render/ConfirmWrapper.js +3 -4
- package/lib/ProForm/components/render/Render.js +12 -19
- package/lib/ProForm/components/render/RenderFields.js +2 -1
- package/lib/ProForm/index.js +9 -16
- package/lib/ProForm/propsType.d.ts +1 -0
- package/lib/ProForm/utils/useForm.js +2 -3
- package/lib/ProForm/utils/useShouldUpdate.js +1 -2
- package/lib/ProIcon/index.js +6 -11
- package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +3 -6
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -3
- package/lib/ProLayout/components/ProCollapse/index.js +5 -10
- package/lib/ProLayout/components/ProFooter/index.js +2 -3
- package/lib/ProLayout/components/ProHeader/components/Copy/index.js +2 -3
- package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +2 -3
- package/lib/ProLayout/components/ProHeader/index.js +15 -24
- package/lib/ProLayout/index.js +2 -3
- package/lib/ProSelect/components/AdaptiveTooltip.js +2 -3
- package/lib/ProSelect/index.js +7 -14
- package/lib/ProStep/components/Anchor/index.js +2 -3
- package/lib/ProTable/components/FormatColumn/index.js +9 -10
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +2 -3
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +2 -3
- package/lib/ProTable/components/RenderColumn/index.js +10 -15
- package/lib/ProTable/components/RenderSummary/index.js +4 -6
- package/lib/ProTable/components/RenderTableHeader/index.js +3 -5
- package/lib/ProTable/components/RenderTabs/index.js +3 -6
- package/lib/ProTable/components/TooltipTitle/index.js +2 -3
- package/lib/ProTable/hooks/useAntdTable.js +3 -6
- package/lib/ProTabs/components/Card/index.js +5 -11
- package/lib/ProTabs/index.js +2 -3
- package/lib/ProTabs/style/index.less +5 -1
- package/lib/ProThemeTools/component/ProTools/index.js +12 -19
- package/lib/ProThemeTools/index.js +2 -3
- package/lib/ProTooltip/index.js +4 -5
- package/lib/ProTree/components/AdaptiveTooltip.js +2 -4
- package/lib/ProTree/components/List.js +3 -4
- package/lib/ProTree/components/ProTree.js +5 -12
- package/lib/ProTree/components/ProTreeSelect/index.js +9 -16
- package/lib/ProTree/components/Tree.js +3 -6
- package/lib/ProTreeModal/components/Cascader.js +3 -4
- package/lib/ProTreeModal/components/List.js +9 -14
- package/lib/ProTreeModal/components/SortableItem.js +2 -3
- package/lib/ProTreeModal/components/Tree.js +3 -4
- package/lib/ProTreeModal/components/Trigger.js +6 -11
- package/lib/ProTreeModal/index.js +9 -16
- package/lib/ProUpload/components/ButtonRender.js +3 -6
- package/lib/ProUpload/components/DragRender.js +2 -3
- package/lib/ProUpload/components/FileItem.js +10 -15
- package/lib/ProUpload/components/ImageRender.js +8 -17
- package/lib/ProUpload/index.js +3 -4
- package/lib/ProViewer/index.js +4 -9
- package/lib/ProViewer/propsType.js +3 -1
- package/lib/ProWaterMark/index.js +2 -3
- package/lib/utils/index.js +13 -1
- package/package.json +1 -2
package/es/ProAction/index.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
-
import "antd/es/popconfirm/style";
|
|
3
|
-
import _Popconfirm from "antd/es/popconfirm";
|
|
4
2
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
5
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
6
|
-
import "antd/es/form/style";
|
|
7
|
-
import _Form from "antd/es/form";
|
|
8
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
9
5
|
import React from 'react';
|
|
10
6
|
import { useSetState } from 'ahooks';
|
|
7
|
+
import { Form, Popconfirm } from 'antd';
|
|
11
8
|
import { isFunction } from 'lodash';
|
|
12
9
|
import CheckModalContent from "./components/CheckModalContent";
|
|
13
10
|
import { ProDrawerForm } from "../index";
|
|
@@ -20,7 +17,7 @@ var ProAction = props => {
|
|
|
20
17
|
var _config$, _config$2, _locale$ProAction2, _config$index;
|
|
21
18
|
var children = props.children,
|
|
22
19
|
config = props.config;
|
|
23
|
-
var _Form$useForm =
|
|
20
|
+
var _Form$useForm = Form.useForm(),
|
|
24
21
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
25
22
|
form = _Form$useForm2[0];
|
|
26
23
|
var _useSetState = useSetState({
|
|
@@ -191,7 +188,7 @@ var ProAction = props => {
|
|
|
191
188
|
return TargetComponent;
|
|
192
189
|
};
|
|
193
190
|
return /*#__PURE__*/_jsxs(_Fragment, {
|
|
194
|
-
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? /*#__PURE__*/_jsx(
|
|
191
|
+
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? /*#__PURE__*/_jsx(Popconfirm, {
|
|
195
192
|
onConfirm: () => onActionRun(0, []),
|
|
196
193
|
title: ((_config$2 = config[0]) === null || _config$2 === void 0 ? void 0 : _config$2.title) || (locale === null || locale === void 0 || (_locale$ProAction2 = locale.ProAction) === null || _locale$ProAction2 === void 0 ? void 0 : _locale$ProAction2.defaultTitle),
|
|
197
194
|
children: children
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
-
import "antd/es/config-provider/style";
|
|
3
|
-
import _ConfigProvider from "antd/es/config-provider";
|
|
4
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
5
3
|
import React, { useContext, useEffect, useReducer } from 'react';
|
|
4
|
+
import { ConfigProvider } from 'antd';
|
|
6
5
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
7
6
|
import enUS from 'antd/es/locale/en_US';
|
|
8
7
|
import 'dayjs/locale/zh-cn';
|
|
@@ -91,7 +90,7 @@ var ThemeAwareConfigProvider = _ref => {
|
|
|
91
90
|
children = _ref.children;
|
|
92
91
|
var _useTheme = useTheme(),
|
|
93
92
|
themeState = _useTheme.state;
|
|
94
|
-
return /*#__PURE__*/_jsx(
|
|
93
|
+
return /*#__PURE__*/_jsx(ConfigProvider, {
|
|
95
94
|
locale: locale,
|
|
96
95
|
theme: themeState.antdConfig,
|
|
97
96
|
children: /*#__PURE__*/_jsx("div", {
|
package/es/ProDownload/index.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import "antd/es/button/style";
|
|
2
|
-
import _Button from "antd/es/button";
|
|
3
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
4
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
5
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
@@ -7,6 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
|
7
5
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
8
6
|
var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
|
|
9
7
|
import { useSetState } from 'ahooks';
|
|
8
|
+
import { Button } from 'antd';
|
|
10
9
|
import classNames from 'classnames';
|
|
11
10
|
import _, { isFunction } from 'lodash';
|
|
12
11
|
import { BlobMakeFile, DownloadRequest } from "./utils";
|
|
@@ -128,7 +127,7 @@ var ProDownload = props => {
|
|
|
128
127
|
var cls = classNames(className, {
|
|
129
128
|
'pro-download': true
|
|
130
129
|
});
|
|
131
|
-
return /*#__PURE__*/_jsx(
|
|
130
|
+
return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
|
|
132
131
|
className: cls,
|
|
133
132
|
onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
|
134
133
|
var res;
|
package/es/ProDownload/utils.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
|
-
import "antd/es/message/style";
|
|
3
|
-
import _message from "antd/es/message";
|
|
4
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
5
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
6
4
|
/* eslint-disable no-empty */
|
|
7
5
|
/* eslint-disable prefer-promise-reject-errors */
|
|
6
|
+
import { message } from 'antd';
|
|
8
7
|
import { isFunction, get } from 'lodash';
|
|
9
8
|
import locale from "../locale";
|
|
10
9
|
var stringify = data => {
|
|
@@ -118,7 +117,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
|
|
|
118
117
|
_context.next = 7;
|
|
119
118
|
break;
|
|
120
119
|
}
|
|
121
|
-
|
|
120
|
+
message.error(`${locale.ProDownload.errorMessage}`);
|
|
122
121
|
return _context.abrupt("return", Promise.reject(`${locale.ProDownload.errorMessage}`));
|
|
123
122
|
case 7:
|
|
124
123
|
if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
|
|
@@ -126,7 +125,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
|
|
|
126
125
|
break;
|
|
127
126
|
}
|
|
128
127
|
errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
|
|
129
|
-
errorMsg &&
|
|
128
|
+
errorMsg && message.error(errorMsg);
|
|
130
129
|
onError && onError(_data);
|
|
131
130
|
return _context.abrupt("return", Promise.reject(errorMsg));
|
|
132
131
|
case 12:
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
import "antd/es/drawer/style";
|
|
2
|
-
import _Drawer from "antd/es/drawer";
|
|
3
|
-
import "antd/es/button/style";
|
|
4
|
-
import _Button from "antd/es/button";
|
|
5
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
6
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
7
|
-
import "antd/es/modal/style";
|
|
8
|
-
import _Modal from "antd/es/modal";
|
|
9
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
10
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
5
|
+
import { Button, Drawer, Modal } from 'antd';
|
|
11
6
|
import React, { useCallback, useState, useRef, useEffect } from 'react';
|
|
12
7
|
import { useScroll } from 'ahooks';
|
|
13
8
|
import classNames from 'classnames';
|
|
@@ -84,7 +79,7 @@ var ProDrawer = _ref => {
|
|
|
84
79
|
if (isView || !isConfirmClose || compareSnapshots()) {
|
|
85
80
|
onCancel && onCancel();
|
|
86
81
|
} else if (!modalRef.current) {
|
|
87
|
-
modalRef.current =
|
|
82
|
+
modalRef.current = Modal.confirm(_objectSpread({
|
|
88
83
|
className: 'width430',
|
|
89
84
|
title: locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.isSureClose,
|
|
90
85
|
okText: locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm,
|
|
@@ -192,13 +187,13 @@ var ProDrawer = _ref => {
|
|
|
192
187
|
*/
|
|
193
188
|
var defaultFooter = /*#__PURE__*/_jsxs("div", {
|
|
194
189
|
className: "pro-drawer-footer",
|
|
195
|
-
children: [/*#__PURE__*/_jsx(
|
|
190
|
+
children: [/*#__PURE__*/_jsx(Button, {
|
|
196
191
|
type: "primary",
|
|
197
192
|
onClick: handleFinish,
|
|
198
193
|
loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
|
|
199
194
|
disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
|
|
200
195
|
children: okText
|
|
201
|
-
}), /*#__PURE__*/_jsx(
|
|
196
|
+
}), /*#__PURE__*/_jsx(Button, {
|
|
202
197
|
onClick: onCancel,
|
|
203
198
|
children: cancelText
|
|
204
199
|
})]
|
|
@@ -226,7 +221,7 @@ var ProDrawer = _ref => {
|
|
|
226
221
|
}
|
|
227
222
|
return defaultFooter;
|
|
228
223
|
};
|
|
229
|
-
return /*#__PURE__*/_jsxs(
|
|
224
|
+
return /*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({
|
|
230
225
|
width: width,
|
|
231
226
|
open: open,
|
|
232
227
|
maskClosable: maskClosable,
|
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
-
import "antd/es/modal/style";
|
|
3
|
-
import _Modal from "antd/es/modal";
|
|
4
|
-
import "antd/es/space/style";
|
|
5
|
-
import _Space from "antd/es/space";
|
|
6
|
-
import "antd/es/button/style";
|
|
7
|
-
import _Button from "antd/es/button";
|
|
8
2
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
9
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
10
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
11
5
|
import React, { useCallback, useState, useRef } from 'react';
|
|
6
|
+
import { Space, Button, Modal } from 'antd';
|
|
12
7
|
import { useScroll, useSize } from 'ahooks';
|
|
13
8
|
import classnames from 'classnames';
|
|
14
9
|
import { isArray } from 'lodash';
|
|
@@ -143,11 +138,11 @@ var ProModal = _ref => {
|
|
|
143
138
|
'pro-modal-footer': extraLeft,
|
|
144
139
|
'pro-modal-footer-123': true
|
|
145
140
|
}),
|
|
146
|
-
children: [extraLeft, /*#__PURE__*/_jsxs(
|
|
147
|
-
children: [/*#__PURE__*/_jsx(
|
|
141
|
+
children: [extraLeft, /*#__PURE__*/_jsxs(Space, {
|
|
142
|
+
children: [/*#__PURE__*/_jsx(Button, {
|
|
148
143
|
onClick: onCancel,
|
|
149
144
|
children: cancelText
|
|
150
|
-
}), /*#__PURE__*/_jsx(
|
|
145
|
+
}), /*#__PURE__*/_jsx(Button, {
|
|
151
146
|
type: "primary",
|
|
152
147
|
onClick: handleFinish,
|
|
153
148
|
loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
|
|
@@ -179,7 +174,7 @@ var ProModal = _ref => {
|
|
|
179
174
|
}
|
|
180
175
|
return defaultFooter;
|
|
181
176
|
};
|
|
182
|
-
return /*#__PURE__*/_jsx(
|
|
177
|
+
return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
|
|
183
178
|
className: _className,
|
|
184
179
|
title: title,
|
|
185
180
|
width: width,
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import "antd/es/space/style";
|
|
2
|
-
import _Space from "antd/es/space";
|
|
3
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
4
2
|
import { useEffect } from 'react';
|
|
5
3
|
import { omit } from 'lodash';
|
|
6
4
|
import { InfoCircleOutlined } from '@ant-design/icons';
|
|
5
|
+
import { Space } from 'antd';
|
|
7
6
|
import { ProForm } from "../../index";
|
|
8
7
|
import { matchFormValue } from "../utils";
|
|
9
8
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
@@ -58,7 +57,7 @@ var RenderProForm = props => {
|
|
|
58
57
|
children: primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title
|
|
59
58
|
}), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) !== null && _props7 !== void 0 && _props7.isView) && /*#__PURE__*/_jsx("div", {
|
|
60
59
|
className: "pro-edit-label-tip",
|
|
61
|
-
children: /*#__PURE__*/_jsxs(
|
|
60
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
|
62
61
|
align: "start",
|
|
63
62
|
children: [/*#__PURE__*/_jsx(InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
|
|
64
63
|
})
|
package/es/ProEditLabel/index.js
CHANGED
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
import "antd/es/popconfirm/style";
|
|
2
|
-
import _Popconfirm from "antd/es/popconfirm";
|
|
3
|
-
import "antd/es/input/style";
|
|
4
|
-
import _Input from "antd/es/input";
|
|
5
|
-
import "antd/es/space/style";
|
|
6
|
-
import _Space from "antd/es/space";
|
|
7
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
8
2
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
9
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
10
|
-
import "antd/es/form/style";
|
|
11
|
-
import _Form from "antd/es/form";
|
|
12
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
13
5
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
14
6
|
var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
|
|
15
7
|
import { EditOutlined } from '@ant-design/icons';
|
|
8
|
+
import { Input, Popconfirm, Form, Space } from 'antd';
|
|
16
9
|
import { useToggle, useSetState } from 'ahooks';
|
|
17
10
|
import classnames from 'classnames';
|
|
18
11
|
import React, { useEffect, useRef } from 'react';
|
|
@@ -56,10 +49,10 @@ var ProEditLabel = _ref => {
|
|
|
56
49
|
_useToggle2 = _slicedToArray(_useToggle, 2),
|
|
57
50
|
status = _useToggle2[0],
|
|
58
51
|
toggleStatus = _useToggle2[1].toggle;
|
|
59
|
-
var _Form$useForm =
|
|
52
|
+
var _Form$useForm = Form.useForm(OriginForm),
|
|
60
53
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
61
54
|
form = _Form$useForm2[0];
|
|
62
|
-
var _Form$useForm3 =
|
|
55
|
+
var _Form$useForm3 = Form.useForm(),
|
|
63
56
|
_Form$useForm4 = _slicedToArray(_Form$useForm3, 1),
|
|
64
57
|
viewForm = _Form$useForm4[0];
|
|
65
58
|
var inputRef = useRef(null);
|
|
@@ -222,7 +215,7 @@ var ProEditLabel = _ref => {
|
|
|
222
215
|
var TextNode = /*#__PURE__*/_jsx("div", {
|
|
223
216
|
className: cls,
|
|
224
217
|
style: style,
|
|
225
|
-
children: /*#__PURE__*/_jsxs(
|
|
218
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
|
226
219
|
align: "start",
|
|
227
220
|
children: [mode === 'current' ? props.value : /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
|
|
228
221
|
value: confirmValue,
|
|
@@ -245,7 +238,7 @@ var ProEditLabel = _ref => {
|
|
|
245
238
|
// 当前页编辑模式
|
|
246
239
|
if (mode === 'current') {
|
|
247
240
|
if (status) {
|
|
248
|
-
return /*#__PURE__*/_jsx(
|
|
241
|
+
return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
|
|
249
242
|
ref: inputRef,
|
|
250
243
|
size: size,
|
|
251
244
|
onBlur: e => {
|
|
@@ -271,7 +264,7 @@ var ProEditLabel = _ref => {
|
|
|
271
264
|
}
|
|
272
265
|
return TextNode;
|
|
273
266
|
};
|
|
274
|
-
return /*#__PURE__*/_jsx(
|
|
267
|
+
return /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
|
|
275
268
|
classNames: {
|
|
276
269
|
root: 'pro-edit-label-popconfirm'
|
|
277
270
|
},
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import "antd/es/popconfirm/style";
|
|
2
|
-
import _Popconfirm from "antd/es/popconfirm";
|
|
3
|
-
import "antd/es/button/style";
|
|
4
|
-
import _Button from "antd/es/button";
|
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
6
2
|
import React from 'react';
|
|
3
|
+
import { Button, Popconfirm } from 'antd';
|
|
7
4
|
import { isFunction, omit } from 'lodash';
|
|
8
5
|
import { iconMap } from "../../utils/config";
|
|
9
6
|
import locale from "../../../locale";
|
|
@@ -108,7 +105,7 @@ var ActionButton = _ref => {
|
|
|
108
105
|
var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
|
|
109
106
|
return _isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_jsx(_Fragment, {
|
|
110
107
|
children: ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_jsx(_Fragment, {
|
|
111
|
-
children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(
|
|
108
|
+
children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
|
|
112
109
|
placement: "topRight",
|
|
113
110
|
title: deleteMsgMap[btnConfig.type],
|
|
114
111
|
onConfirm: () => {
|
|
@@ -128,7 +125,7 @@ var ActionButton = _ref => {
|
|
|
128
125
|
record,
|
|
129
126
|
index,
|
|
130
127
|
disabled: isDisabled
|
|
131
|
-
}))) : /*#__PURE__*/_jsx(
|
|
128
|
+
}))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
132
129
|
disabled: isDisabled,
|
|
133
130
|
type: "link",
|
|
134
131
|
children: btnConfig.label
|
|
@@ -148,7 +145,7 @@ var ActionButton = _ref => {
|
|
|
148
145
|
selectedRows
|
|
149
146
|
});
|
|
150
147
|
}
|
|
151
|
-
}))) : /*#__PURE__*/_jsx(
|
|
148
|
+
}))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
152
149
|
disabled: isDisabled,
|
|
153
150
|
type: "link",
|
|
154
151
|
onClick: () => {
|
|
@@ -168,7 +165,7 @@ var ActionButton = _ref => {
|
|
|
168
165
|
children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
169
166
|
record,
|
|
170
167
|
index
|
|
171
|
-
}))) : /*#__PURE__*/_jsx(
|
|
168
|
+
}))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
|
|
172
169
|
className: "action-button"
|
|
173
170
|
}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
|
|
174
171
|
type: "link",
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import "antd/es/table/style";
|
|
2
|
-
import _Table from "antd/es/table";
|
|
3
|
-
import "antd/es/badge/style";
|
|
4
|
-
import _Badge from "antd/es/badge";
|
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
6
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
7
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
8
4
|
var _excluded = ["tableProps"];
|
|
9
5
|
import { memo, useCallback } from 'react';
|
|
6
|
+
import { Badge, Table } from 'antd';
|
|
10
7
|
import { isFunction, isNumber } from 'lodash';
|
|
11
8
|
import useEditTableError from "../../utils/useEditTableError";
|
|
12
9
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
@@ -92,7 +89,7 @@ var BaseTable = _ref => {
|
|
|
92
89
|
itemRender: (index, type, originalElement) => {
|
|
93
90
|
return type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
|
|
94
91
|
className: "pro-edit-table-pagination-item-badge",
|
|
95
|
-
children: [/*#__PURE__*/_jsx(
|
|
92
|
+
children: [/*#__PURE__*/_jsx(Badge, {
|
|
96
93
|
count: errorLength
|
|
97
94
|
}), originalElement]
|
|
98
95
|
}) : originalElement;
|
|
@@ -108,7 +105,7 @@ var BaseTable = _ref => {
|
|
|
108
105
|
children: [headerRender ? /*#__PURE__*/_jsx("div", {
|
|
109
106
|
className: "pro-edit-table-header",
|
|
110
107
|
children: isFunction(headerRender) ? headerRender() : headerRender
|
|
111
|
-
}) : null, /*#__PURE__*/_jsx(
|
|
108
|
+
}) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
|
|
112
109
|
ref: tableRef
|
|
113
110
|
}, nextTableProps))]
|
|
114
111
|
});
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import "antd/es/table/style";
|
|
2
|
-
import _Table from "antd/es/table";
|
|
3
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
4
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
5
3
|
var _excluded = ["disabled", "children"],
|
|
6
4
|
_excluded2 = ["tableProps", "draggableProps"];
|
|
5
|
+
import { Table } from 'antd';
|
|
7
6
|
import React, { memo, useCallback } from 'react';
|
|
8
7
|
import { DndContext } from '@dnd-kit/core';
|
|
9
8
|
import { isNumber } from 'lodash';
|
|
@@ -196,7 +195,7 @@ var DraggableTable = _ref3 => {
|
|
|
196
195
|
children: [headerRender ? /*#__PURE__*/_jsx("div", {
|
|
197
196
|
className: "pro-edit-table-header",
|
|
198
197
|
children: typeof headerRender === 'function' ? headerRender() : headerRender
|
|
199
|
-
}) : null, /*#__PURE__*/_jsx(
|
|
198
|
+
}) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
|
|
200
199
|
ref: tableRef
|
|
201
200
|
}, nextTableProps))]
|
|
202
201
|
});
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import "antd/es/tooltip/style";
|
|
2
|
-
import _Tooltip from "antd/es/tooltip";
|
|
3
|
-
import "antd/es/space/style";
|
|
4
|
-
import _Space from "antd/es/space";
|
|
5
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
6
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
7
3
|
var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
|
|
8
4
|
import React, { useMemo } from 'react';
|
|
5
|
+
import { Space, Tooltip } from 'antd';
|
|
9
6
|
import classnames from 'classnames';
|
|
10
7
|
import { get } from 'lodash';
|
|
11
8
|
import { diffOriginal } from "../../utils/diffOriginal";
|
|
@@ -195,7 +192,7 @@ var ListChangedWrapper = props => {
|
|
|
195
192
|
'pro-form-item-add': isAdd
|
|
196
193
|
});
|
|
197
194
|
var open = tipOpenCalc();
|
|
198
|
-
return /*#__PURE__*/_jsx(
|
|
195
|
+
return /*#__PURE__*/_jsx(Tooltip, {
|
|
199
196
|
open: open,
|
|
200
197
|
getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
|
|
201
198
|
classNames: {
|
|
@@ -203,14 +200,14 @@ var ListChangedWrapper = props => {
|
|
|
203
200
|
},
|
|
204
201
|
placement: "topLeft",
|
|
205
202
|
autoAdjustOverflow: false,
|
|
206
|
-
title: /*#__PURE__*/_jsxs(
|
|
203
|
+
title: /*#__PURE__*/_jsxs(Space, {
|
|
207
204
|
direction: "vertical",
|
|
208
205
|
className: "changed-tooltip",
|
|
209
|
-
children: [/*#__PURE__*/_jsxs(
|
|
206
|
+
children: [/*#__PURE__*/_jsxs(Space, {
|
|
210
207
|
align: "start",
|
|
211
208
|
className: "original-value-container",
|
|
212
209
|
children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
|
|
213
|
-
}), _showEllipse && /*#__PURE__*/_jsxs(
|
|
210
|
+
}), _showEllipse && /*#__PURE__*/_jsxs(Space, {
|
|
214
211
|
className: "current-value-container",
|
|
215
212
|
children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
|
|
216
213
|
isView: true
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import "antd/es/form/style";
|
|
2
|
-
import _Form from "antd/es/form";
|
|
3
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
4
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
5
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
@@ -8,6 +6,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
|
|
|
8
6
|
/* eslint-disable prefer-destructuring */
|
|
9
7
|
/* eslint-disable prefer-const */
|
|
10
8
|
import React, { useEffect, useCallback, useMemo, memo, useRef } from 'react';
|
|
9
|
+
import { Form } from 'antd';
|
|
11
10
|
import classNames from 'classnames';
|
|
12
11
|
import { cloneDeep, isEqual, debounce, omit, isFunction, isEqualWith } from 'lodash';
|
|
13
12
|
import { compatStartTransition, customEqualForFunction } from "../../../utils";
|
|
@@ -24,6 +23,7 @@ import { isSelect, isTrim } from "../../../ProForm/utils";
|
|
|
24
23
|
import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
|
|
25
24
|
import { getDefaultProps } from "../../utils/getDefaultProps";
|
|
26
25
|
import ListChangedWrapper from "./ListChangedWrapper";
|
|
26
|
+
import useShouldUpdateForTable from "../../utils/useShouldUpdateForTable";
|
|
27
27
|
import { Fragment as _Fragment } from "react/jsx-runtime";
|
|
28
28
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
29
29
|
var RenderField = _ref => {
|
|
@@ -59,8 +59,6 @@ var RenderField = _ref => {
|
|
|
59
59
|
dependencies = column.dependencies,
|
|
60
60
|
desensitization = column.desensitization,
|
|
61
61
|
resetProps = _objectWithoutProperties(column, _excluded);
|
|
62
|
-
// editRender弃用使用component同ProForm
|
|
63
|
-
var _editRender = component || editRender;
|
|
64
62
|
var mode = config.mode,
|
|
65
63
|
cellName = config.cellName,
|
|
66
64
|
cellNamePath = config.cellNamePath,
|
|
@@ -77,13 +75,17 @@ var RenderField = _ref => {
|
|
|
77
75
|
validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
|
|
78
76
|
otherProps = config.otherProps,
|
|
79
77
|
diffConfig = config.diffConfig,
|
|
80
|
-
getIsNew = config.getIsNew
|
|
78
|
+
getIsNew = config.getIsNew,
|
|
79
|
+
shouldUpdateDebounce = config.shouldUpdateDebounce;
|
|
81
80
|
var _fieldProps = fieldProps || formItemProps || {};
|
|
82
81
|
var _rules = rules || [];
|
|
83
82
|
var _required = required;
|
|
84
83
|
var _valueType = valueType;
|
|
85
84
|
var _disabled = false;
|
|
86
85
|
var _desensitization = desensitization || [];
|
|
86
|
+
|
|
87
|
+
// editRender弃用使用component同ProForm
|
|
88
|
+
var _editRender = component || editRender;
|
|
87
89
|
var isCell = mode === 'cell';
|
|
88
90
|
if (isCell) {
|
|
89
91
|
record['is-view'] = !isEqual(cellNamePath, cellName);
|
|
@@ -113,21 +115,34 @@ var RenderField = _ref => {
|
|
|
113
115
|
// 行参数 - 使用useMemo优化
|
|
114
116
|
var rowParams = useMemo(() => [currentValue, rowData, options], [currentValue, rowData, options]);
|
|
115
117
|
|
|
118
|
+
// 使用 hook 处理动态属性(带选择性防抖)
|
|
119
|
+
var dynamicProps = useShouldUpdateForTable({
|
|
120
|
+
rowParams,
|
|
121
|
+
column,
|
|
122
|
+
shouldUpdateDebounce
|
|
123
|
+
});
|
|
124
|
+
|
|
116
125
|
// required & rules & fieldProps & disabled & valueType 函数化处理
|
|
126
|
+
// 优先使用 hook 返回的值,fallback 到原始值
|
|
117
127
|
if (isFunction(required)) {
|
|
118
|
-
|
|
128
|
+
var _dynamicProps$require;
|
|
129
|
+
_required = (_dynamicProps$require = dynamicProps.required) !== null && _dynamicProps$require !== void 0 ? _dynamicProps$require : required(...rowParams);
|
|
119
130
|
}
|
|
120
131
|
if (isFunction(fieldProps)) {
|
|
121
|
-
|
|
132
|
+
var _dynamicProps$fieldPr;
|
|
133
|
+
_fieldProps = (_dynamicProps$fieldPr = dynamicProps.fieldProps) !== null && _dynamicProps$fieldPr !== void 0 ? _dynamicProps$fieldPr : fieldProps(...rowParams);
|
|
122
134
|
}
|
|
123
135
|
if (isFunction(rules)) {
|
|
124
|
-
|
|
136
|
+
var _dynamicProps$rules;
|
|
137
|
+
_rules = (_dynamicProps$rules = dynamicProps.rules) !== null && _dynamicProps$rules !== void 0 ? _dynamicProps$rules : rules(...rowParams);
|
|
125
138
|
}
|
|
126
139
|
if (isFunction(valueType)) {
|
|
127
|
-
|
|
140
|
+
var _dynamicProps$valueTy;
|
|
141
|
+
_valueType = (_dynamicProps$valueTy = dynamicProps.valueType) !== null && _dynamicProps$valueTy !== void 0 ? _dynamicProps$valueTy : valueType(...rowParams);
|
|
128
142
|
}
|
|
129
143
|
if (isFunction(desensitization)) {
|
|
130
|
-
|
|
144
|
+
var _dynamicProps$desensi;
|
|
145
|
+
_desensitization = (_dynamicProps$desensi = dynamicProps.desensitization) !== null && _dynamicProps$desensi !== void 0 ? _dynamicProps$desensi : desensitization(...rowParams);
|
|
131
146
|
}
|
|
132
147
|
|
|
133
148
|
// 获取最终的disabled
|
|
@@ -139,8 +154,11 @@ var RenderField = _ref => {
|
|
|
139
154
|
columnFieldProps: _fieldProps,
|
|
140
155
|
params: rowParams
|
|
141
156
|
});
|
|
157
|
+
|
|
158
|
+
// isEditable 处理 - 优先使用 hook 返回的值
|
|
142
159
|
if (isFunction(isEditable)) {
|
|
143
|
-
|
|
160
|
+
var _dynamicProps$isEdita;
|
|
161
|
+
isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(...rowParams);
|
|
144
162
|
}
|
|
145
163
|
|
|
146
164
|
// 是否只读文本
|
|
@@ -647,7 +665,7 @@ var RenderField = _ref => {
|
|
|
647
665
|
children: FieldComponent
|
|
648
666
|
}));
|
|
649
667
|
}
|
|
650
|
-
FormItem = TargetComponent ? /*#__PURE__*/_jsx(
|
|
668
|
+
FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
|
|
651
669
|
validateFirst: true
|
|
652
670
|
}, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
|
|
653
671
|
// 移除非必要字段
|
|
@@ -658,7 +676,7 @@ var RenderField = _ref => {
|
|
|
658
676
|
viewEmpty: viewEmpty
|
|
659
677
|
});
|
|
660
678
|
if (type === 'FormList') {
|
|
661
|
-
FormItem = /*#__PURE__*/_jsx(
|
|
679
|
+
FormItem = /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
|
|
662
680
|
name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
|
|
663
681
|
}, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
|
|
664
682
|
children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
|
|
@@ -673,7 +691,7 @@ var RenderField = _ref => {
|
|
|
673
691
|
}, [TargetComponent, componentProps, originalValues, record, cellName, names, baseName, index, dataIndex, originalName, originalNames, type, finalFormItemProps, viewRender, diffConfig, _className, formNamePath, viewEmpty, otherProps, getIsNew]);
|
|
674
692
|
return /*#__PURE__*/_jsx(FieldProvider, {
|
|
675
693
|
value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
|
|
676
|
-
children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(
|
|
694
|
+
children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(Form.Item, {
|
|
677
695
|
noStyle: true,
|
|
678
696
|
shouldUpdate: finalFormItemProps.shouldUpdate,
|
|
679
697
|
children: () => getFieldItem()
|
|
@@ -757,5 +775,21 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
|
|
|
757
775
|
return false;
|
|
758
776
|
}
|
|
759
777
|
}
|
|
778
|
+
|
|
779
|
+
// 特殊处理:当使用自定义 component 函数时,比较整个 record 对象
|
|
780
|
+
// 因为自定义组件可能依赖 record 中的其他字段(不只是当前列的 dataIndex)
|
|
781
|
+
if (isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.component) || isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.component)) {
|
|
782
|
+
// 浅比较 record 的所有属性
|
|
783
|
+
var prevKeys = Object.keys(prevRecord || {});
|
|
784
|
+
var nextKeys = Object.keys(nextRecord || {});
|
|
785
|
+
if (prevKeys.length !== nextKeys.length) {
|
|
786
|
+
return false;
|
|
787
|
+
}
|
|
788
|
+
|
|
789
|
+
// 使用 some 方法代替 for 循环
|
|
790
|
+
if (prevKeys.some(key => (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord[key]))) {
|
|
791
|
+
return false;
|
|
792
|
+
}
|
|
793
|
+
}
|
|
760
794
|
return true;
|
|
761
795
|
});
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import "antd/es/space/style";
|
|
2
|
-
import _Space from "antd/es/space";
|
|
3
1
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
4
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
5
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
6
4
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
7
5
|
var _excluded = ["type", "label", "show", "onHandle", "needConfirm", "onClick"];
|
|
8
6
|
import React from 'react';
|
|
7
|
+
import { Space } from 'antd';
|
|
9
8
|
import { actions, defaultBtnNameMap, defaultToolbarKeys } from "../../utils/config";
|
|
10
9
|
import ActionButton from "../ActionButton";
|
|
11
10
|
import { getNamePath } from "../../utils/tools";
|
|
@@ -130,7 +129,7 @@ var RenderToolbar = config => {
|
|
|
130
129
|
}, `${btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.label}${btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type}`);
|
|
131
130
|
});
|
|
132
131
|
};
|
|
133
|
-
return /*#__PURE__*/_jsx(
|
|
132
|
+
return /*#__PURE__*/_jsx(Space, {
|
|
134
133
|
children: renderToolbarBtns()
|
|
135
134
|
});
|
|
136
135
|
};
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import _Table from "antd/es/table";
|
|
3
|
-
import "antd/es/space/style";
|
|
4
|
-
import _Space from "antd/es/space";
|
|
1
|
+
import { Table, Space } from 'antd';
|
|
5
2
|
import { tools } from '@zat-design/utils';
|
|
6
3
|
import { valueTypeRender } from "../../../ProUtils/utils";
|
|
7
4
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
@@ -64,17 +61,17 @@ var Summary = _ref3 => {
|
|
|
64
61
|
if (!(data !== null && data !== void 0 && data.length)) {
|
|
65
62
|
return null;
|
|
66
63
|
}
|
|
67
|
-
return /*#__PURE__*/_jsx(
|
|
64
|
+
return /*#__PURE__*/_jsx(Table.Summary, {
|
|
68
65
|
fixed: fixed,
|
|
69
|
-
children: /*#__PURE__*/_jsx(
|
|
66
|
+
children: /*#__PURE__*/_jsx(Table.Summary.Row, {
|
|
70
67
|
children: nextColumns.map(item => {
|
|
71
68
|
var index = item.index,
|
|
72
69
|
colSpan = item.colSpan,
|
|
73
70
|
prefix = item.prefix;
|
|
74
|
-
return /*#__PURE__*/_jsx(
|
|
71
|
+
return /*#__PURE__*/_jsx(Table.Summary.Cell, {
|
|
75
72
|
index: index,
|
|
76
73
|
colSpan: colSpan,
|
|
77
|
-
children: /*#__PURE__*/_jsxs(
|
|
74
|
+
children: /*#__PURE__*/_jsxs(Space, {
|
|
78
75
|
children: [prefix, /*#__PURE__*/_jsx("span", {
|
|
79
76
|
children: renderCell(item)
|
|
80
77
|
})]
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
import "antd/es/form/style";
|
|
2
|
-
import _Form from "antd/es/form";
|
|
3
|
-
import "antd/es/message/style";
|
|
4
|
-
import _message from "antd/es/message";
|
|
5
1
|
import { memo } from 'react';
|
|
2
|
+
import { Form, message } from 'antd';
|
|
6
3
|
import { Fragment as _Fragment } from "react/jsx-runtime";
|
|
7
4
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
8
5
|
var Validator = _ref => {
|
|
@@ -11,7 +8,7 @@ var Validator = _ref => {
|
|
|
11
8
|
editingKeys = _ref.editingKeys,
|
|
12
9
|
onlyOneLineMsg = _ref.onlyOneLineMsg;
|
|
13
10
|
return /*#__PURE__*/_jsx(_Fragment, {
|
|
14
|
-
children: name && virtualKey ? /*#__PURE__*/_jsx(
|
|
11
|
+
children: name && virtualKey ? /*#__PURE__*/_jsx(Form.Item, {
|
|
15
12
|
noStyle: true,
|
|
16
13
|
validateFirst: true,
|
|
17
14
|
name: `${name}-${virtualKey}`,
|
|
@@ -19,7 +16,7 @@ var Validator = _ref => {
|
|
|
19
16
|
// 单行编辑下,校验当前数据是否已保存
|
|
20
17
|
validator: () => {
|
|
21
18
|
if (editingKeys !== null && editingKeys !== void 0 && editingKeys.length) {
|
|
22
|
-
|
|
19
|
+
message.warning(onlyOneLineMsg);
|
|
23
20
|
return Promise.reject();
|
|
24
21
|
}
|
|
25
22
|
return Promise.resolve();
|