Pārlūkot izejas kodu

fix: 谱面编辑老师端移动位置修改

TIANYONG 5 mēneši atpakaļ
vecāks
revīzija
c977864f1f

+ 6 - 5
src/helpers/formateMusic.ts

@@ -714,6 +714,8 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 	let speed = -1
 	let beats = -1;
 	let beatType = -1;
+	// 前面小节的拍子
+	let preBeats = -1;
 	// 小节中如果没有节点默认为休止符
 	for (const measure of measures) {
 		if (beats === -1 && measure.getElementsByTagName("beats").length) {
@@ -784,9 +786,10 @@ export const transferJianNote = (measure: any, divisions: number, beats: number)
 	const notes = measure.getElementsByTagName("note")
 	for (const note of notes) {
 		const noteType = note.getElementsByTagName("type")?.[0]?.textContent || '';
-		if (noteType === 'whole') {
+		if (noteType === 'whole' || noteType === 'half') {
+			const maxNumber = noteType === 'half' ? 2 : beats
 			let quarterNoteNumber = 1;
-			while (quarterNoteNumber <= beats) {
+			while (quarterNoteNumber <= maxNumber) {
 				const newnote = document.createElement('note');
 				newnote.innerHTML = `
 				<rest></rest>
@@ -797,9 +800,7 @@ export const transferJianNote = (measure: any, divisions: number, beats: number)
 				quarterNoteNumber += 1;
 			};
 			measure.removeChild(note);
-		} else if (noteType === 'half') {
-			// measure.removeChild(note);
-		}
+		} 
 	}
 }
 

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

@@ -1,6 +1,6 @@
 import { Row, showToast, showConfirmDialog } from "vant";
 import { defineComponent, onMounted, onUnmounted, reactive, nextTick, ref } from "vue";
-import state from "/src/state";
+import state, { IPlatform } from "/src/state";
 import request from "/src/utils/request";
 import { getQuery } from "/src/utils/queryString";
 import styles from "./index.module.less";
@@ -363,7 +363,11 @@ async function setModelPostion(item: any, x: number, y: number, repeatEdit?: boo
 				const original = document.getElementById(item.id)?.getBoundingClientRect() || { x: 0, y: 0 };
 				tsX = targetX - original.x;
 				tsY = targetY - original.y;
-				// console.log('距离',tsX,tsY,x,y)
+				// console.log('距离',tsX,tsY,x,y,moveData.zoom)
+				if (state.platform === IPlatform.PC) {
+					tsX = tsX / 1.5
+					tsY = tsY / 1.8
+				}
 				g && g.setAttribute("transform", `translate(${tsX / moveData.zoom}, ${tsY / moveData.zoom})`);
 				el && (el.style.transform = `translate(${tsX}px, ${tsY}px)`);
 			} else {

+ 2 - 2
vite.config.ts

@@ -76,8 +76,8 @@ export default defineConfig({
         // target: "https://kt.colexiu.com",
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
-        // target: "https://test.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
-        target: "https://test.kt.colexiu.com",
+        target: "https://test.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
+        // target: "https://test.kt.colexiu.com",
         // target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),