Merge branch 'hqyDevNewVersion' of http://git.dayaedu.com/liushengqiang/music-score into ktyq-test-new

src/helpers/customMusicScore.ts

@@ -659,7 +659,7 @@ export const resetFormate = () => {
 		});
 
 		// 修复D.C、D.S等渲染位置不对的问题
-		const repairWord = ["D.S.", "D.C."];
+		const repairWord = ["D.S.", "D.C.", "Fine"];
 		[...vfmeasures].forEach((measure: any) => {
 			const needRepairTexts = measure.querySelectorAll('text').length ? Array.from(measure.querySelectorAll('text'))?.filter((item: any) => repairWord.includes(item?.textContent)) : [];
 			if (needRepairTexts.length) {

src/helpers/formateMusic.ts

@@ -1650,9 +1650,8 @@ const analyzeEvxml = (xmlParse: any, xmlUrl?: string) => {
 		}
 		state.evXmlBeginTime = firstNoteBeginTime ? firstNoteBeginTime / 1000 : xmlNum ? 60 / state.originSpeed * xmlNum * 4/denNum : 0;
 		state.secondEvXmlBeginTime = firstNoteBeginTime ? 0 : xmlNum2 ? 60 / state.originSpeed * xmlNum2 * 4/denNum2 : 0;
-		const hasTimeGap = xmlParse.getElementsByTagName("timegap").length > 0;
+		const hasTimeGap = state.xmlHasTimeGap = xmlParse.getElementsByTagName("timegap").length > 0;
 		const hasTimes = xmlParse.getElementsByTagName("times").length > 0;
-
 		if (timeGaps && timeGaps.length && !firstNoteBeginTime) {
 			for (const timeGap of timeGaps) {
 				const num: any = timeGap?.getAttribute('num'), den: any = timeGap?.getAttribute('den');

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

@@ -281,7 +281,7 @@ export default defineComponent({
           });
           return beatTimeItem;
         });
-        const webApi_beatTimes = { beatTime, singBeatTime, mingBeatTime, isBeatTime:!state.evXmlBeginArr.length, isSingBeatTime:!state.evXmlBeginArr.length, isMingBeatTime:!state.evXmlBeginArr.length }
+        const webApi_beatTimes = { beatTime, singBeatTime, mingBeatTime, isBeatTime:!state.xmlHasTimeGap, isSingBeatTime:!state.xmlHasTimeGap, isMingBeatTime:!state.xmlHasTimeGap }
         console.log("webApi_beatTimes", webApi_beatTimes);
         window.parent.postMessage(
           {

src/state.ts

@@ -442,7 +442,9 @@ const state = reactive({
   /** evxml等待播放的时间集合，多遍反复播放，会有多个timegap(前奏)时间 */
   evXmlBeginArr: [] as any,
   /** evxml的曲子是否有times */
-  xmlHasTimes: false,
+  xmlHasTimes: false,  
+  /** evxml的曲子是否有timeGap */
+  xmlHasTimeGap: false,
   /** 指法信息 */
   fingeringInfo: {} as IFingering,
   /** 滚动容器的ID */

vite.config.ts

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