From ada9f94217a94b4140dc07023a990fadb6e52fa5 Mon Sep 17 00:00:00 2001
From: yuyuanshifu <747342561@qq.com>
Date: Fri, 24 Jul 2020 22:00:45 +0800
Subject: [PATCH] add dataset_id

---
 templates/repo/datasets/index.tmpl |  4 +++-
 web_src/js/App.vue                 | 29 ++++++-----------------------
 web_src/js/index.js                |  4 ----
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl
index 7f292d99e..d4d015708 100755
--- a/templates/repo/datasets/index.tmpl
+++ b/templates/repo/datasets/index.tmpl
@@ -65,7 +65,9 @@
           </div>
           <div class="dataset ui middle very relaxed page">
             <div class="column">
-              <div id=uploader></div>
+              <div id="datasetId" datasetId="{{.dataset.ID}}">
+              <div id="uploader">
+              </div>
             </div>
           </div>
         </div>
diff --git a/web_src/js/App.vue b/web_src/js/App.vue
index 76a341d03..d16699fbe 100755
--- a/web_src/js/App.vue
+++ b/web_src/js/App.vue
@@ -28,27 +28,10 @@
   export default {
     data () {
       return {
-        /*options: {
-          target: 'http://localhost:9000/upload',
-          testChunks: false,
-          chunkSize: 1024*1024*64,  //64MB
-          simultaneousUploads: 1, //并发上传数
-          headers: {
-                'access-token': 'abcd1234'
-          },
-          maxChunkRetries: 3, //最大自动失败重试上传次数
-            parseTimeRemaining: function (timeRemaining, parsedTimeRemaining) { //格式化时间
-                return parsedTimeRemaining
-                    .replace(/\syears?/, '年')
-                    .replace(/\days?/, '天')
-                    .replace(/\shours?/, '小时')
-                    .replace(/\sminutes?/, '分钟')
-                    .replace(/\sseconds?/, '秒')
-            }
-        },*/
         attrs: {
-          accept: 'img/*'
+          accept: '*'
         },
+        props: ["datasetId"],
         panelShow: false,   //选择文件后，展示上传panel
         collapse: false,
         statusTextMap: {
@@ -59,17 +42,17 @@
             waiting: '等待中...',
             cmd5: '计算md5...'
         },
-
         fileStatusText: (status, response) => {
             return this.statusTextMap[status];
         },
       }
     },
     created() {
-        //const uploaderInstance = this.$refs.uploader.uploader;
+        //const uploaderInstance = this.$refs.uploader;
     },
     methods: {
         onFileAdded(file) {
+          file.datasetId = document.getElementById("datasetId").getAttribute("datasetId");
           // 计算MD5
           this.computeMD5(file);
         },
@@ -212,7 +195,7 @@
                   uploadID: file.uploadID,
                   file_name: file.name,
                   size: file.size,
-                  //dataset_id: datasetID,
+                  dataset_id: file.datasetId,
                   _csrf: csrf
                 })).then(function (response) {
                   resolve(response);
@@ -233,7 +216,7 @@
                   console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk +1}/${chunks}个分片上传`);
                   await loadNext();
               } else {
-                  //console.log(dataset_id)
+                  //console.log({{.dataset_id}});
                   await completeUpload();
                   console.log(`文件上传完成：${file.name} \n分片：${chunks} 大小:${file.size} 用时：${(new Date().getTime() - time)/1000} s`);
                   //window.location.reload();
diff --git a/web_src/js/index.js b/web_src/js/index.js
index b88ab861e..ecad070c2 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -3172,15 +3172,11 @@ function initVueApp() {
 }
 
 function initVueUploader() {
-  //console.log($dataset.data('dataset-id'));
   /* eslint-disable no-new */
   new Vue({
     el: '#uploader',
     components: { App },
     template: '<App/>'
-    /*props: {
-      dataset_id: $dataset.data('dataset-id')
-    }*/
   });
 }