Merge branch 'feature-12.11' into gyt-test

dist/assets/arrow-left-legacy.02402b67.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.aad5f8a6.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.efcc2346.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.7fe5ecd0.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.02402b67.js

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

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.aad5f8a6.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.efcc2346.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.7fe5ecd0.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.02402b67.js

dist/assets/arrow-left.606dae12.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.ad646568.js
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.cb09ca29.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.304ff637.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.606dae12.js

dist/assets/arrow-left.ad646568.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.ad646568.js
 import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.cb09ca29.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.304ff637.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.606dae12.js

dist/assets/colexiu-legacy.b754ce20.js

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

dist/assets/colexiu.8d4b9cc4.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.8d4b9cc4.js
 import"./App.cb09ca29.js";import"./main.78a8b988.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.304ff637.js";import"./main.409586b2.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/colexiu.dd1e9eaa.js

dist/assets/colexiu.dd1e9eaa.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.8d4b9cc4.js
+import"./App.cb09ca29.js";import"./main.78a8b988.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.304ff637.js";import"./main.409586b2.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/colexiu.dd1e9eaa.js

dist/assets/index-legacy.96faf311.js

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

dist/assets/index-legacy.fa119f66.js

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

dist/assets/index.08514dce.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.08514dce.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.cb09ca29.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.304ff637.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.679bd84b.js

dist/assets/index.38a7bbe4.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.83ea492c.js
+import"./App.cb09ca29.js";import"./main.78a8b988.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.304ff637.js";import"./main.409586b2.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/index.38a7bbe4.js

dist/assets/index.569962bb.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.569962bb.js
 import{r,b as n,d as l,a as t,R as i,U as u}from"./App.cb09ca29.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.304ff637.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.593892f8.js

dist/assets/index.593892f8.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.569962bb.js
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.cb09ca29.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.304ff637.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.593892f8.js

dist/assets/index.679bd84b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.08514dce.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.cb09ca29.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.304ff637.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.679bd84b.js

dist/assets/index.83ea492c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.83ea492c.js
 import"./App.cb09ca29.js";import"./main.78a8b988.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.304ff637.js";import"./main.409586b2.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/index.38a7bbe4.js

dist/assets/index.90d9b92c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.90d9b92c.js
 import{d as r,a as e,B as t,g as a,K as o}from"./App.cb09ca29.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.304ff637.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.a19c94b5.js

dist/assets/index.a19c94b5.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.90d9b92c.js
+import{d as r,a as e,B as t,g as a,K as o}from"./App.cb09ca29.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.304ff637.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.a19c94b5.js

dist/assets/index.b5717f9b.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.b5717f9b.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.cb09ca29.js";import{I as u}from"./index.08514dce.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.304ff637.js";import{I as u}from"./index.679bd84b.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.e687e1f4.js

dist/assets/index.e687e1f4.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.b5717f9b.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.cb09ca29.js";import{I as u}from"./index.08514dce.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.304ff637.js";import{I as u}from"./index.679bd84b.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.e687e1f4.js

dist/assets/orchestra-legacy.f5921a36.js

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

dist/assets/orchestra.6e820c40.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.6e820c40.js
 import"./App.cb09ca29.js";import"./main.78a8b988.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.304ff637.js";import"./main.409586b2.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/orchestra.89f3c71b.js

dist/assets/orchestra.89f3c71b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.6e820c40.js
+import"./App.cb09ca29.js";import"./main.78a8b988.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.304ff637.js";import"./main.409586b2.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-12.11:dist/assets/orchestra.89f3c71b.js

dist/assets/state-legacy.0a977c7c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.0a977c7c.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.efcc2346.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 c=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},i={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},u=e("g",(function(){return c(i)})),f=e("s",n(u()));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}}))}}}))}();
+========
+!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.7fe5ecd0.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.6f67d225.js

dist/assets/state-legacy.6f67d225.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.0a977c7c.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.efcc2346.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 c=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},i={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},u=e("g",(function(){return c(i)})),f=e("s",n(u()));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}}))}}}))}();
+========
+!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.7fe5ecd0.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.6f67d225.js

dist/assets/state.299d75d7.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.299d75d7.js
 import{O as l,w as o,Q as r}from"./App.cb09ca29.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.304ff637.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.8fff61ec.js

dist/assets/state.8fff61ec.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.299d75d7.js
+import{O as l,w as o,Q as r}from"./App.cb09ca29.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.304ff637.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.8fff61ec.js

dist/assets/vip.9c904772.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.b10567a1.js
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.cb09ca29.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.304ff637.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.9c904772.js

dist/assets/vip.b10567a1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.b10567a1.js
 import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.cb09ca29.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.304ff637.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.9c904772.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.a73253a3.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -129,6 +130,18 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.299d75d7.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.64ac52c0.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.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.606dae12.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.593892f8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.28b9064f.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.8fff61ec.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.5dc30b70.css">
+>>>>>>> feature-12.11
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
@@ -193,7 +206,12 @@
   </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.9953f350.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.c8bf63c1.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.7e9f0433.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.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.8bf8dd09.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.299d75d7.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.2c32de2f.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.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.606dae12.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.593892f8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.28b9064f.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.8fff61ec.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">
@@ -125,8 +137,13 @@
   </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.bded964d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.8d43a6c8.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.d2eb3868.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.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.08514dce.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.b65e0a69.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.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.679bd84b.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>
@@ -83,7 +92,12 @@
   </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.65bd48e5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.a6a75559.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.8d4b9cc4.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/main.78a8b988.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.dd1e9eaa.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/main.409586b2.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>
@@ -220,7 +228,12 @@
     </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.e5e12829.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.b754ce20.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.5af36110.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.569962bb.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.ca2fc888.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.593892f8.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">
@@ -183,7 +191,12 @@
   </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.081f58e3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.b664ddbb.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.83ea492c.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.78a8b988.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/index.38a7bbe4.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.409586b2.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>
@@ -96,8 +104,13 @@
   </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.8857ddc0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.fa119f66.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.3e999574.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.c08ea161.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.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>
@@ -218,7 +224,12 @@
     </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.37ef8164.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.fa46823e.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.6e820c40.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.cb09ca29.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.78a8b988.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.2f94d1bd.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.89f3c71b.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.304ff637.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.409586b2.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>
@@ -96,8 +104,13 @@
   </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="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.24a9419a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e65e4f45.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.f5921a36.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-12.11
 </body>
 
 </html>

osmd-extended/src/MusicalScore/ScoreIO/MusicSymbolModules/ExpressionReader.ts

@@ -182,7 +182,8 @@ export class ExpressionReader {
         }
         let dirContentNode: IXmlElement = dirNode.element("metronome");
         if (dirContentNode) {
-            currentMeasure.metronomeNoteIndex = noteIndex;
+            // osmd1.4.5版本，修复开始变速的小节如果是休止符，iterator.currentMeasure可能不存在的情况，变速小节的metronomeNoteIndex应该从0开始
+            currentMeasure.metronomeNoteIndex = 0;
             // console.log(this, directionNode, currentMeasure, noteIndex);
             const beatUnit: IXmlElement = dirContentNode.element("beat-unit");
             // TODO check second "beat-unit", e.g. quarter = half

src/pages/detail/helpers.ts

@@ -130,6 +130,24 @@ const speedInfo: { [key in string]: number } = {
   'poco accel.': 0.8,
 }
 
+export const unitObj = {
+  "1/1": 1 / 1,
+  "1/2": 1 / 2,
+  "1/4": 1 / 4,
+  "1/8": 1 / 8,
+  "1/16": 1 / 16,
+  "1/2.": (1 / 2) * 1.5,
+  "1/4.": (1 / 4) * 1.5,
+  "1/8.": (1 / 8) * 1.5
+} as Record<string, any>
+
+/**
+* 速度转换，几分音符的速度转为几分音符的速度
+*/
+export const speedBeatTo = (speedBeat: { unit: string; speed: number }, unit: string) => {
+  return (unitObj[speedBeat.unit] * speedBeat.speed) / unitObj[unit]
+}
+
 /** 按照dorico的渐快渐慢生成对应的速度 */
 export const createSpeedInfo = (gradualChange: GradualChange | undefined, speed: number) => {
   if (gradualChange && speedInfo[gradualChange.startWord?.toLocaleLowerCase()]) {

src/pages/detail/state.ts

@@ -98,6 +98,8 @@ const state = reactive({
   playSpeed: 0 as any,
   /** 后台设置的速度,（临时用） */
   temporarySpeed: 0 as any,
+  /** 谱面的速度节拍 */
+  speedBeatUnit: "1/4",
 })
 
 export const isRhythmicExercises = (musicName?: string) => {