Skip to content

Merge develop into release/0.17.3 #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 29, 2023
Merged

Merge develop into release/0.17.3 #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48fbace
chore: move graphicUtil to vtable
Rui-Sun Dec 29, 2023
5e3d5a6
Merge pull request #826 from VisActor/feat/table-export
Rui-Sun Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions packages/vtable-export/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions packages/vtable-export/src/excel/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
5 changes: 4 additions & 1 deletion packages/vtable/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -88,7 +90,8 @@ export {
DataStatistics,
CustomLayout,
updateCell,
renderChart
renderChart,
graphicUtil
};

/** @private */
Expand Down