浏览代码

style: 学生端引导图Ui修改

TIANYONG 1 年之前
父节点
当前提交
cdecb5fab9

+ 5 - 1
src/helpers/formateMusic.ts

@@ -621,6 +621,7 @@ export const formatZoom = (num = 1) => {
  */
 export const formatXML = (xml: string, xmlUrl?: string): string => {
 	if (!xml) return "";
+	
 	const xmlParse = new DOMParser().parseFromString(xml, "text/xml");
 	const measures = Array.from(xmlParse.getElementsByTagName("measure"));
 	const repeats: any = Array.from(xmlParse.querySelectorAll('repeat'));
@@ -671,12 +672,15 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 			});
 		}
 		// 如果有特殊中文速度文本,需要删除
+		const reg = new RegExp("[\\u4E00-\\u9FFF]+", "g");
 		if (measure.getElementsByTagName("words").length && state.isEvxml) {
 			const wordList = Array.from(measure.getElementsByTagName("words")) || [];
 			wordList.forEach((word: any) => {
 				// TODO:删除妙极客曲子无意义的words
-				if (word?.textContent && !word?.textContent?.includes('D') && word?.parentNode?.parentNode) {
+				// wordArr?.push(word?.textContent)
+				if (word?.textContent && reg.test(word?.textContent) && word?.parentNode?.parentNode) {
 					measure.removeChild(word.parentNode.parentNode);
+					// deleteWordArr?.push(word?.textContent)
 				}
 				// if(hideSpeedWords.includes(word?.textContent) && word?.parentNode?.parentNode) {
 				// 	measure.removeChild(word.parentNode.parentNode);

+ 16 - 11
src/page-instrument/custom-plugins/guide-page/student-top.tsx

@@ -22,7 +22,7 @@ export default defineComponent({
           eleRect: {} as DOMRect,
           img: getImage("studnetT1.png"),
           handStyle: {
-            top: "0.6rem",
+            top: "0.67rem",
             left:'0.1rem'
           },
           imgStyle: {
@@ -40,7 +40,7 @@ export default defineComponent({
           ele: "",
           img: getImage("studnetT2.png"),
           handStyle: {
-            top: "0.6rem",
+            top: "0.67rem",
             left:'0.1rem',
   
           },
@@ -59,7 +59,7 @@ export default defineComponent({
           ele: "",
           img: getImage("studnetT3.png"),
           handStyle: {
-            top: "0.6rem",
+            top: "0.67rem",
             left:'0.1rem',
           },
           imgStyle: {
@@ -77,7 +77,7 @@ export default defineComponent({
           ele: "",
           img: getImage("studnetT4.png"),
           handStyle: {
-            top: "0.6rem",
+            top: "0.67rem",
             left:'0.1rem',
           },
           imgStyle: {
@@ -95,7 +95,7 @@ export default defineComponent({
           ele: "",
           img: getImage("studnetT5.png"),
           handStyle: {
-            top: "0.6rem",
+            top: "0.67rem",
             left:'0.1rem',
      
           },
@@ -114,7 +114,7 @@ export default defineComponent({
           ele: "",
           img: getImage("studnetT6.png"),
           handStyle: {
-            top: "0.6rem",
+            top: "0.67rem",
             left:'0.1rem',
          
           },
@@ -134,7 +134,7 @@ export default defineComponent({
             eleRect: {} as DOMRect,
             img: getImage("studnetT7.png"),
             handStyle: {
-                top: "0.6rem",
+                top: "0.67rem",
                 left:'0.1rem',
             },
             imgStyle: {
@@ -169,6 +169,7 @@ export default defineComponent({
           },
       ],
       step: 0,
+      initDone: false,
     });
     const tipShow = ref(false)
     const query: any = getQuery();
@@ -214,7 +215,7 @@ export default defineComponent({
 					return
 				}
         const eleRect = ele.getBoundingClientRect();
-        console.log(eleRect.y,666)
+        // console.log(eleRect,666)
         data.box = {
           left: eleRect.x + "px",
           top: eleRect.y + "px",
@@ -227,6 +228,7 @@ export default defineComponent({
       // 顶部栏有个动画过度效果,位置会移动,需要加个延迟时间计算其移动后的位置
       setTimeout(() => {
         getStepELe();
+        data.initDone = true;
       }, 1000);
     });
 
@@ -269,8 +271,9 @@ export default defineComponent({
         
           跳过
         </div>} 
-        
-        <div class={styles.box} style={data.box} id={`modeType-${data.step}`}>
+        {
+          data.initDone &&
+          <div class={styles.box} style={data.box} id={`modeType-${data.step}`}>
           {data.steps.map((item: any, index) => (
 
             <div
@@ -313,7 +316,9 @@ export default defineComponent({
               </div>
             </div>
           ))}
-        </div>
+          </div>          
+        }
+
       </div>
       </Popup>
     );

+ 6 - 3
src/view/music-score/testCheck.tsx

@@ -37,6 +37,8 @@ export const resetRenderMusicScore = (type?: string) => {
 	location.search = "?" + newSearch;
 };
 
+let wordList: never[] = [], deleteWordList: never[] = [];
+
 export default defineComponent({
 	name: "music-score",
 	emits: ["rendered"],
@@ -69,14 +71,15 @@ export default defineComponent({
                 const item = list[i];
                 try {
                     await getXML(item.evxml_file_url);
-                    await init(i);
+                    // await init(i);
                 } catch (error) {
                     errorNum += 1;
                     errorList.push(item.evxml_file_url);
                     console.log('🚀 ~ evxml解析报错:',`第${i}个xml`,error,'总错误数:',errorNum)
                 }
             }
-            console.log('🚀 ~ evxml循环完成','没有times和timegap的:',state.noTimes,'解析报错的xml:',errorList)
+            // console.log('🚀 ~ evxml循环完成','没有times和timegap的:',state.noTimes,'解析报错的xml:',errorList)
+			console.log('关键词',wordList, deleteWordList)
         }
 		/** 设置 曲谱模式,五线谱还是简谱 */
 		const setRenderType = () => {
@@ -88,7 +91,7 @@ export default defineComponent({
 		const getXML = async (evxml: any) => {
 			const res = await fetch(evxml).then((response) => response?.text());
             if (res) {
-                const xml = formatXML(res, evxml);
+                const xml = formatXML(res, evxml, wordList, deleteWordList);
                 musicData.score = state.isCombineRender ? xml : onlyVisible(xml, state.partIndex);
                 if (state.gradualTimes) {
                     state.gradual = getGradualLengthByXml(xml);

+ 2 - 2
vite.config.ts

@@ -76,9 +76,9 @@ 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.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
         // target: "https://dev.resource.colexiu.com",
-        // target: "https://test.kt.colexiu.com",
+        target: "https://test.kt.colexiu.com",
         // target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),