Accueil Explorer Aide
Connexion
liushengqiang
/
music-score
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

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

黄琪勇 il y a 2 mois
Parent
b2e2c93d76 b13af5cd54
commit
f7df57db2f
76 fichiers modifiés avec 194 ajouts et 8 suppressions
Vue séparée Afficher les stats Diff
  1. 19 0
      dist/colexiu.html
  2. 0 0
      dist/css/index-52f81eaa.css
  3. 18 1
      dist/index.html
  4. 15 0
      dist/instrument.html
  5. 1 0
      dist/js/colexiu-d6a8a6f7.js
  6. 1 0
      dist/js/colexiu-fb8eb125.js
  7. 1 0
      dist/js/colexiu-legacy-0df3c557.js
  8. 1 0
      dist/js/colexiu-legacy-bb92dba7.js
  9. 1 0
      dist/js/gym-6061f41c.js
  10. 1 0
      dist/js/gym-f35c74ea.js
  11. 1 0
      dist/js/gym-legacy-bf8ebac6.js
  12. 1 0
      dist/js/gym-legacy-c6399e81.js
  13. 1 0
      dist/js/index-0a4ba24c.js
  14. 4 0
      dist/js/index-15192259.js
  15. 1 0
      dist/js/index-239d31fb.js
  16. 1 0
      dist/js/index-34ec9ad8.js
  17. 1 0
      dist/js/index-417692d4.js
  18. 5 0
      dist/js/index-42c1b3bc.js
  19. 0 0
      dist/js/index-4c22c73f.js
  20. 1 0
      dist/js/index-651a0c1e.js
  21. 1 0
      dist/js/index-6bac2a14.js
  22. 1 0
      dist/js/index-a94b64cb.js
  23. 1 0
      dist/js/index-aa9f18d4.js
  24. 0 0
      dist/js/index-b002b7be.js
  25. 1 0
      dist/js/index-b9506946.js
  26. 4 0
      dist/js/index-c5be89e2.js
  27. 1 0
      dist/js/index-d7ee69b5.js
  28. 5 0
      dist/js/index-e1cde5ec.js
  29. 1 0
      dist/js/index-f75216cb.js
  30. 1 0
      dist/js/index-f98400e1.js
  31. 4 0
      dist/js/index-legacy-2591332c.js
  32. 5 0
      dist/js/index-legacy-35bc1c40.js
  33. 1 0
      dist/js/index-legacy-39efee0b.js
  34. 1 0
      dist/js/index-legacy-5b59ca64.js
  35. 1 0
      dist/js/index-legacy-6f12c9ee.js
  36. 1 0
      dist/js/index-legacy-89307716.js
  37. 1 0
      dist/js/index-legacy-8e539e3b.js
  38. 1 0
      dist/js/index-legacy-8ee29a47.js
  39. 4 0
      dist/js/index-legacy-9825cc3c.js
  40. 1 0
      dist/js/index-legacy-9ea34714.js
  41. 1 0
      dist/js/index-legacy-9f0e1045.js
  42. 5 0
      dist/js/index-legacy-9fba706c.js
  43. 1 0
      dist/js/index-legacy-a6b85384.js
  44. 1 0
      dist/js/index-legacy-a99ad28f.js
  45. 1 0
      dist/js/index-legacy-b6d10053.js
  46. 1 0
      dist/js/index-legacy-c69167f7.js
  47. 1 0
      dist/js/index-legacy-ed96035a.js
  48. 1 0
      dist/js/index-legacy-fcd179ff.js
  49. 1 0
      dist/js/instrument-1d49c61b.js
  50. 1 0
      dist/js/instrument-cc1283a5.js
  51. 1 0
      dist/js/instrument-legacy-ad135f43.js
  52. 1 0
      dist/js/instrument-legacy-f08dd5dc.js
  53. 1 0
      dist/js/modeView-6e5d8730.js
  54. 1 0
      dist/js/modeView-e0a5cbd2.js
  55. 1 0
      dist/js/modeView-legacy-5f006d7b.js
  56. 1 0
      dist/js/modeView-legacy-c379567c.js
  57. 1 0
      dist/js/orchestra-7f272374.js
  58. 1 0
      dist/js/orchestra-f7c64f07.js
  59. 1 0
      dist/js/orchestra-legacy-0e8f9126.js
  60. 1 0
      dist/js/orchestra-legacy-64e39c04.js
  61. 1 0
      dist/js/polyfills-08c036dd.js
  62. 1 0
      dist/js/polyfills-e26b5460.js
  63. 0 0
      dist/js/polyfills-legacy-2b34d33c.js
  64. 1 0
      dist/js/report-share-6e7d531e.js
  65. 1 0
      dist/js/report-share-e89ef703.js
  66. 1 0
      dist/js/report-share-legacy-ed63569c.js
  67. 1 0
      dist/js/report-share-legacy-fe8b2ebb.js
  68. 19 0
      dist/orchestra.html
  69. 17 0
      dist/report-share.html
  70. 1 1
      osmd-extended
  71. 2 1
      src/helpers/formateMusic.ts
  72. 5 0
      src/state.ts
  73. 2 2
      src/view/evaluating/evaluatResult.ts
  74. 0 0
      src/view/evaluating/scoreIcon.json
  75. 7 3
      src/view/selection/index.module.less
  76. 1 0
      stats.html

+ 19 - 0
dist/colexiu.html
Voir le fichier 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-08c036dd.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-e26b5460.js"></script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
 
@@ -40,6 +44,7 @@
 
       },
 
     })
 
   </script>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/colexiu-fb8eb125.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-4c22c73f.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-a94b64cb.js">
 
@@ -47,6 +52,15 @@
 
   <link rel="modulepreload" crossorigin href="./js/index-c5be89e2.js">
 
   <link rel="stylesheet" href="./css/index-64ae39d1.css">
 
   <link rel="stylesheet" href="./css/colexiu-e8b419b5.css">
 
+=======
 
+  <script type="module" crossorigin src="./js/colexiu-d6a8a6f7.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-b002b7be.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-651a0c1e.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-0a4ba24c.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-e1cde5ec.js">
 
+  <link rel="stylesheet" href="./css/index-52f81eaa.css">
 
+  <link rel="stylesheet" href="./css/colexiu-62f31c4f.css">
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 
 </head>
 
@@ -56,8 +70,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-207e93cc.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-bb92dba7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-0df3c557.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 </body>
 
 
 </html>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/index-52f81eaa.css


+ 18 - 1
dist/index.html
Voir le fichier 

@@ -2,7 +2,11 @@
 
 <html lang="ZH-cn">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-08c036dd.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-e26b5460.js"></script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="./favicon.ico" />
 
@@ -75,13 +79,21 @@
 
       }
 
     })
 
   </script>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/gym-6061f41c.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-4c22c73f.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-a94b64cb.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-34ec9ad8.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-c5be89e2.js">
 
+=======
 
+  <script type="module" crossorigin src="./js/gym-f35c74ea.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-b002b7be.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-651a0c1e.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-aa9f18d4.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-e1cde5ec.js">
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
-  <link rel="stylesheet" href="./css/index-64ae39d1.css">
 
+  <link rel="stylesheet" href="./css/index-52f81eaa.css">
 
   <link rel="stylesheet" href="./css/index-85f95688.css">
 
   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
 
   <link rel="stylesheet" href="./css/index-171cd132.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-207e93cc.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-c6399e81.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-bf8ebac6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 </body>
 
 
 </html>

+ 15 - 0
dist/instrument.html
Voir le fichier 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-08c036dd.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-e26b5460.js"></script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -41,9 +45,15 @@
 
       })
 
     }
 
   </script>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/instrument-cc1283a5.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-4c22c73f.js">
 
   <link rel="stylesheet" href="./css/index-64ae39d1.css">
 
+=======
 
+  <script type="module" crossorigin src="./js/instrument-1d49c61b.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-b002b7be.js">
 
+  <link rel="stylesheet" href="./css/index-52f81eaa.css">
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
   <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>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 
@@ -67,8 +77,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-207e93cc.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-ad135f43.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-f08dd5dc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 </body>
 
 
 </html>

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/colexiu-d6a8a6f7.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/colexiu-fb8eb125.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/colexiu-legacy-0df3c557.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/colexiu-legacy-bb92dba7.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/gym-6061f41c.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/gym-f35c74ea.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/gym-legacy-bf8ebac6.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/gym-legacy-c6399e81.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-0a4ba24c.js


+ 4 - 0
dist/js/index-15192259.js
Voir le fichier 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-15192259.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-4c22c73f.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-b002b7be.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};
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-42c1b3bc.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-239d31fb.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-34ec9ad8.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-417692d4.js


+ 5 - 0
dist/js/index-42c1b3bc.js
Voir le fichier 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-15192259.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-4c22c73f.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-b002b7be.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};
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-42c1b3bc.js

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/index-4c22c73f.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-651a0c1e.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-6bac2a14.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-a94b64cb.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-aa9f18d4.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/index-b002b7be.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-b9506946.js


+ 4 - 0
dist/js/index-c5be89e2.js
Voir le fichier 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-c5be89e2.js
 
 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-4c22c73f.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};
 
+========
 
+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-b002b7be.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};
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-e1cde5ec.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-d7ee69b5.js


+ 5 - 0
dist/js/index-e1cde5ec.js
Voir le fichier 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-c5be89e2.js
 
+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-4c22c73f.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};
 
+========
 
+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-b002b7be.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};
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-e1cde5ec.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-f75216cb.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-f98400e1.js


+ 4 - 0
dist/js/index-legacy-2591332c.js
Voir le fichier 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-2591332c.js
 
 System.register(["./index-legacy-89307716.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-c69167f7.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))}}}));
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-legacy-9fba706c.js

+ 5 - 0
dist/js/index-legacy-35bc1c40.js
Voir le fichier 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-9825cc3c.js
 
+System.register(["./index-legacy-89307716.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-c69167f7.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)])])}}))}}}));
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-legacy-35bc1c40.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-39efee0b.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-5b59ca64.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-6f12c9ee.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-89307716.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-8e539e3b.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-8ee29a47.js


+ 4 - 0
dist/js/index-legacy-9825cc3c.js
Voir le fichier 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-9825cc3c.js
 
 System.register(["./index-legacy-89307716.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-c69167f7.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)])])}}))}}}));
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-legacy-35bc1c40.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-9ea34714.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-9f0e1045.js


+ 5 - 0
dist/js/index-legacy-9fba706c.js
Voir le fichier 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-2591332c.js
 
+System.register(["./index-legacy-89307716.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-c69167f7.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))}}}));
 
+>>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8:dist/js/index-legacy-9fba706c.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-a6b85384.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-a99ad28f.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-b6d10053.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-c69167f7.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-ed96035a.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/index-legacy-fcd179ff.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/instrument-1d49c61b.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/instrument-cc1283a5.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/instrument-legacy-ad135f43.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/instrument-legacy-f08dd5dc.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/modeView-6e5d8730.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/modeView-e0a5cbd2.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/modeView-legacy-5f006d7b.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/modeView-legacy-c379567c.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/orchestra-7f272374.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/orchestra-f7c64f07.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/orchestra-legacy-0e8f9126.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/orchestra-legacy-64e39c04.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/polyfills-08c036dd.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/polyfills-e26b5460.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/polyfills-legacy-2b34d33c.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/report-share-6e7d531e.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/report-share-e89ef703.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/report-share-legacy-ed63569c.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/js/report-share-legacy-fe8b2ebb.js


+ 19 - 0
dist/orchestra.html
Voir le fichier 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-08c036dd.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-e26b5460.js"></script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -41,6 +45,7 @@
 
       transition: opacity .3s;
 
     }
 
   </style>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/orchestra-7f272374.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-4c22c73f.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-a94b64cb.js">
 
@@ -48,6 +53,15 @@
 
   <link rel="modulepreload" crossorigin href="./js/index-34ec9ad8.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-c5be89e2.js">
 
   <link rel="stylesheet" href="./css/index-64ae39d1.css">
 
+=======
 
+  <script type="module" crossorigin src="./js/orchestra-f7c64f07.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-b002b7be.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-651a0c1e.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-0a4ba24c.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-aa9f18d4.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-e1cde5ec.js">
 
+  <link rel="stylesheet" href="./css/index-52f81eaa.css">
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
   <link rel="stylesheet" href="./css/index-85f95688.css">
 
   <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
@@ -70,8 +84,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-207e93cc.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-0e8f9126.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-64e39c04.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 </body>
 
 
 </html>

+ 17 - 0
dist/report-share.html
Voir le fichier 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-08c036dd.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-e26b5460.js"></script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -25,11 +29,19 @@
 
       transition: opacity .3s;
 
     }
 
   </style>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/report-share-6e7d531e.js"></script>
 
   <link rel="modulepreload" crossorigin href="./js/index-4c22c73f.js">
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
   <link rel="modulepreload" crossorigin href="./js/index-c5be89e2.js">
 
   <link rel="stylesheet" href="./css/index-64ae39d1.css">
 
+=======
 
+  <script type="module" crossorigin src="./js/report-share-e89ef703.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-b002b7be.js">
 
+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-e1cde5ec.js">
 
+  <link rel="stylesheet" href="./css/index-52f81eaa.css">
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
 
   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
@@ -52,8 +64,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-207e93cc.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-ed63569c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-fe8b2ebb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> b13af5cd54ae181521af6b857ae9c9551f55b9f8
 
 </body>
 
 
 </html>

+ 1 - 1
osmd-extended
Voir le fichier 

@@ -1 +1 @@
 
-Subproject commit fb702c6947470a08ebf5221bc62a6a7921ee65af
 
+Subproject commit d38f84a71bd007582ff14d17c5cb247c3978dc9a

+ 2 - 1
src/helpers/formateMusic.ts
Voir le fichier 

@@ -991,12 +991,13 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 
 			note.maxNoteNum = maxNoteNum;
 
 			note.trackIndex = minIndex;
 
 			_notes.push({
 
+				measureNum: note?.sourceMeasure?.MeasureNumberXML,
 
 				note,
 
 				iterator: { ...iterator },
 
 				currentTime,
 
 				isDouble,
 
 				isMutileSubject,
 
-				measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM
 
+				measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM,
 
 			});
 
 		}
 
 		iterator.moveToNextVisibleVoiceEntry(false);

+ 5 - 0
src/state.ts
Voir le fichier 

@@ -1642,6 +1642,11 @@ const setState = (data: any, index: number) => {
 
   // state.enableEvaluation = data.isEvaluated ? true : false;
 
   state.examSongId = data.bizId + "";
 
   state.cbsExamSongId = data.id + "";
 
+  // 曲子：1795013331841662977，1.3.5.7跳房子带repeat，2.4.6.8跳房子带DC，该曲子需要特殊处理，需要传入自定义的跳转规则
 
+  if (state.examSongId == '1795013331841662977') {
 
+    ; (window as any).DYCustomHopscotch = [1,2,1,2,1,2,1,2]
 
+  }
 
+  ; (window as any).DYExamSongId = state.examSongId
 
   state.examSongName = data.name;
 
   state.coverImg = data.musicCover ?? "";
 
   // 如果是simple页面，只显示单轨

+ 2 - 2
src/view/evaluating/evaluatResult.ts
Voir le fichier 

@@ -33,7 +33,7 @@ export const leveByScoreMeasureIcons = [
 
 	{
 
 		icon: scoreIcon.good,
 
 		text: "good",
 
-		color: "#FF958B",
 
+		color: "#14C187",
 
 	},
 
 	{
 
 		icon: scoreIcon.great,
 
@@ -43,7 +43,7 @@ export const leveByScoreMeasureIcons = [
 
 	{
 
 		icon: scoreIcon.perfect,
 
 		text: "perfect",
 
-		color: "#516AFF",
 
+		color: "#90A0FF",
 
 	},
 
 ];

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/view/evaluating/scoreIcon.json


+ 7 - 3
src/view/selection/index.module.less
Voir le fichier 

@@ -83,10 +83,10 @@
 
 
 .scoreItem {
 
     position: absolute;
 
-    left: 80%;
 
+    left: 60%;
 
     top: -120%;
 
     transform: translateX(-50%);
 
-    font-size: 16px;
 
+    font-size: 18px;
 
     font-family: "Roboto", sans-serif;
 
     font-weight: bold;
 
     display: flex;
 
@@ -95,7 +95,11 @@
 
     transition: all .8s;
 
 
     img {
 
-        height: 30px;
 
+        height: 43px;
 
+    }
 
+
 
+    span {
 
+        margin-top: 5px;
 
     }
 
 }

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
stats.html


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff