This commit is contained in:
X1627315083
2025-04-01 15:25:15 +08:00
parent 70ed89049a
commit b6e5f05f06
101 changed files with 11533 additions and 1015 deletions

View File

@@ -2,10 +2,10 @@
<template>
<div class="uploadList">
<div class="uploadList_box">
<div class="content_img_item" v-for="(file) in currentList[currentDetailType]" :key="file.id">
<div class="content_img_item" v-for="(file) in currentList[type]" :key="file.id">
<div class="content_img_item_block" :class="{active:file?.checked}">
<img v-lazy="file.imgUrl" :key="file.imgUrl" :alt="file.name" @click.stop="selectImgItem(file)"/>
<sketchCategory :disignTypeList="catecoryList" :generateList="allBoardData.sketchboardFiles" :item="file" :isSpread="true"></sketchCategory>
<sketchCategory v-model:disignTypeList="catecoryList" :generateList="allBoardData.sketchboardFiles" :item="file" :isSpread="true"></sketchCategory>
</div>
</div>
</div>
@@ -29,7 +29,12 @@ export default defineComponent({
type:Object,
default:()=>[] as any,
required:true
}
},
type:{
type:String,
default:'' as any,
required:true
},
},
emits:['selectImgItem'],
setup(props,{emit}) {
@@ -38,9 +43,9 @@ export default defineComponent({
const detailData = reactive({
allBoardData:computed(()=>store.state.UploadFilesModule.allBoardData),
currentList:{
sketch:[],
print:[],
color:[],
sketch:computed(()=>store.state.UploadFilesModule.allBoardData.sketchboardFiles),
print:computed(()=>store.state.UploadFilesModule.allBoardData.printboardFiles),
color:computed(()=>store.state.UploadFilesModule.allBoardData.colorBoards),
},
currentDetailType:computed(()=>store.state.DesignDetailCopy.currentDetailType),
@@ -56,11 +61,11 @@ export default defineComponent({
}
onMounted(()=>{
detailData.currentList = {
sketch:detailData.allBoardData.sketchboardFiles,
print:detailData.allBoardData.printboardFiles,
color:detailData.allBoardData.colorBoards,
}
// detailData.currentList = {
// sketch:detailData.allBoardData.sketchboardFiles,
// print:detailData.allBoardData.printboardFiles,
// color:detailData.allBoardData.colorBoards,
// }
})
return{

View File

@@ -57,6 +57,10 @@ export default defineComponent({
default:'' as any,
required:true
},
randomId:{
type:Boolean,
default:true
},
level1Type:{
type:String,
default:'' as any,
@@ -100,9 +104,11 @@ export default defineComponent({
let id = file.id
if(type == 'sketch'){
id = Number(file.id + (randomNum + ''))
if(hasDuplicateId(id)){
selectImgItem(file)
return
if(props.randomId){
if(hasDuplicateId(id)){
selectImgItem(file)
return
}
}
}
let data = JSON.parse(JSON.stringify(file))
@@ -113,7 +119,7 @@ export default defineComponent({
const getLibraryList = ()=>{
detailData.isShowLoading = true
let level2Type = ''
let workspace = store.state.Workspace.workspace
let workspace = store.state.Workspace.probjects
// let type = store.state.DesignDetailCopy.currentDetailType
let data = {
level1Type:props.level1Type,

View File

@@ -26,13 +26,13 @@
</div>
<div class="print_content_list">
<div class="content_item" v-show="selectTitle == 'current'" v-if="type != 'element'">
<currentList ref="currentList" :level1Type="level1Type" @selectImgItem="selectImgItem" :catecoryList="catecoryList"></currentList>
<currentList ref="currentList" :level1Type="level1Type" :type="type" @selectImgItem="selectImgItem" :catecoryList="catecoryList"></currentList>
</div>
<div class="content_item" v-show="selectTitle == 'upload'">
<uploadList @selectImgItem="selectImgItem" :level1Type="level1Type" :catecoryList="catecoryList"></uploadList>
</div>
<div class="content_item" v-show="selectTitle == 'library'">
<libraryList @selectImgItem="selectImgItem" :level1Type="level1Type" :type="type" ref="libraryList" :catecoryList="catecoryList"></libraryList>
<libraryList @selectImgItem="selectImgItem" :randomId="randomId" :level1Type="level1Type" :type="type" ref="libraryList" :catecoryList="catecoryList"></libraryList>
</div>
</div>
</div>
@@ -58,6 +58,11 @@ export default defineComponent({
type:Array,
default:()=>[]
},
randomId:{
type:Boolean,
default:true,
required:false
},
type:{
type:String,
default:'' as any,

View File

@@ -75,7 +75,7 @@ export default defineComponent({
upload:{
isPin: 0,
level1Type: props.level1Type,
gender:store.state.Workspace.workspace.sex,
gender:store.state.Workspace.probjects.sex ,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
},
token:getCookie("token"),

View File

@@ -35,7 +35,7 @@ export default defineComponent({
selectTitle:'current',
selectDetail:computed(()=>store.state.DesignDetailCopy.selectDetail),
sketchCatecoryList:computed(()=>{
return store.state.Workspace.workspacePosition
return store.state.Workspace.probjects.positionList
}),
currentDetailType:computed(()=>store.state.DesignDetailCopy.currentDetailType)
})