fix: #bug修复

osmd-extended

@@ -1 +1 @@
-Subproject commit bf326ddcff73eff1f34abeda04e4ae12ce4698e4
+Subproject commit 765141b814bf94bf9b810a09f966c40af18014c9

src/helpers/metronome.ts

@@ -191,7 +191,7 @@ class Metronome {
 		} else {
 			this.source.muted = false
 		}
-		// console.log('节拍器播放的时间',tickTockPlayTime)
+		console.log('节拍器播放的时间',tickTockPlayTime)
 		this.source.play();
 	};
 
@@ -310,7 +310,15 @@ class Metronome {
 						}
 						m.stepList = calculateMutilpleMetroStep(note.measures, m);
 					} else {
-						m.stepList = calculateMetroStep(note.measures, m);
+						/**
+						 * bug:#9877
+						 * 多分轨合并显示，不同分轨的音符数量可能不同
+						 */
+						let measureArr = note.measures;
+						if (state.isCombineRender) {
+							measureArr = measureArr.filter((item: any) => item.MeasureNumberXML === m.measureNumberXML)
+						}
+						m.stepList = calculateMetroStep(measureArr, m);
 					}
 					measures.push(m);
 					xmlNumber = measureNumberXML;

src/state.ts

@@ -686,7 +686,7 @@ const setCursorPosition = (note: any, cursor: any) => {
      * bug：#9920
      * 简谱选段模式，预备小节为休止小节时，选段播放结束，指针会重置到第一小节位置的初始位置
      */
-    if (state.sectionStatus && note.isRestFlag) {
+    if (state.sectionStatus && note.multipleRestMeasures) {
       return
     }
     nextTick(() => {

src/view/plugins/toggleMusicSheet/choosePartName/index.tsx

@@ -19,7 +19,9 @@ export default defineComponent({
     // #9463 bug，未更换声轨点击确定不应该重新加载，现在会导致切换错误
     const partIndexChanged = ref(false);
     const { partListNames, partIndex } = toRefs(props)
-    const selectIndex = ref((partListNames.value[partIndex.value] as any).value)
+    let idx = partListNames.value.findIndex((item: any) => item.value === partIndex.value);
+    idx = idx > -1 ? idx : 0;
+    const selectIndex = ref(idx);
     const columns = computed(() => {
       return partListNames.value
     })

vite.config.ts

@@ -68,9 +68,9 @@ export default defineConfig({
 				// target: "https://kt.colexiu.com",
 				// target: "https://test.lexiaoya.cn",
 				// target: "https://dev.kt.colexiu.com",
-				// target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
+				target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
 				// target: "https://dev.resource.colexiu.com",
-				target: "https://test.kt.colexiu.com",
+				// target: "https://test.kt.colexiu.com",
 				// target: "https://mec.colexiu.com",
 				changeOrigin: true,
 				rewrite: (path) => path.replace(/^\/instrument/, ""),