Merge branch 'feature-12.11' into gyt-test

dist/assets/arrow-left-legacy.6b82be5a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.a98e7cfb.js
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.98325bd3.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.705693f7.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+>>>>>>>> feature-12.11:dist/assets/arrow-left-legacy.6b82be5a.js

dist/assets/arrow-left-legacy.a98e7cfb.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.a98e7cfb.js
 !function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.98325bd3.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.705693f7.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+>>>>>>>> feature-12.11:dist/assets/arrow-left-legacy.6b82be5a.js

dist/assets/arrow-left.0dc84acc.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.0fa28adb.js
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.5f274f71.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+========
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.56029e96.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+>>>>>>>> feature-12.11:dist/assets/arrow-left.0dc84acc.js

dist/assets/arrow-left.0fa28adb.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.0fa28adb.js
 import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.5f274f71.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+========
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.56029e96.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+>>>>>>>> feature-12.11:dist/assets/arrow-left.0dc84acc.js

dist/assets/colexiu-legacy.badb4f5f.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.705693f7.js","./main-legacy.cf78dbc6.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/colexiu.0dc4c909.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.0dc4c909.js
 import"./App.5f274f71.js";import"./main.725fce98.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.56029e96.js";import"./main.bf351bea.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/colexiu.d592decc.js

dist/assets/colexiu.d592decc.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.0dc4c909.js
+import"./App.5f274f71.js";import"./main.725fce98.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.56029e96.js";import"./main.bf351bea.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/colexiu.d592decc.js

dist/assets/index-legacy.117cdce5.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.705693f7.js"],(function(t){"use strict";var e,r,n,u,i;return{setters:[function(t){e=t.d,r=t.a,n=t.B,u=t.g,i=t.K}],execute:function(){t("default",e({name:"notfund",render:function(){var t=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return t.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));

dist/assets/index-legacy.48a0f32e.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.705693f7.js","./main-legacy.cf78dbc6.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/index.1c3bc355.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.9d9e288d.js
+import"./App.5f274f71.js";import"./main.725fce98.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.56029e96.js";import"./main.bf351bea.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/index.1c3bc355.js

dist/assets/index.266263ff.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.266263ff.js
 import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.5f274f71.js";import{I as u}from"./index.dd555b44.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.56029e96.js";import{I as u}from"./index.f1865c4b.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> feature-12.11:dist/assets/index.d106c8da.js

dist/assets/index.51ddbdeb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.5fe3cfd5.js
+import{d as r,a as e,B as t,g as a,K as o}from"./App.5f274f71.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.56029e96.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> feature-12.11:dist/assets/index.51ddbdeb.js

dist/assets/index.5fe3cfd5.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.5fe3cfd5.js
 import{d as r,a as e,B as t,g as a,K as o}from"./App.5f274f71.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.56029e96.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> feature-12.11:dist/assets/index.51ddbdeb.js

dist/assets/index.6e04dfdb.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.6e04dfdb.js
 import{r,b as n,d as l,a as t,R as i,U as u}from"./App.5f274f71.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.56029e96.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+>>>>>>>> feature-12.11:dist/assets/index.7d4ffad7.js

dist/assets/index.7d4ffad7.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.6e04dfdb.js
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.5f274f71.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.56029e96.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+>>>>>>>> feature-12.11:dist/assets/index.7d4ffad7.js

dist/assets/index.9d9e288d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.9d9e288d.js
 import"./App.5f274f71.js";import"./main.725fce98.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.56029e96.js";import"./main.bf351bea.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/index.1c3bc355.js

dist/assets/index.d106c8da.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.266263ff.js
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.5f274f71.js";import{I as u}from"./index.dd555b44.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.56029e96.js";import{I as u}from"./index.f1865c4b.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> feature-12.11:dist/assets/index.d106c8da.js

dist/assets/index.dd555b44.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.dd555b44.js
 import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.5f274f71.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.56029e96.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+>>>>>>>> feature-12.11:dist/assets/index.f1865c4b.js

dist/assets/index.f1865c4b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.dd555b44.js
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.5f274f71.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.56029e96.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+>>>>>>>> feature-12.11:dist/assets/index.f1865c4b.js

dist/assets/orchestra-legacy.8ec5b67b.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.705693f7.js","./main-legacy.cf78dbc6.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/orchestra.045f2281.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.045f2281.js
 import"./App.5f274f71.js";import"./main.725fce98.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.56029e96.js";import"./main.bf351bea.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/orchestra.6bdb827a.js

dist/assets/orchestra.6bdb827a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.045f2281.js
+import"./App.5f274f71.js";import"./main.725fce98.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.56029e96.js";import"./main.bf351bea.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/orchestra.6bdb827a.js

dist/assets/state-legacy.aabce01f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.f2607941.js
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.98325bd3.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.705693f7.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),f=e("s",n(c()));r(f,(function(){o.set("state",f)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];f[e]=n}}))}}}))}();
+>>>>>>>> feature-12.11:dist/assets/state-legacy.aabce01f.js

dist/assets/state-legacy.f2607941.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.f2607941.js
 !function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.98325bd3.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.705693f7.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),f=e("s",n(c()));r(f,(function(){o.set("state",f)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];f[e]=n}}))}}}))}();
+>>>>>>>> feature-12.11:dist/assets/state-legacy.aabce01f.js

dist/assets/state.1c163a6a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.64b4b4ad.js
+import{O as l,w as o,Q as r}from"./App.5f274f71.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{O as l,w as o,Q as r}from"./App.56029e96.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> feature-12.11:dist/assets/state.1c163a6a.js

dist/assets/state.64b4b4ad.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.64b4b4ad.js
 import{O as l,w as o,Q as r}from"./App.5f274f71.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{O as l,w as o,Q as r}from"./App.56029e96.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> feature-12.11:dist/assets/state.1c163a6a.js

dist/assets/vip.52099aab.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.52099aab.js
 import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.5f274f71.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.56029e96.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> feature-12.11:dist/assets/vip.717b3f93.js

dist/assets/vip.717b3f93.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.52099aab.js
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.5f274f71.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.56029e96.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> feature-12.11:dist/assets/vip.717b3f93.js

dist/colexiu-report-share.html

@@ -119,6 +119,7 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.bcfaa4a3.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -127,6 +128,16 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.6e04dfdb.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.581268cb.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.64b4b4ad.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.e9faec87.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/arrow-left.0dc84acc.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.7d4ffad7.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.6b37c357.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.1c163a6a.js">
+>>>>>>> feature-12.11
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
@@ -194,6 +205,10 @@
   
   <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.f0e532a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.5f6720b8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 </html>

dist/colexiu-report.html

@@ -83,6 +83,7 @@
       height: 100Px;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.b51b5bba.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -92,6 +93,17 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.581268cb.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.64b4b4ad.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.82651793.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/arrow-left.0dc84acc.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.7d4ffad7.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.6b37c357.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.1c163a6a.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
@@ -126,7 +138,11 @@
   
   <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.cf0ef1a1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.f8fc9873.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 
 </html>

dist/colexiu-share.html

@@ -65,12 +65,21 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.6abc4288.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.dd555b44.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.51acf3cf.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.f1865c4b.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-share.8457fad4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
@@ -84,6 +93,10 @@
   
   <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.06310125.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.fdc62e50.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 </html>

dist/colexiu.html

@@ -131,11 +131,19 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.0dc4c909.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/main.725fce98.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.d592decc.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/main.bf351bea.js">
+    <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;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>
   </head>
@@ -221,6 +229,10 @@
     
     <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.3db02f4c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.badb4f5f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
   </body>
 </html>

dist/colxiu-website.html

@@ -116,11 +116,19 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.adcc16e9.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.6e04dfdb.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.d4519ba9.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.7d4ffad7.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-website.a27d2131.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
@@ -184,6 +192,10 @@
   
   <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.67b4746f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.f530b17d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 </html>

dist/index.html

@@ -62,11 +62,19 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/index.9d9e288d.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.725fce98.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/index.1c3bc355.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.bf351bea.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;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>
 </head>
@@ -97,7 +105,11 @@
   
   <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.eed67a7b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.48a0f32e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 
 </html>

dist/music-sheet.html

@@ -131,9 +131,15 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.3bc96fc9.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.0d80b6ad.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+    <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
     <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;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>
@@ -219,6 +225,10 @@
     
     <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.466242de.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.667e547d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
   </body>
 </html>

dist/orchestra.html

@@ -62,11 +62,19 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.045f2281.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.5f274f71.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.725fce98.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.6bdb827a.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.56029e96.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.bf351bea.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;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>
 </head>
@@ -97,7 +105,11 @@
   
   <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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.3675ab77.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.8ec5b67b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 
 </html>

src/subpages/colexiu/helpers/instruments.ts

@@ -1,228 +1,238 @@
-const instruments: { [_: string]: any } = {
-  'Acoustic Grand Piano': '大钢琴',
-  'Bright Acoustic Piano': '明亮的钢琴',
-  'Electric Grand Piano': '电钢琴',
-  'Rhodes Piano': '柔和的电钢琴',
-  'Chorused Piano': '加合唱效果的电钢琴',
-  'Harpsichord': '羽管键琴',
-  'Clavichord': '科拉维科特琴',
-  'Celesta': '钢片琴',
-  'Glockenspiel': '钢片琴',
-  'Music box': '八音盒',
-  'Vibraphone': '颤音琴',
-  'Marimba': '马林巴',
-  'Xylophone': '木琴',
-  'Tubular Bells': '管钟',
-  'Dulcimer': '大扬琴',
-  'Hammond Organ': '击杆风琴',
-  'Percussive Organ': '打击式风琴',
-  'Rock Organ': '摇滚风琴',
-  'Church Organ': '教堂风琴',
-  'Reed Organ': '簧管风琴',
-  'Accordian': '手风琴',
-  'Harmonica': '口琴',
-  'Tango Accordian': '探戈手风琴',
-  'Acoustic Guitar': '钢弦吉他',
-  'Electric Guitar': '闷音电吉他',
-  'Overdriven Guitar': '加驱动效果的电吉他',
-  'Distortion Guitar': '加失真效果的电吉他',
-  'Guitar Harmonics': '吉他和音',
-  'Acoustic Bass': '大贝司',
-  'Electric Bass': '电贝司',
-  'Fretless Bass': '无品贝司',
-  'Slap Bass': '掌击',
-  'Synth Bass': '电子合成',
-  'Violin': '小提琴',
-  'Viola': '中提琴',
-  'Cello': '大提琴',
-  'Contrabass': '低音大提琴',
-  'Tremolo Strings': '弦乐群颤音音色',
-  'Pizzicato Strings': '弦乐群拨弦音色',
-  'Orchestral Harp': '竖琴',
-  'Timpani': '定音鼓',
-  'String Ensemble': '弦乐合奏音色',
-  'Synth Strings': '合成弦乐合奏音色',
-  'Choir Aahs': '人声合唱',
-  'Voice Oohs': '人声',
-  'Synth Voice': '合成人声',
-  'Orchestra Hit': '管弦乐敲击齐奏',
-  'Trumpet': '小号',
-  'Trombone': '长号',
-  'Tuba': '大号',
-  'Muted Trumpet': '加弱音器小号',
-  'French Horn': '法国号',
-  'Brass Section': '铜管组',
-  'Synth Brass': '合成铜管音色',
-  'Soprano Sax': '高音萨克斯管',
-  'Alto Sax': '中音萨克斯管',
-  'Tenor Sax': '次中音萨克斯管',
-  'Baritone Sax': '低音萨克斯管',
-  'Oboe': '双簧管',
-  'English Horn': '英国管',
-  'Bassoon': '巴松',
-  'Soprano Saxophone': '高音萨克斯管',
-  'Alto Saxophone': '中音萨克斯管',
-  'Tenor Saxophone': '次中音萨克斯管',
-  'Baritone Saxophone': '低音萨克斯管',
-  'Piccolo': '短笛',
-  'Flute': '长笛',
-  'Recorder': '竖笛',
-  'Soprano Recorder': '高音竖笛',
-  'Pan Flute': '排箫',
-  'Bottle Blow': '瓶木管',
-  'Whistle': '口哨声',
-  'Ocarina': '陶笛',
-  'Lead': '合成主音',
-  'Lead lead': '合成主音',
-  'Pad age': '合成音色',
-  'Pad': '合成音色',
-  'FX': '合成效果  科幻',
-  'Sitar': '西塔尔',
-  'Banjo': '班卓琴',
-  'Shamisen': '三昧线',
-  'Koto': '十三弦筝',
-  'Kalimba': '卡林巴',
-  'Bagpipe': '风笛',
-  'Fiddle': '民族提琴',
-  'Shanai': '山奈',
-  'Tinkle Bell': '叮当铃',
-  'Agogos': '阿戈戈铃',
-  'Steel Drums': '钢鼓',
-  'Taiko Drum': '太鼓',
-  'Melodic Toms': '嗵嗵鼓',
-  'Synth Drums': '合成鼓',
-  'Reverse Cymbals': '反向镲',
-  'Agogo Bells': '阿戈戈铃',
-  'Taiko Drums': '太鼓',
-  'Bongos': '邦戈鼓',
-  'Bongo Bell': '邦戈铃',
-  'Congas': '康加鼓',
-  'Guiro': '刮壶',
-  'Guitar Fret Noise': '吉他换把杂音',
-  'Breath Noise': '呼吸声',
-  'Seashore': '海浪声',
-  'Bird Tweet': '鸟鸣',
-  'Telephone Ring': '电话铃',
-  'Helicopter': '直升机',
-  'Applause': '鼓掌声',
-  'Gunshot': '枪声',
-  'Acoustic Bass Drum': '大鼓',
-  'Bass Drum': '大鼓',
-  'Side Drum': '小鼓鼓边',
-  'Acoustic Snare': '小鼓',
-  'Hand Claps': '拍手',
-  'Electric Snare': '小鼓',
-  'Low Floor Tom': '低音嗵鼓',
-  'Closed Hi-Hat': '闭合踩镲',
-  'High Floor Tom': '高音落地嗵鼓',
-  'Pedal Hi-Hat': '脚踏踩镲',
-  'Low Tom': '低音嗵鼓',
-  'Open Hi-Hat': '开音踩镲',
-  'Low-Mid Tom': '中低音嗵鼓',
-  'Hi Mid Tom': '高音鼓',
-  'Crash Cymbals': '对镲',
-  'High Tom': '高音嗵鼓',
-  'Ride Cymbals': '叮叮镲',
-  'Chinese Cymbals': '中国镲',
-  'Ride Bell': '圆铃',
-  'Tambourine': '铃鼓',
-  'Splash Cymbal': '溅音镲',
-  'Cowbell': '牛铃',
-  'Crash Cymbal': '强音钹',
-  'Vibra-Slap': '颤音器',
-  'Ride Cymbal': '打点钹',
-  'Hi Bongo': '高音邦戈鼓',
-  'Low Bongo': '低音邦戈鼓',
-  'Mute Hi Conga': '弱音高音康加鼓',
-  'Open Hi Conga': '强音高音康加鼓',
-  'Low Conga': '低音康加鼓',
-  'High Timbale': '高音天巴鼓',
-  'Low Timbale': '低音天巴鼓',
-  'High Agogo': '高音阿戈戈铃',
-  'Low Agogo': '低音阿戈戈铃',
-  'Cabasa': '卡巴萨',
-  'Maracas': '沙锤',
-  'Short Whistle': '短口哨',
-  'Long Whistle': '长口哨',
-  'Short Guiro': '短刮壶',
-  'Long Guiro': '长刮壶',
-  'Claves': '响棒',
-  'Hi Wood Block': '高音木鱼',
-  'Low Wood Block': '低音木鱼',
-  'Mute Triangle': '弱音三角铁',
-  'Open Triangle': '强音三角铁',
-  'Drum Set': '架子鼓',
-  'Hulusi flute': '葫芦丝',
-  'Melodica': '口风琴',
-  'Snare Drum': '小军鼓',
-  'Horn in F': '圆号',
-  'Triangle': '三角铁',
-  'Vibrato': '颤音琴',
-  'Suspend Cymbals': '吊镲',
-  'Suspended Cymbals': '吊镲',
-  'Tom-Toms': '嗵嗵鼓',
-  'Bell': '铃铛',
-  'Bells': '铃铛',
-  'Alto Clarinet': '中音单簧管',
-  'Bass Clarinet': '低音单簧管',
-  'Clarinet': '单簧管',
-  'Cornet': '短号',
-  'Euphonium': '上低音号',
-  'crash cymbals': '对镲',
-  'Castanets': '响板',
-  'Shaker': '沙锤',
-  'Mark tree': '音树',
-  'Chimes': '管钟',
-  'Mark Tree': '音树',
-  'Tom-toms': '嗵嗵鼓',
-  'Hi-Hat': '踩镲',
-  'Sleigh Bells': '雪橇铃',
-  'Flexatone': '弹音器',
-  'Brake drum': '闸鼓',
-  'Gong': '锣',
-  'concert tom': '音乐会嗵嗵鼓',
-  'brake drum': '车轮鼓',
-  'finger cymbal': '指钹',
-  'ride cymbal': '叮叮镲',
-  'Concert Toms': '音乐会嗵嗵鼓',
-  'Vibraslap': '弹音器',
-  'Wood Blocks': '木鱼',
-  'Temple Blocks': '木鱼',
-  'Wood Block': '木鱼',
-  'Field Drum': '军鼓',
-  'Quad-Toms': '筒鼓',
-  'Quads': '筒鼓',
-  'Drums set': '架子鼓',
-  'High Bongo': '邦戈',
-  'Timbales': '天巴鼓',
-  'rain stick': '雨棒',
-  'String Bass': '弦乐低音',
-  'Floor Tom': '侧嗵鼓',
-  'Brake Drum': '闸鼓',
-  'Tam-tam': '大锣',
-  'Cymbal': '镲',
-  'Cymbals': '镲',
-}
+// const instruments: { [_: string]: any } = {
+//   'Acoustic Grand Piano': '大钢琴',
+//   'Bright Acoustic Piano': '明亮的钢琴',
+//   'Electric Grand Piano': '电钢琴',
+//   'Rhodes Piano': '柔和的电钢琴',
+//   'Chorused Piano': '加合唱效果的电钢琴',
+//   'Harpsichord': '羽管键琴',
+//   'Clavichord': '科拉维科特琴',
+//   'Celesta': '钢片琴',
+//   'Glockenspiel': '钢片琴',
+//   'Music box': '八音盒',
+//   'Vibraphone': '颤音琴',
+//   'Marimba': '马林巴',
+//   'Xylophone': '木琴',
+//   'Tubular Bells': '管钟',
+//   'Dulcimer': '大扬琴',
+//   'Hammond Organ': '击杆风琴',
+//   'Percussive Organ': '打击式风琴',
+//   'Rock Organ': '摇滚风琴',
+//   'Church Organ': '教堂风琴',
+//   'Reed Organ': '簧管风琴',
+//   'Accordian': '手风琴',
+//   'Harmonica': '口琴',
+//   'Tango Accordian': '探戈手风琴',
+//   'Acoustic Guitar': '钢弦吉他',
+//   'Electric Guitar': '闷音电吉他',
+//   'Overdriven Guitar': '加驱动效果的电吉他',
+//   'Distortion Guitar': '加失真效果的电吉他',
+//   'Guitar Harmonics': '吉他和音',
+//   'Acoustic Bass': '大贝司',
+//   'Electric Bass': '电贝司',
+//   'Fretless Bass': '无品贝司',
+//   'Slap Bass': '掌击',
+//   'Synth Bass': '电子合成',
+//   'Violin': '小提琴',
+//   'Viola': '中提琴',
+//   'Cello': '大提琴',
+//   'Contrabass': '低音大提琴',
+//   'Tremolo Strings': '弦乐群颤音音色',
+//   'Pizzicato Strings': '弦乐群拨弦音色',
+//   'Orchestral Harp': '竖琴',
+//   'Timpani': '定音鼓',
+//   'String Ensemble': '弦乐合奏音色',
+//   'Synth Strings': '合成弦乐合奏音色',
+//   'Choir Aahs': '人声合唱',
+//   'Voice Oohs': '人声',
+//   'Synth Voice': '合成人声',
+//   'Orchestra Hit': '管弦乐敲击齐奏',
+//   'Trumpet': '小号',
+//   'Trombone': '长号',
+//   'Tuba': '大号',
+//   'Muted Trumpet': '加弱音器小号',
+//   'French Horn': '法国号',
+//   'Brass Section': '铜管组',
+//   'Synth Brass': '合成铜管音色',
+//   'Soprano Sax': '高音萨克斯管',
+//   'Alto Sax': '中音萨克斯管',
+//   'Tenor Sax': '次中音萨克斯管',
+//   'Baritone Sax': '低音萨克斯管',
+//   'Oboe': '双簧管',
+//   'English Horn': '英国管',
+//   'Bassoon': '巴松',
+//   'Soprano Saxophone': '高音萨克斯管',
+//   'Alto Saxophone': '中音萨克斯管',
+//   'Tenor Saxophone': '次中音萨克斯管',
+//   'Baritone Saxophone': '低音萨克斯管',
+//   'Piccolo': '短笛',
+//   'Flute': '长笛',
+//   'Recorder': '竖笛',
+//   'Soprano Recorder': '高音竖笛',
+//   'Pan Flute': '排箫',
+//   'Bottle Blow': '瓶木管',
+//   'Whistle': '口哨声',
+//   'Ocarina': '陶笛',
+//   'Lead': '合成主音',
+//   'Lead lead': '合成主音',
+//   'Pad age': '合成音色',
+//   'Pad': '合成音色',
+//   'FX': '合成效果  科幻',
+//   'Sitar': '西塔尔',
+//   'Banjo': '班卓琴',
+//   'Shamisen': '三昧线',
+//   'Koto': '十三弦筝',
+//   'Kalimba': '卡林巴',
+//   'Bagpipe': '风笛',
+//   'Fiddle': '民族提琴',
+//   'Shanai': '山奈',
+//   'Tinkle Bell': '叮当铃',
+//   'Agogos': '阿戈戈铃',
+//   'Steel Drums': '钢鼓',
+//   'Taiko Drum': '太鼓',
+//   'Melodic Toms': '嗵嗵鼓',
+//   'Synth Drums': '合成鼓',
+//   'Reverse Cymbals': '反向镲',
+//   'Agogo Bells': '阿戈戈铃',
+//   'Taiko Drums': '太鼓',
+//   'Bongos': '邦戈鼓',
+//   'Bongo Bell': '邦戈铃',
+//   'Congas': '康加鼓',
+//   'Guiro': '刮壶',
+//   'Guitar Fret Noise': '吉他换把杂音',
+//   'Breath Noise': '呼吸声',
+//   'Seashore': '海浪声',
+//   'Bird Tweet': '鸟鸣',
+//   'Telephone Ring': '电话铃',
+//   'Helicopter': '直升机',
+//   'Applause': '鼓掌声',
+//   'Gunshot': '枪声',
+//   'Acoustic Bass Drum': '大鼓',
+//   'Bass Drum': '大鼓',
+//   'Side Drum': '小鼓鼓边',
+//   'Acoustic Snare': '小鼓',
+//   'Hand Claps': '拍手',
+//   'Electric Snare': '小鼓',
+//   'Low Floor Tom': '低音嗵鼓',
+//   'Closed Hi-Hat': '闭合踩镲',
+//   'High Floor Tom': '高音落地嗵鼓',
+//   'Pedal Hi-Hat': '脚踏踩镲',
+//   'Low Tom': '低音嗵鼓',
+//   'Open Hi-Hat': '开音踩镲',
+//   'Low-Mid Tom': '中低音嗵鼓',
+//   'Hi Mid Tom': '高音鼓',
+//   'Crash Cymbals': '对镲',
+//   'High Tom': '高音嗵鼓',
+//   'Ride Cymbals': '叮叮镲',
+//   'Chinese Cymbals': '中国镲',
+//   'Ride Bell': '圆铃',
+//   'Tambourine': '铃鼓',
+//   'Splash Cymbal': '溅音镲',
+//   'Cowbell': '牛铃',
+//   'Crash Cymbal': '强音钹',
+//   'Vibra-Slap': '颤音器',
+//   'Ride Cymbal': '打点钹',
+//   'Hi Bongo': '高音邦戈鼓',
+//   'Low Bongo': '低音邦戈鼓',
+//   'Mute Hi Conga': '弱音高音康加鼓',
+//   'Open Hi Conga': '强音高音康加鼓',
+//   'Low Conga': '低音康加鼓',
+//   'High Timbale': '高音天巴鼓',
+//   'Low Timbale': '低音天巴鼓',
+//   'High Agogo': '高音阿戈戈铃',
+//   'Low Agogo': '低音阿戈戈铃',
+//   'Cabasa': '卡巴萨',
+//   'Maracas': '沙锤',
+//   'Short Whistle': '短口哨',
+//   'Long Whistle': '长口哨',
+//   'Short Guiro': '短刮壶',
+//   'Long Guiro': '长刮壶',
+//   'Claves': '响棒',
+//   'Hi Wood Block': '高音木鱼',
+//   'Low Wood Block': '低音木鱼',
+//   'Mute Triangle': '弱音三角铁',
+//   'Open Triangle': '强音三角铁',
+//   'Drum Set': '架子鼓',
+//   'Hulusi flute': '葫芦丝',
+//   'Melodica': '口风琴',
+//   'Snare Drum': '小军鼓',
+//   'Horn in F': '圆号',
+//   'Triangle': '三角铁',
+//   'Vibrato': '颤音琴',
+//   'Suspend Cymbals': '吊镲',
+//   'Suspended Cymbals': '吊镲',
+//   'Tom-Toms': '嗵嗵鼓',
+//   'Bell': '铃铛',
+//   'Bells': '铃铛',
+//   'Alto Clarinet': '中音单簧管',
+//   'Bass Clarinet': '低音单簧管',
+//   'Clarinet': '单簧管',
+//   'Cornet': '短号',
+//   'Euphonium': '上低音号',
+//   'crash cymbals': '对镲',
+//   'Castanets': '响板',
+//   'Shaker': '沙锤',
+//   'Mark tree': '音树',
+//   'Chimes': '管钟',
+//   'Mark Tree': '音树',
+//   'Tom-toms': '嗵嗵鼓',
+//   'Hi-Hat': '踩镲',
+//   'Sleigh Bells': '雪橇铃',
+//   'Flexatone': '弹音器',
+//   'Brake drum': '闸鼓',
+//   'Gong': '锣',
+//   'concert tom': '音乐会嗵嗵鼓',
+//   'brake drum': '车轮鼓',
+//   'finger cymbal': '指钹',
+//   'ride cymbal': '叮叮镲',
+//   'Concert Toms': '音乐会嗵嗵鼓',
+//   'Vibraslap': '弹音器',
+//   'Wood Blocks': '木鱼',
+//   'Temple Blocks': '木鱼',
+//   'Wood Block': '木鱼',
+//   'Field Drum': '军鼓',
+//   'Quad-Toms': '筒鼓',
+//   'Quads': '筒鼓',
+//   'Drums set': '架子鼓',
+//   'High Bongo': '邦戈',
+//   'Timbales': '天巴鼓',
+//   'rain stick': '雨棒',
+//   'String Bass': '弦乐低音',
+//   'Floor Tom': '侧嗵鼓',
+//   'Brake Drum': '闸鼓',
+//   'Tam-tam': '大锣',
+//   'Cymbal': '镲',
+//   'Cymbals': '镲',
+// }
+
+export let instruments: any = {}
 
 /**
  * 获取乐器名称
  * @param instrumentName 乐器code
  * @returns
  */
-export const getInstrumentName = (instrumentName: string) => {
-  const _instrumentName = instrumentName.replace(/ /g, ' ').toLocaleLowerCase()
-  const _instrument = Object.keys(instruments)
-  for (let i = 0; i < _instrument.length; i++) {
-    const _name = _instrument[i].replace(/ /g, ' ').toLocaleLowerCase()
-    if (_name === _instrumentName) {
-      return instruments[_instrument[i]] || ''
-    }
-  }
-  for (let i = 0; i < _instrument.length; i++) {
-    const _name = _instrument[i].replace(/ /g, ' ').toLocaleLowerCase()
-    if (_instrumentName.includes(_name)) {
-      return instruments[_instrument[i]] || ''
-    }
-  }
-  return ''
-}
+export const getInstrumentName = (name = '') => {
+	name = name.toLocaleLowerCase().replace(/ /g, '')
+	if (!name) return ''
+	// 全匹配声轨名称
+	for(let key in instruments){
+	  const _key = key.toLocaleLowerCase().replace(/ /g, '')
+	  if (_key === name){
+		return instruments[key]
+	  }
+	}
+	// 用返回的code模糊匹配传入的xml声轨名称name
+	for(let key in instruments){
+	  const _key = key.toLocaleLowerCase().replace(/ /g, '')
+	  if (name.includes(_key)){
+		return instruments[key]
+	  }
+	}
+  //   for(let key in instruments){
+  //     const _key = key.toLocaleLowerCase().replace(/ /g, '')
+  //     if (name.includes(_key)){
+  //       return instruments[key]
+  //     }
+  //   }
+	return ''
+  };

src/subpages/colexiu/uses/use-app.ts

@@ -16,8 +16,8 @@ import { evaluatStopPlay } from '../buttons/evaluating'
 import state from '/src/pages/detail/state'
 import { getGradualLengthByXml } from '/src/pages/detail/calcSpeed'
 import { musicInfo } from '../state'
-import { getInstrumentName } from '../helpers/instruments'
 import { metronomeData } from '/src/helpers/metronome'
+import { getInstrumentName, instruments } from '../helpers/instruments'
 
 const search = useOriginSearch()
 const skpList = ['Ukulele']
@@ -167,6 +167,30 @@ export const useSpecialShapedScreen = () => {
   return [heightRef]
 }
 
+
+// 获取后台配置的声轨编码
+const initInstrumentCode = async () => {
+  const prefix = getRequestHostname()
+  request
+  .get(`/musicSheet/instrumentCode`, {
+    prefix: prefix,
+  }).then((res) => {
+    if (res?.code === 200 && res.data?.length) {
+      for (let item of res.data) {
+        const codes = item.code.split(',') || [item.code]
+        codes.forEach((code: any) => {
+          instruments[code] = item.name
+        })
+      }
+    }
+  })
+  .catch((error) => {
+    // 
+  })
+  // console.log('声轨codes',instruments)
+}
+
+
 /**
  * 获取当前曲目信息
  * @param id 歌曲id
@@ -176,11 +200,17 @@ export const useDetail = (id: number | string): [Ref<ShaeetStatusType>, Ref<Musi
   const status = ref<ShaeetStatusType>('loading')
   const data = ref<MusicSheelDetail>({})
   status.value = 'loading'
+  console.log('获取详情')
   request
     .get(`/musicSheet/detail/${id}`, {
       prefix: prefix,
     })
     .then((res) => {
+      try {
+        initInstrumentCode()
+      } catch (error) {
+        //
+      }
       useMp3s(res.data)
       data.value = {
         ...res.data,

vite.config.js

@@ -5,7 +5,7 @@ import glsl from 'vite-plugin-glsl'
 const vueJsx = require('@vitejs/plugin-vue-jsx')
 const legacy = require('@vitejs/plugin-legacy')
 
-const proxyUrl = 'https://dev.lexiaoya.cn/' // test 环境
+const proxyUrl = 'https://test.lexiaoya.cn/' // test 环境
 // const proxyUrl = 'http://192.168.3.70:8989/' // test 环境
 // const proxyUrl = 'https://online.colexiu.com/' // online 环境