Merge pull request #56 from walle233/feat-oss

Update bucket add quota param

Author: maslow

packages/app-console/src/api/oss.js

@@ -61,13 +61,14 @@ export async function createBucket(bucketName, mode, quota) {
  * @param {number} mode
  * @returns {Promise<any[]>}
  */
-export async function updateBucket(bucketName, mode) {
+export async function updateBucket(bucketName, mode, quota) {
   const appid = store.state.app.appid
   const res = await request({
     url: `/apps/${appid}/oss/buckets/${bucketName}`,
     method: 'put',
     data: {
-      mode
+      mode,
+      quota
     }
   })
 

packages/app-console/src/styles/index.scss

@@ -173,6 +173,7 @@ aside {
 
 .filter-container {
   padding-bottom: 10px;
+  position: relative;
 
   .filter-item {
     display: inline-block;

packages/app-console/src/utils/file.js

@@ -51,3 +51,21 @@ export function validateFileName(name) {
   const reg = /^[^\\\/\:\*\?\"\<\>\|\.]+$/
   return reg.test(name)
 }
+
+export function byte2gb(bytes) {
+  return Math.floor(bytes / 1024 / 1024 / 1024)
+}
+
+export function gb2byte(gb) {
+  return gb * 1024 * 1024 * 1024
+}
+
+export function byte2GbOrMb(bytes) {
+  if (bytes >= 1024 * 1024 * 1024) {
+    return `${Math.floor(bytes / 1024 / 1024 / 1024)} GB`
+  } else if (bytes > 1024 * 1024) {
+    return `${Math.floor(bytes / 1024 / 1024)} MB`
+  } else {
+    return `${Math.floor(bytes / 1024)} KB`
+  }
+}

packages/app-console/src/views/storage/buckets.vue

@@ -193,11 +193,12 @@ export default {
       const ret = await oss.getBuckets().catch(() => { this.listLoading = false })
       assert(ret.code === 0, 'get file buckets got error')
 
-      this.list = ret.data
       const usedQuota = ret.data.reduce((total, bucket) => {
         return total + bucket.quota
       }, 0)
       this.freeQuota = this.totalQuota - this.byte2gb(usedQuota)
+
+      this.list = ret.data
       this.listLoading = false
     },
     // 显示创建表单
@@ -219,7 +220,7 @@ export default {
         }
 
         if (this.freeQuota < this.form.quota) {
-          return showError('Bucket 容量不能超过总容量')
+          return showError('所有Bucket容量相加不能超过总容量')
         }
         const quota = this.gb2byte(this.form.quota)
         // 执行创建请求
@@ -246,7 +247,7 @@ export default {
     },
     // 显示编辑表单
     showEditForm(row) {
-      this.form = { ...row }
+      this.form = { ...row, quota: this.byte2gb(row.quota) }
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {
@@ -258,8 +259,16 @@ export default {
       this.$refs['dataForm'].validate(async(valid) => {
         if (!valid) { return }
 
+        // 检查quota是否可用
+        const existedQuota = this.list.find(bucket => bucket.name === this.form.name).quota
+        const freeQuota = this.freeQuota + this.byte2gb(existedQuota)
+        if (freeQuota < this.form.quota) {
+          return showError('所有Bucket容量相加不能超过总容量')
+        }
+        const quota = this.gb2byte(this.form.quota)
+
         // 执行更新请求
-        const r = await oss.updateBucket(this.form.name, this.form.mode)
+        const r = await oss.updateBucket(this.form.name, this.form.mode, quota)
 
         if (r.code) {
           this.$notify({

packages/app-console/src/views/storage/files.vue

@@ -21,6 +21,11 @@
         <span style="font-size: 16px;color: gray; margin-right: 5px;">当前:</span>
         <path-link :path="currentPath" :bucket="bucket" @change="onChangeDirectory" />
       </div>
+      <div class="filter-item tips">
+        <span>bucket容量：{{ bucketQuota }} </span>
+        <span>已用容量：{{ bucketSize }} </span>
+        <span>文件数量：{{ bucketObjects }} </span>
+      </div>
     </div>
 
     <!-- 表格 -->
@@ -105,7 +110,7 @@
         :show-file-list="true"
         :file-list="uploadFileList"
         :auto-upload="true"
-        :http-request="uploadFile"
+        :http-request="handleUploadFile"
       >
         <i class="el-icon-upload" />
         <div class="el-upload__text">
@@ -122,6 +127,7 @@ import * as oss from '@/api/oss'
 import { assert } from '@/utils/assert'
 import { showError, showSuccess } from '@/utils/show'
 import PathLink from './components/path-link.vue'
+import { byte2gb, byte2GbOrMb, gb2byte } from '@/utils/file'
 
 export default {
   name: 'BucketsListPage',
@@ -131,16 +137,19 @@ export default {
       bucket: null,
       bucketDetail: {
         name: '',
-        mode: 0,
+        mode: 'private',
         full_token: '',
         read_token: '',
-        credentials: {}
+        credentials: {},
+        objects: 0,
+        size: 0,
+        quota: 0,
       },
       tableKey: 0,
       list: null,
       currentPath: '/',
       total: 0,
-      listLoading: true,
+      listLoading: false,
       listQuery: {
         page: 1,
         limit: 20,
@@ -153,9 +162,20 @@ export default {
       },
       downloadLoading: false,
       uploadCommand: 'uploadFile',
-      uploadFileList: []
+      uploadFileList: [],
     }
   },
+  computed: {
+    bucketQuota() {
+      return this.bucketDetail.quota ? byte2GbOrMb(this.bucketDetail.quota) : 0
+    },
+    bucketSize() {
+      return this.bucketDetail.size ? byte2GbOrMb(this.bucketDetail.size) : 0
+    },
+    bucketObjects() {
+      return this.bucketDetail.objects
+    },
+  },
   async created() {
     this.bucket = this.$route.params?.bucket
 
@@ -168,21 +188,25 @@ export default {
     /**
      * 获取数据列表
      */
-    async getList() {
+    getList(upload = false) {
+      if (this.listLoading) return
       this.listLoading = true
-      // 拼装查询条件 by this.listQuery
-      // const { limit, page } = this.listQuery
-      // 执行数据查询
-      const res = await oss.getFilesByBucketName(this.bucket, {
-        marker: undefined,
-        prefix: this.currentPath,
-        credentials: this.bucketDetail.credentials
-      }).finally(() => { this.listLoading = false })
 
-      const files = res.Contents || []
-      const dirs = res.CommonPrefixes || []
-      this.list = [...files, ...dirs]
-      this.listLoading = false
+      const getList = async () => {
+        const res = await oss.getFilesByBucketName(this.bucket, {
+          marker: undefined,
+          prefix: this.currentPath,
+          credentials: this.bucketDetail.credentials
+        }).finally(() => { this.listLoading = false })
+
+        const files = res.Contents || []
+        const dirs = res.CommonPrefixes || []
+        this.list = [...files, ...dirs]
+        this.listLoading = false
+      }
+
+      // 对多文件或文件夹上传做节流处理
+      upload ? setTimeout(getList, 1000) : getList()
     },
     // 搜索
     handleFilter() {
@@ -253,19 +277,19 @@ export default {
     },
     handleUploadCommand(command) {
       this.dialogFormVisible = true
+      this.uploadCommand = command
       if (command === 'uploadFolder') {
-        this.uploadCommand = 'uploadFolder'
         this.$nextTick(() => {
           document.getElementsByClassName('el-upload__input')[0].webkitdirectory = true
         })
       } else {
-        this.uploadCommand = 'uploadFile'
         this.$nextTick(() => {
           document.getElementsByClassName('el-upload__input')[0].webkitdirectory = false
         })
       }
     },
-    async uploadFile(param) {
+    async handleUploadFile(param) {
+      console.log('upload file', param)
       const file = param.file
       const key = this.currentPath + (file.webkitRelativePath ? file.webkitRelativePath : file.name)
       const res = await oss.uploadAppFile(this.bucket, key, file, this.bucketDetail.credentials, { contentType: file.type })
@@ -274,7 +298,7 @@ export default {
       }
 
       showSuccess('文件上传成功: ' + key)
-      this.getList()
+      this.getList(true)
     },
     // 判断是否为图片类型
     isImage(row) {
@@ -313,6 +337,12 @@ export default {
 </script>
 
 <style scoped>
+.filter-container .tips {
+  font-size: 14px; color: #333;position: absolute;right: 20px;
+}
+.filter-container .tips span {
+  margin-right: 10px;
+}
 .thumb-image {
   width: 100px;
   max-height: 60px;