折叠

src/layout/indexCommon.vue

@@ -893,11 +893,11 @@ const iframeSize = (par,history) => {
   inIframe.style.width = outIframe.style.width =
     outIframe.parentElement.offsetWidth + "px";
       // if(history){
-      //     var widgetIFrameParent = inIframe.parentNode;
+      //     // var widgetIFrameParent = inIframe.parentNode;
       //     outIframe.remove();
       //     // widgetIFrameParent.append("<iframe id=\"widgetIFrame\" style=\"width: 100%;height: 600px\" src=\"\"></iframe>");
-      //     widgetIFrameParent.append("<iframe :src=\"item.src\" frameborder=\"0\" :id=\"`iframe${item.id}`\" :name=\"`iframe${item.id}`\" width=\"100%\" height=\"800px\" class=\"iframeBox\" ></iframe>");
-      //     var widgetIFrameNew = document.getElementById("iframe" + par.id);
+      //     // widgetIFrameParent.append("<iframe :src=\"item.src\" frameborder=\"0\" :id=\"`iframe${item.id}`\" :name=\"`iframe${item.id}`\" width=\"100%\" height=\"800px\" class=\"iframeBox\" ></iframe>");
+      //     // var widgetIFrameNew = document.getElementById("iframe" + par.id);
       //     // widgetIFrameNew.attr('src',encodeURI(par.src));
       //     // widgetIFrameNew.css('width',"100%")
       // }

src/views/department/MyFile.vue

@@ -277,7 +277,7 @@
                                 <template #title>
                                    <span class="file-title">文件</span>
                                 </template>
-                                <el-table v-el-table-infinite-scroll="setScroll" :infinite-scroll-distance="30" :infinite-scroll-disabled="tableBeEnd" v-if="fileGrid == 1" height="38vh" :data="fileList" :scrollbar-always-on="true" style="width: 100%"
+                                <el-table v-el-table-infinite-scroll="setScroll" :infinite-scroll-distance="30" :infinite-scroll-disabled="tableBeEnd" v-if="fileGrid == 1" :height="fileHeight" :data="fileList" :scrollbar-always-on="true" style="width: 100%"
                                     @row-contextmenu="handleRowClick" @selection-change="handleSelectionChange"
                                     @row-click="mouseClick" :default-sort="{ prop: 'createTime', order: 'descending' }">
                                     <el-table-column type="selection" width="55" />
@@ -457,7 +457,7 @@
 </template>
 
 <script>
-import { ref, toRaw, onMounted,onActivated ,inject} from 'vue'
+import { ref, toRaw, onMounted,onActivated ,inject,watch} from 'vue'
 import myfile from '../../api/myfile/myfile'
 import { delFavorite } from '@/api/biz/favorite.js'
 import documents from '../../api/document/document'
@@ -577,6 +577,8 @@ export default {
                 choose: "我的空间"
             }
         ])
+        const fileHeight=ref('38vh')
+        const pageSize = ref(10)
         let useMenu = ref([
             // {
             //     img: ImgFile.copy,
@@ -1793,7 +1795,7 @@ export default {
 
             // console.log('tableBeEnd.value',tableBeEnd.value);
             filePageNum.value = filePageNum.value+1
-            const query = `${thisFolder.value.dirId}?pageSize=10&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             // -------------先禁止掉事件 定时器1秒钟后才能再次触发
             tableBeEnd.value = true
             
@@ -1883,6 +1885,48 @@ export default {
             openScanMove.value = false
             refreshFile()
         }
+        watch(() => folder.value, async(newValue, oldValue) => {
+            // console.log('iFrameData 发生改变了', newValue, oldValue);
+            console.log('files',newValue);
+            filePageNum.value = 1
+            if(!newValue.length){
+                fileHeight.value = '75vh'
+                pageSize.value = 20
+                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const res = await myfile.getById(query)
+                 console.log('filessetScrollres',res);
+                 if (res.code === 200) {
+                    // const newarr = res.rows.concat(toRaw(fileList.value))
+                    const newarr = res.rows
+                    console.log('newarr',newarr);
+                    fileList.value = JSON.parse(JSON.stringify(newarr))
+                    if(newarr.length < tableTotal.value){
+                        //获取后的数量<total就可以再次获取
+                        setTimeout(()=>{
+                            tableBeEnd.value = false 
+                        },1000)
+                    }
+                }
+            }else{
+                pageSize.value = 10
+                fileHeight.value = '38vh'
+                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const res = await myfile.getById(query)
+                 console.log('filessetScrollres',res);
+                 if (res.code === 200) {
+                    // const newarr = res.rows.concat(toRaw(fileList.value))
+                    const newarr = res.rows
+                    console.log('newarr',newarr);
+                    fileList.value = JSON.parse(JSON.stringify(newarr))
+                    if(newarr.length < tableTotal.value){
+                        //获取后的数量<total就可以再次获取
+                        setTimeout(()=>{
+                            tableBeEnd.value = false 
+                        },1000)
+                    }
+                }
+            }
+        });
         onMounted(() => {
             getAllTop()
             getSpaceList()
@@ -2153,8 +2197,9 @@ export default {
             openScanMove,
             closeOpenScanMove,
             scanFileArr,
-            setImg
-
+            setImg,
+            fileHeight,
+            pageSize
         }
     },
     watch: {

src/views/department/components/createTasnsfer.vue

@@ -250,7 +250,7 @@ onMounted(async () => {
 }
 
 .needLog {
-  height: 100%;
+  height: calc(100% - 30px);
 }
 
 :deep(.el-tag__content) {

src/views/department/modalComponebts/Transfer.vue

@@ -368,7 +368,7 @@ export default {
 }
 
 .needLog {
-    height: 100%;
+  height: calc(100% - 30px);
     overflow-y: auto;
 }
 

src/views/myfile/MyFile.vue

@@ -293,7 +293,7 @@
                                        <span class="file-title">文件</span>
                                     </template>
                                     <el-table v-el-table-infinite-scroll="setScroll" :infinite-scroll-distance="30"
-                                        :infinite-scroll-disabled="tableBeEnd" v-if="fileGrid == 1" height="38vh"
+                                        :infinite-scroll-disabled="tableBeEnd" v-if="fileGrid == 1" :height="fileHeight"
                                         :data="fileList" :scrollbar-always-on="true" style="width: 100%;"
                                         @row-contextmenu="handleRowClick" @selection-change="handleSelectionChange"
                                         @row-click="mouseClick" :default-sort="{ prop: 'createTime', order: 'descending' }">
@@ -477,7 +477,7 @@
 </template>
 
 <script>
-import { ref, toRaw, onMounted, inject, onActivated } from 'vue'
+import { ref, toRaw, onMounted, inject, onActivated ,watch} from 'vue'
 import myfile from '../../api/myfile/myfile'
 import {documentation}from "@/api/biz/actor.js"
 import {getInfo}from "@/api/biz/info.js"
@@ -734,6 +734,8 @@ export default {
         const openScanMove = ref(false)
         const pathLabelData = ref([
         ])
+        const fileHeight=ref('38vh')
+        const pageSize = ref(10)
          //控制宫格展示
         const isList = ref(false); //控制显示方式
         const openScan = ref(false)//控制扫描文档显示
@@ -1899,7 +1901,7 @@ export default {
 
             // console.log('tableBeEnd.value',tableBeEnd.value);
             filePageNum.value = filePageNum.value + 1
-            const query = `${thisFolder.value.dirId}?pageSize=10&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             // -------------先禁止掉事件 定时器1秒钟后才能再次触发
             tableBeEnd.value = true
 
@@ -1975,6 +1977,48 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        watch(() => folder.value, async(newValue, oldValue) => {
+            // console.log('iFrameData 发生改变了', newValue, oldValue);
+            console.log('files',newValue);
+            filePageNum.value = 1
+            if(!newValue.length){
+                fileHeight.value = '75vh'
+                pageSize.value = 20
+                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const res = await myfile.getById(query)
+                 console.log('filessetScrollres',res);
+                 if (res.code === 200) {
+                    // const newarr = res.rows.concat(toRaw(fileList.value))
+                    const newarr = res.rows
+                    console.log('newarr',newarr);
+                    fileList.value = JSON.parse(JSON.stringify(newarr))
+                    if(newarr.length < tableTotal.value){
+                        //获取后的数量<total就可以再次获取
+                        setTimeout(()=>{
+                            tableBeEnd.value = false 
+                        },1000)
+                    }
+                }
+            }else{
+                pageSize.value = 10
+                fileHeight.value = '38vh'
+                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const res = await myfile.getById(query)
+                 console.log('filessetScrollres',res);
+                 if (res.code === 200) {
+                    // const newarr = res.rows.concat(toRaw(fileList.value))
+                    const newarr = res.rows
+                    console.log('newarr',newarr);
+                    fileList.value = JSON.parse(JSON.stringify(newarr))
+                    if(newarr.length < tableTotal.value){
+                        //获取后的数量<total就可以再次获取
+                        setTimeout(()=>{
+                            tableBeEnd.value = false 
+                        },1000)
+                    }
+                }
+            }
+        });
         onMounted(() => {
             // if(!thisFolder.value){
             getAllTop()
@@ -2257,7 +2301,9 @@ export default {
             closeOpenScanMove,
             scanFileArr,
             setImg,
-            closeAddFile
+            closeAddFile,
+            fileHeight,
+            pageSize
         }
     },
     watch: {

src/views/myfile/modalComponebts/Transfer.vue

@@ -366,7 +366,7 @@ export default {
   }
 }
 .needLog {
-    height: 100%;
+  height: calc(100% - 30px);
     overflow-y: auto;
 }
 

src/views/publicment/MyFile.vue

@@ -275,7 +275,7 @@
                                 <template #title>
                                    <span class="file-title">文件</span>
                                 </template>
-                                <el-table v-el-table-infinite-scroll="setScroll" :infinite-scroll-distance="10" :infinite-scroll-disabled="tableBeEnd" v-if="fileGrid == 1" :data="fileList" height="38vh" :scrollbar-always-on="true" style="width: 100%"
+                                <el-table v-el-table-infinite-scroll="setScroll" :infinite-scroll-distance="10" :infinite-scroll-disabled="tableBeEnd" v-if="fileGrid == 1" :data="fileList" :height="fileHeight" :scrollbar-always-on="true" style="width: 100%"
                                     @row-contextmenu="handleRowClick" @selection-change="handleSelectionChange"
                                     @row-click="mouseClick" :default-sort="{ prop: 'createTime', order: 'descending' }">
                                     <el-table-column type="selection" width="55" />
@@ -453,7 +453,7 @@
 </template>
 
 <script>
-import { ref, toRaw, onMounted ,onActivated} from 'vue'
+import { ref, toRaw, onMounted ,onActivated,watch} from 'vue'
 import myfile from '../../api/myfile/myfile'
 import {documentation}from "@/api/biz/actor.js"
 import { delFavorite } from '@/api/biz/favorite.js'
@@ -577,6 +577,8 @@ export default {
                 choose: "我的空间"
             }
         ])
+        const fileHeight=ref('38vh')
+        const pageSize = ref(10)
         let useMenu = ref([
             // {
             //     img: ImgFile.copy,
@@ -1802,7 +1804,7 @@ export default {
 
             // console.log('tableBeEnd.value',tableBeEnd.value);
             filePageNum.value = filePageNum.value+1
-            const query = `${thisFolder.value.dirId}?pageSize=10&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             // -------------先禁止掉事件 定时器1秒钟后才能再次触发
             tableBeEnd.value = true
             
@@ -1896,6 +1898,48 @@ export default {
             openScanMove.value = false
             refreshFile()
         }
+        watch(() => folder.value, async(newValue, oldValue) => {
+            // console.log('iFrameData 发生改变了', newValue, oldValue);
+            console.log('files',newValue);
+            filePageNum.value = 1
+            if(!newValue.length){
+                fileHeight.value = '75vh'
+                pageSize.value = 20
+                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const res = await myfile.getById(query)
+                 console.log('filessetScrollres',res);
+                 if (res.code === 200) {
+                    // const newarr = res.rows.concat(toRaw(fileList.value))
+                    const newarr = res.rows
+                    console.log('newarr',newarr);
+                    fileList.value = JSON.parse(JSON.stringify(newarr))
+                    if(newarr.length < tableTotal.value){
+                        //获取后的数量<total就可以再次获取
+                        setTimeout(()=>{
+                            tableBeEnd.value = false 
+                        },1000)
+                    }
+                }
+            }else{
+                pageSize.value = 10
+                fileHeight.value = '38vh'
+                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const res = await myfile.getById(query)
+                 console.log('filessetScrollres',res);
+                 if (res.code === 200) {
+                    // const newarr = res.rows.concat(toRaw(fileList.value))
+                    const newarr = res.rows
+                    console.log('newarr',newarr);
+                    fileList.value = JSON.parse(JSON.stringify(newarr))
+                    if(newarr.length < tableTotal.value){
+                        //获取后的数量<total就可以再次获取
+                        setTimeout(()=>{
+                            tableBeEnd.value = false 
+                        },1000)
+                    }
+                }
+            }
+        });
         onMounted(() => {
             getAllTop()
             getSpaceList()
@@ -2167,7 +2211,9 @@ export default {
             openScanMove,
             closeOpenScanMove,
             scanFileArr,
-            setImg
+            setImg,
+            fileHeight,
+            pageSize
         }
     },
     watch: {

src/views/publicment/components/createTasnsfer.vue

@@ -219,7 +219,7 @@ onMounted(async () => {
   width: 50%;
   height: 380px;
   border: 1px solid green;
-  overflow-y: auto;
+  // overflow-y: auto;
 }
 .custom-tree-node{
   display: flex;
@@ -246,7 +246,7 @@ onMounted(async () => {
 }
 
 .needLog {
-  height: 100%;
+  height: calc(100% - 30px);
 }
 
 :deep(.el-tag__content) {

src/views/publicment/modalComponebts/Transfer.vue

@@ -366,7 +366,7 @@ export default {
   }
 }
 .needLog {
-    height: 100%;
+  height: calc(100% - 30px);
     overflow-y: auto;
 }