feat: merge fillfillcolor strokestrokecolor into fillstroke (#25)

VisActor · Jun 14, 2023 · f8e45c2 · f8e45c2
1 parent 12ed159
commit f8e45c2
Show file tree

Hide file tree

Showing 42 changed files with 715 additions and 312 deletions.
diff --git a/...r/vtable/feat-merge-fillfillcolor-strokestrokecolor-into-fillstroke_2023-06-13-08-30.json b/...r/vtable/feat-merge-fillfillcolor-strokestrokecolor-into-fillstroke_2023-06-13-08-30.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "update vrender version",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json
@@ -83,7 +83,7 @@
    * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides
    */
   "globalOverrides": {
-    "@visactor/vrender": "0.9.0-alpha.1"
+    "@visactor/vrender": "0.9.2-fill-stroke.10"
   },
   /**
    * The `globalPeerDependencyRules` setting provides various settings for suppressing validation errors

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/vtable/examples/custom/default.ts b/packages/vtable/examples/custom/default.ts
@@ -122,7 +122,7 @@ export function createTable() {
             text: record.bloggerName,
             fontSize: 13,
             fontFamily: 'sans-serif',
-            fillColor: 'black',
+            fill: 'black',
             marginLeft: 10
           });
           bloggerName.getSize(table);
@@ -141,7 +141,7 @@ export function createTable() {
             text: record.city,
             fontSize: 11,
             fontFamily: 'sans-serif',
-            fillColor: '#6f7070'
+            fill: '#6f7070'
           });
           bloggerName.getSize(table);
           containerRightTop.add(locationName);
@@ -151,9 +151,9 @@ export function createTable() {
               text: record.tags[i],
               fontSize: 10,
               fontFamily: 'sans-serif',
-              fillColor: 'rgb(51, 101, 238)',
+              fill: 'rgb(51, 101, 238)',
               background: {
-                fillColor: '#f4f4f2',
+                fill: '#f4f4f2',
                 borderRadius: 5,
                 expandX: 5,
                 expandY: 5

diff --git a/packages/vtable/examples/icon/icon-shape.ts b/packages/vtable/examples/icon/icon-shape.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-len */
 import * as VTable from '../../src';
+import { bindDebugTool } from '../../src/scenegraph/debug-tool';
 const ListTable = VTable.ListTable;
 const Table_CONTAINER_DOM_ID = 'vTable';
 
@@ -195,9 +196,9 @@ export function createTable() {
       hoverIconKey = '';
     }
   });
-  // VTable.bindDebugTool(instance.scenegraph.stage as any, {
-  //   customGrapicKeys: ['role', '_updateTag'],
-  // });
+  bindDebugTool(instance.scenegraph.stage as any, {
+    customGrapicKeys: ['role', '_updateTag']
+  });
 
   // 只为了方便控制太调试用，不要拷贝
   (window as any).tableInstance = instance;

diff --git a/packages/vtable/examples/menu.ts b/packages/vtable/examples/menu.ts
@@ -148,6 +148,10 @@ export const menus = [
       {
         path: 'style',
         name: 'auto-wrap-text'
+      },
+      {
+        path: 'style',
+        name: 'border'
       }
     ]
   },

diff --git a/packages/vtable/examples/pivot/pivot-basic.ts b/packages/vtable/examples/pivot/pivot-basic.ts
@@ -1,4 +1,5 @@
 import * as VTable from '../../src';
+import { bindDebugTool } from '../../src/scenegraph/debug-tool';
 const PivotTable = VTable.PivotTable;
 const Table_CONTAINER_DOM_ID = 'vTable';
 
@@ -483,14 +484,15 @@ export function createTable() {
   };
 
   const instance = new PivotTable(option);
+  window.tableInstance = instance;
 
   const { PIVOT_SORT_CLICK } = VTable.PivotTable.EVENT_TYPE;
   instance.listen(PIVOT_SORT_CLICK, e => {
     const order = e.order === 'asc' ? 'desc' : e.order === 'desc' ? 'normal' : 'asc';
     instance.updatePivotSortState([{ dimensions: e.dimensionInfo, order }]);
   });
 
-  VTable.bindDebugTool(instance.scenegraph.stage as any, {
+  bindDebugTool(instance.scenegraph.stage as any, {
     customGrapicKeys: ['role', '_updateTag']
   });
 

diff --git a/packages/vtable/examples/pivot/pivot-no-indicator.ts b/packages/vtable/examples/pivot/pivot-no-indicator.ts
@@ -1,4 +1,5 @@
 import * as VTable from '../../src';
+import { bindDebugTool } from '../../src/scenegraph/debug-tool';
 const PivotTable = VTable.PivotTable;
 const Table_CONTAINER_DOM_ID = 'vTable';
 
@@ -247,7 +248,7 @@ export function createTable() {
     instance.updatePivotSortState([{ dimensions: e.dimensionInfo, order }]);
   });
 
-  VTable.bindDebugTool(instance.scenegraph.stage as any, {
+  bindDebugTool(instance.scenegraph.stage as any, {
     customGrapicKeys: ['role', '_updateTag']
   });