Merge branch 'fix-tianyong' into gyt-test

dist/colexiu-report-share.html

@@ -191,7 +191,11 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.ce51be5a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 </html>

dist/colexiu-report.html

@@ -123,7 +123,11 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.6150f45c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/colexiu-share.html

@@ -80,7 +80,11 @@
   </div>
   
   <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.6b6316a9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 </html>

dist/colexiu.html

@@ -220,7 +220,11 @@
     </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.cb9edc3c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/colxiu-website.html

@@ -184,7 +184,11 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.3034b329.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 </html>

dist/index.html

@@ -84,7 +84,11 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.dcfac47d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/music-sheet.html

@@ -218,7 +218,11 @@
     </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.c69a499e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/orchestra.html

@@ -84,7 +84,11 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+>>>>>>> fix-tianyong
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.17beef1a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/subpages/colexiu/buttons/evaluating.tsx

@@ -256,13 +256,15 @@ const sendOffsetTime = (offsetTime: number) => {
 
 const cancelTheEvaluation = () => {
   const search = useOriginSearch()
-  postMessage({ api: 'endEvaluating', content: { musicScoreId: search.id } })
-  playStatus.value = 'stop'
-  RuntimeUtils.pause()
-  RuntimeUtils.resetPlayStatus()
-  RuntimeUtils.clearIntervalTimeline()
-  RuntimeUtils.setCurrentTime(0)
-  Toast.clear()
+  setTimeout(() => {
+    postMessage({ api: 'endEvaluating', content: { musicScoreId: search.id } })
+    playStatus.value = 'stop'
+    RuntimeUtils.pause()
+    RuntimeUtils.resetPlayStatus()
+    RuntimeUtils.clearIntervalTimeline()
+    RuntimeUtils.setCurrentTime(0)
+    Toast.clear()
+  }, 200);
 }
 
 const stopPlay = () => {
@@ -373,21 +375,23 @@ const playerStop = () => {
     message: '评分中...',
     type: 'loading',
   })
-  postMessage(
-    {
-      api: 'endEvaluating',
-      content: {
-        musicScoreId: useOriginSearch().id,
+  setTimeout(() => {
+    postMessage(
+      {
+        api: 'endEvaluating',
+        content: {
+          musicScoreId: useOriginSearch().id,
+        },
       },
-    },
-    (evt) => {
-      console.log('调用endEvaluating结束', evt)
-      endloading.value = false
-      evaluating.value = false
-      // RuntimeUtils.setCaptureMode()
-    }
-  )
-  RuntimeUtils.endCapture()
+      (evt) => {
+        console.log('调用endEvaluating结束', evt)
+        endloading.value = false
+        evaluating.value = false
+        // RuntimeUtils.setCaptureMode()
+      }
+    )
+    RuntimeUtils.endCapture()
+  },200)
 }
 export const evaluatPlayerStop = playerStop