Merge branch 'hqyDev' of http://git.dayaedu.com/liushengqiang/music-score into ktyq-test-new

src/view/audio-list/index.tsx

@@ -264,7 +264,7 @@ async function mergeBeatAudio(music?:string){
 		const beatsTime:number[] = []
 		metronomeData.metroMeasure.map(measures=>{
 			measures.map((item:any)=>{
-				beats.push(item.isTick?tickBuff!:tockBuff!)
+				beats.push(item.index===0?tickBuff!:tockBuff!)
 				beatsTime.push(item.time + silenceDuration) // xml 计算的时候 加上空白的时间
 			})
 		})

src/view/music-score/index.tsx

@@ -234,10 +234,10 @@ export default defineComponent({
 			}
 			// 有可能会有 其他地方的js执行 阻塞 这里确保加载条出来
 			isLoadingCss.value = true
+			musicData.showSelection = false;
 			setTimeout(async () => {
 				state.evXmlBeginArr = [];
 				state.vfmeasures = [];
-				musicData.showSelection = false;
 				state.osmd.clear();
 				musicData.isRenderLoading = true;
 				musicData.isRefreshLoading = true;
@@ -270,7 +270,7 @@ export default defineComponent({
 			>
 				{slots.default?.()}
 				{props.showSelection && musicData.showSelection && !state.isEvaluatReport &&!state.isSimplePage && state.musicRendered && <Selection />}
-				{props.showSelection && musicData.showSelection && state.isCombineRender && state.musicRendered && <CombineAudio></CombineAudio> }
+				{props.showSelection && musicData.showSelection && state.isCombineRender &&!state.isSimplePage && !state.isPreView && state.musicRendered && <CombineAudio></CombineAudio> }
 			</div>
 		);
 	},