Ver Fonte

Merge branch 'ponline' of http://git.dayaedu.com/lex/h5-colexiu

黄琪勇 há 11 meses atrás
pai
commit
e1bd11c252
48 ficheiros alterados com 116 adições e 7 exclusões
  1. 1 0
      dist/assets/auth-login-legacy.afc672fc.js
  2. 1 0
      dist/assets/auth-login-legacy.b67e97d8.js
  3. 1 0
      dist/assets/auth-login.2f32a192.js
  4. 1 0
      dist/assets/auth-login.dc2d60f4.js
  5. 0 0
      dist/assets/formatSvgToImg-legacy.416b5515.js
  6. 0 0
      dist/assets/formatSvgToImg-legacy.db03a587.js
  7. 1 0
      dist/assets/formatSvgToImg.4ab65f58.js
  8. 1 0
      dist/assets/formatSvgToImg.5f92eb56.js
  9. 5 0
      dist/assets/home-layout-center-legacy.3375bf18.js
  10. 4 0
      dist/assets/home-layout-center-legacy.d266624b.js
  11. 5 0
      dist/assets/home-layout-center.13283654.js
  12. 4 0
      dist/assets/home-layout-center.f08a8f7c.js
  13. 1 0
      dist/assets/index-legacy.01e8a047.js
  14. 1 0
      dist/assets/index-legacy.1433efb4.js
  15. 1 0
      dist/assets/index-legacy.1f2f9628.js
  16. 1 0
      dist/assets/index-legacy.43ae32b4.js
  17. 1 0
      dist/assets/index-legacy.55b0fba4.js
  18. 1 0
      dist/assets/index-legacy.5e1889e7.js
  19. 1 0
      dist/assets/index-legacy.ac77ba14.js
  20. 1 0
      dist/assets/index-legacy.c2773da1.js
  21. 0 0
      dist/assets/index.301ab08a.js
  22. 1 0
      dist/assets/index.3f2e62a0.js
  23. 1 0
      dist/assets/index.4115c248.js
  24. 1 0
      dist/assets/index.5be1fe5e.js
  25. 0 0
      dist/assets/index.75cd7991.js
  26. 1 0
      dist/assets/index.973c397d.js
  27. 1 0
      dist/assets/login-legacy.9e24d28e.js
  28. 1 0
      dist/assets/login-legacy.d63016aa.js
  29. 1 0
      dist/assets/login.764e0b49.js
  30. 1 0
      dist/assets/login.ba3ab756.js
  31. 0 0
      dist/assets/new-index-legacy.e991aaf9.js
  32. 0 0
      dist/assets/new-index.162024a3.js
  33. 1 0
      dist/assets/routes-common-legacy.0ba61e0c.js
  34. 1 0
      dist/assets/routes-common-legacy.9f262c61.js
  35. 0 0
      dist/assets/routes-common.9ab2dd22.js
  36. 1 0
      dist/assets/teacher-legacy.37ff3a7a.js
  37. 1 0
      dist/assets/teacher-legacy.da009fd5.js
  38. 0 0
      dist/assets/teacher.93a3e091.js
  39. 1 0
      dist/assets/tenant-legacy.4c47547e.js
  40. 1 0
      dist/assets/tenant-legacy.6e86fb9d.js
  41. 0 0
      dist/assets/tenant.96f81ec4.js
  42. 12 0
      dist/index.html
  43. 0 0
      dist/osmd/opensheetmusicdisplay.min.js
  44. 11 0
      dist/teacher.html
  45. 11 0
      dist/tenant.html
  46. 0 0
      public/osmd/opensheetmusicdisplay.min.js
  47. 27 3
      src/tenant/music/music-detail/formatSvgToImg.ts
  48. 9 4
      src/tenant/music/music-detail/new-index.tsx

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/auth-login-legacy.afc672fc.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/auth-login-legacy.b67e97d8.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/auth-login.2f32a192.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/auth-login.dc2d60f4.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/formatSvgToImg-legacy.416b5515.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/formatSvgToImg-legacy.db03a587.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/formatSvgToImg.4ab65f58.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/formatSvgToImg.5f92eb56.js


+ 5 - 0
dist/assets/home-layout-center-legacy.3375bf18.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.d266624b.js
+!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.15af8cfc.js","./index-legacy.ac77ba14.js","./auth-legacy.561e85dd.js","./routes-common-legacy.0ba61e0c.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)])}}))}}}))}();
+>>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047:dist/assets/home-layout-center-legacy.3375bf18.js

+ 4 - 0
dist/assets/home-layout-center-legacy.d266624b.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.d266624b.js
 !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.15af8cfc.js","./index-legacy.ac77ba14.js","./auth-legacy.561e85dd.js","./routes-common-legacy.0ba61e0c.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)])}}))}}}))}();
+>>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047:dist/assets/home-layout-center-legacy.3375bf18.js

+ 5 - 0
dist/assets/home-layout-center.13283654.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.f08a8f7c.js
+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.096808cc.js";import{a,b as h}from"./index.6ef914f8.js";import"./auth.6ac00a50.js";import"./routes-common.5daa7b90.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};
+>>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047:dist/assets/home-layout-center.13283654.js

+ 4 - 0
dist/assets/home-layout-center.f08a8f7c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.f08a8f7c.js
 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.096808cc.js";import{a,b as h}from"./index.6ef914f8.js";import"./auth.6ac00a50.js";import"./routes-common.5daa7b90.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};
+>>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047:dist/assets/home-layout-center.13283654.js

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


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


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


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


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


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


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


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


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


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


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


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


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


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


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/login-legacy.9e24d28e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/login-legacy.d63016aa.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/login.764e0b49.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/login.ba3ab756.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/new-index-legacy.e991aaf9.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/new-index.162024a3.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/routes-common-legacy.0ba61e0c.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/routes-common-legacy.9f262c61.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/routes-common.9ab2dd22.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/teacher-legacy.37ff3a7a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/teacher-legacy.da009fd5.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/teacher.93a3e091.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/tenant-legacy.4c47547e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
dist/assets/tenant-legacy.6e86fb9d.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/tenant.96f81ec4.js


+ 12 - 0
dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.6ef914f8.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
   <link rel="modulepreload" href="./assets/routes-common.5daa7b90.js">
+=======
+  <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.9ab2dd22.js">
+>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -67,8 +74,13 @@
   
   <!-- <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.ac77ba14.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</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.43ae32b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
 </body>
 
 </html>

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/osmd/opensheetmusicdisplay.min.js


+ 11 - 0
dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.a6f5c11b.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/routes-common.5daa7b90.js">
+=======
+  <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.9ab2dd22.js">
+>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
   <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>
@@ -64,8 +70,13 @@
   <div id="app"></div>
   
   <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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.37ff3a7a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</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.da009fd5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
 </body>
 
 </html>

+ 11 - 0
dist/tenant.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.84f920fb.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.96f81ec4.js"></script>
+  <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
+  <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
+>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -66,8 +72,13 @@
   
   <!-- <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.6e86fb9d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</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.4c47547e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
 </body>
 
 </html>

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
public/osmd/opensheetmusicdisplay.min.js


+ 27 - 3
src/tenant/music/music-detail/formatSvgToImg.ts

@@ -34,11 +34,16 @@ const blobToBase64 = (blob: any) => {
     reader.readAsDataURL(blob)
   })
 }
-
+let canvas = null as any
 export const svgtopng = async (svg: any, width: any, height: any) => {
-  const canvas = new OffscreenCanvas(width, height)
+  console.log(canvas, +new Date() + '-----')
+
+  if (!canvas) {
+    canvas = new OffscreenCanvas(width, height)
+  }
+
   const ctx = canvas.getContext('2d')!
-  const v = await Canvg.fromString(ctx!, svg, preset)
+  let v: any = await Canvg.fromString(ctx!, svg, preset)
 
   /**
    * Resize SVG to fit in given size.
@@ -52,5 +57,24 @@ export const svgtopng = async (svg: any, width: any, height: any) => {
   await v.start()
   const blob = await canvas.convertToBlob()
   const base64 = await blobToBase64(blob)
+  // canvas.drawImage(base64
+  // await v.stop()
+  // releaseCanvas(canvas)
+  ctx.clearRect(0, 0, canvas.width, canvas.height)
+  // canvas = null
+  console.log(canvas, 'draw')
+  await v.stop()
+  v = null
   return base64
 }
+
+// function releaseCanvas(canvasElement) {
+//   // 清空 Canvas 上的内容
+//   const ctx = canvasElement.getContext('2d')
+//   ctx.clearRect(0, 0, canvasElement.width, canvasElement.height)
+
+//   // 停止任何正在进行的动画或定时器
+//   cancelAnimationFrame(canvasElement.animationId)
+//   // 删除对 Canvas 元素的引用
+//   canvasElement = null
+// }

+ 9 - 4
src/tenant/music/music-detail/new-index.tsx

@@ -681,8 +681,12 @@ export default defineComponent({
           staffData.xmlPartList = partList
         }
 
-        // staffData.iframeSrc = `${location.origin}/osmd/index.html`
-        staffData.iframeSrc = `${location.origin}${location.pathname}osmd/index.html`
+        // staffData.iframeSrc = `${
+        //   location.origin
+        // }/osmd/index.html?t=${new Date().getTime()}`
+        staffData.iframeSrc = `${location.origin}${
+          location.pathname
+        }osmd/index.html?t=${new Date().getTime()}`
         staffData.musicXml = musicDetail.value?.xmlFileUrl || ''
         staffData.partList = musicDetail.value?.background || []
         staffData.partList.forEach((part: any) => {
@@ -896,10 +900,11 @@ export default defineComponent({
               style={{
                 display:
                   musicDetail.value?.musicSheetType === 'SINGLE' ? '' : 'none',
-                opacity: uploadImgs.value ? 0.6 : 1
+                opacity: showImg.value.length <= 0 ? 0.6 : 1
               }}
               onClick={() => {
-                if (uploadImgs.value) return
+                if (showImg.value.length <= 0) return
+
                 staff.status = true
               }}
             >

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