From 851a9280f0b44e3f8cfe285353a169cf9c4ff75f Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 20 May 2024 10:23:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E7=9A=84=E6=8B=96=E6=8B=BD=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/habit.vue | 3 +- src/component/HomePage/ExportModel.vue | 44 ++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 91b5dc7a..5ff71584 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -90,7 +90,6 @@ @@ -615,6 +614,8 @@ export default defineComponent({ this.workspaceItem.systemDesignerPercentage = num }, formatter(value: number) { + // let num = Math.abs((value-50)*2) + return `${value}%`; }, diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 6f3392b4..24db1548 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -54,7 +54,7 @@
Color
Sketch
Selected Design
-
+
{{colorItem.tcx}}
@@ -63,10 +63,11 @@
@@ -808,6 +809,18 @@ export default defineComponent({ currentType.value.type = type currentType.value.data = imgItem } + let present = {} + let setDragstart = (type,imgItem)=>{ + currentType.value.type = type + present.checked = false + present = {} + if(imgItem.checked){ + }else{ + imgItem.checked = true + present = imgItem + } + currentType.value.data = imgItem + } let canvasOnDrop = ()=>{ canvas.on('drop', (opt)=> { let offset = { @@ -1359,7 +1372,27 @@ export default defineComponent({ } //设置再画布上按下 let setCanvasDown = (event)=>{ - + //设置移动端按下添加元素 + if(isMoible && present.checked){ + present.checked = false + present = {} + let pointerVpt = canvas.restorePointerVpt(event.pointer) + switch (currentType.value.type) { + case 'colorBoards': + let rect = setGroup(currentType.value.data) + setCanvasColor(pointerVpt.y, pointerVpt.x,rect) + break + case 'moodboardFiles': + createImage(pointerVpt.y, pointerVpt.x,currentType.value.type) + break + default : + createImage(pointerVpt.y, pointerVpt.x,currentType.value.type) + break + } + // 创建完元素,把当前操作的元素类型设置回 null + currentType.value.type = null + currentType.value.data = null + } downPoint = event.absolutePointer let arr = ['rect','line','circle','triangle','ellipse','fold'] if(arr.indexOf(operation.value) > -1){ @@ -1636,6 +1669,7 @@ export default defineComponent({ setCloseNav,//给图片导航或者工具收起来或者展开 multiselect,//获取整体高度 onDragstart,//拖拽函数 + setDragstart,//的移动端拖拽改为按下 historyState,//执行撤回或者反撤回 operation,//设置当前鼠标状态绘画或者矩形或者移动 operationMode,//设置矩形是边框还是填充 @@ -1896,6 +1930,10 @@ export default defineComponent({ max-height: 100%; } } + .active{ + opacity: .5; + transform: scale(.9); + } } } .exportCanvasBox_left_tool{