@zat-design/sisyphus-react 3.9.0-beta.8 → 3.9.0-beta.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/.vscode/extensions.json +5 -0
- 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 +4 -4
- package/es/ProDrawerForm/components/ProModal/index.js +3 -3
- 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/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/index.js +5 -5
- 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/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 +1 -1
- package/es/ProEnum/utils/eventCenter.js +1 -2
- package/es/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/es/ProForm/components/base/Input/index.d.ts +1 -1
- 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.js +1 -1
- 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 +5 -5
- 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 +1 -2
- package/es/ProForm/components/old/ProAddress/index.js +1 -1
- package/es/ProForm/components/old/ProRangeBox/index.d.ts +1 -2
- package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/es/ProForm/components/render/Render.js +3 -3
- package/es/ProForm/index.js +1 -1
- package/es/ProForm/utils/index.js +14 -10
- package/es/ProForm/utils/useForm.js +1 -1
- package/es/ProIcon/utils/index.js +4 -3
- 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 +2 -1
- package/es/ProTable/components/FormatColumn/index.js +10 -8
- 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 +9 -8
- package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts +1 -1
- package/es/ProTable/components/RenderColumn/index.d.ts +1 -0
- package/es/ProTable/components/RenderColumn/index.js +16 -3
- 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/hooks/useAntdTable.js +3 -3
- package/es/ProTable/index.d.ts +1 -1
- package/es/ProTable/index.js +3 -2
- package/es/ProTable/propsType.d.ts +1 -0
- 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 +1 -2
- 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 +20 -20
- 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 +12 -11
- package/es/ProTreeModal/components/Cascader.d.ts +1 -1
- package/es/ProTreeModal/components/CloseIcon.d.ts +1 -2
- 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 +16 -14
- 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/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 +4 -4
- package/lib/ProDrawerForm/components/ProModal/index.js +3 -3
- 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/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/index.js +5 -5
- 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/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 +1 -1
- package/lib/ProEnum/utils/eventCenter.js +1 -2
- package/lib/ProEnum/utils/getEnumLabel.d.ts +1 -1
- package/lib/ProForm/components/base/Input/index.d.ts +1 -1
- 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.js +1 -1
- 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 +5 -5
- 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 +1 -2
- package/lib/ProForm/components/old/ProAddress/index.js +1 -1
- package/lib/ProForm/components/old/ProRangeBox/index.d.ts +1 -2
- package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
- package/lib/ProForm/components/render/Render.js +3 -3
- package/lib/ProForm/index.js +1 -1
- 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 +2 -1
- package/lib/ProTable/components/FormatColumn/index.js +10 -8
- 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 -0
- package/lib/ProTable/components/RenderColumn/index.js +16 -3
- 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/hooks/useAntdTable.js +3 -3
- package/lib/ProTable/index.d.ts +1 -1
- package/lib/ProTable/index.js +3 -2
- package/lib/ProTable/propsType.d.ts +1 -0
- 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 +1 -2
- 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 +20 -20
- 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 +1 -2
- 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/package.json +1 -1
@@ -54,7 +54,8 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
54
54
|
wrapToolTipProps = _ref2.wrapToolTipProps,
|
55
55
|
scroll = _ref2.scroll,
|
56
56
|
onUpdateMinWidth = _ref2.onUpdateMinWidth,
|
57
|
-
isInNewRow = _ref2.isInNewRow
|
57
|
+
isInNewRow = _ref2.isInNewRow,
|
58
|
+
diffConfig = _ref2.diffConfig;
|
58
59
|
var title = column.title,
|
59
60
|
valueType = column.valueType,
|
60
61
|
_column$format = column.format,
|
@@ -70,8 +71,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
70
71
|
prefix = column.prefix,
|
71
72
|
suffix = column.suffix,
|
72
73
|
dataIndex = column.dataIndex,
|
73
|
-
|
74
|
-
originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
|
74
|
+
originalDiffTip = column.originalDiffTip,
|
75
75
|
_column$toolTipProps = column.toolTipProps,
|
76
76
|
toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
|
77
77
|
minWidth = column.minWidth,
|
@@ -87,7 +87,7 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
87
87
|
callback: onUpdateMinWidth
|
88
88
|
});
|
89
89
|
var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
|
90
|
-
var _originalDiffTip =
|
90
|
+
var _originalDiffTip = (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource) || (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip);
|
91
91
|
// 前缀处理
|
92
92
|
var prefixNode = function prefixNode(value, record, index) {
|
93
93
|
if (!prefix) {
|
@@ -126,13 +126,15 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
126
126
|
// 存在比对
|
127
127
|
if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
128
128
|
var _originalObj$record$r;
|
129
|
-
|
129
|
+
var diffResult = otherProps.viewRender({
|
130
130
|
originalValue: originalValue,
|
131
131
|
originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
|
132
132
|
value: value,
|
133
133
|
record: record,
|
134
134
|
index: index
|
135
135
|
});
|
136
|
+
originalValue = diffResult;
|
137
|
+
otherProps.diffChange = diffResult;
|
136
138
|
}
|
137
139
|
return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
|
138
140
|
valueType: valueType,
|
@@ -525,14 +527,14 @@ export var getParentElement = function getParentElement(element, name) {
|
|
525
527
|
if (!element || !name) {
|
526
528
|
return result;
|
527
529
|
}
|
528
|
-
var
|
530
|
+
var _searchDom = function searchDom(element, name) {
|
529
531
|
var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
|
530
532
|
if (element.parentElement[type] === name) {
|
531
533
|
result = element.parentElement;
|
532
534
|
return false;
|
533
535
|
}
|
534
|
-
|
536
|
+
_searchDom(element.parentElement, name, type = 'className');
|
535
537
|
};
|
536
|
-
|
538
|
+
_searchDom(element, name, type = 'className');
|
537
539
|
return result;
|
538
540
|
};
|
package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js
CHANGED
@@ -74,7 +74,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
74
74
|
onDragStartGuard = _ref2.onDragStartGuard,
|
75
75
|
onDragEndGuard = _ref2.onDragEndGuard;
|
76
76
|
var onDragStart = /*#__PURE__*/function () {
|
77
|
-
var _ref4 = _asyncToGenerator(
|
77
|
+
var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
|
78
78
|
var active, _transformedValue, activeObject;
|
79
79
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
80
80
|
while (1) switch (_context.prev = _context.next) {
|
@@ -105,7 +105,7 @@ var DndWrapper = function DndWrapper(_ref2) {
|
|
105
105
|
};
|
106
106
|
}();
|
107
107
|
var onDragEnd = /*#__PURE__*/function () {
|
108
|
-
var _ref6 = _asyncToGenerator(
|
108
|
+
var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
|
109
109
|
var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
|
110
110
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
111
111
|
while (1) switch (_context2.prev = _context2.next) {
|
@@ -9,7 +9,7 @@ export var getRowKey = function getRowKey(rowKey, record) {
|
|
9
9
|
}
|
10
10
|
return key;
|
11
11
|
};
|
12
|
-
|
12
|
+
var _addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
|
13
13
|
var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
14
14
|
var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
|
15
15
|
return tree.map(function (node) {
|
@@ -18,11 +18,12 @@ export var addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
|
|
18
18
|
newNode.parentId = currentParentId;
|
19
19
|
newNode.rowKey = getRowKey(rowKey, node);
|
20
20
|
if (node.children) {
|
21
|
-
newNode.children =
|
21
|
+
newNode.children = _addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
|
22
22
|
}
|
23
23
|
return newNode;
|
24
24
|
});
|
25
25
|
};
|
26
|
+
export { _addLevelAndParentId as addLevelAndParentId };
|
26
27
|
export function getFinalChildrenKey(tree, meta, options) {
|
27
28
|
if (typeof options.getChildrenKey === 'function') {
|
28
29
|
var dynamicChildrenKey = options.getChildrenKey(tree, meta);
|
@@ -33,7 +34,7 @@ export function getFinalChildrenKey(tree, meta, options) {
|
|
33
34
|
return options.childrenKey;
|
34
35
|
}
|
35
36
|
// 前置深度优先遍历
|
36
|
-
var
|
37
|
+
var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
37
38
|
var callbackResult = callback(treeItem, options);
|
38
39
|
if (callbackResult) {
|
39
40
|
return treeItem;
|
@@ -45,7 +46,7 @@ var treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
|
45
46
|
}
|
46
47
|
for (var i = 0, count = children.length; i < count; i++) {
|
47
48
|
var childItem = children[i];
|
48
|
-
var findOne =
|
49
|
+
var findOne = _treeNodePreImpl(childItem, callback, _objectSpread(_objectSpread({}, options), {}, {
|
49
50
|
parents: [].concat(_toConsumableArray(options.parents), [treeItem]),
|
50
51
|
depth: options.depth + 1
|
51
52
|
}));
|
@@ -56,7 +57,7 @@ var treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
|
56
57
|
return undefined;
|
57
58
|
};
|
58
59
|
var treeNodeStrategies = {
|
59
|
-
pre:
|
60
|
+
pre: _treeNodePreImpl
|
60
61
|
};
|
61
62
|
export function treeNodeFind(tree, callback, options) {
|
62
63
|
var _options$childrenKey, _options$strategy;
|
@@ -121,7 +122,7 @@ export function createTreeFromArray(array, options) {
|
|
121
122
|
return result;
|
122
123
|
}
|
123
124
|
// 前置遍历
|
124
|
-
var
|
125
|
+
var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
|
125
126
|
callback(treeItem, options);
|
126
127
|
var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
|
127
128
|
var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
|
@@ -131,12 +132,12 @@ var treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options
|
|
131
132
|
depth: options.depth + 1
|
132
133
|
});
|
133
134
|
children.forEach(function (childItem) {
|
134
|
-
|
135
|
+
_treeForEachPreImpl(childItem, callback, nextLevelOptions);
|
135
136
|
});
|
136
137
|
}
|
137
138
|
};
|
138
139
|
var treeForEachStrategies = {
|
139
|
-
pre:
|
140
|
+
pre: _treeForEachPreImpl
|
140
141
|
};
|
141
142
|
export function treeForEach(tree, callback, options) {
|
142
143
|
var _options$childrenKey2, _options$strategy2;
|
@@ -8,6 +8,7 @@ import "antd/es/typography/style";
|
|
8
8
|
import _Typography from "antd/es/typography";
|
9
9
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
10
10
|
import { useSetState } from 'ahooks';
|
11
|
+
import classNames from 'classnames';
|
11
12
|
import { CheckOutlined } from '@ant-design/icons';
|
12
13
|
import { ReactSVG } from 'react-svg';
|
13
14
|
import { isEmpty } from '../../../utils';
|
@@ -35,6 +36,9 @@ var RenderColumn = function RenderColumn(props) {
|
|
35
36
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
36
37
|
tooltip = _useSetState2[0].tooltip,
|
37
38
|
setState = _useSetState2[1];
|
39
|
+
var cellDiffCls = classNames({
|
40
|
+
'varied-cell': originalDiffTip
|
41
|
+
});
|
38
42
|
if (!isEmpty(originalValue) && !isInNewRowFlag) {
|
39
43
|
var renderNode = value ? node : '-';
|
40
44
|
if (ellipsis || originalDiffTip) {
|
@@ -48,8 +52,14 @@ var RenderColumn = function RenderColumn(props) {
|
|
48
52
|
},
|
49
53
|
children: ellipsis ? currentValue : renderNode
|
50
54
|
});
|
55
|
+
if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
|
56
|
+
return renderNode;
|
57
|
+
}
|
58
|
+
if (Array.isArray(originalValue)) {
|
59
|
+
console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
|
60
|
+
}
|
51
61
|
return _jsx(_Tooltip, _objectSpread(_objectSpread({
|
52
|
-
className:
|
62
|
+
className: cellDiffCls,
|
53
63
|
style: {
|
54
64
|
width: width,
|
55
65
|
minWidth: minWidth
|
@@ -64,7 +74,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
64
74
|
children: [_jsxs(_Space, {
|
65
75
|
align: "start",
|
66
76
|
className: "original-value-container",
|
67
|
-
children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
|
77
|
+
children: ["\u521D\u59CB\u503C\uFF1A", !Array.isArray(originalValue) ? originalValue : null]
|
68
78
|
}), _jsx(_Space, {
|
69
79
|
className: "current-value-container",
|
70
80
|
children: ellipsis ? _jsxs(_Space, {
|
@@ -80,8 +90,11 @@ var RenderColumn = function RenderColumn(props) {
|
|
80
90
|
children: renderNode
|
81
91
|
}));
|
82
92
|
}
|
93
|
+
if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
|
94
|
+
return renderNode;
|
95
|
+
}
|
83
96
|
return _jsx("span", {
|
84
|
-
className:
|
97
|
+
className: cellDiffCls,
|
85
98
|
style: {
|
86
99
|
width: width,
|
87
100
|
minWidth: minWidth
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const RenderFooter: (props: any) => JSX.Element;
|
1
|
+
declare const RenderFooter: (props: any) => import("react/jsx-runtime").JSX.Element;
|
2
2
|
export default RenderFooter;
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const RenderTableHeader: (props: any) => JSX.Element;
|
1
|
+
declare const RenderTableHeader: (props: any) => import("react/jsx-runtime").JSX.Element;
|
2
2
|
export default RenderTableHeader;
|
@@ -276,7 +276,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
276
276
|
}
|
277
277
|
};
|
278
278
|
var handleRefresh = /*#__PURE__*/function () {
|
279
|
-
var _ref4 = _asyncToGenerator(
|
279
|
+
var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
280
280
|
var res;
|
281
281
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
282
282
|
while (1) switch (_context.prev = _context.next) {
|
@@ -388,7 +388,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
388
388
|
total: total
|
389
389
|
}),
|
390
390
|
onSelect: function () {
|
391
|
-
var _onSelect = _asyncToGenerator(
|
391
|
+
var _onSelect = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
|
392
392
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
393
393
|
while (1) switch (_context2.prev = _context2.next) {
|
394
394
|
case 0:
|
@@ -412,7 +412,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
412
412
|
key: 'uncheckAll',
|
413
413
|
text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
|
414
414
|
onSelect: function () {
|
415
|
-
var _onSelect2 = _asyncToGenerator(
|
415
|
+
var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
416
416
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
417
417
|
while (1) switch (_context3.prev = _context3.next) {
|
418
418
|
case 0:
|
package/es/ProTable/index.d.ts
CHANGED
package/es/ProTable/index.js
CHANGED
@@ -213,6 +213,7 @@ var ProTable = function ProTable(props) {
|
|
213
213
|
column: item,
|
214
214
|
originalObj: originalObj,
|
215
215
|
rowKey: props.rowKey,
|
216
|
+
diffConfig: diffConfig,
|
216
217
|
diffToolTip: toolTip,
|
217
218
|
wrapToolTipProps: wrapToolTipProps,
|
218
219
|
scroll: _scroll,
|
@@ -244,7 +245,7 @@ var ProTable = function ProTable(props) {
|
|
244
245
|
_scroll = props === null || props === void 0 ? void 0 : props.scroll;
|
245
246
|
}
|
246
247
|
var handleColumnConfig = /*#__PURE__*/function () {
|
247
|
-
var _ref6 = _asyncToGenerator(
|
248
|
+
var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
|
248
249
|
var newColumns, _columnConfig$onColum, catchColumns;
|
249
250
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
250
251
|
while (1) switch (_context.prev = _context.next) {
|
@@ -353,7 +354,7 @@ var ProTable = function ProTable(props) {
|
|
353
354
|
return _rowSelection;
|
354
355
|
};
|
355
356
|
var onDataSourceChange = /*#__PURE__*/function () {
|
356
|
-
var _ref7 = _asyncToGenerator(
|
357
|
+
var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
|
357
358
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
358
359
|
while (1) switch (_context2.prev = _context2.next) {
|
359
360
|
case 0:
|
@@ -46,6 +46,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
|
|
46
46
|
originValue: any;
|
47
47
|
}) => boolean;
|
48
48
|
viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
|
49
|
+
diffChange?: boolean;
|
49
50
|
}
|
50
51
|
export interface CreateTreeFromArrayOptions {
|
51
52
|
itemKey?: string;
|
@@ -1,3 +1,3 @@
|
|
1
1
|
import type { DevToolsPropsType } from '../../propsType';
|
2
|
-
declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => JSX.Element;
|
2
|
+
declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
|
3
3
|
export default ProTools;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import type { ProThemeToolsProps } from './propsType';
|
2
2
|
declare const ProThemeTools: {
|
3
|
-
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): JSX.Element;
|
3
|
+
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): import("react/jsx-runtime").JSX.Element;
|
4
4
|
defaultProps: {
|
5
5
|
size: number;
|
6
6
|
mode: string;
|
package/es/ProTooltip/index.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
1
|
import { ProTooltipPropsType } from './propsType';
|
2
2
|
import './style/index.less';
|
3
|
-
declare const ProTooltip: (props: ProTooltipPropsType) => JSX.Element;
|
3
|
+
declare const ProTooltip: (props: ProTooltipPropsType) => import("react/jsx-runtime").JSX.Element;
|
4
4
|
export default ProTooltip;
|
@@ -12,6 +12,6 @@ interface ListProps {
|
|
12
12
|
handleFilterClose?: (code: string) => void;
|
13
13
|
optionRender?: (item: any, searchStr?: string) => string | ReactNode;
|
14
14
|
}
|
15
|
-
declare function List(props: ListProps): JSX.Element;
|
15
|
+
declare function List(props: ListProps): import("react/jsx-runtime").JSX.Element;
|
16
16
|
declare const _default: import("react").MemoExoticComponent<typeof List>;
|
17
17
|
export default _default;
|
@@ -359,7 +359,7 @@ var ProTree = function ProTree(props) {
|
|
359
359
|
};
|
360
360
|
/** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
|
361
361
|
var onSelectTreeNode = /*#__PURE__*/function () {
|
362
|
-
var _ref2 = _asyncToGenerator(
|
362
|
+
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
|
363
363
|
var _options$;
|
364
364
|
var values, options, option;
|
365
365
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { PropTreeSelectProps } from './propsType';
|
3
|
-
export declare const ProTreeSelect: (props: PropTreeSelectProps, ref: React.Ref<unknown> | undefined) => JSX.Element;
|
3
|
+
export declare const ProTreeSelect: (props: PropTreeSelectProps, ref: React.Ref<unknown> | undefined) => import("react/jsx-runtime").JSX.Element;
|
4
4
|
declare const _default: React.ForwardRefExoticComponent<PropTreeSelectProps & React.RefAttributes<unknown>>;
|
5
5
|
export default _default;
|
@@ -110,14 +110,14 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
110
110
|
}
|
111
111
|
var count = 0;
|
112
112
|
var result = [];
|
113
|
-
var
|
113
|
+
var _loopCount = function loopCount(data) {
|
114
114
|
data.map(function (item) {
|
115
115
|
count += 1;
|
116
116
|
var children = item.children,
|
117
117
|
other = _objectWithoutProperties(item, _excluded2);
|
118
118
|
result.push(_objectSpread({}, other));
|
119
119
|
if (item.children) {
|
120
|
-
|
120
|
+
_loopCount(item.children);
|
121
121
|
}
|
122
122
|
return item;
|
123
123
|
});
|
@@ -125,7 +125,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
125
125
|
if ((dictsEnum === null || dictsEnum === void 0 ? void 0 : dictsEnum.length) > 10) {
|
126
126
|
return dictsEnum;
|
127
127
|
}
|
128
|
-
|
128
|
+
_loopCount(dictsEnum);
|
129
129
|
if (count <= 10) {
|
130
130
|
return result;
|
131
131
|
}
|
@@ -139,17 +139,17 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
139
139
|
*/
|
140
140
|
var transferDataSource = function transferDataSource(dataArr, showCodeAndName) {
|
141
141
|
var copyData = cloneDeep(dataArr);
|
142
|
-
var
|
142
|
+
var _loop = function loop(arr) {
|
143
143
|
arr.map(function (item) {
|
144
144
|
item[label] = "".concat(item[code], "-").concat(item[label]);
|
145
145
|
if (item.children) {
|
146
|
-
|
146
|
+
_loop(item.children);
|
147
147
|
}
|
148
148
|
return item;
|
149
149
|
});
|
150
150
|
};
|
151
151
|
if (showCodeAndName) {
|
152
|
-
|
152
|
+
_loop(copyData);
|
153
153
|
}
|
154
154
|
return copyData;
|
155
155
|
};
|
@@ -243,19 +243,19 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
243
243
|
return viewEmpty;
|
244
244
|
}
|
245
245
|
var labelResult = [];
|
246
|
-
var
|
246
|
+
var _queryLabel = function queryLabel(dicts) {
|
247
247
|
return dicts.map(function (item) {
|
248
248
|
if (value.includes(item[code])) {
|
249
249
|
var labelText = item[label];
|
250
250
|
labelResult.push(labelText);
|
251
251
|
}
|
252
252
|
if (item.children) {
|
253
|
-
|
253
|
+
_queryLabel(item.children);
|
254
254
|
}
|
255
255
|
return item;
|
256
256
|
});
|
257
257
|
};
|
258
|
-
|
258
|
+
_queryLabel(origDataSource);
|
259
259
|
return labelResult === null || labelResult === void 0 ? void 0 : labelResult.join(',');
|
260
260
|
};
|
261
261
|
// 纯展示处理
|
@@ -293,7 +293,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
293
293
|
* @param node 每个节点数据对象
|
294
294
|
* @returns 整个react节点树
|
295
295
|
*/
|
296
|
-
var
|
296
|
+
var _renderTreeNode = function renderTreeNode(node, grade) {
|
297
297
|
var children = node.children,
|
298
298
|
icon = node.icon;
|
299
299
|
var labelText = node[label];
|
@@ -364,7 +364,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
364
364
|
checkable: node.checkable,
|
365
365
|
className: "node-val-".concat(value),
|
366
366
|
children: children.map(function (child) {
|
367
|
-
return
|
367
|
+
return _renderTreeNode(child, sonGrade);
|
368
368
|
})
|
369
369
|
}, key);
|
370
370
|
};
|
@@ -375,7 +375,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
375
375
|
* @returns 处理后得树
|
376
376
|
*/
|
377
377
|
function filterTree(sourceList, keyWord) {
|
378
|
-
var
|
378
|
+
var _filterData = function filterData(data) {
|
379
379
|
var currentAllNodeChild = []; // 记录当前节点得所有子节点
|
380
380
|
// 遍历数组
|
381
381
|
for (var i = 0; i < data.length; i++) {
|
@@ -383,7 +383,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
383
383
|
// 一直递归到最后一层子节点
|
384
384
|
var currentNodeChild = []; // 记录当前节点下得子节点匹配到的节点个数
|
385
385
|
if (item.children && item.children.length > 0) {
|
386
|
-
currentNodeChild =
|
386
|
+
currentNodeChild = _filterData(item.children);
|
387
387
|
}
|
388
388
|
// 迭代完子节点向上回溯,如果有匹配到得子节点,那么加入当前节点得孩子对象上,否则加入得是空数组
|
389
389
|
item.children = currentNodeChild;
|
@@ -397,11 +397,11 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
397
397
|
}
|
398
398
|
return currentAllNodeChild;
|
399
399
|
};
|
400
|
-
sourceList =
|
400
|
+
sourceList = _filterData(sourceList);
|
401
401
|
return sourceList;
|
402
402
|
}
|
403
|
-
var searchTreeEvent = debounce(
|
404
|
-
var _ref5 = _asyncToGenerator(
|
403
|
+
var searchTreeEvent = debounce(/*#__PURE__*/function () {
|
404
|
+
var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
|
405
405
|
var result;
|
406
406
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
407
407
|
while (1) switch (_context.prev = _context.next) {
|
@@ -431,7 +431,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
431
431
|
}(), 500);
|
432
432
|
function findTreeNode(treeList, nodeValue) {
|
433
433
|
var result = {};
|
434
|
-
var
|
434
|
+
var _filterData2 = function filterData(data) {
|
435
435
|
for (var i = 0; i < data.length; i++) {
|
436
436
|
var item = data[i];
|
437
437
|
if (item[code] === nodeValue || Array.isArray(nodeValue) && nodeValue.includes(item[code])) {
|
@@ -443,11 +443,11 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
443
443
|
}
|
444
444
|
// 一直递归到最后一层子节点
|
445
445
|
if (item.children && item.children.length > 0) {
|
446
|
-
|
446
|
+
_filterData2(item.children);
|
447
447
|
}
|
448
448
|
}
|
449
449
|
};
|
450
|
-
|
450
|
+
_filterData2(treeList);
|
451
451
|
return result;
|
452
452
|
}
|
453
453
|
function getLabelByValue(treeList, nodeValue) {
|
@@ -584,7 +584,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
584
584
|
}
|
585
585
|
}, treeProps), {}, {
|
586
586
|
children: selectList.map(function (node) {
|
587
|
-
return
|
587
|
+
return _renderTreeNode(node, 1);
|
588
588
|
})
|
589
589
|
}))
|
590
590
|
});
|
@@ -6,6 +6,6 @@ declare function SearchTitle(props: {
|
|
6
6
|
showEllipse?: boolean;
|
7
7
|
ellipseWidth?: string;
|
8
8
|
otherProps?: ProFormOtherProps;
|
9
|
-
}): JSX.Element;
|
9
|
+
}): import("react/jsx-runtime").JSX.Element;
|
10
10
|
declare const _default: import("react").MemoExoticComponent<typeof SearchTitle>;
|
11
11
|
export default _default;
|
@@ -23,5 +23,5 @@ interface ListProps extends ProTreeProps {
|
|
23
23
|
handleFilterClose?: (code: string, node?: any) => void;
|
24
24
|
[key: string]: any;
|
25
25
|
}
|
26
|
-
declare function List(props: ListProps): JSX.Element;
|
26
|
+
declare function List(props: ListProps): import("react/jsx-runtime").JSX.Element;
|
27
27
|
export default List;
|
@@ -110,7 +110,7 @@ function List(props) {
|
|
110
110
|
}
|
111
111
|
}, [selectedKey]);
|
112
112
|
var onSelect = /*#__PURE__*/function () {
|
113
|
-
var _ref = _asyncToGenerator(
|
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