Browse Source

Merge branch '2023-8-28'

liushengqiang 1 year ago
parent
commit
f385aa4dfd
1 changed files with 22 additions and 6 deletions
  1. 22 6
      src/pc/home/index.tsx

+ 22 - 6
src/pc/home/index.tsx

@@ -936,9 +936,15 @@ export default defineComponent({
 			// 谱号
 			if (type === "clef") {
 				if (data.active) {
-					if (!activeNote) return;
-					activeNote.clef = `[${value}]`;
-					await handleResetRender();
+					if (data.active.measureIndex === 0 && data.active.noteIndex === 0) {
+						abcData.abc.celf = value;
+						handleResetRender();
+					} else {
+						if (!activeNote) return;
+						activeNote.clef = `[${value}]`;
+						await handleResetRender();
+					}
+					rangeHighlight(data.active.startChar);
 				} else {
 					abcData.abc.celf = value;
 					handleResetRender();
@@ -948,11 +954,21 @@ export default defineComponent({
 			// 调号
 			if (type === "key") {
 				if (data.active) {
-					if (!activeNote) return;
-					activeNote.key = `[${value}]`;
-					await handleResetRender();
+					if (data.active.measureIndex === 0 && data.active.noteIndex === 0) {
+						abcData.abc.key = value;
+						abcData.abc.visualTranspose = 0;
+						abcData.abc.visualKey = "K:C";
+						await handleResetRender();
+					} else {
+						if (!activeNote) return;
+						activeNote.key = `[${value}]`;
+						await handleResetRender();
+					}
+					rangeHighlight(data.active.startChar);
 				} else {
 					abcData.abc.key = value;
+					abcData.abc.visualTranspose = 0;
+					abcData.abc.visualKey = "K:C";
 					await handleResetRender();
 				}
 			}