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-19 16:57:12 +08:00
parent 74b43e431b c20ef9d00c
commit f837542797
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,14 +331,15 @@ export default defineComponent({
} }
const setClothes = async (list:any,str:string)=>{ const setClothes = async (list:any,str:string)=>{
let clothesList:any = [] let clothesList:any = []
await nextTick() await uploadElement()
if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{ if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
detailData.selectDetail.sketchString = rv detailData.selectDetail.sketchString = rv
}) })
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
await detailDom.canvasBox.privewDetail()
for(let i = 0;i<list.length;i++){ for(let i = 0;i<list.length;i++){
detailData.selectDetail detailData.selectDetail
let {scale,offset,priority,transpose,rotate,maskUrl,maskMinioUrl} = await (detailDom.model as any).getSubmitData(list[i]) let {scale,offset,priority,transpose,rotate,maskUrl,maskMinioUrl} = await (detailDom.model as any).getSubmitData(list[i])
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
let gradient = null let gradient = null
let newData = list[i]?.newDetail?.[detailData.currentDetailType] let newData = list[i]?.newDetail?.[detailData.currentDetailType]
// newData[0].location=[ // newData[0].location=[

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

@@ -182,6 +182,7 @@ export default defineComponent({
width:props.sketchSize.width, width:props.sketchSize.width,
height:props.sketchSize.height, height:props.sketchSize.height,
}).then((rv)=>{ }).then((rv)=>{
console.log(rv,'================')
if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv
}) })
//包含平铺图层 single+overall模式的图 //包含平铺图层 single+overall模式的图

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

@@ -207,10 +207,10 @@ export default defineComponent({
elList:[] as any, elList:[] as any,
selectIndex:0, selectIndex:0,
}) })
watch
const setOveralSingle = ()=>{ const setOveralSingle = async ()=>{
setItemPosition() await setItemPosition()
} }
const formatter = (value:any)=>{ const formatter = (value:any)=>{
return `${value}%`; return `${value}%`;
@@ -419,6 +419,8 @@ export default defineComponent({
arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType] arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
} }
if(arr && arr.length > 0){ if(arr && arr.length > 0){
editPrintElementData.printStyleList[props.type].single = []
editPrintElementData.printStyleList[props.type].overall = []
arr.forEach((item:any)=>{ arr.forEach((item:any)=>{
if(!item.ifSingle){ if(!item.ifSingle){
editPrintElementData.stateOverallSingle = 'overall', editPrintElementData.stateOverallSingle = 'overall',
@@ -470,8 +472,10 @@ export default defineComponent({
if(arr.length > 0){ if(arr.length > 0){
editPrintElementData.imgDomIndex = 0 editPrintElementData.imgDomIndex = 0
if(newVal == 'overall'){ if(newVal == 'overall'){
editPrintElementData.printStyleList[props.type].single = []
editPrintElementData.printStyleList[props.type].overall = []
arr.forEach((item:any,index:number) => { arr.forEach((item:any,index:number) => {
item.id_ = index getItemPosition(item)
}); });
} }
}else{ }else{
@@ -1227,7 +1231,7 @@ export default defineComponent({
top: 0; top: 0;
left: 0; left: 0;
pointer-events: none; pointer-events: none;
height: 100%; width: 100%;
} }
} }
.designOpenrtion_sketch_mask{ .designOpenrtion_sketch_mask{