byt-ui 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byt-ui",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "private": false,
   "description": "byt组件库",
   "author": {

package/packages/common/index.js

@@ -2,7 +2,7 @@
  * @Description:
  * @Author: 王国火
  * @Date: 2022-09-19 10:17:14
- * @LastEditTime: 2024-04-18 16:26:34
+ * @LastEditTime: 2024-04-22 12:56:46
  * @LastEditors: 王国火
  */
 // 动态引入
@@ -11,10 +11,13 @@ const requireContext = require.context('./modules', true, /.*\.js/)
 requireContext.keys().map(key => {
   const reg = /\w+/
   const k = key.match(reg)[0]
-  if (requireContext(key).default) {
-    conmmon[k] = requireContext(key).default
-  } else {
-    conmmon = Object.assign(conmmon, requireContext(key))
+  const cnt = requireContext(key)
+  if (!cnt) return
+  const conf = { ...cnt }
+  if (conf.default) {
+    conmmon[k] = conf.default
+    delete (conf.default)
   }
+  conmmon = Object.assign(conmmon, cnt)
 })
 export default conmmon

package/packages/common/modules/cookie.js

@@ -2,22 +2,30 @@
  * @Description:
  * @Author: 王国火
  * @Date: 2022-10-18 12:37:03
- * @LastEditTime: 2024-04-19 13:27:26
+ * @LastEditTime: 2024-04-22 14:40:35
  * @LastEditors: 王国火
  */
 import Cookie from 'js-cookie'
 import website from './website'
 export const getCookie = (key) => {
-  const searchKey = `${website.key}-${key}`
-  return Cookie.get(searchKey) || ''
+  const fullKey = `${website.key}-${key}`;
+  return Cookie.get(fullKey, {
+    domain: window.location.hostname
+  }) || ''
 }
 
 export const setCookie = (key, value, expires = 7, path = '/') => {
-  return Cookie.set(`${website.key}-${key}`, value, { expires, path })
+  const fullKey = `${website.key}-${key}`;
+  return Cookie.set(fullKey, value, {
+    expires,
+    path,
+    domain: window.location.hostname
+  })
 }
 
 export const removeCookie = (key, path = '/') => {
-  return Cookie.remove(`${website.key}-${key}`, {
+  const fullKey = `${website.key}-${key}`;
+  return Cookie.remove(fullKey, {
     path,
     domain: window.location.hostname
   })

package/packages/common/modules/request.js

@@ -0,0 +1,159 @@
+import axios from 'axios'
+import { Message } from 'element-ui'
+import { getCookie } from './cookie'
+
+class Request {
+  constructor(config = {}) {
+    const { options = {}, handler = {}} = config;
+    this.request = null;
+    this._errorCode = {
+      '000': '操作太频繁，请勿重复请求',
+      '401': '当前操作没有权限',
+      '403': '当前操作没有权限',
+      '404': '接口不存在',
+      '417': '未绑定登录账号，请使用密码登录后绑定',
+      '423': '演示环境不能操作，如需了解联系我们',
+      '426': '用户名不存在或密码错误',
+      '428': '验证码错误,请重新输入',
+      '429': '请求过频繁',
+      '479': '演示环境，没有权限操作',
+      'default': '系统未知错误,请反馈给管理员'
+    }
+    this._methods = ['get', 'post', 'delete', 'put']
+    this.handler = Object.assign({}, handler);
+    this.options = Object.assign({}, {
+      baseURL: '/bytserver',
+      responseType: 'json',
+      timeout: 60000,
+      withCredentials: false
+    }, options)
+    // 注册fetch;
+    this.register()
+  }
+
+  interceptors() {
+    // HTTPrequest拦截
+    this.request.interceptors.request.use(config => {
+      const TENANT_ID = getCookie('tenantId')
+      const isToken = (config.headers || {}).isToken === false
+      const token = getCookie('access_token')
+      if (token && !isToken) {
+        config.headers['Authorization'] = `Bearer ${token}`// token
+      }
+      if (TENANT_ID) {
+        config.headers['TENANT-ID'] = TENANT_ID // 租户ID
+      }
+      return config
+    }, error => {
+      return Promise.reject(error)
+    })
+
+    // HTTPresponse拦截
+    this.request.interceptors.response.use(res => {
+      const status = Number(res.status) || 200
+      const message = res.data.msg || this._errorCode[status] || this._errorCode['default']
+      switch (status * 1) {
+        case 200:
+          if (res.data.code === 1) {
+            Message.error(message)
+            this.handler.error && this.handler.error(res.data);
+            return Promise.reject(res.data)
+          }
+          this.handler.success && this.handler.success(res.data)
+          return res.data
+        case 424:
+        case 428:
+          // 后台定义 424||428 针对令牌过期的特殊响应码
+          this.handler.expire && this.handler.expire(res.data);
+          break;
+        default:
+          Message.error(message);
+          this.handler.error && this.handler.error(res.data);
+          return Promise.reject(message)
+      }
+    }, error => {
+      if (error.response) {
+        const status = error.response.status
+        switch (status) {
+          case 404:
+            Message.error(this._errorCode[status])
+            break;
+          case 503:
+            Message.error(error.response.data.msg)
+            break;
+        }
+        this.error && this.error(error.response);
+      }
+      return Promise.reject(new Error(error))
+    })
+  }
+
+  setMethods() {
+    this._methods.forEach(v => {
+      this.request[v] = ({
+        url,
+        data = {},
+        params = {},
+        responseType = 'json',
+        headers = {},
+        retry = 0
+      }) => {
+        return new Promise((resolve, reject) => {
+          this.request({
+            url,
+            method: v.toUpperCase(),
+            data,
+            params,
+            responseType,
+            headers
+          }).then(res => {
+            if (
+              !res.code ||
+              res.code === 0 ||
+              responseType == 'arraybuffer' ||
+              responseType == 'blob'
+            ) {
+              resolve(res)
+            } else {
+              Message.error(res.msg)
+              reject(res)
+            }
+          }).catch(err => {
+            // 重试请求
+            reject(err)
+            if (retry > 0) {
+              this.request[v]({
+                url,
+                data,
+                params,
+                responseType,
+                headers,
+                retry: retry - 1
+              })
+            }
+          })
+        })
+      }
+    })
+  }
+
+  register() {
+    this.request = axios.create(this.options)
+
+    // 添加拦截器
+    this.interceptors();
+
+    // 覆盖自定义方法
+    this.setMethods();
+  }
+}
+
+export const { request } = new Request()
+
+export default {
+  install(Vue, options = {}) {
+    const { request } = new Request(Object.assign({}, options))
+    Vue.prototype.$http = request
+  }
+}
+

package/packages/common/modules/{Sentry.js → sentry.js}

@@ -2,7 +2,7 @@
  * @Description:
  * @Author: 王国火
  * @Date: 2024-04-18 15:37:44
- * @LastEditTime: 2024-04-19 13:50:16
+ * @LastEditTime: 2024-04-22 08:56:36
  * @LastEditors: 王国火
  */
 import * as sentry from '@sentry/vue'
@@ -21,9 +21,34 @@ class Sentry {
     this.register();
   }
 
+  getUserInfo() {
+    // 处理要提交的用户信息
+    const { fullPath } = this.router.currentRoute;
+    const userInfo = getCookie('userInfo') || getStore('userInfo');
+    const tenantId = getCookie('tenantId') || ''
+    const params = {
+      path: fullPath,
+      title: document.title,
+      ip: window.location.host
+    }
+    let opts = {};
+    if (userInfo) {
+      const info = JSON.parse(userInfo);
+      const { username, email } = info;
+      opts = Object.assign(params, info, {
+        id: tenantId,
+        username,
+        email
+      })
+    } else {
+      opts = params
+    }
+    return opts
+  }
+
   captureEvent({
     message = '',
-    level = 'error',
+    level = 'info',
     tags = {
       type: 'xhr-error',
       category: 'xhr-category'
@@ -31,6 +56,7 @@ class Sentry {
     extra = {},
     breadcrumbs = []
   }) {
+    // 错误上报
     sentry.captureEvent({
       message,
       level,
@@ -40,6 +66,7 @@ class Sentry {
     })
   }
   init(dsn) {
+    // init调用
     const params = {
       Vue: this.Vue,
       dsn,
@@ -60,32 +87,16 @@ class Sentry {
       },
       beforeSend: (e) => {
         // 请求发送前添加用户信息
-        const { fullPath } = this.router.currentRoute;
-        const userInfo = getCookie('userInfo') || getStore('userInfo');
-        const tenantId = getCookie('tenantId') || ''
-        const params = {
-          path: fullPath,
-          title: document.title,
-          ip: window.location.host
-        }
-        if (userInfo) {
-          const info = JSON.parse(userInfo);
-          const { username, email } = info;
-          e.user = Object.assign(params, info, {
-            id: tenantId,
-            username,
-            email
-          })
-        } else {
-          e.user = params
-        }
+        e.user = this.getUserInfo();
         return e;
       },
       beforeSendTransaction: (e) => {
+        // 请求发送前添加用户信息,修改transaction为title
         e.transaction = document.title
+        e.user = this.getUserInfo();
         return e
       },
-      // 任何请求都会调用的函数，处理请求status_code不是200时，自定义上报错误信息
+      // 任何请求都会调用的函数，处理请求status_code不是200时，或者code=1,自定义上报错误信息
       beforeBreadcrumb: (scope, hint) => {
         if (scope.category == 'xhr') {
           const statusCode = scope.data.status_code;
@@ -135,23 +146,29 @@ class Sentry {
     // 允许自定义配置覆盖、合并默认配置
     sentry.init(Object.assign({}, params, this.options))
   }
-  register() {
-    this.axios({
+  async register() {
+    const res = await this.axios({
       url: '/leo-tech-bridge/sysParam/getSentryDsn',
       method: 'GET'
-    }).then((res) => {
-      // 需要兼容商城和业务中台
-      const val = res instanceof Object ? res.data : res
-      if (val) {
-        // 重新处理拼接dsn地址
-        const localhost = window.location;
-        const result = val.split('@');
-        const dsn = `${localhost.protocol}//${result[0]}@${localhost.host}${result[1]}`;
-        this.init(dsn);
-      }
-    })
+    });
+    // 需要兼容商城和业务中台
+    const val = res instanceof Object ? res.data : res;
+    if (val) {
+      // 重新处理拼接dsn地址
+      const localhost = window.location;
+      const result = val.split('@');
+      const dsn = `${localhost.protocol}//${result[0]}@${localhost.host}${result[1]}`;
+      this.init(dsn);
+    }
   }
 }
 
-export default Sentry
+export default {
+  install(Vue, options) {
+    const sentry = new Sentry(Object.assign({
+      Vue
+    }, options))
+    Vue.prototype.$sentry = sentry
+  }
+}