Merge pull request #263 from VisActor/fix/axis-releate

Fix/axis releate
VisActor · Aug 31, 2023 · 6096938 · 6096938
2 parents 7688ba2 + e9f66e7
commit 6096938
Show file tree

Hide file tree

Showing 208 changed files with 13,503 additions and 2,877 deletions.
diff --git a/.github/ISSUE_TEMPLATE/others.md b/.github/ISSUE_TEMPLATE/others.md
@@ -0,0 +1,7 @@
+---
+name: Others
+about: Describe this issue's purpose here.
+title: ''
+labels: ''
+assignees: ''
+---
diff --git a/...es/@visactor/vtable/183-refactor-wrap-text-should-suit-english-word_2023-08-24-06-49.json b/...es/@visactor/vtable/183-refactor-wrap-text-should-suit-english-word_2023-08-24-06-49.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: wrap text should suit English word #183\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@visactor/vtable/240-feature-update-single-option-item_2023-08-24-10-38.json b/common/changes/@visactor/vtable/240-feature-update-single-option-item_2023-08-24-10-38.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "feat: add api for updateAutoWrapText widthMode heightMode #240\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@visactor/vtable/240-feature-update-single-option-item_2023-08-25-08-35.json b/common/changes/@visactor/vtable/240-feature-update-single-option-item_2023-08-25-08-35.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: optimize performance when window resize Compute RowHeight ColWidth  #249\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@visactor/vtable/254-data-analysis-pivot-analysis_2023-08-29-03-56.json b/common/changes/@visactor/vtable/254-data-analysis-pivot-analysis_2023-08-29-03-56.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "feat: add analysis for pivot table\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/...n/changes/@visactor/vtable/269-bug-pivottable-horizontal-scroll-bar_2023-08-31-07-47.json b/...n/changes/@visactor/vtable/269-bug-pivottable-horizontal-scroll-bar_2023-08-31-07-47.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: pivotTable horizontal scroll bar is abnormal when the display area is small #269\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/vtable/__tests__/pivotChart.test.ts b/packages/vtable/__tests__/pivotChart.test.ts
@@ -47,7 +47,7 @@ const columnTree = [
 const columns: (VTable.IDimension | string)[] = [
   {
     dimensionKey: '230417171050031',
-    dimensionTitle: '国家',
+    title: '国家',
     headerStyle: {
       color: 'red'
     }
@@ -57,7 +57,7 @@ const columns: (VTable.IDimension | string)[] = [
 const rows = [
   {
     dimensionKey: '230417170554012',
-    dimensionTitle: '邮寄方式',
+    title: '邮寄方式',
     headerStyle: {
       color: 'red'
     }
@@ -66,7 +66,7 @@ const rows = [
 const indicators: VTable.TYPES.IIndicator[] = [
   {
     indicatorKey: '230417171050011',
-    caption: '数量',
+    title: '数量',
     width: 'auto',
     columnType: 'chart',
     chartModule: 'vchart',
@@ -112,7 +112,7 @@ const indicators: VTable.TYPES.IIndicator[] = [
   },
   {
     indicatorKey: '230417171050025',
-    caption: '销售额 & 利润',
+    title: '销售额 & 利润',
     columnType: 'chart',
     chartModule: 'vchart',
     chartSpec: {
@@ -179,7 +179,7 @@ const indicators: VTable.TYPES.IIndicator[] = [
   },
   {
     indicatorKey: '230707112948009',
-    caption: '折扣',
+    title: '折扣',
     width: 'auto',
     columnType: 'chart',
     chartModule: 'vchart',
@@ -9675,7 +9675,7 @@ describe('pivotTable init test', () => {
     const indicators1: VTable.TYPES.IIndicator[] = [
       {
         indicatorKey: '230417171050011',
-        caption: '数量',
+        title: '数量',
         width: 'auto',
         columnType: 'chart',
         chartModule: 'vchart',
@@ -9711,7 +9711,7 @@ describe('pivotTable init test', () => {
       },
       {
         indicatorKey: '230417171050025',
-        caption: '销售额 & 利润',
+        title: '销售额 & 利润',
         columnType: 'chart',
         chartModule: 'vchart',
         chartSpec: {
@@ -9778,7 +9778,7 @@ describe('pivotTable init test', () => {
       },
       {
         indicatorKey: '230707112948009',
-        caption: '折扣',
+        title: '折扣',
         width: 'auto',
         columnType: 'chart',
         chartModule: 'vchart',

diff --git a/packages/vtable/__tests__/pivotTable.test.ts b/packages/vtable/__tests__/pivotTable.test.ts
@@ -385,7 +385,7 @@ describe('pivotTable init test', () => {
   const rows = [
     {
       dimensionKey: '地区',
-      dimensionTitle: '地区',
+      title: '地区',
       headerStyle: {
         textStick: true,
         color: 'red',
@@ -396,7 +396,7 @@ describe('pivotTable init test', () => {
     },
     {
       dimensionKey: '省/自治区',
-      dimensionTitle: '省/自治区',
+      title: '省/自治区',
       width: 'auto',
       showSort: false,
       headerStyle: {
@@ -416,7 +416,7 @@ describe('pivotTable init test', () => {
   const columns = [
     {
       dimensionKey: '子类别',
-      dimensionTitle: '子类别',
+      title: '子类别',
       headerStyle: {
         textStick: true
       },
@@ -426,7 +426,7 @@ describe('pivotTable init test', () => {
   const indicators = [
     {
       indicatorKey: '利润',
-      caption: '利润',
+      title: '利润',
       width: 'auto',
       style: {
         borderColor: 'red',
@@ -440,7 +440,7 @@ describe('pivotTable init test', () => {
     },
     {
       indicatorKey: '销售额',
-      caption: '销售额',
+      title: '销售额',
       width: 'auto'
     }
   ];

diff --git a/packages/vtable/examples/README.md b/packages/vtable/examples/README.md
@@ -14,9 +14,7 @@ npm i --global @microsoft/rush
 
 3. 启动demo
 
-在根目录下运行：
-`rush run -p @visactor/VTable -s demo`
-or 进入到项目中
+进入到项目中
 ```shell
 cd packages/vtable/
 rushx demo

diff --git a/packages/vtable/examples/auto-size/adaptive-width.ts b/packages/vtable/examples/auto-size/adaptive-width.ts
@@ -19,13 +19,13 @@ export function createTable() {
           fontSize: 12,
           fontFamily: 'sans-serif'
         },
-        caption: 'progress',
+        title: 'progress',
         description: '这是一个标题的详细描述',
         width: 'calc(20% - 20px)'
         // width: 'auto'
       },
       {
-        caption: 'Name',
+        title: 'Name',
         headerStyle: {
           textAlign: 'center',
           fontWeight: 'bold',
@@ -35,7 +35,7 @@ export function createTable() {
         columns: [
           {
             field: 'fname',
-            caption: 'First Name',
+            title: 'First Name',
             width: '20%',
             minWidth: 150,
             headerStyle: {
@@ -44,15 +44,15 @@ export function createTable() {
           },
           {
             field: 'lname',
-            caption: 'Last Name',
+            title: 'Last Name',
             width: '20%',
             minWidth: 150
           }
         ]
       },
       {
         field: 'email',
-        caption: 'email',
+        title: 'email',
         width: 200,
         headerStyle: {
           autoWrapText: true,
@@ -108,7 +108,7 @@ export function createTable() {
             rec.birthday = isNaN(parseInt(date.toString(), 10)) ? val : date;
           }
         },
-        caption: 'Birthday',
+        title: 'Birthday',
         width: 150
       }
     ],