agilebuilder-ui 1.1.44 → 1.1.45

package/package.json

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

package/src/utils/common-util.js

@@ -1,6 +1,5 @@
 import * as Vue from 'vue'
-import authApi from './auth-api'
-import { getToken, getLanguage, getAllLanguages, setAllLanguages, removeToken } from './auth'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
@@ -231,7 +230,11 @@ export function isPlateSys(systemCode) {
 
 export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
-    http.get('./server-config.json').then((result) => {
+    let timestamp = '1'
+    if(__BUILD_TIME__) {
+      timestamp = __BUILD_TIME__
+    }
+    http.get('./server-config.json?t='+timestamp).then((result) => {
       const config = result
       for (const key in config) {
         window.$vueApp.config.globalProperties[key] = config[key]
@@ -245,10 +248,10 @@ export function getServerConfigUtil(http) {
       localStorage.setItem('_baseAPI_', window.$vueApp.config.globalProperties.baseAPI)
       localStorage.setItem('_amb_projectModel_', window.$vueApp.config.globalProperties.projectModel)
       if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}/iconfont.css`)
+        window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
       }
       if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css`)
+        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
       }
       resolve()
     })
@@ -557,27 +560,49 @@ async function handlePlateSysLang(currentLanguage) {
     }
   }
 }
+// 缓存项目设值信息
+export function cacheProjectSetting() {
+  return new Promise((resolve,reject)=>{
+    const projectSettingCache = localStorage.getItem('PROJECT_SETTINGS')
+    let projectSettings = null
+    if(projectSettingCache && projectSettingCache === '_EMPTY_VALUE') {
+       resolve(projectSettings)
+    } else if (projectSettingCache) {
+      projectSettings = JSON.parse(projectSettingCache)
+      setBrowserFavicon(projectSettings)
+      resolve(projectSettings)
+    } else {
+      window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
+        if(data){
+          localStorage.setItem('PROJECT_SETTINGS', JSON.stringify(data))
+          projectSettings = data
+          setBrowserFavicon(projectSettings)
+        } else {
+          localStorage.setItem('PROJECT_SETTINGS', '_EMPTY_VALUE')
+        }
+        resolve(projectSettings)
+      }).catch((error)=>{
+        reject(error)
+      })
+    }
+  })
+}
 
-// export function setProjectSetting() {
-//   const projectSettingCache = Cookies.get('PROJECT_SETTINGS')
-//   let projectSettings = null
-//   if (projectSettingCache) {
-//     projectSettings = JSON.parse(projectSettingCache)
-//    // TODO:工具方法中没有this，这个代码会报错，先注释该方法，没找到调用它的地方
-//     this.setLogoUrl(projectSettings)
-//   } else {
-//     window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
-//       Cookies.set('PROJECT_SETTINGS', JSON.stringify(data))
-//       projectSettings = data
-//     })
-//   }
-//   if (projectSettings.browserImageUuid) {
-//     const linkElement = document.getElementById('ambBrowserIcon')
-//     if (linkElement) {
-//       linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
-//     }
-//   }
-// }
+function setBrowserFavicon(projectSettings){
+  const linkElement = document.getElementById('ambBrowserIcon')
+  if(!linkElement){
+    return
+  }
+  if (projectSettings) {
+    const browserIconUrl = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon?t='+__BUILD_TIME__
+    if(projectSettings.browserImageUuid && (!linkElement.href || linkElement.href !== browserIconUrl) ){
+      linkElement.href = browserIconUrl
+    }
+  }
+  if(!linkElement.href) {
+    linkElement.href = 'favicon.svg?t='+__BUILD_TIME__
+  }
+}
 
 // 动态加载css
 export function loadCSS() {