feat: getLanguage, setLanguage

12f61422 · qiang · 52dade77 · 12f61422 · 12f61422 · 12f61422
23 changed file
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
  },
  "devDependencies": {
    "@babel/preset-env": "^7.14.7",
-    "@dcloudio/types": "^2.5.0",
+    "@dcloudio/types": "^2.5.1",
    "@jest/types": "^27.0.2",
    "@microsoft/api-extractor": "^7.13.2",
    "@rollup/plugin-alias": "^3.1.1",

--- a/packages/shims-uni-app.d.ts
+++ b/packages/shims-uni-app.d.ts
@@ -70,6 +70,7 @@ declare namespace UniApp {
    }
    onReady: (fn: Function) => void
    serviceReady: boolean
+    language: string
  }
  interface UniRoute {

--- a/packages/uni-api/src/index.ts
+++ b/packages/uni-api/src/index.ts
@@ -14,6 +14,7 @@ export * from './service/ui/createSelectorQuery'
 export * from './service/ui/createAnimation'
 export * from './service/ui/tabBar'
 export * from './service/ui/window'
+export * from './service/ui/language'
 export * from './service/keyboard/getSelectedTextRange'

--- a/packages/uni-api/src/service/ui/language.ts
+++ b/packages/uni-api/src/service/ui/language.ts
+import { defineSyncApi } from '../../helpers/api'
+import { useI18n } from '@dcloudio/uni-core'
+import { BuiltInLocale } from '@dcloudio/uni-i18n'
+export const getLanguage = defineSyncApi<typeof uni.getLanguage>(
+  'getLanguage',
+  () => {
+    const i18n = useI18n()
+    return i18n.getLocale()
+  }
+)
+export const setLanguage = defineSyncApi<typeof uni.setLanguage>(
+  'setLanguage',
+  (locale) => {
+    const i18n = useI18n()
+    return i18n.setLocale(locale as BuiltInLocale)
+  }
+)
--- a/packages/uni-app-plus/dist/uni-app-service.es.js
+++ b/packages/uni-app-plus/dist/uni-app-service.es.js
@@ -1432,13 +1432,16 @@ var serviceContext = (function (vue) {
      }
  }
+  const ignoreVueI18n = true;
  function initLocaleWatcher(appVm, i18n) {
-      appVm.$i18n &&
+      if (appVm.$i18n) {
-          appVm.$i18n.vm.$watch('locale', (newLocale) => {
+          const vm = appVm.$i18n.vm ? appVm.$i18n.vm : appVm;
+          vm.$watch(appVm.$i18n.vm ? 'locale' : () => appVm.$i18n.locale, (newLocale) => {
              i18n.setLocale(newLocale);
          }, {
              immediate: true,
          });
+      }
  }
  // function getDefaultLocale() {
  //   if (typeof navigator !== 'undefined') {
@@ -1450,7 +1453,7 @@ var serviceContext = (function (vue) {
  //   }
  //   return uni.getSystemInfoSync().language
  // }
-  function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN) {
+  function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN, watcher) {
      // 兼容旧版本入参
      if (typeof locale !== 'string') {
          [locale, messages] = [messages, locale];
@@ -1462,6 +1465,7 @@ var serviceContext = (function (vue) {
          locale: locale || fallbackLocale,
          fallbackLocale,
          messages,
+          watcher,
      });
      let t = (key, values) => {
          if (typeof getApp !== 'function') {
@@ -1473,7 +1477,7 @@ var serviceContext = (function (vue) {
          }
          else {
              const appVm = getApp().$vm;
-              if (!appVm.$t || !appVm.$i18n) {
+              if (!appVm.$t || !appVm.$i18n || ignoreVueI18n) {
                  // if (!locale) {
                  //   i18n.setLocale(getDefaultLocale())
                  // }
@@ -1522,10 +1526,28 @@ var serviceContext = (function (vue) {
      if (!i18n) {
          let language;
          {
-              // TODO 需替换为新API
+              if (typeof getApp === 'function') {
-              language = plus.os.language;
+                  language = weex.requireModule('plus').getLanguage();
+              }
+              else {
+                  language = plus.webview.currentWebview().getStyle().language;
+              }
+          }
+          const SET_LOCALE_API = 'i18n.setLocale';
+          {
+              i18n = initVueI18n(language, undefined, undefined, typeof getApp === 'function'
+                  ? (locale) => {
+                      const pages = getCurrentPages();
+                      pages.forEach((page) => {
+                          UniServiceJSBridge.publishHandler(SET_LOCALE_API, locale, page.$page.id);
+                      });
+                      weex.requireModule('plus').setLanguage(locale);
+                  }
+                  : undefined);
+          }
+          if (typeof getApp !== 'function') {
+              UniViewJSBridge.subscribe(SET_LOCALE_API, i18n.setLocale);
          }
-          i18n = initVueI18n(language);
      }
      return i18n;
  }
@@ -4076,6 +4098,15 @@ var serviceContext = (function (vue) {
      // window.removeEventListener('resize', onResize)
  });
+  const getLanguage = defineSyncApi('getLanguage', () => {
+      const i18n = useI18n();
+      return i18n.getLocale();
+  });
+  const setLanguage = defineSyncApi('setLanguage', (locale) => {
+      const i18n = useI18n();
+      return i18n.setLocale(locale);
+  });
  const API_GET_SELECTED_TEXT_RANGE = 'getSelectedTextRange';
  const getSelectedTextRange = defineAsyncApi(API_GET_SELECTED_TEXT_RANGE, (_, { resolve, reject }) => {
@@ -10243,6 +10274,7 @@ var serviceContext = (function (vue) {
          // android 需要使用
          webviewStyle.isTab = isTabBar;
      }
+      webviewStyle.language = weex.requireModule('plus').getLanguage();
      if ((process.env.NODE_ENV !== 'production')) {
          console.log(formatLog('updateWebview', webviewStyle));
      }
@@ -12034,6 +12066,8 @@ var serviceContext = (function (vue) {
    canvasPutImageData: canvasPutImageData,
    canvasToTempFilePath: canvasToTempFilePath,
    getSelectedTextRange: getSelectedTextRange,
+    getLanguage: getLanguage,
+    setLanguage: setLanguage,
    $on: $on,
    $off: $off,
    $once: $once,

--- a/packages/uni-app-plus/dist/uni-app-view.umd.js
+++ b/packages/uni-app-plus/dist/uni-app-view.umd.js
--- a/packages/uni-app-plus/src/service/api/index.ts
+++ b/packages/uni-app-plus/src/service/api/index.ts
@@ -96,6 +96,8 @@ export {
  canvasPutImageData,
  canvasToTempFilePath,
  getSelectedTextRange,
+  getLanguage,
+  setLanguage,
  $on,
  $off,
  $once,

--- a/packages/uni-app-plus/src/service/framework/webview/init/style.ts
+++ b/packages/uni-app-plus/src/service/framework/webview/init/style.ts
@@ -17,6 +17,7 @@ export function initWebviewStyle(
    // android 需要使用
    webviewStyle.isTab = isTabBar
  }
+  webviewStyle.language = weex.requireModule('plus').getLanguage()
  if (__DEV__) {
    console.log(formatLog('updateWebview', webviewStyle))
  }

--- a/packages/uni-app-plus/src/service/framework/webview/style/index.ts
+++ b/packages/uni-app-plus/src/service/framework/webview/style/index.ts
@@ -12,6 +12,7 @@ export function parseWebviewStyle(
  uniPageUrl?: InitUniPageUrl
  debugRefresh?: DebugRefresh
  isTab?: boolean
+  language?: string
 } {
  const webviewStyle: PlusWebviewWebviewStyles = {
    bounce: 'vertical',

--- a/packages/uni-cli-shared/src/json/app/manifest/merge.ts
+++ b/packages/uni-cli-shared/src/json/app/manifest/merge.ts
@@ -15,6 +15,7 @@ export function initRecursiveMerge(
        name: userManifestJson.versionName,
        code: userManifestJson.versionCode,
      },
+      language: userManifestJson.language,
    },
    { plus: userManifestJson['app-plus'] }
  )

--- a/packages/uni-core/src/i18n/useI18n.ts
+++ b/packages/uni-core/src/i18n/useI18n.ts
@@ -3,6 +3,10 @@ import { BuiltInLocale, initVueI18n } from '@dcloudio/uni-i18n'
 let i18n: ReturnType<typeof initVueI18n>
+interface webviewStyleWithLanguage extends PlusWebviewWebviewStyles {
+  language: string
+}
 export function useI18n() {
  if (!i18n) {
    let language: BuiltInLocale
@@ -10,15 +14,45 @@ export function useI18n() {
      if (__NODE_JS__) {
        language = getEnvLocale() as BuiltInLocale
      } else {
-        language = navigator.language as BuiltInLocale
+        language = (__uniConfig.language || navigator.language) as BuiltInLocale
      }
    } else if (__PLATFORM__ === 'app') {
-      // TODO 需替换为新API
+      if (typeof getApp === 'function') {
-      language = plus.os.language as BuiltInLocale
+        language = weex.requireModule('plus').getLanguage() as BuiltInLocale
+      } else {
+        language = (
+          plus.webview.currentWebview().getStyle() as webviewStyleWithLanguage
+        ).language as BuiltInLocale
+      }
    } else {
      language = uni.getSystemInfoSync().language as BuiltInLocale
    }
-    i18n = initVueI18n(language)
+    const SET_LOCALE_API = 'i18n.setLocale'
+    if (__PLATFORM__ === 'app') {
+      i18n = initVueI18n(
+        language,
+        undefined,
+        undefined,
+        typeof getApp === 'function'
+          ? (locale) => {
+              const pages = getCurrentPages()
+              pages.forEach((page) => {
+                UniServiceJSBridge.publishHandler(
+                  SET_LOCALE_API,
+                  locale,
+                  page.$page.id
+                )
+              })
+              weex.requireModule('plus').setLanguage(locale)
+            }
+          : undefined
+      )
+    } else {
+      i18n = initVueI18n(language)
+    }
+    if (__PLATFORM__ === 'app' && typeof getApp !== 'function') {
+      UniViewJSBridge.subscribe(SET_LOCALE_API, i18n.setLocale)
+    }
  }
  return i18n
 }
--- a/packages/uni-h5-vite/lib/api.json
+++ b/packages/uni-h5-vite/lib/api.json
@@ -32,6 +32,7 @@
  "downloadFile",
  "getFileInfo",
  "getImageInfo",
+  "getLanguage",
  "getLeftWindowStyle",
  "getLocation",
  "getNetworkType",
@@ -101,6 +102,7 @@
  "scanCode",
  "sendSocketMessage",
  "setKeepScreenOn",
+  "setLanguage",
  "setLeftWindowStyle",
  "setNavigationBarColor",
  "setNavigationBarTitle",

--- a/packages/uni-h5-vite/src/plugins/manifestJson.ts
+++ b/packages/uni-h5-vite/src/plugins/manifestJson.ts
@@ -49,6 +49,9 @@ export function uniManifestJsonPlugin(): Plugin {
            sdkConfigs.maps.qqmap.key) ||
          defaultQQMapKey
+        let language: string | null | undefined = manifest.language
+        language = language && language.toUpperCase() !== 'AUTO' ? language : ''
        const flexDirection =
          (manifest['app'] &&
            manifest['app'].nvue &&
@@ -67,6 +70,7 @@ export function uniManifestJsonPlugin(): Plugin {
  export const async = ${JSON.stringify(async)}
  export const qqMapKey = '${qqMapKey}'
  export const sdkConfigs = ${JSON.stringify(sdkConfigs)}
+  export const language = '${language}'
  `,
          map: { mappings: '' },
        }

--- a/packages/uni-h5-vite/src/plugins/pagesJson.ts
+++ b/packages/uni-h5-vite/src/plugins/pagesJson.ts
@@ -55,7 +55,7 @@ function generatePagesJsonCode(
  return `
 import { defineAsyncComponent, resolveComponent, createVNode, withCtx, openBlock, createBlock } from 'vue'
 import { PageComponent, AsyncLoadingComponent, AsyncErrorComponent, setupWindow } from '@dcloudio/uni-h5'
-import { appid, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, nvue } from '${manifestJsonPath}'
+import { appid, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, nvue, language } from '${manifestJsonPath}'
 ${importLayoutComponentsCode}
 const extend = Object.assign
 ${cssCode}
@@ -255,6 +255,7 @@ delete ${globalName}['____'+appid+'____']
  sdkConfigs,
  qqMapKey,
  nvue,
+  language,
  router
 })
 `

--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -15,7 +15,9 @@ function useI18n() {
        language = uniShared.getEnvLocale();
      }
    }
-    i18n = uniI18n.initVueI18n(language);
+    {
+      i18n = uniI18n.initVueI18n(language);
+    }
  }
  return i18n;
 }

--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
@@ -9,10 +9,12 @@ function useI18n() {
    let language;
    {
      {
-        language = navigator.language;
+        language = __uniConfig.language || navigator.language;
      }
    }
-    i18n = initVueI18n(language);
+    {
+      i18n = initVueI18n(language);
+    }
  }
  return i18n;
 }
@@ -4240,6 +4242,14 @@ const onWindowResize = /* @__PURE__ */ defineOnApi(API_ON_WINDOW_RESIZE, () => {
 });
 const offWindowResize = /* @__PURE__ */ defineOffApi(API_OFF_WINDOW_RESIZE, () => {
 });
+const getLanguage = /* @__PURE__ */ defineSyncApi("getLanguage", () => {
+  const i18n2 = useI18n();
+  return i18n2.getLocale();
+});
+const setLanguage = /* @__PURE__ */ defineSyncApi("setLanguage", (locale) => {
+  const i18n2 = useI18n();
+  return i18n2.setLocale(locale);
+});
 const API_GET_SELECTED_TEXT_RANGE = "getSelectedTextRange";
 const getSelectedTextRange$1 = /* @__PURE__ */ defineAsyncApi(API_GET_SELECTED_TEXT_RANGE, (_, { resolve, reject }) => {
  UniServiceJSBridge.invokeViewMethod("getSelectedTextRange", {}, getCurrentPageId(), (res) => {
@@ -19031,6 +19041,8 @@ var api = {
  canvasPutImageData,
  canvasToTempFilePath,
  getSelectedTextRange: getSelectedTextRange$1,
+  getLanguage,
+  setLanguage,
  $on,
  $off,
  $once,
@@ -21184,4 +21196,4 @@ var index = /* @__PURE__ */ defineSystemComponent({
    return openBlock(), createBlock("div", clazz, [loadingVNode]);
  }
 });
-export { $emit, $off, $on, $once, index$1 as AsyncErrorComponent, index as AsyncLoadingComponent, index$s as Button, index$q as Canvas, index$o as Checkbox, index$p as CheckboxGroup, index$4 as CoverImage, index$5 as CoverView, index$n as Editor, index$u as Form, index$m as Icon, index$l as Image, Input, index$t as Label, LayoutComponent, Map$1 as Map, MovableArea, MovableView, index$k as Navigator, index$2 as PageComponent, index$3 as Picker, PickerView, PickerViewColumn, index$j as Progress, index$h as Radio, index$i as RadioGroup, ResizeSensor, index$g as RichText, ScrollView, index$f as Slider, Swiper, SwiperItem, index$e as Switch, index$d as Text, index$c as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, index$8 as Video, index$b as View, index$7 as WebView, addInterceptor, addPhoneContact, arrayBufferToBase64, base64ToArrayBuffer, canIUse, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, chooseFile, chooseImage, chooseLocation, chooseVideo, clearStorage, clearStorageSync, closeSocket, connectSocket, createAnimation$1 as createAnimation, createCameraContext, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createLivePlayerContext, createMapContext, createMediaQueryObserver, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, downloadFile, getApp$1 as getApp, getCurrentPages$1 as getCurrentPages, getFileInfo, getImageInfo, getLeftWindowStyle, getLocation, getNetworkType, getProvider, getRealPath, getRecorderManager, getRightWindowStyle, getSavedFileInfo, getSavedFileList, getScreenBrightness, getSelectedTextRange$1 as getSelectedTextRange, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getTopWindowStyle, getVideoInfo, hideKeyboard, hideLeftWindow, hideLoading, hideNavigationBarLoading, hideRightWindow, hideTabBar, hideTabBarRedDot, hideToast, hideTopWindow, loadFontFace, login, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offCompassChange, offNetworkStatusChange, offWindowResize, onAccelerometerChange, onCompassChange, onGyroscopeChange, onMemoryWarning, onNetworkStatusChange, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, onUserCaptureScreen, onWindowResize, openDocument, openLocation, pageScrollTo, index$9 as plugin, preloadPage, previewImage, promiseInterceptor, reLaunch, redirectTo, removeInterceptor, removeSavedFileInfo, removeStorage, removeStorageSync, removeTabBarBadge, request, saveFile, saveImageToPhotosAlbum, saveVideoToPhotosAlbum, scanCode, sendSocketMessage, setKeepScreenOn, setLeftWindowStyle, setNavigationBarColor, setNavigationBarTitle, setRightWindowStyle, setScreenBrightness, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setTopWindowStyle, setupApp, setupPage, setupWindow, showActionSheet, showLeftWindow, showLoading, showModal, showNavigationBarLoading, showRightWindow, showTabBar, showTabBarRedDot, showToast, showTopWindow, startAccelerometer, startCompass, startGyroscope, startPullDownRefresh, stopAccelerometer, stopCompass, stopGyroscope, stopPullDownRefresh, switchTab, uni$1 as uni, uploadFile, upx2px, useTabBar, vibrateLong, vibrateShort };
+export { $emit, $off, $on, $once, index$1 as AsyncErrorComponent, index as AsyncLoadingComponent, index$s as Button, index$q as Canvas, index$o as Checkbox, index$p as CheckboxGroup, index$4 as CoverImage, index$5 as CoverView, index$n as Editor, index$u as Form, index$m as Icon, index$l as Image, Input, index$t as Label, LayoutComponent, Map$1 as Map, MovableArea, MovableView, index$k as Navigator, index$2 as PageComponent, index$3 as Picker, PickerView, PickerViewColumn, index$j as Progress, index$h as Radio, index$i as RadioGroup, ResizeSensor, index$g as RichText, ScrollView, index$f as Slider, Swiper, SwiperItem, index$e as Switch, index$d as Text, index$c as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, index$8 as Video, index$b as View, index$7 as WebView, addInterceptor, addPhoneContact, arrayBufferToBase64, base64ToArrayBuffer, canIUse, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, chooseFile, chooseImage, chooseLocation, chooseVideo, clearStorage, clearStorageSync, closeSocket, connectSocket, createAnimation$1 as createAnimation, createCameraContext, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createLivePlayerContext, createMapContext, createMediaQueryObserver, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, downloadFile, getApp$1 as getApp, getCurrentPages$1 as getCurrentPages, getFileInfo, getImageInfo, getLanguage, getLeftWindowStyle, getLocation, getNetworkType, getProvider, getRealPath, getRecorderManager, getRightWindowStyle, getSavedFileInfo, getSavedFileList, getScreenBrightness, getSelectedTextRange$1 as getSelectedTextRange, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getTopWindowStyle, getVideoInfo, hideKeyboard, hideLeftWindow, hideLoading, hideNavigationBarLoading, hideRightWindow, hideTabBar, hideTabBarRedDot, hideToast, hideTopWindow, loadFontFace, login, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offCompassChange, offNetworkStatusChange, offWindowResize, onAccelerometerChange, onCompassChange, onGyroscopeChange, onMemoryWarning, onNetworkStatusChange, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, onUserCaptureScreen, onWindowResize, openDocument, openLocation, pageScrollTo, index$9 as plugin, preloadPage, previewImage, promiseInterceptor, reLaunch, redirectTo, removeInterceptor, removeSavedFileInfo, removeStorage, removeStorageSync, removeTabBarBadge, request, saveFile, saveImageToPhotosAlbum, saveVideoToPhotosAlbum, scanCode, sendSocketMessage, setKeepScreenOn, setLanguage, setLeftWindowStyle, setNavigationBarColor, setNavigationBarTitle, setRightWindowStyle, setScreenBrightness, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setTopWindowStyle, setupApp, setupPage, setupWindow, showActionSheet, showLeftWindow, showLoading, showModal, showNavigationBarLoading, showRightWindow, showTabBar, showTabBarRedDot, showToast, showTopWindow, startAccelerometer, startCompass, startGyroscope, startPullDownRefresh, stopAccelerometer, stopCompass, stopGyroscope, stopPullDownRefresh, switchTab, uni$1 as uni, uploadFile, upx2px, useTabBar, vibrateLong, vibrateShort };
--- a/packages/uni-h5/src/service/api/index.ts
+++ b/packages/uni-h5/src/service/api/index.ts
@@ -85,6 +85,8 @@ export {
  canvasPutImageData,
  canvasToTempFilePath,
  getSelectedTextRange,
+  getLanguage,
+  setLanguage,
  $on,
  $off,
  $once,

--- a/packages/uni-i18n/dist/uni-i18n.cjs.js
+++ b/packages/uni-i18n/dist/uni-i18n.cjs.js
@@ -203,13 +203,16 @@ class I18n {
    }
 }
+const ignoreVueI18n = true;
 function initLocaleWatcher(appVm, i18n) {
-    appVm.$i18n &&
+    if (appVm.$i18n) {
-        appVm.$i18n.vm.$watch('locale', (newLocale) => {
+        const vm = appVm.$i18n.vm ? appVm.$i18n.vm : appVm;
+        vm.$watch(appVm.$i18n.vm ? 'locale' : () => appVm.$i18n.locale, (newLocale) => {
            i18n.setLocale(newLocale);
        }, {
            immediate: true,
        });
+    }
 }
 // function getDefaultLocale() {
 //   if (typeof navigator !== 'undefined') {
@@ -221,7 +224,7 @@ function initLocaleWatcher(appVm, i18n) {
 //   }
 //   return uni.getSystemInfoSync().language
 // }
-function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN) {
+function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN, watcher) {
    // 兼容旧版本入参
    if (typeof locale !== 'string') {
        [locale, messages] = [messages, locale];
@@ -233,6 +236,7 @@ function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_
        locale: locale || fallbackLocale,
        fallbackLocale,
        messages,
+        watcher,
    });
    let t = (key, values) => {
        if (typeof getApp !== 'function') {
@@ -244,7 +248,7 @@ function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_
        }
        else {
            const appVm = getApp().$vm;
-            if (!appVm.$t || !appVm.$i18n) {
+            if (!appVm.$t || !appVm.$i18n || ignoreVueI18n) {
                // if (!locale) {
                //   i18n.setLocale(getDefaultLocale())
                // }

--- a/packages/uni-i18n/dist/uni-i18n.es.js
+++ b/packages/uni-i18n/dist/uni-i18n.es.js
@@ -199,13 +199,16 @@ class I18n {
    }
 }
+const ignoreVueI18n = true;
 function initLocaleWatcher(appVm, i18n) {
-    appVm.$i18n &&
+    if (appVm.$i18n) {
-        appVm.$i18n.vm.$watch('locale', (newLocale) => {
+        const vm = appVm.$i18n.vm ? appVm.$i18n.vm : appVm;
+        vm.$watch(appVm.$i18n.vm ? 'locale' : () => appVm.$i18n.locale, (newLocale) => {
            i18n.setLocale(newLocale);
        }, {
            immediate: true,
        });
+    }
 }
 // function getDefaultLocale() {
 //   if (typeof navigator !== 'undefined') {
@@ -217,7 +220,7 @@ function initLocaleWatcher(appVm, i18n) {
 //   }
 //   return uni.getSystemInfoSync().language
 // }
-function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN) {
+function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_EN, watcher) {
    // 兼容旧版本入参
    if (typeof locale !== 'string') {
        [locale, messages] = [messages, locale];
@@ -229,6 +232,7 @@ function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_
        locale: locale || fallbackLocale,
        fallbackLocale,
        messages,
+        watcher,
    });
    let t = (key, values) => {
        if (typeof getApp !== 'function') {
@@ -240,7 +244,7 @@ function initVueI18n(locale = LOCALE_EN, messages = {}, fallbackLocale = LOCALE_
        }
        else {
            const appVm = getApp().$vm;
-            if (!appVm.$t || !appVm.$i18n) {
+            if (!appVm.$t || !appVm.$i18n || ignoreVueI18n) {
                // if (!locale) {
                //   i18n.setLocale(getDefaultLocale())
                // }

--- a/packages/uni-i18n/src/vue-i18n.ts
+++ b/packages/uni-i18n/src/vue-i18n.ts
 import { I18n, BuiltInLocale, LocaleMessages, LOCALE_EN } from './I18n'
+const ignoreVueI18n = true
 type Interpolate = (
  key: string,
  values?: Record<string, unknown> | Array<unknown>
 ) => string
 function initLocaleWatcher(appVm: any, i18n: I18n) {
-  appVm.$i18n &&
+  if (appVm.$i18n) {
-    appVm.$i18n.vm.$watch(
+    const vm = appVm.$i18n.vm ? appVm.$i18n.vm : appVm
-      'locale',
+    vm.$watch(
+      appVm.$i18n.vm ? 'locale' : () => appVm.$i18n.locale,
      (newLocale: BuiltInLocale) => {
        i18n.setLocale(newLocale)
      },
@@ -16,6 +19,7 @@ function initLocaleWatcher(appVm: any, i18n: I18n) {
        immediate: true,
      }
    )
+  }
 }
 // function getDefaultLocale() {
@@ -32,7 +36,8 @@ function initLocaleWatcher(appVm: any, i18n: I18n) {
 export function initVueI18n(
  locale: BuiltInLocale = LOCALE_EN,
  messages: LocaleMessages = {},
-  fallbackLocale: BuiltInLocale = LOCALE_EN
+  fallbackLocale: BuiltInLocale = LOCALE_EN,
+  watcher?: (locale: BuiltInLocale) => void
 ) {
  // 兼容旧版本入参
  if (typeof locale !== 'string') {
@@ -45,6 +50,7 @@ export function initVueI18n(
    locale: locale || fallbackLocale,
    fallbackLocale,
    messages,
+    watcher,
  })
  let t: Interpolate = (key, values) => {
    if (typeof getApp !== 'function') {
@@ -55,7 +61,7 @@ export function initVueI18n(
      }
    } else {
      const appVm = getApp().$vm
-      if (!appVm.$t || !appVm.$i18n) {
+      if (!appVm.$t || !appVm.$i18n || ignoreVueI18n) {
        // if (!locale) {
        //   i18n.setLocale(getDefaultLocale())
        // }

--- a/packages/uni-stat/dist/uni-stat.cjs.js
+++ b/packages/uni-stat/dist/uni-stat.cjs.js
--- a/packages/uni-stat/dist/uni-stat.es.js
+++ b/packages/uni-stat/dist/uni-stat.es.js
--- a/yarn.lock
+++ b/yarn.lock
@@ -922,10 +922,10 @@
  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@dcloudio/types@^2.5.0":
+"@dcloudio/types@^2.5.1":
-  version "2.5.0"
+  version "2.5.1"
-  resolved "https://registry.nlark.com/@dcloudio/types/download/@dcloudio/types-2.5.0.tgz#fe25f19166a9ba091213f72a8a07e1704d205134"
+  resolved "https://registry.yarnpkg.com/@dcloudio/types/-/types-2.5.1.tgz#1aacead4158e2d7448e2585db1a68af28fccac1a"
-  integrity sha1-/iXxkWapugkSE/cqigfhcE0gUTQ=
+  integrity sha512-tw+ELDxWJFG2/GoVlQuUuA8YATtXMmCP7AzRvb1syrdf1rVgrzCGJr3GVlGE8qLEl/lhhRKuufgcOp3h9VSEzA==
 "@eslint/eslintrc@^0.4.3":
  version "0.4.3"