pull

dist/js/index-8f1db6fe.js → dist/js/index-29004c7c.js

@@ -1 +1 @@
-import{d as i,g as l,n as d,cV as e,c,m as r,f as s,ai as u}from"./index-06491bc6.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+import{d as i,g as l,n as d,cV as e,c,m as r,f as s,ai as u}from"./index-716162c7.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};

dist/js/index-433d999b.js → dist/js/index-d0098337.js

@@ -1 +1 @@
-import{d,l as i,n as p,m as e,w as o,f as r,L as a}from"./index-06491bc6.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+import{d,l as i,n as p,m as e,w as o,f as r,L as a}from"./index-716162c7.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};

dist/js/index-legacy-1347746a.js → dist/js/index-legacy-aa52a74f.js

@@ -1 +1 @@
-System.register(["./index-legacy-d7605800.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.cV,r=e.c,s=e.m,d=e.f,l=e.ai}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+System.register(["./index-legacy-b5b3af95.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.cV,r=e.c,s=e.m,d=e.f,l=e.ai}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));

dist/js/index-legacy-1415f516.js → dist/js/index-legacy-d8f93183.js

@@ -1 +1 @@
-System.register(["./index-legacy-d7605800.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.f,o=e.L}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+System.register(["./index-legacy-b5b3af95.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.f,o=e.L}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));

src/helpers/customMusicScore.ts

@@ -156,12 +156,68 @@ export const resetGivenFormate = () => {
 	
 };
 
+/**
+ * TODO:曲目：摇篮曲（节奏练习）-倚音位置 特殊处理
+ */
+export const moveGracePosition = (needTrans?: boolean) => {
+	/**
+	 * TODO:曲目：摇篮曲（节奏练习）-倚音位置 特殊处理
+	 */
+	const specialIds = ['1788850864767643649','1788502467554750466'];
+	if (specialIds.includes(state.cbsExamSongId) || needTrans) {
+		const lastCurve: any = Array.from(document.getElementsByClassName('vf-curve'))?.last();
+		if (lastCurve) {
+			lastCurve.style.display = 'none';
+		}
+		if (state.musicRenderType === 'staff') {
+			// const transNoteDom = document.getElementById('vf-auto2182')?.getElementsByClassName('vf-modifiers')?.[0];
+			// const transBeamDom = document.getElementById('auto3167')?.parentNode?.getElementsByClassName('vf-beams')?.[0];
+			// if (transNoteDom) {
+			// 	transNoteDom.style.transform = 'translateX(-0.5rem)';
+			// }
+			// if (transBeamDom) {
+			// 	transBeamDom.style.transform = 'translateX(-0.5rem)';
+			// }
+		} else {
+			const signatureDom = document.getElementById('auto2784'), fixedSigntureDom = document.getElementById('auto3022');
+			const needTransLateDom: any = document.getElementById('vf-auto2178')?.getElementsByClassName('vf-modifier')?.[0], fixednNeedTransLateDom: any = document.getElementById('vf-auto2390')?.getElementsByClassName('vf-modifier')?.[0];
+			const arrowDom = document.getElementById('vf-auto2178-lines'), fixedArrowDom = document.getElementById('vf-auto2390-lines');
+			if (signatureDom) signatureDom.style.display = 'none';
+			if (fixedSigntureDom) fixedSigntureDom.style.display = 'none';
+			if (needTransLateDom) needTransLateDom.style.transform = 'translateX(-0.65rem)';
+			if (fixednNeedTransLateDom) fixednNeedTransLateDom.style.transform = 'translateX(-0.65rem)';
+			if (arrowDom) {
+				arrowDom.style.transform = 'translateX(-0.65rem)';
+			}
+			if (fixedArrowDom) {
+				fixedArrowDom.style.transform = 'translateX(-0.65rem)';
+			}
+			if (arrowDom || fixedArrowDom) {
+				const path: any = arrowDom ? arrowDom.querySelector('path') : fixedArrowDom ? fixedArrowDom.querySelector('path') : null;
+				let d = path?.getAttribute("d");
+				if (d) {
+					const patchStr = d.split('L')?.last()?.split(" ")?.[0];
+					let startX = d.split("M")?.[1]?.split(" ")[0] || 0;
+					startX = startX ? Number(startX) : 0;
+					let endX = d.split("L")?.last().split(" ")[0] || 0;
+					endX = endX ? Number(endX) : 0;
+					const distanceX = endX - startX;
+					const transX = startX - distanceX;
+					d = d.replace(`L${patchStr}`,`L${transX}`);
+					path.setAttribute("d", d);
+				}
+			}
+		}
+
+	}
+}
 
 // 谱面优化
 export const resetFormate = () => {
 	container.value = document.getElementById('scrollContainer')
 	// if (state.extStyleConfigJson || !container.value) return;
 	if (!container.value) return;
+	moveGracePosition();
 	const stafflines: SVGAElement[] = Array.from((container.value as HTMLElement).querySelectorAll(".staffline"));
 	const baseStep = 4; // 两个元素相间，的间距
 	const musicalDistance = 28; // 音阶与第一条线谱的间距，默认设置为28
@@ -180,40 +236,6 @@ export const resetFormate = () => {
 		const staveSection: SVGAElement[] = Array.from(staffline.querySelectorAll(".vf-measure .vf-staveSection"));
 		const paths: SVGAElement[] = Array.from(staffline.querySelectorAll(".vf-measure > .vf-stave path"));
 		const dotModifiers: SVGAElement[] = Array.from(staffline.querySelectorAll(".vf-measure .vf-stopDot"));
-		/**
-		 * TODO:曲目：摇篮曲（节奏练习）-倚音位置 特殊处理
-		 */
-		const specialIds = ['1788850864767643649','1788502467554750466'];
-		if (specialIds.includes(state.cbsExamSongId)) {
-			const lastCurve = Array.from(document.getElementsByClassName('vf-curve'))?.last();
-			if (lastCurve) {
-				lastCurve.style.display = 'none';
-			}
-			if (state.musicRenderType === 'staff') {
-				const transNoteDom = document.getElementById('vf-auto2182')?.getElementsByClassName('vf-modifiers')?.[0];
-				const transBeamDom = document.getElementById('auto3167')?.parentNode?.getElementsByClassName('vf-beams')?.[0];
-				if (transNoteDom) {
-					transNoteDom.style.transform = 'translateX(-0.5rem)';
-				}
-				if (transBeamDom) {
-					transBeamDom.style.transform = 'translateX(-0.5rem)';
-				}
-			} else {
-				const signatureDom = document.getElementById('auto2784');
-				const needTransLateDom = document.getElementById('vf-auto2178')?.getElementsByClassName('vf-modifier')?.[0];
-				const arrowDom = document.getElementById('vf-auto2178-lines');
-				if (signatureDom) {
-					signatureDom.style.display = 'none';
-				}
-				if (needTransLateDom) {
-					needTransLateDom.style.transform = 'translateX(-0.65rem)';
-				}
-				if (arrowDom) {
-					arrowDom.style.transform = 'translateX(-0.65rem)';
-				}
-			}
-
-		}
 
 		// 获取第一个线谱的y轴坐标
 		const firstLinePathY = paths[0]?.getBBox().y || 0