Merge pull request #827 from VisActor/develop

Merge develop into release/0.17.3
VisActor · Dec 29, 2023 · b1b5389 · b1b5389
2 parents f549db3 + 5e3d5a6
commit b1b5389
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/vtable-export/package.json b/packages/vtable-export/package.json
@@ -37,8 +37,7 @@
     "@visactor/vtable": "workspace:*",
     "@visactor/vutils": "~0.17.1",
     "file-saver": "2.0.5",
-    "exceljs": "4.4.0",
-    "@visactor/vrender": "0.17.8"
+    "exceljs": "4.4.0"
   },
   "devDependencies": {
     "@visactor/vchart": "1.7.3",

diff --git a/packages/vtable-export/src/excel/index.ts b/packages/vtable-export/src/excel/index.ts
@@ -1,9 +1,8 @@
-import { graphicUtil } from '@visactor/vrender';
 import ExcelJS from 'exceljs';
 import { encodeCellAddress } from '../util/encode';
 import type { CellType, IVTable } from '../util/type';
 import { getCellAlignment, getCellBorder, getCellFill, getCellFont } from './style';
-import { updateCell, renderChart } from '@visactor/vtable';
+import { updateCell, renderChart, graphicUtil } from '@visactor/vtable';
 import { isArray } from '@visactor/vutils';
 
 export async function exportVTableToExcel(tableInstance: IVTable) {

diff --git a/packages/vtable/src/index.ts b/packages/vtable/src/index.ts
@@ -1,4 +1,6 @@
 /* eslint-disable sort-imports */
+import { graphicUtil } from '@visactor/vrender';
+
 import * as TYPES from './ts-types';
 import * as core from './core';
 import * as data from './data';
@@ -88,7 +90,8 @@ export {
   DataStatistics,
   CustomLayout,
   updateCell,
-  renderChart
+  renderChart,
+  graphicUtil
 };
 
 /** @private */