Inicio Explorar Axuda
Iniciar sesión
tianyong
/
gym-music-score
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge branch 'gym-test' of http://git.dayaedu.com/tianyong/gym-music-score into gym-test

黄琪勇 hai 8 meses
pai
eb04e6ffa8 6f98e53571
achega
f765bdabd7
Modificáronse 61 ficheiros con 52 adicións e 7 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 4 4
      dist/instrument.html
  2. 0 0
      dist/js/index-378cc1af.js
  3. 0 0
      dist/js/index-c59a3a80.js
  4. 0 0
      dist/js/index-ed8f8746.js
  5. 1 1
      dist/js/index-efd4b842.js
  6. 0 0
      dist/js/index-legacy-60888482.js
  7. 0 0
      dist/js/index-legacy-aa3b345e.js
  8. 0 0
      dist/js/index-legacy-b563c20e.js
  9. 1 1
      dist/js/index-legacy-f102a157.js
  10. 0 0
      dist/js/instrument-1ea870a0.js
  11. 0 0
      dist/js/instrument-legacy-0e1191fe.js
  12. 0 0
      dist/js/modeView-31532f95.js
  13. 0 0
      dist/js/modeView-legacy-d688ab1a.js
  14. 0 0
      dist/js/polyfills-858fb2ee.js
  15. 0 0
      dist/js/polyfills-legacy-1f76d399.js
  16. 0 0
      dist/svg/background-b89deedf.svg
  17. 0 0
      dist/svg/close2-9bf3f858.svg
  18. 0 0
      dist/svg/clx1-3d063166.svg
  19. 0 0
      dist/svg/clx2-99f2ced3.svg
  20. 0 0
      dist/svg/clx3-82262a8a.svg
  21. 0 0
      dist/svg/clx4-7a8a1657.svg
  22. 0 0
      dist/svg/clx5-b3331931.svg
  23. 0 0
      dist/svg/cursor-icon-1-b64224eb.svg
  24. 0 0
      dist/svg/cursor-icon-2-03a5f875.svg
  25. 0 0
      dist/svg/cursor-icon-3-020a25ee.svg
  26. 0 0
      dist/svg/down-1c21ed5a.svg
  27. 0 0
      dist/svg/guding-a3ea7233.svg
  28. 0 0
      dist/svg/guding-active-e8543b78.svg
  29. 0 0
      dist/svg/icon-staff-5a2b7c94.svg
  30. 0 0
      dist/svg/icon-staff-active-5035908c.svg
  31. 0 0
      dist/svg/icon_bg-026faf73.svg
  32. 0 0
      dist/svg/icon_cancel-06949ce5.svg
  33. 0 0
      dist/svg/icon_close-382c9a2f.svg
  34. 0 0
      dist/svg/icon_confirm-fa958ade.svg
  35. 0 0
      dist/svg/icon_evaluatingOff-0b1c80e6.svg
  36. 0 0
      dist/svg/icon_evaluatingOn-bb155620.svg
  37. 0 0
      dist/svg/icon_menu-30009ed1.svg
  38. 0 0
      dist/svg/icon_minus-35cb01c5.svg
  39. 0 0
      dist/svg/icon_pause-b4b9ea85.svg
  40. 0 0
      dist/svg/icon_play-4e74a97f.svg
  41. 0 0
      dist/svg/icon_plus-8646d352.svg
  42. 0 0
      dist/svg/icon_resetbtn-b9bae964.svg
  43. 0 0
      dist/svg/icon_speed-ba38a91a.svg
  44. 0 0
      dist/svg/icon_speedRest-c6c9e93d.svg
  45. 0 0
      dist/svg/icon_title-e17b577f.svg
  46. 0 0
      dist/svg/icon_zhuanpu-61d31826.svg
  47. 0 0
      dist/svg/info-ba658f25.svg
  48. 0 0
      dist/svg/modeType-7cd93c3f.svg
  49. 0 0
      dist/svg/music-856b3e8e.svg
  50. 0 0
      dist/svg/off-8d507628.svg
  51. 0 0
      dist/svg/on-13b29450.svg
  52. 0 0
      dist/svg/shenggui-31fe8d1c.svg
  53. 0 0
      dist/svg/shuodiao-active-36a3e38b.svg
  54. 0 0
      dist/svg/shuodiao-da855d30.svg
  55. 0 0
      dist/svg/task-bg-859300d7.svg
  56. 0 0
      dist/svg/tv-6937ad6f.svg
  57. 0 0
      dist/svg/yijian-9ffcec54.svg
  58. 27 0
      src/helpers/svgToPng.ts
  59. 13 0
      src/page-instrument/view-detail/index.tsx
  60. 6 1
      src/view/music-score/index.tsx
  61. 0 0
      stats.html

+ 4 - 4
dist/instrument.html
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-a6b45a45.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-858fb2ee.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -41,7 +41,7 @@
 
       })
 
     }
 
   </script>
 
-  <script type="module" crossorigin src="./js/instrument-009bf74a.js"></script>
 
+  <script type="module" crossorigin src="./js/instrument-1ea870a0.js"></script>
 
   <link rel="stylesheet" href="./css/instrument-7508600c.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>
 
@@ -65,8 +65,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>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-55a61f59.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-52e6efc1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1f76d399.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-0e1191fe.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/index-378cc1af.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/index-c59a3a80.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/index-ed8f8746.js


+ 1 - 1
dist/js/index-1cba08ab.js → dist/js/index-efd4b842.js
Ver ficheiro 

@@ -1 +1 @@
 
-import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-009bf74a.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,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-1ea870a0.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};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/index-legacy-60888482.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/index-legacy-aa3b345e.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/index-legacy-b563c20e.js


+ 1 - 1
dist/js/index-legacy-7537d87e.js → dist/js/index-legacy-f102a157.js
Ver ficheiro 

@@ -1 +1 @@
 
-System.register(["./instrument-legacy-52e6efc1.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,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.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],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()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));
 
+System.register(["./instrument-legacy-0e1191fe.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,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.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],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()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/instrument-1ea870a0.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/instrument-legacy-0e1191fe.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/modeView-31532f95.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/modeView-legacy-d688ab1a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/polyfills-858fb2ee.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/polyfills-legacy-1f76d399.js


+ 0 - 0
dist/svg/background-339c2bb0.svg → dist/svg/background-b89deedf.svg
Ver ficheiro


+ 0 - 0
dist/svg/close2-851f5aa1.svg → dist/svg/close2-9bf3f858.svg
Ver ficheiro


+ 0 - 0
dist/svg/clx1-04861a74.svg → dist/svg/clx1-3d063166.svg
Ver ficheiro


+ 0 - 0
dist/svg/clx2-1c450860.svg → dist/svg/clx2-99f2ced3.svg
Ver ficheiro


+ 0 - 0
dist/svg/clx3-c5121d5e.svg → dist/svg/clx3-82262a8a.svg
Ver ficheiro


+ 0 - 0
dist/svg/clx4-2bbc0c38.svg → dist/svg/clx4-7a8a1657.svg
Ver ficheiro


+ 0 - 0
dist/svg/clx5-f9cec754.svg → dist/svg/clx5-b3331931.svg
Ver ficheiro


+ 0 - 0
dist/svg/cursor-icon-1-35a09bde.svg → dist/svg/cursor-icon-1-b64224eb.svg
Ver ficheiro


+ 0 - 0
dist/svg/cursor-icon-2-e277d6c8.svg → dist/svg/cursor-icon-2-03a5f875.svg
Ver ficheiro


+ 0 - 0
dist/svg/cursor-icon-3-64b29b2d.svg → dist/svg/cursor-icon-3-020a25ee.svg
Ver ficheiro


+ 0 - 0
dist/svg/down-c6403c5c.svg → dist/svg/down-1c21ed5a.svg
Ver ficheiro


+ 0 - 0
dist/svg/guding-8da6abc6.svg → dist/svg/guding-a3ea7233.svg
Ver ficheiro


+ 0 - 0
dist/svg/guding-active-a30cec46.svg → dist/svg/guding-active-e8543b78.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon-staff-6a809c25.svg → dist/svg/icon-staff-5a2b7c94.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon-staff-active-937cf7ca.svg → dist/svg/icon-staff-active-5035908c.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_bg-b8b32f61.svg → dist/svg/icon_bg-026faf73.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_cancel-537e7528.svg → dist/svg/icon_cancel-06949ce5.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_close-728e02a6.svg → dist/svg/icon_close-382c9a2f.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_confirm-77c45bbf.svg → dist/svg/icon_confirm-fa958ade.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_evaluatingOff-05461279.svg → dist/svg/icon_evaluatingOff-0b1c80e6.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_evaluatingOn-a6a49955.svg → dist/svg/icon_evaluatingOn-bb155620.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_menu-99ffdcc1.svg → dist/svg/icon_menu-30009ed1.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_minus-549a0b1d.svg → dist/svg/icon_minus-35cb01c5.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_pause-13985e91.svg → dist/svg/icon_pause-b4b9ea85.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_play-f0c384fb.svg → dist/svg/icon_play-4e74a97f.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_plus-b3d97051.svg → dist/svg/icon_plus-8646d352.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_resetbtn-68afe187.svg → dist/svg/icon_resetbtn-b9bae964.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_speed-9c32fdc9.svg → dist/svg/icon_speed-ba38a91a.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_speedRest-e296c675.svg → dist/svg/icon_speedRest-c6c9e93d.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_title-d80e504a.svg → dist/svg/icon_title-e17b577f.svg
Ver ficheiro


+ 0 - 0
dist/svg/icon_zhuanpu-cdc8567c.svg → dist/svg/icon_zhuanpu-61d31826.svg
Ver ficheiro


+ 0 - 0
dist/svg/info-99f8d45a.svg → dist/svg/info-ba658f25.svg
Ver ficheiro


+ 0 - 0
dist/svg/modeType-50f7e8a4.svg → dist/svg/modeType-7cd93c3f.svg
Ver ficheiro


+ 0 - 0
dist/svg/music-e800b1ef.svg → dist/svg/music-856b3e8e.svg
Ver ficheiro


+ 0 - 0
dist/svg/off-604231f2.svg → dist/svg/off-8d507628.svg
Ver ficheiro


+ 0 - 0
dist/svg/on-5f47e293.svg → dist/svg/on-13b29450.svg
Ver ficheiro


+ 0 - 0
dist/svg/shenggui-eda4e462.svg → dist/svg/shenggui-31fe8d1c.svg
Ver ficheiro


+ 0 - 0
dist/svg/shuodiao-active-15d1fbac.svg → dist/svg/shuodiao-active-36a3e38b.svg
Ver ficheiro


+ 0 - 0
dist/svg/shuodiao-5a39d9ca.svg → dist/svg/shuodiao-da855d30.svg
Ver ficheiro


+ 0 - 0
dist/svg/task-bg-8f66edfc.svg → dist/svg/task-bg-859300d7.svg
Ver ficheiro


+ 0 - 0
dist/svg/tv-dc7f6f77.svg → dist/svg/tv-6937ad6f.svg
Ver ficheiro


+ 0 - 0
dist/svg/yijian-739ef8fd.svg → dist/svg/yijian-9ffcec54.svg
Ver ficheiro


+ 27 - 0
src/helpers/svgToPng.ts
Ver ficheiro 

@@ -0,0 +1,27 @@
 
+// 将svg转成png
 
+export const getSvgPngToSize = (osmd: any) => {
 
+    if (osmd) {
 
+      if (osmd.Drawer.Backends.length > 0) {
 
+        var imgList = []
 
+
 
+        for (var idx = 0, len = osmd.Drawer.Backends.length; idx < len; idx++) {
 
+          var backend = osmd.Drawer.Backends[idx]
 
+          var state = backend.ctx.state;
 
+          var width = backend.ctx.width / state.scale.x;
 
+          var height = backend.ctx.height / state.scale.y;
 
+          var cont = new XMLSerializer().serializeToString(
 
+            backend.ctx.svg
 
+          )
 
+
 
+          imgList.push({
 
+            img: cont,
 
+            width: width,
 
+            height: height,
 
+          })
 
+        }
 
+        return imgList
 
+      }
 
+    } else {
 
+      console.log('没有OSMD')
 
+    }
 
+}

+ 13 - 0
src/page-instrument/view-detail/index.tsx
Ver ficheiro 

@@ -40,6 +40,7 @@ import Loading from "./loading"
 
 import ExerciseStatistics from "../custom-plugins/ExerciseStatistics"
 
 import { musicData } from "/src/view/music-score"
 
 import Vip from "/src/page-instrument/component/vip"
 
+import { getSvgPngToSize } from "/src/helpers/svgToPng"
 
 // import bgJson from "./images/index.json";
 
 
 // const DelayCheck = defineAsyncComponent(() =>
 
@@ -312,6 +313,18 @@ export default defineComponent({
 
       // } else {
 
       //   state.musicScoreBtnDirection = state.playBtnDirection;
 
       // }
 
+
 
+      // 管乐迷曲谱详情页，需要下载A4尺寸的图片
 
+      if (query.downPng === 'A4') {
 
+        const imgList = getSvgPngToSize(state.osmd)
 
+        console.log('A4', imgList)
 
+        window.parent.postMessage({
 
+          api: 'musicStaffRender',
 
+          loading: false,
 
+          osmdImg: imgList
 
+        }, '*');
 
+      }
 
+
 
       state.musicScoreBtnDirection = state.playBtnDirection;
 
       state.musicRendered = true;

+ 6 - 1
src/view/music-score/index.tsx
Ver ficheiro 

@@ -172,7 +172,12 @@ export default defineComponent({
 
 					osmd.Sheet.Instruments[i].Visible = canSelectTracks.includes(trackName)
 
 				}
 
 			}
 
-			osmd.zoom = state.zoom;
 
+			if (query.downPng === 'A4') {
 
+				osmd.setPageFormat('794x1070')
 
+				osmd.zoom = 0.3;
 
+			} else {
 
+				osmd.zoom = state.zoom;
 
+			}
 
 			osmd.render();
 
 			console.log("🚀 ~ osmd:", osmd)
 
 			emit("rendered", osmd);

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
stats.html


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio