@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
package/lib/ProAction/index.js
CHANGED
@@ -5,15 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
9
|
+
require("antd/es/popconfirm/style");
|
10
|
+
var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
|
8
11
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
9
12
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
10
13
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
14
|
+
require("antd/es/form/style");
|
15
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
11
16
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
17
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
12
18
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
19
|
var _react = _interopRequireDefault(require("react"));
|
14
20
|
var _ahooks = require("ahooks");
|
15
|
-
var
|
16
|
-
var _lodash = require("lodash");
|
21
|
+
var _CheckModalContent = _interopRequireDefault(require("./components/CheckModalContent"));
|
17
22
|
var _index = require("../index");
|
18
23
|
var _locale = _interopRequireDefault(require("../locale"));
|
19
24
|
require("./index.less");
|
@@ -21,14 +26,15 @@ var ProAction = function ProAction(props) {
|
|
21
26
|
var _config$, _config$2, _locale$ProAction2, _config$index;
|
22
27
|
var children = props.children,
|
23
28
|
config = props.config;
|
24
|
-
var _Form$useForm =
|
29
|
+
var _Form$useForm = _form.default.useForm(),
|
25
30
|
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
26
31
|
form = _Form$useForm2[0];
|
27
32
|
var _useSetState = (0, _ahooks.useSetState)({
|
28
33
|
index: 0,
|
29
34
|
open: false,
|
30
35
|
servicesArray: [],
|
31
|
-
loading: false
|
36
|
+
loading: false,
|
37
|
+
errorModalData: null
|
32
38
|
}),
|
33
39
|
_useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
|
34
40
|
state = _useSetState2[0],
|
@@ -41,12 +47,12 @@ var ProAction = function ProAction(props) {
|
|
41
47
|
});
|
42
48
|
}
|
43
49
|
var index = state.index,
|
44
|
-
|
50
|
+
errorModalData = state.errorModalData;
|
45
51
|
var length = config.length;
|
46
52
|
var _onActionRun = /*#__PURE__*/function () {
|
47
53
|
var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
|
48
54
|
var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
|
49
|
-
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5,
|
55
|
+
var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
|
50
56
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
51
57
|
while (1) switch (_context.prev = _context.next) {
|
52
58
|
case 0:
|
@@ -83,7 +89,7 @@ var ProAction = function ProAction(props) {
|
|
83
89
|
_context.t1 = {};
|
84
90
|
case 18:
|
85
91
|
res = _context.t1;
|
86
|
-
if (!(transformResponse && (0,
|
92
|
+
if (!(transformResponse && (0, _isFunction2.default)(transformResponse))) {
|
87
93
|
_context.next = 26;
|
88
94
|
break;
|
89
95
|
}
|
@@ -103,7 +109,7 @@ var ProAction = function ProAction(props) {
|
|
103
109
|
if (!service) {
|
104
110
|
newServicesArray[currentIndex] = null;
|
105
111
|
}
|
106
|
-
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)
|
112
|
+
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));
|
107
113
|
setState({
|
108
114
|
servicesArray: newServicesArray,
|
109
115
|
index: currentIndex,
|
@@ -113,14 +119,15 @@ var ProAction = function ProAction(props) {
|
|
113
119
|
_context.next = 37;
|
114
120
|
break;
|
115
121
|
}
|
116
|
-
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 :
|
117
|
-
errorTitle = (_newServicesArray$
|
122
|
+
list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
|
123
|
+
errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
|
118
124
|
form.setFieldsValue({
|
119
125
|
errorTitle: errorTitle,
|
120
126
|
list: list
|
121
127
|
});
|
122
128
|
setState({
|
123
|
-
loading: false
|
129
|
+
loading: false,
|
130
|
+
errorModalData: newServicesArray[currentIndex]
|
124
131
|
});
|
125
132
|
return _context.abrupt("return");
|
126
133
|
case 37:
|
@@ -168,8 +175,29 @@ var ProAction = function ProAction(props) {
|
|
168
175
|
open: false
|
169
176
|
});
|
170
177
|
};
|
178
|
+
var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
|
179
|
+
var _ref3 = errorModalConfig || {},
|
180
|
+
contextRender = _ref3.contextRender;
|
181
|
+
var renderContent = function renderContent() {
|
182
|
+
var TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
|
183
|
+
if (typeof contextRender === 'function') {
|
184
|
+
var View = contextRender(errorModalData);
|
185
|
+
TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
186
|
+
children: View
|
187
|
+
});
|
188
|
+
} else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
|
189
|
+
TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
190
|
+
children: contextRender
|
191
|
+
});
|
192
|
+
} else if (/*#__PURE__*/_react.default.isValidElement(contextRender)) {
|
193
|
+
TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
194
|
+
children: contextRender
|
195
|
+
});
|
196
|
+
}
|
197
|
+
return TargetComponent;
|
198
|
+
};
|
171
199
|
return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
172
|
-
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(
|
200
|
+
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(_popconfirm.default, {
|
173
201
|
onConfirm: function onConfirm() {
|
174
202
|
return _onActionRun(0, []);
|
175
203
|
},
|
@@ -180,8 +208,10 @@ var ProAction = function ProAction(props) {
|
|
180
208
|
mode: "Modal",
|
181
209
|
title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
|
182
210
|
onCancel: function onCancel() {
|
211
|
+
form.resetFields();
|
183
212
|
setState({
|
184
|
-
open: false
|
213
|
+
open: false,
|
214
|
+
errorModalData: null
|
185
215
|
});
|
186
216
|
},
|
187
217
|
modalProps: {
|
@@ -190,37 +220,8 @@ var ProAction = function ProAction(props) {
|
|
190
220
|
size: "small",
|
191
221
|
onOk: onOk,
|
192
222
|
form: form,
|
193
|
-
|
194
|
-
|
195
|
-
isView: true,
|
196
|
-
columns: [{
|
197
|
-
type: 'Input',
|
198
|
-
name: 'errorTitle',
|
199
|
-
viewRender: function viewRender(value) {
|
200
|
-
var _servicesArray$index;
|
201
|
-
var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
|
202
|
-
return (0, _jsxRuntime.jsxs)("div", {
|
203
|
-
className: "pro-action-view-tile",
|
204
|
-
children: [value, list.length === 1 ? (0, _jsxRuntime.jsxs)("span", {
|
205
|
-
children: [" ", list[0]]
|
206
|
-
}) : '']
|
207
|
-
});
|
208
|
-
}
|
209
|
-
}, {
|
210
|
-
type: 'TextArea',
|
211
|
-
name: 'list',
|
212
|
-
fieldProps: {
|
213
|
-
autoSize: {
|
214
|
-
minRows: 4,
|
215
|
-
maxRows: 7
|
216
|
-
}
|
217
|
-
},
|
218
|
-
show: function show() {
|
219
|
-
var _servicesArray$index2, _servicesArray$index3;
|
220
|
-
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;
|
221
|
-
}
|
222
|
-
}]
|
223
|
-
}
|
223
|
+
className: "pro-action-error-modal",
|
224
|
+
children: !contextRender ? (0, _jsxRuntime.jsx)(_CheckModalContent.default, (0, _objectSpread2.default)({}, errorModalData !== null && errorModalData !== void 0 ? errorModalData : {})) : renderContent()
|
224
225
|
}) : null]
|
225
226
|
});
|
226
227
|
};
|
package/lib/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;
|
@@ -7,11 +7,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
});
|
8
8
|
exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
|
9
9
|
exports.useProConfig = useProConfig;
|
10
|
+
require("antd/es/config-provider/style");
|
11
|
+
var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
|
10
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
12
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
15
|
var _react = _interopRequireWildcard(require("react"));
|
14
|
-
var _antd = require("antd");
|
15
16
|
var _zh_CN = _interopRequireDefault(require("antd/es/locale/zh_CN"));
|
16
17
|
var _en_US = _interopRequireDefault(require("antd/es/locale/en_US"));
|
17
18
|
var _merge = _interopRequireDefault(require("lodash/merge"));
|
@@ -106,7 +107,7 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
|
|
106
107
|
state: (0, _merge.default)(state, props.value),
|
107
108
|
dispatch: dispatch
|
108
109
|
},
|
109
|
-
children: (0, _jsxRuntime.jsx)(
|
110
|
+
children: (0, _jsxRuntime.jsx)(_configProvider.default, {
|
110
111
|
locale: antdLangMap[lang],
|
111
112
|
children: (0, _jsxRuntime.jsx)("div", {
|
112
113
|
children: props.children
|
package/lib/ProDownload/index.js
CHANGED
@@ -1,21 +1,22 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
4
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
6
5
|
value: true
|
7
6
|
});
|
8
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/button/style");
|
9
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
9
10
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
12
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
12
13
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
13
14
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
15
|
+
var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
|
16
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
14
17
|
var _jsxRuntime = require("react/jsx-runtime");
|
15
18
|
var _ahooks = require("ahooks");
|
16
|
-
var _antd = require("antd");
|
17
19
|
var _classnames = _interopRequireDefault(require("classnames"));
|
18
|
-
var _lodash = _interopRequireWildcard(require("lodash"));
|
19
20
|
var _utils = require("./utils");
|
20
21
|
var _ProConfigProvider = require("../ProConfigProvider");
|
21
22
|
var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
|
@@ -75,7 +76,7 @@ var ProDownload = function ProDownload(props) {
|
|
75
76
|
loading: true
|
76
77
|
});
|
77
78
|
_params = params;
|
78
|
-
if (!(0,
|
79
|
+
if (!(0, _isFunction2.default)(params)) {
|
79
80
|
_context.next = 14;
|
80
81
|
break;
|
81
82
|
}
|
@@ -135,7 +136,7 @@ var ProDownload = function ProDownload(props) {
|
|
135
136
|
var cls = (0, _classnames.default)(className, {
|
136
137
|
'pro-download': true
|
137
138
|
});
|
138
|
-
return (0, _jsxRuntime.jsx)(
|
139
|
+
return (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
139
140
|
className: cls,
|
140
141
|
onClick: function () {
|
141
142
|
var _onClick = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
|
@@ -143,7 +144,7 @@ var ProDownload = function ProDownload(props) {
|
|
143
144
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
|
144
145
|
while (1) switch (_context3.prev = _context3.next) {
|
145
146
|
case 0:
|
146
|
-
if (!(
|
147
|
+
if (!((0, _isBoolean2.default)(beforeDownload) && !beforeDownload)) {
|
147
148
|
_context3.next = 2;
|
148
149
|
break;
|
149
150
|
}
|
package/lib/ProDownload/utils.js
CHANGED
@@ -8,11 +8,13 @@ exports.BlobMakeFile = BlobMakeFile;
|
|
8
8
|
exports.convertBase64ToBlob = exports.DownloadRequest = void 0;
|
9
9
|
exports.getFilenameFromContentDisposition = getFilenameFromContentDisposition;
|
10
10
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
11
|
+
require("antd/es/message/style");
|
12
|
+
var _message2 = _interopRequireDefault(require("antd/es/message"));
|
11
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
12
14
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
13
15
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
14
|
-
var
|
15
|
-
var
|
16
|
+
var _get2 = _interopRequireDefault(require("lodash/get"));
|
17
|
+
var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
16
18
|
var _locale = _interopRequireDefault(require("../locale"));
|
17
19
|
/* eslint-disable no-empty */
|
18
20
|
/* eslint-disable prefer-promise-reject-errors */
|
@@ -123,7 +125,7 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
|
|
123
125
|
_context.next = 7;
|
124
126
|
break;
|
125
127
|
}
|
126
|
-
|
128
|
+
_message2.default.error("".concat(_locale.default.ProDownload.errorMessage));
|
127
129
|
return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
|
128
130
|
case 7:
|
129
131
|
if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
|
@@ -131,11 +133,11 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
|
|
131
133
|
break;
|
132
134
|
}
|
133
135
|
errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
|
134
|
-
errorMsg &&
|
136
|
+
errorMsg && _message2.default.error(errorMsg);
|
135
137
|
onError && onError(_data);
|
136
138
|
return _context.abrupt("return", Promise.reject(errorMsg));
|
137
139
|
case 12:
|
138
|
-
if (!(0,
|
140
|
+
if (!(0, _isFunction2.default)(transformResponse)) {
|
139
141
|
_context.next = 14;
|
140
142
|
break;
|
141
143
|
}
|
@@ -168,12 +170,12 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
|
|
168
170
|
res = _context2.sent;
|
169
171
|
data = null;
|
170
172
|
contentFileName = '';
|
171
|
-
if ((0,
|
173
|
+
if ((0, _isFunction2.default)(transformResponse)) {
|
172
174
|
data = res;
|
173
175
|
} else {
|
174
176
|
// 优先获取Content-Disposition中filename
|
175
177
|
contentFileName = getFilenameFromContentDisposition(res.headers.get('Content-Disposition'));
|
176
|
-
data = (0,
|
178
|
+
data = (0, _get2.default)(res, 'data');
|
177
179
|
}
|
178
180
|
if (!data) {
|
179
181
|
_context2.next = 15;
|
@@ -6,15 +6,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
|
+
require("antd/es/drawer/style");
|
10
|
+
var _drawer = _interopRequireDefault(require("antd/es/drawer"));
|
11
|
+
require("antd/es/button/style");
|
12
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
9
13
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
14
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
15
|
+
require("antd/es/modal/style");
|
16
|
+
var _modal = _interopRequireDefault(require("antd/es/modal"));
|
11
17
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
12
18
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
19
|
+
var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
|
13
20
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
|
-
var _antd = require("antd");
|
15
21
|
var _react = _interopRequireWildcard(require("react"));
|
16
22
|
var _ahooks = require("ahooks");
|
17
|
-
var _lodash = require("lodash");
|
18
23
|
var _reactSvg = require("react-svg");
|
19
24
|
var _close = _interopRequireDefault(require("../../../assets/close.svg"));
|
20
25
|
var _locale = _interopRequireDefault(require("../../../locale"));
|
@@ -83,7 +88,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
83
88
|
if (isView || !isConfirmClose || compareSnapshots()) {
|
84
89
|
onCancel && onCancel();
|
85
90
|
} else if (!modalRef.current) {
|
86
|
-
modalRef.current =
|
91
|
+
modalRef.current = _modal.default.confirm((0, _objectSpread2.default)({
|
87
92
|
className: 'width430',
|
88
93
|
title: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProDrawerForm = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.isSureClose,
|
89
94
|
okText: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProDrawerForm2 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm,
|
@@ -190,13 +195,13 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
190
195
|
*/
|
191
196
|
var defaultFooter = (0, _jsxRuntime.jsxs)("div", {
|
192
197
|
className: "pro-drawer-footer",
|
193
|
-
children: [(0, _jsxRuntime.jsx)(
|
198
|
+
children: [(0, _jsxRuntime.jsx)(_button.default, {
|
194
199
|
type: "primary",
|
195
200
|
onClick: handleFinish,
|
196
201
|
loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
|
197
202
|
disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
|
198
203
|
children: okText
|
199
|
-
}), (0, _jsxRuntime.jsx)(
|
204
|
+
}), (0, _jsxRuntime.jsx)(_button.default, {
|
200
205
|
onClick: onCancel,
|
201
206
|
children: cancelText
|
202
207
|
})]
|
@@ -211,7 +216,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
211
216
|
children: footer
|
212
217
|
});
|
213
218
|
}
|
214
|
-
if ((0,
|
219
|
+
if ((0, _isArray2.default)(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
|
215
220
|
return (0, _jsxRuntime.jsx)("div", {
|
216
221
|
className: "pro-drawer-footer",
|
217
222
|
children: footer.map(function (item) {
|
@@ -224,7 +229,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
224
229
|
}
|
225
230
|
return defaultFooter;
|
226
231
|
};
|
227
|
-
return (0, _jsxRuntime.jsxs)(
|
232
|
+
return (0, _jsxRuntime.jsxs)(_drawer.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
228
233
|
width: width,
|
229
234
|
open: visible,
|
230
235
|
maskClosable: maskClosable,
|
@@ -7,15 +7,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
|
+
require("antd/es/modal/style");
|
11
|
+
var _modal = _interopRequireDefault(require("antd/es/modal"));
|
12
|
+
require("antd/es/button/style");
|
13
|
+
var _button = _interopRequireDefault(require("antd/es/button"));
|
14
|
+
require("antd/es/space/style");
|
15
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
10
16
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
11
17
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
12
18
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
19
|
+
var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
|
13
20
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
21
|
var _react = _interopRequireWildcard(require("react"));
|
15
|
-
var _antd = require("antd");
|
16
22
|
var _ahooks = require("ahooks");
|
17
23
|
var _classnames = _interopRequireDefault(require("classnames"));
|
18
|
-
var _lodash = require("lodash");
|
19
24
|
var _reactSvg = require("react-svg");
|
20
25
|
var _close = _interopRequireDefault(require("../../../assets/close.svg"));
|
21
26
|
/**
|
@@ -143,11 +148,11 @@ var ProModal = function ProModal(_ref) {
|
|
143
148
|
*/
|
144
149
|
var defaultFooter = (0, _jsxRuntime.jsxs)("div", {
|
145
150
|
className: extraLeft ? 'pro-modal-footer' : undefined,
|
146
|
-
children: [extraLeft, (0, _jsxRuntime.jsxs)(
|
147
|
-
children: [(0, _jsxRuntime.jsx)(
|
151
|
+
children: [extraLeft, (0, _jsxRuntime.jsxs)(_space.default, {
|
152
|
+
children: [(0, _jsxRuntime.jsx)(_button.default, {
|
148
153
|
onClick: onCancel,
|
149
154
|
children: cancelText
|
150
|
-
}), (0, _jsxRuntime.jsx)(
|
155
|
+
}), (0, _jsxRuntime.jsx)(_button.default, {
|
151
156
|
type: "primary",
|
152
157
|
onClick: handleFinish,
|
153
158
|
loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
|
@@ -166,7 +171,7 @@ var ProModal = function ProModal(_ref) {
|
|
166
171
|
children: footer
|
167
172
|
});
|
168
173
|
}
|
169
|
-
if ((0,
|
174
|
+
if ((0, _isArray2.default)(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
|
170
175
|
return (0, _jsxRuntime.jsx)("div", {
|
171
176
|
className: "pro-drawer-footer",
|
172
177
|
children: footer.map(function (item) {
|
@@ -179,7 +184,7 @@ var ProModal = function ProModal(_ref) {
|
|
179
184
|
}
|
180
185
|
return defaultFooter;
|
181
186
|
};
|
182
|
-
return (0, _jsxRuntime.jsx)(
|
187
|
+
return (0, _jsxRuntime.jsx)(_modal.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
183
188
|
className: _className,
|
184
189
|
title: title,
|
185
190
|
width: width,
|
@@ -5,12 +5,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
6
6
|
});
|
7
7
|
exports.default = void 0;
|
8
|
+
require("antd/es/space/style");
|
9
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
8
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
11
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
9
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
10
13
|
var _react = require("react");
|
11
|
-
var _lodash = require("lodash");
|
12
14
|
var _icons = require("@ant-design/icons");
|
13
|
-
var _antd = require("antd");
|
14
15
|
var _index = require("../../index");
|
15
16
|
var _utils = require("../utils");
|
16
17
|
var RenderProForm = function RenderProForm(props) {
|
@@ -32,7 +33,7 @@ var RenderProForm = function RenderProForm(props) {
|
|
32
33
|
}, []);
|
33
34
|
// 兼容老写法
|
34
35
|
if (!props.columns) {
|
35
|
-
columns[0] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0,
|
36
|
+
columns[0] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode'])), {}, {
|
36
37
|
name: props.type || 'Input'
|
37
38
|
});
|
38
39
|
_props = {
|
@@ -41,7 +42,7 @@ var RenderProForm = function RenderProForm(props) {
|
|
41
42
|
isView: props.isView
|
42
43
|
};
|
43
44
|
} else {
|
44
|
-
_props = (0, _objectSpread2.default)({}, (0,
|
45
|
+
_props = (0, _objectSpread2.default)({}, (0, _omit2.default)(props, ['onChange', 'isNode']));
|
45
46
|
}
|
46
47
|
if ((_props3 = _props) === null || _props3 === void 0 ? void 0 : _props3.isView) {
|
47
48
|
var _props4, _props4$columns;
|
@@ -60,7 +61,7 @@ var RenderProForm = function RenderProForm(props) {
|
|
60
61
|
children: primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title
|
61
62
|
}), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) === null || _props7 === void 0 ? void 0 : _props7.isView) && (0, _jsxRuntime.jsx)("div", {
|
62
63
|
className: "pro-edit-label-tip",
|
63
|
-
children: (0, _jsxRuntime.jsxs)(
|
64
|
+
children: (0, _jsxRuntime.jsxs)(_space.default, {
|
64
65
|
align: "start",
|
65
66
|
children: [(0, _jsxRuntime.jsx)(_icons.InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
|
66
67
|
})
|
@@ -6,19 +6,26 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
7
7
|
});
|
8
8
|
exports.default = void 0;
|
9
|
+
require("antd/es/popconfirm/style");
|
10
|
+
var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
|
11
|
+
require("antd/es/input/style");
|
12
|
+
var _input = _interopRequireDefault(require("antd/es/input"));
|
9
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
14
|
+
require("antd/es/space/style");
|
15
|
+
var _space = _interopRequireDefault(require("antd/es/space"));
|
10
16
|
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
11
17
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
12
18
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
19
|
+
require("antd/es/form/style");
|
20
|
+
var _form = _interopRequireDefault(require("antd/es/form"));
|
13
21
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
14
22
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
23
|
+
var _omit2 = _interopRequireDefault(require("lodash/omit"));
|
15
24
|
var _jsxRuntime = require("react/jsx-runtime");
|
16
25
|
var _icons = require("@ant-design/icons");
|
17
|
-
var _antd = require("antd");
|
18
26
|
var _ahooks = require("ahooks");
|
19
27
|
var _classnames2 = _interopRequireDefault(require("classnames"));
|
20
28
|
var _react = _interopRequireWildcard(require("react"));
|
21
|
-
var _lodash = require("lodash");
|
22
29
|
var _RenderProForm = _interopRequireDefault(require("./components/RenderProForm"));
|
23
30
|
var _utils = require("./utils");
|
24
31
|
var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
|
@@ -55,10 +62,10 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
55
62
|
_useToggle2 = (0, _slicedToArray2.default)(_useToggle, 2),
|
56
63
|
status = _useToggle2[0],
|
57
64
|
toggleStatus = _useToggle2[1].toggle;
|
58
|
-
var _Form$useForm =
|
65
|
+
var _Form$useForm = _form.default.useForm(OriginForm),
|
59
66
|
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
60
67
|
form = _Form$useForm2[0];
|
61
|
-
var _Form$useForm3 =
|
68
|
+
var _Form$useForm3 = _form.default.useForm(),
|
62
69
|
_Form$useForm4 = (0, _slicedToArray2.default)(_Form$useForm3, 1),
|
63
70
|
viewForm = _Form$useForm4[0];
|
64
71
|
var inputRef = (0, _react.useRef)(null);
|
@@ -210,7 +217,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
210
217
|
var TextNode = (0, _jsxRuntime.jsx)("div", {
|
211
218
|
className: cls,
|
212
219
|
style: style,
|
213
|
-
children: (0, _jsxRuntime.jsxs)(
|
220
|
+
children: (0, _jsxRuntime.jsxs)(_space.default, {
|
214
221
|
align: "start",
|
215
222
|
children: [mode === 'current' ? props.value : (0, _jsxRuntime.jsx)(_RenderProForm.default, (0, _objectSpread2.default)({
|
216
223
|
value: confirmValue,
|
@@ -233,7 +240,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
233
240
|
// 当前页编辑模式
|
234
241
|
if (mode === 'current') {
|
235
242
|
if (status) {
|
236
|
-
return (0, _jsxRuntime.jsx)(
|
243
|
+
return (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
237
244
|
ref: inputRef,
|
238
245
|
size: size,
|
239
246
|
onBlur: function onBlur(e) {
|
@@ -259,7 +266,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
259
266
|
}
|
260
267
|
return TextNode;
|
261
268
|
};
|
262
|
-
return (0, _jsxRuntime.jsx)(
|
269
|
+
return (0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
263
270
|
overlayClassName: "pro-edit-label-popconfirm",
|
264
271
|
icon: null,
|
265
272
|
destroyTooltipOnHide: true,
|
@@ -274,7 +281,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
|
|
274
281
|
onOpenChange: function onOpenChange(open) {
|
275
282
|
_onOpenChange && _onOpenChange(open);
|
276
283
|
}
|
277
|
-
}, (0,
|
284
|
+
}, (0, _omit2.default)(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), {}, {
|
278
285
|
children: labelRender()
|
279
286
|
}));
|
280
287
|
}
|