@zat-design/sisyphus-react 3.7.3-beta.13 → 3.7.3-beta.14
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 +12 -1
- package/dist/less.esm.css +12 -1
- 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 +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/RenderToolbar/index.d.ts +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/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 +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/combination/ProCascader/index.d.ts +1 -1
- package/es/ProForm/components/combination/ProCascader/index.js +7 -7
- package/es/ProForm/components/combination/ProModalSelect/index.js +29 -24
- 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/ProRangeBox/index.d.ts +2 -1
- package/es/ProForm/utils/index.js +10 -14
- 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/Step/index.d.ts +1 -1
- package/es/ProStep/index.d.ts +2 -2
- package/es/ProTable/components/FormatColumn/index.d.ts +7 -1
- package/es/ProTable/components/FormatColumn/index.js +17 -11
- package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- 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/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/index.d.ts +1 -1
- package/es/ProTable/index.js +30 -13
- package/es/ProTable/propsType.d.ts +14 -1
- package/es/ProTable/style/index.less +1 -1
- 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 +4 -0
- package/es/ProTree/components/AdaptiveTooltip.js +55 -0
- package/es/ProTree/components/CloseIcon.d.ts +2 -1
- package/es/ProTree/components/List.d.ts +1 -1
- package/es/ProTree/components/List.js +15 -3
- 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 +38 -18
- package/es/ProTree/components/ProTreeSelect/propsType.d.ts +2 -0
- package/es/ProTree/components/SearchTitle.d.ts +2 -1
- package/es/ProTree/components/SearchTitle.js +7 -8
- 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/style/index.less +14 -0
- 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/utils.js +11 -12
- 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 +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/RenderToolbar/index.d.ts +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/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 +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/combination/ProCascader/index.d.ts +1 -1
- package/lib/ProForm/components/combination/ProCascader/index.js +7 -7
- package/lib/ProForm/components/combination/ProModalSelect/index.js +29 -24
- 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/ProRangeBox/index.d.ts +2 -1
- package/lib/ProForm/utils/index.js +10 -10
- 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/Step/index.d.ts +1 -1
- package/lib/ProStep/index.d.ts +2 -2
- package/lib/ProTable/components/FormatColumn/index.d.ts +7 -1
- package/lib/ProTable/components/FormatColumn/index.js +17 -11
- package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts +1 -1
- 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/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/index.d.ts +1 -1
- package/lib/ProTable/index.js +30 -13
- package/lib/ProTable/propsType.d.ts +14 -1
- package/lib/ProTable/style/index.less +1 -1
- 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 +4 -0
- package/lib/ProTree/components/AdaptiveTooltip.js +61 -0
- package/lib/ProTree/components/CloseIcon.d.ts +2 -1
- package/lib/ProTree/components/List.d.ts +1 -1
- package/lib/ProTree/components/List.js +15 -3
- 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 +38 -18
- package/lib/ProTree/components/ProTreeSelect/propsType.d.ts +2 -0
- package/lib/ProTree/components/SearchTitle.d.ts +2 -1
- package/lib/ProTree/components/SearchTitle.js +8 -7
- 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/style/index.less +14 -0
- 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/utils.js +11 -11
- package/lib/ProUpload/components/DraggableUploadListItem.d.ts +1 -1
- package/package.json +1 -1
|
@@ -15,7 +15,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
15
15
|
_pathName = activeMenu;
|
|
16
16
|
}
|
|
17
17
|
var result;
|
|
18
|
-
var
|
|
18
|
+
var menuDeep = function menuDeep(menuDeepItem) {
|
|
19
19
|
for (var i = 0; i <= menuDeepItem.length - 1; i++) {
|
|
20
20
|
var item = menuDeepItem[i];
|
|
21
21
|
// 只包含一级菜单时,解决URL:/endorsement/demo/123无法选中问题
|
|
@@ -24,7 +24,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
24
24
|
break;
|
|
25
25
|
}
|
|
26
26
|
if (Array.isArray(item.children) && item.children.length) {
|
|
27
|
-
|
|
27
|
+
menuDeep(item.children);
|
|
28
28
|
} else if (((item === null || item === void 0 ? void 0 : item.url) && _pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
|
|
29
29
|
// 当循环到最后一层时判断URL是否包含最后一层的URL,解决URL在URL中不存在的场景
|
|
30
30
|
result = item.keyIdPath;
|
|
@@ -32,7 +32,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
|
-
|
|
35
|
+
menuDeep(menus);
|
|
36
36
|
return result || [];
|
|
37
37
|
};
|
|
38
38
|
/**
|
|
@@ -42,7 +42,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
|
|
|
42
42
|
*/
|
|
43
43
|
export var transformMenu = function transformMenu(menuData, pathPrefix) {
|
|
44
44
|
var data = _toConsumableArray(menuData);
|
|
45
|
-
var
|
|
45
|
+
var menuDeep = function menuDeep(menuDeepItem) {
|
|
46
46
|
if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
|
|
47
47
|
return [];
|
|
48
48
|
}
|
|
@@ -75,11 +75,11 @@ export var transformMenu = function transformMenu(menuData, pathPrefix) {
|
|
|
75
75
|
childrenItem.keyUrlPath = _toConsumableArray(item.keyUrlPath);
|
|
76
76
|
childrenItem.keyIdPath = _toConsumableArray(item.keyIdPath);
|
|
77
77
|
});
|
|
78
|
-
|
|
78
|
+
menuDeep(item.children);
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
};
|
|
82
|
-
|
|
82
|
+
menuDeep(data);
|
|
83
83
|
return data;
|
|
84
84
|
};
|
|
85
85
|
/**
|
|
@@ -134,7 +134,7 @@ export var getPathNameKey = function getPathNameKey(_ref) {
|
|
|
134
134
|
var menus = _ref.menus,
|
|
135
135
|
pathName = _ref.pathName;
|
|
136
136
|
var result;
|
|
137
|
-
var
|
|
137
|
+
var menuDeep = function menuDeep(menuDeepItem) {
|
|
138
138
|
if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
|
|
139
139
|
return [];
|
|
140
140
|
}
|
|
@@ -148,7 +148,7 @@ export var getPathNameKey = function getPathNameKey(_ref) {
|
|
|
148
148
|
break;
|
|
149
149
|
}
|
|
150
150
|
if (Array.isArray(item.children) && item.children.length) {
|
|
151
|
-
|
|
151
|
+
menuDeep(item.children);
|
|
152
152
|
} else if (((item === null || item === void 0 ? void 0 : item.url) && pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
|
|
153
153
|
// URL未匹配时,循环到最后一层时判断URL是否包含最后一层的URL,解决URL在URL中不存在的场景
|
|
154
154
|
result = item.keyIdPath;
|
|
@@ -156,6 +156,6 @@ export var getPathNameKey = function getPathNameKey(_ref) {
|
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
};
|
|
159
|
-
|
|
159
|
+
menuDeep(menus);
|
|
160
160
|
return result;
|
|
161
161
|
};
|
package/es/ProSelect/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PropSelectProps, ProSelectAction } from './propsType';
|
|
3
3
|
import './index.less';
|
|
4
|
-
export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) =>
|
|
4
|
+
export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => JSX.Element;
|
|
5
5
|
declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<ProSelectAction>>;
|
|
6
6
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MenuItem: (props: any) =>
|
|
1
|
+
export declare const MenuItem: (props: any) => JSX.Element;
|
|
2
2
|
export default MenuItem;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ProStepItem } from '../../propsType';
|
|
2
|
-
declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) =>
|
|
2
|
+
declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProStepPropsType } from '../../propsType';
|
|
2
2
|
export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
|
|
3
3
|
errorCollection: object;
|
|
4
|
-
}) =>
|
|
4
|
+
}) => JSX.Element;
|
|
5
5
|
export default Step;
|
package/es/ProStep/index.d.ts
CHANGED
|
@@ -4,9 +4,9 @@ import './style/index.less';
|
|
|
4
4
|
export declare const ProStepContext: import("react").Context<any>;
|
|
5
5
|
export declare const useStep: () => any;
|
|
6
6
|
declare const ProStep: {
|
|
7
|
-
({ children, ...resetProps }: ProStepPropsType):
|
|
7
|
+
({ children, ...resetProps }: ProStepPropsType): JSX.Element;
|
|
8
8
|
useStep: () => any;
|
|
9
|
-
Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) =>
|
|
9
|
+
Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
|
|
10
10
|
Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
|
|
11
11
|
};
|
|
12
12
|
export default ProStep;
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { ProTableColumn } from '../../propsType';
|
|
3
|
-
export declare const formatColumn: (column
|
|
3
|
+
export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
|
|
4
|
+
column: ProTableColumn;
|
|
5
|
+
originalObj: any;
|
|
6
|
+
dataSourceObj: any;
|
|
7
|
+
rowKey: any;
|
|
8
|
+
diffToolTip?: boolean;
|
|
9
|
+
}) => void;
|
|
4
10
|
/**
|
|
5
11
|
* 查找最近的父级className
|
|
6
12
|
* @param element 当前node节点
|
|
@@ -11,7 +11,12 @@ import RenderColumn from '../RenderColumn';
|
|
|
11
11
|
import { getDecimalDigits, getOriginalValue } from '../../utils';
|
|
12
12
|
import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
|
|
13
13
|
import ProForm from '../../../ProForm';
|
|
14
|
-
export var formatColumn = function formatColumn(
|
|
14
|
+
export var formatColumn = function formatColumn(_ref) {
|
|
15
|
+
var column = _ref.column,
|
|
16
|
+
originalObj = _ref.originalObj,
|
|
17
|
+
dataSourceObj = _ref.dataSourceObj,
|
|
18
|
+
rowKey = _ref.rowKey,
|
|
19
|
+
diffToolTip = _ref.diffToolTip;
|
|
15
20
|
var title = column.title,
|
|
16
21
|
valueType = column.valueType,
|
|
17
22
|
_column$format = column.format,
|
|
@@ -31,6 +36,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
31
36
|
originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
|
|
32
37
|
_column$toolTipProps = column.toolTipProps,
|
|
33
38
|
toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
|
|
39
|
+
var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
|
|
34
40
|
// 前缀处理
|
|
35
41
|
var prefixNode = function prefixNode(value, record, index) {
|
|
36
42
|
if (!prefix) {
|
|
@@ -98,7 +104,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
98
104
|
node: node,
|
|
99
105
|
value: value,
|
|
100
106
|
currentValue: renderValue,
|
|
101
|
-
originalDiffTip:
|
|
107
|
+
originalDiffTip: _originalDiffTip,
|
|
102
108
|
toolTipProps: toolTipProps
|
|
103
109
|
});
|
|
104
110
|
};
|
|
@@ -128,7 +134,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
128
134
|
node: node,
|
|
129
135
|
value: value,
|
|
130
136
|
currentValue: renderValue,
|
|
131
|
-
originalDiffTip:
|
|
137
|
+
originalDiffTip: _originalDiffTip,
|
|
132
138
|
toolTipProps: toolTipProps
|
|
133
139
|
});
|
|
134
140
|
};
|
|
@@ -181,7 +187,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
181
187
|
node: node,
|
|
182
188
|
value: value,
|
|
183
189
|
currentValue: renderValue,
|
|
184
|
-
originalDiffTip:
|
|
190
|
+
originalDiffTip: _originalDiffTip,
|
|
185
191
|
toolTipProps: toolTipProps
|
|
186
192
|
});
|
|
187
193
|
};
|
|
@@ -219,7 +225,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
219
225
|
node: node,
|
|
220
226
|
value: value,
|
|
221
227
|
currentValue: renderValue,
|
|
222
|
-
originalDiffTip:
|
|
228
|
+
originalDiffTip: _originalDiffTip,
|
|
223
229
|
toolTipProps: toolTipProps
|
|
224
230
|
});
|
|
225
231
|
};
|
|
@@ -246,7 +252,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
246
252
|
node: node,
|
|
247
253
|
value: value,
|
|
248
254
|
currentValue: renderValue,
|
|
249
|
-
originalDiffTip:
|
|
255
|
+
originalDiffTip: _originalDiffTip,
|
|
250
256
|
toolTipProps: toolTipProps
|
|
251
257
|
});
|
|
252
258
|
};
|
|
@@ -323,7 +329,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
323
329
|
node: value,
|
|
324
330
|
value: value,
|
|
325
331
|
currentValue: value || '-',
|
|
326
|
-
originalDiffTip:
|
|
332
|
+
originalDiffTip: _originalDiffTip,
|
|
327
333
|
toolTipProps: toolTipProps
|
|
328
334
|
}), suffixNode(value, record, index)]
|
|
329
335
|
});
|
|
@@ -346,7 +352,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
|
|
|
346
352
|
node: node,
|
|
347
353
|
value: value,
|
|
348
354
|
currentValue: value || '-',
|
|
349
|
-
originalDiffTip:
|
|
355
|
+
originalDiffTip: _originalDiffTip,
|
|
350
356
|
toolTipProps: toolTipProps
|
|
351
357
|
});
|
|
352
358
|
};
|
|
@@ -365,14 +371,14 @@ export var getParentElement = function getParentElement(element, name) {
|
|
|
365
371
|
if (!element || !name) {
|
|
366
372
|
return result;
|
|
367
373
|
}
|
|
368
|
-
var
|
|
374
|
+
var searchDom = function searchDom(element, name) {
|
|
369
375
|
var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
|
|
370
376
|
if (element.parentElement[type] === name) {
|
|
371
377
|
result = element.parentElement;
|
|
372
378
|
return false;
|
|
373
379
|
}
|
|
374
|
-
|
|
380
|
+
searchDom(element.parentElement, name, type = 'className');
|
|
375
381
|
};
|
|
376
|
-
|
|
382
|
+
searchDom(element, name, type = 'className');
|
|
377
383
|
return result;
|
|
378
384
|
};
|
|
@@ -9,7 +9,7 @@ export var getRowKey = function getRowKey(rowKey, record) {
|
|
|
9
9
|
}
|
|
10
10
|
return key;
|
|
11
11
|
};
|
|
12
|
-
var
|
|
12
|
+
export 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,12 +18,11 @@ 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 };
|
|
27
26
|
export function getFinalChildrenKey(tree, meta, options) {
|
|
28
27
|
if (typeof options.getChildrenKey === 'function') {
|
|
29
28
|
var dynamicChildrenKey = options.getChildrenKey(tree, meta);
|
|
@@ -34,7 +33,7 @@ export function getFinalChildrenKey(tree, meta, options) {
|
|
|
34
33
|
return options.childrenKey;
|
|
35
34
|
}
|
|
36
35
|
// 前置深度优先遍历
|
|
37
|
-
var
|
|
36
|
+
var treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
|
38
37
|
var callbackResult = callback(treeItem, options);
|
|
39
38
|
if (callbackResult) {
|
|
40
39
|
return treeItem;
|
|
@@ -46,7 +45,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
|
|
46
45
|
}
|
|
47
46
|
for (var i = 0, count = children.length; i < count; i++) {
|
|
48
47
|
var childItem = children[i];
|
|
49
|
-
var findOne =
|
|
48
|
+
var findOne = treeNodePreImpl(childItem, callback, _objectSpread(_objectSpread({}, options), {}, {
|
|
50
49
|
parents: [].concat(_toConsumableArray(options.parents), [treeItem]),
|
|
51
50
|
depth: options.depth + 1
|
|
52
51
|
}));
|
|
@@ -57,7 +56,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
|
|
|
57
56
|
return undefined;
|
|
58
57
|
};
|
|
59
58
|
var treeNodeStrategies = {
|
|
60
|
-
pre:
|
|
59
|
+
pre: treeNodePreImpl
|
|
61
60
|
};
|
|
62
61
|
export function treeNodeFind(tree, callback, options) {
|
|
63
62
|
var _options$childrenKey, _options$strategy;
|
|
@@ -122,7 +121,7 @@ export function createTreeFromArray(array, options) {
|
|
|
122
121
|
return result;
|
|
123
122
|
}
|
|
124
123
|
// 前置遍历
|
|
125
|
-
var
|
|
124
|
+
var treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
|
|
126
125
|
callback(treeItem, options);
|
|
127
126
|
var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
|
|
128
127
|
var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
|
|
@@ -132,12 +131,12 @@ var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, option
|
|
|
132
131
|
depth: options.depth + 1
|
|
133
132
|
});
|
|
134
133
|
children.forEach(function (childItem) {
|
|
135
|
-
|
|
134
|
+
treeForEachPreImpl(childItem, callback, nextLevelOptions);
|
|
136
135
|
});
|
|
137
136
|
}
|
|
138
137
|
};
|
|
139
138
|
var treeForEachStrategies = {
|
|
140
|
-
pre:
|
|
139
|
+
pre: treeForEachPreImpl
|
|
141
140
|
};
|
|
142
141
|
export function treeForEach(tree, callback, options) {
|
|
143
142
|
var _options$childrenKey2, _options$strategy2;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const RenderFooter: (props: any) =>
|
|
1
|
+
declare const RenderFooter: (props: any) => JSX.Element;
|
|
2
2
|
export default RenderFooter;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const RenderTableHeader: (props: any) =>
|
|
1
|
+
declare const RenderTableHeader: (props: any) => JSX.Element;
|
|
2
2
|
export default RenderTableHeader;
|
package/es/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):
|
|
8
|
+
declare function ProTable(props: ProTableProps): JSX.Element;
|
|
9
9
|
declare namespace ProTable {
|
|
10
10
|
var defaultProps: {
|
|
11
11
|
quickConfig: boolean;
|
package/es/ProTable/index.js
CHANGED
|
@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
|
5
5
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
7
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
8
|
-
var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "
|
|
8
|
+
var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd"],
|
|
9
9
|
_excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
|
|
10
10
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
11
11
|
import { useEffect, useMemo, useState, createContext } from 'react';
|
|
@@ -52,10 +52,15 @@ function ProTable(props) {
|
|
|
52
52
|
summary = props.summary,
|
|
53
53
|
_props$emptyText = props.emptyText,
|
|
54
54
|
emptyText = _props$emptyText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
|
|
55
|
-
|
|
55
|
+
diffConfig = props.diffConfig,
|
|
56
56
|
onDragStartGuard = props.onDragStart,
|
|
57
57
|
onDragEndGuard = props.onDragEnd,
|
|
58
58
|
restProps = _objectWithoutProperties(props, _excluded);
|
|
59
|
+
var _ref3 = diffConfig || {},
|
|
60
|
+
originalDataSource = _ref3.originalDataSource,
|
|
61
|
+
changeTipColor = _ref3.changeTipColor,
|
|
62
|
+
addTipColor = _ref3.addTipColor,
|
|
63
|
+
toolTip = _ref3.toolTip;
|
|
59
64
|
var quickTableConfig = quickConfig ? _objectSpread({
|
|
60
65
|
columnConfig: true,
|
|
61
66
|
cacheTime: true
|
|
@@ -71,10 +76,10 @@ function ProTable(props) {
|
|
|
71
76
|
_quickTableConfig$sto = quickTableConfig.storage,
|
|
72
77
|
storage = _quickTableConfig$sto === void 0 ? configStorage : _quickTableConfig$sto,
|
|
73
78
|
tableProps = _objectWithoutProperties(quickTableConfig, _excluded2);
|
|
74
|
-
var
|
|
75
|
-
pagination =
|
|
76
|
-
dataSource =
|
|
77
|
-
rowKey =
|
|
79
|
+
var _ref4 = tableProps || {},
|
|
80
|
+
pagination = _ref4.pagination,
|
|
81
|
+
dataSource = _ref4.dataSource,
|
|
82
|
+
rowKey = _ref4.rowKey;
|
|
78
83
|
var initDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
|
|
79
84
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
80
85
|
rowKey: getRowKey(rowKey, item)
|
|
@@ -157,8 +162,8 @@ function ProTable(props) {
|
|
|
157
162
|
};
|
|
158
163
|
// 列宽resize函数
|
|
159
164
|
var handleResize = function handleResize(index) {
|
|
160
|
-
return function (e,
|
|
161
|
-
var size =
|
|
165
|
+
return function (e, _ref5) {
|
|
166
|
+
var size = _ref5.size;
|
|
162
167
|
var nextColumns = _toConsumableArray(curColumns);
|
|
163
168
|
nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
|
|
164
169
|
width: size.width
|
|
@@ -188,7 +193,13 @@ function ProTable(props) {
|
|
|
188
193
|
return !(item === null || item === void 0 ? void 0 : item.delete);
|
|
189
194
|
});
|
|
190
195
|
newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
|
|
191
|
-
formatColumn(
|
|
196
|
+
formatColumn({
|
|
197
|
+
column: item,
|
|
198
|
+
originalObj: originalObj,
|
|
199
|
+
dataSourceObj: dataSourceObj,
|
|
200
|
+
rowKey: 'rowKey',
|
|
201
|
+
diffToolTip: toolTip
|
|
202
|
+
});
|
|
192
203
|
});
|
|
193
204
|
return newColumns;
|
|
194
205
|
}, [curColumns, handleResize]);
|
|
@@ -205,7 +216,7 @@ function ProTable(props) {
|
|
|
205
216
|
});
|
|
206
217
|
}, [columns]);
|
|
207
218
|
var handleColumnConfig = /*#__PURE__*/function () {
|
|
208
|
-
var
|
|
219
|
+
var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
|
|
209
220
|
var newColumns, _columnConfig$onColum, catchColumns;
|
|
210
221
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
211
222
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -241,7 +252,7 @@ function ProTable(props) {
|
|
|
241
252
|
}, _callee);
|
|
242
253
|
}));
|
|
243
254
|
return function handleColumnConfig(_x) {
|
|
244
|
-
return
|
|
255
|
+
return _ref6.apply(this, arguments);
|
|
245
256
|
};
|
|
246
257
|
}();
|
|
247
258
|
useDebounceEffect(function () {
|
|
@@ -314,7 +325,7 @@ function ProTable(props) {
|
|
|
314
325
|
return _rowSelection;
|
|
315
326
|
};
|
|
316
327
|
var onDataSourceChange = /*#__PURE__*/function () {
|
|
317
|
-
var
|
|
328
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
|
|
318
329
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
319
330
|
while (1) switch (_context2.prev = _context2.next) {
|
|
320
331
|
case 0:
|
|
@@ -330,7 +341,7 @@ function ProTable(props) {
|
|
|
330
341
|
}, _callee2);
|
|
331
342
|
}));
|
|
332
343
|
return function onDataSourceChange(_x2) {
|
|
333
|
-
return
|
|
344
|
+
return _ref7.apply(this, arguments);
|
|
334
345
|
};
|
|
335
346
|
}();
|
|
336
347
|
var _rowClassName = function _rowClassName(record, index) {
|
|
@@ -339,6 +350,11 @@ function ProTable(props) {
|
|
|
339
350
|
}
|
|
340
351
|
};
|
|
341
352
|
var TableComponent = draggable ? DraggableTable : BaseTable;
|
|
353
|
+
// 标记样式
|
|
354
|
+
var tagStyle = {
|
|
355
|
+
'--zaui-contract-bg': changeTipColor,
|
|
356
|
+
'--zaui-contract-bg-add': addTipColor
|
|
357
|
+
};
|
|
342
358
|
return _jsx(TableContext.Provider, {
|
|
343
359
|
value: {
|
|
344
360
|
pathKey: pathKey,
|
|
@@ -362,6 +378,7 @@ function ProTable(props) {
|
|
|
362
378
|
}
|
|
363
379
|
}), _jsxs("div", {
|
|
364
380
|
className: "pro-table-container",
|
|
381
|
+
style: tagStyle,
|
|
365
382
|
children: [_jsx(TableComponent, _objectSpread(_objectSpread({}, restProps), {}, {
|
|
366
383
|
draggableProps: {
|
|
367
384
|
onChange: onDataSourceChange,
|
|
@@ -59,6 +59,16 @@ export interface DragStartGuardProps {
|
|
|
59
59
|
activeObject: any;
|
|
60
60
|
currentDataSource: any[];
|
|
61
61
|
}
|
|
62
|
+
export interface TableDiffConfigProps {
|
|
63
|
+
/** 比对原始数据源 */
|
|
64
|
+
originalDataSource: any[];
|
|
65
|
+
/** 是否显示对比值气泡 */
|
|
66
|
+
toolTip?: boolean;
|
|
67
|
+
/** 变更提示颜色 */
|
|
68
|
+
changeTipColor?: string;
|
|
69
|
+
/** 新增提示颜色 */
|
|
70
|
+
addTipColor?: string;
|
|
71
|
+
}
|
|
62
72
|
export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
|
|
63
73
|
tableId?: string;
|
|
64
74
|
rowKey?: string | GetRowKey<any>;
|
|
@@ -84,7 +94,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
|
|
|
84
94
|
*/
|
|
85
95
|
stripe?: boolean;
|
|
86
96
|
columns: ProTableColumn[];
|
|
87
|
-
|
|
97
|
+
/**
|
|
98
|
+
* 比对配置
|
|
99
|
+
*/
|
|
100
|
+
diffConfig?: TableDiffConfigProps;
|
|
88
101
|
/**
|
|
89
102
|
* 拖拽额外配置
|
|
90
103
|
*/
|
|
@@ -270,7 +270,7 @@
|
|
|
270
270
|
.@{ant-prefix}-table-cell .varied-cell {
|
|
271
271
|
margin-left: -8px;
|
|
272
272
|
padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
|
|
273
|
-
background: var(--zaui-contract-bg
|
|
273
|
+
background: var(--zaui-contract-bg; #fffaa1) !important;
|
|
274
274
|
border-radius: var(--zaui-border-radius, 8px);
|
|
275
275
|
}
|
|
276
276
|
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { DevToolsPropsType } from '../../propsType';
|
|
2
|
-
declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) =>
|
|
2
|
+
declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => 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):
|
|
3
|
+
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): 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) =>
|
|
3
|
+
declare const ProTooltip: (props: ProTooltipPropsType) => JSX.Element;
|
|
4
4
|
export default ProTooltip;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import "antd/es/tooltip/style";
|
|
2
|
+
import _Tooltip from "antd/es/tooltip";
|
|
3
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
4
|
+
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
5
|
+
/*
|
|
6
|
+
* @Author: za-xuwenli xuwenli@zhongan.io
|
|
7
|
+
* @Date: 2024-09-20 10:26:04
|
|
8
|
+
* @LastEditors: za-xuwenli xuwenli@zhongan.io
|
|
9
|
+
* @LastEditTime: 2024-09-26 14:12:44
|
|
10
|
+
* @FilePath: /za-material-warehouse/src/ProTree/components/AdaptiveTooltip.tsx
|
|
11
|
+
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { useEffect, useState } from 'react';
|
|
15
|
+
var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
|
|
16
|
+
var children = _ref.children;
|
|
17
|
+
var _useState = useState('right'),
|
|
18
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
19
|
+
placement = _useState2[0],
|
|
20
|
+
setPlacement = _useState2[1];
|
|
21
|
+
useEffect(function () {
|
|
22
|
+
var handleResize = function handleResize() {
|
|
23
|
+
var tooltipElement = document.getElementById('adaptive-tooltip');
|
|
24
|
+
if (tooltipElement) {
|
|
25
|
+
var boundingRect = tooltipElement.getBoundingClientRect();
|
|
26
|
+
var windowWidth = window.innerWidth;
|
|
27
|
+
if (windowWidth - boundingRect.right < 150) {
|
|
28
|
+
setPlacement('left');
|
|
29
|
+
} else {
|
|
30
|
+
setPlacement('right');
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
window.addEventListener('resize', handleResize);
|
|
35
|
+
handleResize();
|
|
36
|
+
return function () {
|
|
37
|
+
window.removeEventListener('resize', handleResize);
|
|
38
|
+
};
|
|
39
|
+
}, [children]);
|
|
40
|
+
return _jsx(_Tooltip, {
|
|
41
|
+
placement: placement,
|
|
42
|
+
title: _jsx("div", {
|
|
43
|
+
onMouseDown: function onMouseDown(e) {
|
|
44
|
+
return e.stopPropagation();
|
|
45
|
+
},
|
|
46
|
+
children: children
|
|
47
|
+
}),
|
|
48
|
+
id: "adaptive-tooltip",
|
|
49
|
+
children: _jsxs("span", {
|
|
50
|
+
className: "pro-tree-wrap-ellipse",
|
|
51
|
+
children: [" ", children]
|
|
52
|
+
})
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
export default AdaptiveTooltip;
|
|
@@ -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):
|
|
15
|
+
declare function List(props: ListProps): JSX.Element;
|
|
16
16
|
declare const _default: import("react").MemoExoticComponent<typeof List>;
|
|
17
17
|
export default _default;
|