agilebuilder-ui 1.0.71-tmp3 → 1.0.71-tmp6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.71tmp3",
+  "version": "1.0.71tmp6",
   "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'
 /**
  * 获得相对地址
  */
@@ -312,15 +312,7 @@ export function isMobileBrowser() {
 }
 
 export function getLocaleByLang(lang) {
-  let locale = 'cn'
-  if (lang && lang.indexOf('_') > 0) {
-    const language = lang.substring(0, lang.indexOf('_'))
-    locale = language
-  }
-  if (locale === 'zh') {
-    locale = 'cn'
-  }
-  return locale
+  return i18nUtil.getLocaleByLang(lang)
 }
 
 export function cacheLangs(langs) {
@@ -439,28 +431,71 @@ 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 = getCurrentSystemCode()
+      if (isPlateSys(systemCode)) {
+        // 平台系统不需要加载国际化文件
+        if (currentLanguage && currentLanguage !== 'undefined') {
+          resolve(currentLanguage)
+        } else {
+          // 如果没有缓存当前用户的语言，则需要获取
+          const params = { systemCode: systemCode }
+          http
+            .post(window.$vueApp.config.globalProperties.baseAPI + '/acs/user/i18n-languages', params)
+            .then((langInfo) => {
+              resolve(langInfo.language ? langInfo.language : 'zh_CN')
+            })
+            .catch(() => {
+              resolve('zh_CN')
+            })
+        }
       } 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
-          )
-          .then((langInfo) => {
-            debugger
-            if (langInfo.i18nFileUrls && langInfo.i18nFileUrls[langInfo.language]) {
-              window.$vueApp.config.globalProperties.$loadScript(langInfo.i18nFileUrls[langInfo.language])
-            }
-            resolve(langInfo.language)
-          })
+        // 业务系统是否启用了国际化
+        const enableI18n = i18nUtil.getEnableI18nState(systemCode)
+        if (!enableI18n && currentLanguage && currentLanguage !== 'undefined') {
+          // 如果没有开启国际化, 并且已经缓存了当前用户的语言，则直接返回
+          resolve(currentLanguage)
+        } else {
+          // 启用了国际化并且当前已经加载过了国际化json文件,则需要检查是否是最新的国际化文件
+          // 没有加载过国际化文件，则不用传递checkLastestI18nFile参数，后台会返回最新的国际化文件路径和用户当前语言
+          const url = i18nUtil.getLangFileUrl(systemCode, currentLanguage)
+          const params = { systemCode: systemCode }
+          if (url && currentLanguage && currentLanguage !== 'undefined' && enableI18n) {
+            params.checkLastestI18nFile = true
+          }
+          http
+            .post(window.$vueApp.config.globalProperties.baseAPI + '/acs/user/i18n-languages', params)
+            .then((langInfo) => {
+              if (langInfo.isLastestI18nFile) {
+                // 表示是最新的国际化文件，可以直接加载使用
+                i18nUtil
+                  .loadLangFile(systemCode, url, langInfo.language)
+                  .then(() => {
+                    resolve(langInfo.language)
+                  })
+                  .catch(() => {
+                    resolve(langInfo.language ? langInfo.language : 'zh_CN')
+                  })
+              } else {
+                // 不是最新的国际化文件或者没有加载过国际化文件,则后端会返回最新的国际化文件路径和用户当前语言
+                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(systemCode, url, langInfo.language)
+                    .then(() => {
+                      resolve(langInfo.language)
+                    })
+                    .catch(() => {
+                      resolve(langInfo.language ? langInfo.language : 'zh_CN')
+                    })
+                } else {
+                  // 如果没有开启国际化
+                  resolve(langInfo.language)
+                }
+              }
+            })
+        }
       }
     } else {
       // 默认是中文
@@ -583,10 +618,11 @@ 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)
+export function getCurrentSystemCode() {
+  if (window.$vueApp.config.globalProperties.currentSystem) {
+    return window.$vueApp.config.globalProperties.currentSystem
+  } else {
+    return window.$vueApp.config.globalProperties.systemCode
+  }
 }

package/src/utils/i18n-util.js

@@ -0,0 +1,127 @@
+import axios from 'axios'
+export function setLangFileUrl(systemCode, lang, url) {
+  let i18nFileUrlsItem = getLocalStorageJson('i18nFileUrls')
+  if (!i18nFileUrlsItem) {
+    i18nFileUrlsItem = {}
+  }
+  i18nFileUrlsItem[systemCode + '_' + lang] = url
+  window.localStorage.setItem('i18nFileUrls', JSON.stringify(i18nFileUrlsItem))
+}
+
+export function getLangFileUrl(systemCode, lang) {
+  const i18nFileUrlsItem = getLocalStorageJson('i18nFileUrls')
+  if (i18nFileUrlsItem) {
+    return i18nFileUrlsItem[systemCode + '_' + lang]
+  }
+  return null
+}
+
+export function removeLangFileUrl(systemCode, lang) {
+  const i18nFileUrlsItem = getLocalStorageJson('i18nFileUrls')
+  if (i18nFileUrlsItem) {
+    delete i18nFileUrlsItem[systemCode + '_' + lang]
+    window.localStorage.setItem('i18nFileUrls', JSON.stringify(i18nFileUrlsItem))
+  }
+}
+
+export function removeAllLangFileUrl(systemCode, lang) {
+  window.localStorage.removeItem('i18nFileUrls')
+}
+
+export function setEnableI18nState(systemCode, enableI18n) {
+  let allStateObj = {}
+  const allState = getLocalStorageJson('enableI18nSystem')
+  if (allState) {
+    allStateObj = allState
+  }
+  allStateObj[systemCode] = enableI18n ? true : false
+  window.localStorage.setItem('enableI18nSystem', JSON.stringify(allStateObj))
+}
+
+export function getEnableI18nState(systemCode) {
+  const allState = getLocalStorageJson('enableI18nSystem')
+  if (allState) {
+    return allState[systemCode]
+  }
+  return null
+}
+
+export function removeEnableI18nState() {
+  window.localStorage.removeItem('enableI18nSystem')
+}
+
+export function removeEnableI18nWidthSystemCode() {
+  const allState = getLocalStorageJson('enableI18nSystem')
+  if (allState) {
+    delete allState[getCurrentSystemCode()]
+    window.localStorage.setItem('enableI18nSystem', JSON.stringify(allState))
+  }
+}
+
+function getLocalStorageJson(key) {
+  const item = window.localStorage.getItem(key)
+  if (item) {
+    return JSON.parse(item)
+  }
+  return null
+}
+
+function loadLangFile(systemCode, url, language) {
+  console.log('loadLangFile', systemCode, url, language)
+  return new Promise((resolve, reject) => {
+    if (window.$i18n) {
+      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)
+        })
+    }
+    resolve()
+  })
+}
+export function getLocaleByLang(lang) {
+  let locale = 'cn'
+  if (lang && lang.indexOf('_') > 0) {
+    const language = lang.substring(0, lang.indexOf('_'))
+    locale = language
+  }
+  if (locale === 'zh') {
+    locale = 'cn'
+  }
+  return locale
+}
+
+function clearI18nCache(lang) {
+  removeEnableI18nState()
+  removeAllLangFileUrl()
+}
+export default {
+  setLangFileUrl,
+  getLangFileUrl,
+  removeLangFileUrl,
+  setEnableI18nState,
+  getEnableI18nState,
+  removeEnableI18nState,
+  removeEnableI18nWidthSystemCode,
+  getLocalStorageJson,
+  loadLangFile,
+  getLocaleByLang
+}