imatrix-ui 2.8.85-dwtmp1 → 2.8.86-dwtmp1

package/package.json

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

package/src/utils/common-util.js

@@ -206,3 +206,20 @@ export function getOrignUrl() {
 export function isPromise(p) {
   return p && Object.prototype.toString.call(p) === '[object Promise]'
 }
+/**
+ * 获得UTC时区
+ * @returns 时区
+ */
+export function getTimeZone() {
+  const dateStr = new Date() + ''
+  let timeZone = ''
+  if (dateStr.indexOf('GMT') > 0) {
+    const timeZoneSuffix = dateStr.substring(dateStr.indexOf('GMT') + 3, dateStr.indexOf('(')).trim()
+    const partPrefix = timeZoneSuffix.substring(0, timeZoneSuffix.length - 2)
+    const partSuffix = timeZoneSuffix.substring(timeZoneSuffix.length - 2)
+    timeZone = 'UTC' + partPrefix + ':' + partSuffix
+  } else if (dateStr.indexOf('UTC') > 0) {
+    timeZone = 'UTC' + dateStr.substring(dateStr.indexOf('UTC') + 3, dateStr.indexOf('(')).trim()
+  }
+  return timeZone
+}

package/src/utils/request.js

@@ -13,7 +13,8 @@ import {
   getI18n
 } from './util'
 import {
-  getRelativeBaseUrl
+  getRelativeBaseUrl,
+  getTimeZone
 } from './common-util'
 // 创建axios实例
 const service = axios.create({
@@ -27,6 +28,8 @@ service.interceptors.request.use(
   config => {
     // 防止重复发送ajax请求
     store.commit('togglePreventReclick', true)
+    const timeZone = getTimeZone()
+    config.headers['timeZone'] = timeZone
     const token = getToken()
     if (token) {
       config.headers['Authorization'] = token // 让每个请求携带自定义token 请根据实际情况自行修改
@@ -61,7 +64,6 @@ service.interceptors.response.use(
     // 出错了之后允许再次提交
     store.commit('togglePreventReclick', false)
     if (error.response) {
-      console.log('请求返回不为空---', error)
       if (error.response.status === 401) {
         // LoginException(401)
         // 清除sessionStorage中的jwt，否则无法转到login页面
@@ -130,15 +132,14 @@ service.interceptors.response.use(
         return Promise.reject(error)
       }
     } else {
-      console.log('请求返回空---', error)
-      // const errorMsg = getI18n().t('imatrixUIMessage.internalServerError')
-      // Message({
-      //   showClose: true,
-      //   message: errorMsg,
-      //   type: 'error',
-      //   duration: 5 * 1000
-      // })
-      // return Promise.reject(error)
+      const errorMsg = getI18n().t('imatrixUIMessage.internalServerError')
+      Message({
+        showClose: true,
+        message: errorMsg,
+        type: 'error',
+        duration: 5 * 1000
+      })
+      return Promise.reject(error)
     }
   }
 )