aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
李志鹏
2026-01-20 16:11:42 +08:00
parent 844694d638 695a91ac1c
commit 27198cc35b
11 changed files with 965 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/Detail/DesignDetail.vue
View File

@@ -101,7 +101,7 @@
</div>
</div>
<div class="contentRight canvas" v-if="selectDetail && selectDetail.id && currentDetailType" :class="{'active': isEditPattern.value}">
<canvasBox ref="canvasBox" :key="canvasKey" :sketchSize="sketchSize" @setSloganData="setSloganData" :isEditPattern="isEditPattern.value" :updateOtherLayers="updateOtherLayers"></canvasBox>
<canvasBox ref="canvasBox" v-model:loadingShow="loadingShow" :key="canvasKey" :sketchSize="sketchSize" @setSloganData="setSloganData" :isEditPattern="isEditPattern.value" :updateOtherLayers="updateOtherLayers"></canvasBox>
</div>
<!-- 画布 -->
<!-- <div class="content" v-else-if="selectDetail && selectDetail.id">
@@ -261,7 +261,7 @@ export default defineComponent({
}
detailData.loadingShow = false
// detailData.loadingShow = false
resolve(rv)
}
).catch(rv=>{

2
src/component/Detail/canvas/index.vue
View File

@@ -85,6 +85,7 @@ export default defineComponent({
default:()=>{}
},
},
emits:['update:loadingShow'],
setup(props,{emit}) {
const store = useStore();
const {t} = useI18n();
@@ -345,6 +346,7 @@ export default defineComponent({
detailData.changeSketchUpdateFrontBack = null
}
setUndivideLayer()
emit('update:loadingShow',false)
}
const setUndivideLayer = async ()=>{
await new Promise<void>(async (resolve, reject) => {

15
src/component/Detail/detailRight/editPrintElement.vue
View File

@@ -53,6 +53,7 @@
</a-slider> -->
<a-popover
trigger="click"
placement="topRight"
destroyTooltipOnHide
:title="t('Canvas.repeatSetting')"
>
@@ -110,7 +111,7 @@
</ul> -->
</div>
<div class="designOpenrtion_pingpu" v-else>
<pingpu :width="sketchSize.width" :height="sketchSize.height" ref="pingpuRef" @change-canvas="updateCanvas"></pingpu>
<pingpu :key="selectDetail?.id" :width="sketchSize.width" :height="sketchSize.height" ref="pingpuRef" @change-canvas="updateCanvas"></pingpu>
</div>
</div>
</div>
@@ -207,7 +208,6 @@ export default defineComponent({
elList:[] as any,
selectIndex:0,
})
watch
const setOveralSingle = async ()=>{
await setItemPosition()
@@ -263,7 +263,7 @@ export default defineComponent({
setItemPosition()
store.commit('DesignDetail/setCurrentPrintElement',null)
}
const previewDetailPrintData = ()=>{
const previewDetailPrintData = (id:any = editPrintElementData.selectDetail?.id)=>{
let data:any = []
let index = 1
let setData = (item:any,index:number)=>{
@@ -310,7 +310,8 @@ export default defineComponent({
})
let value = {
data,
str:props.type
str:props.type,
id:id,
}
store.commit('DesignDetail/setNewDetail',value)
}
@@ -453,9 +454,10 @@ export default defineComponent({
addPrintELement(newVal)
}
})
watch(()=>((editPrintElementData.selectDetail?.id)),(newVal)=>{
watch(()=>((editPrintElementData.selectDetail?.id)),(newVal,oldVal)=>{
if(!newVal)return
editPrintElementData.isSketchLoad = false,
if(oldVal)previewDetailPrintData(oldVal)
editPrintElementData.isSketchLoad = false
editPrintElementData.printStyleList[props.type] = {
single:[],
overall:[],
@@ -921,7 +923,6 @@ export default defineComponent({
}
const inputFillScale = (scale:any)=>{
let arr = editPrintElementData.printStyleList[props.type].overall
console.log(arr,scale,editPrintElementData.imgDomIndex)
arr[editPrintElementData.imgDomIndex].scale = [scale,scale]
editPrintElementDom.pingpuRef.updataList([
{