Merge remote-tracking branch 'origin/develop' into feat/pivot-chart

VisActor · Sep 1, 2023 · 63026ea · 63026ea
2 parents f758e40 + 15afbf6
commit 63026ea
Show file tree

Hide file tree

Showing 103 changed files with 304 additions and 297 deletions.
diff --git a/packages/vtable/__tests__/listTable-autoRowHeight.test.ts b/packages/vtable/__tests__/listTable-autoRowHeight.test.ts
@@ -134,8 +134,8 @@ describe('listTable init test', () => {
     expect(listTable.getCellValue(3, 5)).toEqual('万兰');
   });
 
-  test('listTable API getCellType', () => {
-    expect(listTable.getCellType(5, 3)).toEqual('body');
-    expect(listTable.getCellType(5, 0)).toEqual('columnHeader');
+  test('listTable API getCellLocation', () => {
+    expect(listTable.getCellLocation(5, 3)).toEqual('body');
+    expect(listTable.getCellLocation(5, 0)).toEqual('columnHeader');
   });
 });
diff --git a/packages/vtable/__tests__/listTable.test.ts b/packages/vtable/__tests__/listTable.test.ts
@@ -136,7 +136,7 @@ describe('listTable init test', () => {
   //       rowHeaderPaths: []
   //     },
   //     caption: '省/自治区',
-  //     columnType: 'text',
+  //     cellType: 'text',
   //     originData: {
   //       '行 ID': '5',
   //       '订单 ID': 'CN-2018-2975416',

diff --git a/packages/vtable/__tests__/pivotChart.test.ts b/packages/vtable/__tests__/pivotChart.test.ts
@@ -68,7 +68,7 @@ const indicators: VTable.TYPES.IIndicator[] = [
     indicatorKey: '230417171050011',
     title: '数量',
     width: 'auto',
-    columnType: 'chart',
+    cellType: 'chart',
     chartModule: 'vchart',
     chartSpec: {
       // type: 'common',
@@ -113,7 +113,7 @@ const indicators: VTable.TYPES.IIndicator[] = [
   {
     indicatorKey: '230417171050025',
     title: '销售额 & 利润',
-    columnType: 'chart',
+    cellType: 'chart',
     chartModule: 'vchart',
     chartSpec: {
       type: 'common',
@@ -181,7 +181,7 @@ const indicators: VTable.TYPES.IIndicator[] = [
     indicatorKey: '230707112948009',
     title: '折扣',
     width: 'auto',
-    columnType: 'chart',
+    cellType: 'chart',
     chartModule: 'vchart',
     chartSpec: {
       // type: 'common',
@@ -9677,7 +9677,7 @@ describe('pivotTable init test', () => {
         indicatorKey: '230417171050011',
         title: '数量',
         width: 'auto',
-        columnType: 'chart',
+        cellType: 'chart',
         chartModule: 'vchart',
         chartSpec: {
           // type: 'common',
@@ -9712,7 +9712,7 @@ describe('pivotTable init test', () => {
       {
         indicatorKey: '230417171050025',
         title: '销售额 & 利润',
-        columnType: 'chart',
+        cellType: 'chart',
         chartModule: 'vchart',
         chartSpec: {
           type: 'common',
@@ -9780,7 +9780,7 @@ describe('pivotTable init test', () => {
         indicatorKey: '230707112948009',
         title: '折扣',
         width: 'auto',
-        columnType: 'chart',
+        cellType: 'chart',
         chartModule: 'vchart',
         chartSpec: {
           // type: 'common',

diff --git a/packages/vtable/examples/business/one.ts b/packages/vtable/examples/business/one.ts
@@ -116,7 +116,7 @@ export function createTable() {
             menuKey: 'visual_style'
           }
         ],
-        columnType: 'link',
+        cellType: 'link',
         linkDetect: true,
         linkJump: false
       },

diff --git a/packages/vtable/examples/business/two.ts b/packages/vtable/examples/business/two.ts
@@ -116,7 +116,7 @@ export function createTable() {
             menuKey: 'visual_style'
           }
         ],
-        columnType: 'link',
+        cellType: 'link',
         linkDetect: true,
         linkJump: false
       },
@@ -221,7 +221,7 @@ export function createTable() {
             menuKey: 'visual_style'
           }
         ],
-        columnType: 'link',
+        cellType: 'link',
         linkDetect: true,
         linkJump: false
       },

diff --git a/packages/vtable/examples/cell-move/column.ts b/packages/vtable/examples/cell-move/column.ts
@@ -9,7 +9,7 @@ export function createTable() {
       {
         field: 'p',
         // fieldKey: 'progress',
-        columnType: 'text',
+        cellType: 'text',
         fieldFormat(rec) {
           return `i已完成${rec.progress}%`;
         },

diff --git a/packages/vtable/examples/cell-move/pivot.ts b/packages/vtable/examples/cell-move/pivot.ts
@@ -364,7 +364,7 @@ export function createTable() {
         },
         maxWidth: 200,
         minWidth: 10,
-        columnType: 'progressbar'
+        cellType: 'progressbar'
       },
       {
         showSort: false,
@@ -374,7 +374,7 @@ export function createTable() {
           // if (rec.rowDimensions[0].value === '东北') return `${rec.dataValue}%`;
           return rec.dataValue;
         },
-        columnType: 'progressbar'
+        cellType: 'progressbar'
       }
     ],
     records: generatePivotDataSource(19, 18),

diff --git a/packages/vtable/examples/frozen/pivot-table-both-frozen.ts b/packages/vtable/examples/frozen/pivot-table-both-frozen.ts
@@ -228,7 +228,7 @@ export function createTable() {
           },
           barColor: 'transparent'
         },
-        columnType: 'progressbar',
+        cellType: 'progressbar',
         showSort: true
         // headerType: 'MULTILINETEXT',
       },
@@ -239,7 +239,7 @@ export function createTable() {
           // if (rec.rowDimensions[0].value === '东北') return `${rec.dataValue}%`;
           return rec.dataValue;
         },
-        columnType: 'progressbar',
+        cellType: 'progressbar',
         style: {
           barHeight: '50%',
           barBottom: 20,

diff --git a/packages/vtable/examples/frozen/pivot-table-bottom-frozen.ts b/packages/vtable/examples/frozen/pivot-table-bottom-frozen.ts
@@ -228,7 +228,7 @@ export function createTable() {
           },
           barColor: 'transparent'
         },
-        columnType: 'progressbar',
+        cellType: 'progressbar',
         showSort: true
         // headerType: 'MULTILINETEXT',
       },
@@ -239,7 +239,7 @@ export function createTable() {
           // if (rec.rowDimensions[0].value === '东北') return `${rec.dataValue}%`;
           return rec.dataValue;
         },
-        columnType: 'progressbar',
+        cellType: 'progressbar',
         style: {
           barHeight: '50%',
           barBottom: 20,

diff --git a/packages/vtable/examples/frozen/pivot-table-right-frozen.ts b/packages/vtable/examples/frozen/pivot-table-right-frozen.ts
@@ -228,7 +228,7 @@ export function createTable() {
           },
           barColor: 'transparent'
         },
-        columnType: 'progressbar',
+        cellType: 'progressbar',
         showSort: true
         // headerType: 'MULTILINETEXT',
       },
@@ -239,7 +239,7 @@ export function createTable() {
           // if (rec.rowDimensions[0].value === '东北') return `${rec.dataValue}%`;
           return rec.dataValue;
         },
-        columnType: 'progressbar',
+        cellType: 'progressbar',
         style: {
           barHeight: '50%',
           barBottom: 20,

diff --git a/packages/vtable/examples/fs/update-option.ts b/packages/vtable/examples/fs/update-option.ts
@@ -52,7 +52,7 @@ export function createTable() {
         indicatorKey: '0',
         width: 'auto',
         title: 'title',
-        columnType: 'chart',
+        cellType: 'chart',
         chartModule: 'vchart',
         chartSpec: {
           type: 'common',
@@ -487,7 +487,7 @@ export function createTable() {
         indicatorKey: '1',
         width: 'auto',
         title: 'title',
-        columnType: 'chart',
+        cellType: 'chart',
         chartModule: 'vchart',
         chartSpec: {
           type: 'line',
@@ -1420,7 +1420,7 @@ export function createTable() {
           indicatorKey: '0',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'common',
@@ -1855,7 +1855,7 @@ export function createTable() {
           indicatorKey: '1',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'line',
@@ -3487,7 +3487,7 @@ export function createTable() {
           indicatorKey: '0',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'bar',
@@ -3719,7 +3719,7 @@ export function createTable() {
           indicatorKey: '1',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'line',
@@ -3951,7 +3951,7 @@ export function createTable() {
           indicatorKey: '2',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'line',
@@ -4183,7 +4183,7 @@ export function createTable() {
           indicatorKey: '3',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'line',
@@ -4415,7 +4415,7 @@ export function createTable() {
           indicatorKey: '4',
           width: 'auto',
           title: 'title',
-          columnType: 'chart',
+          cellType: 'chart',
           chartModule: 'vchart',
           chartSpec: {
             type: 'line',

diff --git a/packages/vtable/examples/list/list-chart.ts b/packages/vtable/examples/list/list-chart.ts
@@ -20,7 +20,7 @@ export function createTable() {
       field: 'areaChart',
       title: 'vchart area',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'area',
@@ -101,7 +101,7 @@ export function createTable() {
       field: 'lineChart',
       title: 'vchart line',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -175,7 +175,7 @@ export function createTable() {
       field: 'barChart',
       title: 'vchart line',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -224,7 +224,7 @@ export function createTable() {
       field: 'scatterChart',
       title: 'vchart line',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -260,7 +260,7 @@ export function createTable() {
       field: 'areaChart',
       title: 'vchart area',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -345,7 +345,7 @@ export function createTable() {
       field: 'lineChart',
       title: 'vchart line',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -419,7 +419,7 @@ export function createTable() {
       field: 'barChart',
       title: 'vchart line',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -468,7 +468,7 @@ export function createTable() {
       field: 'scatterChart',
       title: 'vchart line',
       width: '320',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',

diff --git a/packages/vtable/examples/pivot-chart/aeolus.ts b/packages/vtable/examples/pivot-chart/aeolus.ts
@@ -181,7 +181,7 @@ export function createTable() {
         indicatorKey: '10002',
         caption: '',
         width: 'auto',
-        columnType: 'chart',
+        cellType: 'chart',
         chartModule: 'vchart',
         style: {
           padding: 1

diff --git a/packages/vtable/examples/pivot-chart/horizontal-hideHeader.ts b/packages/vtable/examples/pivot-chart/horizontal-hideHeader.ts
@@ -123,7 +123,7 @@ export function createTable() {
       indicatorKey: '230417171050011',
       title: '数量',
       width: 'auto',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         // type: 'common',
@@ -169,7 +169,7 @@ export function createTable() {
     {
       indicatorKey: '230417171050025',
       title: '销售额 & 利润',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -242,7 +242,7 @@ export function createTable() {
       indicatorKey: '230707112948009',
       title: '折扣',
       width: 'auto',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         // type: 'common',

diff --git a/packages/vtable/examples/pivot-chart/horizontal.ts b/packages/vtable/examples/pivot-chart/horizontal.ts
@@ -125,7 +125,7 @@ export function createTable() {
       indicatorKey: '230417171050011',
       title: '数量',
       width: 'auto',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         // type: 'common',
@@ -171,7 +171,7 @@ export function createTable() {
     {
       indicatorKey: '230417171050025',
       title: '销售额 & 利润',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         type: 'common',
@@ -244,7 +244,7 @@ export function createTable() {
       indicatorKey: '230707112948009',
       title: '折扣',
       width: 'auto',
-      columnType: 'chart',
+      cellType: 'chart',
       chartModule: 'vchart',
       chartSpec: {
         // type: 'common',