fix: import type directly from vchart

packages/vchart-theme-demo-component/src/spec/funnelHorizontal.ts

@@ -52,10 +52,10 @@ export const horizontalFunnelSpec = {
         visible: true,
         style: {
           lineHeight: 16,
-          limit: (datum, ctx) => Math.abs(ctx.getPoints(datum)[0].x - ctx.getPoints(datum)[3].x),
-          text: datum => `${datum.percent * 100}%`,
-          x: (datum, ctx) => ctx.getPoints(datum)[0].x + 10,
-          y: (datum, ctx) => ctx.getPoints(datum)[0].y - 10,
+          limit: (datum: any, ctx: any) => Math.abs(ctx.getPoints(datum)[0].x - ctx.getPoints(datum)[3].x),
+          text: (datum: any) => `${datum.percent * 100}%`,
+          x: (datum: any, ctx: any) => ctx.getPoints(datum)[0].x + 10,
+          y: (datum: any, ctx: any) => ctx.getPoints(datum)[0].y - 10,
           textAlign: 'left',
           textBaseline: 'bottom',
           fontSize: 20,
@@ -67,7 +67,7 @@ export const horizontalFunnelSpec = {
           type: 'polygon',
           dataId: 'funnel',
           style: {
-            points: (datum, ctx) => {
+            points: (datum: any, ctx: any) => {
               const start = ctx.getPoints(datum)[1];
               const end = { x: start.x, y: 0 };
               return [start, end];
@@ -81,7 +81,7 @@ export const horizontalFunnelSpec = {
           type: 'text',
           dataId: 'funnel',
           style: {
-            text: (datum, ctx) => {
+            text: (datum: any, ctx: any) => {
               return {
                 type: 'rich',
                 text: [
@@ -101,8 +101,8 @@ export const horizontalFunnelSpec = {
                 ]
               };
             },
-            x: (datum, ctx) => ctx.getPoints(datum)[0].x + 10,
-            width: (datum, ctx) => {
+            x: (datum: any, ctx: any) => ctx.getPoints(datum)[0].x + 10,
+            width: (datum: any, ctx: any) => {
               return ctx.getPoints(datum)[3].x - ctx.getPoints(datum)[0].x;
             },
             textAlign: 'left',
@@ -119,7 +119,7 @@ export const horizontalFunnelSpec = {
           style: {
             image:
               'https://sf16-scmcdn-sg.ibytedtos.com/obj/static-sg/visactor-site/sg/client/img/visactor/vrender-icon.svg',
-            x: (datum, ctx) =>
+            x: (datum: any, ctx: any) =>
               ctx.getPoints(datum)[2].x + (ctx.getPoints(datum)[2].x - ctx.getPoints(datum)[1].x) * 0.5 - 36,
             y: 10,
             align: 'right',

packages/vchart-theme-demo-component/src/vchart-chart-hub-theme/charts.tsx

@@ -68,6 +68,7 @@ export function Charts(props: IProps) {
                   ...chart.spec,
                   height: chartHeight
                 }}
+                // @ts-ignore
                 options={{
                   ...chart.option,
                   mode: isMobile ? 'mobile-browser' : 'desktop-browser'

packages/vchart-theme-utils/package.json

@@ -37,7 +37,7 @@
     "@types/jest": "~29.5.0",
     "@rushstack/eslint-patch": "~1.1.4",
     "@visactor/vchart": "1.11.6",
-    "@visactor/vchart-types": "1.11.0",
+    "@visactor/vchart-types": "1.11.6",
     "eslint": "~8.18.0",
     "vite": "^4.5.0",
     "typescript": "4.9.5",

packages/vchart-theme/package.json

@@ -39,7 +39,7 @@
     "@types/jest": "~29.5.0",
     "@rushstack/eslint-patch": "~1.1.4",
     "@visactor/vchart": "1.11.6",
-    "@visactor/vchart-types": "1.11.0",
+    "@visactor/vchart-types": "1.11.6",
     "eslint": "~8.18.0",
     "vite": "^4.5.0",
     "typescript": "4.9.5",

packages/vchart-theme/src/chart-hub/common/component/data-zoom.ts

@@ -1,4 +1,4 @@
-import type { IDataZoomTheme } from '@visactor/vchart-types';
+import type { IDataZoomTheme } from '@visactor/vchart';
 
 export const dataZoom: IDataZoomTheme = {
   height: 44,

packages/vchart-theme/src/chart-hub/common/component/polar-axis.ts

@@ -1,4 +1,4 @@
-import type { IPolarAxisCommonTheme } from '@visactor/vchart-types';
+import type { IPolarAxisCommonTheme } from '@visactor/vchart';
 
 const axisRadius: IPolarAxisCommonTheme = {
   domainLine: {},

packages/vchart-theme/src/legacy/legend/color-legend.ts

@@ -1,4 +1,4 @@
-import type { IColorLegendTheme, IContinuousLegendTheme } from '@visactor/vchart-types';
+import type { IColorLegendTheme, IContinuousLegendTheme } from '@visactor/vchart';
 import { DEFAULT_CONTINUOUS_LEGEND_THEME } from './continuous';
 
 const handlerTheme: IContinuousLegendTheme['handler'] = {

packages/vchart-theme/src/legacy/legend/continuous.ts

@@ -1,4 +1,4 @@
-import type { IContinuousLegendTheme } from '@visactor/vchart-types';
+import type { IContinuousLegendTheme } from '@visactor/vchart';
 
 export const DEFAULT_CONTINUOUS_LEGEND_THEME: IContinuousLegendTheme = {
   orient: 'right',

packages/vchart-theme/src/legacy/legend/size-legend.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-duplicate-imports
-import type { IContinuousLegendTheme, ISizeLegendTheme } from '@visactor/vchart-types';
+import type { IContinuousLegendTheme, ISizeLegendTheme } from '@visactor/vchart';
 import { DEFAULT_CONTINUOUS_LEGEND_THEME } from './continuous';
 
 const getHandlerTheme = (align?: 'top' | 'bottom' | 'left' | 'right'): IContinuousLegendTheme['handler'] => ({

packages/vchart-theme/src/mobile/common/component/axis/band-axis.ts

@@ -1,4 +1,4 @@
-import type { IBandAxisTheme } from '@visactor/vchart-types';
+import type { IBandAxisTheme } from '@visactor/vchart';
 
 export const axisBand: IBandAxisTheme = {
   domainLine: {

packages/vchart-theme/src/mobile/common/component/axis/cartesian-axis.ts

@@ -1,4 +1,4 @@
-import type { ICartesianAxisCommonTheme } from '@visactor/vchart-types';
+import type { ICartesianAxisCommonTheme } from '@visactor/vchart';
 
 export const axisX: ICartesianAxisCommonTheme = {
   label: {

packages/vchart-theme/src/mobile/common/component/axis/common-axis.ts

@@ -1,4 +1,4 @@
-import type { IAxisCommonTheme } from '@visactor/vchart-types';
+import type { IAxisCommonTheme } from '@visactor/vchart';
 
 export const commonAxis: IAxisCommonTheme = {
   domainLine: {

packages/vchart-theme/src/mobile/common/component/axis/linear-axis.ts

@@ -1,4 +1,4 @@
-import type { IAxisCommonTheme } from '@visactor/vchart-types';
+import type { IAxisCommonTheme } from '@visactor/vchart';
 
 export const axisLinear: IAxisCommonTheme = {
   domainLine: {

packages/vchart-theme/src/mobile/common/component/axis/polar-axis.ts

@@ -1,4 +1,4 @@
-import type { IPolarAxisCommonTheme } from '@visactor/vchart-types';
+import type { IPolarAxisCommonTheme } from '@visactor/vchart';
 
 export const axisRadius: IPolarAxisCommonTheme = {
   grid: {

packages/vchart-theme/src/mobile/common/component/crosshair.ts

@@ -1,9 +1,5 @@
-import type { ICrosshairTheme } from '@visactor/vchart-types';
-import type {
-  ICrosshairCategoryFieldSpec,
-  ICrosshairLabelSpec,
-  ICrosshairValueFieldSpec
-} from '@visactor/vchart-types/types/component/crosshair';
+import type { ICrosshairTheme } from '@visactor/vchart';
+import type { ICrosshairLabelSpec } from '@visactor/vchart-types/types/component/crosshair';
 
 const getLabelSpec = (): ICrosshairLabelSpec => ({
   visible: false,
@@ -17,14 +13,14 @@ const getLabelSpec = (): ICrosshairLabelSpec => ({
   }
 });
 
-const getBandField = (): ICrosshairCategoryFieldSpec => ({
+const getBandField = (): ICrosshairTheme['bandField'] => ({
   visible: false,
-  label: getLabelSpec()
+  label: getLabelSpec() as any
 });
 
-const getLinearField = (): ICrosshairValueFieldSpec => ({
+const getLinearField = (): ICrosshairTheme['linearField'] => ({
   visible: false,
-  label: getLabelSpec()
+  label: getLabelSpec() as any
 });
 
 export const crosshair: ICrosshairTheme = {

packages/vchart-theme/src/mobile/common/component/data-zoom.ts

@@ -1,4 +1,4 @@
-import type { IDataZoomTheme } from '@visactor/vchart-types';
+import type { IDataZoomTheme } from '@visactor/vchart';
 
 export const dataZoom: IDataZoomTheme = {
   padding: [12, 0],

packages/vchart-theme/src/mobile/common/component/index.ts

@@ -1,4 +1,4 @@
-import type { IComponentTheme } from '@visactor/vchart-types';
+import type { IComponentTheme } from '@visactor/vchart';
 import { axisBand } from './axis/band-axis';
 import { axisX, axisY, axisZ } from './axis/cartesian-axis';
 import { commonAxis } from './axis/common-axis';

packages/vchart-theme/src/mobile/common/component/indicator.ts

@@ -1,4 +1,4 @@
-import type { IIndicatorTheme } from '@visactor/vchart-types';
+import type { IIndicatorTheme } from '@visactor/vchart';
 
 export const indicator: IIndicatorTheme = {
   title: {

packages/vchart-theme/src/mobile/common/component/legend/color-legend.ts

@@ -1,4 +1,4 @@
-import type { IColorLegendTheme } from '@visactor/vchart-types';
+import type { IColorLegendTheme } from '@visactor/vchart';
 import { DEFAULT_CONTINUOUS_LEGEND_THEME } from './continuous';
 
 export const colorLegend: IColorLegendTheme = {

packages/vchart-theme/src/mobile/common/component/legend/continuous.ts

@@ -1,4 +1,4 @@
-import type { IContinuousLegendTheme } from '@visactor/vchart-types';
+import type { IContinuousLegendTheme } from '@visactor/vchart';
 
 export const DEFAULT_CONTINUOUS_LEGEND_THEME: IContinuousLegendTheme = {
   orient: 'right',

packages/vchart-theme/src/mobile/common/component/legend/discrete-legend.ts

@@ -1,4 +1,4 @@
-import type { IDiscreteLegendTheme } from '@visactor/vchart-types';
+import type { IDiscreteLegendTheme } from '@visactor/vchart';
 
 export const discreteLegend: IDiscreteLegendTheme = {
   orient: 'top',

packages/vchart-theme/src/mobile/common/component/legend/size-legend.ts

@@ -1,4 +1,4 @@
-import type { ISizeLegendTheme } from '@visactor/vchart-types';
+import type { ISizeLegendTheme } from '@visactor/vchart';
 import { DEFAULT_CONTINUOUS_LEGEND_THEME } from './continuous';
 
 export const sizeLegend: ISizeLegendTheme = {

packages/vchart-theme/src/mobile/common/component/map-label.ts

@@ -1,4 +1,4 @@
-import type { IMapLabelTheme } from '@visactor/vchart-types';
+import type { IMapLabelTheme } from '@visactor/vchart';
 
 export const mapLabel: IMapLabelTheme = {
   visible: true,

packages/vchart-theme/src/mobile/common/component/mark-area.ts

@@ -1,4 +1,4 @@
-import type { IMarkAreaTheme } from '@visactor/vchart-types';
+import type { IMarkAreaTheme } from '@visactor/vchart';
 
 export const markArea: IMarkAreaTheme = {
   label: {

packages/vchart-theme/src/mobile/common/component/mark-line.ts

@@ -1,4 +1,4 @@
-import type { IMarkLineTheme } from '@visactor/vchart-types';
+import type { IMarkLineTheme } from '@visactor/vchart';
 
 export const markLine: IMarkLineTheme = {
   startSymbol: {

packages/vchart-theme/src/mobile/common/component/mark-point.ts

@@ -1,4 +1,4 @@
-import type { IMarkPointTheme } from '@visactor/vchart-types';
+import type { IMarkPointTheme } from '@visactor/vchart';
 
 export const markPoint: IMarkPointTheme = {
   itemLine: {

packages/vchart-theme/src/mobile/common/component/player.ts

@@ -1,4 +1,4 @@
-import type { IPlayerTheme } from '@visactor/vchart-types';
+import type { IPlayerTheme } from '@visactor/vchart';
 
 export const player: IPlayerTheme = {
   visible: true,

packages/vchart-theme/src/mobile/common/component/poptip.ts

@@ -1,4 +1,4 @@
-import type { IPoptipTheme } from '@visactor/vchart-types';
+import type { IPoptipTheme } from '@visactor/vchart';
 
 export const poptip: IPoptipTheme = {
   visible: true,

packages/vchart-theme/src/mobile/common/component/title.ts

@@ -1,4 +1,4 @@
-import type { ITitleTheme } from '@visactor/vchart-types';
+import type { ITitleTheme } from '@visactor/vchart';
 
 export const title: ITitleTheme = {
   padding: {

packages/vchart-theme/src/mobile/common/component/tooltip.ts

@@ -1,4 +1,4 @@
-import type { ITooltipTheme } from '@visactor/vchart-types';
+import type { ITooltipTheme } from '@visactor/vchart';
 
 export const tooltip: ITooltipTheme = {
   offset: {

packages/vchart-theme/src/mobile/common/component/total-label.ts

@@ -1,4 +1,4 @@
-import type { ITotalLabelTheme } from '@visactor/vchart-types';
+import type { ITotalLabelTheme } from '@visactor/vchart';
 
 export const totalLabel: ITotalLabelTheme = {
   visible: false,

packages/vchart-theme/src/mobile/common/mark.ts

@@ -1,4 +1,4 @@
-import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '@visactor/vchart-types';
+import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '@visactor/vchart';
 
 export const markByType: IGlobalMarkThemeByType = {
   text: {

packages/vchart-theme/src/theme-map.ts

@@ -8,7 +8,7 @@ export const allThemeMap = new Map([
   // 移动端主题
   [mobileLightTheme.name, mobileLightTheme],
   [mobileDarkTheme.name, mobileDarkTheme],
-  // 传统主题
+  // // 传统主题
   [legacyLightTheme.name, legacyLightTheme],
   [legacyDarkTheme.name, legacyDarkTheme],
   // 大屏主题

packages/vchart-theme/src/v-screen/common/color-scheme.ts

@@ -1,4 +1,4 @@
-import type { IThemeColorScheme } from '@visactor/vchart-types';
+import type { IThemeColorScheme } from '@visactor/vchart';
 import { palette } from './palette';
 
 export const getColorScheme = (dataScheme: string[]): IThemeColorScheme => ({

packages/vchart-theme/src/v-screen/common/component/axis.ts

@@ -1,4 +1,4 @@
-import type { IComponentTheme } from '@visactor/vchart-types';
+import type { IComponentTheme } from '@visactor/vchart';
 
 export const axis: Pick<
   IComponentTheme,

packages/vchart-theme/src/v-screen/common/component/crosshair.ts

@@ -1,4 +1,4 @@
-import type { ICrosshairTheme } from '@visactor/vchart-types';
+import type { ICrosshairTheme } from '@visactor/vchart';
 
 export const crosshair: ICrosshairTheme = {
   bandField: {

packages/vchart-theme/src/v-screen/common/component/tooltip.ts

@@ -1,4 +1,4 @@
-import type { ITooltipTheme } from '@visactor/vchart-types';
+import type { ITooltipTheme } from '@visactor/vchart';
 
 export const tooltip: ITooltipTheme = {
   panel: {

packages/vchart-theme/src/v-screen/common/mark.ts

@@ -1,3 +1,3 @@
-import type { IGlobalMarkThemeByName } from '@visactor/vchart-types';
+import type { IGlobalMarkThemeByName } from '@visactor/vchart';
 
 export const markByName: IGlobalMarkThemeByName = {};

packages/vchart-theme/src/v-screen/common/palette.ts

@@ -1,4 +1,4 @@
-import type { BuiltinColorPalette } from '@visactor/vchart-types';
+import type { BuiltinColorPalette } from '@visactor/vchart';
 
 export const palette: Partial<BuiltinColorPalette> = {
   /** 背景色 */

packages/vchart-theme/src/v-screen/common/series/area.ts

@@ -1,4 +1,4 @@
-import type { ISeriesTheme, SeriesTypeEnum, SeriesTypeForThemeEnum } from '@visactor/vchart-types';
+import type { ISeriesTheme, SeriesTypeEnum, SeriesTypeForThemeEnum } from '@visactor/vchart';
 
 export const area: Pick<
   ISeriesTheme,

packages/vchart-theme/src/v-screen/common/series/bar.ts

@@ -1,4 +1,4 @@
-import type { ISeriesTheme, SeriesTypeEnum, SeriesTypeForThemeEnum } from '@visactor/vchart-types';
+import type { ISeriesTheme, SeriesTypeEnum, SeriesTypeForThemeEnum } from '@visactor/vchart';
 
 export const bar: Pick<
   ISeriesTheme,