@zat-design/sisyphus-react 3.13.7 → 3.13.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/ProAction/components/CheckModalContent/index.css +22 -0
- package/es/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/es/ProAction/components/CheckModalContent/index.js +38 -0
- package/es/ProAction/components/CheckModalContent/index.less +28 -0
- package/es/ProAction/index.js +39 -41
- package/es/ProAction/index.less +5 -6
- package/es/ProAction/propsType.d.ts +8 -6
- package/es/ProDownload/index.js +4 -3
- package/es/ProDownload/utils.js +5 -4
- package/es/ProDrawerForm/components/ProDrawer/index.js +2 -2
- package/es/ProDrawerForm/components/ProModal/index.js +2 -2
- package/es/ProEditLabel/components/RenderProForm.js +3 -3
- package/es/ProEditLabel/index.js +2 -2
- package/es/ProEditTable/components/ActionButton/index.js +9 -8
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +6 -6
- package/es/ProEditTable/components/RenderField/index.js +20 -16
- package/es/ProEditTable/index.js +10 -7
- package/es/ProEditTable/utils/config.js +3 -3
- package/es/ProEditTable/utils/diffOriginal.js +6 -4
- package/es/ProEditTable/utils/getDefaultProps.js +8 -7
- package/es/ProEditTable/utils/index.js +21 -18
- package/es/ProEditTable/utils/tools.js +32 -24
- package/es/ProEditTable/utils/useEditTableError.js +2 -2
- package/es/ProEnum/index.js +16 -11
- package/es/ProEnum/utils/eventCenter.js +2 -2
- package/es/ProEnum/utils/getEnumLabel.js +5 -4
- package/es/ProEnum/utils/index.js +3 -2
- package/es/ProForm/components/base/DatePicker/index.js +11 -8
- package/es/ProForm/components/base/Input/index.js +3 -3
- package/es/ProForm/components/base/InputNumber/index.js +6 -4
- package/es/ProForm/components/base/RangePicker/index.js +12 -8
- package/es/ProForm/components/base/Select/index.js +2 -2
- package/es/ProForm/components/base/Switch/index.js +3 -2
- package/es/ProForm/components/base/SwitchCheckbox/index.js +3 -2
- package/es/ProForm/components/base/TextArea/index.js +2 -2
- package/es/ProForm/components/combination/Container/index.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +7 -6
- package/es/ProForm/components/combination/FormList/components/BlockFields.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +5 -4
- package/es/ProForm/components/combination/FormList/index.js +2 -2
- package/es/ProForm/components/combination/FormList/utils.js +2 -2
- package/es/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/es/ProForm/components/combination/Group/index.js +2 -2
- package/es/ProForm/components/combination/Group/utils.js +6 -6
- package/es/ProForm/components/combination/ProCascader/index.js +6 -4
- package/es/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/combination/ProModalSelect/index.js +13 -10
- package/es/ProForm/components/combination/ProNumberRange/index.js +2 -2
- package/es/ProForm/components/combination/ProRangeLimit/index.js +8 -5
- package/es/ProForm/components/combination/ProTimeLimit/index.js +10 -7
- package/es/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/es/ProForm/components/old/EnumSelect/index.js +3 -3
- package/es/ProForm/components/render/ChangedWrapper.js +3 -3
- package/es/ProForm/components/render/ConfirmWrapper.js +4 -3
- package/es/ProForm/components/render/Render.js +17 -13
- package/es/ProForm/components/render/RenderFields.js +9 -6
- package/es/ProForm/index.js +6 -4
- package/es/ProForm/utils/_useChanged.js +3 -3
- package/es/ProForm/utils/_useListChanged.js +6 -6
- package/es/ProForm/utils/diffOriginal.js +6 -4
- package/es/ProForm/utils/getDefaultProps.js +7 -6
- package/es/ProForm/utils/index.js +20 -15
- package/es/ProForm/utils/rulesCreator.js +4 -3
- package/es/ProForm/utils/transformNames.js +2 -2
- package/es/ProForm/utils/transformValue.js +3 -3
- package/es/ProForm/utils/useDeepCompareMemo.js +2 -2
- package/es/ProForm/utils/useRules.js +4 -3
- package/es/ProForm/utils/useShouldUpdate.js +23 -21
- package/es/ProForm/utils/useWatch.js +2 -2
- package/es/ProForm/utils/valueType.js +2 -2
- package/es/ProIcon/index.js +2 -2
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +2 -2
- package/es/ProLayout/components/ProCollapse/index.js +2 -2
- package/es/ProLayout/components/ProHeader/index.js +12 -9
- package/es/ProLayout/utils/index.js +3 -2
- package/es/ProSelect/index.js +11 -7
- package/es/ProSelect/utils/index.js +5 -3
- package/es/ProStep/components/Item/index.js +2 -2
- package/es/ProStep/components/Listener/index.js +2 -2
- package/es/ProStep/components/Step/index.js +2 -2
- package/es/ProStep/index.js +2 -2
- package/es/ProStep/utils/index.js +4 -3
- package/es/ProStepTab/index.js +3 -3
- package/es/ProTable/components/FormatColumn/index.js +16 -12
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/es/ProTable/components/RenderColumn/index.js +2 -2
- package/es/ProTable/components/RenderSummary/index.js +3 -3
- package/es/ProTable/hooks/useAntdTable.js +15 -10
- package/es/ProTable/index.js +12 -7
- package/es/ProTable/utils/index.js +5 -4
- package/es/ProTabs/index.js +2 -2
- package/es/ProThemeTools/index.js +2 -2
- package/es/ProTree/components/ProTree.js +5 -4
- package/es/ProTree/components/ProTreeSelect/index.js +6 -5
- package/es/ProTreeModal/index.js +5 -4
- package/es/ProUpload/components/ImageRender.js +2 -2
- package/es/ProUpload/index.js +5 -4
- package/es/old/ProEditableTable/index.js +7 -7
- package/es/old/ProEditableTable/utils.js +2 -2
- package/lib/ProAction/components/CheckModalContent/index.css +22 -0
- package/lib/ProAction/components/CheckModalContent/index.d.ts +8 -0
- package/lib/ProAction/components/CheckModalContent/index.js +45 -0
- package/lib/ProAction/components/CheckModalContent/index.less +28 -0
- package/lib/ProAction/index.js +45 -44
- package/lib/ProAction/index.less +5 -6
- package/lib/ProAction/propsType.d.ts +8 -6
- package/lib/ProConfigProvider/index.js +3 -2
- package/lib/ProDownload/index.js +7 -6
- package/lib/ProDownload/utils.js +9 -7
- package/lib/ProDrawerForm/components/ProDrawer/index.js +12 -7
- package/lib/ProDrawerForm/components/ProModal/index.js +12 -7
- package/lib/ProEditLabel/components/RenderProForm.js +6 -5
- package/lib/ProEditLabel/index.js +15 -8
- package/lib/ProEditTable/components/ActionButton/index.js +15 -11
- package/lib/ProEditTable/components/RcTable/BaseTable.js +6 -3
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +3 -2
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +14 -11
- package/lib/ProEditTable/components/RenderField/index.js +25 -20
- package/lib/ProEditTable/components/RenderToolbar/index.js +3 -2
- package/lib/ProEditTable/components/Summary/index.js +8 -5
- package/lib/ProEditTable/components/Validator/index.js +7 -3
- package/lib/ProEditTable/index.js +20 -12
- package/lib/ProEditTable/utils/config.js +8 -7
- package/lib/ProEditTable/utils/diffOriginal.js +7 -4
- package/lib/ProEditTable/utils/getDefaultProps.js +8 -7
- package/lib/ProEditTable/utils/index.js +27 -21
- package/lib/ProEditTable/utils/tools.js +32 -24
- package/lib/ProEditTable/utils/useEditTableError.js +2 -2
- package/lib/ProEnum/index.js +31 -19
- package/lib/ProEnum/utils/eventCenter.js +2 -2
- package/lib/ProEnum/utils/getEnumLabel.js +5 -4
- package/lib/ProEnum/utils/index.js +3 -2
- package/lib/ProForm/components/Container.js +3 -2
- package/lib/ProForm/components/FormFooter/index.js +7 -4
- package/lib/ProForm/components/base/Checkbox/index.js +4 -3
- package/lib/ProForm/components/base/DatePicker/index.js +14 -10
- package/lib/ProForm/components/base/Input/index.js +6 -5
- package/lib/ProForm/components/base/InputNumber/index.js +12 -7
- package/lib/ProForm/components/base/Radio/index.js +4 -3
- package/lib/ProForm/components/base/RangePicker/index.js +15 -10
- package/lib/ProForm/components/base/Select/index.js +5 -4
- package/lib/ProForm/components/base/Switch/index.js +6 -4
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +6 -4
- package/lib/ProForm/components/base/TextArea/index.js +5 -4
- package/lib/ProForm/components/base/TimePicker/index.js +3 -2
- package/lib/ProForm/components/combination/Container/index.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +16 -10
- package/lib/ProForm/components/combination/FormList/components/BlockFields.js +8 -5
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/LineFields.js +3 -2
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +10 -6
- package/lib/ProForm/components/combination/FormList/index.js +5 -4
- package/lib/ProForm/components/combination/FormList/utils.js +2 -2
- package/lib/ProForm/components/combination/Group/hooks/index.js +4 -3
- package/lib/ProForm/components/combination/Group/index.js +6 -5
- package/lib/ProForm/components/combination/Group/utils.js +10 -9
- package/lib/ProForm/components/combination/ProCascader/index.js +14 -7
- package/lib/ProForm/components/combination/ProCascader/utils/index.js +2 -2
- package/lib/ProForm/components/combination/ProCombination/index.js +9 -4
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/combination/ProModalSelect/index.js +35 -19
- package/lib/ProForm/components/combination/ProNumberRange/index.js +17 -10
- package/lib/ProForm/components/combination/ProRangeLimit/index.js +17 -9
- package/lib/ProForm/components/combination/ProTimeLimit/index.js +19 -11
- package/lib/ProForm/components/old/EnumSelect/hooks/useRequestList.js +3 -3
- package/lib/ProForm/components/old/EnumSelect/index.js +15 -8
- package/lib/ProForm/components/old/InputRange/index.js +8 -5
- package/lib/ProForm/components/old/InputWithSuffix/index.js +4 -3
- package/lib/ProForm/components/old/ProAddress/index.js +18 -11
- package/lib/ProForm/components/old/ProCertNo/index.js +12 -7
- package/lib/ProForm/components/old/ProCertValidity/index.js +11 -6
- package/lib/ProForm/components/old/ProRangeBox/index.js +21 -12
- package/lib/ProForm/components/render/ChangedWrapper.js +11 -8
- package/lib/ProForm/components/render/ConfirmWrapper.js +8 -6
- package/lib/ProForm/components/render/Render.js +34 -23
- package/lib/ProForm/components/render/RenderFields.js +9 -6
- package/lib/ProForm/index.js +21 -12
- package/lib/ProForm/utils/_useChanged.js +7 -5
- package/lib/ProForm/utils/_useListChanged.js +10 -8
- package/lib/ProForm/utils/diffOriginal.js +7 -4
- package/lib/ProForm/utils/getDefaultProps.js +8 -6
- package/lib/ProForm/utils/index.js +20 -15
- package/lib/ProForm/utils/rulesCreator.js +4 -3
- package/lib/ProForm/utils/transformNames.js +3 -2
- package/lib/ProForm/utils/transformValue.js +3 -3
- package/lib/ProForm/utils/useDeepCompareMemo.js +3 -2
- package/lib/ProForm/utils/useForm.js +3 -2
- package/lib/ProForm/utils/useRules.js +4 -3
- package/lib/ProForm/utils/useShouldUpdate.js +23 -21
- package/lib/ProForm/utils/useWatch.js +2 -2
- package/lib/ProForm/utils/valueType.js +2 -2
- package/lib/ProIcon/index.js +13 -8
- package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js +6 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +5 -4
- package/lib/ProLayout/components/ProCollapse/index.js +13 -8
- package/lib/ProLayout/components/ProFooter/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/Copy/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js +3 -2
- package/lib/ProLayout/components/ProHeader/index.js +37 -25
- package/lib/ProLayout/index.js +3 -2
- package/lib/ProLayout/utils/index.js +2 -2
- package/lib/ProSelect/components/AdaptiveTooltip.js +3 -2
- package/lib/ProSelect/index.js +25 -14
- package/lib/ProSelect/utils/index.js +4 -4
- package/lib/ProStep/components/Anchor/index.js +3 -2
- package/lib/ProStep/components/Item/index.js +2 -2
- package/lib/ProStep/components/Listener/index.js +2 -2
- package/lib/ProStep/components/Step/index.js +2 -2
- package/lib/ProStep/index.js +2 -2
- package/lib/ProStep/utils/index.js +4 -3
- package/lib/ProStepTab/index.js +3 -3
- package/lib/ProTable/components/FormatColumn/index.js +26 -21
- package/lib/ProTable/components/RcTable/components/BaseTable/index.js +3 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +3 -3
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.js +3 -2
- package/lib/ProTable/components/RenderColumn/index.js +17 -12
- package/lib/ProTable/components/RenderSummary/index.js +8 -7
- package/lib/ProTable/components/RenderTableHeader/index.js +5 -3
- package/lib/ProTable/components/RenderTabs/index.js +6 -3
- package/lib/ProTable/components/TooltipTitle/index.js +3 -2
- package/lib/ProTable/hooks/useAntdTable.js +21 -13
- package/lib/ProTable/index.js +12 -7
- package/lib/ProTable/utils/index.js +5 -4
- package/lib/ProTabs/components/Card/index.js +11 -5
- package/lib/ProTabs/index.js +5 -4
- package/lib/ProThemeTools/component/ProTools/index.js +19 -12
- package/lib/ProThemeTools/index.js +12 -9
- package/lib/ProThemeTools/utils/index.js +3 -2
- package/lib/ProTooltip/index.js +5 -4
- package/lib/ProTree/components/AdaptiveTooltip.js +4 -2
- package/lib/ProTree/components/List.js +4 -3
- package/lib/ProTree/components/ProTree.js +17 -9
- package/lib/ProTree/components/ProTreeSelect/index.js +22 -14
- package/lib/ProTree/components/Tree.js +6 -3
- package/lib/ProTreeModal/components/Cascader.js +4 -3
- package/lib/ProTreeModal/components/List.js +14 -9
- package/lib/ProTreeModal/components/SortableItem.js +3 -2
- package/lib/ProTreeModal/components/Tree.js +4 -3
- package/lib/ProTreeModal/components/Trigger.js +11 -6
- package/lib/ProTreeModal/index.js +21 -13
- package/lib/ProUpload/components/ButtonRender.js +6 -3
- package/lib/ProUpload/components/DragRender.js +3 -2
- package/lib/ProUpload/components/FileItem.js +15 -10
- package/lib/ProUpload/components/ImageRender.js +19 -10
- package/lib/ProUpload/index.js +9 -7
- package/lib/ProViewer/index.js +9 -4
- package/lib/old/ProCertValidity/index.js +11 -6
- package/lib/old/ProEditableTable/index.js +36 -23
- package/lib/old/ProEditableTable/utils.js +35 -18
- package/package.json +2 -1
@@ -0,0 +1,22 @@
|
|
1
|
+
.pro-action-check-modal-box .res-err-list .err-tip {
|
2
|
+
color: #666;
|
3
|
+
}
|
4
|
+
.pro-action-check-modal-box .res-err-list .err-item {
|
5
|
+
box-sizing: border-box;
|
6
|
+
padding-left: 6px;
|
7
|
+
color: #333;
|
8
|
+
border-radius: 4px;
|
9
|
+
}
|
10
|
+
.pro-action-check-modal-box .res-err-list .err-item:hover {
|
11
|
+
background-color: #f0f0f0;
|
12
|
+
}
|
13
|
+
.pro-action-check-modal-box .res-err-list .list-wrap {
|
14
|
+
box-sizing: border-box;
|
15
|
+
max-height: 50vh;
|
16
|
+
margin: 12px 0;
|
17
|
+
padding: 4px;
|
18
|
+
overflow-y: auto;
|
19
|
+
line-height: 1.8;
|
20
|
+
border: 1px solid #ccc;
|
21
|
+
border-radius: 6px;
|
22
|
+
}
|
@@ -0,0 +1,8 @@
|
|
1
|
+
import './index.less';
|
2
|
+
interface propsWithCheckModal {
|
3
|
+
errorTitle?: string;
|
4
|
+
list?: string[];
|
5
|
+
[key: string]: any;
|
6
|
+
}
|
7
|
+
declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
|
8
|
+
export default CheckModalContent;
|
@@ -0,0 +1,38 @@
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
2
|
+
/*
|
3
|
+
* @Author: za-xuwenli xuwenli@zhongan.io
|
4
|
+
* @Date: 2025-02-17 11:49:02
|
5
|
+
* @LastEditors: za-xuwenli xuwenli@zhongan.io
|
6
|
+
* @LastEditTime: 2025-05-29 13:55:34
|
7
|
+
* @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
|
8
|
+
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
9
|
+
*/
|
10
|
+
import './index.less';
|
11
|
+
var CheckModalContent = function CheckModalContent(props) {
|
12
|
+
var _ref = props !== null && props !== void 0 ? props : {},
|
13
|
+
errorTitle = _ref.errorTitle,
|
14
|
+
_ref$list = _ref.list,
|
15
|
+
list = _ref$list === void 0 ? [] : _ref$list;
|
16
|
+
return _jsx("div", {
|
17
|
+
className: "pro-action-check-modal-box",
|
18
|
+
children: _jsxs("div", {
|
19
|
+
className: "res-err-list",
|
20
|
+
children: [_jsx("span", {
|
21
|
+
className: "err-tip",
|
22
|
+
children: errorTitle
|
23
|
+
}), Array.isArray(list) && list.length === 1 ? _jsx("span", {
|
24
|
+
className: "err-item",
|
25
|
+
children: list[0]
|
26
|
+
}) : null, Array.isArray(list) && list.length > 1 ? _jsx("div", {
|
27
|
+
className: "list-wrap",
|
28
|
+
children: list.map(function (item) {
|
29
|
+
return _jsx("div", {
|
30
|
+
className: "err-item",
|
31
|
+
children: item
|
32
|
+
});
|
33
|
+
})
|
34
|
+
}) : null]
|
35
|
+
})
|
36
|
+
});
|
37
|
+
};
|
38
|
+
export default CheckModalContent;
|
@@ -0,0 +1,28 @@
|
|
1
|
+
.pro-action-check-modal-box {
|
2
|
+
.res-err-list {
|
3
|
+
.err-tip {
|
4
|
+
color: #666;
|
5
|
+
}
|
6
|
+
|
7
|
+
.err-item {
|
8
|
+
box-sizing: border-box;
|
9
|
+
padding-left: 6px;
|
10
|
+
color: #333;
|
11
|
+
border-radius: 4px;
|
12
|
+
&:hover {
|
13
|
+
background-color: #f0f0f0;
|
14
|
+
}
|
15
|
+
}
|
16
|
+
|
17
|
+
.list-wrap {
|
18
|
+
box-sizing: border-box;
|
19
|
+
max-height: 50vh;
|
20
|
+
margin: 12px 0;
|
21
|
+
padding: 4px;
|
22
|
+
overflow-y: auto;
|
23
|
+
line-height: 1.8;
|
24
|
+
border: 1px solid #ccc;
|
25
|
+
border-radius: 6px;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|
package/es/ProAction/index.js
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
1
2
|
import "antd/es/popconfirm/style";
|
2
3
|
import _Popconfirm from "antd/es/popconfirm";
|
3
4
|
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
@@ -6,10 +7,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
6
7
|
import "antd/es/form/style";
|
7
8
|
import _Form from "antd/es/form";
|
8
9
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
10
|
+
import _isFunction from "lodash/isFunction";
|
9
11
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
10
12
|
import React from 'react';
|
11
13
|
import { useSetState } from 'ahooks';
|
12
|
-
import
|
14
|
+
import CheckModalContent from './components/CheckModalContent';
|
13
15
|
import { ProDrawerForm } from '../index';
|
14
16
|
import locale from '../locale';
|
15
17
|
import './index.less';
|
@@ -24,7 +26,8 @@ var ProAction = function ProAction(props) {
|
|
24
26
|
index: 0,
|
25
27
|
open: false,
|
26
28
|
servicesArray: [],
|
27
|
-
loading: false
|
29
|
+
loading: false,
|
30
|
+
errorModalData: null
|
28
31
|
}),
|
29
32
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
30
33
|
state = _useSetState2[0],
|
@@ -37,12 +40,12 @@ var ProAction = function ProAction(props) {
|
|
37
40
|
});
|
38
41
|
}
|
39
42
|
var index = state.index,
|
40
|
-
|
43
|
+
errorModalData = state.errorModalData;
|
41
44
|
var length = config.length;
|
42
45
|
var _onActionRun = /*#__PURE__*/function () {
|
43
46
|
var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
|
44
47
|
var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
|
45
|
-
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5,
|
48
|
+
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
|
46
49
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
47
50
|
while (1) switch (_context.prev = _context.next) {
|
48
51
|
case 0:
|
@@ -79,7 +82,7 @@ var ProAction = function ProAction(props) {
|
|
79
82
|
_context.t1 = {};
|
80
83
|
case 18:
|
81
84
|
res = _context.t1;
|
82
|
-
if (!(transformResponse &&
|
85
|
+
if (!(transformResponse && _isFunction(transformResponse))) {
|
83
86
|
_context.next = 26;
|
84
87
|
break;
|
85
88
|
}
|
@@ -99,7 +102,7 @@ var ProAction = function ProAction(props) {
|
|
99
102
|
if (!service) {
|
100
103
|
newServicesArray[currentIndex] = null;
|
101
104
|
}
|
102
|
-
open = (actionProps === null || actionProps === void 0 ? void 0 : actionProps.mode) === 'check' && ((_newServicesArray$cur = newServicesArray[currentIndex]) === null || _newServicesArray$cur === void 0 ? void 0 : _newServicesArray$cur.errorTitle)
|
105
|
+
open = (actionProps === null || actionProps === void 0 ? void 0 : actionProps.mode) === 'check' && (((_newServicesArray$cur = newServicesArray[currentIndex]) === null || _newServicesArray$cur === void 0 ? void 0 : _newServicesArray$cur.errorTitle) || ((_newServicesArray$cur2 = newServicesArray[currentIndex]) === null || _newServicesArray$cur2 === void 0 ? void 0 : (_newServicesArray$cur3 = _newServicesArray$cur2.list) === null || _newServicesArray$cur3 === void 0 ? void 0 : _newServicesArray$cur3.length));
|
103
106
|
setState({
|
104
107
|
servicesArray: newServicesArray,
|
105
108
|
index: currentIndex,
|
@@ -109,14 +112,15 @@ var ProAction = function ProAction(props) {
|
|
109
112
|
_context.next = 37;
|
110
113
|
break;
|
111
114
|
}
|
112
|
-
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 :
|
113
|
-
errorTitle = (_newServicesArray$
|
115
|
+
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
|
116
|
+
errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
|
114
117
|
form.setFieldsValue({
|
115
118
|
errorTitle: errorTitle,
|
116
119
|
list: list
|
117
120
|
});
|
118
121
|
setState({
|
119
|
-
loading: false
|
122
|
+
loading: false,
|
123
|
+
errorModalData: newServicesArray[currentIndex]
|
120
124
|
});
|
121
125
|
return _context.abrupt("return");
|
122
126
|
case 37:
|
@@ -164,6 +168,27 @@ var ProAction = function ProAction(props) {
|
|
164
168
|
open: false
|
165
169
|
});
|
166
170
|
};
|
171
|
+
var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
|
172
|
+
var _ref3 = errorModalConfig || {},
|
173
|
+
contextRender = _ref3.contextRender;
|
174
|
+
var renderContent = function renderContent() {
|
175
|
+
var TargetComponent = _jsx(_Fragment, {});
|
176
|
+
if (typeof contextRender === 'function') {
|
177
|
+
var View = contextRender(errorModalData);
|
178
|
+
TargetComponent = _jsx(_Fragment, {
|
179
|
+
children: View
|
180
|
+
});
|
181
|
+
} else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
|
182
|
+
TargetComponent = _jsx(_Fragment, {
|
183
|
+
children: contextRender
|
184
|
+
});
|
185
|
+
} else if (/*#__PURE__*/React.isValidElement(contextRender)) {
|
186
|
+
TargetComponent = _jsx(_Fragment, {
|
187
|
+
children: contextRender
|
188
|
+
});
|
189
|
+
}
|
190
|
+
return TargetComponent;
|
191
|
+
};
|
167
192
|
return _jsxs(_Fragment, {
|
168
193
|
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? _jsx(_Popconfirm, {
|
169
194
|
onConfirm: function onConfirm() {
|
@@ -176,8 +201,10 @@ var ProAction = function ProAction(props) {
|
|
176
201
|
mode: "Modal",
|
177
202
|
title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
|
178
203
|
onCancel: function onCancel() {
|
204
|
+
form.resetFields();
|
179
205
|
setState({
|
180
|
-
open: false
|
206
|
+
open: false,
|
207
|
+
errorModalData: null
|
181
208
|
});
|
182
209
|
},
|
183
210
|
modalProps: {
|
@@ -186,37 +213,8 @@ var ProAction = function ProAction(props) {
|
|
186
213
|
size: "small",
|
187
214
|
onOk: onOk,
|
188
215
|
form: form,
|
189
|
-
|
190
|
-
|
191
|
-
isView: true,
|
192
|
-
columns: [{
|
193
|
-
type: 'Input',
|
194
|
-
name: 'errorTitle',
|
195
|
-
viewRender: function viewRender(value) {
|
196
|
-
var _servicesArray$index;
|
197
|
-
var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
|
198
|
-
return _jsxs("div", {
|
199
|
-
className: "pro-action-view-tile",
|
200
|
-
children: [value, list.length === 1 ? _jsxs("span", {
|
201
|
-
children: [" ", list[0]]
|
202
|
-
}) : '']
|
203
|
-
});
|
204
|
-
}
|
205
|
-
}, {
|
206
|
-
type: 'TextArea',
|
207
|
-
name: 'list',
|
208
|
-
fieldProps: {
|
209
|
-
autoSize: {
|
210
|
-
minRows: 4,
|
211
|
-
maxRows: 7
|
212
|
-
}
|
213
|
-
},
|
214
|
-
show: function show() {
|
215
|
-
var _servicesArray$index2, _servicesArray$index3;
|
216
|
-
return ((_servicesArray$index2 = servicesArray[index]) === null || _servicesArray$index2 === void 0 ? void 0 : (_servicesArray$index3 = _servicesArray$index2.list) === null || _servicesArray$index3 === void 0 ? void 0 : _servicesArray$index3.length) > 1;
|
217
|
-
}
|
218
|
-
}]
|
219
|
-
}
|
216
|
+
className: "pro-action-error-modal",
|
217
|
+
children: !contextRender ? _jsx(CheckModalContent, _objectSpread({}, errorModalData !== null && errorModalData !== void 0 ? errorModalData : {})) : renderContent()
|
220
218
|
}) : null]
|
221
219
|
});
|
222
220
|
};
|
package/es/ProAction/index.less
CHANGED
@@ -1,11 +1,10 @@
|
|
1
1
|
@root-entry-name: 'default';
|
2
2
|
@import (reference) '~antd/es/style/themes/index.less';
|
3
3
|
|
4
|
-
.pro-action-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
color: #000;
|
4
|
+
.pro-action-error-modal {
|
5
|
+
.ant-modal-content {
|
6
|
+
> div.ant-modal-body {
|
7
|
+
max-height: none;
|
8
|
+
}
|
10
9
|
}
|
11
10
|
}
|
@@ -13,32 +13,34 @@ export interface ProActionType {
|
|
13
13
|
title?: string | ReactNode;
|
14
14
|
/**
|
15
15
|
* @description 操作回调函数
|
16
|
-
* @param
|
16
|
+
* @param previousData 接上一个 useRequest 返回的值
|
17
17
|
* @param args 接所有链式 useRequest 返回的值
|
18
18
|
* @param index 当前操作的索引
|
19
19
|
* @returns void或Promise<void>
|
20
20
|
* @default -
|
21
21
|
*/
|
22
|
-
onAction?: (
|
22
|
+
onAction?: (previousData?: any, args?: any[], index?: number) => void | Promise<void>;
|
23
23
|
/**
|
24
24
|
* @description 自定义请求
|
25
|
-
* @param
|
25
|
+
* @param previousData 接上一个 useRequest 返回的值
|
26
26
|
* @param args 接所有链式 useRequest 返回的值
|
27
27
|
* @returns 包含service、options和transformResponse的对象
|
28
28
|
* @default -
|
29
29
|
*/
|
30
|
-
useRequest?: (
|
30
|
+
useRequest?: (previousData: any, args: any) => {
|
31
31
|
service?: Service<any, any>;
|
32
32
|
options?: Options<any, any>;
|
33
33
|
transformResponse?: (data: any) => any;
|
34
34
|
};
|
35
35
|
/**
|
36
36
|
* @description 是否中断链式操作
|
37
|
-
* @param
|
37
|
+
* @param previousData 上一个操作的返回数据
|
38
38
|
* @param args 所有链式的数据合集
|
39
39
|
* @returns 布尔值,返回true继续执行,返回false中断操作
|
40
40
|
* @default -
|
41
41
|
*/
|
42
|
-
continue?: (
|
42
|
+
continue?: (previousData: any, args: any[]) => boolean;
|
43
|
+
/** 自定义错误弹窗内容视图渲染 */
|
44
|
+
contextRender?: (data: any) => string | ReactNode;
|
43
45
|
}
|
44
46
|
export type ProActionProps = ProActionType;
|
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
|
};
|