Skip to content

Commit 88583d6

Browse files
committed
Merge remote-tracking branch 'origin/develop' into 3788-bug-focusHighlight-plugin
2 parents 870ad75 + b56bd12 commit 88583d6

37 files changed

+668
-165
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "refactor: change event listener with vglobal #3734\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "892739385@qq.com"
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "fix: when records is blank updateColumns api occor error #3766\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "892739385@qq.com"
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "fix: updateOption with dataSource object occor error #3768\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "892739385@qq.com"
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "fix: when hide pivot header find headerPath error #3791\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "892739385@qq.com"
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "fix: supplement adaptive widthAdaptiveMode logic #3796\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "892739385@qq.com"
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "fix: skip serial number calculation for aggregation rows when groupBy is enabled\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "zzh7498624@163.com"
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "fix: hide rowSeriesNumber and checkbox in aggregation #2173\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vtable"
7+
}
8+
],
9+
"packageName": "@visactor/vtable",
10+
"email": "zzh7498624@163.com"
11+
}

docs/assets/api/en/methods.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@
66

77
Update table configuration items, which will be automatically redrawn after being called.
88

9+
updateConfig parameter description:
10+
11+
- keepData: When the new option does not pass in records or dataSource, whether to retain the original data. The default is false
12+
913
```ts
1014
/**
1115
*Update options currently only support full updates
1216
* @param options
1317
*/
14-
updateOption(options: BaseTableConstructorOptions) => void
18+
updateOption(options: BaseTableConstructorOptions,updateConfig?:{
19+
//When the new option does not pass in records or dataSource, whether to retain the original data. The default is false
20+
keepData?:boolean
21+
}) => void
1522
```
1623

1724
If you need to update a single configuration item, please refer to the other `update**` interfaces below
@@ -1414,6 +1421,16 @@ getAllColsWidth: () => number;
14141421

14151422
```
14161423
1424+
## getAllColsWidths(Function)
1425+
1426+
get all columns width list
1427+
1428+
```
1429+
1430+
getAllColsWidth: () => number[];
1431+
1432+
```
1433+
14171434
## setSortedIndexMap(Function)
14181435
14191436
Set up a pre-sort index to improve initial sorting performance in scenarios where large amounts of data are sorted.

docs/assets/api/zh/methods.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44

55
## updateOption(Function)
66

7-
更新表格配置项,调用后会自动重绘
7+
更新表格配置项,调用后会自动重绘。
8+
9+
updateConfig 参数说明:
10+
11+
- keepData: 当新的option没有传入records或者dataSource时,是否保留原本的数据。默认为false
812

913
```ts
1014
/**
1115
* 更新options 目前只支持全量更新
1216
* @param options
1317
*/
14-
updateOption(options: BaseTableConstructorOptions) => void
18+
updateOption(options: BaseTableConstructorOptions,updateConfig?:{
19+
//当新的option没有传入records或者dataSource时,是否保留原本的数据
20+
keepData?:boolean
21+
}) => void
1522
```
1623

1724
如果需要更新单个配置项,请参考下面其他`update**`接口
@@ -1261,6 +1268,14 @@ getAllRowsHeight: () => number;
12611268
getAllColsWidth: () => number;
12621269
```
12631270

1271+
## getAllColsWidths(Function)
1272+
1273+
获取表格所有列的宽度列表
1274+
1275+
```
1276+
getAllColsWidth: () => number[];
1277+
```
1278+
12641279
## setSortedIndexMap(Function)
12651280

12661281
设置预排序索引,用在大数据量排序的场景下,提升初次排序性能

packages/vtable-editors/src/list-editor.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ export class ListEditor implements IEditor {
3737
// input.style.boxShadow = 'none';
3838
});
3939

40-
41-
4240
this.element = select;
4341

4442
// create option tags
@@ -86,16 +84,15 @@ export class ListEditor implements IEditor {
8684
}
8785

8886
adjustPosition(rect: RectProps) {
89-
9087
//使border均分input位置rect的上下左右
9188
const borderWidth = 2;
9289
const top = rect.top - borderWidth / 2;
9390
const left = rect.left - borderWidth / 2;
9491
const width = rect.width + borderWidth;
9592
const height = rect.height + borderWidth;
9693

97-
this.element.style.top =top + 'px';
98-
this.element.style.left =left + 'px';
94+
this.element.style.top = top + 'px';
95+
this.element.style.left = left + 'px';
9996
this.element.style.width = width + 'px';
10097
this.element.style.height = height + 'px';
10198
}

0 commit comments

Comments
 (0)