Merge branch 'online'

dist/colexiu.html

@@ -38,9 +38,15 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-88ac721c.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-0e3acafe.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-7890d8c3.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e746a9e1.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -52,8 +58,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-d1fc2011.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-647ded5e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/index.html

@@ -73,8 +73,13 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-55159d48.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
+=======
+  <script type="module" crossorigin src="./assets/index-a8569114.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
+>>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -92,8 +97,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-8a175521.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-43839439.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/orchestra.html

@@ -39,9 +39,15 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-5868bc59.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-0e3acafe.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-6cb9f493.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e746a9e1.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/orchestra-48fbf383.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -64,8 +70,13 @@
   </script>
   
   <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>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-7010dcc6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-ae4563e7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/report-share.html

@@ -23,8 +23,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-c641e103.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-ebeedc13.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
+>>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -49,8 +54,13 @@
   </script>
   
   <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>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-eef42502.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-74d6b226.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

src/helpers/metronome.ts

@@ -108,7 +108,7 @@ class Metronome {
 	playAudio = () => {
 		if (!metronomeData.initPlayerState) return;
 		this.source = metronomeData.activeMetro?.index === 0 ? this.source1 : this.source2;
-		this.source.volume(metronomeData.disable ? 0 : 0.4);
+		this.source.volume(metronomeData.disable || state.playState === 'paused' ? 0 : 0.4);
 		this.source.play();
 	};
 

src/state.ts

@@ -1,4 +1,4 @@
-import { showToast } from "vant";
+import { closeToast, showToast } from "vant";
 import { reactive } from "vue";
 import { OpenSheetMusicDisplay } from "../osmd-extended/src";
 import { metronomeData } from "./helpers/metronome";
@@ -89,8 +89,6 @@ const state = reactive({
 	sectionStatus: false,
 	/** 选段数据 */
 	section: [] as any[],
-	/** 选段提示 */
-	sectionToast: null as any,
 	/** 选段背景 */
 	sectionBoundingBoxs: [] as any[],
 	/** 开启选段预备 */
@@ -387,7 +385,7 @@ export const handleSetSpeed = (speed: number) => {
 export const clearSelection = () => {
 	state.sectionStatus = false;
 	state.section = [];
-	state.sectionToast?.close();
+	closeToast();
 };
 
 /** 开启选段 */
@@ -404,18 +402,12 @@ export const handleChangeSection = () => {
 	if (state.sectionStatus) {
 		togglePlay("paused");
 	}
-	if (state.sectionToast) {
-		state.sectionToast.message = "请选择开始小节"
-		state.sectionToast.duration = 0
-		state.sectionToast.toggle(true)
-	} else {
-		state.sectionToast = showToast({
-			message: "请选择开始小节",
-			duration: 0,
-			position: "top",
-			className: "selectionToast",
-		});
-	}
+	showToast({
+		message: "请选择开始小节",
+		duration: 0,
+		position: "top",
+		className: "selectionToast",
+	})
 };
 
 /** 效验并格式化选段小节 */
@@ -451,11 +443,16 @@ export const handleSelection = (item: any) => {
 		state.section.push(item);
 		if (state.section.length === 2) {
 			state.section = formateSelectMearure(state.section);
-			state.sectionToast?.close();
+			closeToast();
 		}
 	}
-	if (state.section.length === 1 && state.sectionToast) {
-		state.sectionToast.message = "请选择结束小节";
+	if (state.section.length === 1) {
+		showToast({
+			message: "请选择结束小节",
+			duration: 0,
+			position: "top",
+			className: "selectionToast",
+		})
 	}
 };