Merge pull request #1568 from VisActor/fix/merge-conflicts

Merge develop into dev/0.24.0

common/changes/@visactor/vtable/1557-refactor-optimize-performance-row-tree-node_2024-04-19-09-27.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: optimize performance when row tree node exceed 8000 nodes #1557\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}

common/changes/@visactor/vtable/1559-bug-input-editor-autofillwidth_2024-04-22-06-30.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: when resize window size the editor input size not match cell size #1559\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}

common/changes/@visactor/vtable/fix-fs-style-align_2024-04-17-07-26.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: fix multilines new line style #1531",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}

common/changes/@visactor/vtable/fix-promise-order_2024-04-16-08-52.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: fix cell group order in async data #1517",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}

common/changes/@visactor/vtable/fix-skip-merge-in-getValue_2024-04-22-06-42.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: add skipCustomMerge in getCellValue() #1543",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}

docs/assets/api/en/methods.md

@@ -250,13 +250,13 @@ Clear the selection of all cells.
 
 ## getCellValue(Function)
 
-Get cell display value
+Get the cell display value. If used in the customMergeCell function, you need to pass in the skipCustomMerge parameter, otherwise an error will be reported.
 
 ```
   /**
    * Get the cell display value
    */
-  getCellValue(col: number, row: number): FieldData;
+  getCellValue(col: number, row: number, skipCustomMerge?: boolean): FieldData;
 ```
 
 ## getCellOriginValue(Function)

docs/assets/api/zh/methods.md

@@ -251,13 +251,13 @@ setRecords(records: Array<any>)
 
 ## getCellValue(Function)
 
-获取单元格展示值
+获取单元格展示值，如果在customMergeCell函数中使用，需要传入 skipCustomMerge 参数，否则会导致报错。
 
 ```
   /**
    * 获取单元格展示值
    */
-  getCellValue(col: number, row: number): FieldData;
+  getCellValue(col: number, row: number, skipCustomMerge?: boolean): FieldData;
 ```
 
 ## getCellOriginValue(Function)

docs/assets/demo-openinula/zh/usage/grammatical-tag.md

@@ -1,7 +1,7 @@
 ---
 category: examples
 group: usage
-title: 使用完整option
+title: 使用语法化标签
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/react-default-new.png
 order: 1-1
 link: '../guide/Developer_Ecology/openinula'

docs/assets/demo-react/zh/usage/grammatical-tag.md

@@ -1,7 +1,7 @@
 ---
 category: examples
 group: usage
-title: 使用完整option
+title: 使用语法化标签
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/react-default.png
 order: 1-1
 link: '../guide/Developer_Ecology/react'

docs/assets/demo/menu.json

@@ -1338,29 +1338,6 @@
           }
         }
       ]
-    },
-    {
-      "path": "react",
-      "title": {
-        "zh": "react",
-        "en": "react"
-      },
-      "children": [
-        {
-          "path": "table-option",
-          "title": {
-            "zh": "table-option",
-            "en": "table-option"
-          }
-        },
-        {
-          "path": "table-component",
-          "title": {
-            "zh": "table-component",
-            "en": "table-component"
-          }
-        }
-      ]
     }
   ]
 }

packages/vtable/src/ListTable.ts

@@ -208,13 +208,15 @@ export class ListTable extends BaseTable implements ListTableAPI {
     }
   }
   /** 获取单元格展示值 */
-  getCellValue(col: number, row: number): FieldData {
+  getCellValue(col: number, row: number, skipCustomMerge?: boolean): FieldData {
     if (col === -1 || row === -1) {
       return null;
     }
-    const customMergeText = this.getCustomMergeValue(col, row);
-    if (customMergeText) {
-      return customMergeText;
+    if (!skipCustomMerge) {
+      const customMergeText = this.getCustomMergeValue(col, row);
+      if (customMergeText) {
+        return customMergeText;
+      }
     }
     const table = this;
     if (table.internalProps.layoutMap.isSeriesNumber(col, row)) {
@@ -373,6 +375,7 @@ export class ListTable extends BaseTable implements ListTableAPI {
     internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode;
     //分页配置
     this.pagination = options.pagination;
+    internalProps.sortState = options.sortState;
     internalProps.dataConfig = {}; // cloneDeep(options.dataConfig ?? {});
     //更新protectedSpace
     this.showHeader = options.showHeader ?? true;

packages/vtable/src/PivotChart.ts

@@ -386,10 +386,12 @@ export class PivotChart extends BaseTable implements PivotChartAPI {
   //   return dataValue;
   // }
 
-  getCellValue(col: number, row: number): FieldData {
-    const customMergeText = this.getCustomMergeValue(col, row);
-    if (customMergeText) {
-      return customMergeText;
+  getCellValue(col: number, row: number, skipCustomMerge?: boolean): FieldData {
+    if (!skipCustomMerge) {
+      const customMergeText = this.getCustomMergeValue(col, row);
+      if (customMergeText) {
+        return customMergeText;
+      }
     }
     if (this.internalProps.layoutMap.isHeader(col, row)) {
       if (