imatrix-ui 2.9.60-dw → 2.9.61-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.60-dw",
+  "version": "2.9.61-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/utils/auth-api.js

@@ -8,7 +8,6 @@ const versionEnv = 'VERSION_ENVIRONMENT'
 const userVersion = 'CURRENT_USER_SYSTEM_VERSION'
 const langKey = 'CURRENT_LANGUAGE'
 const allLangKey = 'AMB_LANG_INFO'
-const currentSystemUrlKey = 'CURRENT_SYSTEM_URL_'
 
 function getToken() {
   let token = getCookieCache(jwtKey)
@@ -171,39 +170,6 @@ function removeLocalStorageCache(key) {
   localStorage.removeItem(key)
 }
 
-function getSystemCacheUrlByCode(systemCode) {
-  if (!systemCode) {
-    systemCode = Vue.prototype.customSystem
-  }
-  if (!systemCode) {
-    systemCode = Vue.prototype.systemCode
-  }
-  if (systemCode) {
-    const systemUrls = getSystemCacheUrl()
-    if (systemUrls) {
-      return systemUrls[systemCode]
-    }
-  }
-}
-
-function getSystemCacheUrl() {
-  const systemUrlJson = getLocalStorageCache(currentSystemUrlKey)
-  if (systemUrlJson) {
-    return JSON.parse(systemUrlJson)
-  }
-}
-
-function setSystemCacheUrl(systemUrlObj) {
-  if (systemUrlObj) {
-    const systemUrlStr = JSON.stringify(systemUrlObj)
-    setLocalStorageCache(currentSystemUrlKey, systemUrlStr)
-  }
-}
-
-function removeSystemCacheUrl() {
-  removeLocalStorageCache(currentSystemUrlKey)
-}
-
 export default {
   getToken,
   setToken,
@@ -229,9 +195,5 @@ export default {
   removeAllLanguages,
   getLocalStorageCache,
   setLocalStorageCache,
-  removeLocalStorageCache,
-  getSystemCacheUrlByCode,
-  getSystemCacheUrl,
-  setSystemCacheUrl,
-  removeSystemCacheUrl
+  removeLocalStorageCache
 }

package/src/utils/common-util.js

@@ -104,22 +104,43 @@ export function getLoginUrl() {
     let systemPath = href
     let routerPath = ''
     let param = ''
+    console.log('getLoginUrl---href=', href)
     if (href.indexOf('#/') > 0 && href.indexOf('#/login') < 0) {
       systemPath = href.substring(0, href.indexOf('#'))
       const suffix = href.substring(href.indexOf('#') + 1)
+      console.log('getLoginUrl---suffix=', suffix)
       routerPath = suffix
       if (suffix.indexOf('?') > 0) {
         // 如果包含参数，则需要截取参数
         routerPath = suffix.substring(0, suffix.indexOf('?'))
         param = suffix.substring(suffix.indexOf('?') + 1)
       }
+    } else {
+      systemPath = null
     }
+    console.log('getLoginUrl---param=', param)
     getPortalFrontendUrl().then(portalUrl => {
-      let loginUrl = portalUrl + '#/login?systemPath=' + systemPath + '&routerPath=' + routerPath
+      let loginUrl = portalUrl + '#/login'
+      if (systemPath) {
+        loginUrl = loginUrl + '?systemPath=' + systemPath
+      }
+      if (routerPath) {
+        if (loginUrl.indexOf('?') > 0) {
+          loginUrl = loginUrl + '&routerPath=' + routerPath
+        } else {
+          loginUrl = loginUrl + '?routerPath=' + routerPath
+        }
+      }
       if (param) {
-        loginUrl += '&' + param
+        if (loginUrl.indexOf('?') > 0) {
+          loginUrl = loginUrl + '&' + param
+        } else {
+          loginUrl = loginUrl + '?' + param
+        }
       }
+      console.log('getLoginUrl---loginUrl11=', loginUrl)
       loginUrl = replacePrefix(loginUrl)
+      console.log('getLoginUrl---loginUr222=', loginUrl)
       resolve(loginUrl)
     }).catch(error => {
       reject(error)
@@ -335,14 +356,3 @@ export function cacheCurrentLanguageUtil(http) {
     }
   })
 }
-
-// 刷新浏览器页面
-export function refreshLocationHref(url, locationObj) {
-  if (!locationObj) {
-    locationObj = window.location
-  }
-  if (!url) {
-    return
-  }
-  locationObj.href = url
-}