Página Principal Explorar Ajuda
Iniciar Sessão
liushengqiang
/
music-score
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

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

黄琪勇 há 2 semanas atrás
pai
92564ed2b6 9e479031fe
commit
3214237407
68 ficheiros alterados com 171 adições e 1 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 17 0
      dist/colexiu.html
  2. 17 0
      dist/index.html
  3. 14 0
      dist/instrument.html
  4. 1 0
      dist/js/colexiu-30822c67.js
  5. 1 0
      dist/js/colexiu-78ed176a.js
  6. 1 0
      dist/js/colexiu-legacy-50512495.js
  7. 1 0
      dist/js/colexiu-legacy-55b82d3d.js
  8. 1 0
      dist/js/gym-1b861a87.js
  9. 1 0
      dist/js/gym-445da2c0.js
  10. 1 0
      dist/js/gym-legacy-8707cd1d.js
  11. 1 0
      dist/js/gym-legacy-fbc380c6.js
  12. 1 0
      dist/js/index-1a910c45.js
  13. 1 0
      dist/js/index-26ba4804.js
  14. 1 0
      dist/js/index-2700cd18.js
  15. 1 0
      dist/js/index-3df25c22.js
  16. 1 0
      dist/js/index-469a5c8f.js
  17. 1 0
      dist/js/index-5499f5a7.js
  18. 1 0
      dist/js/index-5ef3da57.js
  19. 1 0
      dist/js/index-66023a9e.js
  20. 1 0
      dist/js/index-69b9dd32.js
  21. 1 0
      dist/js/index-6c570372.js
  22. 5 0
      dist/js/index-a3afb983.js
  23. 5 0
      dist/js/index-aeb37bff.js
  24. 1 0
      dist/js/index-b09f6eaf.js
  25. 4 0
      dist/js/index-d6b922b4.js
  26. 0 0
      dist/js/index-d7bbabe2.js
  27. 4 0
      dist/js/index-e20cafe8.js
  28. 1 0
      dist/js/index-f0819fb2.js
  29. 1 0
      dist/js/index-f72a3ee0.js
  30. 1 0
      dist/js/index-legacy-1240e95f.js
  31. 1 0
      dist/js/index-legacy-12ddbd6e.js
  32. 4 0
      dist/js/index-legacy-1a68965a.js
  33. 1 0
      dist/js/index-legacy-30993a69.js
  34. 1 0
      dist/js/index-legacy-5617469d.js
  35. 1 0
      dist/js/index-legacy-6acf7700.js
  36. 1 0
      dist/js/index-legacy-7eb5d38a.js
  37. 5 0
      dist/js/index-legacy-8fc67a3a.js
  38. 0 0
      dist/js/index-legacy-936af2c8.js
  39. 1 0
      dist/js/index-legacy-99a8de7e.js
  40. 4 0
      dist/js/index-legacy-99b21de6.js
  41. 1 0
      dist/js/index-legacy-a2ac7b8c.js
  42. 1 0
      dist/js/index-legacy-a372d123.js
  43. 5 0
      dist/js/index-legacy-ae95f99a.js
  44. 1 0
      dist/js/index-legacy-c282d117.js
  45. 1 0
      dist/js/index-legacy-c594c2fa.js
  46. 1 0
      dist/js/index-legacy-cfb51ad0.js
  47. 1 0
      dist/js/index-legacy-e083175e.js
  48. 1 0
      dist/js/instrument-1e44ba3c.js
  49. 1 0
      dist/js/instrument-46b31bd8.js
  50. 1 0
      dist/js/instrument-legacy-3922ab40.js
  51. 1 0
      dist/js/instrument-legacy-8aa92e26.js
  52. 1 0
      dist/js/modeView-73a6b92a.js
  53. 1 0
      dist/js/modeView-93fe9ccf.js
  54. 1 0
      dist/js/modeView-legacy-3bb43569.js
  55. 1 0
      dist/js/modeView-legacy-620801b2.js
  56. 1 0
      dist/js/orchestra-56fc56e5.js
  57. 1 0
      dist/js/orchestra-db63db38.js
  58. 1 0
      dist/js/orchestra-legacy-3fc7e01d.js
  59. 1 0
      dist/js/orchestra-legacy-c29ec171.js
  60. 0 0
      dist/js/polyfills-dbce9f5f.js
  61. 1 0
      dist/js/report-share-6cda41b3.js
  62. 1 0
      dist/js/report-share-aa658ec5.js
  63. 1 0
      dist/js/report-share-legacy-314387f4.js
  64. 1 0
      dist/js/report-share-legacy-d21a08cc.js
  65. 18 0
      dist/orchestra.html
  66. 16 0
      dist/report-share.html
  67. 2 1
      src/view/music-score/index.tsx
  68. 1 0
      stats.html

+ 17 - 0
dist/colexiu.html
Ver Ficheiro 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-5eb1eea6.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-dbce9f5f.js"></script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 
   <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-78ed176a.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-b09f6eaf.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-3df25c22.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-69b9dd32.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-d6b922b4.js">
 
+=======
 
+  <script type="module" crossorigin src="./js/colexiu-30822c67.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-d7bbabe2.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-5499f5a7.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-2700cd18.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-aeb37bff.js">
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
   <link rel="stylesheet" href="./css/index-1ec513a0.css">
 
   <link rel="stylesheet" href="./css/colexiu-62f31c4f.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-c5b3c94c.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-55b82d3d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-50512495.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 </body>
 
 
 </html>

+ 17 - 0
dist/index.html
Ver Ficheiro 

@@ -2,7 +2,11 @@
 
 <html lang="ZH-cn">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-5eb1eea6.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-dbce9f5f.js"></script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="./favicon.ico" />
 
@@ -75,11 +79,19 @@
 
       }
 
     })
 
   </script>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/gym-445da2c0.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-b09f6eaf.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-3df25c22.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-469a5c8f.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-d6b922b4.js">
 
+=======
 
+  <script type="module" crossorigin src="./js/gym-1b861a87.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-d7bbabe2.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-5499f5a7.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-f0819fb2.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-aeb37bff.js">
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
   <link rel="stylesheet" href="./css/index-1ec513a0.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-c5b3c94c.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-fbc380c6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-8707cd1d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 </body>
 
 
 </html>

+ 14 - 0
dist/instrument.html
Ver Ficheiro 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-5eb1eea6.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-dbce9f5f.js"></script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -41,8 +45,13 @@
 
       })
 
     }
 
   </script>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/instrument-46b31bd8.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-b09f6eaf.js">
 
+=======
 
+  <script type="module" crossorigin src="./js/instrument-1e44ba3c.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-d7bbabe2.js">
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
   <link rel="stylesheet" href="./css/index-1ec513a0.css">
 
   <link rel="stylesheet" href="./css/instrument-7b1512ed.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-c5b3c94c.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-8aa92e26.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-3922ab40.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 </body>
 
 
 </html>

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/colexiu-30822c67.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/colexiu-78ed176a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/colexiu-legacy-50512495.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/colexiu-legacy-55b82d3d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/gym-1b861a87.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/gym-445da2c0.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/gym-legacy-8707cd1d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/gym-legacy-fbc380c6.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-1a910c45.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-26ba4804.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-2700cd18.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-3df25c22.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-469a5c8f.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-5499f5a7.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-5ef3da57.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-66023a9e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-69b9dd32.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-6c570372.js


+ 5 - 0
dist/js/index-a3afb983.js
Ver Ficheiro 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-e20cafe8.js
 
+import{d as i,F as l,W as d,bY as e,M as r,V as c,j as s,aT as u}from"./index-b09f6eaf.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,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:""}]});r(()=>{window.appName="colexiu",c.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,F as l,W as d,bY as e,M as r,V as c,j as s,aT as u}from"./index-d7bbabe2.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,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:""}]});r(()=>{window.appName="colexiu",c.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};
 
+>>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529:dist/js/index-a3afb983.js

+ 5 - 0
dist/js/index-aeb37bff.js
Ver Ficheiro 

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

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-b09f6eaf.js


+ 4 - 0
dist/js/index-d6b922b4.js
Ver Ficheiro 

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

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/index-d7bbabe2.js


+ 4 - 0
dist/js/index-e20cafe8.js
Ver Ficheiro 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-e20cafe8.js
 
 import{d as i,F as l,W as d,bY as e,M as r,V as c,j as s,aT as u}from"./index-b09f6eaf.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,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:""}]});r(()=>{window.appName="colexiu",c.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,F as l,W as d,bY as e,M as r,V as c,j as s,aT as u}from"./index-d7bbabe2.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,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:""}]});r(()=>{window.appName="colexiu",c.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};
 
+>>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529:dist/js/index-a3afb983.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-f0819fb2.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-f72a3ee0.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-1240e95f.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-12ddbd6e.js


+ 4 - 0
dist/js/index-legacy-1a68965a.js
Ver Ficheiro 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-1a68965a.js
 
 System.register(["./index-legacy-c594c2fa.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.c,e=t.d,n=t.j,l=t.bx,o=t.n,i=t.D,s=t.bM,u=t.s,d=t.q,p=t.t,v=t.A,h=t.P}],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[w,W]=r("skeleton-avatar"),f={avatarSize:o,avatarShape:u("round")};var g=e({name:w,props:f,setup:t=>()=>n("div",{class:W([t.avatarShape]),style:s(t.avatarSize)},null)}),A=i(g);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[B,b]=r("skeleton-paragraph");var x=e({name:B,props:z,setup:t=>()=>n("div",{class:b([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[q,D]=r("skeleton"),M={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 N=e({name:q,inheritAttrs:!1,props:M,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(A,{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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("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(N))}}}));
 
+========
 
+System.register(["./index-legacy-936af2c8.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.c,e=t.d,n=t.j,l=t.bx,o=t.n,i=t.D,s=t.bM,u=t.s,d=t.q,p=t.t,v=t.A,h=t.P}],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[w,W]=r("skeleton-avatar"),f={avatarSize:o,avatarShape:u("round")};var g=e({name:w,props:f,setup:t=>()=>n("div",{class:W([t.avatarShape]),style:s(t.avatarSize)},null)}),A=i(g);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[B,b]=r("skeleton-paragraph");var x=e({name:B,props:z,setup:t=>()=>n("div",{class:b([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[q,D]=r("skeleton"),M={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 N=e({name:q,inheritAttrs:!1,props:M,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(A,{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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("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(N))}}}));
 
+>>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529:dist/js/index-legacy-ae95f99a.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-30993a69.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-5617469d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-6acf7700.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-7eb5d38a.js


+ 5 - 0
dist/js/index-legacy-8fc67a3a.js
Ver Ficheiro 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-99b21de6.js
 
+System.register(["./index-legacy-c594c2fa.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.F,a=e.W,o=e.bY,r=e.M,s=e.V,d=e.j,l=e.aT}],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-936af2c8.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.F,a=e.W,o=e.bY,r=e.M,s=e.V,d=e.j,l=e.aT}],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)])])}}))}}}));
 
+>>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529:dist/js/index-legacy-8fc67a3a.js

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/index-legacy-936af2c8.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-99a8de7e.js


+ 4 - 0
dist/js/index-legacy-99b21de6.js
Ver Ficheiro 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-99b21de6.js
 
 System.register(["./index-legacy-c594c2fa.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.F,a=e.W,o=e.bY,r=e.M,s=e.V,d=e.j,l=e.aT}],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-936af2c8.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.F,a=e.W,o=e.bY,r=e.M,s=e.V,d=e.j,l=e.aT}],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)])])}}))}}}));
 
+>>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529:dist/js/index-legacy-8fc67a3a.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-a2ac7b8c.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-a372d123.js


+ 5 - 0
dist/js/index-legacy-ae95f99a.js
Ver Ficheiro 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-1a68965a.js
 
+System.register(["./index-legacy-c594c2fa.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.c,e=t.d,n=t.j,l=t.bx,o=t.n,i=t.D,s=t.bM,u=t.s,d=t.q,p=t.t,v=t.A,h=t.P}],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[w,W]=r("skeleton-avatar"),f={avatarSize:o,avatarShape:u("round")};var g=e({name:w,props:f,setup:t=>()=>n("div",{class:W([t.avatarShape]),style:s(t.avatarSize)},null)}),A=i(g);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[B,b]=r("skeleton-paragraph");var x=e({name:B,props:z,setup:t=>()=>n("div",{class:b([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[q,D]=r("skeleton"),M={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 N=e({name:q,inheritAttrs:!1,props:M,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(A,{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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("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(N))}}}));
 
+========
 
+System.register(["./index-legacy-936af2c8.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.c,e=t.d,n=t.j,l=t.bx,o=t.n,i=t.D,s=t.bM,u=t.s,d=t.q,p=t.t,v=t.A,h=t.P}],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[w,W]=r("skeleton-avatar"),f={avatarSize:o,avatarShape:u("round")};var g=e({name:w,props:f,setup:t=>()=>n("div",{class:W([t.avatarShape]),style:s(t.avatarSize)},null)}),A=i(g);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[B,b]=r("skeleton-paragraph");var x=e({name:B,props:z,setup:t=>()=>n("div",{class:b([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[q,D]=r("skeleton"),M={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 N=e({name:q,inheritAttrs:!1,props:M,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(A,{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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("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(N))}}}));
 
+>>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529:dist/js/index-legacy-ae95f99a.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-c282d117.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-c594c2fa.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-cfb51ad0.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/index-legacy-e083175e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/instrument-1e44ba3c.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/instrument-46b31bd8.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/instrument-legacy-3922ab40.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/instrument-legacy-8aa92e26.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/modeView-73a6b92a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/modeView-93fe9ccf.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/modeView-legacy-3bb43569.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/modeView-legacy-620801b2.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/orchestra-56fc56e5.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/orchestra-db63db38.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/orchestra-legacy-3fc7e01d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/orchestra-legacy-c29ec171.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/js/polyfills-dbce9f5f.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/report-share-6cda41b3.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/report-share-aa658ec5.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/report-share-legacy-314387f4.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/js/report-share-legacy-d21a08cc.js


+ 18 - 0
dist/orchestra.html
Ver Ficheiro 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-5eb1eea6.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-dbce9f5f.js"></script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 
   <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-db63db38.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-b09f6eaf.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-3df25c22.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-69b9dd32.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-469a5c8f.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-d6b922b4.js">
 
+=======
 
+  <script type="module" crossorigin src="./js/orchestra-56fc56e5.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-d7bbabe2.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-5499f5a7.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-2700cd18.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-f0819fb2.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-aeb37bff.js">
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
   <link rel="stylesheet" href="./css/index-1ec513a0.css">
 
   <link rel="stylesheet" href="./css/index-85f95688.css">
 
   <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.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-c5b3c94c.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-c29ec171.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-3fc7e01d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 </body>
 
 
 </html>

+ 16 - 0
dist/report-share.html
Ver Ficheiro 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-5eb1eea6.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-dbce9f5f.js"></script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 
   <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-aa658ec5.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-b09f6eaf.js">
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-d6b922b4.js">
 
+=======
 
+  <script type="module" crossorigin src="./js/report-share-6cda41b3.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-d7bbabe2.js">
 
+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-aeb37bff.js">
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
   <link rel="stylesheet" href="./css/index-1ec513a0.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-c5b3c94c.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-314387f4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-d21a08cc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> 9e479031fe1518077ffabf8779151b56ec5d3529
 
 </body>
 
 
 </html>

+ 2 - 1
src/view/music-score/index.tsx
Ver Ficheiro 

@@ -277,7 +277,8 @@ export default defineComponent({
 
 			>
 
 				{slots.default?.()}
 
 				{props.showSelection && musicData.showSelection && !state.isEvaluatReport &&!state.isSimplePage && state.musicRendered && <Selection />}
 
-				{props.showSelection && musicData.showSelection && state.isCombineRender &&!state.isSimplePage && !state.isPreView && state.musicRendered && <CombineAudio></CombineAudio> }
 
+				{/* 目前只有演奏模式下有 */}
 
+				{props.showSelection && musicData.showSelection && state.isCombineRender &&!state.isSimplePage && !state.isPreView && state.musicRendered && state.playType === "play" && <CombineAudio></CombineAudio> }
 
 			</div>
 
 		);
 
 	},

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
stats.html


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff