@zat-design/sisyphus-react 3.6.6 → 3.6.7-beta.2
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 +9 -0
- package/dist/less.esm.css +9 -0
- package/es/ProAction/index.js +4 -4
- package/es/ProDownload/index.d.ts +1 -1
- package/es/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/es/ProEditTable/components/RcTable/BaseTable.d.ts +6 -0
- package/es/ProEditTable/components/RcTable/BaseTable.js +75 -0
- package/es/ProEditTable/components/RcTable/DraggableTable.d.ts +7 -0
- package/es/ProEditTable/components/RcTable/DraggableTable.js +90 -0
- package/es/ProEditTable/components/RcTable/VirtualTable.d.ts +6 -0
- package/es/ProEditTable/components/RcTable/VirtualTable.js +166 -0
- package/es/ProEditTable/components/RcTable/index.d.ts +6 -0
- package/es/ProEditTable/components/RcTable/index.js +6 -0
- package/es/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/index.js +27 -19
- package/es/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/es/ProEditTable/components/RenderToolbar/index.js +8 -6
- package/es/ProEditTable/components/Summary/index.d.ts +1 -1
- package/es/ProEditTable/index.js +33 -56
- package/es/ProEditTable/propsType.d.ts +11 -0
- package/es/ProEditTable/utils/config.d.ts +1 -1
- package/es/ProEditTable/utils/index.js +1 -1
- package/es/ProEditTable/utils/tools.js +3 -3
- package/es/ProEnum/components/Group.d.ts +1 -1
- package/es/ProEnum/components/Tag.d.ts +1 -1
- package/es/ProEnum/index.d.ts +2 -2
- 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/base/InputNumber/index.js +8 -2
- package/es/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.js +9 -7
- 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/ProRangeBox/index.d.ts +1 -2
- package/es/ProForm/utils/index.js +14 -10
- package/es/ProForm/utils/useWatch.d.ts +1 -2
- 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/ProSelect/index.js +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/Step/index.d.ts +1 -1
- package/es/ProStep/index.d.ts +2 -2
- package/es/ProTable/components/DndWrapper/index.d.ts +2 -1
- package/es/ProTable/components/DndWrapper/index.js +49 -10
- package/es/ProTable/components/DndWrapper/utils/index.d.ts +8 -0
- package/es/ProTable/components/DndWrapper/utils/index.js +165 -0
- package/es/ProTable/components/DndWrapper/utils/propsType.d.ts +61 -0
- package/es/ProTable/components/DndWrapper/utils/propsType.js +1 -0
- package/es/ProTable/components/ResizableLine/index.d.ts +1 -1
- package/es/ProTable/components/TableResizable/index.d.ts +1 -1
- package/es/ProTable/index.d.ts +1 -1
- package/es/ProTable/index.js +2 -1
- package/es/ProTable/propsType.d.ts +2 -1
- package/es/ProTable/style/index.less +9 -0
- package/es/ProTable/useAntdTable.d.ts +2 -2
- package/es/ProTable/useAntdTable.js +17 -3
- package/es/ProTable/utils.js +3 -3
- package/es/ProTabs/components/Card/index.d.ts +1 -1
- package/es/ProThemeTools/component/PrdTools/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/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/ProTreeSelect/index.d.ts +1 -1
- package/es/ProTree/components/ProTreeSelect/index.js +18 -18
- package/es/ProTree/components/SearchTitle.d.ts +1 -1
- package/es/ProTree/components/Tree.d.ts +1 -1
- package/es/ProTree/components/Tree.js +3 -3
- 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/utils.js +12 -11
- package/es/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/lib/ProAction/index.js +4 -4
- package/lib/ProDownload/index.d.ts +1 -1
- package/lib/ProEditTable/components/ActionButton/index.d.ts +1 -1
- package/lib/ProEditTable/components/RcTable/BaseTable.d.ts +6 -0
- package/lib/ProEditTable/components/RcTable/BaseTable.js +81 -0
- package/lib/ProEditTable/components/RcTable/DraggableTable.d.ts +7 -0
- package/lib/ProEditTable/components/RcTable/DraggableTable.js +96 -0
- package/lib/ProEditTable/components/RcTable/VirtualTable.d.ts +6 -0
- package/lib/ProEditTable/components/RcTable/VirtualTable.js +172 -0
- package/lib/ProEditTable/components/RcTable/index.d.ts +6 -0
- package/lib/ProEditTable/components/RcTable/index.js +27 -0
- package/lib/ProEditTable/components/RenderField/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/index.js +27 -19
- package/lib/ProEditTable/components/RenderToolbar/index.d.ts +1 -1
- package/lib/ProEditTable/components/RenderToolbar/index.js +7 -5
- package/lib/ProEditTable/components/Summary/index.d.ts +1 -1
- package/lib/ProEditTable/index.js +32 -53
- package/lib/ProEditTable/propsType.d.ts +11 -0
- package/lib/ProEditTable/utils/config.d.ts +1 -1
- package/lib/ProEditTable/utils/index.js +1 -1
- package/lib/ProEditTable/utils/tools.js +3 -3
- package/lib/ProEnum/components/Group.d.ts +1 -1
- package/lib/ProEnum/components/Tag.d.ts +1 -1
- package/lib/ProEnum/index.d.ts +2 -2
- 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/base/InputNumber/index.js +8 -2
- package/lib/ProForm/components/combination/ProCascader/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.js +9 -7
- 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/ProRangeBox/index.d.ts +1 -2
- package/lib/ProForm/utils/index.js +10 -10
- package/lib/ProForm/utils/useWatch.d.ts +1 -2
- 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/ProSelect/index.js +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/Step/index.d.ts +1 -1
- package/lib/ProStep/index.d.ts +2 -2
- package/lib/ProTable/components/DndWrapper/index.d.ts +2 -1
- package/lib/ProTable/components/DndWrapper/index.js +48 -9
- package/lib/ProTable/components/DndWrapper/utils/index.d.ts +8 -0
- package/lib/ProTable/components/DndWrapper/utils/index.js +177 -0
- package/lib/ProTable/components/DndWrapper/utils/propsType.d.ts +61 -0
- package/lib/ProTable/components/DndWrapper/utils/propsType.js +5 -0
- package/lib/ProTable/components/ResizableLine/index.d.ts +1 -1
- package/lib/ProTable/components/TableResizable/index.d.ts +1 -1
- package/lib/ProTable/index.d.ts +1 -1
- package/lib/ProTable/index.js +2 -1
- package/lib/ProTable/propsType.d.ts +2 -1
- package/lib/ProTable/style/index.less +9 -0
- package/lib/ProTable/useAntdTable.d.ts +2 -2
- package/lib/ProTable/useAntdTable.js +16 -2
- package/lib/ProTable/utils.js +3 -3
- package/lib/ProTabs/components/Card/index.d.ts +1 -1
- package/lib/ProThemeTools/component/PrdTools/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/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/ProTreeSelect/index.d.ts +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +18 -18
- package/lib/ProTree/components/SearchTitle.d.ts +1 -1
- package/lib/ProTree/components/Tree.d.ts +1 -1
- package/lib/ProTree/components/Tree.js +3 -3
- 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/utils.js +11 -11
- package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/package.json +6 -3
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.Row = void 0;
|
|
8
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
8
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
9
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
10
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -12,6 +13,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
12
13
|
var _core = require("@dnd-kit/core");
|
|
13
14
|
var _sortable = require("@dnd-kit/sortable");
|
|
14
15
|
var _utilities = require("@dnd-kit/utilities");
|
|
16
|
+
var _index = require("./utils/index");
|
|
15
17
|
var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
|
|
16
18
|
var _excluded = ["disabled", "children"];
|
|
17
19
|
var Row = exports.Row = function Row(props) {
|
|
@@ -67,30 +69,67 @@ var Row = exports.Row = function Row(props) {
|
|
|
67
69
|
}));
|
|
68
70
|
};
|
|
69
71
|
var DndWrapper = function DndWrapper(_ref2) {
|
|
70
|
-
var
|
|
72
|
+
var _flatTree$;
|
|
71
73
|
var draggable = _ref2.draggable,
|
|
72
74
|
value = _ref2.value,
|
|
73
75
|
onChange = _ref2.onChange,
|
|
74
76
|
disabled = _ref2.disabled,
|
|
75
|
-
children = _ref2.children
|
|
77
|
+
children = _ref2.children,
|
|
78
|
+
rowKey = _ref2.rowKey;
|
|
76
79
|
var onDragEnd = function onDragEnd(_ref3) {
|
|
77
80
|
var active = _ref3.active,
|
|
78
81
|
over = _ref3.over;
|
|
82
|
+
// 为数据源划分层级及parentId
|
|
83
|
+
var transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
|
|
84
|
+
// 同一level层级的且parentId相同的,可以互相之间拖拽替换
|
|
79
85
|
if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
|
|
80
|
-
var
|
|
81
|
-
return
|
|
86
|
+
var activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
|
|
87
|
+
return t.rowKey === active.id;
|
|
82
88
|
});
|
|
83
|
-
var
|
|
84
|
-
return
|
|
89
|
+
var overObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
|
|
90
|
+
return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
|
|
85
91
|
});
|
|
86
|
-
|
|
87
|
-
|
|
92
|
+
if (activeObject && overObject) {
|
|
93
|
+
var activeLevel = activeObject.level,
|
|
94
|
+
activeParentId = activeObject.parentId;
|
|
95
|
+
var overLevel = overObject.level,
|
|
96
|
+
overParentId = overObject.parentId;
|
|
97
|
+
if (activeLevel === overLevel && activeParentId === overParentId) {
|
|
98
|
+
// 将树平铺
|
|
99
|
+
var _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
|
|
100
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
|
101
|
+
children: undefined
|
|
102
|
+
});
|
|
103
|
+
});
|
|
104
|
+
var activeIndex = _flatTree.findIndex(function (i) {
|
|
105
|
+
return i.rowKey === active.id;
|
|
106
|
+
});
|
|
107
|
+
var overIndex = _flatTree.findIndex(function (i) {
|
|
108
|
+
return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
|
|
109
|
+
});
|
|
110
|
+
var nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
|
|
111
|
+
onChange((0, _index.createTreeFromArray)(nextValue, {
|
|
112
|
+
itemKey: 'rowKey',
|
|
113
|
+
parentKey: 'parentId',
|
|
114
|
+
childrenKey: 'children'
|
|
115
|
+
}));
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
} else {
|
|
119
|
+
onChange((0, _toConsumableArray2.default)(value));
|
|
88
120
|
}
|
|
89
121
|
};
|
|
122
|
+
// 将树平铺
|
|
123
|
+
var flatTree = (0, _index.transformTreeToArray)(value).map(function (item) {
|
|
124
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
|
125
|
+
children: undefined
|
|
126
|
+
});
|
|
127
|
+
});
|
|
90
128
|
return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
|
|
91
129
|
onDragEnd: onDragEnd,
|
|
130
|
+
collisionDetection: _core.closestCorners,
|
|
92
131
|
children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
|
|
93
|
-
items: (
|
|
132
|
+
items: (flatTree === null || flatTree === void 0 ? void 0 : (_flatTree$ = flatTree[0]) === null || _flatTree$ === void 0 ? void 0 : _flatTree$.rowKey) ? flatTree.map(function (i) {
|
|
94
133
|
return i.rowKey;
|
|
95
134
|
}) : [],
|
|
96
135
|
strategy: _sortable.verticalListSortingStrategy,
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ChildrenKey, Tree, BaseCallbackMeta, BaseInnerOptions, FindCallback, FindOptions, ArrayItemWithParentKey, FromArrayOptions, TreeWithParentKey, TypeOfKey, ForeachOptions, ForeachCallback, ToArrayOptions } from './propsType';
|
|
2
|
+
export declare const getRowKey: (rowKey: any, record: any) => any;
|
|
3
|
+
export declare const addLevelAndParentId: (tree: any[], rowKey: any, currentLevel?: number, currentParentId?: any) => any[];
|
|
4
|
+
export declare function getFinalChildrenKey<T extends ChildrenKey>(tree: Tree<T>, meta: BaseCallbackMeta, options: BaseInnerOptions<T>): ChildrenKey;
|
|
5
|
+
export declare function treeNodeFind<T extends ChildrenKey>(tree: Tree<T> | Tree<T>[], callback: FindCallback<T>, options?: FindOptions): Tree<T> | undefined;
|
|
6
|
+
export declare function createTreeFromArray<K extends TypeOfKey, P extends TypeOfKey, T extends ChildrenKey>(array: ArrayItemWithParentKey<K, P>[], options?: FromArrayOptions): TreeWithParentKey<K, P, T>[];
|
|
7
|
+
export declare function treeForEach<T extends ChildrenKey>(tree: Tree<T> | Tree<T>[], callback: ForeachCallback<T>, options?: ForeachOptions): void;
|
|
8
|
+
export declare function transformTreeToArray<T extends ChildrenKey>(tree: Tree<T> | Tree<T>[], options?: ToArrayOptions): Tree<T>[];
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.addLevelAndParentId = void 0;
|
|
8
|
+
exports.createTreeFromArray = createTreeFromArray;
|
|
9
|
+
exports.getFinalChildrenKey = getFinalChildrenKey;
|
|
10
|
+
exports.getRowKey = void 0;
|
|
11
|
+
exports.transformTreeToArray = transformTreeToArray;
|
|
12
|
+
exports.treeForEach = treeForEach;
|
|
13
|
+
exports.treeNodeFind = treeNodeFind;
|
|
14
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
15
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
16
|
+
var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
|
|
17
|
+
// 默认取id
|
|
18
|
+
var key = record.rowKey || 'id';
|
|
19
|
+
if (rowKey) {
|
|
20
|
+
var _ref;
|
|
21
|
+
key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
|
|
22
|
+
}
|
|
23
|
+
return key;
|
|
24
|
+
};
|
|
25
|
+
var _addLevelAndParentId = exports.addLevelAndParentId = function addLevelAndParentId(tree, rowKey) {
|
|
26
|
+
var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
27
|
+
var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
|
|
28
|
+
return tree.map(function (node) {
|
|
29
|
+
var newNode = (0, _objectSpread2.default)({}, node);
|
|
30
|
+
newNode.level = currentLevel;
|
|
31
|
+
newNode.parentId = currentParentId;
|
|
32
|
+
newNode.rowKey = getRowKey(rowKey, node);
|
|
33
|
+
if (node.children) {
|
|
34
|
+
newNode.children = _addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
|
|
35
|
+
}
|
|
36
|
+
return newNode;
|
|
37
|
+
});
|
|
38
|
+
};
|
|
39
|
+
function getFinalChildrenKey(tree, meta, options) {
|
|
40
|
+
if (typeof options.getChildrenKey === 'function') {
|
|
41
|
+
var dynamicChildrenKey = options.getChildrenKey(tree, meta);
|
|
42
|
+
if (dynamicChildrenKey != null) {
|
|
43
|
+
return dynamicChildrenKey;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return options.childrenKey;
|
|
47
|
+
}
|
|
48
|
+
// 前置深度优先遍历
|
|
49
|
+
var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
|
50
|
+
var callbackResult = callback(treeItem, options);
|
|
51
|
+
if (callbackResult) {
|
|
52
|
+
return treeItem;
|
|
53
|
+
}
|
|
54
|
+
var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
|
|
55
|
+
var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
|
|
56
|
+
if (!children || !Array.isArray(children)) {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
for (var i = 0, count = children.length; i < count; i++) {
|
|
60
|
+
var childItem = children[i];
|
|
61
|
+
var findOne = _treeNodePreImpl(childItem, callback, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
|
|
62
|
+
parents: [].concat((0, _toConsumableArray2.default)(options.parents), [treeItem]),
|
|
63
|
+
depth: options.depth + 1
|
|
64
|
+
}));
|
|
65
|
+
if (findOne) {
|
|
66
|
+
return findOne;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return undefined;
|
|
70
|
+
};
|
|
71
|
+
var treeNodeStrategies = {
|
|
72
|
+
pre: _treeNodePreImpl
|
|
73
|
+
};
|
|
74
|
+
function treeNodeFind(tree, callback, options) {
|
|
75
|
+
var _options$childrenKey, _options$strategy;
|
|
76
|
+
var childrenKey = (_options$childrenKey = options === null || options === void 0 ? void 0 : options.childrenKey) !== null && _options$childrenKey !== void 0 ? _options$childrenKey : 'children';
|
|
77
|
+
var strategy = (_options$strategy = options === null || options === void 0 ? void 0 : options.strategy) !== null && _options$strategy !== void 0 ? _options$strategy : 'pre';
|
|
78
|
+
var getChildrenKey = options === null || options === void 0 ? void 0 : options.getChildrenKey;
|
|
79
|
+
var method = treeNodeStrategies[strategy];
|
|
80
|
+
var innerOptions = {
|
|
81
|
+
childrenKey: childrenKey,
|
|
82
|
+
depth: 0,
|
|
83
|
+
parents: [],
|
|
84
|
+
getChildrenKey: getChildrenKey
|
|
85
|
+
};
|
|
86
|
+
if (Array.isArray(tree)) {
|
|
87
|
+
for (var i = 0, count = tree.length; i < count; i++) {
|
|
88
|
+
var treeItem = tree[i];
|
|
89
|
+
var result = method(treeItem, callback, innerOptions);
|
|
90
|
+
if (result) {
|
|
91
|
+
return result;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
return method(tree, callback, innerOptions);
|
|
97
|
+
}
|
|
98
|
+
function createTreeFromArray(array, options) {
|
|
99
|
+
var result = [];
|
|
100
|
+
var _ref2 = options || {},
|
|
101
|
+
_ref2$parentKey = _ref2.parentKey,
|
|
102
|
+
parentKey = _ref2$parentKey === void 0 ? 'pid' : _ref2$parentKey,
|
|
103
|
+
_ref2$itemKey = _ref2.itemKey,
|
|
104
|
+
itemKey = _ref2$itemKey === void 0 ? 'id' : _ref2$itemKey,
|
|
105
|
+
_ref2$childrenKey = _ref2.childrenKey,
|
|
106
|
+
childrenKey = _ref2$childrenKey === void 0 ? 'children' : _ref2$childrenKey;
|
|
107
|
+
var map = new Map();
|
|
108
|
+
array.map(function (item) {
|
|
109
|
+
var itemKeyValue = item[itemKey];
|
|
110
|
+
if (!map.get(itemKeyValue)) {
|
|
111
|
+
map.set(itemKeyValue, item);
|
|
112
|
+
}
|
|
113
|
+
return item;
|
|
114
|
+
});
|
|
115
|
+
array.map(function (item) {
|
|
116
|
+
var parentKeyValue = item[parentKey];
|
|
117
|
+
var parentItem = map.get(parentKeyValue);
|
|
118
|
+
if (!parentItem || !parentKeyValue) {
|
|
119
|
+
result.push(item);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
var siblings = parentItem[childrenKey];
|
|
123
|
+
if (siblings === null || siblings === undefined) {
|
|
124
|
+
// disable eslint tslint
|
|
125
|
+
parentItem[childrenKey] = [item];
|
|
126
|
+
} else if (Array.isArray(siblings)) {
|
|
127
|
+
siblings.push(item);
|
|
128
|
+
} else {
|
|
129
|
+
var msg = "the key \"".concat(childrenKey, "\" is not an array, please check your data");
|
|
130
|
+
throw new Error(msg);
|
|
131
|
+
}
|
|
132
|
+
return item;
|
|
133
|
+
});
|
|
134
|
+
return result;
|
|
135
|
+
}
|
|
136
|
+
// 前置遍历
|
|
137
|
+
var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
|
|
138
|
+
callback(treeItem, options);
|
|
139
|
+
var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
|
|
140
|
+
var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
|
|
141
|
+
if (children && Array.isArray(children)) {
|
|
142
|
+
var nextLevelOptions = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
|
|
143
|
+
parents: [].concat((0, _toConsumableArray2.default)(options.parents), [treeItem]),
|
|
144
|
+
depth: options.depth + 1
|
|
145
|
+
});
|
|
146
|
+
children.forEach(function (childItem) {
|
|
147
|
+
_treeForEachPreImpl(childItem, callback, nextLevelOptions);
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
};
|
|
151
|
+
var treeForEachStrategies = {
|
|
152
|
+
pre: _treeForEachPreImpl
|
|
153
|
+
};
|
|
154
|
+
function treeForEach(tree, callback, options) {
|
|
155
|
+
var _options$childrenKey2, _options$strategy2;
|
|
156
|
+
var childrenKey = (_options$childrenKey2 = options === null || options === void 0 ? void 0 : options.childrenKey) !== null && _options$childrenKey2 !== void 0 ? _options$childrenKey2 : 'children';
|
|
157
|
+
var strategy = (_options$strategy2 = options === null || options === void 0 ? void 0 : options.strategy) !== null && _options$strategy2 !== void 0 ? _options$strategy2 : 'pre';
|
|
158
|
+
var getChildrenKey = options === null || options === void 0 ? void 0 : options.getChildrenKey;
|
|
159
|
+
var isForest = Array.isArray(tree);
|
|
160
|
+
var method = treeForEachStrategies[strategy];
|
|
161
|
+
var innerOptions = {
|
|
162
|
+
childrenKey: childrenKey,
|
|
163
|
+
depth: 0,
|
|
164
|
+
parents: [],
|
|
165
|
+
getChildrenKey: getChildrenKey
|
|
166
|
+
};
|
|
167
|
+
isForest ? tree.forEach(function (tree) {
|
|
168
|
+
method(tree, callback, innerOptions);
|
|
169
|
+
}) : method(tree, callback, innerOptions);
|
|
170
|
+
}
|
|
171
|
+
function transformTreeToArray(tree, options) {
|
|
172
|
+
var results = [];
|
|
173
|
+
treeForEach(tree, function (t) {
|
|
174
|
+
results.push(t);
|
|
175
|
+
}, options);
|
|
176
|
+
return results;
|
|
177
|
+
}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
export type TreeKey = string | number;
|
|
2
|
+
export type ChildrenKey = TreeKey;
|
|
3
|
+
export type Tree<T extends ChildrenKey = 'children'> = {
|
|
4
|
+
[key in T]?: Tree<T>[];
|
|
5
|
+
} & {
|
|
6
|
+
[key in TreeKey]: any;
|
|
7
|
+
};
|
|
8
|
+
export type Strategy = 'pre' | 'post' | 'breadth';
|
|
9
|
+
export interface BaseOptions {
|
|
10
|
+
itemKey?: String;
|
|
11
|
+
parentKey?: String;
|
|
12
|
+
childrenKey?: ChildrenKey;
|
|
13
|
+
strategy?: Strategy;
|
|
14
|
+
getChildrenKey?: (tree: Tree, meta: BaseCallbackMeta) => ChildrenKey | undefined;
|
|
15
|
+
}
|
|
16
|
+
export interface BaseInnerOptions<T extends ChildrenKey = 'children'> {
|
|
17
|
+
childrenKey: ChildrenKey;
|
|
18
|
+
parents: Tree<T>[];
|
|
19
|
+
depth: number;
|
|
20
|
+
getChildrenKey?: (tree: Tree, meta: BaseCallbackMeta) => ChildrenKey | undefined;
|
|
21
|
+
}
|
|
22
|
+
export interface BaseCallbackMeta<T extends ChildrenKey = 'children'> {
|
|
23
|
+
depth: number;
|
|
24
|
+
parents?: Tree<T>[];
|
|
25
|
+
}
|
|
26
|
+
export type FindOptions = BaseOptions;
|
|
27
|
+
export type FindCallbackMeta<T extends ChildrenKey> = BaseCallbackMeta<T>;
|
|
28
|
+
export type FindCallback<T extends ChildrenKey> = (treeItem: Tree<T>, meta: FindCallbackMeta<T>) => boolean | undefined;
|
|
29
|
+
type FindInnerOption<T extends ChildrenKey> = BaseInnerOptions<T>;
|
|
30
|
+
export type FindImpl<T extends ChildrenKey> = (treeItem: Tree<T>, callback: FindCallback<T>, options: FindInnerOption<T>) => Tree<T> | undefined;
|
|
31
|
+
export interface QueueItem {
|
|
32
|
+
tree: Tree<ChildrenKey>;
|
|
33
|
+
options: FindInnerOption<ChildrenKey>;
|
|
34
|
+
}
|
|
35
|
+
export type TypeOfKey = string;
|
|
36
|
+
export type KeyValue = string | number | undefined | null;
|
|
37
|
+
export type ArrayItemWithParentKey<P extends TypeOfKey, K extends TypeOfKey> = Record<string, any> & {
|
|
38
|
+
[key in P]?: KeyValue;
|
|
39
|
+
} & {
|
|
40
|
+
[key in K]?: KeyValue;
|
|
41
|
+
};
|
|
42
|
+
export type TreeWithParentKey<K extends TypeOfKey, P extends TypeOfKey, T extends ChildrenKey> = Record<string, any> & {
|
|
43
|
+
[key in P]?: KeyValue;
|
|
44
|
+
} & {
|
|
45
|
+
[key in K]: KeyValue;
|
|
46
|
+
} & {
|
|
47
|
+
[key in T]?: TreeWithParentKey<K, P, T>[];
|
|
48
|
+
};
|
|
49
|
+
export interface FromArrayOptions {
|
|
50
|
+
parentKey?: TypeOfKey;
|
|
51
|
+
itemKey?: TypeOfKey;
|
|
52
|
+
childrenKey?: ChildrenKey;
|
|
53
|
+
}
|
|
54
|
+
export type FromArray<K extends TypeOfKey, P extends TypeOfKey, T extends ChildrenKey> = (array: ArrayItemWithParentKey<K, P>[], options: FromArrayOptions) => TreeWithParentKey<K, P, T>[];
|
|
55
|
+
export type ForeachOptions = BaseOptions;
|
|
56
|
+
export type ForeachCallbackMeta<T extends ChildrenKey> = BaseCallbackMeta<T>;
|
|
57
|
+
export type ForeachCallback<T extends ChildrenKey> = (treeItem: Tree<T>, meta: ForeachCallbackMeta<T>) => void;
|
|
58
|
+
export type ForeachInnerOption<T extends ChildrenKey> = BaseInnerOptions<T>;
|
|
59
|
+
export type ForeachImpl<T extends ChildrenKey> = (treeItem: Tree<T>, callback: ForeachCallback<T>, options: ForeachInnerOption<T>) => void;
|
|
60
|
+
export type ToArrayOptions = ForeachOptions;
|
|
61
|
+
export {};
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const ResizableLine: () => JSX.Element;
|
|
1
|
+
declare const ResizableLine: () => import("react/jsx-runtime").JSX.Element;
|
|
2
2
|
export default ResizableLine;
|
package/lib/ProTable/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const defaultPage: {
|
|
|
5
5
|
pageNum: number;
|
|
6
6
|
pageSize: number;
|
|
7
7
|
};
|
|
8
|
-
declare function ProTable(props: ProTableProps): JSX.Element;
|
|
8
|
+
declare function ProTable(props: ProTableProps): import("react/jsx-runtime").JSX.Element;
|
|
9
9
|
declare namespace ProTable {
|
|
10
10
|
var defaultProps: {
|
|
11
11
|
quickConfig: boolean;
|
package/lib/ProTable/index.js
CHANGED
|
@@ -370,10 +370,11 @@ function ProTable(props) {
|
|
|
370
370
|
children: (0, _jsxRuntime.jsx)("div", {
|
|
371
371
|
className: cls,
|
|
372
372
|
children: (0, _jsxRuntime.jsxs)(_components.DndWrapper, {
|
|
373
|
-
value: _dataSource,
|
|
373
|
+
value: _dataSource !== null && _dataSource !== void 0 ? _dataSource : [],
|
|
374
374
|
onChange: onDataSourceChange,
|
|
375
375
|
disabled: false,
|
|
376
376
|
draggable: draggable,
|
|
377
|
+
rowKey: rowKey,
|
|
377
378
|
children: [(headerRender || columnConfig || resizeColumn) && (0, _jsxRuntime.jsxs)("div", {
|
|
378
379
|
className: "column-config",
|
|
379
380
|
children: [(0, _jsxRuntime.jsx)("div", {
|
|
@@ -72,11 +72,12 @@ export interface PaginationProps {
|
|
|
72
72
|
pageNum: number;
|
|
73
73
|
pageSize: number;
|
|
74
74
|
}
|
|
75
|
+
type RowSelectionTypeWithPick = Pick<TableProps<any>, 'rowSelection'>['rowSelection'];
|
|
75
76
|
export interface RequestOptions<T, R> {
|
|
76
77
|
form?: FormInstance;
|
|
77
78
|
isResetQuery?: boolean;
|
|
78
79
|
rowKey?: string | GetRowKey<R>;
|
|
79
|
-
rowSelection?: boolean;
|
|
80
|
+
rowSelection?: boolean | RowSelectionTypeWithPick;
|
|
80
81
|
rowSelectType?: RowSelectionType;
|
|
81
82
|
rowSelections?: boolean;
|
|
82
83
|
extraParams?: Partial<T>;
|
|
@@ -9,6 +9,15 @@
|
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
+
.@{ant-prefix}-table-cell-with-append {
|
|
13
|
+
white-space: nowrap;
|
|
14
|
+
position: relative;
|
|
15
|
+
z-index: 100;
|
|
16
|
+
}
|
|
17
|
+
.@{ant-prefix}-table-row-expand-icon {
|
|
18
|
+
position: absolute;
|
|
19
|
+
left: -16px;
|
|
20
|
+
}
|
|
12
21
|
|
|
13
22
|
.@{ant-prefix}-table-content {
|
|
14
23
|
>table {
|
|
@@ -11,7 +11,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
|
|
|
11
11
|
selectedRowKeys: Key[];
|
|
12
12
|
onChange(rowKeys: Key[], rows: any[]): void;
|
|
13
13
|
onSelectAll: (selected: boolean) => void;
|
|
14
|
-
getCheckboxProps: () => {
|
|
14
|
+
getCheckboxProps: (record?: any) => {
|
|
15
15
|
className: string;
|
|
16
16
|
};
|
|
17
17
|
selections: boolean | ({
|
|
@@ -57,7 +57,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
|
|
|
57
57
|
selectedRowKeys: Key[];
|
|
58
58
|
onChange(rowKeys: Key[], rows: any[]): void;
|
|
59
59
|
onSelectAll: (selected: boolean) => void;
|
|
60
|
-
getCheckboxProps: () => {
|
|
60
|
+
getCheckboxProps: (record?: any) => {
|
|
61
61
|
className: string;
|
|
62
62
|
};
|
|
63
63
|
selections: boolean | ({
|
|
@@ -320,7 +320,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
320
320
|
}));
|
|
321
321
|
}
|
|
322
322
|
}, [extraParams]);
|
|
323
|
-
var
|
|
323
|
+
var _rowSelection = {
|
|
324
324
|
fixed: true,
|
|
325
325
|
type: rowSelectType,
|
|
326
326
|
columnWidth: rowSelections ? 64 : undefined,
|
|
@@ -362,7 +362,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
362
362
|
});
|
|
363
363
|
}
|
|
364
364
|
},
|
|
365
|
-
getCheckboxProps: function getCheckboxProps() {
|
|
365
|
+
getCheckboxProps: function getCheckboxProps(record) {
|
|
366
366
|
return {
|
|
367
367
|
className: allSelected && rowSelections ? 'checkbox-disabled' : ''
|
|
368
368
|
};
|
|
@@ -431,6 +431,20 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
431
431
|
}()
|
|
432
432
|
}] : false
|
|
433
433
|
};
|
|
434
|
+
var rowSelection = (0, _lodash.isObject)(returnRowSelection) ? (0, _lodash.merge)(_rowSelection, returnRowSelection) : _rowSelection;
|
|
435
|
+
if ((0, _lodash.isObject)(returnRowSelection) && !(0, _lodash.isEqual)(rowSelection, _rowSelection)) {
|
|
436
|
+
// getCheckboxProps需要特殊兼容原有的逻辑,特殊处理
|
|
437
|
+
var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
|
|
438
|
+
if (isHasGetCheckboxProps) {
|
|
439
|
+
(0, _lodash.set)(rowSelection, 'getCheckboxProps', function (record) {
|
|
440
|
+
var _rowSelection$getChec;
|
|
441
|
+
var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
|
|
442
|
+
return (0, _objectSpread2.default)({
|
|
443
|
+
className: allSelected && rowSelections ? 'checkbox-disabled' : ''
|
|
444
|
+
}, passReturnObjects);
|
|
445
|
+
});
|
|
446
|
+
}
|
|
447
|
+
}
|
|
434
448
|
var selectedTip = allSelected || selectedRowKeys.length ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable5 = _locale.default.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
|
|
435
449
|
selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
|
|
436
450
|
}) : null;
|
package/lib/ProTable/utils.js
CHANGED
|
@@ -389,15 +389,15 @@ var getParentElement = exports.getParentElement = function getParentElement(elem
|
|
|
389
389
|
if (!element || !name) {
|
|
390
390
|
return result;
|
|
391
391
|
}
|
|
392
|
-
var
|
|
392
|
+
var _searchDom = function searchDom(element, name) {
|
|
393
393
|
var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
|
|
394
394
|
if (element.parentElement[type] === name) {
|
|
395
395
|
result = element.parentElement;
|
|
396
396
|
return false;
|
|
397
397
|
}
|
|
398
|
-
|
|
398
|
+
_searchDom(element.parentElement, name, type = 'className');
|
|
399
399
|
};
|
|
400
|
-
|
|
400
|
+
_searchDom(element, name, type = 'className');
|
|
401
401
|
return result;
|
|
402
402
|
};
|
|
403
403
|
/**
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { DevToolsPropsType } from '../../propsType';
|
|
2
|
-
declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => JSX.Element;
|
|
2
|
+
declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
|
|
3
3
|
export default PrdTools;
|
|
@@ -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;
|
|
@@ -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;
|
|
@@ -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;
|