Browse Source

Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

TIANYONG 5 months ago
parent
commit
09eefb7904
1 changed files with 7 additions and 2 deletions
  1. 7 2
      src/view/plugins/move-music-score/index.tsx

+ 7 - 2
src/view/plugins/move-music-score/index.tsx

@@ -345,6 +345,11 @@ async function setModelPostion(item: any, x: number, y: number, repeatEdit?: boo
 	if (item) {
 		const g = document.querySelector("#" + item.id)!; // svg元素
 		const el: HTMLElement = document.querySelector(`[data-id=${item.id}]`)!; // svg元素的背景div
+		let scaleZoom: number = item.zoom ? item.zoom : moveData.zoom;
+		// 预览页时0.65倍的谱面,需要特殊处理下
+		if (state.isPreView && state.zoom == 0.65) {
+			scaleZoom = 0.65
+		}
 		if (x === 0 && y === 0) {
 			g && g.removeAttribute("transform");
 			el && (el.style.transform = "");
@@ -368,10 +373,10 @@ async function setModelPostion(item: any, x: number, y: number, repeatEdit?: boo
 					// tsX = tsX / 1.5
 					// tsY = tsY / 1.8
 				}
-				g && g.setAttribute("transform", `translate(${tsX / moveData.zoom}, ${tsY / moveData.zoom})`);
+				g && g.setAttribute("transform", `translate(${tsX / scaleZoom}, ${tsY / scaleZoom})`);
 				el && (el.style.transform = `translate(${tsX}px, ${tsY}px)`);
 			} else {
-				g && g.setAttribute("transform", `translate(${tsX / moveData.zoom}, ${tsY / moveData.zoom})`);
+				g && g.setAttribute("transform", `translate(${tsX / scaleZoom}, ${tsY / scaleZoom})`);
 				el && (el.style.transform = `translate(${tsX}px, ${tsY}px)`);
 			}
 		}