ホーム エクスプローラ ヘルプ
サインイン
liushengqiang
/
music-score
1
0
フォーク 0
ファイル 課題 0 プルリクエスト 0 Wiki
ソースを参照

build

TIANYONG 3 週間 前
親
d73f22e412
コミット
5d45f4b118
95 ファイル変更、40 行追加、210 行削除
分割表示 差分情報を表示
  1. 8 25
      dist/colexiu.html
  2. 8 25
      dist/index.html
  3. 5 19
      dist/instrument.html
  4. 0 1
      dist/js/colexiu-7d875053.js
  5. 0 1
      dist/js/colexiu-9d55b6fb.js
  6. 0 1
      dist/js/colexiu-legacy-22ed920b.js
  7. 0 1
      dist/js/colexiu-legacy-29f8962c.js
  8. 0 1
      dist/js/gym-5ad66b23.js
  9. 0 0
      dist/js/gym-63bcc40e.js
  10. 0 1
      dist/js/gym-e57d2e74.js
  11. 0 1
      dist/js/gym-legacy-a9050635.js
  12. 0 1
      dist/js/gym-legacy-bd35c562.js
  13. 0 0
      dist/js/gym-legacy-e1265e74.js
  14. 0 0
      dist/js/index-069351bf.js
  15. 0 1
      dist/js/index-074ee934.js
  16. 0 1
      dist/js/index-0f65e958.js
  17. 0 1
      dist/js/index-139c70d3.js
  18. 0 1
      dist/js/index-204e8585.js
  19. 0 5
      dist/js/index-29a489a4.js
  20. 0 0
      dist/js/index-363dd17f.js
  21. 0 0
      dist/js/index-38628a6e.js
  22. 0 5
      dist/js/index-40e89029.js
  23. 0 0
      dist/js/index-430addba.js
  24. 0 5
      dist/js/index-49b6901e.js
  25. 0 5
      dist/js/index-4ef6f5b9.js
  26. 0 1
      dist/js/index-603bbe7d.js
  27. 0 1
      dist/js/index-619c9e56.js
  28. 1 0
      dist/js/index-64e928ba.js
  29. 0 1
      dist/js/index-7dad5569.js
  30. 0 1
      dist/js/index-890ff5f7.js
  31. 0 1
      dist/js/index-89f36e8b.js
  32. 0 0
      dist/js/index-8cd1bd4f.js
  33. 0 1
      dist/js/index-b5659e41.js
  34. 0 1
      dist/js/index-de4e4bb8.js
  35. 0 0
      dist/js/index-dfbb77e0.js
  36. 1 0
      dist/js/index-ee65d8b0.js
  37. 0 1
      dist/js/index-ee7bc841.js
  38. 0 1
      dist/js/index-f1d8ca4c.js
  39. 0 1
      dist/js/index-f7a5b5dd.js
  40. 0 0
      dist/js/index-legacy-0c28445c.js
  41. 0 5
      dist/js/index-legacy-21fcfe5f.js
  42. 0 1
      dist/js/index-legacy-234918c8.js
  43. 0 1
      dist/js/index-legacy-2b2de957.js
  44. 0 0
      dist/js/index-legacy-2c1595e8.js
  45. 0 5
      dist/js/index-legacy-40921853.js
  46. 0 1
      dist/js/index-legacy-46433986.js
  47. 0 0
      dist/js/index-legacy-47dc2e8d.js
  48. 0 1
      dist/js/index-legacy-4ac51454.js
  49. 0 1
      dist/js/index-legacy-606494f3.js
  50. 0 1
      dist/js/index-legacy-6756c292.js
  51. 0 5
      dist/js/index-legacy-68f9fc7c.js
  52. 0 1
      dist/js/index-legacy-7787e22d.js
  53. 0 1
      dist/js/index-legacy-7f50f9f0.js
  54. 0 1
      dist/js/index-legacy-89bfe514.js
  55. 0 1
      dist/js/index-legacy-93c90b23.js
  56. 1 0
      dist/js/index-legacy-b73df397.js
  57. 0 1
      dist/js/index-legacy-c4f2a05f.js
  58. 0 0
      dist/js/index-legacy-d54d87a2.js
  59. 0 1
      dist/js/index-legacy-d97fd70a.js
  60. 0 1
      dist/js/index-legacy-e9a0a46a.js
  61. 0 0
      dist/js/index-legacy-ebcfeb6b.js
  62. 0 0
      dist/js/index-legacy-ecded27b.js
  63. 1 0
      dist/js/index-legacy-f0c71ba9.js
  64. 0 5
      dist/js/index-legacy-f0f7b7cc.js
  65. 0 0
      dist/js/instrument-27333d3f.js
  66. 0 1
      dist/js/instrument-68317320.js
  67. 0 1
      dist/js/instrument-b316f97b.js
  68. 0 1
      dist/js/instrument-legacy-b016555e.js
  69. 0 1
      dist/js/instrument-legacy-ea8dd046.js
  70. 0 0
      dist/js/instrument-legacy-fc35e997.js
  71. 0 1
      dist/js/modeView-7e57fec5.js
  72. 0 1
      dist/js/modeView-84ce18f2.js
  73. 0 0
      dist/js/modeView-91b3f7c4.js
  74. 0 0
      dist/js/modeView-legacy-026b4987.js
  75. 0 1
      dist/js/modeView-legacy-8c38640e.js
  76. 0 1
      dist/js/modeView-legacy-9a73f1b8.js
  77. 0 1
      dist/js/orchestra-4da094e9.js
  78. 0 0
      dist/js/orchestra-6215356b.js
  79. 0 1
      dist/js/orchestra-a130c006.js
  80. 0 1
      dist/js/orchestra-legacy-2c2d2394.js
  81. 0 1
      dist/js/orchestra-legacy-5c5fd267.js
  82. 0 0
      dist/js/orchestra-legacy-9b7f8104.js
  83. 0 0
      dist/js/polyfills-336fef56.js
  84. 0 0
      dist/js/polyfills-6b4fae76.js
  85. 0 0
      dist/js/polyfills-legacy-ac2ca436.js
  86. 0 0
      dist/js/polyfills-legacy-ae95c351.js
  87. 0 1
      dist/js/report-share-45d51a75.js
  88. 0 1
      dist/js/report-share-cd5a973e.js
  89. 0 0
      dist/js/report-share-dca8db75.js
  90. 0 1
      dist/js/report-share-legacy-223752da.js
  91. 0 1
      dist/js/report-share-legacy-3c3b08e1.js
  92. 0 0
      dist/js/report-share-legacy-ab2f7ab5.js
  93. 9 27
      dist/orchestra.html
  94. 6 22
      dist/report-share.html
  95. 0 1
      stats.html

+ 8 - 25
dist/colexiu.html
ファイルの表示 

@@ -2,11 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
 
-=======
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
 
@@ -44,19 +40,11 @@
 
       },
 
     })
 
   </script>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/colexiu-9d55b6fb.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-0f65e958.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-ee7bc841.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
 
-=======
 
-  <script type="module" crossorigin src="./js/colexiu-6797f344.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-204e8585.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-890ff5f7.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/colexiu-7d875053.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-069351bf.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-363dd17f.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-38628a6e.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-ee65d8b0.js">
 
   <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>
 
@@ -68,13 +56,8 @@
 
   <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-ae95c351.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-22ed920b.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-021b26ee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
->>>>>>> feature-patch
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-ac2ca436.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-29f8962c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 8 - 25
dist/index.html
ファイルの表示 

@@ -2,11 +2,7 @@
 
 <html lang="ZH-cn">
 
 
 <head>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
 
-=======
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
 
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="./favicon.ico" />
 
@@ -79,19 +75,11 @@
 
       }
 
     })
 
   </script>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/gym-5ad66b23.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-0f65e958.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-f1d8ca4c.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
 
-=======
 
-  <script type="module" crossorigin src="./js/gym-e57d2e74.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-204e8585.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-7dad5569.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/gym-63bcc40e.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-069351bf.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-363dd17f.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-8cd1bd4f.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-ee65d8b0.js">
 
   <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">
 
@@ -110,13 +98,8 @@
 
   <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-ae95c351.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-a9050635.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-bd35c562.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
->>>>>>> feature-patch
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-ac2ca436.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-e1265e74.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 5 - 19
dist/instrument.html
ファイルの表示 

@@ -2,11 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
 
-=======
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -45,13 +41,8 @@
 
       })
 
     }
 
   </script>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/instrument-68317320.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
 
-=======
 
-  <script type="module" crossorigin src="./js/instrument-b316f97b.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/instrument-27333d3f.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-069351bf.js">
 
   <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>
 
@@ -76,13 +67,8 @@
 
     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-ae95c351.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-ea8dd046.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-b016555e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
->>>>>>> feature-patch
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-ac2ca436.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-fc35e997.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/colexiu-7d875053.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/colexiu-9d55b6fb.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/colexiu-legacy-22ed920b.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/colexiu-legacy-29f8962c.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/gym-5ad66b23.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/gym-63bcc40e.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/gym-e57d2e74.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/gym-legacy-a9050635.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/gym-legacy-bd35c562.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/gym-legacy-e1265e74.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-069351bf.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-074ee934.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-0f65e958.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-139c70d3.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-204e8585.js


+ 0 - 5
dist/js/index-29a489a4.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-40e89029.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-f7a5b5dd.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-139c70d3.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};
 
->>>>>>>> feature-patch:dist/js/index-29a489a4.js

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-363dd17f.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-38628a6e.js


+ 0 - 5
dist/js/index-40e89029.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-40e89029.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-f7a5b5dd.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-139c70d3.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};
 
->>>>>>>> feature-patch:dist/js/index-29a489a4.js

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-430addba.js


+ 0 - 5
dist/js/index-49b6901e.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-49b6901e.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-f7a5b5dd.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-139c70d3.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};
 
->>>>>>>> feature-patch:dist/js/index-4ef6f5b9.js

+ 0 - 5
dist/js/index-4ef6f5b9.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-49b6901e.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-f7a5b5dd.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-139c70d3.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};
 
->>>>>>>> feature-patch:dist/js/index-4ef6f5b9.js

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-603bbe7d.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-619c9e56.js


+ 1 - 0
dist/js/index-64e928ba.js
ファイルの表示 

@@ -0,0 +1 @@
 
+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-069351bf.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};

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-7dad5569.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-890ff5f7.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-89f36e8b.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-8cd1bd4f.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-b5659e41.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-de4e4bb8.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-dfbb77e0.js


+ 1 - 0
dist/js/index-ee65d8b0.js
ファイルの表示 

@@ -0,0 +1 @@
 
+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-069351bf.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};

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-ee7bc841.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-f1d8ca4c.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-f7a5b5dd.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-legacy-0c28445c.js


+ 0 - 5
dist/js/index-legacy-21fcfe5f.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-legacy-f0f7b7cc.js
 
-System.register(["./index-legacy-ebcfeb6b.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-e352db17.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)])])}}))}}}));
 
->>>>>>>> feature-patch:dist/js/index-legacy-21fcfe5f.js

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-234918c8.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-2b2de957.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-legacy-2c1595e8.js


+ 0 - 5
dist/js/index-legacy-40921853.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-legacy-40921853.js
 
-System.register(["./index-legacy-ebcfeb6b.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-e352db17.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))}}}));
 
->>>>>>>> feature-patch:dist/js/index-legacy-68f9fc7c.js

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-46433986.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-legacy-47dc2e8d.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-4ac51454.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-606494f3.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-6756c292.js


+ 0 - 5
dist/js/index-legacy-68f9fc7c.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-legacy-40921853.js
 
-System.register(["./index-legacy-ebcfeb6b.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-e352db17.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))}}}));
 
->>>>>>>> feature-patch:dist/js/index-legacy-68f9fc7c.js

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-7787e22d.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-7f50f9f0.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-89bfe514.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-93c90b23.js


+ 1 - 0
dist/js/index-legacy-b73df397.js
ファイルの表示 

@@ -0,0 +1 @@
 
+System.register(["./index-legacy-2b2de957.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)])])}}))}}}));

ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-c4f2a05f.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-legacy-d54d87a2.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-d97fd70a.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/index-legacy-e9a0a46a.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-legacy-ebcfeb6b.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/index-legacy-ecded27b.js


+ 1 - 0
dist/js/index-legacy-f0c71ba9.js
ファイルの表示 

@@ -0,0 +1 @@
 
+System.register(["./index-legacy-2b2de957.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))}}}));

+ 0 - 5
dist/js/index-legacy-f0f7b7cc.js
ファイルの表示 

@@ -1,5 +0,0 @@
 
-<<<<<<<< HEAD:dist/js/index-legacy-f0f7b7cc.js
 
-System.register(["./index-legacy-ebcfeb6b.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-e352db17.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)])])}}))}}}));
 
->>>>>>>> feature-patch:dist/js/index-legacy-21fcfe5f.js

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/instrument-27333d3f.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/instrument-68317320.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/instrument-b316f97b.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/instrument-legacy-b016555e.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/instrument-legacy-ea8dd046.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/instrument-legacy-fc35e997.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/modeView-7e57fec5.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/modeView-84ce18f2.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/modeView-91b3f7c4.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/modeView-legacy-026b4987.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/modeView-legacy-8c38640e.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/modeView-legacy-9a73f1b8.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/orchestra-4da094e9.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/orchestra-6215356b.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/orchestra-a130c006.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/orchestra-legacy-2c2d2394.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/orchestra-legacy-5c5fd267.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/orchestra-legacy-9b7f8104.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/polyfills-336fef56.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/polyfills-6b4fae76.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/polyfills-legacy-ac2ca436.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/polyfills-legacy-ae95c351.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/report-share-45d51a75.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/report-share-cd5a973e.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/report-share-dca8db75.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/report-share-legacy-223752da.js


ファイルの差分が大きいため隠しています
+ 0 - 1
dist/js/report-share-legacy-3c3b08e1.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/js/report-share-legacy-ab2f7ab5.js


+ 9 - 27
dist/orchestra.html
ファイルの表示 

@@ -2,11 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
 
-=======
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -45,21 +41,12 @@
 
       transition: opacity .3s;
 
     }
 
   </style>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/orchestra-4da094e9.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-0f65e958.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-ee7bc841.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-f1d8ca4c.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
 
-=======
 
-  <script type="module" crossorigin src="./js/orchestra-a130c006.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-204e8585.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-890ff5f7.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-7dad5569.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/orchestra-6215356b.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-069351bf.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-363dd17f.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-38628a6e.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-8cd1bd4f.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-ee65d8b0.js">
 
   <link rel="stylesheet" href="./css/index-1ec513a0.css">
 
   <link rel="stylesheet" href="./css/index-85f95688.css">
 
   <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.css">
 
@@ -83,13 +70,8 @@
 
   </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-ae95c351.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-2c2d2394.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-5c5fd267.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
->>>>>>> feature-patch
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-ac2ca436.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-9b7f8104.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 6 - 22
dist/report-share.html
ファイルの表示 

@@ -2,11 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
 
-=======
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
->>>>>>> feature-patch
 
+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -29,17 +25,10 @@
 
       transition: opacity .3s;
 
     }
 
   </style>
 
-<<<<<<< HEAD
 
-  <script type="module" crossorigin src="./js/report-share-45d51a75.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
 
+  <script type="module" crossorigin src="./js/report-share-dca8db75.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-069351bf.js">
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
 
-=======
 
-  <script type="module" crossorigin src="./js/report-share-cd5a973e.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
 
-  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
 
->>>>>>> feature-patch
 
+  <link rel="modulepreload" crossorigin href="./js/index-ee65d8b0.js">
 
   <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">
 
@@ -63,13 +52,8 @@
 
   </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-ae95c351.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-3c3b08e1.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-223752da.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
->>>>>>> feature-patch
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-ac2ca436.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-ab2f7ab5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

ファイルの差分が大きいため隠しています
+ 0 - 1
stats.html


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません