Browse Source

feat: 摇篮曲特殊处理

TIANYONG 1 năm trước cách đây
mục cha
commit
f9b9de9dc8

+ 8 - 3
src/helpers/customMusicScore.ts

@@ -195,7 +195,10 @@ export const moveGracePosition = (needTrans?: boolean) => {
 			const arrowDom = document.getElementById('vf-auto2178-lines'), fixedArrowDom = document.getElementById('vf-auto2390-lines');
 			const arrowDom = document.getElementById('vf-auto2178-lines'), fixedArrowDom = document.getElementById('vf-auto2390-lines');
 
 
 			const needTransLateDom2: any = document.getElementById('vf-auto2172')?.getElementsByClassName('vf-modifier')?.[0], fixednNeedTransLateDom2: any = document.getElementById('vf-auto2384')?.getElementsByClassName('vf-modifier')?.[0];
 			const needTransLateDom2: any = document.getElementById('vf-auto2172')?.getElementsByClassName('vf-modifier')?.[0], fixednNeedTransLateDom2: any = document.getElementById('vf-auto2384')?.getElementsByClassName('vf-modifier')?.[0];
-			const arrowDom2 = document.getElementById('vf-auto2172-lines'), fixedArrowDom2 = document.getElementById('vf-auto2384-lines');			
+			const arrowDom2 = document.getElementById('vf-auto2172-lines'), fixedArrowDom2 = document.getElementById('vf-auto2384-lines');	
+			
+			const needTransLateDom3: any = document.getElementById('vf-auto1589')?.getElementsByClassName('vf-modifier')?.[0];
+			const arrowDom3 = document.getElementById('vf-auto1589-lines');
 
 
 			// const targetIdx = ['1788502467554750466','1788501975122489346'].includes(state.cbsExamSongId) ? 29 : 17;
 			// const targetIdx = ['1788502467554750466','1788501975122489346'].includes(state.cbsExamSongId) ? 29 : 17;
 			// const targetNeedTransLateDom: any = document.querySelectorAll('.vf-measure')?.[targetIdx]?.getElementsByClassName('vf-stavenote')?.[1]?.getElementsByClassName('vf-modifier')?.[0];
 			// const targetNeedTransLateDom: any = document.querySelectorAll('.vf-measure')?.[targetIdx]?.getElementsByClassName('vf-stavenote')?.[1]?.getElementsByClassName('vf-modifier')?.[0];
@@ -213,14 +216,16 @@ export const moveGracePosition = (needTrans?: boolean) => {
 			if (fixednNeedTransLateDom) fixednNeedTransLateDom.style.transform = 'translateX(-0.65rem)';
 			if (fixednNeedTransLateDom) fixednNeedTransLateDom.style.transform = 'translateX(-0.65rem)';
 			if (needTransLateDom2) needTransLateDom2.style.transform = 'translateX(-1rem)';
 			if (needTransLateDom2) needTransLateDom2.style.transform = 'translateX(-1rem)';
 			if (fixednNeedTransLateDom2) fixednNeedTransLateDom2.style.transform = 'translateX(-1rem)';
 			if (fixednNeedTransLateDom2) fixednNeedTransLateDom2.style.transform = 'translateX(-1rem)';
+			if (needTransLateDom3) needTransLateDom3.style.transform = 'translateX(-0.65rem)';
 
 
 			if (arrowDom) arrowDom.style.transform = 'translateX(-0.65rem)';
 			if (arrowDom) arrowDom.style.transform = 'translateX(-0.65rem)';
 			if (fixedArrowDom) fixedArrowDom.style.transform = 'translateX(-0.65rem)';
 			if (fixedArrowDom) fixedArrowDom.style.transform = 'translateX(-0.65rem)';
 			if (arrowDom2) arrowDom2.style.transform = 'translateX(-1rem)';
 			if (arrowDom2) arrowDom2.style.transform = 'translateX(-1rem)';
 			if (fixedArrowDom2) fixedArrowDom2.style.transform = 'translateX(-1rem)';
 			if (fixedArrowDom2) fixedArrowDom2.style.transform = 'translateX(-1rem)';
+			if (arrowDom3) arrowDom3.style.transform = 'translateX(-0.65rem)';
 
 
-			if (arrowDom || fixedArrowDom || arrowDom2 || fixedArrowDom2 || targetArrowDom) {
-				const path: any = arrowDom ? arrowDom.querySelector('path') : fixedArrowDom ? fixedArrowDom.querySelector('path') : arrowDom2 ? arrowDom2.querySelector('path') : fixedArrowDom2 ? fixedArrowDom2.querySelector('path') : targetArrowDom ? targetArrowDom.querySelector('path') : null;
+			if (arrowDom || fixedArrowDom || arrowDom2 || fixedArrowDom2 || arrowDom3) {
+				const path: any = arrowDom ? arrowDom.querySelector('path') : fixedArrowDom ? fixedArrowDom.querySelector('path') : arrowDom2 ? arrowDom2.querySelector('path') : fixedArrowDom2 ? fixedArrowDom2.querySelector('path') : arrowDom3 ? arrowDom3.querySelector('path') : null;
 				let d = path?.getAttribute("d");
 				let d = path?.getAttribute("d");
 				if (d) {
 				if (d) {
 					const patchStr = d.split('L')?.last()?.split(" ")?.[0];
 					const patchStr = d.split('L')?.last()?.split(" ")?.[0];

+ 1 - 1
src/page-instrument/header-top/music-type/index.tsx

@@ -79,7 +79,7 @@ export default defineComponent({
 						<div>首调</div>
 						<div>首调</div>
 					</div>
 					</div>
 					{
 					{
-						['1788501975122489346','1788502467554750466'].includes(state.cbsExamSongId) ? null : 
+						['1788501975122489346','1788502467554750466','1789839575249596417'].includes(state.cbsExamSongId) ? null : 
 						<div class={["van-popover__action", styles.item, state.musicRenderType === "fixedTone" && styles.active]} onClick={() => onSelect("fixedTone")}>
 						<div class={["van-popover__action", styles.item, state.musicRenderType === "fixedTone" && styles.active]} onClick={() => onSelect("fixedTone")}>
 							<img src={state.musicRenderType === "fixedTone" ? headImg("guding-active.svg") : headImg("guding.svg")} />
 							<img src={state.musicRenderType === "fixedTone" ? headImg("guding-active.svg") : headImg("guding.svg")} />
 							<div>固定调</div>
 							<div>固定调</div>

+ 1 - 1
src/state.ts

@@ -1287,7 +1287,7 @@ const setState = (data: any, index: number) => {
   /**
   /**
    * TODO:摇篮曲特殊处理
    * TODO:摇篮曲特殊处理
    */
    */
-  if (['1788501975122489346','1788502467554750466'].includes(state.cbsExamSongId)) {
+  if (['1788501975122489346','1788502467554750466','1789839575249596417'].includes(state.cbsExamSongId)) {
     if (state.musicRenderType === 'fixedTone') {
     if (state.musicRenderType === 'fixedTone') {
       state.musicRenderType = EnumMusicRenderType.firstTone;
       state.musicRenderType = EnumMusicRenderType.firstTone;
     }
     }