fix: type error & gauge theme

VisActor · May 30, 2024 · 4e9dd92 · 4e9dd92
1 parent d886718
commit 4e9dd92
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 21 deletions.
diff --git a/packages/vchart-theme/src/chart-hub/common/component/axis.ts b/packages/vchart-theme/src/chart-hub/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,

diff --git a/packages/vchart-theme/src/chart-hub/common/component/indicator.ts b/packages/vchart-theme/src/chart-hub/common/component/indicator.ts
@@ -13,7 +13,6 @@ export const indicator: IIndicatorTheme = {
     visible: true,
     style: {
       fill: '#85878A',
-      // fill: { type: 'palette', key: 'blackColors65' },
       fontWeight: 400,
       fontSize: 12
     }

diff --git a/packages/vchart-theme/src/chart-hub/common/component/mark-point.ts b/packages/vchart-theme/src/chart-hub/common/component/mark-point.ts
@@ -2,7 +2,8 @@ import type { IMarkPointTheme } from '@visactor/vchart';
 
 export const markPoint: IMarkPointTheme = {
   itemContent: {
-    autoRotate: false,
+    // @ts-ignore
+    autoRotate: false, // FIXME: type error
     offsetY: -16,
     text: {
       style: {

diff --git a/packages/vchart-theme/src/chart-hub/common/series/bar.ts b/packages/vchart-theme/src/chart-hub/common/series/bar.ts
@@ -2,7 +2,8 @@ import type { ISeriesTheme, SeriesTypeEnum, SeriesTypeForThemeEnum } from '@visa
 
 const bar: ISeriesTheme['bar'] = {
   barWidth: 8,
-  barGapInGroup: 4,
+  // @ts-ignore
+  barGapInGroup: 4, // FIXME: typeError
   label: {
     style: {
       fill: { type: 'palette', key: 'secondaryFontColor' }
@@ -11,15 +12,17 @@ const bar: ISeriesTheme['bar'] = {
 };
 
 const bar_horizontal: ISeriesTheme['bar'] = {
-  stackCornerRadius: [0, 1, 1, 0],
+  // @ts-ignore
+  stackCornerRadius: [0, 1, 1, 0], // FIXME: typeError
   label: {
     position: 'right',
     offset: 4
   }
 };
 
 const bar_vertical: ISeriesTheme['bar'] = {
-  stackCornerRadius: [1, 1, 0, 0],
+  // @ts-ignore
+  stackCornerRadius: [1, 1, 0, 0], // FIXME: typeError
   label: {
     position: 'top',
     offset: 4

diff --git a/packages/vchart-theme/src/chart-hub/common/series/gauge.ts b/packages/vchart-theme/src/chart-hub/common/series/gauge.ts
@@ -1,16 +1,22 @@
 import type { ISeriesTheme } from '@visactor/vchart';
 
 export const gauge: ISeriesTheme = {
-  gauge: {
-    // FIXME: 不生效
-    outerRadius: 0.8,
-    innerRadius: 0.6,
-    // FIXME: 不生效
-    segment: {
+  circularProgress: {
+    // FIXME: not work
+    // radius: 1,
+    // innerRadius: 0.1,
+    progress: {
       style: {
-        fill: 'red',
-        fillOpacity: 1,
-        cornerRadius: 100
+        cornerRadius: 100,
+        fill: { type: 'palette', key: 'bandColor' }
+      }
+    },
+    track: {
+      interactive: false,
+      style: {
+        cornerRadius: 100,
+        fill: '#DCDEE1',
+        fillOpacity: 1
       }
     }
   },

diff --git a/packages/vchart-theme/src/chart-hub/index.ts b/packages/vchart-theme/src/chart-hub/index.ts
@@ -54,6 +54,5 @@ export const chartHubLightTheme: ITheme = {
     treemap,
     heatmap
   },
-  // mark: markByType,
   markByName
 };
diff --git a/packages/vchart-theme/src/legacy/index.ts b/packages/vchart-theme/src/legacy/index.ts
@@ -1,6 +1,6 @@
 import { colorLegend } from './legend/color-legend';
 import { sizeLegend } from './legend/size-legend';
-import type { ITheme } from '@visactor/vchart-types';
+import type { ITheme } from '@visactor/vchart';
 
 export const legacyLightTheme: ITheme = {
   name: 'legacyLight',

diff --git a/packages/vchart-theme/src/mobile/dark/index.ts b/packages/vchart-theme/src/mobile/dark/index.ts
@@ -1,4 +1,4 @@
-import type { ITheme } from '@visactor/vchart-types';
+import type { ITheme } from '@visactor/vchart';
 import { component } from '../common/component';
 import { markByName, markByType } from '../common/mark';
 import { token } from '../common/constants';

diff --git a/packages/vchart-theme/src/mobile/light/index.ts b/packages/vchart-theme/src/mobile/light/index.ts
@@ -1,4 +1,4 @@
-import type { ITheme } from '@visactor/vchart-types';
+import type { ITheme } from '@visactor/vchart';
 import { component } from '../common/component';
 import { markByName, markByType } from '../common/mark';
 import { token } from '../common/constants';

diff --git a/packages/vchart-theme/src/theme-map.ts b/packages/vchart-theme/src/theme-map.ts
@@ -1,4 +1,4 @@
-import type { ITheme } from '@visactor/vchart-types';
+import type { ITheme } from '@visactor/vchart';
 import { vScreenThemeList } from './v-screen';
 import { legacyDarkTheme, legacyLightTheme } from './legacy';
 import { mobileDarkTheme, mobileLightTheme } from './mobile';

diff --git a/packages/vchart-theme/src/v-screen/common/index.ts b/packages/vchart-theme/src/v-screen/common/index.ts
@@ -1,4 +1,4 @@
-import type { ITheme } from '@visactor/vchart-types';
+import type { ITheme } from '@visactor/vchart';
 import { markByName } from './mark';
 import { axis } from './component/axis';
 import { crosshair } from './component/crosshair';
@@ -13,6 +13,7 @@ export const getVScreenCommonTheme = (name: string, description: string, dataSch
   type: 'dark',
   colorScheme: getColorScheme(dataScheme),
   markByName,
+  // @ts-ignore
   series: {
     ...bar,
     ...area