fix: i18n configuration does not work

fix #126

packages/components/controls/compass/index.ts

@@ -5,9 +5,8 @@ import { $, getVcParentInstance } from '@vue-cesium/utils/private/vm'
 import { defaultProps, defaultOptions } from './defaultProps'
 import { hMergeSlot } from '@vue-cesium/utils/private/render'
 import { VcBtn, VcIcon, VcTooltip } from '@vue-cesium/components/ui'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import useCompass from './use-compass'
-import { t } from '@vue-cesium/locale'
 
 export default defineComponent({
   name: 'VcCompass',
@@ -21,6 +20,7 @@ export default defineComponent({
     if (commonState === void 0) {
       return
     }
+    const { t } = useLocaleInject()
     const parentInstance = getVcParentInstance(instance)
     const { $services } = commonState
     const compassState = useCompass(props, ctx, instance)

packages/components/controls/my-location/defaultProps.ts

@@ -1,5 +1,5 @@
 import { positionProps } from '@vue-cesium/composables/private/use-position'
-import { t } from '@vue-cesium/locale'
+import { t } from '@vue-cesium/composables/use-locale'
 import { PropType } from 'vue'
 
 export default {

packages/components/controls/my-location/index.ts

@@ -17,9 +17,8 @@ import usePosition from '@vue-cesium/composables/private/use-position'
 import { gcj02towgs84 } from '@vue-cesium/utils/coordtransform'
 import { makeColor, makeCartesian3 } from '@vue-cesium/utils/cesium-helpers'
 import { isArray, isFunction, isPlainObject } from '@vue-cesium/utils/util'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import defaultProps from './defaultProps'
-import { t } from '@vue-cesium/locale'
 
 export default defineComponent({
   name: 'VcMyLocation',
@@ -35,6 +34,7 @@ export default defineComponent({
       return
     }
     const { $services } = commonState
+    const { t } = useLocaleInject()
     const rootRef = ref<HTMLElement | null>(null)
     const tooltipRef = ref<typeof VcTooltip | null>(null)
     const btnRef = ref<typeof VcBtn | null>(null)

packages/components/controls/navigation-sm/compass-sm.ts

@@ -4,9 +4,8 @@ import { VcComponentInternalInstance } from '@vue-cesium/utils/types'
 import { $, getVcParentInstance } from '@vue-cesium/utils/private/vm'
 import { hMergeSlot } from '@vue-cesium/utils/private/render'
 import { VcTooltip } from '@vue-cesium/components/ui'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import useCompass from './use-compass'
-import { t } from '@vue-cesium/locale'
 
 export default defineComponent({
   name: 'VcCompassSm',
@@ -43,6 +42,7 @@ export default defineComponent({
     if (commonState === void 0) {
       return
     }
+    const { t } = useLocaleInject()
     const parentInstance = getVcParentInstance(instance)
     const { $services } = commonState
     const compassState = useCompass(props, ctx, instance)

packages/components/controls/navigation-sm/zoom-control-sm.ts

@@ -3,9 +3,8 @@ import { VcComponentInternalInstance } from '@vue-cesium/utils/types'
 import usePosition, { positionProps } from '@vue-cesium/composables/private/use-position'
 import { $, getVcParentInstance } from '@vue-cesium/utils/private/vm'
 import { hMergeSlot } from '@vue-cesium/utils/private/render'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import useZoomControl from './use-zoom-control'
-import { t } from '@vue-cesium/locale'
 import { VcTooltip } from '@vue-cesium/components/ui'
 import { isObject } from '@vue-cesium/utils/util'
 
@@ -48,7 +47,7 @@ export default defineComponent({
     if (commonState === void 0) {
       return
     }
-
+    const { t } = useLocaleInject()
     const { $services } = commonState
     const positionState = usePosition(props, $services)
     const zoomControlState = useZoomControl(props, ctx, instance, $services)

packages/components/controls/print/createPrintView.ts

@@ -1,6 +1,14 @@
+/*
+ * @Author: zouyaoji@https://github.com/zouyaoji
+ * @Date: 2021-10-27 15:54:13
+ * @LastEditTime: 2021-11-06 16:07:17
+ * @LastEditors: zouyaoji
+ * @Description:
+ * @FilePath: \vue-cesium@next\packages\components\controls\print\createPrintView.ts
+ */
 import { createApp } from 'vue'
 import VcPrintView from './print-view'
-import { t } from '@vue-cesium/locale'
+import { t } from '@vue-cesium/composables/use-locale'
 
 const styles = `
   .background {

packages/components/controls/print/index.ts

@@ -4,11 +4,10 @@ import { $, getVcParentInstance, getInstanceListener } from '@vue-cesium/utils/p
 import usePosition from '@vue-cesium/composables/private/use-position'
 import { captureScreenshot } from '@vue-cesium/utils/cesium-helpers'
 import { VcBtn, VcTooltip, VcIcon } from '@vue-cesium/components/ui'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import createPrintView from './createPrintView'
 import defaultProps from './defaultProps'
 import printWindow from './printWindow'
-import { t } from '@vue-cesium/locale'
 import { isPlainObject } from '@vue-cesium/utils/util'
 
 export default defineComponent({
@@ -24,6 +23,7 @@ export default defineComponent({
     if (commonState === void 0) {
       return
     }
+    const { t } = useLocaleInject()
     const { $services } = commonState
     const rootRef = ref<HTMLElement | null>(null)
     const tooltipRef = ref<typeof VcTooltip | null>(null)

packages/components/controls/print/print-view.ts

@@ -1,6 +1,6 @@
 import { defineComponent, getCurrentInstance, onMounted, onUnmounted, ref, h, createCommentVNode, VNode } from 'vue'
 import { AnyFunction, VcComponentInternalInstance } from '@vue-cesium/utils/types'
-import { t } from '@vue-cesium/locale'
+import { useLocaleInject } from '@vue-cesium/composables'
 
 const VcPrintView = defineComponent({
   name: 'VcPrintView',
@@ -13,6 +13,7 @@ const VcPrintView = defineComponent({
     const printingStarted = ref(false)
     const instance = getCurrentInstance() as VcComponentInternalInstance
     instance.cesiumClass = 'VcPrintView'
+    const { t } = useLocaleInject()
     // methods
     const checkForImagesReady = () => {
       if (ready.value) {

packages/components/controls/status-bar/index.ts

@@ -16,10 +16,9 @@ import usePosition from '@vue-cesium/composables/private/use-position'
 import { VcComponentInternalInstance } from '@vue-cesium/utils/types'
 import MouseCoords, { extendForMouseCoords } from './MouseCoords'
 import throttle from '@vue-cesium/utils/private/throttle'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import { VcBtn, VcTooltip } from '@vue-cesium/components/ui'
 import defaultProps from './defaultProps'
-import { t } from '@vue-cesium/locale'
 import { isPlainObject } from '@vue-cesium/utils/util'
 
 export default defineComponent({
@@ -39,6 +38,7 @@ export default defineComponent({
     const { $services } = commonState
     const rootRef = ref<typeof VcBtn | null>(null)
     const tooltipRef = ref<typeof VcTooltip | null>(null)
+    const { t } = useLocaleInject()
 
     let lastMouseX = -1
     let lastMouseY = -1

packages/components/controls/vc-overview-map/index.ts

@@ -1,4 +1,4 @@
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import usePosition from '@vue-cesium/composables/private/use-position'
 import { VcBtn, VcTooltip } from '@vue-cesium/components/ui'
 import { $ } from '@vue-cesium/utils/private/vm'
@@ -19,7 +19,6 @@ import {
 } from 'vue'
 import VcViewer from '@vue-cesium/components/viewer'
 import { hSlot } from '@vue-cesium/utils/private/render'
-import { t } from '@vue-cesium/locale'
 
 export default defineComponent({
   name: 'VcOverviewMap',
@@ -65,6 +64,7 @@ export default defineComponent({
     if (commonState === void 0) {
       return
     }
+    const { t } = useLocaleInject()
     const { $services } = commonState
     const rootRef = ref<HTMLElement | null>(null)
     const rootStyle = reactive<CSSProperties>({})

packages/components/controls/zoom-control/index.ts

@@ -6,9 +6,8 @@ import { setViewerCamera } from '@vue-cesium/utils/cesium-helpers'
 import { hMergeSlot } from '@vue-cesium/utils/private/render'
 import { defaultProps, defaultOptions } from './defaultProps'
 import { VcBtn, VcIcon, VcTooltip } from '@vue-cesium/components/ui'
-import { useCommon } from '@vue-cesium/composables'
+import { useCommon, useLocaleInject } from '@vue-cesium/composables'
 import useZoomControl from './use-zoom-control'
-import { t } from '@vue-cesium/locale'
 import { kebabCase } from '@vue-cesium/utils/util'
 
 export default defineComponent({
@@ -24,6 +23,7 @@ export default defineComponent({
     if (commonState === undefined) {
       return
     }
+    const { t } = useLocaleInject()
     const { $services } = commonState
     const zoomControlState = useZoomControl(props, ctx, instance, $services)
     const positionState = usePosition(props, $services)

packages/components/drawings/src/index.ts

@@ -13,7 +13,6 @@ import {
 import { camelize } from '@vue-cesium/utils/util'
 import { VcFabAction } from '@vue-cesium/components/ui'
 import { VcComponentInternalInstance } from '@vue-cesium/utils/types'
-import { t } from '@vue-cesium/locale'
 import VcDrawingPin from './pin'
 import VcDrawingPoint from './point'
 import VcDrawingPolyline from './polyline'
@@ -34,6 +33,7 @@ import {
 import { DrawingActionCmpOpts, DrawingActionCmpRef, DrawingActionOpts, VcDrawingActionInstance } from '@vue-cesium/utils/drawing-types'
 import useDrawingFab from '@vue-cesium/composables/use-drawing/use-drawing-fab'
 import { defaultsDeep } from 'lodash'
+import { useLocaleInject } from '@vue-cesium/composables'
 
 export default defineComponent({
   name: 'VcDrawings',
@@ -43,6 +43,7 @@ export default defineComponent({
     // state
     const instance = getCurrentInstance() as VcComponentInternalInstance
     instance.cesiumClass = 'VcDrawings'
+    const { t } = useLocaleInject()
 
     const options: any = {}
     // computed

packages/components/index.ts

@@ -1,3 +1,12 @@
+/*
+ * @Author: zouyaoji@https://github.com/zouyaoji
+ * @Date: 2021-10-27 15:54:11
+ * @LastEditTime: 2021-11-06 15:43:34
+ * @LastEditors: zouyaoji
+ * @Description:
+ * @FilePath: \vue-cesium@next\packages\components\index.ts
+ */
+export * from './config-provider'
 export * from './controls'
 export * from './datasources'
 export * from './drawings'

packages/components/measurements/src/index.ts

@@ -37,7 +37,7 @@ import VcMeasurementRectangle from './rectangle'
 import VcMeasurementRegular from './regular'
 import { MeasurementActionCmpOpts, MeasurementActionCmpRef, MeasurementActionOpts, VcDrawingActionInstance } from '@vue-cesium/utils/drawing-types'
 import { VcComponentInternalInstance } from '@vue-cesium/utils/types'
-import { t } from '@vue-cesium/locale'
+import { useLocaleInject } from '@vue-cesium/composables'
 import useDrawingFab from '@vue-cesium/composables/use-drawing/use-drawing-fab'
 import { circleDrawingActionDefault, clearActionDefault, regularDrawingActionDefault } from '@vue-cesium/composables/use-drawing/defaultOpts'
 import { defaultsDeep } from 'lodash'
@@ -50,6 +50,7 @@ export default defineComponent({
     // state
     const instance = getCurrentInstance() as VcComponentInternalInstance
     instance.cesiumClass = 'VcMeasurements'
+    const { t } = useLocaleInject()
 
     const clearActionOpts = reactive<typeof clearActionDefault>(defaultsDeep({}, props.clearActionOpts, defaultOptions.clearActionOpts))
     const mainFabOpts = reactive<typeof mainFabDefault>(defaultsDeep({}, props.mainFabOpts, defaultOptions.mainFabOpts))

packages/components/viewer/src/useViewer.ts

@@ -1,6 +1,6 @@
 import { ExtractPropTypes, watch, ref, onMounted, onUnmounted, nextTick, reactive } from 'vue'
 import mitt, { Emitter } from 'mitt'
-import { t } from '@vue-cesium/locale'
+import { useLocaleInject } from '@vue-cesium/composables'
 import defaultProps from './defaultProps'
 import { mergeDescriptors } from '@vue-cesium/utils/merge-descriptors'
 import { dirname, removeEmpty, isEmptyObj } from '@vue-cesium/utils/util'
@@ -47,6 +47,8 @@ export default function (props: ExtractPropTypes<typeof defaultProps>, ctx, vcIn
 
   logger.debug('viewer creating')
 
+  const { t } = useLocaleInject()
+
   // watch
   watch(
     () => props.selectionIndicator,

packages/composables/use-common/index.ts

@@ -7,7 +7,7 @@ import { ReadyObj, VcComponentInternalInstance, VcComponentPublicInstance, VcMit
 import * as cesiumProps from '@vue-cesium/utils/cesium-props'
 import { vcKey } from '@vue-cesium/utils/config'
 import useLog from '../private/use-log'
-import { t } from '@vue-cesium/locale'
+import { useLocaleInject } from '../use-locale'
 import useEvents from '../use-events'
 
 export default function (props, { emit }, vcInstance: VcComponentInternalInstance) {
@@ -20,11 +20,13 @@ export default function (props, { emit }, vcInstance: VcComponentInternalInstanc
   const vcMitt: Emitter<VcMittEvents> = mitt()
   vcInstance.vcMitt = vcMitt
   const $services = inject<VcViewerProvider>(vcKey)
+  const { t } = useLocaleInject()
 
   if ($services === void 0) {
     console.error(`${vcInstance.cesiumClass} ${t('vc.loadError')}`)
     return
   }
+
   const parentVcInstance = getVcParentInstance(vcInstance)
   const eventsState = useEvents(props, vcInstance, logger)
   vcInstance.children = []

packages/composables/use-drawing/use-drawing-action.ts

@@ -1,22 +1,23 @@
 /*
  * @Author: zouyaoji@https://github.com/zouyaoji
  * @Date: 2021-10-15 09:47:36
- * @LastEditTime: 2021-10-26 14:25:22
+ * @LastEditTime: 2021-11-06 16:16:03
  * @LastEditors: zouyaoji
  * @Description:
  * @FilePath: \vue-cesium@next\packages\composables\use-drawing\use-drawing-action.ts
  */
 // import { enableMouseEvent } from '@vue-cesium/utils/cesium-props'
 import { DrawTipOpts, VcComponentInternalInstance, VcComponentPublicInstance, VcViewerProvider } from '@vue-cesium/utils/types'
-import { Ref, ref, toRef } from 'vue'
-import { t } from '@vue-cesium/locale'
+import { ref } from 'vue'
+import { useLocaleInject } from '../use-locale'
 import { DrawStatus } from '@vue-cesium/shared'
 import useTimeout from '@vue-cesium/composables/private/use-timeout'
 import { kebabCase } from '@vue-cesium/utils/util'
 
 export default function (props, ctx, instance: VcComponentInternalInstance, cmpName: string, $services: VcViewerProvider) {
   instance.cesiumClass = cmpName
   instance.cesiumEvents = []
+  const { t } = useLocaleInject()
   const { emit } = ctx
   const tips = kebabCase(cmpName).split('-')
   if (cmpName === 'VcMeasurementDistance' && props.showComponentLines) {

packages/composables/use-drawing/use-drawing-fab.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zouyaoji@https://github.com/zouyaoji
  * @Date: 2021-10-13 09:45:59
- * @LastEditTime: 2021-10-27 15:08:16
+ * @LastEditTime: 2021-11-06 16:16:29
  * @LastEditors: zouyaoji
  * @Description:
  * @FilePath: \vue-cesium@next\packages\composables\use-drawing\use-drawing-fab.ts
@@ -11,13 +11,13 @@ import { useCommon, useHandler } from '@vue-cesium/composables'
 import { VisibilityState } from '@vue-cesium/shared'
 import { VcDrawingActionInstance } from '@vue-cesium/utils/drawing-types'
 import { VcComponentInternalInstance } from '@vue-cesium/utils/types'
-import { CSSProperties, nextTick, provide, reactive, ref, VNode, h, PropType, createCommentVNode } from 'vue'
+import { CSSProperties, nextTick, provide, reactive, ref, VNode, h, createCommentVNode } from 'vue'
 import usePosition from '../private/use-position'
 import { $ } from '@vue-cesium/utils/private/vm'
 import { isString } from '@vue-cesium/utils/util'
 import { mergeDescriptors } from '@vue-cesium/utils/merge-descriptors'
 import { vcKey } from '@vue-cesium/utils/config'
-import { t } from '@vue-cesium/locale'
+import { useLocaleInject } from '../use-locale'
 import { clearActionDefault } from './defaultOpts'
 import { mainFabDefault } from '@vue-cesium/components/drawings/src/defaultProps'
 
@@ -42,6 +42,7 @@ export default function (
     return
   }
 
+  const { t } = useLocaleInject()
   const { $services } = commonState
   const { emit } = ctx
 

packages/composables/use-drawing/use-drawing-point.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zouyaoji@https://github.com/zouyaoji
  * @Date: 2021-10-19 11:34:26
- * @LastEditTime: 2021-11-04 10:42:15
+ * @LastEditTime: 2021-11-06 16:17:12
  * @LastEditors: zouyaoji
  * @Description:
  * @FilePath: \vue-cesium@next\packages\composables\use-drawing\use-drawing-point.ts
@@ -16,7 +16,7 @@ import {
   VcOverlayHtml,
   VcTooltip
 } from '@vue-cesium/components'
-import { t } from '@vue-cesium/locale'
+import { useLocaleInject } from '../use-locale'
 import { MeasureUnits } from '@vue-cesium/shared'
 import { makeCartesian3 } from '@vue-cesium/utils/cesium-helpers'
 import { PointDrawing } from '@vue-cesium/utils/drawing-types'
@@ -33,6 +33,7 @@ export default function (props, ctx, cmpName: string) {
     return
   }
 
+  const { t } = useLocaleInject()
   const { $services } = commonState
   const { emit } = ctx