mo 2 years ago
parent
commit
62896f4fe2
66 changed files with 173 additions and 2 deletions
  1. 1 0
      dist/assets/colexiu-a0c925e6.js
  2. 1 0
      dist/assets/colexiu-a671614e.js
  3. 1 0
      dist/assets/colexiu-legacy-0ae0f844.js
  4. 1 0
      dist/assets/colexiu-legacy-3aa4f81b.js
  5. 4 0
      dist/assets/index-050d88b8.js
  6. 1 0
      dist/assets/index-138bff71.js
  7. 1 0
      dist/assets/index-1aeefbee.js
  8. 1 0
      dist/assets/index-1ef01765.js
  9. 5 0
      dist/assets/index-21478098.js
  10. 1 0
      dist/assets/index-2232562f.js
  11. 5 0
      dist/assets/index-3156a775.js
  12. 4 0
      dist/assets/index-358b1070.js
  13. 4 0
      dist/assets/index-3598418a.js
  14. 5 0
      dist/assets/index-3c876b5f.js
  15. 1 0
      dist/assets/index-4dde8f6f.js
  16. 1 0
      dist/assets/index-5a135da1.js
  17. 0 0
      dist/assets/index-709163f8.js
  18. 5 0
      dist/assets/index-79b23b33.js
  19. 1 0
      dist/assets/index-80f25595.js
  20. 1 0
      dist/assets/index-84eec2af.js
  21. 0 0
      dist/assets/index-afd188ef.js
  22. 4 0
      dist/assets/index-d773fdb2.js
  23. 1 0
      dist/assets/index-f0ab7aa9.js
  24. 1 0
      dist/assets/index-legacy-25fac8a8.js
  25. 5 0
      dist/assets/index-legacy-2b5f75d2.js
  26. 1 0
      dist/assets/index-legacy-327215da.js
  27. 1 0
      dist/assets/index-legacy-35464aab.js
  28. 1 0
      dist/assets/index-legacy-5267a6e7.js
  29. 1 0
      dist/assets/index-legacy-58aa8478.js
  30. 5 0
      dist/assets/index-legacy-6153a1ad.js
  31. 1 0
      dist/assets/index-legacy-6803deff.js
  32. 4 0
      dist/assets/index-legacy-6e38dad1.js
  33. 0 0
      dist/assets/index-legacy-75784316.js
  34. 1 0
      dist/assets/index-legacy-77a99b5b.js
  35. 0 0
      dist/assets/index-legacy-7c2ed44f.js
  36. 4 0
      dist/assets/index-legacy-8b7b3f0d.js
  37. 1 0
      dist/assets/index-legacy-afe1ae11.js
  38. 1 0
      dist/assets/index-legacy-b98b893d.js
  39. 1 0
      dist/assets/index-legacy-ba63f594.js
  40. 1 0
      dist/assets/index-legacy-dd3a635f.js
  41. 5 0
      dist/assets/index-legacy-def6d30e.js
  42. 4 0
      dist/assets/index-legacy-e0d024de.js
  43. 1 0
      dist/assets/instrument-9aef44bf.js
  44. 1 0
      dist/assets/instrument-c3793ba9.js
  45. 1 0
      dist/assets/instrument-legacy-59b5f851.js
  46. 1 0
      dist/assets/instrument-legacy-8553037b.js
  47. 1 0
      dist/assets/orchestra-12bc4faf.js
  48. 1 0
      dist/assets/orchestra-d310756e.js
  49. 1 0
      dist/assets/orchestra-legacy-9a29e58b.js
  50. 1 0
      dist/assets/orchestra-legacy-b1118668.js
  51. 1 0
      dist/assets/polyfills-legacy-72e42ccb.js
  52. 1 0
      dist/assets/polyfills-legacy-b6148d1f.js
  53. 1 0
      dist/assets/report-share-6e34dcde.js
  54. 1 0
      dist/assets/report-share-849b09f5.js
  55. 1 0
      dist/assets/report-share-legacy-2d0d2bc0.js
  56. 1 0
      dist/assets/report-share-legacy-96290878.js
  57. 1 0
      dist/assets/vue3-lottie.es-536ea5c1.js
  58. 1 0
      dist/assets/vue3-lottie.es-cd173f34.js
  59. 1 0
      dist/assets/vue3-lottie.es-legacy-0fc1ad93.js
  60. 1 0
      dist/assets/vue3-lottie.es-legacy-78339466.js
  61. 13 0
      dist/colexiu.html
  62. 14 0
      dist/index.html
  63. 14 0
      dist/instrument.html
  64. 15 0
      dist/orchestra.html
  65. 10 0
      dist/report-share.html
  66. 2 2
      src/page-instrument/header-top/index.tsx

File diff suppressed because it is too large
+ 1 - 0
dist/assets/colexiu-a0c925e6.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/colexiu-a671614e.js


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


File diff suppressed because it is too large
+ 1 - 0
dist/assets/colexiu-legacy-3aa4f81b.js


+ 4 - 0
dist/assets/index-050d88b8.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-050d88b8.js
 import{c as S,o as E,q as L,t as w,d as B,r as h,bC as R,x as m,bD as N,M as F,g as M,h as _,j as r,A as j,bE as b,bF as q,L as y,C as A}from"./index-84eec2af.js";import{u as D}from"./index-80f25595.js";const[H,o,I]=S("list"),U={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var V=B({name:H,props:U,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},C=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||I("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,C(),T(),P(),e.direction==="up"?l:i])}}});const J=A(V);export{J as L};
+========
+import{c as S,o as E,q as L,t as w,d as B,r as h,bC as R,x as m,bD as N,M as F,g as M,h as _,j as r,A as j,bE as b,bF as q,L as y,C as A}from"./index-afd188ef.js";import{u as D}from"./index-1ef01765.js";const[H,o,I]=S("list"),U={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var V=B({name:H,props:U,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},C=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||I("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,C(),T(),P(),e.direction==="up"?l:i])}}});const J=A(V);export{J as L};
+>>>>>>>> guide:dist/assets/index-3156a775.js

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


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


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


+ 5 - 0
dist/assets/index-21478098.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-3598418a.js
+import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-84eec2af.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+========
+import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-afd188ef.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+>>>>>>>> guide:dist/assets/index-21478098.js

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


+ 5 - 0
dist/assets/index-3156a775.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-050d88b8.js
+import{c as S,o as E,q as L,t as w,d as B,r as h,bC as R,x as m,bD as N,M as F,g as M,h as _,j as r,A as j,bE as b,bF as q,L as y,C as A}from"./index-84eec2af.js";import{u as D}from"./index-80f25595.js";const[H,o,I]=S("list"),U={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var V=B({name:H,props:U,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},C=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||I("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,C(),T(),P(),e.direction==="up"?l:i])}}});const J=A(V);export{J as L};
+========
+import{c as S,o as E,q as L,t as w,d as B,r as h,bC as R,x as m,bD as N,M as F,g as M,h as _,j as r,A as j,bE as b,bF as q,L as y,C as A}from"./index-afd188ef.js";import{u as D}from"./index-1ef01765.js";const[H,o,I]=S("list"),U={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var V=B({name:H,props:U,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},C=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||I("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,C(),T(),P(),e.direction==="up"?l:i])}}});const J=A(V);export{J as L};
+>>>>>>>> guide:dist/assets/index-3156a775.js

+ 4 - 0
dist/assets/index-358b1070.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-358b1070.js
 import{d as f,F as y,V as h,bx as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-84eec2af.js";import{s as x}from"./instrument-9aef44bf.js";import"./vue3-lottie.es-536ea5c1.js";import"./index-80f25595.js";import"./index-4dde8f6f.js";import"./index-050d88b8.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=x(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+========
+import{d as f,F as y,V as h,bx as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-afd188ef.js";import{s as x}from"./instrument-c3793ba9.js";import"./vue3-lottie.es-cd173f34.js";import"./index-1ef01765.js";import"./index-f0ab7aa9.js";import"./index-3156a775.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=x(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+>>>>>>>> guide:dist/assets/index-79b23b33.js

+ 4 - 0
dist/assets/index-3598418a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-3598418a.js
 import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-84eec2af.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+========
+import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-afd188ef.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+>>>>>>>> guide:dist/assets/index-21478098.js

+ 5 - 0
dist/assets/index-3c876b5f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-d773fdb2.js
+import{d as i,F as l,V as d,bx as e,M as r,U as c,j as s,aJ as u}from"./index-84eec2af.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+========
+import{d as i,F as l,V as d,bx as e,M as r,U as c,j as s,aJ as u}from"./index-afd188ef.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+>>>>>>>> guide:dist/assets/index-3c876b5f.js

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


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


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


+ 5 - 0
dist/assets/index-79b23b33.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-358b1070.js
+import{d as f,F as y,V as h,bx as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-84eec2af.js";import{s as x}from"./instrument-9aef44bf.js";import"./vue3-lottie.es-536ea5c1.js";import"./index-80f25595.js";import"./index-4dde8f6f.js";import"./index-050d88b8.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=x(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+========
+import{d as f,F as y,V as h,bx as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-afd188ef.js";import{s as x}from"./instrument-c3793ba9.js";import"./vue3-lottie.es-cd173f34.js";import"./index-1ef01765.js";import"./index-f0ab7aa9.js";import"./index-3156a775.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=x(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+>>>>>>>> guide:dist/assets/index-79b23b33.js

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


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


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


+ 4 - 0
dist/assets/index-d773fdb2.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-d773fdb2.js
 import{d as i,F as l,V as d,bx as e,M as r,U as c,j as s,aJ as u}from"./index-84eec2af.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+========
+import{d as i,F as l,V as d,bx as e,M as r,U as c,j as s,aJ as u}from"./index-afd188ef.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+>>>>>>>> guide:dist/assets/index-3c876b5f.js

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


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


+ 5 - 0
dist/assets/index-legacy-2b5f75d2.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-8b7b3f0d.js
+System.register(["./index-legacy-58aa8478.js","./index-legacy-6803deff.js"],(function(e,i){"use strict";var r,t,o,n,d,l,a,s,c,u,f,g,h,v,p,x,b,m,T;return{setters:[e=>{r=e.c,t=e.o,o=e.q,n=e.t,d=e.d,l=e.r,a=e.bC,s=e.x,c=e.bD,u=e.M,f=e.g,g=e.h,h=e.j,v=e.A,p=e.bE,x=e.bF,b=e.L,m=e.C},e=>{T=e.u}],execute:function(){const[i,C,k]=r("list"),y={error:Boolean,offset:t(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:o("down"),loadingText:String,finishedText:String,immediateCheck:n};var B=d({name:i,props:y,emits:["load","update:error","update:loading"],setup(e,{emit:i,slots:r}){const t=l(e.loading),o=l(),n=l(),d=T(),m=a(o),y=()=>{v((()=>{if(t.value||e.finished||e.disabled||e.error||!1===(null==d?void 0:d.value))return;const{direction:r}=e,l=+e.offset,a=p(m);if(!a.height||x(o))return;let s=!1;const c=p(n);s="up"===r?a.top-c.top<=l:c.bottom-a.bottom<=l,s&&(t.value=!0,i("update:loading",!0),i("load"))}))},B=()=>{if(e.finished){const i=r.finished?r.finished():e.finishedText;if(i)return h("div",{class:C("finished-text")},[i])}},S=()=>{i("update:error",!1),y()},j=()=>{if(e.error){const i=r.error?r.error():e.errorText;if(i)return h("div",{role:"button",class:C("error-text"),tabindex:0,onClick:S},[i])}},w=()=>{if(t.value&&!e.finished&&!e.disabled)return h("div",{class:C("loading")},[r.loading?r.loading():h(b,{class:C("loading-icon")},{default:()=>[e.loadingText||k("loading")]})])};return s((()=>[e.loading,e.finished,e.error]),y),d&&s(d,(e=>{e&&y()})),c((()=>{t.value=e.loading})),u((()=>{e.immediateCheck&&y()})),f({check:y}),g("scroll",y,{target:m,passive:!0}),()=>{var i;const d=null==(i=r.default)?void 0:i.call(r),l=h("div",{ref:n,class:C("placeholder")},null);return h("div",{ref:o,role:"feed",class:C(),"aria-busy":t.value},["down"===e.direction?d:l,w(),B(),j(),"up"===e.direction?d:l])}}});e("L",m(B))}}}));
+========
+System.register(["./index-legacy-7c2ed44f.js","./index-legacy-b98b893d.js"],(function(e,i){"use strict";var r,t,o,n,d,l,a,s,c,u,f,g,h,v,p,x,b,m,T;return{setters:[e=>{r=e.c,t=e.o,o=e.q,n=e.t,d=e.d,l=e.r,a=e.bC,s=e.x,c=e.bD,u=e.M,f=e.g,g=e.h,h=e.j,v=e.A,p=e.bE,x=e.bF,b=e.L,m=e.C},e=>{T=e.u}],execute:function(){const[i,C,k]=r("list"),y={error:Boolean,offset:t(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:o("down"),loadingText:String,finishedText:String,immediateCheck:n};var B=d({name:i,props:y,emits:["load","update:error","update:loading"],setup(e,{emit:i,slots:r}){const t=l(e.loading),o=l(),n=l(),d=T(),m=a(o),y=()=>{v((()=>{if(t.value||e.finished||e.disabled||e.error||!1===(null==d?void 0:d.value))return;const{direction:r}=e,l=+e.offset,a=p(m);if(!a.height||x(o))return;let s=!1;const c=p(n);s="up"===r?a.top-c.top<=l:c.bottom-a.bottom<=l,s&&(t.value=!0,i("update:loading",!0),i("load"))}))},B=()=>{if(e.finished){const i=r.finished?r.finished():e.finishedText;if(i)return h("div",{class:C("finished-text")},[i])}},S=()=>{i("update:error",!1),y()},j=()=>{if(e.error){const i=r.error?r.error():e.errorText;if(i)return h("div",{role:"button",class:C("error-text"),tabindex:0,onClick:S},[i])}},w=()=>{if(t.value&&!e.finished&&!e.disabled)return h("div",{class:C("loading")},[r.loading?r.loading():h(b,{class:C("loading-icon")},{default:()=>[e.loadingText||k("loading")]})])};return s((()=>[e.loading,e.finished,e.error]),y),d&&s(d,(e=>{e&&y()})),c((()=>{t.value=e.loading})),u((()=>{e.immediateCheck&&y()})),f({check:y}),g("scroll",y,{target:m,passive:!0}),()=>{var i;const d=null==(i=r.default)?void 0:i.call(r),l=h("div",{ref:n,class:C("placeholder")},null);return h("div",{ref:o,role:"feed",class:C(),"aria-busy":t.value},["down"===e.direction?d:l,w(),B(),j(),"up"===e.direction?d:l])}}});e("L",m(B))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-2b5f75d2.js

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


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


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


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


+ 5 - 0
dist/assets/index-legacy-6153a1ad.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-6e38dad1.js
+System.register(["./index-legacy-58aa8478.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.F,a=e.V,o=e.bx,r=e.M,s=e.U,d=e.j,l=e.aJ}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-7c2ed44f.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.F,a=e.V,o=e.bx,r=e.M,s=e.U,d=e.j,l=e.aJ}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-6153a1ad.js

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


+ 4 - 0
dist/assets/index-legacy-6e38dad1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-6e38dad1.js
 System.register(["./index-legacy-58aa8478.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.F,a=e.V,o=e.bx,r=e.M,s=e.U,d=e.j,l=e.aJ}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-7c2ed44f.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.F,a=e.V,o=e.bx,r=e.M,s=e.U,d=e.j,l=e.aJ}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-6153a1ad.js

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


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


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


+ 4 - 0
dist/assets/index-legacy-8b7b3f0d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-8b7b3f0d.js
 System.register(["./index-legacy-58aa8478.js","./index-legacy-6803deff.js"],(function(e,i){"use strict";var r,t,o,n,d,l,a,s,c,u,f,g,h,v,p,x,b,m,T;return{setters:[e=>{r=e.c,t=e.o,o=e.q,n=e.t,d=e.d,l=e.r,a=e.bC,s=e.x,c=e.bD,u=e.M,f=e.g,g=e.h,h=e.j,v=e.A,p=e.bE,x=e.bF,b=e.L,m=e.C},e=>{T=e.u}],execute:function(){const[i,C,k]=r("list"),y={error:Boolean,offset:t(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:o("down"),loadingText:String,finishedText:String,immediateCheck:n};var B=d({name:i,props:y,emits:["load","update:error","update:loading"],setup(e,{emit:i,slots:r}){const t=l(e.loading),o=l(),n=l(),d=T(),m=a(o),y=()=>{v((()=>{if(t.value||e.finished||e.disabled||e.error||!1===(null==d?void 0:d.value))return;const{direction:r}=e,l=+e.offset,a=p(m);if(!a.height||x(o))return;let s=!1;const c=p(n);s="up"===r?a.top-c.top<=l:c.bottom-a.bottom<=l,s&&(t.value=!0,i("update:loading",!0),i("load"))}))},B=()=>{if(e.finished){const i=r.finished?r.finished():e.finishedText;if(i)return h("div",{class:C("finished-text")},[i])}},S=()=>{i("update:error",!1),y()},j=()=>{if(e.error){const i=r.error?r.error():e.errorText;if(i)return h("div",{role:"button",class:C("error-text"),tabindex:0,onClick:S},[i])}},w=()=>{if(t.value&&!e.finished&&!e.disabled)return h("div",{class:C("loading")},[r.loading?r.loading():h(b,{class:C("loading-icon")},{default:()=>[e.loadingText||k("loading")]})])};return s((()=>[e.loading,e.finished,e.error]),y),d&&s(d,(e=>{e&&y()})),c((()=>{t.value=e.loading})),u((()=>{e.immediateCheck&&y()})),f({check:y}),g("scroll",y,{target:m,passive:!0}),()=>{var i;const d=null==(i=r.default)?void 0:i.call(r),l=h("div",{ref:n,class:C("placeholder")},null);return h("div",{ref:o,role:"feed",class:C(),"aria-busy":t.value},["down"===e.direction?d:l,w(),B(),j(),"up"===e.direction?d:l])}}});e("L",m(B))}}}));
+========
+System.register(["./index-legacy-7c2ed44f.js","./index-legacy-b98b893d.js"],(function(e,i){"use strict";var r,t,o,n,d,l,a,s,c,u,f,g,h,v,p,x,b,m,T;return{setters:[e=>{r=e.c,t=e.o,o=e.q,n=e.t,d=e.d,l=e.r,a=e.bC,s=e.x,c=e.bD,u=e.M,f=e.g,g=e.h,h=e.j,v=e.A,p=e.bE,x=e.bF,b=e.L,m=e.C},e=>{T=e.u}],execute:function(){const[i,C,k]=r("list"),y={error:Boolean,offset:t(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:o("down"),loadingText:String,finishedText:String,immediateCheck:n};var B=d({name:i,props:y,emits:["load","update:error","update:loading"],setup(e,{emit:i,slots:r}){const t=l(e.loading),o=l(),n=l(),d=T(),m=a(o),y=()=>{v((()=>{if(t.value||e.finished||e.disabled||e.error||!1===(null==d?void 0:d.value))return;const{direction:r}=e,l=+e.offset,a=p(m);if(!a.height||x(o))return;let s=!1;const c=p(n);s="up"===r?a.top-c.top<=l:c.bottom-a.bottom<=l,s&&(t.value=!0,i("update:loading",!0),i("load"))}))},B=()=>{if(e.finished){const i=r.finished?r.finished():e.finishedText;if(i)return h("div",{class:C("finished-text")},[i])}},S=()=>{i("update:error",!1),y()},j=()=>{if(e.error){const i=r.error?r.error():e.errorText;if(i)return h("div",{role:"button",class:C("error-text"),tabindex:0,onClick:S},[i])}},w=()=>{if(t.value&&!e.finished&&!e.disabled)return h("div",{class:C("loading")},[r.loading?r.loading():h(b,{class:C("loading-icon")},{default:()=>[e.loadingText||k("loading")]})])};return s((()=>[e.loading,e.finished,e.error]),y),d&&s(d,(e=>{e&&y()})),c((()=>{t.value=e.loading})),u((()=>{e.immediateCheck&&y()})),f({check:y}),g("scroll",y,{target:m,passive:!0}),()=>{var i;const d=null==(i=r.default)?void 0:i.call(r),l=h("div",{ref:n,class:C("placeholder")},null);return h("div",{ref:o,role:"feed",class:C(),"aria-busy":t.value},["down"===e.direction?d:l,w(),B(),j(),"up"===e.direction?d:l])}}});e("L",m(B))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-2b5f75d2.js

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


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


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


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


+ 5 - 0
dist/assets/index-legacy-def6d30e.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-e0d024de.js
+System.register(["./index-legacy-58aa8478.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-7c2ed44f.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-def6d30e.js

+ 4 - 0
dist/assets/index-legacy-e0d024de.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-e0d024de.js
 System.register(["./index-legacy-58aa8478.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-7c2ed44f.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-def6d30e.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/instrument-9aef44bf.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/instrument-c3793ba9.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/instrument-legacy-59b5f851.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/instrument-legacy-8553037b.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/orchestra-12bc4faf.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/orchestra-d310756e.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/orchestra-legacy-9a29e58b.js


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


File diff suppressed because it is too large
+ 1 - 0
dist/assets/polyfills-legacy-72e42ccb.js


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


File diff suppressed because it is too large
+ 1 - 0
dist/assets/report-share-6e34dcde.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/report-share-849b09f5.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/report-share-legacy-2d0d2bc0.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/report-share-legacy-96290878.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/vue3-lottie.es-536ea5c1.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/vue3-lottie.es-cd173f34.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/vue3-lottie.es-legacy-0fc1ad93.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/vue3-lottie.es-legacy-78339466.js


+ 13 - 0
dist/colexiu.html

@@ -40,11 +40,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-a671614e.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-84eec2af.js">
   <link rel="modulepreload" crossorigin href="./assets/index-80f25595.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-536ea5c1.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3598418a.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-a0c925e6.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-afd188ef.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1ef01765.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-cd173f34.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-21478098.js">
+>>>>>>> guide
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -57,8 +65,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-3aa4f81b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b6148d1f.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-0ae0f844.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

+ 14 - 0
dist/index.html

@@ -75,12 +75,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-2232562f.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-84eec2af.js">
   <link rel="modulepreload" crossorigin href="./assets/index-80f25595.js">
   <link rel="modulepreload" crossorigin href="./assets/index-050d88b8.js">
   <link rel="modulepreload" crossorigin href="./assets/index-1aeefbee.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3598418a.js">
+=======
+  <script type="module" crossorigin src="./assets/index-138bff71.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-afd188ef.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1ef01765.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3156a775.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-5a135da1.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-21478098.js">
+>>>>>>> guide
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
@@ -100,8 +109,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-afe1ae11.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b6148d1f.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-35464aab.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

+ 14 - 0
dist/instrument.html

@@ -38,12 +38,21 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-9aef44bf.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-84eec2af.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-536ea5c1.js">
   <link rel="modulepreload" crossorigin href="./assets/index-80f25595.js">
   <link rel="modulepreload" crossorigin href="./assets/index-4dde8f6f.js">
   <link rel="modulepreload" crossorigin href="./assets/index-050d88b8.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-c3793ba9.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-afd188ef.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-cd173f34.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1ef01765.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f0ab7aa9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3156a775.js">
+>>>>>>> guide
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
   <link rel="stylesheet" href="./assets/instrument-7ea4ff02.css">
@@ -56,8 +65,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-8553037b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b6148d1f.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-59b5f851.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

+ 15 - 0
dist/orchestra.html

@@ -41,6 +41,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-12bc4faf.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-84eec2af.js">
   <link rel="modulepreload" crossorigin href="./assets/index-80f25595.js">
@@ -48,6 +49,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-1aeefbee.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3598418a.js">
   <link rel="modulepreload" crossorigin href="./assets/index-4dde8f6f.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-d310756e.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-afd188ef.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1ef01765.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-cd173f34.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-5a135da1.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-21478098.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f0ab7aa9.js">
+>>>>>>> guide
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -72,8 +82,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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-9a29e58b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b6148d1f.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-b1118668.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

+ 10 - 0
dist/report-share.html

@@ -25,8 +25,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-849b09f5.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-84eec2af.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-6e34dcde.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-afd188ef.js">
+>>>>>>> guide
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -51,8 +56,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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-2d0d2bc0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b6148d1f.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-96290878.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

+ 2 - 2
src/page-instrument/header-top/index.tsx

@@ -44,8 +44,8 @@ export const headTopData = reactive({
 			if (state.platform === IPlatform.PC) {
 				showConfirmDialog({
 					className: 'modalTip',
-					title: "温馨提",
-					message: "该功能暂未开放,敬请期待",
+					title: "温馨提",
+					message: "该功能暂未开放,敬请期待",
 					showCancelButton: false,
 				});
 				return;

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