Просмотр исходного кода

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

黄琪勇 6 месяцев назад
Родитель
Сommit
8c741bb3cc
60 измененных файлов с 151 добавлено и 1 удалено
  1. 17 0
      dist/colexiu.html
  2. 17 0
      dist/index.html
  3. 14 0
      dist/instrument.html
  4. 0 0
      dist/js/colexiu-10385e58.js
  5. 1 0
      dist/js/colexiu-legacy-6d2fe3a4.js
  6. 1 0
      dist/js/colexiu-legacy-fc7edfeb.js
  7. 0 0
      dist/js/gym-3d27031f.js
  8. 1 0
      dist/js/gym-legacy-8443af4f.js
  9. 1 0
      dist/js/gym-legacy-da604147.js
  10. 0 0
      dist/js/index-092675db.js
  11. 1 0
      dist/js/index-255bc9ab.js
  12. 1 0
      dist/js/index-296bb273.js
  13. 4 0
      dist/js/index-304497cc.js
  14. 1 0
      dist/js/index-4754262e.js
  15. 1 0
      dist/js/index-72e26be9.js
  16. 1 0
      dist/js/index-77fbfebd.js
  17. 0 0
      dist/js/index-87131c6f.js
  18. 5 0
      dist/js/index-93bb2d37.js
  19. 1 0
      dist/js/index-ab6f38bd.js
  20. 1 0
      dist/js/index-c49a4857.js
  21. 1 0
      dist/js/index-d05ece23.js
  22. 0 0
      dist/js/index-f1796f7f.js
  23. 1 0
      dist/js/index-f2a7e185.js
  24. 1 0
      dist/js/index-legacy-1c22195e.js
  25. 1 0
      dist/js/index-legacy-21dad50e.js
  26. 5 0
      dist/js/index-legacy-26b9e03a.js
  27. 5 0
      dist/js/index-legacy-27ffd6e1.js
  28. 1 0
      dist/js/index-legacy-2c532aaf.js
  29. 1 0
      dist/js/index-legacy-2fc11698.js
  30. 1 0
      dist/js/index-legacy-32328ca0.js
  31. 1 0
      dist/js/index-legacy-35ed6f65.js
  32. 1 0
      dist/js/index-legacy-3ffee9d9.js
  33. 0 0
      dist/js/index-legacy-420f6168.js
  34. 0 0
      dist/js/index-legacy-6720a2a7.js
  35. 1 0
      dist/js/index-legacy-8ebc7623.js
  36. 1 0
      dist/js/index-legacy-b1b00396.js
  37. 4 0
      dist/js/index-legacy-f141f0fd.js
  38. 4 0
      dist/js/index-legacy-f2741568.js
  39. 0 0
      dist/js/index-legacy-f2c4d036.js
  40. 1 0
      dist/js/instrument-7ba56e72.js
  41. 1 0
      dist/js/instrument-c1ea0f0e.js
  42. 1 0
      dist/js/instrument-legacy-8014788a.js
  43. 1 0
      dist/js/instrument-legacy-fcba4340.js
  44. 1 0
      dist/js/modeView-189afa0a.js
  45. 1 0
      dist/js/modeView-e3fe59b0.js
  46. 0 0
      dist/js/modeView-legacy-12ddb7bf.js
  47. 0 0
      dist/js/orchestra-ce0d4316.js
  48. 1 0
      dist/js/orchestra-legacy-217b20f2.js
  49. 1 0
      dist/js/orchestra-legacy-9f255c01.js
  50. 0 0
      dist/js/polyfills-f4401cbd.js
  51. 0 0
      dist/js/polyfills-legacy-40603d5c.js
  52. 1 0
      dist/js/report-share-1aa96437.js
  53. 1 0
      dist/js/report-share-8d31054a.js
  54. 1 0
      dist/js/report-share-legacy-342aff9d.js
  55. 1 0
      dist/js/report-share-legacy-3f9d6771.js
  56. 18 0
      dist/orchestra.html
  57. 16 0
      dist/report-share.html
  58. 2 1
      src/helpers/metronome.ts
  59. 1 0
      stats.html
  60. 5 0
      vite.config.ts

+ 17 - 0
dist/colexiu.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/polyfills-bd9a26d6.js"></script>
+=======
+  <script type="module" crossorigin src="./js/polyfills-f4401cbd.js"></script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 
   <meta charset="UTF-8" />
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
@@ -40,11 +44,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/colexiu-5e72098c.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-5000bc03.js">
   <link rel="modulepreload" crossorigin href="./js/index-c99673dd.js">
   <link rel="modulepreload" crossorigin href="./js/index-4754262e.js">
   <link rel="modulepreload" crossorigin href="./js/index-b2861ff4.js">
+=======
+  <script type="module" crossorigin src="./js/colexiu-10385e58.js"></script>
+  <link rel="modulepreload" crossorigin href="./js/index-092675db.js">
+  <link rel="modulepreload" crossorigin href="./js/index-87131c6f.js">
+  <link rel="modulepreload" crossorigin href="./js/index-c49a4857.js">
+  <link rel="modulepreload" crossorigin href="./js/index-ab6f38bd.js">
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
   <link rel="stylesheet" href="./css/index-e4df67fc.css">
   <link rel="stylesheet" href="./css/colexiu-e8b419b5.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -56,8 +68,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="./js/polyfills-legacy-567ededd.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-6d2fe3a4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-fc7edfeb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 </body>
 
 </html>

+ 17 - 0
dist/index.html

@@ -2,7 +2,11 @@
 <html lang="ZH-cn">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/polyfills-bd9a26d6.js"></script>
+=======
+  <script type="module" crossorigin src="./js/polyfills-f4401cbd.js"></script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 
   <meta charset="UTF-8">
   <link rel="icon" href="./favicon.ico" />
@@ -75,11 +79,19 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/gym-c4b85304.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-5000bc03.js">
   <link rel="modulepreload" crossorigin href="./js/index-c99673dd.js">
   <link rel="modulepreload" crossorigin href="./js/index-f2a7e185.js">
   <link rel="modulepreload" crossorigin href="./js/index-b2861ff4.js">
+=======
+  <script type="module" crossorigin src="./js/gym-3d27031f.js"></script>
+  <link rel="modulepreload" crossorigin href="./js/index-092675db.js">
+  <link rel="modulepreload" crossorigin href="./js/index-87131c6f.js">
+  <link rel="modulepreload" crossorigin href="./js/index-77fbfebd.js">
+  <link rel="modulepreload" crossorigin href="./js/index-ab6f38bd.js">
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
   <link rel="stylesheet" href="./css/index-e4df67fc.css">
   <link rel="stylesheet" href="./css/index-85f95688.css">
@@ -98,8 +110,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="./js/polyfills-legacy-567ededd.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-da604147.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-8443af4f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 </body>
 
 </html>

+ 14 - 0
dist/instrument.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/polyfills-bd9a26d6.js"></script>
+=======
+  <script type="module" crossorigin src="./js/polyfills-f4401cbd.js"></script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 
   <meta charset="UTF-8" />
   <meta name="viewport"
@@ -41,8 +45,13 @@
       })
     }
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/instrument-c1ea0f0e.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-5000bc03.js">
+=======
+  <script type="module" crossorigin src="./js/instrument-7ba56e72.js"></script>
+  <link rel="modulepreload" crossorigin href="./js/index-092675db.js">
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
   <link rel="stylesheet" href="./css/index-e4df67fc.css">
   <link rel="stylesheet" href="./css/instrument-118f68d3.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -67,8 +76,13 @@
     var vConsole = new window.VConsole();
   </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="./js/polyfills-legacy-567ededd.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-8014788a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-fcba4340.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 </body>
 
 </html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/colexiu-10385e58.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/colexiu-legacy-6d2fe3a4.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/colexiu-legacy-fc7edfeb.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/gym-3d27031f.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/gym-legacy-8443af4f.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/gym-legacy-da604147.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/index-092675db.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-255bc9ab.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-296bb273.js


+ 4 - 0
dist/js/index-304497cc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/js/index-304497cc.js
 import{d as i,g as l,n as d,bM as e,c,m as r,h as s,au as u}from"./index-5000bc03.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+========
+import{d as i,g as l,n as d,bM as e,c,m as r,h as s,au as u}from"./index-092675db.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+>>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75:dist/js/index-93bb2d37.js

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-4754262e.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-72e26be9.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-77fbfebd.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/index-87131c6f.js


+ 5 - 0
dist/js/index-93bb2d37.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/js/index-304497cc.js
+import{d as i,g as l,n as d,bM as e,c,m as r,h as s,au as u}from"./index-5000bc03.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+========
+import{d as i,g as l,n as d,bM as e,c,m as r,h as s,au as u}from"./index-092675db.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+>>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75:dist/js/index-93bb2d37.js

+ 1 - 0
dist/js/index-ab6f38bd.js

@@ -0,0 +1 @@
+import{b7 as l,d as i,h as a,bh as v,ba as r,bc as d,bz as _,bd as m,bA as w,bg as u,bk as g,F as A}from"./index-092675db.js";const[$,y]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:$,props:P,setup(t){return()=>a("h3",{class:y([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>a("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var I=R;const s="100%",L={round:Boolean,rowWidth:{type:r,default:s}},[U,C]=l("skeleton-paragraph");var E=i({name:U,props:L,setup(t){return()=>a("div",{class:C([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[V,c]=l("skeleton"),j="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:V,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return a(I,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return a(z,{round:t.round,titleWidth:t.titleWidth},null)},k=n=>{const{rowWidth:e}=t;return e===s&&n===+t.row-1?j:Array.isArray(e)?e[n]:e},W=()=>Array(+t.row).fill("").map((n,e)=>a(O,{key:e,round:t.round,rowWidth:v(k(e))},null)),b=()=>o.template?o.template():a(A,null,[f(),a("div",{class:c("content")},[S(),W()])]);return()=>{var n;return t.loading?a("div",g({class:c({animate:t.animate,round:t.round})},h),[b()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-c49a4857.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-d05ece23.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/index-f1796f7f.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-f2a7e185.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-1c22195e.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-21dad50e.js


+ 5 - 0
dist/js/index-legacy-26b9e03a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/js/index-legacy-f141f0fd.js
+System.register(["./index-legacy-8ebc7623.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
+========
+System.register(["./index-legacy-f2c4d036.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
+>>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75:dist/js/index-legacy-26b9e03a.js

+ 5 - 0
dist/js/index-legacy-27ffd6e1.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/js/index-legacy-f2741568.js
+System.register(["./index-legacy-8ebc7623.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bM,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-f2c4d036.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bM,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+>>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75:dist/js/index-legacy-27ffd6e1.js

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-2c532aaf.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-2fc11698.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-32328ca0.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-35ed6f65.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-3ffee9d9.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/index-legacy-420f6168.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/index-legacy-6720a2a7.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-8ebc7623.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/index-legacy-b1b00396.js


+ 4 - 0
dist/js/index-legacy-f141f0fd.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/js/index-legacy-f141f0fd.js
 System.register(["./index-legacy-8ebc7623.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
+========
+System.register(["./index-legacy-f2c4d036.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
+>>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75:dist/js/index-legacy-26b9e03a.js

+ 4 - 0
dist/js/index-legacy-f2741568.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/js/index-legacy-f2741568.js
 System.register(["./index-legacy-8ebc7623.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bM,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-f2c4d036.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bM,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+>>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75:dist/js/index-legacy-27ffd6e1.js

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/index-legacy-f2c4d036.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/instrument-7ba56e72.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/instrument-c1ea0f0e.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/instrument-legacy-8014788a.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/instrument-legacy-fcba4340.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/modeView-189afa0a.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/modeView-e3fe59b0.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/modeView-legacy-12ddb7bf.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/orchestra-ce0d4316.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/orchestra-legacy-217b20f2.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/orchestra-legacy-9f255c01.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/polyfills-f4401cbd.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/js/polyfills-legacy-40603d5c.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/report-share-1aa96437.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/report-share-8d31054a.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/report-share-legacy-342aff9d.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/js/report-share-legacy-3f9d6771.js


+ 18 - 0
dist/orchestra.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/polyfills-bd9a26d6.js"></script>
+=======
+  <script type="module" crossorigin src="./js/polyfills-f4401cbd.js"></script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -41,12 +45,21 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/orchestra-a46e2409.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-5000bc03.js">
   <link rel="modulepreload" crossorigin href="./js/index-c99673dd.js">
   <link rel="modulepreload" crossorigin href="./js/index-4754262e.js">
   <link rel="modulepreload" crossorigin href="./js/index-f2a7e185.js">
   <link rel="modulepreload" crossorigin href="./js/index-b2861ff4.js">
+=======
+  <script type="module" crossorigin src="./js/orchestra-ce0d4316.js"></script>
+  <link rel="modulepreload" crossorigin href="./js/index-092675db.js">
+  <link rel="modulepreload" crossorigin href="./js/index-87131c6f.js">
+  <link rel="modulepreload" crossorigin href="./js/index-c49a4857.js">
+  <link rel="modulepreload" crossorigin href="./js/index-77fbfebd.js">
+  <link rel="modulepreload" crossorigin href="./js/index-ab6f38bd.js">
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
   <link rel="stylesheet" href="./css/index-e4df67fc.css">
   <link rel="stylesheet" href="./css/index-85f95688.css">
   <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
@@ -70,8 +83,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="./js/polyfills-legacy-567ededd.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-9f255c01.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-217b20f2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 </body>
 
 </html>

+ 16 - 0
dist/report-share.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/polyfills-bd9a26d6.js"></script>
+=======
+  <script type="module" crossorigin src="./js/polyfills-f4401cbd.js"></script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -25,10 +29,17 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./js/report-share-8d31054a.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-5000bc03.js">
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
   <link rel="modulepreload" crossorigin href="./js/index-b2861ff4.js">
+=======
+  <script type="module" crossorigin src="./js/report-share-1aa96437.js"></script>
+  <link rel="modulepreload" crossorigin href="./js/index-092675db.js">
+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
+  <link rel="modulepreload" crossorigin href="./js/index-ab6f38bd.js">
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
   <link rel="stylesheet" href="./css/index-e4df67fc.css">
   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
@@ -52,8 +63,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="./js/polyfills-legacy-567ededd.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-3f9d6771.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-342aff9d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
 </body>
 
 </html>

+ 2 - 1
src/helpers/metronome.ts

@@ -315,7 +315,8 @@ class Metronome {
 					let nextNoteStartTime = times[note.measures[note.measures.length - 1].i + 1]?.time
 					let noteEndTime = 0
 					if(!nextNoteStartTime){
-						noteEndTime = time + noteLengthTime
+						// 当不够的时候补上时值
+						noteEndTime = time + noteLengthTime > endtime ? time + noteLengthTime : endtime
 					}else{
 						if(Math.abs(nextNoteStartTime - endtime)*1000< 10){
 							// 当首位本来就是相连的

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
stats.html


+ 5 - 0
vite.config.ts

@@ -76,8 +76,13 @@ export default defineConfig({
         // target: "https://kt.colexiu.com",
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
+<<<<<<< HEAD
         target: "https://dev.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
         // target: "https://test.kt.colexiu.com",
+=======
+        // target: "https://test.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
+        target: "https://test.kt.colexiu.com",
+>>>>>>> 5a1837c0eabdc4a6898549c9b701a42a69241b75
         // target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),

Некоторые файлы не были показаны из-за большого количества измененных файлов