From 732fdeefb542a97b28ac7b906d69b22afffceb42 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Thu, 28 Apr 2022 10:05:38 +0800
Subject: [PATCH] fix issue

---
 templates/repo/attachment/upload.tmpl   |  7 ++++---
 web_src/js/components/MinioUploader.vue | 23 +++++++----------------
 web_src/js/index.js                     |  4 ++++
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/templates/repo/attachment/upload.tmpl b/templates/repo/attachment/upload.tmpl
index 7700484e8..150cfbdba 100644
--- a/templates/repo/attachment/upload.tmpl
+++ b/templates/repo/attachment/upload.tmpl
@@ -13,15 +13,16 @@
                   <el-form  label-width="140px">
                       {{.CsrfTokenHtml}}
                       <el-form-item label='{{$.i18n.Tr "dataset.dataset_available_clusters"}}:' prop="title">
-                          <el-button :class="{active:type==0}" size="small" style="margin: 0;border-radius: 0.28571429rem 0 0 0.28571429rem;" @click="uploadGpu">CPU/GPU</el-button>
-                          <el-button :class="{active:type==1}" size="small" style="margin: 0 0 0 -4px;border-radius: 0 0.28571429rem 0.28571429rem 0;" @click="uploadNpu">NPU</el-button>
+                          ${clusterFlag}
+                          <el-button :class="{active:type==0}" :disabled="clusterFlag" size="small" style="margin: 0;border-radius: 0.28571429rem 0 0 0.28571429rem;" @click="uploadGpu">CPU/GPU</el-button>
+                          <el-button :class="{active:type==1}" :disabled="clusterFlag" size="small" style="margin: 0 0 0 -4px;border-radius: 0 0.28571429rem 0.28571429rem 0;" @click="uploadNpu">NPU</el-button>
                           <!-- <span>请输入字母、数字、_和-，最长64个字符，且不能以中划线（-）结尾。</span> -->
                       </el-form-item>
                       <el-form-item label='{{$.i18n.Tr "dataset.file_description"}}:' prop="description">
                           <el-input type="textarea" :rows="3" maxlength="255" placeholder="{{$.i18n.Tr "repo.modelarts.train_job.new_place"}}" v-model="desc"></el-input>
                       </el-form-item>
                       <el-form-item label='{{$.i18n.Tr "dataset.data_upload"}}:' prop="category">
-                            <minio-uploader :uploadtype="type" :desc="desc"></minio-uploader>
+                            <minio-uploader :uploadtype="type" :desc="desc" @setcluster="setcluster"></minio-uploader>
                       </el-form-item>        
                         <div style='display:none;'
                         id="minioUploader-params"
diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue
index 0ff2f097d..8611d8b78 100755
--- a/web_src/js/components/MinioUploader.vue
+++ b/web_src/js/components/MinioUploader.vue
@@ -132,40 +132,35 @@ export default {
       $('.maxfilesize.ui.red.message').css('display','none')
     })
     dropzoneUploader.on('maxfilesexceeded', function (file) {
-      console.log("maxfilesexceeded")
-      // if (this.files[0].status !== 'success') {
-      //   alert(this.dropzoneParams.data('waitting-uploading'));
-      //   this.removeFile(file);
-      //   return;
-      // }
       dropzoneUploader.removeFile(file)
       $('.maxfilesize.ui.red.message').text("单次最多上传10个文件，单个文件不超过200G")
       $('.maxfilesize.ui.red.message').css('display','block')
-      // this.removeAllFiles();
-      // this.addFile(file);
-    });
 
+    });
     this.dropzoneUploader = dropzoneUploader;
-    console.log(this.dropzoneUploader)
   },
   watch:{
     allUploadLength(len){
-        console.log(len)
         if(len===this.uploadFiles.length){
           setTimeout(() => {
           this.dropzoneUploader.removeAllFiles(true)
           this.btnFlag = false
+          this.$emit('setcluster',this.btnFlag)
         }, 2000);
         }
     }
   },
   methods: {
     startUpload(){
+      this.uploadFiles = this.dropzoneUploader.getQueuedFiles()
+      if(this.uploadFiles.length===0){
+        return
+      }
       this.resetStatus()
       $('.dz-remove').remove()
       $('.maxfilesize.ui.red.message').css('display','none')
       this.btnFlag = true
-      this.uploadFiles = this.dropzoneUploader.getQueuedFiles()
+      this.$emit('setcluster',this.btnFlag)
       this.uploadFiles.forEach(element => {
         element.datasetId = document.getElementById('datasetId').getAttribute('datasetId')
         this.computeMD5(element)
@@ -226,7 +221,6 @@ export default {
       file.previewTemplate.querySelector(
         '.dz-progress'
       ).style.opacity = 0
-      console.log()
       if(this.uploadLength === this.uploadFiles.length){
         setTimeout(() => {
         window.location.href = this.repoPath
@@ -235,7 +229,6 @@ export default {
     },
 
     computeMD5(file) {
-      console.log("computeMD5-file:",file)
       const blobSlice =
           File.prototype.slice ||
           File.prototype.mozSlice ||
@@ -269,7 +262,6 @@ export default {
             (currentChunk / chunks) *
             100
           ).toFixed(2)}% (${currentChunk}/${chunks})`;
-          console.log("this.status",this.status)
           this.updateProgress(file, ((currentChunk / chunks) * 100).toFixed(2));
           loadMd5Next();
           return;
@@ -580,7 +572,6 @@ export default {
             this.allUploadLength++
             this.uploadError(file,info)
             this.allUploadFiles.push({name:file.name,status:2,info:info})
-            console.log("err",err)
             if(err){
               return
             }
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 36ffce55b..88529bf8a 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -3837,6 +3837,7 @@ function  initVueDataset() {
       suburl: AppSubUrl,
       url:'',
       checked:false,
+      clusterFlag:false,
       type:0,
       desc:'',
       descfile:'',
@@ -4051,6 +4052,9 @@ function  initVueDataset() {
       gotoAnnotate(repolink,uuid,type){
         location.href = `${AppSubUrl}${repolink}/datasets/label/${uuid}?type=${type}`
       },
+      setcluster(val){
+        this.clusterFlag = val
+      },
       uploadGpu(){
         this.type=0
       },