Browse Source

Merge branch '2023-9-13_指法' into online

liushengqiang 1 year ago
parent
commit
d7e6fd356f

+ 8 - 5
src/page-instrument/view-figner/index.tsx

@@ -118,11 +118,13 @@ export default defineComponent({
 			}
 		};
 
-		if (!props.isComponent && !browsInfo.ios && fingerData.fingeringInfo.orientation === 1) {
-			getAPPData("top");
-		}
-		if (!props.isComponent && !browsInfo.ios && fingerData.fingeringInfo.orientation === 0) {
-			getAPPData("left");
+		const getHeadTop = () => {
+			if (!browsInfo.ios && fingerData.fingeringInfo.orientation === 1) {
+				getAPPData("top");
+			}
+			if (!browsInfo.ios && fingerData.fingeringInfo.orientation === 0) {
+				getAPPData("left");
+			}
 		}
 
 		const getNotes = () => {
@@ -194,6 +196,7 @@ export default defineComponent({
 			data.viewTotal = o[data.subject] || 1;
 			getFingeringData();
 			getSounFonts();
+			getHeadTop();
 		});
 
 		const noteClick = (item: IFIGNER_INSTRUMENT_Note) => {

+ 1 - 1
src/view/fingering/fingering-relationships.ts

@@ -438,7 +438,7 @@ const relationships = {
 	ocarina: {
 		57: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
 		58: [1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12],
-		59: [1, 2, 4, 5, 6, 8, 9, 10, 11, 12],
+		59: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12],
 		60: [1, 2, 4, 5, 6, 8, 9, 10, 11, 12],
 		61: [1, 2, 4, 5, 6, 7, 8, 9, 11, 12],
 		62: [1, 2, 4, 5, 6, 8, 9, 11, 12],