云盘

src/assets/styles/common.css

@@ -216,6 +216,9 @@ page {
 	flex-direction: row;
 	flex-wrap: nowrap;
 }
+.nowrap{
+	flex-wrap: nowrap;
+}
 .wrap{
 	flex-wrap: wrap !important;
 }

src/components/CloudDisk/cellList.vue

@@ -86,12 +86,12 @@
     const multipleSelection = ref([] as any)
 
     const handleSelectionChange = (row: any) =>{
-        let filter = props.Parent.SelectedDatas.filter(x=>x==row.DetailsId)
+        let filter = props.Parent.SelectedDatas.filter(x=>x.DetailsId==row.DetailsId)
         if(filter.length==0&&row.check) {
-            multipleSelection.value.push(row.DetailsId)
+            multipleSelection.value.push(row)
             emit('MultipleChoice',multipleSelection.value)
         }else if(!row.check){
-            let newFilter = props.Parent.SelectedDatas.filter(x=>x!=row.DetailsId)
+            let newFilter = props.Parent.SelectedDatas.filter(x=>x.DetailsId!=row.DetailsId)
             multipleSelection.value = newFilter
             emit('MultipleChoice',multipleSelection.value)
         }

src/components/CloudDisk/copyMove.vue

@@ -43,8 +43,8 @@
             required: true,
         },
         DetailsId: {
-            type: String,
-            required: '',
+            type: String||Array,
+            required: ''||[],
         },
         GroupId: {
             type: String,
@@ -67,7 +67,7 @@
     dialogTitle.value = props.dialogType==1?'复制文件':'移动文件'
     
     const getGName = () =>{
-        let GroupArr = GroupList.value.filter(x=>x.Id==params.GId)
+        let GroupArr = props.GroupList.filter(x=>x.Id==params.GId)
         currentGroup.value = GroupArr[0].GName
     }
     const close = () =>{
@@ -75,7 +75,9 @@
         emit('close')
     }
     const submit = () => {
-        params.Id = props.DetailsId
+        if(!Array.isArray(props.DetailsId)){
+            params.Id = props.DetailsId
+        }
         let text = ''
         if(props.dialogType==1)text = `复制到${currentGroup.value}分组下`
         else text = `移动至${currentGroup.value}分组下`
@@ -88,9 +90,22 @@
             type: 'warning',
             }
         ).then(() => {
-            setCopy()
+            if(!Array.isArray(props.DetailsId))setCopy()
+            else BatchCopy()
+            
         }).catch(() => {})
     }
+    const BatchCopy = async () =>{
+        setLoading.value = true
+        let response;
+        if(props.dialogType==1) response = await CloudDiskService.BatchCloudFileCopy(props.DetailsId,params.GId);
+        else response = await CloudDiskService.BatchCloudFileMove(props.DetailsId,params.GId);
+        if (response.data.resultCode==ApiResult.SUCCESS) {
+            dialogFormVisible.value = false
+            emit('success',1)
+        }
+        setLoading.value = false
+    }
     const setCopy = async () =>{
         setLoading.value = true
         let response;

src/components/CloudDisk/list.vue

@@ -5,19 +5,15 @@
         @selection-change="handleSelectionChange"
         row-key="DetailsId">
             <el-table-column type="selection" width="55"/>
-            <el-table-column label="基本信息" show-overflow-tooltip min-width="200">
+            <el-table-column label="基本信息" show-overflow-tooltip min-width="400">
               <template #default="scope">
                 <div class="row items-center">
                         <el-image
                         class="cursor-pointer"
                         style="width: 50px; height: auto"
                         :src="scope.row.FilePath"
-                        :zoom-rate="1.2"
-                        :max-scale="7"
-                        :min-scale="0.2"
                         :preview-src-list="[]"
-                        :initial-index="4"
-                        fit="contain"
+                        fit=""
                         @click="getImg(scope.row,scope.$index)"
                         >
                         <template #error>
@@ -48,15 +44,18 @@
             <el-table-column label="大小" min-width="100">
                 <template #default="scope">{{ scope.row.FileSize }} kb</template>
             </el-table-column>
+            <el-table-column label="添加时间" min-width="180">
+                <template #default="scope">{{ scope.row.CreateDate }}</template>
+            </el-table-column>
             <el-table-column align="center" min-width="80">
                 <template #header>
                     <el-dropdown trigger="click" >
                         <el-icon class="cursor-pointer" size="16" color="#b1b7cf"><IconSetting /></el-icon>
                         <template #dropdown>
                             <el-dropdown-menu class="q-pa-md microsoft">
-                                <el-dropdown-item icon="CopyDocument" @click="CopyTo()">复制到</el-dropdown-item>
-                                <el-dropdown-item icon="Expand" @click="MoveFile()">移动到</el-dropdown-item>
-                                <el-dropdown-item icon="Delete" @click="deleteImg()">删除</el-dropdown-item>
+                                <el-dropdown-item icon="CopyDocument" @click="BatchCopyTo()">复制到</el-dropdown-item>
+                                <el-dropdown-item icon="Expand" @click="BatchMoveFile()">移动到</el-dropdown-item>
+                                <el-dropdown-item icon="Delete" @click="BatchRemove()">删除</el-dropdown-item>
                               </el-dropdown-menu>
                         </template>
                     </el-dropdown>
@@ -106,6 +105,9 @@
         (event: 'getImg'): void,
         (event: 'deleteImg'): void,
         (event: 'MultipleChoice'): void,
+        (event: 'BatchRemove'): void,
+        (event: 'BatchCopyTo'): void,
+        (event: 'BatchMoveFile'): void,
     }>()
     const editorTarget = ref('')
     const nickNam = ref(''||  Number)
@@ -114,8 +116,20 @@
     const multipleTableRef = ref<InstanceType<typeof ElTable>>()
     const multipleSelection = ref([] as any)
 
+    const BatchRemove = () =>{
+        emit('BatchRemove')
+    }
+
+    const BatchCopyTo = () =>{
+        emit('BatchCopyTo')
+    }
+
+    const BatchMoveFile = () =>{
+        emit('BatchMoveFile')
+    }
+
     const handleSelectionChange = (val: []) =>{
-        multipleSelection.value = val.map(x=>{return x.DetailsId})
+        multipleSelection.value = val.map(x=>{return x})
         emit('MultipleChoice',multipleSelection.value)
     }
     const setCloudNameHandler = async (target:any)=>{
@@ -174,7 +188,7 @@
                 props.Parent.SelectedDatas.forEach(x => {
                     let filterS = props.dataList.filter((y,index)=>{
                         y.index=index
-                        return x==y.DetailsId
+                        return x.DetailsId==y.DetailsId
                     })
                     let index = filterS&&filterS[0]&&filterS[0].index
                     if(index>=0) {

src/components/CloudDisk/waterfallFlowList.vue

@@ -105,12 +105,12 @@
     const multipleSelection = ref([] as any)
 
     const handleSelectionChange = (row: any) =>{
-        let filter = props.Parent.SelectedDatas.filter(x=>x==row.DetailsId)
+        let filter = props.Parent.SelectedDatas.filter(x=>x.DetailsId==row.DetailsId)
         if(filter.length==0&&row.check) {
-            multipleSelection.value.push(row.DetailsId)
+            multipleSelection.value.push(row)
             emit('MultipleChoice',multipleSelection.value)
         }else if(!row.check){
-            let newFilter = props.Parent.SelectedDatas.filter(x=>x!=row.DetailsId)
+            let newFilter = props.Parent.SelectedDatas.filter(x=>x.DetailsId!=row.DetailsId)
             multipleSelection.value = newFilter
             emit('MultipleChoice',multipleSelection.value)
         }

src/services/CloudDiskService.ts

@@ -4,6 +4,21 @@ import Api,{ HttpResponse, Result } from './../utils/request';
 
 class CloudDiskService{
 
+    static async GetEmpByEmpNameKey(keyWord:string):Promise<HttpResponse>{
+        let params = {keyWord}
+        return Api.Post("ppt_GetEmpByEmpNameKey",params)
+    }
+
+    static async BatchCloudFileCopy(IdList:any,GId:string):Promise<HttpResponse>{
+        let params = {IdList,GId}
+        return Api.Post("ppt_BatchCloudFileCopy",params)
+    }
+
+    static async BatchCloudFileMove(IdList:any,GId:string):Promise<HttpResponse>{
+        let params = {IdList,GId}
+        return Api.Post("ppt_BatchCloudFileMove",params)
+    }
+    
     static async BatchRemoveCloudInfo(IdList:any):Promise<HttpResponse>{
         let params = {IdList}
         return Api.Post("ppt_BatchRemoveCloudInfo",params)