agilebuilder-ui 1.0.73 → 1.0.74-tmp2

package/src/utils/common-util.js

@@ -2,7 +2,8 @@ import * as Vue from 'vue'
 import authApi from './auth-api'
 import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
-import {getCookieCache} from './auth'
+import { getCookieCache } from './auth'
+import i18nUtil from './i18n-util'
 /**
  * 获得相对地址
  */
@@ -311,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) {
@@ -438,12 +431,77 @@ export function cacheCurrentLanguageUtil(http) {
     const token = getToken()
     if (token) {
       const currentLanguage = getLanguage()
-      if (currentLanguage && currentLanguage !== 'undefined') {
-        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) => {
+        // 业务系统是否启用了国际化
+        const enableI18n = i18nUtil.getEnableI18nState(systemCode)
+        if (enableI18n === false && 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
+            params.i18nFileVersion = i18nUtil.getI18nFileVersion()
+          }
+          http
+            .post(window.$vueApp.config.globalProperties.baseAPI + '/acs/user/i18n-languages', params)
+            .then((langInfo) => {
+              const i18nCurrentVersion = i18nUtil.getI18nFileVersion()
+              i18nUtil.setI18nFileVersion(langInfo.i18nFileVersion)
+              if (i18nCurrentVersion && Number(i18nCurrentVersion) === langInfo.i18nFileVersion) {
+                // 表示是最新的国际化文件，可以直接加载使用
+                i18nUtil
+                  .loadLangFile(systemCode, url, currentLanguage)
+                  .then(() => {
+                    resolve(currentLanguage)
+                  })
+                  .catch(() => {
+                    resolve(currentLanguage)
+                  })
+              } 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)
+                }
+              }
+            })
+            .catch(() => {
+              resolve('zh_CN')
+            })
+        }
       }
     } else {
       // 默认是中文
@@ -518,8 +576,7 @@ export function replacePlaceholders(template, ...args) {
   })
 }
 
-
-function isOpenMobileGateway () {
+function isOpenMobileGateway() {
   // 系统参数设置中配置的是否开启移动网关，没有配置默认是开启的
   let isOpenMobileGatewayCache = getCookieCache('IS_OPEN_MOBILE_GATEWAY')
   if (isOpenMobileGatewayCache === undefined || isOpenMobileGatewayCache === null) {
@@ -532,13 +589,16 @@ function isOpenMobileGateway () {
  * @param {*} url
  * @returns
  */
-export function getReplaceUrlDomain (url) {
+export function getReplaceUrlDomain(url) {
   const isOpenMobileGatewayCache = isOpenMobileGateway()
   console.log('===getReplaceUrlDomain==isOpenMobileGatewayCache=', isOpenMobileGatewayCache)
   if (isOpenMobileGatewayCache === 'true' && url !== undefined && window.$vueApp.config.globalProperties.replaceUrl) {
     // 表示需要替换url中的"https://域名"
     const baseApi = uswindow.$vueApp.config.globalProperties.baseAPI
-    if ((url + '').indexOf(uswindow.$vueApp.config.globalProperties.replaceUrl + '/') < 0 && (url + '').indexOf('://') > 0) {
+    if (
+      (url + '').indexOf(uswindow.$vueApp.config.globalProperties.replaceUrl + '/') < 0 &&
+      (url + '').indexOf('://') > 0
+    ) {
       // 表示路径还未替换
       console.log('===getReplaceUrlDomain==url.indexOf(uswindow.$vueApp.config.globalProperties.replaceUrl) !== 0')
       const prefixUrl1 = baseApi.substring(0, baseApi.indexOf('://'))
@@ -561,9 +621,17 @@ export function getReplaceUrlDomain (url) {
   return url
 }
 
-export function formatFileName (fileName) {
+export function formatFileName(fileName) {
   if (fileName) {
     fileName = fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
   }
   return fileName
-}
+}
+
+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,138 @@
+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()
+}
+
+function setI18nFileVersion(version) {
+  window.localStorage.setItem('i18nFileVersion', version)
+}
+
+function getI18nFileVersion() {
+  return window.localStorage.getItem('i18nFileVersion')
+}
+
+export default {
+  setLangFileUrl,
+  getLangFileUrl,
+  removeLangFileUrl,
+  setEnableI18nState,
+  getEnableI18nState,
+  removeEnableI18nState,
+  removeEnableI18nWidthSystemCode,
+  getLocalStorageJson,
+  loadLangFile,
+  getLocaleByLang,
+  setI18nFileVersion,
+  getI18nFileVersion
+}

package/src/views/layout/EmptyLayout.vue

@@ -1,46 +1,3 @@
 <template>
   <router-view />
 </template>
-<script>
-import eventBus from '../../../src/utils/eventBus'
-export default {
-  created(){
-    window.addEventListener('message', this.receiveMessage, false)
-  },
-  destroyed () {
-    window.removeEventListener('message', this.receiveMessage, false)
-  },
-  methods: {
-    receiveMessage (event) {
-      const result = event.data
-      console.log('receiveMessage-----result111=', result)
-      if (result && typeof result === 'string') {
-        console.log('receiveMessage-----result2222=', result)
-        // console.log('接收手机端传过来的信息--receiveMessage===', result)
-        try {
-          const data = JSON.parse(result)
-          // console.log('接收手机端传过来的信息--data=', data)
-          const type = data.type // 'pickFileDone' 选择文件完成,'uploadFileDone' 上传文件完成
-          console.log('receiveMessage-----result3333=', type, 'data.files=', data.files)
-          // console.log('接收手机端传过来的信息--type=', type)
-          if (type && type === 'onResize') {
-            // 横竖屏切换时重新计算高度
-            eventBus.$emit('onResize')
-          } else if (type && type === 'pickFileDone') {
-            // 选择文件完成
-            console.log('receiveMessage-----result4444=', type)
-            // fileNames:[{name:'xx',base64Path:'xxx'},{name:'xxx',base64Path:'xxxxx'}]
-            eventBus.$emit('pickFileDone', data)
-          } else if (type && type === 'uploadFileDone') {
-            eventBus.$emit('uploadFileDone', data)
-          } else if (type && type === 'scan') {
-            eventBus.$emit('scan', data)
-          }
-        } catch (error) {
-          console.log(error)
-        }
-      }
-    }
-  }
-}
-</script>

package/src/views/layout/Layout.vue

@@ -17,7 +17,6 @@
 import { Sidebar, AppMain, Breadcrumb } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { isShowMenuRoute } from '../../../src/utils/common-util'
-import eventBus from '../../../src/utils/eventBus'
 
 export default {
   name: 'Layout',
@@ -50,46 +49,10 @@ export default {
       }
     },
   },
-  created(){
-    window.addEventListener('message', this.receiveMessage, false)
-  },
-  destroyed () {
-    window.removeEventListener('message', this.receiveMessage, false)
-  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('closeSidebar', { withoutAnimation: false })
     },
-    receiveMessage (event) {
-      const result = event.data
-      console.log('receiveMessage-----result111=', result)
-      if (result && typeof result === 'string') {
-        console.log('receiveMessage-----result2222=', result)
-        // console.log('接收手机端传过来的信息--receiveMessage===', result)
-        try {
-          const data = JSON.parse(result)
-          // console.log('接收手机端传过来的信息--data=', data)
-          const type = data.type // 'pickFileDone' 选择文件完成,'uploadFileDone' 上传文件完成
-          console.log('receiveMessage-----result3333=', type, 'data.files=', data.files)
-          // console.log('接收手机端传过来的信息--type=', type)
-          if (type && type === 'onResize') {
-            // 横竖屏切换时重新计算高度
-            eventBus.$emit('onResize')
-          } else if (type && type === 'pickFileDone') {
-            // 选择文件完成
-            console.log('receiveMessage-----result4444=', type)
-            // fileNames:[{name:'xx',base64Path:'xxx'},{name:'xxx',base64Path:'xxxxx'}]
-            eventBus.$emit('pickFileDone', data)
-          } else if (type && type === 'uploadFileDone') {
-            eventBus.$emit('uploadFileDone', data)
-          } else if (type && type === 'scan') {
-            eventBus.$emit('scan', data)
-          }
-        } catch (error) {
-          console.log(error)
-        }
-      }
-    }
   },
 }
 </script>