Merge branch 'feat-html2md-import' into beta

src/components/pages/knowledge/folderFileBox.vue

@@ -700,6 +700,8 @@ export default {
     },
     handleWebUrlConfirm(dataFromForm) {
       if (!dataFromForm) return;
+      this.proVisible = true;
+      // this.isLoading = true;
       // 直接 decode，不用判断前缀
       // let url = decodeURIComponent(dataFromForm.url);
 
@@ -746,7 +748,7 @@ export default {
             // 获取文件名和id
             // const fileName = response.data.results && response.data.results.filename ? response.data.results.filename : url;
             const fileName = response.data.title;
-            const documentId = response.data.results && response.data.results.documentId;
+            const documentId = response.data.results && response.data.results.document_id;
 
             const status =
               response && response.status === 200
@@ -820,6 +822,8 @@ export default {
         console.error(err);
         this.$message.error(this.lang.uploadFail);
       }
+      this.proVisible = false;
+
     },
     async uploadFile(formData, name, uuid) {
       try {
@@ -1293,7 +1297,7 @@ export default {
   left: 0;
   width: 100%;
   height: 100%;
-  z-index: 90;
+  z-index: 4000;
   display: flex;
   align-items: center;
   justify-content: center;