Merge branch 'online'

dist/index.html

@@ -12,7 +12,11 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-050d3fbf.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-f5d710a3.js"></script>
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-2c2847b0.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -23,7 +27,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-7555a301.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-cad6e346.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-79b286fc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

src/pc/home/index.tsx

@@ -323,7 +323,7 @@ export default defineComponent({
 				if (!data.playState) return;
 				if (ev.measureStart && ev.left === null) return; // this was the second part of a tie across a measure line. Just ignore it.
 
-				if (popup.selectMearesShow) {
+				if (popup.selectMearesShow && data.selectMeasures.startNote && data.selectMeasures.endNote) {
 					const startTime = data.selectMeasures.startNote?.currentTrackMilliseconds || 0;
 					// const timeNote = data.times.find(
 					// 	(n) => n.startChar === data.selectMeasures.startNote.startChar
@@ -399,6 +399,20 @@ export default defineComponent({
 
 		const togglePlay = (type: "play" | "pause" | "reset") => {
 			if (type === "play") {
+				if (popup.selectMearesShow) {
+					if (
+						data.selectMeasures.start > data.selectMeasures.end ||
+						data.selectMeasures.start === 0 ||
+						data.selectMeasures.end === 0
+					) {
+						data.selectMeasures.start = 0;
+						data.selectMeasures.end = 0;
+						data.selectMeasures.startNote = null;
+						data.selectMeasures.endNote = null;
+						message.warning("请输入正确的小节范围");
+						return;
+					}
+				}
 				abcData.synthControl.play();
 				data.playState = true;
 			} else if (type === "pause") {
@@ -2387,7 +2401,10 @@ export default defineComponent({
 									<div class={styles.mearesInput}>
 										<NInputNumber
 											min={1}
-											max={(data.selectMeasures.end ? data.selectMeasures.end + 1 : 0) || data.selectMeasures.max}
+											max={
+												(data.selectMeasures.end ? data.selectMeasures.end + 1 : 0) ||
+												data.selectMeasures.max
+											}
 											bordered={false}
 											placeholder="开始小节"
 											showButton={false}