lex 11 months ago
parent
commit
3cd9483012

File diff suppressed because it is too large
+ 0 - 0
dist/assets/auth-login-legacy.b67e97d8.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/auth-login.2f32a192.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/formatSvgToImg-legacy.416b5515.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/formatSvgToImg.5f92eb56.js


+ 1 - 1
dist/assets/home-layout-center-legacy.50fd0c81.js → dist/assets/home-layout-center-legacy.3375bf18.js

@@ -1 +1 @@
-!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.26c2050f.js","./index-legacy.d106bcec.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.42eac500.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,u(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败,请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.26c2050f.js","./index-legacy.43ae32b4.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.9f262c61.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,u(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败,请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

+ 1 - 1
dist/assets/home-layout-center.7c6d7d0f.js → dist/assets/home-layout-center.13283654.js

@@ -1 +1 @@
-import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.ff6db5d6.js";import{a,b as h}from"./index.8e2906bd.js";import"./auth.eb9bda32.js";import"./routes-common.b07784fe.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.ff6db5d6.js";import{a,b as h}from"./index.75cd7991.js";import"./auth.eb9bda32.js";import"./routes-common.9ab2dd22.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.1f2f9628.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.43ae32b4.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.5e1889e7.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.5be1fe5e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.75cd7991.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.973c397d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/login-legacy.9e24d28e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/login.764e0b49.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/new-index-legacy.85bcbf05.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/new-index-legacy.e991aaf9.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/new-index.162024a3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/new-index.3ab801b4.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/routes-common-legacy.9f262c61.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/routes-common.9ab2dd22.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher-legacy.da009fd5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher.93a3e091.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/tenant-legacy.b40402dc.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/tenant.6b4f6b26.js


+ 3 - 3
dist/index.html

@@ -52,10 +52,10 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/index.8e2906bd.js"></script>
+  <script type="module" crossorigin src="./assets/index.75cd7991.js"></script>
   <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
   <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
-  <link rel="modulepreload" href="./assets/routes-common.b07784fe.js">
+  <link rel="modulepreload" href="./assets/routes-common.9ab2dd22.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -68,7 +68,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d106bcec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.43ae32b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 61 - 3
dist/osmd/index.html

@@ -22,6 +22,10 @@
     .vf-text {
       display: none;
     }
+
+    #cursorImg-0 {
+      display: none;
+    }
   </style>
 </head>
 
@@ -32,10 +36,35 @@
     osmd.setOptions({
       backend: "svg",
       drawTitle: false,
-      drawPartNames: true,
+      drawPartNames: false,
       drawLyricist: false,
-      drawComposer: false,
     });
+    // osmd.EngravingRules.RenderMultipleRestMeasures = true;
+    // osmd.EngravingRules.CompactMode = true;
+    // osmd.EngravingRules.PageTopMarginNarrow = 5.0; // for compact mode
+    // osmd.EngravingRules.PageBottomMargin = 15.0;
+
+
+    // osmd.EngravingRules.DYMusicScoreType =
+    //     state.musicRenderType === EnumMusicRenderType.staff ? "staff" : "jianpu";
+    //   // 如果为固定调,需要加入全局
+    //   if (state.musicRenderType === EnumMusicRenderType.fixedTone) {
+    //     window.sett = {
+    //       keySignature: true,
+    //     };
+    //   }
+    // debugger
+    // console.log('osmd.EngravingRules')
+    // osmd.EngravingRules.StaffDistance = 1.0;
+    // osmd.EngravingRules.BetweenStaffDistance = 1.0;
+    // osmd.EngravingRules.MinimumStaffLineDistance = 1.0;
+    //osmd.EngravingRules.MinSkyBottomDistBetweenStaves = 1.0; // default 1.0. this can cause collisions with slurs and dynamics sometimes
+    osmd.EngravingRules.MinSkyBottomDistBetweenSystems = 3.0; // default 5.0
+    // note that osmd.EngravingRules === osmd.rules, since it's passed as a reference
+
+
+    osmd.EngravingRules.MinimumDistanceBetweenSystems = 1;
+    // osmd.setPageFormat('794x1123')
     osmd.setPageFormat('650x884')
     function getSvgPngToSize(osmd) {
       if (osmd) {
@@ -89,12 +118,41 @@
     }
     function resetRender(partIndex) {
       for (let i = 0; i < osmd.Sheet.Instruments.length; i++) {
-        // console.log(osmd.Sheet.Instruments[i].Name);
         osmd.Sheet.Instruments[i].Visible = i === partIndex;
       }
       render();
 
     }
+
+    function resetRenderPage(type, xmlUrl) {
+      let str = 'staff'
+      if (type === 'first') {
+        str = 'jianpu'
+        window.sett = {
+          keySignature: false,
+        };
+      } else if (type === 'fixed') {
+        str = 'jianpu'
+        window.sett = {
+          keySignature: true,
+        };
+      }
+
+      osmd.EngravingRules.DYMusicScoreType = str
+      // console.log(type, xmlUrl)
+      osmd
+        .load(xmlUrl)
+        .then(
+          function () {
+            // for (let i = 0; i < osmd.Sheet.Instruments.length; i++) {
+            //   // console.log(osmd.Sheet.Instruments[i].Name);
+            //   osmd.Sheet.Instruments[i].Visible = i === partIndex;
+            // }
+            osmd.zoom = .5
+            render();
+          }
+        );
+    }
   </script>
 </body>
 

File diff suppressed because it is too large
+ 0 - 0
dist/osmd/opensheetmusicdisplay.min.js


+ 3 - 3
dist/teacher.html

@@ -52,9 +52,9 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/teacher.f090ed90.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.93a3e091.js"></script>
   <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
-  <link rel="modulepreload" href="./assets/routes-common.b07784fe.js">
+  <link rel="modulepreload" href="./assets/routes-common.9ab2dd22.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.css">
   <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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,7 +65,7 @@
   
   <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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.071ff31e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.da009fd5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 2 - 2
dist/tenant.html

@@ -52,7 +52,7 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/tenant.5639ed09.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.6b4f6b26.js"></script>
   <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
   <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
@@ -67,7 +67,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b1d845a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b40402dc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

Some files were not shown because too many files changed in this diff