Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

osmd-extended

@@ -1 +1 @@
-Subproject commit e740e090df6df7593f61f042aebd4a7ed5c3cbed
+Subproject commit aa9562c2e5674361ae5a9b8964040fd3d5f1688b

src/view/music-score/index.tsx

@@ -162,6 +162,8 @@ export default defineComponent({
 			osmd.EngravingRules.DYMusicScoreId = state.examSongId || ''
 			osmd.EngravingRules.DYCustomRepeatCount = state.maxLyricNum || 0;
 			osmd.EngravingRules.DYIsSingleLine = state.isSingleLine;
+			// 传入自定义的小节循环顺序
+			osmd.EngravingRules.DYCustomRepeatStr = state.extConfigJson.customRepeatStr?.trim()?.replace(/，/g, ',') || '';
 			await osmd.load(musicData.score);
 			// 对外暴露 一行谱时候 缩小谱面
 			if(state.isSimplePage){