byt-ui 0.1.11 → 0.1.13

package/package.json

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

package/packages/common/modules/minio.js

@@ -62,7 +62,7 @@ class Minio {
       })
     })
   }
-  upload(file, bucketName, fileName) {
+  putObject(file, bucketName, fileName) {
     return new Promise((resolve, reject) => {
       const metaData = {
         'Content-Type': file.type
@@ -97,13 +97,34 @@ class Minio {
       await this.minioMakeBucket(bucketName)
     }
     return new Promise((resolve, reject) => {
-      this.upload(file, bucketName, fileName).then(res => {
+      this.putObject(file, bucketName, fileName).then(res => {
         resolve(res)
       }).catch((err) => {
         reject(err)
       })
     })
   }
+
+  upload(file, bucketName = 'public', unHodeName = true) {
+    // file：文件
+    // bucketName：桶名
+    // unHodeName：是否保留原文件名，默认不保留
+    // 上传图片至minio
+    const { name } = file;
+    const suffix = name.match(/\.[a-zA-Z\d]+$/i);
+    const fileName = unHodeName ? `${new Date().getTime()}${suffix[0]}` : name
+    return new Promise((resolve, reject) => {
+      this.uploadToMinio({
+        file,
+        bucketName,
+        fileName
+      }).then(() => {
+        resolve(`/minio/${bucketName}/${fileName}`)
+      }).catch(err => {
+        reject(err)
+      })
+    })
+  }
 }
 
 export default {

package/packages/common/modules/request.js

@@ -79,12 +79,20 @@ class Request {
     }, error => {
       if (error.response) {
         const status = error.response.status
+        const message = error.response.data.msg;
         switch (status) {
-          case 404:
-            Message.error(this._errorCode[status])
+          case 424:
+          case 428:
+            // 后台定义 424||428 针对令牌过期的特殊响应码
+            this.handler.expire && this.handler.expire(error.response);
+            Message.error(message);
+            if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
+              const { outLogin } = this._Vue.prototype.$appCommon;
+              outLogin && outLogin();
+            }
             break;
-          case 503:
-            Message.error(error.response.data.msg)
+          default:
+            if (error.config.showError)Message.error(message)
             break;
         }
         this.handler.error && this.handler.error(error.response);
@@ -109,7 +117,8 @@ class Request {
         params = {},
         responseType = 'json',
         headers = {},
-        retry = 0
+        retry = 0,
+        showError
       }) => {
         return new Promise((resolve, reject) => {
           this.request({
@@ -128,7 +137,7 @@ class Request {
             ) {
               resolve(res)
             } else {
-              Message.error(res.msg)
+              if (showError)Message.error(res.msg)
               reject(res)
             }
           }).catch(err => {
@@ -141,7 +150,8 @@ class Request {
                 params,
                 responseType,
                 headers,
-                retry: retry - 1
+                retry: retry - 1,
+                showError
               })
             }
           })