liushengqiang 2 tahun lalu
induk
melakukan
270631fb08

+ 2 - 1
src/page-instrument/view-detail/index.tsx

@@ -151,7 +151,8 @@ export default defineComponent({
 			state.musicSheetCategoriesId = data.musicSheetCategoriesId;
 			state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
 			state.originSpeed = state.speed = data.playSpeed;
-			state.track = data.code || data.track;
+			const track = data.code || data.track;
+			state.track = track ? track.replace(/ /g, '').toLocaleLowerCase() : "";
 			state.enableNotation = data.notation ? true : false;
 
 			// 映射声部ID

+ 27 - 27
src/view/fingering/fingering-config.ts

@@ -84,33 +84,33 @@ export const mappingVoicePart = (
 		return subject[id];
 	} else if (soruce === "INSTRUMENT") {
 		const subject: { [_key: string | number]: any } = {
-			Flute: 2,
-			Clarinet: 4,
-			Trombone: 14,
-			Tuba: 17,
-			Trumpet: 12,
-			Horn: 13,
-			AltoSaxophone: 6,
-			TenorSaxophone: 6,
-			Saxophone: 6,
-			UpBassHorn: 15,
-			Melodica: 137,
-			HulusiFlute: 136,
-			PanFlute: 135,
-			Recorder: 120,
-			Ukulele: 130,
-			Mouthorgan: 140,
-			Piano: 150,
+			flute: 2,
+			clarinet: 4,
+			trombone: 14,
+			tuba: 17,
+			trumpet: 12,
+			horn: 13,
+			altosaxophone: 6,
+			tenorsaxophone: 6,
+			saxophone: 6,
+			upbasshorn: 15,
+			melodica: 137,
+			hulusiFlute: 136,
+			panflute: 135,
+			recorder: 120,
+			ukulele: 130,
+			mouthorgan: 140,
+			piano: 150,
 			4: 120,
 			3: "hulusi-flute",
 			1: "pan-flute",
 			// 2: "ocarina",
 			// 5: "melodica",
-			"Tenor Recorder": 120,
-			// Woodwind: "hulusi-flute",
-			// Panpipes: "pan-flute",
-			// Ocarina: "ocarina",
-			// Nai: "melodica",
+			renorrecorder: 120,
+			woodwind: "hulusi-flute",
+			panpipes: "pan-flute",
+			ocarina: "ocarina",
+			nai: "melodica",
 		};
 		return subject[id] || 0;
 	}
@@ -174,14 +174,14 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
 				name: "piccolo",
 				direction: "vertical",
 				width: "3rem",
-				orientation: 1
+				orientation: 1,
 			};
 		case "hulusi-flute": // 葫芦丝
 			return {
 				name: "hulusi-flute",
 				direction: "vertical",
 				width: "3rem",
-				orientation: 1
+				orientation: 1,
 			};
 		case "pan-flute": // 排箫
 			return {
@@ -189,7 +189,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
 				direction: "vertical",
 				width: "3rem",
 				disabledFinger: true,
-				orientation: 0
+				orientation: 0,
 			};
 		case "ocarina": // 陶笛
 			return {
@@ -197,14 +197,14 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
 				direction: "vertical",
 				width: "3rem",
 				disabledFinger: true,
-				orientation: 0
+				orientation: 0,
 			};
 		case "melodica": // 口风琴
 			return {
 				name: "melodica",
 				direction: "transverse",
 				height: "1.8rem",
-				orientation: 0
+				orientation: 0,
 			};
 		default:
 			return {};