byt-ui 0.1.10 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byt-ui",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "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

@@ -43,9 +43,8 @@ class Request {
       if (token && !isToken) {
         config.headers['Authorization'] = `Bearer ${token}`// token
       }
-      if (TENANT_ID) {
-        config.headers['TENANT-ID'] = TENANT_ID // 租户ID
-      }
+      config.headers['TENANT-ID'] = TENANT_ID || this.getQueryString('TENANT-ID') || '' // 租户ID
+
       return config
     }, error => {
       return Promise.reject(error)
@@ -94,6 +93,14 @@ class Request {
     })
   }
 
+  getQueryString(name) {
+    const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`, 'i')
+    const r = window.location.search.substr(1).match(reg)
+    if (r != null) {
+      return decodeURIComponent(r[2])
+    }
+    return null
+  }
   setMethods() {
     this._methods.forEach(v => {
       this.request[v] = ({