This commit is contained in:
X1627315083
2024-10-14 17:53:06 +08:00
parent 403222c385
commit f173f090bb
3 changed files with 16 additions and 13 deletions

View File

@@ -2,7 +2,7 @@
<div class="generalMiniCanvas">
<div class="addDetails_canvasCenter">
<div class="generalMiniCanvas_input generalMiniCanvas_item" :class="{spread:spreadState}">
<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition')">
<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition' && canvasState != 'zoomIn' && canvasState != 'zoomOut')">
<span>{{ $t('exportModel.Size') }}</span>
<input type="range" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
</div>
@@ -303,8 +303,8 @@ export default defineComponent({
let setCanvasDown = (event)=>{
if(canvasBtn.canvasState == 'movePosition'){
isMovePostion = true;
lastPosX = event.e.clientX;
lastPosY = event.e.clientY;
lastPosX = event.pointer.x;
lastPosY = event.pointer.y;
return
}
if(canvasBtn.canvasState == 'zoomIn' || canvasBtn.canvasState == 'zoomOut'){
@@ -313,15 +313,15 @@ export default defineComponent({
}
}
let setCanvasPosition = (event)=>{
const e = event.e;
const e = event;
const vpt = canvas.viewportTransform;
vpt[4] += e.clientX - lastPosX; // 更新水平偏移
vpt[5] += e.clientY - lastPosY; // 更新垂直偏移
vpt[4] += e.pointer.x - lastPosX; // 更新水平偏移
vpt[5] += e.pointer.y - lastPosY; // 更新垂直偏移
canvas.requestRenderAll(); // 请求重绘画布
lastPosX = e.clientX;
lastPosY = e.clientY;
lastPosX = e.pointer.x;
lastPosY = e.pointer.y;
}
let setCanvasZoom = (opt)=>{
let zoom = canvas.getZoom() // 获取画布当前缩放值
@@ -333,8 +333,8 @@ export default defineComponent({
// console.log(zoom);
canvas.zoomToPoint(
{ // 关键点
x: opt.e.offsetX,
y: opt.e.offsetY
x: opt.pointer.x,
y: opt.pointer.y
},
zoom
)
@@ -456,7 +456,9 @@ export default defineComponent({
setPencilWidth()
}
let upDataPencilWidth = (zoom)=>{
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]) / zoom;
if(canvasBtn.canvasPencilWidth[canvasBtn?.canvasState]){
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]) / zoom;
}
}
let deleteObj = ()=> {
// if(!canvas.getActiveObjects()){