merge

src/constant/instruments.ts

@@ -156,6 +156,7 @@ const instruments: any = {
 	Melodica: '口风琴',
 	'Snare Drum': '小军鼓',
 	'Horn in F': '圆号',
+	'Horns in F': '圆号',
 	Triangle: '三角铁',
 	Vibrato: '颤音琴',
 	'Suspend Cymbals': '吊镲',

src/constant/instrumentsClassfiy.ts

@@ -3,7 +3,7 @@ const instrumentsClassfiy: any = {
 	"4": ["Clarinet"],
 	"6": ["Soprano Sax", "Alto Sax", "Tenor Sax", "Baritone Sax", "Soprano Saxophone", "Alto Saxophone", "Tenor Saxophone", "Baritone Saxophone"],
 	"12": ["Trumpet", "Muted Trumpet"],
-	"13": ["Horn in F", "French Horn"],
+	"13": ["Horn in F", "French Horn", "Horns in F"],
 	"14": ["Trombone"],
 	"15": ["Euphonium"],
 	"17": ["Tuba"],

src/helpers/customMusicScore.ts

@@ -1084,15 +1084,6 @@ export const setCustomNoteRealValue = () => {
 			0: 0.03125,
 		};
 	}
-	if (["12673"].includes(detailId) && ['22'].includes(partIndex)) {
-		customData.customNoteRealValue = {
-			208: 0.125,
-		};
-	}
-
-    if (["12667", "12673"].includes(detailId)){
-        customData.customNoteCurrentTime = true
-    }
 };
 
 /** 转换简谱的全休止符和二分休止符 */

src/helpers/formateMusic.ts

@@ -681,8 +681,8 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 	for (const minute of minutes) {
 		let measureSpeed = minute.textContent ? Number(minute.textContent) : 0;
 		// 速度带附点，需要转换成不带附点的速度值
-		const hasSpeedDot = Array.from(minute?.parentElement?.children || []).some((item: any) => item?.tagName === 'beat-unit-dot')
-		measureSpeed = hasSpeedDot ? measureSpeed + measureSpeed/2 : measureSpeed;
+		// const hasSpeedDot = Array.from(minute?.parentElement?.children || []).some((item: any) => item?.tagName === 'beat-unit-dot')
+		// measureSpeed = hasSpeedDot ? measureSpeed + measureSpeed/2 : measureSpeed;
 		if (minute.textContent && measureSpeed) {
 			speeds.push(Number(measureSpeed))
 		}

src/page-instrument/simple-detail/index.tsx

@@ -124,7 +124,7 @@ export default defineComponent({
 				handleSetSpeed(saveSpeed);
 			}
 			// setCustomGradual();
-			setCustomNoteRealValue();
+			// setCustomNoteRealValue();
 			state.times = formateTimes(osmd);
 			console.log("🚀 ~ state.times:", state.times, state);
 			nextTick(() => {

src/page-instrument/view-detail/index.tsx

@@ -220,7 +220,7 @@ export default defineComponent({
       //   handleSetSpeed(saveSpeed);
       // }
       // setCustomGradual();
-      setCustomNoteRealValue();
+      // setCustomNoteRealValue();
       state.times = formateTimes(osmd);
       // state.times = resetFrequency(state.times);
       state.times = setNoteHalfTone(state.times);

src/view/fingering/fingering-config.ts

@@ -179,6 +179,7 @@ export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU"
       "Horn in F": 13,
       "Horn in F 1": 13,
       "Horn in F 2": 13,
+      "Horns in F": 13,
       "Trombone 1": 14,
       "Trombone 2": 14,
       "Trombone 3": 14,
@@ -287,6 +288,7 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):
       "Horn in F": 13,
       "Horn in F 1": 13,
       "Horn in F 2": 13,
+      "Horns in F": 13,
       "Trombone 1": 14,
       "Trombone 2": 14,
       "Trombone 3": 14,