agilebuilder-ui 1.0.71-tmp3 → 1.0.71-tmp4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.71tmp3",
+  "version": "1.0.71tmp4",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",
@@ -34,6 +34,7 @@
     "vue": "3.3.4",
     "vue-i18n": "^9.5.0",
     "vue-router": "^4.2.5",
-    "vuex": "^4.1.0"
+    "vuex": "^4.1.0",
+    "axios": "^1.5.1"
   }
 }

package/src/utils/common-util.js

@@ -3,7 +3,7 @@ import authApi from './auth-api'
 import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
-
+import i18nUtil from './i18n-util'
 /**
  * 获得相对地址
  */
@@ -439,27 +439,33 @@ export function cacheCurrentLanguageUtil(http) {
     const token = getToken()
     if (token) {
       const currentLanguage = getLanguage()
-      debugger
-      if (
-        currentLanguage &&
-        currentLanguage !== 'undefined' &&
-        getLangFileUrl(window.$vueApp.config.globalProperties.currentSystem, currentLanguage)
-      ) {
-        resolve(currentLanguage)
+      const systemCode = i18nUtil.getCurrentSystemCode()
+      const enableI18n = i18nUtil.getEnableI18nState(systemCode)
+      if (currentLanguage && currentLanguage !== 'undefined' && enableI18n) {
+        const url = i18nUtil.getLangFileUrl(systemCode, currentLanguage)
+        if (url && enableI18n === 'true') {
+          // 表示需要加载国际化文件
+          loadLangFile(url, currentLanguage).then(() => {
+            resolve(currentLanguage)
+          })
+        } else {
+          resolve(currentLanguage)
+        }
       } else {
         // http.get(window.$vueApp.config.globalProperties.baseAPI + '/acs/user-languages').then((currentLanguage) => {
         http
-          .get(
-            window.$vueApp.config.globalProperties.baseAPI +
-              '/acs/user/i18n-languages?systemCode=' +
-              window.$vueApp.config.globalProperties.currentSystem
-          )
+          .get(window.$vueApp.config.globalProperties.baseAPI + '/acs/user/i18n-languages?systemCode=' + systemCode)
           .then((langInfo) => {
-            debugger
-            if (langInfo.i18nFileUrls && langInfo.i18nFileUrls[langInfo.language]) {
-              window.$vueApp.config.globalProperties.$loadScript(langInfo.i18nFileUrls[langInfo.language])
+            i18nUtil.setEnableI18nState(systemCode, langInfo.enableI18n ? true : false)
+            if (langInfo.enableI18n && langInfo.i18nFileUrls[langInfo.language]) {
+              const url = langInfo.i18nFileUrls[langInfo.language] + '?_t_=' + new Date().getTime()
+              i18nUtil.setLangFileUrl(systemCode, langInfo.language, url)
+              i18nUtil.loadLangFile(url, langInfo.language).then(() => {
+                resolve(langInfo.language)
+              })
+            } else {
+              resolve(langInfo.language)
             }
-            resolve(langInfo.language)
           })
       }
     } else {
@@ -583,10 +589,3 @@ export function formatFileName(fileName) {
   }
   return fileName
 }
-export function setLangFileUrl(systemCode, lang, url) {
-  window.sessionStorage.setItem('langFileUrl_' + systemCode + '_' + lang, url)
-}
-
-export function getLangFileUrl(systemCode, lang) {
-  return window.sessionStorage.getItem('langFileUrl_' + systemCode + '_' + lang)
-}

package/src/utils/i18n-util.js

@@ -0,0 +1,98 @@
+import axios from 'axios'
+export function setLangFileUrl(systemCode, lang, url) {
+  window.localStorage.setItem('langFileUrl_' + systemCode + '_' + lang, url)
+}
+
+export function getLangFileUrl(systemCode, lang) {
+  return window.localStorage.getItem('langFileUrl_' + systemCode + '_' + lang)
+}
+
+export function removeLangFileUrl(systemCode, lang) {
+  return window.localStorage.removeItem('langFileUrl_' + systemCode + '_' + lang)
+}
+
+export function setEnableI18nState(systemCode, enableI18n) {
+  let allStateObj = {}
+  const allState = getEnableI18System()
+  if (allState) {
+    allStateObj = allState
+  }
+  allStateObj[systemCode] = enableI18n ? true : false
+  window.localStorage.setItem('enableI18System', JSON.stringify(allStateObj))
+}
+
+export function getEnableI18nState(systemCode) {
+  const allState = getLocalStorageJson('enableI18System')
+  if (allState) {
+    return allState[systemCode]
+  }
+  return null
+}
+
+export function removeEnableI18nState() {
+  window.localStorage.removeItem('enableI18System')
+}
+
+export function removeEnableI18nWidthSystemCode() {
+  const allState = getLocalStorageJson('enableI18System')
+  if (allState) {
+    delete allState[getCurrentSystemCode()]
+    window.localStorage.setItem('enableI18System', JSON.stringify(allState))
+  }
+}
+
+function getLocalStorageJson(key) {
+  const item = window.localStorage.getItem(key)
+  if (item) {
+    return JSON.parse(item)
+  }
+  return null
+}
+
+function getCurrentSystemCode() {
+  if (window.$vueApp.config.globalProperties.currentSystem) {
+    return window.$vueApp.config.globalProperties.currentSystem
+  } else {
+    return window.$vueApp.config.globalProperties.systemCode
+  }
+}
+
+function loadLangFile(systemCode, url, language) {
+  return new Promise((resolve, reject) => {
+    axios
+      .get(url, {
+        withCredential: false
+      })
+      .then((response) => {
+        const lang = getLocaleByLang(language)
+        if (response && response.data) {
+          // 获取当前的国际化消息
+          const currentMessages = window.$i18n.global.getLocaleMessage(lang)
+          // 新的国际化消息
+          if (currentMessages[systemCode]) {
+            Object.assign(currentMessages[systemCode], response.data)
+          } else {
+            currentMessages[systemCode] = response.data
+          }
+          // 设置合并后的国际化消息
+          window.$i18n.global.setLocaleMessage(lang, currentMessages)
+        }
+        resolve()
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
+export default {
+  setLangFileUrl,
+  getLangFileUrl,
+  removeLangFileUrl,
+  setEnableI18nState,
+  getEnableI18nState,
+  removeEnableI18nState,
+  removeEnableI18nWidthSystemCode,
+  getLocalStorageJson,
+  getCurrentSystemCode,
+  loadLangFile
+}