Merge branch 'master-V32-LH' into 'master'

文档管理无根目录建文件报错问题修改



See merge request !376

@@ -274,6 +274,9 @@ export default {
 
 
         // 获取表格树
         // 获取表格树
         let getPage = (id) => {
         let getPage = (id) => {
+            if(id==undefined){
+                id='';
+            }
             let docIds = props.fileIds.length == 0 ? '' : props.fileIds.join(',')
             let docIds = props.fileIds.length == 0 ? '' : props.fileIds.join(',')
             let params = {
             let params = {
                 id: id,
                 id: id,
@@ -333,14 +336,15 @@ export default {
 
 
         // 刷新
         // 刷新
         let reload = (loadTree) => {
         let reload = (loadTree) => {
+
             // 属性tree
             // 属性tree
             setTimeout(function () {
             setTimeout(function () {
                 let id = currentNodeData.value.id;
                 let id = currentNodeData.value.id;
-
                 if (loadTree && loadTree == true) {
                 if (loadTree && loadTree == true) {
                     getTree();
                     getTree();
                 } else {
                 } else {
-                    getPage(id);
+                    // getPage();
+                    getTree();
                 }
                 }
 
 
 
 
@@ -533,11 +537,15 @@ export default {
          * @param type 文件夹或者文档
          * @param type 文件夹或者文档
          */
          */
         let addFolder = (id) => {
         let addFolder = (id) => {
+
             proxy.$refs[id].validate((valid) => {
             proxy.$refs[id].validate((valid) => {
                 if (valid) {
                 if (valid) {
                     let params = docForm.value;
                     let params = docForm.value;
-                    params.pid = currentNodeData.value.id;
-
+                    if (currentNodeData.value.id == undefined || currentNodeData.value.id == '') {
+                        params.pid = '0'
+                    } else {
+                        params.pid = currentNodeData.value.id;
+                    }
                     if (isUserFolder.value) {
                     if (isUserFolder.value) {
                         params.id = "";
                         params.id = "";
                         params.docNo = "user";
                         params.docNo = "user";
@@ -557,6 +565,7 @@ export default {
                     let isUser = !isUserFolder.value;
                     let isUser = !isUserFolder.value;
                     reload(isUser);
                     reload(isUser);
                     showFolder(false, isUser);
                     showFolder(false, isUser);
+
                 } else {
                 } else {
                     console.log('error submit!!')
                     console.log('error submit!!')
                     return false
                     return false