Merge branch 'fix-tianyong'

dist/assets/index-2b0159b2.js

@@ -0,0 +1 @@
+import{d as i,g as l,n as d,bb as e,c,m as r,f as s,aj as u}from"./index-0dbc5171.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:""}]});c(()=>{window.appName="colexiu",r.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};

dist/assets/index-35c5f154.js

@@ -0,0 +1 @@
+import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-0dbc5171.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};

dist/assets/index-legacy-1e25738e.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-7d10cde1.js
+System.register(["./index-legacy-7729eeaa.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l;return{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bb,r=e.c,s=e.m,d=e.f,l=e.aj}],execute:function(){var t=document.createElement("style");t.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(t);const c="_detail_vtlsh_12",h="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),t=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,t.isLoading=!1}));const i=async()=>{console.log("渲染完成")};return()=>d("div",{class:c},[d("div",{id:"scrollContainer",class:[h,"hideCursor"]},[!t.isLoading&&d(l,{onRendered:i},null)])])}}))}}}));
+========
+System.register(["./index-legacy-c08dba1e.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l;return{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bb,r=e.c,s=e.m,d=e.f,l=e.aj}],execute:function(){var t=document.createElement("style");t.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(t);const c="_detail_vtlsh_12",h="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),t=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,t.isLoading=!1}));const i=async()=>{console.log("渲染完成")};return()=>d("div",{class:c},[d("div",{id:"scrollContainer",class:[h,"hideCursor"]},[!t.isLoading&&d(l,{onRendered:i},null)])])}}))}}}));
+>>>>>>>> fix-tianyong:dist/assets/index-legacy-1e25738e.js

dist/assets/index-legacy-7d10cde1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-7d10cde1.js
 System.register(["./index-legacy-7729eeaa.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l;return{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bb,r=e.c,s=e.m,d=e.f,l=e.aj}],execute:function(){var t=document.createElement("style");t.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(t);const c="_detail_vtlsh_12",h="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),t=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,t.isLoading=!1}));const i=async()=>{console.log("渲染完成")};return()=>d("div",{class:c},[d("div",{id:"scrollContainer",class:[h,"hideCursor"]},[!t.isLoading&&d(l,{onRendered:i},null)])])}}))}}}));
+========
+System.register(["./index-legacy-c08dba1e.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l;return{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bb,r=e.c,s=e.m,d=e.f,l=e.aj}],execute:function(){var t=document.createElement("style");t.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(t);const c="_detail_vtlsh_12",h="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),t=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,t.isLoading=!1}));const i=async()=>{console.log("渲染完成")};return()=>d("div",{class:c},[d("div",{id:"scrollContainer",class:[h,"hideCursor"]},[!t.isLoading&&d(l,{onRendered:i},null)])])}}))}}}));
+>>>>>>>> fix-tianyong:dist/assets/index-legacy-1e25738e.js

dist/assets/index-legacy-b8f7e45b.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-c08dba1e.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.J,o=e.f}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,p(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));

dist/colexiu.html

@@ -40,11 +40,11 @@
       },
     })
   </script>
-  <script type="module" crossorigin src="./assets/colexiu-6101f25a.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-87375c2f.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-24e6eb53.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-c878ca01.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-13f20079.js">
+  <script type="module" crossorigin src="./assets/colexiu-8a261766.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0dbc5171.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-67f9671e.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e8dd1803.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-35c5f154.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -58,7 +58,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-8ce09952.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-d145bb2c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/index.html

@@ -75,12 +75,12 @@
       }
     })
   </script>
-  <script type="module" crossorigin src="./assets/index-a5797e53.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-87375c2f.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-24e6eb53.js">
-  <link rel="modulepreload" crossorigin href="./assets/instruments-075dc404.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-b93f4f8e.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-13f20079.js">
+  <script type="module" crossorigin src="./assets/index-b9e226a1.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0dbc5171.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-67f9671e.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-a3925dcf.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-a67667d8.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-35c5f154.js">
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
@@ -101,7 +101,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-0985a712.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-03e1f82d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/instrument.html

@@ -42,12 +42,12 @@
     }
 
   </script>
-  <script type="module" crossorigin src="./assets/instrument-51f059ac.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-87375c2f.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-c878ca01.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-24e6eb53.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-5217730d.js">
-  <link rel="modulepreload" crossorigin href="./assets/instruments-075dc404.js">
+  <script type="module" crossorigin src="./assets/instrument-7661ddc0.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0dbc5171.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e8dd1803.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-67f9671e.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-ad825f6b.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-a3925dcf.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/instrument-6fcc9d8d.css">
@@ -61,7 +61,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-9a88208a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-9b0a8186.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/orchestra.html

@@ -41,13 +41,13 @@
       transition: opacity .3s;
     }
   </style>
-  <script type="module" crossorigin src="./assets/orchestra-49464eeb.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-87375c2f.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-24e6eb53.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-c878ca01.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-b93f4f8e.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-13f20079.js">
-  <link rel="modulepreload" crossorigin href="./assets/index-5217730d.js">
+  <script type="module" crossorigin src="./assets/orchestra-180ec01c.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0dbc5171.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-67f9671e.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e8dd1803.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-a67667d8.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-35c5f154.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-ad825f6b.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -73,7 +73,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-3fef4e2c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-e8e4293b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/report-share.html

@@ -25,8 +25,8 @@
       transition: opacity .3s;
     }
   </style>
-  <script type="module" crossorigin src="./assets/report-share-e91a5bdd.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-87375c2f.js">
+  <script type="module" crossorigin src="./assets/report-share-1bd1fd46.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-0dbc5171.js">
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/plyr-aeb30ba4.css">
@@ -52,7 +52,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-298d665b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-92d703cd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

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

@@ -35,7 +35,7 @@ export const headTopData = reactive({
   settingMode: false,
   /** 切换模式 */
   handleChangeModeType(value: "practise" | "follow" | "evaluating") {
-    if (!state.enableEvaluation) return
+    if (value === 'evaluating' && !state.enableEvaluation) return
     // 跟练模式，光标只有音符模式，无节拍模式
     if (value === 'follow' && metronomeData.cursorMode === 2) {
       metronomeData.cursorMode = 1

src/page-instrument/view-detail/index.tsx

@@ -172,7 +172,7 @@ export default defineComponent({
       state.isSpecialBookCategory = !classids.includes(data.musicSheetCategoriesId) 
 
       // 设置指法
-      const code = mappingVoicePart(state.trackId, "INSTRUMENT");
+      const code = mappingVoicePart(state.subjectId, "INSTRUMENT");
       state.fingeringInfo = subjectFingering(code);
       console.log("🚀 ~ state.fingeringInfo:", code, state.fingeringInfo, state.trackId, state.track);
 

src/view/fingering/fingering-config.ts

@@ -57,8 +57,7 @@ export type IVocals =
 export const mappingVoicePart = (
 	id: number | string,
 	soruce: "GYM" | "COLEXIU" | "ORCHESTRA" | "INSTRUMENT"
-): number | string => {
-	console.log(1)
+): number => {
 	if (soruce === "GYM") {
 		return Number(id);
 	} else if (soruce === "COLEXIU") {
@@ -98,41 +97,11 @@ export const mappingVoicePart = (
 		return subject[id];
 	} else if (soruce === "INSTRUMENT") {
 		let code = id;
-		// if (typeof code === "string") {
-		// 	//code = code.toLocaleLowerCase().replace(/ /g, "");
-		// 	code = code.toLocaleLowerCase().split(' ')[0]
-		// }
+		if (typeof code === "string") {
+			code = code.toLocaleLowerCase().replace(/ /g, "");
+		}
 		const subject: { [_key: string | number]: any } = {
-			"Flute 1": 2,
-			"Flute 2": 2,
-			"Oboe": 4,
-			"Clarinet in Bb 1": 4,
-			"Clarinet in Bb 2": 4,
-			"Alto Clarinet in Eb": 4,
-			"Bass Clarinet in Bb": 4,
-			"Bassoon": 1,
-			"Alto Saxophone": 5,
-			"Tenor Saxophone": 5,
-			"Baritone Saxophone": 5,
-			"Trumpet in Bb 1": 12,
-			"Trumpet in Bb 2": 12,
-			"Horn in F": 13,
-			"Trombone 1": 14,
-			"Trombone 2": 14,
-			"Euphonium": 15,
-			"Tuba": 17,
-			"Chimes": 1,
-			"Bells": 1,
-			"Xylophone": 1,
-			"Snare Drum": 1,
-			"Bass Drum": 1,
-			"Triangle": 1,
-			"Suspended Cymbal": 1,
-			"Crash Cymbals": 1,
-			"Concert Toms": 1,
-			"Timpani": 1,
 			flute: 2,
-			oboe: 4,
 			clarinet: 4,
 			trombone: 14,
 			tuba: 17,
@@ -154,33 +123,19 @@ export const mappingVoicePart = (
 			1: "pan-flute",
 			2: "ocarina",
 			5: "melodica",
-			26: 12,
 			tenorrecorder: "piccolo",
 			woodwind: "hulusi-flute",
 			panpipes: "pan-flute",
 			ocarina: "ocarina",
 			nai: "melodica",
 		};
-		let _track;
-		if (typeof code === 'string') {
-			for (let sKey in subject) {
-				if(sKey === code) {
-					_track = subject[sKey]
-					break;
-				}
-			}
-		} else {
-			_track = subject.code
-		}
-		// const _track = typeof code === 'string' ? Object.keys(subject).filter((key) => key.includes(String(code)) || String(code).includes(key))[0] : code
-		return _track;
+		return subject[code] || 0;
 	}
 	return 0;
 };
 
 /** 声部的指法配置信息 */
 export const subjectFingering = (subjectId: number | string): IFingering => {
-	subjectId = isNaN(Number(subjectId)) ? subjectId : Number(subjectId)
 	switch (subjectId) {
 		case 2: // 长笛
 			return {