@zat-design/sisyphus-react 3.9.0-beta.2 → 3.9.0-beta.21
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 +41 -15
- package/dist/less.esm.css +37 -13
- package/es/ProAction/index.js +5 -5
- package/es/ProDownload/index.d.ts +1 -1
- package/es/ProDownload/index.js +3 -3
- package/es/ProDownload/utils.js +3 -3
- package/es/ProDrawerForm/components/ProDrawer/index.js +7 -5
- package/es/ProDrawerForm/components/ProModal/index.js +8 -6
- package/es/ProDrawerForm/propsType.d.ts +1 -0
- package/es/ProEditLabel/index.js +3 -3
- package/es/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/es/ProEditTable/components/ActionButton/index.js +3 -3
- package/es/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +7 -3
- package/es/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/index.js +8 -7
- package/es/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderToolbar/index.js +1 -1
- package/es/ProEditTable/components/Summary/index.d.ts +1 -1
- package/es/ProEditTable/index.js +23 -16
- package/es/ProEditTable/style/index.less +14 -2
- package/es/ProEditTable/utils/config.d.ts +1 -1
- package/es/ProEditTable/utils/config.js +2 -2
- package/es/ProEditTable/utils/index.js +5 -5
- package/es/ProEditTable/utils/tools.js +4 -4
- package/es/ProEnum/components/Group.d.ts +1 -1
- package/es/ProEnum/components/Tag.d.ts +1 -1
- package/es/ProEnum/hooks/useEnumRequest.js +2 -2
- package/es/ProEnum/index.d.ts +2 -2
- package/es/ProEnum/index.js +7 -5
- package/es/ProEnum/propsType.d.ts +1 -0
- package/es/ProEnum/utils/eventCenter.js +2 -1
- package/es/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/es/ProForm/components/base/Input/index.d.ts +1 -1
- package/es/ProForm/components/base/SwitchCheckbox/index.js +9 -2
- package/es/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
- package/es/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
- package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
- package/es/ProForm/components/combination/FormList/utils.js +1 -1
- package/es/ProForm/components/combination/Group/component/ComRender.d.ts +1 -0
- package/es/ProForm/components/combination/Group/component/ComRender.js +13 -2
- package/es/ProForm/components/combination/Group/index.js +4 -3
- package/es/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.js +8 -8
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
- package/es/ProForm/components/combination/ProModalSelect/index.js +7 -6
- package/es/ProForm/components/old/InputRange/index.d.ts +1 -1
- package/es/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
- package/es/ProForm/components/old/ProAddress/index.d.ts +2 -1
- package/es/ProForm/components/old/ProAddress/index.js +1 -1
- package/es/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
- package/es/ProForm/components/render/ChangedWrapper.js +1 -2
- package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/es/ProForm/components/render/Render.js +3 -3
- package/es/ProForm/components/render/RenderFields.js +3 -2
- package/es/ProForm/components/render/propsType.d.ts +1 -0
- package/es/ProForm/index.js +1 -1
- package/es/ProForm/style/index.less +8 -5
- package/es/ProForm/utils/diffOriginal.js +18 -12
- package/es/ProForm/utils/index.js +10 -14
- package/es/ProForm/utils/useForm.js +1 -1
- package/es/ProIcon/utils/index.js +3 -4
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
- package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
- package/es/ProLayout/components/ProCollapse/index.d.ts +1 -1
- package/es/ProLayout/components/ProFooter/index.d.ts +1 -1
- package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
- package/es/ProLayout/components/ProHeader/index.d.ts +1 -1
- package/es/ProLayout/index.d.ts +4 -4
- package/es/ProLayout/utils/index.js +9 -9
- package/es/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
- package/es/ProSelect/index.d.ts +1 -1
- package/es/ProStep/components/Anchor/index.d.ts +1 -1
- package/es/ProStep/components/Item/index.d.ts +1 -1
- package/es/ProStep/components/Listener/index.js +1 -1
- package/es/ProStep/components/Step/index.d.ts +1 -1
- package/es/ProStep/index.d.ts +2 -2
- package/es/ProStep/index.js +3 -3
- package/es/ProTable/components/FormatColumn/index.d.ts +5 -3
- package/es/ProTable/components/FormatColumn/index.js +95 -74
- package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
- package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -9
- package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/es/ProTable/components/RenderColumn/index.d.ts +1 -1
- package/es/ProTable/components/RenderColumn/index.js +29 -11
- package/es/ProTable/components/RenderFooter/index.d.ts +1 -1
- package/es/ProTable/components/RenderTableHeader/index.d.ts +1 -1
- package/es/ProTable/components/TableResizable/index.d.ts +1 -1
- package/es/ProTable/components/TableResizable/index.js +1 -5
- package/es/ProTable/hooks/useAntdTable.js +3 -3
- package/es/ProTable/index.d.ts +6 -5
- package/es/ProTable/index.js +6 -8
- package/es/ProTable/propsType.d.ts +2 -1
- package/es/ProTable/style/index.less +10 -1
- package/es/ProTable/utils/index.d.ts +5 -2
- package/es/ProTable/utils/index.js +13 -4
- package/es/ProTabs/components/Card/index.d.ts +1 -1
- package/es/ProThemeTools/component/ProTools/index.d.ts +1 -1
- package/es/ProThemeTools/index.d.ts +1 -1
- package/es/ProTooltip/index.d.ts +1 -1
- package/es/ProTree/components/AdaptiveTooltip.d.ts +1 -1
- package/es/ProTree/components/CloseIcon.d.ts +2 -1
- package/es/ProTree/components/List.d.ts +1 -1
- package/es/ProTree/components/ProTree.d.ts +1 -1
- package/es/ProTree/components/ProTree.js +1 -1
- package/es/ProTree/components/ProTreeSelect/index.d.ts +1 -1
- package/es/ProTree/components/ProTreeSelect/index.js +50 -31
- package/es/ProTree/components/SearchTitle.d.ts +1 -1
- package/es/ProTree/components/Tree.d.ts +1 -1
- package/es/ProTree/components/Tree.js +4 -4
- package/es/ProTree/index.d.ts +1 -1
- package/es/ProTree/utils.js +11 -12
- package/es/ProTreeModal/components/Cascader.d.ts +1 -1
- package/es/ProTreeModal/components/CloseIcon.d.ts +2 -1
- package/es/ProTreeModal/components/SearchTitle.d.ts +1 -1
- package/es/ProTreeModal/components/Tree.js +6 -6
- package/es/ProTreeModal/components/Trigger.d.ts +1 -1
- package/es/ProTreeModal/index.d.ts +1 -1
- package/es/ProTreeModal/index.js +3 -3
- package/es/ProTreeModal/utils.js +14 -16
- package/es/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/es/ProUpload/components/ImageRender.js +1 -1
- package/es/ProViewer/index.js +2 -2
- package/es/old/ProEditableTable/index.js +4 -4
- package/es/style/theme/antd.less +4 -2
- package/es/utils/index.d.ts +1 -1
- package/es/utils/index.js +4 -1
- package/lib/ProAction/index.js +5 -5
- package/lib/ProDownload/index.d.ts +1 -1
- package/lib/ProDownload/index.js +3 -3
- package/lib/ProDownload/utils.js +3 -3
- package/lib/ProDrawerForm/components/ProDrawer/index.js +7 -5
- package/lib/ProDrawerForm/components/ProModal/index.js +8 -6
- package/lib/ProDrawerForm/propsType.d.ts +1 -0
- package/lib/ProEditLabel/index.js +3 -3
- package/lib/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/lib/ProEditTable/components/ActionButton/index.js +3 -3
- package/lib/ProEditTable/components/RcTable/BaseTable.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/DraggableTable.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/VirtualTable.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +5 -1
- package/lib/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/index.js +8 -7
- package/lib/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderToolbar/index.js +1 -1
- package/lib/ProEditTable/components/Summary/index.d.ts +1 -1
- package/lib/ProEditTable/index.js +23 -16
- package/lib/ProEditTable/style/index.less +14 -2
- package/lib/ProEditTable/utils/config.d.ts +1 -1
- package/lib/ProEditTable/utils/config.js +2 -2
- package/lib/ProEditTable/utils/index.js +5 -5
- package/lib/ProEditTable/utils/tools.js +4 -4
- package/lib/ProEnum/components/Group.d.ts +1 -1
- package/lib/ProEnum/components/Tag.d.ts +1 -1
- package/lib/ProEnum/hooks/useEnumRequest.js +2 -2
- package/lib/ProEnum/index.d.ts +2 -2
- package/lib/ProEnum/index.js +7 -5
- package/lib/ProEnum/propsType.d.ts +1 -0
- package/lib/ProEnum/utils/eventCenter.js +2 -1
- package/lib/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/lib/ProForm/components/base/Input/index.d.ts +1 -1
- package/lib/ProForm/components/base/SwitchCheckbox/index.js +9 -2
- package/lib/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
- package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
- package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
- package/lib/ProForm/components/combination/FormList/utils.js +1 -1
- package/lib/ProForm/components/combination/Group/component/ComRender.d.ts +1 -0
- package/lib/ProForm/components/combination/Group/component/ComRender.js +13 -2
- package/lib/ProForm/components/combination/Group/index.js +4 -3
- package/lib/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.js +8 -8
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
- package/lib/ProForm/components/combination/ProModalSelect/index.js +7 -6
- package/lib/ProForm/components/old/InputRange/index.d.ts +1 -1
- package/lib/ProForm/components/old/InputWithSuffix/index.d.ts +1 -1
- package/lib/ProForm/components/old/ProAddress/index.d.ts +2 -1
- package/lib/ProForm/components/old/ProAddress/index.js +1 -1
- package/lib/ProForm/components/old/ProRangeBox/index.d.ts +2 -1
- package/lib/ProForm/components/render/ChangedWrapper.js +1 -2
- package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/lib/ProForm/components/render/Render.js +3 -3
- package/lib/ProForm/components/render/RenderFields.js +3 -2
- package/lib/ProForm/components/render/propsType.d.ts +1 -0
- package/lib/ProForm/index.js +1 -1
- package/lib/ProForm/style/index.less +8 -5
- package/lib/ProForm/utils/diffOriginal.js +18 -12
- package/lib/ProForm/utils/index.js +10 -10
- package/lib/ProForm/utils/useForm.js +1 -1
- package/lib/ProIcon/utils/index.js +3 -3
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts +1 -1
- package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +3 -3
- package/lib/ProLayout/components/ProCollapse/index.d.ts +1 -1
- package/lib/ProLayout/components/ProFooter/index.d.ts +1 -1
- package/lib/ProLayout/components/ProHeader/components/Copy/index.d.ts +1 -1
- package/lib/ProLayout/components/ProHeader/index.d.ts +1 -1
- package/lib/ProLayout/index.d.ts +4 -4
- package/lib/ProLayout/utils/index.js +9 -9
- package/lib/ProSelect/components/AdaptiveTooltip.d.ts +1 -1
- package/lib/ProSelect/index.d.ts +1 -1
- package/lib/ProStep/components/Anchor/index.d.ts +1 -1
- package/lib/ProStep/components/Item/index.d.ts +1 -1
- package/lib/ProStep/components/Listener/index.js +1 -1
- package/lib/ProStep/components/Step/index.d.ts +1 -1
- package/lib/ProStep/index.d.ts +2 -2
- package/lib/ProStep/index.js +3 -3
- package/lib/ProTable/components/FormatColumn/index.d.ts +5 -3
- package/lib/ProTable/components/FormatColumn/index.js +94 -73
- package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
- package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js +8 -8
- package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/lib/ProTable/components/RenderColumn/index.d.ts +1 -1
- package/lib/ProTable/components/RenderColumn/index.js +29 -11
- package/lib/ProTable/components/RenderFooter/index.d.ts +1 -1
- package/lib/ProTable/components/RenderTableHeader/index.d.ts +1 -1
- package/lib/ProTable/components/TableResizable/index.d.ts +1 -1
- package/lib/ProTable/components/TableResizable/index.js +0 -4
- package/lib/ProTable/hooks/useAntdTable.js +3 -3
- package/lib/ProTable/index.d.ts +6 -5
- package/lib/ProTable/index.js +6 -8
- package/lib/ProTable/propsType.d.ts +2 -1
- package/lib/ProTable/style/index.less +10 -1
- package/lib/ProTable/utils/index.d.ts +5 -2
- package/lib/ProTable/utils/index.js +13 -4
- package/lib/ProTabs/components/Card/index.d.ts +1 -1
- package/lib/ProThemeTools/component/ProTools/index.d.ts +1 -1
- package/lib/ProThemeTools/index.d.ts +1 -1
- package/lib/ProTooltip/index.d.ts +1 -1
- package/lib/ProTree/components/AdaptiveTooltip.d.ts +1 -1
- package/lib/ProTree/components/CloseIcon.d.ts +2 -1
- package/lib/ProTree/components/List.d.ts +1 -1
- package/lib/ProTree/components/ProTree.d.ts +1 -1
- package/lib/ProTree/components/ProTree.js +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.d.ts +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +49 -30
- package/lib/ProTree/components/SearchTitle.d.ts +1 -1
- package/lib/ProTree/components/Tree.d.ts +1 -1
- package/lib/ProTree/components/Tree.js +4 -4
- package/lib/ProTree/index.d.ts +1 -1
- package/lib/ProTree/utils.js +11 -11
- package/lib/ProTreeModal/components/Cascader.d.ts +1 -1
- package/lib/ProTreeModal/components/CloseIcon.d.ts +2 -1
- package/lib/ProTreeModal/components/SearchTitle.d.ts +1 -1
- package/lib/ProTreeModal/components/Tree.js +6 -6
- package/lib/ProTreeModal/components/Trigger.d.ts +1 -1
- package/lib/ProTreeModal/index.d.ts +1 -1
- package/lib/ProTreeModal/index.js +3 -3
- package/lib/ProTreeModal/utils.js +13 -13
- package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/lib/ProUpload/components/ImageRender.js +1 -1
- package/lib/ProViewer/index.js +2 -2
- package/lib/old/ProEditableTable/index.js +4 -4
- package/lib/style/theme/antd.less +4 -2
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +4 -1
- package/package.json +1 -1
- package/.vscode/extensions.json +0 -5
@@ -110,7 +110,7 @@ function List(props) {
|
|
110
110
|
}
|
111
111
|
}, [selectedKey]);
|
112
112
|
var onSelect = /*#__PURE__*/function () {
|
113
|
-
var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, item) {
|
113
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, item) {
|
114
114
|
var _props$onSelect;
|
115
115
|
var val;
|
116
116
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
@@ -298,7 +298,7 @@ function List(props) {
|
|
298
298
|
}, onlyKey);
|
299
299
|
};
|
300
300
|
function fn() {
|
301
|
-
var
|
301
|
+
var loop = function loop(data, index) {
|
302
302
|
index++;
|
303
303
|
var treeRow = data.map(function (item) {
|
304
304
|
var nodeClass = 'pro-tree-tree-node ';
|
@@ -320,7 +320,7 @@ function List(props) {
|
|
320
320
|
return _objectSpread(_objectSpread({}, item), {}, {
|
321
321
|
title: nodeTitle,
|
322
322
|
key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue],
|
323
|
-
children:
|
323
|
+
children: loop(item[fieldNames.children], index)
|
324
324
|
});
|
325
325
|
}
|
326
326
|
return _objectSpread(_objectSpread({}, item), {}, {
|
@@ -337,7 +337,7 @@ function List(props) {
|
|
337
337
|
if (searchStr) {
|
338
338
|
newTreeData = filterCheckedNodes(originalTreeData, [], searchStr, fieldNames);
|
339
339
|
}
|
340
|
-
return
|
340
|
+
return loop(newTreeData, -1);
|
341
341
|
}
|
342
342
|
var _treeData = fn();
|
343
343
|
var onExpand = function onExpand(newExpandedKeys, nextPara) {
|
package/es/ProTree/index.d.ts
CHANGED
package/es/ProTree/utils.js
CHANGED
@@ -50,7 +50,7 @@ export function getAllKeys(data, fieldNames) {
|
|
50
50
|
* @param fieldNames
|
51
51
|
* @returns
|
52
52
|
*/
|
53
|
-
var
|
53
|
+
export var getParentKey = function getParentKey(key, tree, fieldNames) {
|
54
54
|
var parentKey;
|
55
55
|
for (var i = 0; i < tree.length; i++) {
|
56
56
|
var node = tree[i];
|
@@ -59,17 +59,16 @@ var _getParentKey = function getParentKey(key, tree, fieldNames) {
|
|
59
59
|
return item[fieldNames.value] === key;
|
60
60
|
})) {
|
61
61
|
parentKey = node[fieldNames.value];
|
62
|
-
} else if (
|
63
|
-
parentKey =
|
62
|
+
} else if (getParentKey(key, node[fieldNames.children], fieldNames)) {
|
63
|
+
parentKey = getParentKey(key, node[fieldNames.children], fieldNames);
|
64
64
|
}
|
65
65
|
}
|
66
66
|
}
|
67
67
|
return parentKey;
|
68
68
|
};
|
69
|
-
export { _getParentKey as getParentKey };
|
70
69
|
export function findTreeNodeByKey(treeData, key, fieldNames) {
|
71
70
|
var result = [];
|
72
|
-
var
|
71
|
+
var traverse = function traverse(node, parents) {
|
73
72
|
if (node[fieldNames.value] === key) {
|
74
73
|
result.push.apply(result, [node].concat(_toConsumableArray(parents)));
|
75
74
|
return true;
|
@@ -80,7 +79,7 @@ export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
80
79
|
try {
|
81
80
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
82
81
|
var child = _step.value;
|
83
|
-
if (
|
82
|
+
if (traverse(child, [node].concat(_toConsumableArray(parents)))) {
|
84
83
|
return true;
|
85
84
|
}
|
86
85
|
}
|
@@ -96,7 +95,7 @@ export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
96
95
|
try {
|
97
96
|
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
98
97
|
var node = _step2.value;
|
99
|
-
|
98
|
+
traverse(node, []);
|
100
99
|
}
|
101
100
|
} catch (err) {
|
102
101
|
_iterator2.e(err);
|
@@ -115,23 +114,23 @@ export function filterCheckedNodes(data, checkedKeys) {
|
|
115
114
|
var searchStr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
116
115
|
var fieldNames = arguments.length > 3 ? arguments[3] : undefined;
|
117
116
|
var result = [];
|
118
|
-
var
|
117
|
+
var traverse = function traverse(node) {
|
119
118
|
var _node$fieldNames$chil3;
|
120
119
|
var title = node[fieldNames.value] + node[fieldNames.label];
|
121
120
|
if (!searchStr) {
|
122
121
|
if (checkedKeys.includes(node[fieldNames.value])) {
|
123
122
|
var _node$fieldNames$chil;
|
124
|
-
var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(
|
123
|
+
var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(traverse).filter(Boolean)) || [];
|
125
124
|
return _objectSpread(_objectSpread({}, node), {}, _defineProperty({}, fieldNames.children, _children));
|
126
125
|
}
|
127
126
|
} else if ((title === null || title === void 0 ? void 0 : title.indexOf(searchStr)) > -1) {
|
128
127
|
var _node$fieldNames$chil2;
|
129
|
-
var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(
|
128
|
+
var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(traverse).filter(Boolean)) || [];
|
130
129
|
return _objectSpread(_objectSpread({}, node), {}, {
|
131
130
|
children: _children2
|
132
131
|
});
|
133
132
|
}
|
134
|
-
var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(
|
133
|
+
var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(traverse).filter(Boolean);
|
135
134
|
if (children && children.length > 0) {
|
136
135
|
return _objectSpread(_objectSpread({}, node), {}, _defineProperty({}, fieldNames.children, children));
|
137
136
|
}
|
@@ -143,7 +142,7 @@ export function filterCheckedNodes(data, checkedKeys) {
|
|
143
142
|
try {
|
144
143
|
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
145
144
|
var node = _step3.value;
|
146
|
-
var filtered =
|
145
|
+
var filtered = traverse(node);
|
147
146
|
if (filtered) {
|
148
147
|
result.push(filtered);
|
149
148
|
}
|
@@ -10,5 +10,5 @@ interface CascaderProps {
|
|
10
10
|
handleOnChange?: (e: any, value: string) => void;
|
11
11
|
optionRender?: (item: any, searchStr: string) => string | ReactNode;
|
12
12
|
}
|
13
|
-
declare const Cascader: (props: CascaderProps) =>
|
13
|
+
declare const Cascader: (props: CascaderProps) => JSX.Element;
|
14
14
|
export default Cascader;
|
@@ -59,7 +59,7 @@ function List(props, ref) {
|
|
59
59
|
}, [searchStr]);
|
60
60
|
var _treeData = useMemo(function () {
|
61
61
|
function fn() {
|
62
|
-
var
|
62
|
+
var loop = function loop(data, index) {
|
63
63
|
index++;
|
64
64
|
return data.map(function (item) {
|
65
65
|
var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
|
@@ -84,7 +84,7 @@ function List(props, ref) {
|
|
84
84
|
})]
|
85
85
|
}),
|
86
86
|
key: item[fieldNameValue],
|
87
|
-
children:
|
87
|
+
children: loop(item[fieldNames.children], index)
|
88
88
|
});
|
89
89
|
}
|
90
90
|
return _objectSpread(_objectSpread({}, item), {}, {
|
@@ -117,12 +117,12 @@ function List(props, ref) {
|
|
117
117
|
if (searchStr) {
|
118
118
|
newTreeData = filterCheckedNodes(originalTreeData, [], searchStr, fieldNames);
|
119
119
|
}
|
120
|
-
return
|
120
|
+
return loop(newTreeData, -1);
|
121
121
|
}
|
122
122
|
return fn();
|
123
123
|
}, [searchStr, expandedKeys, showCodeName]);
|
124
124
|
var treeViewData = useMemo(function () {
|
125
|
-
var
|
125
|
+
var loop = function loop(data, index) {
|
126
126
|
index++;
|
127
127
|
return data.map(function (item) {
|
128
128
|
var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
|
@@ -151,7 +151,7 @@ function List(props, ref) {
|
|
151
151
|
})]
|
152
152
|
}),
|
153
153
|
key: item[fieldNameValue],
|
154
|
-
children:
|
154
|
+
children: loop(item[fieldNames.children], index)
|
155
155
|
});
|
156
156
|
}
|
157
157
|
return _objectSpread(_objectSpread({}, item), {}, {
|
@@ -170,7 +170,7 @@ function List(props, ref) {
|
|
170
170
|
});
|
171
171
|
});
|
172
172
|
};
|
173
|
-
return
|
173
|
+
return loop(treeData, -1);
|
174
174
|
}, [treeData]);
|
175
175
|
var onExpand = function onExpand(newExpandedKeys) {
|
176
176
|
setExpandedKeys(newExpandedKeys);
|
@@ -17,5 +17,5 @@ interface TriggerProps {
|
|
17
17
|
handleClearAll: () => void;
|
18
18
|
appointChange: (appoint?: boolean) => void;
|
19
19
|
}
|
20
|
-
declare function Trigger(props: TriggerProps):
|
20
|
+
declare function Trigger(props: TriggerProps): JSX.Element;
|
21
21
|
export default Trigger;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { ProTreeModalProps } from './propsType';
|
2
2
|
import './style/index.less';
|
3
3
|
export declare const CASCADER = "CASCADER";
|
4
|
-
declare const ProTreeModal: (props: ProTreeModalProps) =>
|
4
|
+
declare const ProTreeModal: (props: ProTreeModalProps) => JSX.Element;
|
5
5
|
export default ProTreeModal;
|
package/es/ProTreeModal/index.js
CHANGED
@@ -386,7 +386,7 @@ var ProTreeModal = function ProTreeModal(props) {
|
|
386
386
|
// 子项合并勾选
|
387
387
|
checkedValues = checkedValues.concat(allChildren);
|
388
388
|
// 从完整树中拿到父节点 只要存在父节点,那么就判断当前children是否全被勾选 若全被勾选就合并当前key到勾选队列
|
389
|
-
var
|
389
|
+
var _recourse = function _recourse(findNode) {
|
390
390
|
if (findNode.parentId) {
|
391
391
|
var _transformTreeToArray2;
|
392
392
|
var parentNode = treeNodeFind(state.transformedTree, function (t) {
|
@@ -407,12 +407,12 @@ var ProTreeModal = function ProTreeModal(props) {
|
|
407
407
|
checkedValues = checkedValues.concat([parentNode[fieldNameValue]]);
|
408
408
|
// 继续向上查找
|
409
409
|
if (parentNode.parentId) {
|
410
|
-
|
410
|
+
_recourse(parentNode);
|
411
411
|
}
|
412
412
|
}
|
413
413
|
}
|
414
414
|
};
|
415
|
-
|
415
|
+
_recourse(activeNode);
|
416
416
|
}
|
417
417
|
var _checkStrictly = state.searchStr ? true : checkStrictly;
|
418
418
|
// 此时应该取消掉自身并包含它所有的子集
|
package/es/ProTreeModal/utils.js
CHANGED
@@ -57,7 +57,7 @@ export function getAllKeys(data, fieldNames) {
|
|
57
57
|
* @param fieldNames
|
58
58
|
* @returns
|
59
59
|
*/
|
60
|
-
var
|
60
|
+
export var getParentKey = function getParentKey(key, tree, fieldNames) {
|
61
61
|
var parentKey;
|
62
62
|
for (var i = 0; i < tree.length; i++) {
|
63
63
|
var node = tree[i];
|
@@ -66,17 +66,16 @@ var _getParentKey = function getParentKey(key, tree, fieldNames) {
|
|
66
66
|
return item[fieldNames.value] === key;
|
67
67
|
})) {
|
68
68
|
parentKey = node[fieldNames.value];
|
69
|
-
} else if (
|
70
|
-
parentKey =
|
69
|
+
} else if (getParentKey(key, node[fieldNames.children], fieldNames)) {
|
70
|
+
parentKey = getParentKey(key, node[fieldNames.children], fieldNames);
|
71
71
|
}
|
72
72
|
}
|
73
73
|
}
|
74
74
|
return parentKey;
|
75
75
|
};
|
76
|
-
export { _getParentKey as getParentKey };
|
77
76
|
export function findTreeNodeByKey(treeData, key, fieldNames) {
|
78
77
|
var result = [];
|
79
|
-
var
|
78
|
+
var traverse = function traverse(node, parents) {
|
80
79
|
if (node[fieldNames.value] === key) {
|
81
80
|
result.push.apply(result, [node].concat(_toConsumableArray(parents)));
|
82
81
|
return true;
|
@@ -87,7 +86,7 @@ export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
87
86
|
try {
|
88
87
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
89
88
|
var child = _step.value;
|
90
|
-
if (
|
89
|
+
if (traverse(child, [node].concat(_toConsumableArray(parents)))) {
|
91
90
|
return true;
|
92
91
|
}
|
93
92
|
}
|
@@ -103,7 +102,7 @@ export function findTreeNodeByKey(treeData, key, fieldNames) {
|
|
103
102
|
try {
|
104
103
|
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
105
104
|
var node = _step2.value;
|
106
|
-
|
105
|
+
traverse(node, []);
|
107
106
|
}
|
108
107
|
} catch (err) {
|
109
108
|
_iterator2.e(err);
|
@@ -122,23 +121,23 @@ export function filterCheckedNodes(data, checkedKeys) {
|
|
122
121
|
var searchStr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
123
122
|
var fieldNames = arguments.length > 3 ? arguments[3] : undefined;
|
124
123
|
var result = [];
|
125
|
-
var
|
124
|
+
var traverse = function traverse(node) {
|
126
125
|
var _node$fieldNames$chil3;
|
127
126
|
var title = node[fieldNames.value] + node[fieldNames.label];
|
128
127
|
if (!searchStr) {
|
129
128
|
if (checkedKeys.includes(node[fieldNames.value])) {
|
130
129
|
var _node$fieldNames$chil;
|
131
|
-
var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(
|
130
|
+
var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(traverse).filter(Boolean)) || [];
|
132
131
|
return _objectSpread(_objectSpread({}, node), {}, _defineProperty({}, fieldNames.children, _children));
|
133
132
|
}
|
134
133
|
} else if (title.indexOf(searchStr) > -1) {
|
135
134
|
var _node$fieldNames$chil2;
|
136
|
-
var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(
|
135
|
+
var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(traverse).filter(Boolean)) || [];
|
137
136
|
return _objectSpread(_objectSpread({}, node), {}, {
|
138
137
|
children: _children2
|
139
138
|
});
|
140
139
|
}
|
141
|
-
var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(
|
140
|
+
var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(traverse).filter(Boolean);
|
142
141
|
if (children && children.length > 0) {
|
143
142
|
return _objectSpread(_objectSpread({}, node), {}, _defineProperty({}, fieldNames.children, children));
|
144
143
|
}
|
@@ -150,7 +149,7 @@ export function filterCheckedNodes(data, checkedKeys) {
|
|
150
149
|
try {
|
151
150
|
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
152
151
|
var node = _step3.value;
|
153
|
-
var filtered =
|
152
|
+
var filtered = traverse(node);
|
154
153
|
if (filtered) {
|
155
154
|
result.push(filtered);
|
156
155
|
}
|
@@ -198,7 +197,7 @@ export var transformMessage = function transformMessage(obj, message) {
|
|
198
197
|
});
|
199
198
|
return _message;
|
200
199
|
};
|
201
|
-
var
|
200
|
+
export var addLevelAndParentId = function addLevelAndParentId() {
|
202
201
|
var tree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
203
202
|
var fieldNames = arguments.length > 1 ? arguments[1] : undefined;
|
204
203
|
var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
@@ -212,9 +211,8 @@ var _addLevelAndParentId = function addLevelAndParentId() {
|
|
212
211
|
newNode.level = currentLevel;
|
213
212
|
newNode.parentId = currentParentId;
|
214
213
|
if (node[children]) {
|
215
|
-
newNode[children] =
|
214
|
+
newNode[children] = addLevelAndParentId(node[children], fieldNames, currentLevel + 1, newNode[value]);
|
216
215
|
}
|
217
216
|
return newNode;
|
218
217
|
});
|
219
|
-
};
|
220
|
-
export { _addLevelAndParentId as addLevelAndParentId };
|
218
|
+
};
|
@@ -1,2 +1,2 @@
|
|
1
1
|
import { DraggableUploadListItemProps } from '../propsType';
|
2
|
-
export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) =>
|
2
|
+
export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) => JSX.Element;
|
@@ -168,7 +168,7 @@ var ImageRender = function ImageRender(props) {
|
|
168
168
|
disabled: isView || disabled,
|
169
169
|
className: "action-item",
|
170
170
|
onClick: function () {
|
171
|
-
var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
171
|
+
var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
172
172
|
var res;
|
173
173
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
174
174
|
while (1) switch (_context.prev = _context.next) {
|
package/es/ProViewer/index.js
CHANGED
@@ -109,8 +109,8 @@ var ProViewer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
109
109
|
useEffect(function () {
|
110
110
|
if (previewFile) {
|
111
111
|
try {
|
112
|
-
previewFile().then(/*#__PURE__*/function () {
|
113
|
-
var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
|
112
|
+
previewFile().then( /*#__PURE__*/function () {
|
113
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
|
114
114
|
var res, blob, blobUrl;
|
115
115
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
116
116
|
while (1) switch (_context.prev = _context.next) {
|
@@ -172,7 +172,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
172
172
|
* @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
|
173
173
|
*/
|
174
174
|
var onMultipleDelete = /*#__PURE__*/function () {
|
175
|
-
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
175
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
176
176
|
var res, values, nextList, resetFieldsIndex;
|
177
177
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
178
178
|
while (1) switch (_context.prev = _context.next) {
|
@@ -278,7 +278,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
278
278
|
* @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
|
279
279
|
*/
|
280
280
|
var onSave = /*#__PURE__*/function () {
|
281
|
-
var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rowIndex, callback) {
|
281
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rowIndex, callback) {
|
282
282
|
var _form$getFieldsValue$, _form$getFieldsValue, nextValues, res, values;
|
283
283
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
284
284
|
while (1) switch (_context2.prev = _context2.next) {
|
@@ -404,12 +404,12 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
404
404
|
}, antButtonProps), {}, {
|
405
405
|
children: buttonText
|
406
406
|
}))]
|
407
|
-
}) : (/*#__PURE__*/cloneElement(buttonText, antButtonProps))
|
407
|
+
}) : ( /*#__PURE__*/cloneElement(buttonText, antButtonProps))
|
408
408
|
}) : null
|
409
409
|
});
|
410
410
|
};
|
411
411
|
var validateFields = /*#__PURE__*/function () {
|
412
|
-
var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
412
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
413
413
|
var values, nextValues, nextList, isEditing;
|
414
414
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
415
415
|
while (1) switch (_context3.prev = _context3.next) {
|
package/es/style/theme/antd.less
CHANGED
@@ -280,8 +280,10 @@
|
|
280
280
|
table {
|
281
281
|
.@{ant-prefix}-table-tbody {
|
282
282
|
.@{ant-prefix}-table-row:nth-child(even) {
|
283
|
-
&:hover td
|
284
|
-
|
283
|
+
&:hover td,
|
284
|
+
&:hover td.@{ant-prefix}-table-cell-fix-right,
|
285
|
+
&:hover td.@{ant-prefix}-table-cell-fix-left {
|
286
|
+
background-color: @zaui-table-hover-bg !important;
|
285
287
|
}
|
286
288
|
|
287
289
|
& td,
|
package/es/utils/index.d.ts
CHANGED
package/es/utils/index.js
CHANGED
@@ -2,7 +2,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
2
|
import { useEffect, useState } from 'react';
|
3
3
|
var EMPTY_VALUE = [undefined, null, ''];
|
4
4
|
/** 判断一个值是否是空值 */
|
5
|
-
export var isEmpty = function isEmpty(value) {
|
5
|
+
export var isEmpty = function isEmpty(value, emptyValue) {
|
6
|
+
if (emptyValue) {
|
7
|
+
EMPTY_VALUE.push(emptyValue);
|
8
|
+
}
|
6
9
|
if (EMPTY_VALUE.includes(value)) {
|
7
10
|
return true;
|
8
11
|
}
|
package/lib/ProAction/index.js
CHANGED
@@ -43,8 +43,8 @@ var ProAction = function ProAction(props) {
|
|
43
43
|
var index = state.index,
|
44
44
|
servicesArray = state.servicesArray;
|
45
45
|
var length = config.length;
|
46
|
-
var
|
47
|
-
var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
|
46
|
+
var onActionRun = /*#__PURE__*/function () {
|
47
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
|
48
48
|
var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
|
49
49
|
var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
|
50
50
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
@@ -140,7 +140,7 @@ var ProAction = function ProAction(props) {
|
|
140
140
|
return _context.abrupt("return", false);
|
141
141
|
case 44:
|
142
142
|
if (currentIndex + 1 < length) {
|
143
|
-
|
143
|
+
onActionRun(currentIndex + 1, newServicesArray);
|
144
144
|
} else {
|
145
145
|
setState({
|
146
146
|
loading: false
|
@@ -158,7 +158,7 @@ var ProAction = function ProAction(props) {
|
|
158
158
|
}();
|
159
159
|
var ChildContent = /*#__PURE__*/_react.default.cloneElement(children, {
|
160
160
|
onClick: function onClick() {
|
161
|
-
|
161
|
+
onActionRun(0, []);
|
162
162
|
},
|
163
163
|
loading: state.loading
|
164
164
|
});
|
@@ -170,7 +170,7 @@ var ProAction = function ProAction(props) {
|
|
170
170
|
return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
171
171
|
children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
|
172
172
|
onConfirm: function onConfirm() {
|
173
|
-
return
|
173
|
+
return onActionRun(0, []);
|
174
174
|
},
|
175
175
|
title: ((_config$2 = config[0]) === null || _config$2 === void 0 ? void 0 : _config$2.title) || (_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAction2 = _locale.default.ProAction) === null || _locale$ProAction2 === void 0 ? void 0 : _locale$ProAction2.defaultTitle),
|
176
176
|
children: children
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { IProDownloadProps } from './propsType';
|
2
2
|
declare const ProDownload: {
|
3
|
-
(props: IProDownloadProps):
|
3
|
+
(props: IProDownloadProps): JSX.Element;
|
4
4
|
downLoadRequest: import("./utils").DownloadRequestProps;
|
5
5
|
};
|
6
6
|
export default ProDownload;
|
package/lib/ProDownload/index.js
CHANGED
@@ -44,7 +44,7 @@ var ProDownload = function ProDownload(props) {
|
|
44
44
|
onErrorConfig = _ref.onError;
|
45
45
|
defaultProps.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headers), defaultProps.headers);
|
46
46
|
var handDownload = /*#__PURE__*/function () {
|
47
|
-
var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
47
|
+
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
48
48
|
var _params;
|
49
49
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
50
50
|
while (1) switch (_context.prev = _context.next) {
|
@@ -138,7 +138,7 @@ var ProDownload = function ProDownload(props) {
|
|
138
138
|
return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
139
139
|
className: cls,
|
140
140
|
onClick: function () {
|
141
|
-
var _onClick = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
|
141
|
+
var _onClick = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
|
142
142
|
var res;
|
143
143
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
|
144
144
|
while (1) switch (_context3.prev = _context3.next) {
|
@@ -153,7 +153,7 @@ var ProDownload = function ProDownload(props) {
|
|
153
153
|
_context3.next = 13;
|
154
154
|
break;
|
155
155
|
}
|
156
|
-
if (!(beforeDownload instanceof /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
156
|
+
if (!(beforeDownload instanceof /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
157
157
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
158
158
|
while (1) switch (_context2.prev = _context2.next) {
|
159
159
|
case 0:
|
package/lib/ProDownload/utils.js
CHANGED
@@ -79,7 +79,7 @@ function getFilenameFromContentDisposition(contentDisposition) {
|
|
79
79
|
}
|
80
80
|
// 发起请求获取下载文件
|
81
81
|
var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
|
82
|
-
var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
|
82
|
+
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
|
83
83
|
var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
|
84
84
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
85
85
|
while (1) switch (_context2.prev = _context2.next) {
|
@@ -106,8 +106,8 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
|
|
106
106
|
config.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config.headers), headers);
|
107
107
|
}
|
108
108
|
_context2.next = 7;
|
109
|
-
return fetch(url, config).then(/*#__PURE__*/function () {
|
110
|
-
var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
|
109
|
+
return fetch(url, config).then( /*#__PURE__*/function () {
|
110
|
+
var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
|
111
111
|
var _data, errorMsg;
|
112
112
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
113
113
|
while (1) switch (_context.prev = _context.next) {
|
@@ -39,6 +39,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
39
39
|
onCancel = _ref.onCancel,
|
40
40
|
children = _ref.children,
|
41
41
|
className = _ref.className,
|
42
|
+
zIndex = _ref.zIndex,
|
42
43
|
drawerProps = _ref.drawerProps;
|
43
44
|
var ref = (0, _react.useRef)(null);
|
44
45
|
var modalRef = (0, _react.useRef)(null);
|
@@ -49,7 +50,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
49
50
|
loading = _useState2[0],
|
50
51
|
toggleLoading = _useState2[1];
|
51
52
|
var noRenderFooter = isView || footer === false || footer === null;
|
52
|
-
var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
53
|
+
var onConfirm = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
53
54
|
var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
|
54
55
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
55
56
|
while (1) switch (_context.prev = _context.next) {
|
@@ -77,7 +78,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
77
78
|
}
|
78
79
|
}, _callee);
|
79
80
|
})), [onCancel, modalRef.current]);
|
80
|
-
var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
81
|
+
var handleFinish = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
|
81
82
|
var values, _error$errorFields, _error$errorFields$;
|
82
83
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
|
83
84
|
while (1) switch (_context2.prev = _context2.next) {
|
@@ -169,7 +170,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
169
170
|
if (noRenderFooter) {
|
170
171
|
return null;
|
171
172
|
}
|
172
|
-
if (/*#__PURE__*/_react.default.isValidElement(footer)) {
|
173
|
+
if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
|
173
174
|
return (0, _jsxRuntime.jsx)("div", {
|
174
175
|
className: "pro-drawer-footer",
|
175
176
|
children: footer
|
@@ -179,7 +180,7 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
179
180
|
return (0, _jsxRuntime.jsx)("div", {
|
180
181
|
className: "pro-drawer-footer",
|
181
182
|
children: footer.map(function (item) {
|
182
|
-
if (/*#__PURE__*/_react.default.isValidElement(item)) {
|
183
|
+
if ( /*#__PURE__*/_react.default.isValidElement(item)) {
|
183
184
|
return item;
|
184
185
|
}
|
185
186
|
return false;
|
@@ -195,7 +196,8 @@ var ProDrawer = function ProDrawer(_ref) {
|
|
195
196
|
placement: "right",
|
196
197
|
className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
|
197
198
|
closable: false,
|
198
|
-
onClose: onCancel
|
199
|
+
onClose: onCancel,
|
200
|
+
zIndex: zIndex
|
199
201
|
}, drawerProps), {}, {
|
200
202
|
children: [(0, _jsxRuntime.jsx)("div", {
|
201
203
|
className: "pro-drawer-close",
|
@@ -38,8 +38,9 @@ var ProModal = function ProModal(_ref) {
|
|
38
38
|
onCancel = _ref.onCancel,
|
39
39
|
children = _ref.children,
|
40
40
|
className = _ref.className,
|
41
|
-
|
42
|
-
|
41
|
+
extraLeft = _ref.extraLeft,
|
42
|
+
zIndex = _ref.zIndex,
|
43
|
+
modalProps = _ref.modalProps;
|
43
44
|
var ref = (0, _react.useRef)(null);
|
44
45
|
var _ref2 = (0, _ahooks.useScroll)((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
|
45
46
|
top = _ref2.top;
|
@@ -55,7 +56,7 @@ var ProModal = function ProModal(_ref) {
|
|
55
56
|
'pro-modal-no-footer': noRenderFooter,
|
56
57
|
'pro-modal-footer-shadow': height >= 450
|
57
58
|
}]);
|
58
|
-
var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
59
|
+
var handleFinish = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
59
60
|
var values, _error$errorFields, _error$errorFields$;
|
60
61
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
61
62
|
while (1) switch (_context.prev = _context.next) {
|
@@ -149,7 +150,7 @@ var ProModal = function ProModal(_ref) {
|
|
149
150
|
if (noRenderFooter) {
|
150
151
|
return null;
|
151
152
|
}
|
152
|
-
if (/*#__PURE__*/_react.default.isValidElement(footer)) {
|
153
|
+
if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
|
153
154
|
return (0, _jsxRuntime.jsx)("div", {
|
154
155
|
className: "pro-drawer-footer",
|
155
156
|
children: footer
|
@@ -159,7 +160,7 @@ var ProModal = function ProModal(_ref) {
|
|
159
160
|
return (0, _jsxRuntime.jsx)("div", {
|
160
161
|
className: "pro-drawer-footer",
|
161
162
|
children: footer.map(function (item) {
|
162
|
-
if (/*#__PURE__*/_react.default.isValidElement(item)) {
|
163
|
+
if ( /*#__PURE__*/_react.default.isValidElement(item)) {
|
163
164
|
return item;
|
164
165
|
}
|
165
166
|
return false;
|
@@ -181,7 +182,8 @@ var ProModal = function ProModal(_ref) {
|
|
181
182
|
closeIcon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
|
182
183
|
className: "close-icon",
|
183
184
|
src: _close.default
|
184
|
-
})
|
185
|
+
}),
|
186
|
+
zIndex: zIndex
|
185
187
|
}, modalProps), {}, {
|
186
188
|
children: (0, _jsxRuntime.jsx)("div", {
|
187
189
|
ref: ref,
|