agilebuilder-ui 1.0.71-tmp1 → 1.0.71-tmp3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.71tmp1",
+  "version": "1.0.71tmp3",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/src/permission.js

@@ -77,10 +77,15 @@ router.beforeEach((to, from, next) => {
       setToken(token)
     }
   }
-  if (to.query && to.query._systemName_) {
-    // 表示需要设置浏览器页签名
-    window.top.document.title = to.query._systemName_
-  }
+  // if (to.query) {
+  //   if (to.query._systemName_) {
+  //     window.top.document.title = to.query._systemName_
+  //   }
+  //   if (to.query.customSystem) {
+  //     window.$vueApp.config.globalProperties.currentSystem = to.query.customSystem
+  //   }
+  //   // 表示需要设置浏览器页签名
+  // }
   // console.log('router.beforeEach-getToken()=', token)
   // 表示需要显示菜单。为了控制是否需要走获得有权限的菜单集合的接口。单点登录跳转到表单页面时不需要请求菜单，提高页面显示速度。
   let isNeedMenu
@@ -104,6 +109,15 @@ router.beforeEach((to, from, next) => {
     } else {
       console.log('router.beforeEach-to.path!=login')
       if (store.getters.name === '') {
+        if (to.query) {
+          if (to.query._systemName_) {
+            window.top.document.title = to.query._systemName_
+          }
+          if (to.query.customSystem) {
+            window.$vueApp.config.globalProperties.currentSystem = to.query.customSystem
+          }
+          // 表示需要设置浏览器页签名
+        }
         // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
         console.log('router.beforeEach-store.getters.name === ""')
         store

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 LoadScript from 'vue-plugin-load-script'
+
 /**
  * 获得相对地址
  */
@@ -362,11 +362,8 @@ export function cacheAllLanguagesUtil(http) {
         setAllLanguages(cookieCacheLangs)
         resolve()
       } else {
-        // http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/all-languages').then((langList) => {
-        http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/i18n/languages').then((langInfo) => {
-          debugger
+        http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/all-languages').then((langList) => {
           const langResult = {}
-          const langList = langInfo.languages
           if (langList) {
             langList.forEach((item) => {
               // 例如：zh_CN、en_US
@@ -385,9 +382,6 @@ export function cacheAllLanguagesUtil(http) {
             })
           }
           cacheLangs(langResult)
-          if (langInfo.i18nFileUrls && langInfo.i18nFileUrls[window.$locale]) {
-            LoadScript(langInfo.i18nFileUrls[window.$locale])
-          }
           resolve()
         })
       }
@@ -445,12 +439,28 @@ export function cacheCurrentLanguageUtil(http) {
     const token = getToken()
     if (token) {
       const currentLanguage = getLanguage()
-      if (currentLanguage && currentLanguage !== 'undefined') {
+      debugger
+      if (
+        currentLanguage &&
+        currentLanguage !== 'undefined' &&
+        getLangFileUrl(window.$vueApp.config.globalProperties.currentSystem, currentLanguage)
+      ) {
         resolve(currentLanguage)
       } else {
-        http.get(window.$vueApp.config.globalProperties.baseAPI + '/acs/user-languages').then((currentLanguage) => {
-          resolve(currentLanguage)
-        })
+        // 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)
+          })
       }
     } else {
       // 默认是中文
@@ -573,3 +583,10 @@ 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)
+}