From 4bd7740753a95b6b57cbd4445903f1b5724bc9dc Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 2 Feb 2026 13:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=8D=B0=E8=8A=B1sort=E5=80=BC=E8=AE=BE=E7=BD=AE=E4=B8=8D?=
=?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Detail/detailRight/editPrintElement.vue | 118 ++++++++++--------
1 file changed, 66 insertions(+), 52 deletions(-)
diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue
index dd145724..c55f9219 100644
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -89,8 +89,8 @@
![]()
- ![]()
-
+
+ ![]()
![]()
@@ -223,6 +223,7 @@ export default defineComponent({
img.onload = ()=>{
let imgScale = img.width / img.height
let zoom = 2
+ console.log(editPrintElementData.sketchWH)
let width = editPrintElementData.sketchWH.width / zoom
let height = width / editPrintElementData.sketchWH.height
@@ -236,26 +237,41 @@ export default defineComponent({
x = sketchW / 2
y = sketchH / 2
}
+ x = sketchW / 2
+ y = sketchH / 2
let location = [x,y]
resolve({scale,location})
}
- img.src = item.url
+ img.src = item.url || item.path
})
}
const addPrintELement = async (data:any)=>{
if(!editPrintElementData.isSketchLoad)return
let {scale,location} = await setScaleLocation(data)
- let allElementPrint = [
- ...(editPrintElementData.selectDetail.printObject.prints || []),
- ...(editPrintElementData.selectDetail.trims.prints || []),
- ]
- let printIndex = Math.max(...allElementPrint.map(item => item.priority)) + 1
+ let printIndex = 0
+ let allElementPrint = []
+ if(props.type == 'print'){
+ allElementPrint = [
+ ...(editPrintElementData.printStyleList.print.single || []),
+ ...(editPrintElementData.printStyleList.print.overall || []),
+ ...(editPrintElementData.selectDetail.trims.prints || []),
+ ]
+ }else{
+ allElementPrint = [
+ ...(editPrintElementData.printStyleList.element.single || []),
+ ...(editPrintElementData.selectDetail.printObject.prints || []),
+ ]
+ }
+
+ printIndex = Math.max(...allElementPrint.map(item => Number(item.priority))) + 1
+ console.log(printIndex)
let item = {
angle:0,
designType:data.designType,
ifSingle:editPrintElementData.stateOverallSingle == 'single',
level2Type:data.level2Type,
- location:editPrintElementData.stateOverallSingle == 'single'?location:[0,0],
+ location:location,
+ // location:editPrintElementData.stateOverallSingle == 'single'?location:[0,0],
minIOPath:data.minIOPath || data.originalUrl,
path:data.url,
priority:printIndex,
@@ -343,6 +359,7 @@ export default defineComponent({
top = item.location[1] / editPrintElementData.sketchWH.scale[1]
}else{
//overall
+ console.log(item)
left = item.location[0] / editPrintElementData.sketchWH.scale[0]
top = item.location[1] / editPrintElementData.sketchWH.scale[1]
item.scale = [1,1]
@@ -405,51 +422,49 @@ export default defineComponent({
}
}
}
- const setPosition = ()=>{
- nextTick(()=>{
- let img = new Image
- img.onload = ()=>{
- // let sketchScale = editPrintElementData.selectDetail.layersObject[0].scale
- let sketchScale = [1,1]
- let scaleX = img.width * sketchScale[0] / editPrintElementDom.sketchImg.offsetWidth
- let scaleY = img.height * sketchScale[1] / editPrintElementDom.sketchImg.offsetHeight
+ const setPosition = async ()=>{
+ await new Promise((resolve, reject) => {
+ nextTick(()=>{
+ let img = new Image
+ img.onload = ()=>{
+ // let sketchScale = editPrintElementData.selectDetail.layersObject[0].scale
+ let sketchScale = [1,1]
+ let scaleX = img.width * sketchScale[0] / editPrintElementDom.sketchImg.offsetWidth
+ let scaleY = img.height * sketchScale[1] / editPrintElementDom.sketchImg.offsetHeight
- editPrintElementData.sketchWH = {
- width:editPrintElementDom.sketchImg.offsetWidth,
- height:editPrintElementDom.sketchImg.offsetHeight,
- scale:[scaleX,scaleY],
+ editPrintElementData.sketchWH = {
+ width:editPrintElementDom.sketchImg.offsetWidth,
+ height:editPrintElementDom.sketchImg.offsetHeight,
+ scale:[scaleX,scaleY],
+ }
+ if(!editPrintElementData.selectDetail.printObject.prints)return
+ let state = true
+ // editPrintElementData.stateOverallSingle = 'single'
+ let arr:any = editPrintElementData.selectDetail.printObject.prints
+ if(props.type == 'element'){
+ arr = editPrintElementData.selectDetail.trims.prints
+ }
+ // if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
+ // arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
+ // }
+ if(arr && arr.length > 0){
+ editPrintElementData.printStyleList[props.type].single = []
+ editPrintElementData.printStyleList[props.type].overall = []
+ arr.forEach((item:any)=>{
+ // if(!item.ifSingle){
+ // editPrintElementData.stateOverallSingle = 'overall',
+ // state = false
+ // }
+ getItemPosition(item)
+ })
+ setItemPosition()
+ }
+ resolve('')
}
- if(!editPrintElementData.selectDetail.printObject.prints)return
- let state = true
- // editPrintElementData.stateOverallSingle = 'single'
- let arr:any = editPrintElementData.selectDetail.printObject.prints
- if(props.type == 'element'){
- arr = editPrintElementData.selectDetail.trims.prints
- }
- // if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
- // arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
- // }
- if(arr && arr.length > 0){
- editPrintElementData.printStyleList[props.type].single = []
- editPrintElementData.printStyleList[props.type].overall = []
- arr.forEach((item:any)=>{
- // if(!item.ifSingle){
- // editPrintElementData.stateOverallSingle = 'overall',
- // state = false
- // }
- getItemPosition(item)
- })
- setItemPosition()
- }
- // if(props.type == 'print'){
- // editPrintElementData.overallSingle = state
- // }
- }
- // undividedLayer
- //计算宽高使用editPrintElementData.selectDetail.path
- // img.src = editPrintElementData.selectDetail.path
- img.src = editPrintElementData.selectDetail.undividedLayer?editPrintElementData.selectDetail.undividedLayer:editPrintElementData.selectDetail.path
+ img.src = editPrintElementData.selectDetail.path
+ })
})
+
}
// watch(()=>editPrintElementData.selectDetail?.id,(newVal)=>{
// if(!newVal)return
@@ -860,7 +875,6 @@ export default defineComponent({
let arr:any = editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle]
arr.forEach((item,index) => {item.uniqueId = `${Date.now()}_${index}`});
- console.log(arr)
const sortedArray = [...arr].sort((a, b) => a.priority - b.priority);
const sortMap = {} as any;
sortedArray.forEach((item, index) => {