diff --git a/package.json b/package.json index 10e51b68..6ec28112 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bizcharts", - "version": "4.1.12", + "version": "4.1.13", "description": "bizcharts", "keywords": [ "bizcharts", diff --git a/src/core.ts b/src/core.ts index 67bf6a7a..17ac8fd5 100644 --- a/src/core.ts +++ b/src/core.ts @@ -4,7 +4,7 @@ import * as SVGEngine from '@antv/g-svg/lib'; import { registerEngine } from '@antv/g2/lib/core'; // 导出自定义比例尺的能力 export { registerScale, getScale, registerTickMethod } from '@antv/scale'; -export { setGlobal, GLOBAL } from '@antv/g2Plot/lib/core/global'; +export { setGlobal, GLOBAL } from '@antv/g2plot/lib/core/global'; import './extend/scale/scale'; // 动画 @@ -17,7 +17,7 @@ registerEngine('svg', SVGEngine); // @ts-ignore export * from '@antv/g2/lib/core'; -export const VERSION = '4.1.12'; +export const VERSION = '4.1.13'; diff --git a/src/createPlot.tsx b/src/createPlot.tsx index d642767a..4850742b 100644 --- a/src/createPlot.tsx +++ b/src/createPlot.tsx @@ -24,9 +24,9 @@ import { debounce, isArray, isFunction, isNil } from '@antv/util'; import warn from 'warning'; // 国际化处理 -import { registerLocale } from '@antv/g2Plot/lib/core/locale'; -import { EN_US_LOCALE } from '@antv/g2Plot/lib/locales/en_US'; -import { ZH_CN_LOCALE } from '@antv/g2Plot/lib/locales/zh_CN'; +import { registerLocale } from '@antv/g2plot/lib/core/locale'; +import { EN_US_LOCALE } from '@antv/g2plot/lib/locales/en_US'; +import { ZH_CN_LOCALE } from '@antv/g2plot/lib/locales/zh_CN'; /** default locale register */ registerLocale('en-US', EN_US_LOCALE); registerLocale('zh-CN', ZH_CN_LOCALE); diff --git a/src/theme/index.tsx b/src/theme/index.tsx index 33719d02..01f288e2 100644 --- a/src/theme/index.tsx +++ b/src/theme/index.tsx @@ -6,14 +6,6 @@ import { registerTheme } from '@antv/g2/lib/theme'; export { createThemeByStyleSheet, antvLight, antvDark }; -// fixme: 临时解Roboto 字体问题,根本解决需要同antv 设计师讨论 -antvDark.fontFamily = `"-apple-system", "Segoe UI", "Helvetica Neue", Arial, -"Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", -"Noto Color Emoji", Roboto`; -antvLight.fontFamily = `"-apple-system", "Segoe UI", "Helvetica Neue", Arial, -"Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", -"Noto Color Emoji", Roboto`; - registerTheme('dark', createThemeByStyleSheet(antvDark)); registerTheme('default', createThemeByStyleSheet(antvLight)); registerTheme('light', createThemeByStyleSheet(antvLight));