imatrix-ui 2.9.41-dw-tmp2 → 2.9.43-dw

package/package.json

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

package/src/i18n/langs/cn.js

@@ -77,8 +77,7 @@ const cn = {
     asyncExport: '正在异步导出，请等待消息通知!',
     selectedWorkingGroup: '已选工作组',
     forbiddenExceptionLinkUrl: '请点击进行权限申请',
-    forbiddenExceptionLinkUser: '如有疑问请联系',
-    systemCacheVersionNotEqual: '{systemCode}系统发版了新版本，系统会自动刷新页面'
+    forbiddenExceptionLinkUser: '如有疑问请联系'
   },
   // 列表组件
   superGrid: {

package/src/i18n/langs/en.js

@@ -77,8 +77,7 @@ const en = {
     asyncExport: 'Asynchronous export, please wait for message notification!',
     selectedWorkingGroup: 'Selected working group',
     forbiddenExceptionLinkUrl: 'please click to apply',
-    forbiddenExceptionLinkUser: 'if you have any questions,please contact',
-    systemCacheVersionNotEqual: '{systemCode} System has released a new version, and the page will automatically refresh'
+    forbiddenExceptionLinkUser: 'if you have any questions,please contact'
   },
   superGrid: {
     columnConfig: 'Column Config',

package/src/permission.js

@@ -6,7 +6,6 @@ import router, { errorRouterMap } from './router'
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 import { Message } from '@gcommon/gcommon-ui'
 import Vue from 'vue'
-// import { validateCacheVersion } from './utils/common-util'
 
 const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
 router.beforeEach((to, from, next) => {

package/src/utils/common-util.js

@@ -1,9 +1,6 @@
 import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
 import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
-import {
-  getI18n
-} from './util'
 /**
  * 获得相对地址
  */
@@ -338,68 +335,3 @@ export function cacheCurrentLanguageUtil(http) {
     }
   })
 }
-
-// 验证系统版本，确定是否需要重新加载
-export function validateCacheVersion() {
-  // 将自定义系统编码放入header中
-  const customSystem = Vue.prototype.systemCode
-  console.log('validateCacheVersion----customSystem=', customSystem)
-  if (customSystem) {
-    const cacheVersion = localStorage.getItem('VUE_APP_VERSION_' + customSystem)
-    console.log('validateCacheVersion----cacheVersion=', cacheVersion)
-    if (process.env.VUE_APP_VERSION && cacheVersion && cacheVersion !== process.env.VUE_APP_VERSION) {
-      // 表示缓存的版本和当前发布的版本不一致，需要清除缓存
-      console.log('validateCacheVersion----1111----')
-      const message = getI18n().t('imatrixUIMessage.systemCacheVersionNotEqual', { systemCode: customSystem })
-      alert(message)
-      clearBrowserCache(customSystem)
-    } else if (process.env.VUE_APP_VERSION) {
-      // 表示缓存的版本和当前发布的版本一致，或cacheVersion是空，表示没有缓存过
-      console.log('validateCacheVersion----2222----')
-      localStorage.setItem('VUE_APP_VERSION_' + customSystem, process.env.VUE_APP_VERSION)
-    }
-  }
-}
-
-function clearCache() {
-  const version = process.env.VUE_APP_VERSION
-  // 获取所有需要清除缓存的元素，如图片、CSS文件、JavaScript文件等
-  const elements = document.getElementsByTagName('link')
-  for (let i = 0; i < elements.length; i++) {
-    const element = elements[i]
-    console.log('elementLink[', i, ']', element)
-    // 将资源的URL后面加上缓存版本号
-    element.href = element.href + '?v=' + version
-  }
-
-  // 同样的方法清除JavaScript文件的缓存
-  const elementsScripts = document.getElementsByTagName('script')
-  for (let i = 0; i < elementsScripts.length; i++) {
-    const elementScript = elementsScripts[i]
-    console.log('elementScript[', i, ']', elementScript)
-    elementScript.src = elementScript.src + '?v=' + version
-  }
-
-  // // 清除图片的缓存
-  // elements = document.getElementsByTagName('img')
-  // for (let i = 0; i < elements.length; i++) {
-  //   const element = elements[i]
-  //   element.src = element.src + '?v=' + version
-  // }
-}
-
-function redirectToCurrentPage() {
-  // 重定向到当前页面
-  window.location.reload()
-}
-
-// 重新加载页面
-export function clearBrowserCache(customSystem) {
-  // 调用清除缓存的方法
-  clearCache()
-  // 调用重定向到当前页面的方法
-  redirectToCurrentPage()
-  if (customSystem) {
-    localStorage.setItem('VUE_APP_VERSION_' + customSystem, process.env.VUE_APP_VERSION)
-  }
-}

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   getToken,
   removeToken
@@ -142,12 +142,35 @@ service.interceptors.response.use(
         if (error.response.data && error.response.data.message) {
           message = error.response.data.message
         }
-        Message({
-          showClose: true,
-          message: message,
-          type: 'error',
-          duration: 5 * 1000
-        })
+        let isHtml = 'false'
+        let htmlMsg
+        try {
+          const msgObj = JSON.parse(message)
+          isHtml = msgObj['htmlFlag']
+          htmlMsg = msgObj['message']
+        } catch (error) {
+          console.log('message is not JSON')
+        }
+        if (isHtml !== undefined && isHtml === 'true') {
+          // 表示显示html片段
+          Message({
+            dangerouslyUseHTMLString: true,
+            showClose: true,
+            message: htmlMsg,
+            type: 'error',
+            duration: 5 * 1000
+          })
+        } else {
+          if (htmlMsg) {
+            message = htmlMsg
+          }
+          Message({
+            showClose: true,
+            message: message,
+            type: 'error',
+            duration: 5 * 1000
+          })
+        }
         return Promise.reject(error)
       } else {
         let message = error.message