云盘 视图切换

src/components/CloudDisk/CloudDiskList.vue

 <template>
     <div class="column full-height" ref="currentRootDom">
-
       <div class="row items-center flex-between">
         <div class="text-dark text-weight-bolder">云盘空间</div>
         <div class="row flex-center CloudDisk-R-inquire">
@@ -193,11 +192,10 @@
                   </el-dropdown>
               </div>
             </div>
-            
             <div ref="imgDiskRef" class="full-height" style="padding-top: 10px;overflow:auto;"
             :style="{'padding-bottom':queryObj.pageCount == queryObj.pageIndex && !loading?'60px':'130px'}"
             @mousedown="handleMouseDown">
-              <div v-if="queryObj.layout!=3" class="mask" v-show="positionList.is_show_mask" :style="'width:' + mask_width + 'left:' + mask_left + 'height:' + mask_height + 'top:' + mask_top"></div>
+              <div class="mask" v-if="queryObj.layout!=3" v-show="positionList.is_show_mask" :style="'width:' + mask_width + 'left:' + mask_left + 'height:' + mask_height + 'top:' + mask_top"></div>
               <cellList v-if="queryObj.layout==1" :dataList="dataList" 
                   @refreshHandler="refreshHandler"
                   @CopyTo="CopyTo"
@@ -688,16 +686,16 @@
       refreshHandler()
     }
     if(type==3){
+      queryObj.layout = item.ID
+      resSetXY()
       const loadingObj = ElLoading.service({
           text:'正在切换',
           lock:true
       })
-      resSetXY()
       for(let i=0;i<layoutType.value.length;i++){
         layoutType.value[i].check = false
       }
       item.check = true
-      queryObj.layout = item.ID
       let time = 300
       if(dataList.value.length>50) time = 3000
       setTimeout(()=>{
@@ -974,7 +972,7 @@ const SearchImg = () =>{
     if(imgDiskRef.value && !loading.value){
         let maxHeight = imgDiskRef.value.scrollHeight - imgDiskRef.value.offsetHeight
         let scrollTop = imgDiskRef.value.scrollTop
-        if(maxHeight - scrollTop==0 && queryObj.pageCount > queryObj.pageIndex) {
+        if(maxHeight - scrollTop<=0 && queryObj.pageCount > queryObj.pageIndex) {
             queryObj.pageIndex++
             querySearchHandler()
         }

src/components/CloudDisk/cellList.vue

@@ -2,8 +2,8 @@
     <div class="CloudDisk-R-Center row">
         <template v-for="(item,index) in dataList">
             <div style="position: relative;">
-                <el-checkbox style="position: absolute;left: 35px;top: 2px;" 
-                class="fz14" label="" v-model="item.check"/>
+                <el-checkbox style="position: absolute;left: 2.5vw;top: .2vw;" 
+                class="fz14" label="" v-model="item.check" @click.stop="item.check=!item.check"/>
                 <div class="CloudDisk-R-Box cursor-pointer" :key="index">
                     <div class="CloudDisk-R-Img">
                         <el-image :src="item.FilePath" style="width: 100%; height: 100%;"
@@ -186,14 +186,14 @@
     flex-wrap: wrap;
 }
 .CloudDisk-R-Box{
-    width: 247px;
-    margin-left: 24px;
+    width: 12.85vw;
+    margin-left: 1.25vw;
     margin-bottom: 24px;
     position: relative;
 }
 .CloudDisk-R-Box.active .CloudDisk-R-Img{
-    width: 247px;
-    height: 247px;
+    width: 12.85vw;
+    height: 12.85vw;
     background: #8790F3;
     box-shadow: 0px 0px 13px 0px #0D3EBC;
     border-radius: 8px;
@@ -218,8 +218,8 @@
     display: block;
 }
 .CloudDisk-R-Img{
-    width: 247px;
-    height: 247px;
+    width: 12.85vw;
+    height: 12.85vw;
     margin-bottom: 9px;
     border-radius: 8px;
     overflow: hidden;
@@ -229,10 +229,10 @@
 }
 
 .CloudDisk-R-Img .el-image{
-    width: 247px;
+    width: 12.85vw;
 }
 .title{
-    width: 247px;
+    width: 12.85vw;
     line-height: 17px;
     overflow: hidden;
     white-space: nowrap;
@@ -269,8 +269,8 @@
 }
 .MoreClick{
     position: absolute;
-    right: 10px;
-    top: 10px;
+    right: .8vw;
+    top: .7vw;
     background: #fff;
     border-radius: 10px;
     padding: 0 3px;

src/components/CloudDisk/waterfallFlowList.vue

@@ -2,10 +2,9 @@
     <div class="CloudDisk-R-Center">
         <Waterfall :list="dataList" 
             :breakpoints="{
-            1400:{rowPerView:5},
-            1200:{rowPerView:4},
-            1000:{rowPerView:3},
-            800:{rowPerView:2},
+            1577:{rowPerView:5},
+            1300:{rowPerView:4},
+            800:{rowPerView:3},
             500:{rowPerView:2}
             }" 
             :hasAroundGutter="false" :align="'left'"
@@ -14,8 +13,8 @@
         >
             <template #item="{ item, url, index }">
                 <div style="position: relative;">
-                    <el-checkbox style="position: absolute;left: 10px;top: 0px;" 
-                    class="fz14" label="" v-model="item.check" 
+                    <el-checkbox style="position: absolute;left: .5vw;top: .2vw;" 
+                    class="fz14" label="" v-model="item.check" @click.stop="item.check=!item.check"
                     />
                     <div class="CloudDisk-R-Box cursor-pointer" :key="index">
                         <div class="CloudDisk-R-Img">
@@ -27,7 +26,6 @@
                                 {{item.FileName}}
                             </el-tooltip>
                         </span>
-                    </div>
                         <el-popover placement="bottom" :width="230" trigger="click" @mousedown.stop="handleChildMouseDown">
                             <template #reference>
                                 <div class="MoreClick row items-center cusor-pointer" @mousedown.stop="handleChildMouseDown"><el-icon size="13"><MoreFilled /></el-icon></div>
@@ -90,6 +88,7 @@
                             </div>
                         </el-popover>
                     </div>
+                </div>
             </template>
         </Waterfall>
             
@@ -199,15 +198,16 @@
 </script>
 <style lang="scss" scoped>
 .CloudDisk-R-Center{
-    max-width: 1400px;
-    padding-left: 24px;
+    max-width: 1577px;
+    padding-left: 1.1vw;
 }
 .CloudDisk-R-Box{
-    width: 247px;
+    width: 12.85vw;
     position: relative;
 }
 .CloudDisk-R-Box.active .CloudDisk-R-Img{
-    width: 247px;
+    width: 12.85vw;
+    min-height: 12.85vw;
     background: #8790F3;
     box-shadow: 0px 0px 13px 0px #0D3EBC;
     border-radius: 8px;
@@ -232,8 +232,7 @@
     display: block;
 }
 .CloudDisk-R-Img{
-    width: 247px;
-    min-height: 40px;
+    width: 12.85vw;
     height: auto;
     margin-bottom: 9px;
     border-radius: 8px;
@@ -242,11 +241,11 @@
 }
 
 .CloudDisk-R-Img .el-image{
-    width: 247px;
+    width: 12.85vw;
     border-radius: 8px;
 }
 .title{
-    width: 247px;
+    width: 12.85vw;
     line-height: 17px;
     overflow: hidden;
     white-space: nowrap;
@@ -277,7 +276,7 @@
 }
 ::v-deep(.lazy__img[lazy=error]){
     padding: 0;
-    width: 247px !important;
+    width: 12.85vw !important;
 }
 .MoreClickCenter{
     
@@ -287,8 +286,8 @@
 }
 .MoreClick{
     position: absolute;
-    right: 10px;
-    top: 10px;
+    right: .5vw;
+    top: .7vw;
     background: #fff;
     border-radius: 10px;
     padding: 0 3px;
@@ -313,4 +312,7 @@
     background: #dedcff;
     color: $el-color-primary;
 }
+.waterfall-list{
+    overflow: initial;
+}
 </style>
\ No newline at end of file

src/views/Index.vue

@@ -154,7 +154,7 @@
                 </div>
               </div>
               <el-divider />
-              <el-menu mode="vertical no-select">
+              <el-menu mode="vertical" class="no-select">
                 <el-menu-item index="1" class="rounded" v-if="!userInfo.it" @click="()=>visibleFind=true">
                   <el-icon><Plus /></el-icon>
                   <span>加入企业</span>

src/views/SellTemplate/BrowsingHistory.vue

@@ -21,9 +21,11 @@
       <div class="col full-width q-ml-md">
           <journeyAdsList 
           :current-menu="currentMenu" 
+          :set-file-list="datas.setFileList"
           :position="position"
           :list="dataList"
           :msg="queryObj"
+          :navigations="Navigations"
           @success="success"
           @refreshHandler="refreshHandler"></journeyAdsList>
       </div> 
@@ -39,6 +41,17 @@
   import journeyAdsList from "./components/journeyAdsList.vue";
   
   
+  const props = defineProps({
+    currentMenu: {
+      type: Number,
+      default: 3,
+    },
+    position:{
+      type:Object as PropType<{FileId:number,FileType:1|2,Position:{FileId:number,FileName:string}[]}|null>,
+      default:null
+    }
+  });
+
   const dataList = ref([] as Array<any>);
   const searchData = ref({} as any);
   searchData.value = inject(injectKeyTemplate)
@@ -58,6 +71,7 @@
     OrderByType: 2,//1 升序 2倒序
   })
   const loading = ref(false as any)
+  const Navigations = ref([] as Array<any>);
 
   const success = () => {
     datas.selectAll = false;

src/views/SellTemplate/components/journeyAdsList.vue

@@ -14,7 +14,7 @@
                                     <ArrowUp v-else/>
                                 </el-icon>
                             </template>
-                            <el-input v-model="queryObj.FileName" placeholder="请输入文档关键字" size="mini" class="full-width" />
+                            <el-input v-model="queryObj.FileName" placeholder="请输入文档关键字" class="full-width" />
                             <div class="q-mt-md text-right">
                                 <el-button link class="q-mr-sm">
                                     <span class="text-bolder pingfangr" @click="setFilterNameHandler(0)">重置</span>

src/views/TeamCenter/Layout.vue

@@ -53,6 +53,7 @@ const menus = ref(useMenu.getTeamMenu);
 const activeIndex = ref('0')
 const path = ref('')
 path.value = router.currentRoute.value.path
+
 const { userInfo } =storeToRefs(useUserStore())
 const forwardSpace = () => router.push('/space')
 if(menus.value.length==0){
@@ -61,7 +62,14 @@ if(menus.value.length==0){
     })
 }
 
+
+
 watch(() => router.currentRoute.value.path, (toPath) => {
+    if(!userInfo.value.showCloudDisk&&toPath=='/a/c'){
+        userInfo.value.showCloudDisk = true
+        location.reload()
+    }else userInfo.value.showCloudDisk = false
+
     if(userInfo.value.isp){
         menus.value = useMenu.getTeamMenu.filter(x=> {return x.url!='/a/l'})
     } else menus.value = useMenu.getTeamMenu

src/views/UserCenter/Layout.vue

@@ -49,6 +49,11 @@ const forwardSpace = () => router.push('/space')
 
 
 watch(() => router.currentRoute.value.path, (toPath) => {
+    if(!userInfo.value.showCloudDisk&&toPath=='/u/cloudDiskSpace'){
+        userInfo.value.showCloudDisk = true
+        location.reload()
+    }else userInfo.value.showCloudDisk = false
+
     if(!userInfo.value.it&&userInfo.value.iv) menus.value = useMenu.getUserMenu
     else menus.value = useMenu.getUserMenu.filter(x=> {return x.url!='/u/w'})
     if(!menus.value) return