Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/react-compone…
Browse files Browse the repository at this point in the history
…nt-container
  • Loading branch information
Rui-Sun committed Jun 17, 2024
2 parents 821dc87 + ce2f8b5 commit 8642834
Show file tree
Hide file tree
Showing 126 changed files with 4,421 additions and 1,314 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feaure_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Feature Request
description: Request a new feature from @VisActor/vtable
title: '[Feature] '
labels: [new-feature]
labels: [feature]
body:
- type: markdown
attributes:
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.2.0","mainProject":"@visactor/vtable","nextBump":"minor"}]
[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.3.2","mainProject":"@visactor/vtable","nextBump":"patch"}]
11 changes: 6 additions & 5 deletions docs/assets/api/en/icon/base-icon.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ IconPosition enumeration type.
*
*/
export enum IconPosition {
/**The icon in front of the text line content follows the text positioning and wraps with the text */
inlineFront = 'inlineFront',
/**The icon after the text line content, positioned with the text, and wrapped with the text. For example, the sort chart is placed in the first line of the text content */
inlineEnd = 'inlineEnd',
/**Button on the left side of the cell and affected by padding */
left = 'left',
/**The button on the right side of the cell is affected by padding, such as the pin chart */
Expand All @@ -35,7 +31,12 @@ export enum IconPosition {
/**The icon on the right side of the cell content block follows the text positioning and does not wrap with the text */
contentRight = 'contentRight',
/**Free positioning in the cell */
absolute = 'absolute'
absolute = 'absolute',
/**The icon in front of the text line content follows the text positioning and wraps with the text */
inlineFront = 'inlineFront',
/**The icon after the text line content, positioned with the text, and wrapped with the text. For example, the sort chart is placed in the first line of the text content */
inlineEnd = 'inlineEnd',
}
```

Expand Down
8 changes: 8 additions & 0 deletions docs/assets/api/en/methods.md
Original file line number Diff line number Diff line change
Expand Up @@ -1157,3 +1157,11 @@ set row height.
/**set row height */
setRowHeight: (row: number, height: number)
```

## cellIsInVisualView(Function)

Determines whether the cell is in the visible area of the cell. If the cell is completely in the visible area, it returns true. If part or all of the cell is outside the visible area, it returns false.

```
cellIsInVisualView(col: number, row: number)
```
23 changes: 13 additions & 10 deletions docs/assets/api/zh/icon/base-icon.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ IconPosition 枚举类型。
*
*/
export enum IconPosition {
/**文本行内容前面的图标,跟随文本定位,随文本折行 */
inlineFront = 'inlineFront',
/**文本行内容后面的图标,跟随文本定位,随文本折行。如sort图表 放在文本内容的第一行 */
inlineEnd = 'inlineEnd',
/**单元格左侧按钮 且受padding影响 */
left = 'left',
/**单元格右侧按钮 受padding影响 如pin图表 */
Expand All @@ -35,7 +31,12 @@ export enum IconPosition {
/**在单元格内容块的右侧的图标,跟随文本定位,不随文本折行 */
contentRight = 'contentRight',
/**在单元格中自由定位 */
absolute = 'absolute'
absolute = 'absolute',
/**文本行内容前面的图标,跟随文本定位,随文本折行 */
inlineFront = 'inlineFront',
/**文本行内容后面的图标,跟随文本定位,随文本折行。如sort图表 放在文本内容的第一行 */
inlineEnd = 'inlineEnd',
}
```

Expand All @@ -50,11 +51,12 @@ icon 的名称,会作为内部缓存的 key。

${prefix} funcType (IconFuncTypeEnum)

重置VTable内部的icon时需要指定 icon 的功能类型。
重置 VTable 内部的 icon 时需要指定 icon 的功能类型。

特别是具有切换状态的功能性的图标请务必配置上funcType,例如排序功能 funcType 配置 sort,name 配置 sort_normal 或 sort_downward,或 sort_upward。这样才能准确替换到内部相应的icon图标。
特别是具有切换状态的功能性的图标请务必配置上 funcType,例如排序功能 funcType 配置 sort,name 配置 sort_normal 或 sort_downward,或 sort_upward。这样才能准确替换到内部相应的 icon 图标。

IconFuncTypeEnum 枚举类型定义:

IconFuncTypeEnum枚举类型定义:
```
enum IconFuncTypeEnum {
pin = 'pin',
Expand Down Expand Up @@ -100,7 +102,8 @@ ${prefix} tooltip (Object)

#${prefix} placement (Placement)
气泡框位置,可选值为 top、left、right 或 bottom。
Placement枚举类型定义:
Placement 枚举类型定义:

```
enum Placement {
top = 'top',
Expand Down Expand Up @@ -129,4 +132,4 @@ Placement枚举类型定义:
气泡框是否显示箭头。

${prefix} interactive (boolean)
是否可交互,默认为 true。目前已知不可交互按钮为下拉菜单状态。
是否可交互,默认为 true。目前已知不可交互按钮为下拉菜单状态。
8 changes: 8 additions & 0 deletions docs/assets/api/zh/methods.md
Original file line number Diff line number Diff line change
Expand Up @@ -1155,3 +1155,11 @@ interface ISortedMapItem {
/**设置行高 */
setRowHeight: (row: number, height: number)
```

## cellIsInVisualView(Function)

判断单元格是否在单元格可见区域,如果单元格完全都在可见区域才会返回 true,如果有部分或者完全都在可见区域外就返回 false

```
cellIsInVisualView(col: number, row: number)
```
48 changes: 48 additions & 0 deletions docs/assets/changelog/en/release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
# v1.3.1

2024-06-14


**🐛 Bug fix**

- **@visactor/vtable**: fix frozenColCount large than colCount error [#1872](https://github.com/VisActor/VTable/issues/1872)
- **@visactor/vtable**: fix merge cell size update [#1869](https://github.com/VisActor/VTable/issues/1869)
- **@visactor/vtable**: optimize row height update when useOneRowHeightFillAll

**📖 Site / documentation update**

- **@visactor/vtable**: update changlog of rush



[more detail about v1.3.1](https://github.com/VisActor/VTable/releases/tag/v1.3.1)

# v1.3.0

2024-06-12


**🆕 New feature**

- **@visactor/vtable**: add ignoreIcon&formatExportOutput config in vtable-export [#1813](https://github.com/VisActor/VTable/issues/1813)
- **@visactor/vtable**: add textArea editor
- **@visactor/vtable**: add strokeColor style [#1847](https://github.com/VisActor/VTable/issues/1847)
- **@visactor/vtable**: add dx&dy in title component [#1874](https://github.com/VisActor/VTable/issues/1874)
- **@visactor/vtable**: add shrinkSparklineFirst config [#1862](https://github.com/VisActor/VTable/issues/1862)
- **@visactor/vtable**: tooltip disappear delay time [#1848](https://github.com/VisActor/VTable/issues/1848)
- **@visactor/vtable**: add sort config for pivotTable [#1865](https://github.com/VisActor/VTable/issues/1865)

**🐛 Bug fix**

- **@visactor/vtable**: icon inlineEnd inlineFront x position compute error [#1882](https://github.com/VisActor/VTable/issues/1882)
- **@visactor/vtable**: drill down icon can not be click [#1899](https://github.com/VisActor/VTable/issues/1899)
- **@visactor/vtable**: fix frozenColCount large than colCount error [#1872](https://github.com/VisActor/VTable/issues/1872)
- **@visactor/vtable**: fix ellipsis error in _disableColumnAndRowSizeRound mode [#1884](https://github.com/VisActor/VTable/issues/1884)

**🔨 Refactor**

- **@visactor/vtable**: memory release logic optimization [#1856](https://github.com/VisActor/VTable/issues/1856)
- **@visactor/vtable**: arrow key with shift ctrl key to select cells [#1873](https://github.com/VisActor/VTable/issues/1873)

[more detail about v1.3.0](https://github.com/VisActor/VTable/releases/tag/v1.3.0)

# v1.2.0

2024-06-06
Expand Down
86 changes: 64 additions & 22 deletions docs/assets/changelog/zh/release.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,73 @@
# v1.3.1

2024-06-14


**🐛 功能修复**

- **@visactor/vtable**: fix frozenColCount large than colCount error [#1872](https://github.com/VisActor/VTable/issues/1872)
- **@visactor/vtable**: fix merge cell size update [#1869](https://github.com/VisActor/VTable/issues/1869)
- **@visactor/vtable**: optimize row height update when useOneRowHeightFillAll

**📖 文档更新**

- **@visactor/vtable**: update changlog of rush



[更多详情请查看 v1.3.1](https://github.com/VisActor/VTable/releases/tag/v1.3.1)

# v1.3.0

2024-06-12


**🆕 新增功能**

- **@visactor/vtable**: vtable-export增加ignoreIcon&formatExportOutput配置 [#1813](https://github.com/VisActor/VTable/issues/1813)
- **@visactor/vtable**: 增加 textArea editor
- **@visactor/vtable**: 增加 strokeColor 样式 [#1847](https://github.com/VisActor/VTable/issues/1847)
- **@visactor/vtable**: title component增加 dx&dy 配置 [#1874](https://github.com/VisActor/VTable/issues/1874)
- **@visactor/vtable**: 增加 shrinkSparklineFirst 配置 [#1862](https://github.com/VisActor/VTable/issues/1862)
- **@visactor/vtable**: 增加 tooltip 消失延迟时间 [#1848](https://github.com/VisActor/VTable/issues/1848)
- **@visactor/vtable**: 增加透视表排序配置 [#1865](https://github.com/VisActor/VTable/issues/1865)

**🐛 功能修复**

- **@visactor/vtable**: 修复部分图标位置计算问题 [#1882](https://github.com/VisActor/VTable/issues/1882)
- **@visactor/vtable**: 修复下钻按钮点击问题 [#1899](https://github.com/VisActor/VTable/issues/1899)
- **@visactor/vtable**: 修复frozenColCount超过列数时的显示问题 [#1872](https://github.com/VisActor/VTable/issues/1872)
- **@visactor/vtable**: 修复_disableColumnAndRowSizeRound模式下文字省略问题 [#1884](https://github.com/VisActor/VTable/issues/1884)

**🔨 功能重构**

- **@visactor/vtable**: 优化内存释放逻辑 [#1856](https://github.com/VisActor/VTable/issues/1856)
- **@visactor/vtable**: 支持方向键 + shift ctrl选中多个单元格 [#1873](https://github.com/VisActor/VTable/issues/1873)

[更多详情请查看 v1.3.0](https://github.com/VisActor/VTable/releases/tag/v1.3.0)

# v1.2.0

2024-06-06


**🆕 新增功能**

- **@visactor/vtable**: support select highlightMode effect [#1167](https://github.com/VisActor/VTable/issues/1167)
- **@visactor/vtable**: add isAggregation api [#1803](https://github.com/VisActor/VTable/issues/1803)
- **@visactor/vtable**: optimize large column performance [#1840](https://github.com/VisActor/VTable/issues/1840) [#1824](https://github.com/VisActor/VTable/issues/1824)
- **@visactor/vtable**: add merge cell custom graphic attribute sync [#1718](https://github.com/VisActor/VTable/issues/1718)

- **@visactor/vtable**: 增加select highlightMode效果 [#1167](https://github.com/VisActor/VTable/issues/1167)
- **@visactor/vtable**: 补充isAggregation api [#1803](https://github.com/VisActor/VTable/issues/1803)
- **@visactor/vtable**: 优化大量列时的性能问题 [#1840](https://github.com/VisActor/VTable/issues/1840) [#1824](https://github.com/VisActor/VTable/issues/1824)
- **@visactor/vtable**: 补充合并单元格自定义图元更新 [#1718](https://github.com/VisActor/VTable/issues/1718)

**🐛 功能修复**

- **@visactor/vtable**: when has no records should not has aggregation row [#1804](https://github.com/VisActor/VTable/issues/1804)
- **@visactor/vtable**: updateColumns set editor error [#1828](https://github.com/VisActor/VTable/issues/1828)
- **@visactor/vtable**: fix maxCharactersNumber effect [#1830](https://github.com/VisActor/VTable/issues/1830)

**🔨 功能重构**

- **@visactor/vtable**: update pixelRatio when resize [#1823](https://github.com/VisActor/VTable/issues/1823)
- **@visactor/vtable**: selectAllOnCtrlA option
- **@visactor/vtable**: 修复无数据时汇总行展示 [#1804](https://github.com/VisActor/VTable/issues/1804)
- **@visactor/vtable**: 修复updateColumns时设置editor问题 [#1828](https://github.com/VisActor/VTable/issues/1828)
- **@visactor/vtable**: 修复maxCharactersNumber效果 [#1830](https://github.com/VisActor/VTable/issues/1830)

**🔧 项目配置**

- **@visactor/vtable**: update vrender version

**🔨 功能重构**

- **@visactor/vtable**: resize时更新pixelRatio [#1823](https://github.com/VisActor/VTable/issues/1823)
- **@visactor/vtable**: 增加selectAllOnCtrlA配置

[更多详情请查看 v1.2.0](https://github.com/VisActor/VTable/releases/tag/v1.2.0)

Expand All @@ -35,7 +77,7 @@


**🔧 项目配置**


- **@visactor/vtable**: update vrender version

[更多详情请查看 v1.1.2](https://github.com/VisActor/VTable/releases/tag/v1.1.2)
Expand All @@ -46,12 +88,12 @@


**🐛 功能修复**

- **@visactor/vtable**: when set emptyTip interaction not work well with has records [#1818](https://github.com/VisActor/VTable/issues/1818)
- **@visactor/vtable**: fix table frame corner radius display problem [#1783](https://github.com/VisActor/VTable/issues/1783)

- **@visactor/vtable**: when set emptyTip interaction not work well with has records [#1818](https://github.com/VisActor/VTable/issues/1818)
- **@visactor/vtable**: fix table frame corner radius display problem [#1783](https://github.com/VisActor/VTable/issues/1783)

**🔨 功能重构**


- **@visactor/vtable**: dimension value same with indicator key cell value error [#1817](https://github.com/VisActor/VTable/issues/1817)

[更多详情请查看 v1.1.1](https://github.com/VisActor/VTable/releases/tag/v1.1.1)
Expand Down
26 changes: 13 additions & 13 deletions docs/assets/demo/en/basic-functionality/pre-sort.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ group: Basic Features
title: Pre Sort
cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/pre-sort.png
order: 3-2
link: '../guide/basic_function/sort'
link: '../guide/basic_function/sort/list_sort'
---

# Pre Sort
Expand Down Expand Up @@ -36,54 +36,54 @@ fetch('https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/test-demo-data
field: 'id',
title: 'ID',
width: 80,
sort: true,
sort: true
},
{
field: 'email1',
title: 'email(pre-sorted)',
width: 250,
sort: true,
sort: true
},
{
field: 'hobbies',
title: 'hobbies(unsorted)',
width: 200,
sort: true,
sort: true
},
{
field: 'birthday',
title: 'birthday',
width: 120,
width: 120
},
{
field: 'sex',
title: 'sex',
width: 100,
width: 100
},
{
field: 'tel',
title: 'telephone',
width: 150,
width: 150
},
{
field: 'work',
title: 'job',
width: 200,
width: 200
},
{
field: 'city',
title: 'city',
width: 150,
},
width: 150
}
];
const option = {
records: data.data,
columns
};
const tableInstance = new VTable.ListTable(document.getElementById(CONTAINER_ID),option);
const tableInstance = new VTable.ListTable(document.getElementById(CONTAINER_ID), option);
window['tableInstance'] = tableInstance;
data.sort.forEach((item) => {

data.sort.forEach(item => {
tableInstance.setSortedIndexMap(item.key, item.value);
});
});
Expand Down
Loading

0 comments on commit 8642834

Please sign in to comment.