Merge branch 'new-feature-tianyong' into ktyq-online

src/view/plugins/move-music-score/index.tsx

@@ -495,13 +495,19 @@ export const renderForMoveData = () => {
 					// }
 					if (textValue !== item.textContent) {
 						while (!done) {
-							preIndex = targetIndex - 1
-							nextIndex = targetIndex + 1
-							let text1 = document.querySelector("#" + moveData.modelList[preIndex].id)?.querySelector("text")?.innerHTML || ''
-							let text2 = document.querySelector("#" + moveData.modelList[nextIndex].id)?.querySelector("text")?.innerHTML || ''
+							let text1 = moveData.modelList[preIndex] ? document.querySelector("#" + moveData.modelList[preIndex].id)?.querySelector("text")?.innerHTML || '' : ''
+							let text2 = moveData.modelList[nextIndex] ? document.querySelector("#" + moveData.modelList[nextIndex].id)?.querySelector("text")?.innerHTML || '' : ''
 							if (text1 === item.textContent || text2 === item.textContent) {
 								done = true
 								targetIndex = text1 === item.textContent ? preIndex : nextIndex
+							} else {
+								// 有可能后台编辑的元素在部分屏幕尺寸下没有该元素，比如小节索引数，可能后台显示的是1，3，5，部分屏幕尺寸显示的1，3，6
+								if (!text1 && !text2) {
+									done = true
+									targetIndex = -1
+								}
+								preIndex = preIndex - 1
+								nextIndex = nextIndex + 1
 							}
 						}
 					}
@@ -510,7 +516,7 @@ export const renderForMoveData = () => {
 					index = targetIndex
 					item.id = `text${targetIndex+1}`
 				}
-				console.log(66666666,index)
+				// console.log(66666666,index)
 				if (index > -1) {
 					moveData.modelList[index] = {
 						...moveData.modelList[index],

src/view/tick/index.tsx

@@ -5,6 +5,8 @@ import { Popup } from "vant";
 import styles from "./index.module.less";
 import state from "/src/state";
 import { browser } from "/src/utils/index";
+import tickWav from "/src/assets/tick.wav";
+import tockWav from "/src/assets/tock.wav";
 
 const browserInfo = browser();
 export const tickData = reactive({
@@ -100,7 +102,7 @@ export default defineComponent({
 			tickData.tickEnd = true
 		};
 		onMounted(() => {
-			Promise.all([createAudio(tockAndTick.tick), createAudio(tockAndTick.tock)]).then(
+			Promise.all([createAudio(tickWav), createAudio(tockWav)]).then(
 				([tick, tock]) => {
 					if (tick) {
 						audioData.tick = tick;