Commit c3846b70 authored by zhengke's avatar zhengke

no message

parents de659319 3a65d394
......@@ -22,15 +22,15 @@
</div>
</div>
<div>
<el-button v-if="selectedItems && selectedItems.length>0">
<!-- <el-button v-if="selectedItems && selectedItems.length>0">
<el-icon><CopyDocument /></el-icon>
<span class="">批量复制</span>
</el-button>
</el-button> -->
</div>
</div>
<div class="col full-width">
<el-table class="sample-table" @selection-change="handleSelectionChange" :data="data" style="width: 100%" height="100%" v-loading="loading" @sort-change="sortHandler" :default-sort="{ prop: 'CreateTime', order: 'descending' }">
<el-table-column type="selection" width="20" />
<el-table class="sample-table" :data="data" style="width: 100%" height="100%" v-loading="loading" @sort-change="sortHandler" :default-sort="{ prop: 'CreateTime', order: 'descending' }">
<!-- <el-table-column type="selection" width="20" /> -->
<el-table-column className="indentLeft">
<template #header>
<div class="row items-center">
......@@ -102,7 +102,7 @@
import { ApiResult } from "@/configs/axios";
import ConfigService from "@/services/ConfigService";
import { ElMessage } from "element-plus";
import { inject, reactive, ref } from "vue";
import { PropType, inject, reactive, ref, watch } from "vue";
import {formatDateTimeToRead, query} from '@/utils/common'
import breadPeeling from './components/breadPeeling.vue'
import CopyFile from './components/CopyFile.vue'
......@@ -111,6 +111,16 @@ import { injectKeyTemplate } from "@/types/injectKey";
import FolderService from "@/services/FolderService";
import { ArrowDown,ArrowUp } from "@element-plus/icons-vue";
const props = defineProps({
position:{
type:Object as PropType<{FileId:number,FileType:1|2,Position:{FileId:number,FileName:string}[]}|null>,
default:null
}
})
const emit = defineEmits<{
(event: 'destroy-position'): void
}>()
const queryObj = reactive<any>({
pageIndex: 1,
pageSize: 50,
......@@ -136,7 +146,6 @@ searchData.value = inject(injectKeyTemplate);
const filterFileNameStatus = ref(false)
const tempFilterName = ref('')
const currentRootDom = ref()
const selectedItems = ref<any[]>([])
const backInquireHandler = () => {
let Navigation = navigations.value[navigations.value.length - 2];
......@@ -265,9 +274,30 @@ const collectHandler = async (row:any) => {
}
loading.value=false
}
const handleSelectionChange = (val:any)=>{
selectedItems.value = val
const checkPositionHandler = (n:any)=>{
if(n){
if(n.Position && n.Position.length>0){
navigations.value=n.Position
queryObj.FileId = n.Position[n.Position.length-1].FileId
queryObj.FileType = 0
}else{
navigations.value=[]
queryObj.FileId = 0
queryObj.FileType = n.FileType
}
emit('destroy-position')
}
}
watch(() => props.position,(n,o)=>{
if(n){
checkPositionHandler(n)
refreshHandler()
}
},{
deep:true
})
checkPositionHandler(props.position)
getDocumentData()
</script>
<style>
......
......@@ -79,8 +79,8 @@
<BrowsingHistory :current-menu="currentMenu" v-if="currentMenu==0"></BrowsingHistory>
<StarTarget :current-menu="currentMenu" v-if="currentMenu==1"></StarTarget>
<journeyAds :position="position" :current-menu="currentMenu" v-if="currentMenu==3||currentMenu==4" @destroy-position="()=>position=null"></journeyAds>
<ShareList v-if="currentMenu==2"></ShareList>
<RecycleBin :current-menu="currentMenu" v-if="currentMenu==-1"></RecycleBin>
<ShareList :position="position" v-if="currentMenu==2" @destroy-position="()=>position=null"></ShareList>
</div>
</div>
</div>
......@@ -125,9 +125,13 @@ const sellAdd = (type:number) =>{
const openFilePosition = (playload:any)=>{
position.value=playload
currentMenu.value = playload.FileType==1?3:4
searchData.value.currentMenu=currentMenu.value
searchData.value.SellTemplateType = playload.FileType
if(!playload.FormShare){
currentMenu.value = playload.FileType==1?3:4
searchData.value.currentMenu=currentMenu.value
searchData.value.SellTemplateType = playload.FileType
}
else currentMenu.value = 2
}
const setCurrentMenuHandler=(i:number)=>{
......
......@@ -228,8 +228,9 @@ const CopyId = async () => {
deleteLoading.value = null;
};
const getFile = async () => {
console.log(props.details)
let querys = {
FileType: props.details.FileType,
FileType: props.details.FolderType,
};
let pageRes = await FolderService.GetMyFolderTree(querys);
if (pageRes.data.resultCode == 1) {
......
......@@ -139,7 +139,8 @@ const openFilePositionHandler = (item:any)=>{
let playload = {
FileId:item.FileId,
FileType:item.FileType,
Position:[]
FormShare:userInfo.value.EmployeeId!=item.CreateBy,
Position:[] as any[]
}
if(item.FolderPath && item.FolderPath!='/'){
let fp = item.FolderPath.split('/')
......
......@@ -159,7 +159,7 @@
<script setup lang="ts">
import { ApiResult } from '@/configs/axios';
import OrgService from '@/services/OrgService';
import { ref,reactive,watch,inject,nextTick } from 'vue';
import { ref,reactive,watch,inject,nextTick, PropType } from 'vue';
import { Edit,View,Download,EditPen,Delete,Star } from '@element-plus/icons-vue';
import { ElMessage,ElTree,ElLoading, ElMessageBox } from 'element-plus';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment