Merge remote-tracking branch 'origin/master' into master

jero-web/src/components/ImportFile/index.vue

@@ -4,8 +4,8 @@
               class="upload-text"
               :multiple="false" :headers="tokenHeader"
               :action="importUrl+'?cut='+cut"
-              @change="handleImportZip"
-              accept=".zip">
+              @change="handleImport"
+              :accept="accept">
       <a-icon type="import" :rotate="270"/>
       {{$t('import')}}
     </a-upload>
@@ -28,12 +28,16 @@
       isTrue:{
         type: Boolean,
         default: false
-      }
+      },
+      accept:{
+        type: String,
+        default: ''
+      },
     },
     data() {
       return {
         tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
-        importUrl: window._CONFIG['domianURL'] + this.url.importZipUrl,
+        importUrl: window._CONFIG['domianURL'] +'/'+ this.url.importZipUrl,
         cut: '',
       }
     },
@@ -47,7 +51,7 @@
       }
     },
     methods: {
-      handleImportZip(info) {
+      handleImport(info) {
         this.spinning = true
         if (info.file.status !== 'uploading') {
           console.log(info.file, info.fileList)