@aloudata/aloudata-design 0.4.0-beta.6 → 0.4.0-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/Avatar/component/Avatar/index.d.ts +84 -0
- package/es/Avatar/component/Avatar/index.js +42 -0
- package/es/Avatar/index.d.ts +1 -13
- package/es/Avatar/index.js +1 -30
- package/es/Avatar/style/index.less +1 -1
- package/es/Button/index.d.ts +1 -1
- package/es/Button/index.js +3 -8
- package/es/Button/style/index.less +7 -1
- package/es/Button/style/variables.less +26 -26
- package/es/Checkbox/component/CheckboxGroup/index.d.ts +4 -0
- package/es/Checkbox/component/CheckboxGroup/index.js +27 -0
- package/es/Checkbox/index.d.ts +4 -5
- package/es/Checkbox/index.js +3 -12
- package/es/Checkbox/style/index.less +36 -12
- package/es/Checkbox/type.d.ts +94 -0
- package/es/Checkbox/type.js +6 -0
- package/es/Divider/index.d.ts +40 -2
- package/es/Divider/index.js +10 -1
- package/es/Divider/style/index.less +4 -0
- package/es/Divider/style/index.less.d.ts +183 -0
- package/es/Icon/icons.js +135 -58
- package/es/Input/components/Input/index.d.ts +13 -1
- package/es/Input/components/Input/index.js +1 -3
- package/es/Input/components/Password/index.d.ts +6 -1
- package/es/Input/components/Password/index.js +11 -3
- package/es/Input/components/TextArea/index.d.ts +1 -1
- package/es/Input/style/index.less +139 -59
- package/es/InputNumber/index.d.ts +3 -3
- package/es/InputNumber/style/index.less +66 -26
- package/es/InputNumber/type.d.ts +161 -0
- package/es/InputNumber/type.js +1 -0
- package/es/Steps/style/index.less +10 -4
- package/es/Table/Table.js +31 -23
- package/es/Table/components/TableHead/index.d.ts +0 -1
- package/es/Table/components/TableHead/index.js +1 -2
- package/es/Table/interface.d.ts +1 -0
- package/es/Table/style/index.less +2 -1
- package/es/Table/utils.js +16 -9
- package/es/Tabs/style/index.less +1 -1
- package/es/Tooltip/style/index.less +1 -1
- package/es/index.d.ts +3 -3
- package/es/style/themes/default/scrollBar.less +10 -7
- package/es/style/themes/default/themeColor.module.less +164 -166
- package/lib/Avatar/component/Avatar/index.d.ts +84 -0
- package/lib/Avatar/component/Avatar/index.js +61 -0
- package/lib/Avatar/index.d.ts +1 -13
- package/lib/Avatar/index.js +3 -44
- package/lib/Avatar/style/index.less +1 -1
- package/lib/Button/index.d.ts +1 -1
- package/lib/Button/index.js +3 -8
- package/lib/Button/style/index.less +7 -1
- package/lib/Button/style/variables.less +26 -26
- package/lib/Checkbox/component/CheckboxGroup/index.d.ts +4 -0
- package/lib/Checkbox/component/CheckboxGroup/index.js +42 -0
- package/lib/Checkbox/index.d.ts +4 -5
- package/lib/Checkbox/index.js +4 -13
- package/lib/Checkbox/style/index.less +36 -12
- package/lib/Checkbox/type.d.ts +94 -0
- package/lib/Checkbox/type.js +13 -0
- package/lib/Divider/index.d.ts +40 -2
- package/lib/Divider/index.js +11 -1
- package/lib/Divider/style/index.less +4 -0
- package/lib/Divider/style/index.less.d.ts +183 -0
- package/lib/Icon/icons.js +135 -58
- package/lib/Input/components/Input/index.d.ts +13 -1
- package/lib/Input/components/Input/index.js +1 -3
- package/lib/Input/components/Password/index.d.ts +6 -1
- package/lib/Input/components/Password/index.js +14 -4
- package/lib/Input/components/TextArea/index.d.ts +1 -1
- package/lib/Input/style/index.less +139 -59
- package/lib/InputNumber/index.d.ts +3 -3
- package/lib/InputNumber/style/index.less +66 -26
- package/lib/InputNumber/type.d.ts +161 -0
- package/lib/InputNumber/type.js +5 -0
- package/lib/Steps/style/index.less +10 -4
- package/lib/Table/Table.js +31 -23
- package/lib/Table/components/TableHead/index.d.ts +0 -1
- package/lib/Table/components/TableHead/index.js +1 -2
- package/lib/Table/interface.d.ts +1 -0
- package/lib/Table/style/index.less +2 -1
- package/lib/Table/utils.js +16 -9
- package/lib/Tabs/style/index.less +1 -1
- package/lib/Tooltip/style/index.less +1 -1
- package/lib/index.d.ts +3 -3
- package/lib/style/themes/default/scrollBar.less +10 -7
- package/lib/style/themes/default/themeColor.module.less +164 -166
- package/package.json +2 -2
- package/es/Table/hooks/useTableColumn.d.ts +0 -28
- package/es/Table/hooks/useTableColumn.js +0 -53
- package/lib/Table/hooks/useTableColumn.d.ts +0 -28
- package/lib/Table/hooks/useTableColumn.js +0 -66
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import { InputNumberProps } from 'antd';
|
|
3
|
+
export interface IInputNumberProps extends InputNumberProps {
|
|
4
|
+
/**
|
|
5
|
+
* @description 带标签的Input,设置后置标签
|
|
6
|
+
* @type ReactNode
|
|
7
|
+
* @default --
|
|
8
|
+
*/
|
|
9
|
+
addonBefore?: React.ReactNode;
|
|
10
|
+
/**
|
|
11
|
+
* @description 带标签的Input,设置前置标签
|
|
12
|
+
* @type ReactNode
|
|
13
|
+
* @default --
|
|
14
|
+
*/
|
|
15
|
+
addonAfter?: React.ReactNode;
|
|
16
|
+
/**
|
|
17
|
+
* @description 自动获取焦点
|
|
18
|
+
* @type boolean
|
|
19
|
+
* @default false
|
|
20
|
+
*/
|
|
21
|
+
autoFocus?: boolean;
|
|
22
|
+
/**
|
|
23
|
+
* @description 是否有边框
|
|
24
|
+
* @type boolean
|
|
25
|
+
* @default true
|
|
26
|
+
*/
|
|
27
|
+
bordered?: boolean;
|
|
28
|
+
/**
|
|
29
|
+
* @description 是否显示增减按钮,也可以设置自定义箭头图标
|
|
30
|
+
* @type boolean
|
|
31
|
+
| {
|
|
32
|
+
upIcon?: React.ReactNode;
|
|
33
|
+
downIcon?: React.ReactNode;
|
|
34
|
+
};
|
|
35
|
+
* @default -
|
|
36
|
+
*/
|
|
37
|
+
controls?: boolean | {
|
|
38
|
+
upIcon?: React.ReactNode;
|
|
39
|
+
downIcon?: React.ReactNode;
|
|
40
|
+
};
|
|
41
|
+
/**
|
|
42
|
+
* @description 小数点
|
|
43
|
+
* @type string
|
|
44
|
+
* @default -
|
|
45
|
+
*/
|
|
46
|
+
decimalSeparator?: string;
|
|
47
|
+
/**
|
|
48
|
+
* @description 初始值
|
|
49
|
+
* @type number
|
|
50
|
+
* @default -
|
|
51
|
+
*/
|
|
52
|
+
defaultValue?: number;
|
|
53
|
+
/**
|
|
54
|
+
* @description 禁用
|
|
55
|
+
* @type boolean
|
|
56
|
+
* @default false
|
|
57
|
+
*/
|
|
58
|
+
disabled?: boolean;
|
|
59
|
+
/**
|
|
60
|
+
* @description 制定输入框展示值的格式
|
|
61
|
+
* @type (value: number | string | undefined, info: { userTyping: boolean; input: string }) => string
|
|
62
|
+
* @default -
|
|
63
|
+
*/
|
|
64
|
+
formatter?: (value: number | string | undefined, info: {
|
|
65
|
+
userTyping: boolean;
|
|
66
|
+
input: string;
|
|
67
|
+
}) => string;
|
|
68
|
+
/**
|
|
69
|
+
* @description 是否启用键盘快捷行为
|
|
70
|
+
* @type boolean
|
|
71
|
+
* @default true
|
|
72
|
+
*/
|
|
73
|
+
keyboard?: boolean;
|
|
74
|
+
/**
|
|
75
|
+
* @description 最大值
|
|
76
|
+
* @type number
|
|
77
|
+
* @default Number.MAX_SAFE_INTEGER
|
|
78
|
+
*/
|
|
79
|
+
max?: number;
|
|
80
|
+
/**
|
|
81
|
+
* @description 最小值
|
|
82
|
+
* @type number
|
|
83
|
+
* @default Number.MIN_SAFE_INTEGER
|
|
84
|
+
*/
|
|
85
|
+
min?: number;
|
|
86
|
+
/**
|
|
87
|
+
* @description 指定从 formatter 里转换回数字的方式,和 formatter 搭配使用
|
|
88
|
+
* @type (value: string) => number
|
|
89
|
+
* @default -
|
|
90
|
+
*/
|
|
91
|
+
parser?: (value: string | undefined) => number;
|
|
92
|
+
/**
|
|
93
|
+
* @description 数值精度,配置 formatter 时会以 formatter 为准
|
|
94
|
+
* @type number
|
|
95
|
+
* @default -
|
|
96
|
+
*/
|
|
97
|
+
precision?: number;
|
|
98
|
+
/**
|
|
99
|
+
* @description 只读
|
|
100
|
+
* @type boolean
|
|
101
|
+
* @default false
|
|
102
|
+
*/
|
|
103
|
+
readonly?: boolean;
|
|
104
|
+
/**
|
|
105
|
+
* @description 设置校验状态
|
|
106
|
+
* @type 'warning' | 'error'
|
|
107
|
+
* @default -
|
|
108
|
+
*/
|
|
109
|
+
status?: 'warning' | 'error';
|
|
110
|
+
/**
|
|
111
|
+
* @description 带有前缀图标的input
|
|
112
|
+
* @type ReactNode
|
|
113
|
+
* @default -
|
|
114
|
+
*/
|
|
115
|
+
prefix?: React.ReactNode;
|
|
116
|
+
/**
|
|
117
|
+
* @description 输入框大小
|
|
118
|
+
* @type 'small' | 'middle' | 'large'
|
|
119
|
+
* @default -
|
|
120
|
+
*/
|
|
121
|
+
size?: 'small' | 'middle' | 'large';
|
|
122
|
+
/**
|
|
123
|
+
* @description 每次改变步数,可以为小数
|
|
124
|
+
* @type number | string
|
|
125
|
+
* @default 1
|
|
126
|
+
*/
|
|
127
|
+
step?: number | string;
|
|
128
|
+
/**
|
|
129
|
+
* @description 字符值模式,开启后支持高精度小数。同时 onChange 将返回 string 类型
|
|
130
|
+
* @type boolean
|
|
131
|
+
* @default false
|
|
132
|
+
*/
|
|
133
|
+
stringMode?: boolean;
|
|
134
|
+
/**
|
|
135
|
+
* @description 当前值
|
|
136
|
+
* @type number
|
|
137
|
+
* @default -
|
|
138
|
+
*/
|
|
139
|
+
value?: number;
|
|
140
|
+
/**
|
|
141
|
+
* @description 变化回调
|
|
142
|
+
* @type (value: number | string | null) => void
|
|
143
|
+
* @default -
|
|
144
|
+
*/
|
|
145
|
+
onChange?: (value: number | string | null) => void;
|
|
146
|
+
/**
|
|
147
|
+
* @description 按下回车的回调
|
|
148
|
+
* @type (e: React.KeyboardEvent) => void
|
|
149
|
+
* @default -
|
|
150
|
+
*/
|
|
151
|
+
onPressEnter: (e: React.KeyboardEvent) => void;
|
|
152
|
+
/**
|
|
153
|
+
* @description 点击上下箭头的回调
|
|
154
|
+
* @type (value: number|string, info: { offset: number|string, type: 'up' | 'down' }) => void
|
|
155
|
+
* @default -
|
|
156
|
+
*/
|
|
157
|
+
onStep: (value: number | string, info: {
|
|
158
|
+
offset: number | string;
|
|
159
|
+
type: 'up' | 'down';
|
|
160
|
+
}) => void;
|
|
161
|
+
}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
@import '../../style/index.less';
|
|
2
2
|
|
|
3
|
-
.ant-steps-item-icon {
|
|
4
|
-
|
|
5
|
-
height: 24px;
|
|
6
|
-
margin: 6px 8px -2px 0;
|
|
3
|
+
.ald-steps .ant-steps-item .ant-steps-item-container .ant-steps-item-icon {
|
|
4
|
+
margin: 6px 8px -2px 42px;
|
|
7
5
|
font-size: 12px;
|
|
8
6
|
line-height: 24px;
|
|
9
7
|
text-align: center;
|
|
@@ -15,6 +13,10 @@
|
|
|
15
13
|
.ant-steps.ald-steps {
|
|
16
14
|
padding: 24px;
|
|
17
15
|
|
|
16
|
+
.ant-steps-item-container {
|
|
17
|
+
height: 49px;
|
|
18
|
+
}
|
|
19
|
+
|
|
18
20
|
.ant-steps-item-content {
|
|
19
21
|
display: flex;
|
|
20
22
|
flex-direction: column;
|
|
@@ -34,12 +36,16 @@
|
|
|
34
36
|
// 常规step
|
|
35
37
|
.ant-steps-item {
|
|
36
38
|
.ant-steps-item-tail {
|
|
39
|
+
display: flex;
|
|
40
|
+
align-items: flex-start;
|
|
41
|
+
height: 30px;
|
|
37
42
|
margin-left: 50px;
|
|
38
43
|
padding: 3.5px 7px;
|
|
39
44
|
|
|
40
45
|
&::after {
|
|
41
46
|
height: 2px;
|
|
42
47
|
background-color: @NL90;
|
|
48
|
+
content: '';
|
|
43
49
|
}
|
|
44
50
|
}
|
|
45
51
|
|
package/lib/Table/Table.js
CHANGED
|
@@ -88,12 +88,12 @@ function Table(props, ref) {
|
|
|
88
88
|
rowKey = props.rowKey,
|
|
89
89
|
height = props.height;
|
|
90
90
|
|
|
91
|
-
var _useState = (0, _react.useState)(
|
|
91
|
+
var _useState = (0, _react.useState)(undefined),
|
|
92
92
|
_useState2 = _slicedToArray(_useState, 2),
|
|
93
93
|
tableClientWidth = _useState2[0],
|
|
94
94
|
setTableClientWidth = _useState2[1];
|
|
95
95
|
|
|
96
|
-
var _useState3 = (0, _react.useState)(
|
|
96
|
+
var _useState3 = (0, _react.useState)(undefined),
|
|
97
97
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
98
98
|
tableClientHeight = _useState4[0],
|
|
99
99
|
setTableClientHeight = _useState4[1];
|
|
@@ -102,7 +102,6 @@ function Table(props, ref) {
|
|
|
102
102
|
var tableRef = (0, _react.useRef)(null);
|
|
103
103
|
var tableHeadRef = (0, _react.useRef)(null);
|
|
104
104
|
var tableBodyRef = (0, _react.useRef)(null);
|
|
105
|
-
var columnsRef = (0, _react.useRef)([]);
|
|
106
105
|
var columnsWidthMapRef = (0, _react.useRef)();
|
|
107
106
|
var columnsTotalWidthRef = (0, _react.useRef)(ZERO);
|
|
108
107
|
|
|
@@ -117,12 +116,7 @@ function Table(props, ref) {
|
|
|
117
116
|
var _useTimeoutLock = (0, _useFrame.useTimeoutLock)(),
|
|
118
117
|
_useTimeoutLock2 = _slicedToArray(_useTimeoutLock, 2),
|
|
119
118
|
setScrollTarget = _useTimeoutLock2[0],
|
|
120
|
-
getScrollTarget = _useTimeoutLock2[1]; //
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
if (columns && columnsRef.current.length === ZERO) {
|
|
124
|
-
columnsRef.current = columns;
|
|
125
|
-
} // 初始化进入时 渲染表格容器宽度
|
|
119
|
+
getScrollTarget = _useTimeoutLock2[1]; // 初始化进入时 渲染表格容器宽度
|
|
126
120
|
|
|
127
121
|
|
|
128
122
|
(0, _react.useEffect)(function () {
|
|
@@ -132,13 +126,17 @@ function Table(props, ref) {
|
|
|
132
126
|
}, []); // 转换外部传入的columns
|
|
133
127
|
|
|
134
128
|
var newColumns = (0, _react.useMemo)(function () {
|
|
135
|
-
|
|
129
|
+
if (!tableClientWidth) {
|
|
130
|
+
return [];
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
var _getColumnsWidthMap = (0, _utils.getColumnsWidthMap)(columns, tableClientWidth, columnsWidthMapRef.current),
|
|
136
134
|
columnsWidthMap = _getColumnsWidthMap.columnsWidthMap,
|
|
137
135
|
totalColumnWidth = _getColumnsWidthMap.totalColumnWidth;
|
|
138
136
|
|
|
139
137
|
columnsWidthMapRef.current = columnsWidthMap;
|
|
140
138
|
columnsTotalWidthRef.current = totalColumnWidth;
|
|
141
|
-
return
|
|
139
|
+
return columns.map(function (column, index) {
|
|
142
140
|
var _columnsWidthMapRef$c, _columnsWidthMapRef$c2;
|
|
143
141
|
|
|
144
142
|
var key = index.toString(); // 不设置dataIndex同时进行排序 则报错
|
|
@@ -161,7 +159,7 @@ function Table(props, ref) {
|
|
|
161
159
|
}
|
|
162
160
|
});
|
|
163
161
|
});
|
|
164
|
-
}, [sortable, tableClientWidth]); // 将rowId转为React Table支持的值
|
|
162
|
+
}, [columns, sortable, tableClientWidth]); // 将rowId转为React Table支持的值
|
|
165
163
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
166
164
|
|
|
167
165
|
var transformRowId = function transformRowId(row, relativeIndex, parent) {
|
|
@@ -187,7 +185,9 @@ function Table(props, ref) {
|
|
|
187
185
|
|
|
188
186
|
|
|
189
187
|
var getTableInitSort = function getTableInitSort() {
|
|
190
|
-
|
|
188
|
+
var EMPTY_SIZE = 0;
|
|
189
|
+
|
|
190
|
+
if (!sortable || loadMore || newColumns.length === EMPTY_SIZE) {
|
|
191
191
|
return [];
|
|
192
192
|
}
|
|
193
193
|
|
|
@@ -243,7 +243,7 @@ function Table(props, ref) {
|
|
|
243
243
|
var tableHeadNode = /*#__PURE__*/_react.default.createElement(_TableHead.default, {
|
|
244
244
|
canResizeColumn: resizeColumn,
|
|
245
245
|
headerGroups: headerGroups,
|
|
246
|
-
tableContentWidth
|
|
246
|
+
// tableContentWidth={columnsTotalWidthRef.current}
|
|
247
247
|
defaultSort: defaultSort,
|
|
248
248
|
sortable: sortable,
|
|
249
249
|
columns: newColumns,
|
|
@@ -304,6 +304,10 @@ function Table(props, ref) {
|
|
|
304
304
|
}, []); // 内部滚动时 纵向的滚动
|
|
305
305
|
|
|
306
306
|
var onBodyVerticalScroll = (0, _react.useCallback)(function (target) {
|
|
307
|
+
if (!tableClientHeight) {
|
|
308
|
+
return;
|
|
309
|
+
}
|
|
310
|
+
|
|
307
311
|
var scrollHeight = target.scrollHeight,
|
|
308
312
|
clientHeight = target.clientHeight,
|
|
309
313
|
scrollTop = target.scrollTop;
|
|
@@ -357,6 +361,10 @@ function Table(props, ref) {
|
|
|
357
361
|
}, [hasNextPage]); // 渲染有设置高度的表格
|
|
358
362
|
|
|
359
363
|
var renderTableWithHeight = function renderTableWithHeight() {
|
|
364
|
+
if (!tableClientWidth || !tableClientHeight) {
|
|
365
|
+
return null;
|
|
366
|
+
}
|
|
367
|
+
|
|
360
368
|
var renderNoHeightTableBody = function renderNoHeightTableBody() {
|
|
361
369
|
if (loading && !rows.length) {
|
|
362
370
|
return /*#__PURE__*/_react.default.createElement(_Loading.default, null);
|
|
@@ -387,21 +395,21 @@ function Table(props, ref) {
|
|
|
387
395
|
}), renderNoHeightTableBody()));
|
|
388
396
|
};
|
|
389
397
|
|
|
390
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
391
|
-
onResize: function onResize(_ref2) {
|
|
392
|
-
var clientWidth = _ref2.width,
|
|
393
|
-
clientHeight = _ref2.height;
|
|
394
|
-
setTableClientWidth(clientWidth);
|
|
395
|
-
setTableClientHeight(clientHeight);
|
|
396
|
-
}
|
|
397
|
-
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
398
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
398
399
|
key: tableKey,
|
|
399
400
|
className: prefixCls,
|
|
400
401
|
ref: tableRef,
|
|
401
402
|
style: {
|
|
402
403
|
height: !height ? 'unset' : height
|
|
403
404
|
}
|
|
404
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
405
|
+
}, /*#__PURE__*/_react.default.createElement(_rcResizeObserver.default, {
|
|
406
|
+
onResize: function onResize(_ref2) {
|
|
407
|
+
var clientWidth = _ref2.width,
|
|
408
|
+
clientHeight = _ref2.height;
|
|
409
|
+
setTableClientWidth(clientWidth);
|
|
410
|
+
setTableClientHeight(clientHeight);
|
|
411
|
+
}
|
|
412
|
+
}, !tableClientWidth ? null : /*#__PURE__*/_react.default.createElement("div", Object.assign({}, getTableProps(), {
|
|
405
413
|
className: (0, _classnames4.default)("".concat(prefixCls, "-table-wrap"), (_classnames3 = {}, _defineProperty(_classnames3, "".concat(prefixCls, "-init-loading"), data.length === ZERO && loading), _defineProperty(_classnames3, "".concat(prefixCls, "-empty"), data.length === ZERO && loading), _classnames3))
|
|
406
414
|
}), height ? renderTableWithHeight() : renderTableWithoutHeight())));
|
|
407
415
|
}
|
|
@@ -4,7 +4,6 @@ import { ISort, TSortOrder } from '../../interface';
|
|
|
4
4
|
import { IWidthDetail } from '../../utils';
|
|
5
5
|
interface ITableWithoutHeightProps<T extends object = {}> {
|
|
6
6
|
headerGroups: HeaderGroup<T>[];
|
|
7
|
-
tableContentWidth: number;
|
|
8
7
|
canResizeColumn?: boolean;
|
|
9
8
|
defaultSort?: ISort<T>;
|
|
10
9
|
sortable?: boolean;
|
|
@@ -59,7 +59,6 @@ var ARRAY_FIRST_INDEX = 0;
|
|
|
59
59
|
|
|
60
60
|
function TableHead(props) {
|
|
61
61
|
var headerGroups = props.headerGroups,
|
|
62
|
-
tableContentWidth = props.tableContentWidth,
|
|
63
62
|
canResizeColumn = props.canResizeColumn,
|
|
64
63
|
defaultSort = props.defaultSort,
|
|
65
64
|
_props$sortable = props.sortable,
|
|
@@ -251,7 +250,7 @@ function TableHead(props) {
|
|
|
251
250
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
252
251
|
className: "".concat(prefixCls, "-thead"),
|
|
253
252
|
style: {
|
|
254
|
-
width:
|
|
253
|
+
width: columnsTotalWidthRef.current
|
|
255
254
|
}
|
|
256
255
|
}, headerGroups.map(function (headerGroup) {
|
|
257
256
|
var _headerGroup$getHeade = headerGroup.getHeaderGroupProps(),
|
package/lib/Table/interface.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export interface IColumn<RecordType> {
|
|
|
11
11
|
render?: (value: any, row: RecordType, index: number) => React.ReactNode;
|
|
12
12
|
width?: number | string;
|
|
13
13
|
minWidth?: number;
|
|
14
|
+
widthFlex?: boolean;
|
|
14
15
|
sorter?: boolean | 'string' | 'number' | 'basic' | 'datetime' | 'alphanumeric';
|
|
15
16
|
sortOrder?: TSortOrder;
|
|
16
17
|
sortDirections?: Array<'ascend' | 'descend'>;
|
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
&-tableHeadScrollWrap {
|
|
33
|
+
display: flex;
|
|
33
34
|
width: 100%;
|
|
34
35
|
overflow-x: hidden;
|
|
35
36
|
}
|
|
@@ -37,7 +38,7 @@
|
|
|
37
38
|
&-cell {
|
|
38
39
|
flex-grow: 1;
|
|
39
40
|
height: unset;
|
|
40
|
-
color:
|
|
41
|
+
color: inherit;
|
|
41
42
|
text-align: left;
|
|
42
43
|
word-break: break-all;
|
|
43
44
|
border-bottom: 1px solid @NL95;
|
package/lib/Table/utils.js
CHANGED
|
@@ -12,7 +12,7 @@ exports.isPercentageWidth = isPercentageWidth;
|
|
|
12
12
|
exports.isSpecificPxWidth = isSpecificPxWidth;
|
|
13
13
|
var ZERO = 0;
|
|
14
14
|
var NOT_SET = -1;
|
|
15
|
-
var COLUMN_MIN_WIDTH =
|
|
15
|
+
var COLUMN_MIN_WIDTH = 80;
|
|
16
16
|
var HUNDRED = 100; // TODO: 添加单侧
|
|
17
17
|
|
|
18
18
|
function getColumnsWidthMap(columns, clientWidth, lastWidthMap) {
|
|
@@ -21,12 +21,19 @@ function getColumnsWidthMap(columns, clientWidth, lastWidthMap) {
|
|
|
21
21
|
var widthMap = new Map();
|
|
22
22
|
var totalColumnWidth = ZERO;
|
|
23
23
|
columns.forEach(function (item, index) {
|
|
24
|
-
var _lastWidthMap$get;
|
|
25
|
-
|
|
26
24
|
var key = index.toString();
|
|
27
|
-
var
|
|
25
|
+
var widthFlex = item.widthFlex;
|
|
26
|
+
var width = getWidthByColumnsWidth(clientWidth, item.width, widthFlex); // 首先判断是否是否是容器宽度的变化
|
|
27
|
+
|
|
28
|
+
var isSpecific;
|
|
28
29
|
|
|
29
|
-
|
|
30
|
+
if (widthFlex) {
|
|
31
|
+
isSpecific = false;
|
|
32
|
+
} else {
|
|
33
|
+
var _lastWidthMap$get;
|
|
34
|
+
|
|
35
|
+
isSpecific = lastWidthMap ? (_lastWidthMap$get = lastWidthMap.get(key)) === null || _lastWidthMap$get === void 0 ? void 0 : _lastWidthMap$get.isSpecific : isSpecificWidth(item.width);
|
|
36
|
+
}
|
|
30
37
|
|
|
31
38
|
if (lastWidthMap && isSpecific) {
|
|
32
39
|
var _lastWidthMap$get2;
|
|
@@ -52,7 +59,7 @@ function getColumnsWidthMap(columns, clientWidth, lastWidthMap) {
|
|
|
52
59
|
|
|
53
60
|
return widthMap.set(item, {
|
|
54
61
|
isSpecific: (_widthMap$get = widthMap.get(item)) === null || _widthMap$get === void 0 ? void 0 : _widthMap$get.isSpecific,
|
|
55
|
-
width:
|
|
62
|
+
width: COLUMN_MIN_WIDTH
|
|
56
63
|
});
|
|
57
64
|
});
|
|
58
65
|
} // 设定宽度小于容器宽度时
|
|
@@ -84,8 +91,8 @@ function getColumnsWidthMap(columns, clientWidth, lastWidthMap) {
|
|
|
84
91
|
};
|
|
85
92
|
}
|
|
86
93
|
|
|
87
|
-
function getWidthByColumnsWidth(clientWidth, width) {
|
|
88
|
-
if (width === undefined) {
|
|
94
|
+
function getWidthByColumnsWidth(clientWidth, width, widthFlex) {
|
|
95
|
+
if (width === undefined || widthFlex) {
|
|
89
96
|
return NOT_SET;
|
|
90
97
|
}
|
|
91
98
|
|
|
@@ -138,7 +145,7 @@ function getValidScrollThreshold(height, clientHeight) {
|
|
|
138
145
|
}
|
|
139
146
|
|
|
140
147
|
function getPercentageValue(percentage, containerNum) {
|
|
141
|
-
var percent =
|
|
148
|
+
var percent = Number(percentage.replace('%', '')) / HUNDRED;
|
|
142
149
|
return getValidWidthByNumber(containerNum * percent);
|
|
143
150
|
}
|
|
144
151
|
|
package/lib/index.d.ts
CHANGED
|
@@ -55,18 +55,18 @@ export { default as Steps } from './Steps';
|
|
|
55
55
|
export { default as Form } from './Form';
|
|
56
56
|
export type { FormInstance, FormProps, FormItemProps } from './Form';
|
|
57
57
|
export { default as Divider } from './Divider';
|
|
58
|
-
export type { DividerProps } from './Divider';
|
|
58
|
+
export type { IDividerProps as DividerProps } from './Divider';
|
|
59
59
|
export { default as Drawer } from './Drawer';
|
|
60
60
|
export type { DrawerProps } from './Drawer';
|
|
61
61
|
export { default as Radio } from './Radio';
|
|
62
62
|
export type { RadioProps, RadioGroupProps } from './Radio';
|
|
63
63
|
export { default as Checkbox } from './Checkbox';
|
|
64
|
-
export type { CheckboxProps, CheckboxOptionType } from './Checkbox';
|
|
64
|
+
export type { ICheckboxProps as CheckboxProps, CheckboxOptionType } from './Checkbox';
|
|
65
65
|
export { default as Modal } from './Modal';
|
|
66
66
|
export type { ModalProps, ModalFuncProps } from './Modal';
|
|
67
67
|
export { default as Popover } from './Popover';
|
|
68
68
|
export type { PopoverProps } from './Popover';
|
|
69
|
-
export type { InputNumberProps } from './InputNumber';
|
|
69
|
+
export type { IInputNumberProps as InputNumberProps } from './InputNumber';
|
|
70
70
|
export { default as InputNumber } from './InputNumber';
|
|
71
71
|
export { default as Breadcrumb } from './Breadcrumb';
|
|
72
72
|
export type { BreadcrumbProps, BreadcrumbItemProps } from './Breadcrumb';
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
&::-webkit-scrollbar {
|
|
2
|
+
width: 12px !important;
|
|
3
|
+
height: 12px !important;
|
|
4
|
+
opacity: 0.5;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
&::-webkit-scrollbar-thumb {
|
|
8
|
+
background-color: rgba(152, 162, 179, 0.5);
|
|
4
9
|
border: 3px solid transparent;
|
|
5
10
|
border-radius: 6px;
|
|
11
|
+
background-clip: padding-box;
|
|
6
12
|
}
|
|
7
13
|
|
|
8
|
-
|
|
9
|
-
width: 12px;
|
|
10
|
-
height: 12px;
|
|
11
|
-
min-height: 12px;
|
|
14
|
+
&::-webkit-scrollbar-track {
|
|
12
15
|
background-color: transparent;
|
|
13
16
|
}
|