Merge branch 'feature-tianyong-newVersion' into ktyq-online-new

src/helpers/formateMusic.ts

@@ -936,7 +936,8 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 	 * 总谱渲染时，需要取第一个渲染的声轨名字，canSelectTracks返回的声轨名字可能不是第一个，顺序有问题，需要用state.osmd.Sheet.Instruments
 	 */
 	// const firstTrackName = state.combinePartIndexs.length>1 ? state.partListNames[state.combinePartIndexs[0]] : state.canSelectTracks[0] || "";
-	const firstTrackName = state.combinePartIndexs.length>1 ? state.partListNames[state.combinePartIndexs[0]] : (state.osmd.Sheet.Instruments[0].Name || state.osmd.Sheet.Instruments[0].NameLabel.text || "");
+	const filterInstruments = state.osmd.Sheet.Instruments.filter(item => item.Name?.toLocaleLowerCase() !== 'common' )
+	const firstTrackName = state.combinePartIndexs.length>1 ? state.partListNames[state.combinePartIndexs[0]] : (filterInstruments[0].Name || filterInstruments[0].NameLabel.text || "");
 	const currentTrackIndex = state.isCombineRender && state.combinePartIndexs.length > 1 ? state.combinePartIndexs[0] : 0;
 	while (!iterator.EndReached) {
 		// console.log({ ...iterator });

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

@@ -214,7 +214,11 @@ export default defineComponent({
       state.isLoading = false
       api_cloudLoading();
       console.timeEnd("渲染加载耗时");
-      console.timeLog('加载过程','谱面渲染完成')
+      if (typeof console.timeLog === 'function') {
+        console.timeLog('加载过程','谱面渲染完成')
+      } else {
+        console.log('加载过程','谱面渲染完成')
+      }
       detailData.skeletonLoading = false;
       state.osmd = osmd;
       // 预览模式不需要往下执行

src/view/audio-list/index.tsx

@@ -681,7 +681,11 @@ export default defineComponent({
 				state.audioDone = true;
 				// state.isLoading = false
 				console.timeEnd("音频加载耗时")
-				console.timeLog('加载过程','音频加载完成')
+				if (typeof console.timeLog === 'function') {
+					console.timeLog('加载过程','音频加载完成')
+				} else {
+					console.log('加载过程','音频加载完成')
+				}
 				console.log("音频数据：",audioData)
 				api_playProgress(progress);
 			} else {

vite.config.ts

@@ -84,8 +84,8 @@ export default defineConfig({
         // target: "https://kt.colexiu.com",
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
-        // target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
-        target: "https://test.kt.colexiu.com",
+        target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
+        // target: "https://test.kt.colexiu.com",
         // target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),