Merge branch 'feature-tianyong' into gym-test

src/helpers/svgToPng.ts

@@ -10,7 +10,7 @@ export const getSvgPngToSize = (osmd: any) => {
           var width = backend.ctx.width / state.scale.x;
           var height = backend.ctx.height / state.scale.y;
           const textX = width - 120,textY = height - 50;
-          const textDom = `<g><text x="${textX}" y="${textY}" stroke-width="3" fill="#000000" stroke="none" stroke-dasharray="none" font-family="Times New Roman" font-size="36px" font-weight="bold" font-style="none">第${idx+1}页</text></g>`
+          const textDom = `<g><text x="${textX}" y="${textY}" stroke-width="3" fill="#000000" stroke="none" stroke-dasharray="none" font-family="Times New Roman" font-size="36px" font-weight="bold" font-style="none">${idx+1}/${len}</text></g>`
           backend.ctx.svg.innerHTML = backend.ctx.svg.innerHTML + textDom;
           var cont = new XMLSerializer().serializeToString(
             backend.ctx.svg

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

@@ -315,15 +315,17 @@ export default defineComponent({
       // }
 
       // 管乐迷曲谱详情页，需要下载A4尺寸的图片
-      if (query.downPng === 'A4') {
-        const imgList = getSvgPngToSize(state.osmd)
-        console.log('A4', imgList)
-        window.parent.postMessage({
-          api: 'musicStaffRender',
-          loading: false,
-          osmdImg: imgList
-        }, '*');
-      }
+      setTimeout(() => {
+        if (query.downPng === 'A4' && state.partIndex != 999) {
+          const imgList = getSvgPngToSize(state.osmd)
+          console.log('A4', imgList)
+          window.parent.postMessage({
+            api: 'musicStaffRender',
+            loading: false,
+            osmdImg: imgList
+          }, '*');
+        }
+      }, 100);
 
       state.musicScoreBtnDirection = state.playBtnDirection;
       state.musicRendered = true;

src/view/music-score/index.tsx

@@ -88,7 +88,7 @@ export default defineComponent({
 			setGlobalMusicSheet();
 			if(!osmd){
 				osmd = new OpenSheetMusicDisplay(container, {
-					drawTitle: false,
+					drawTitle: query.downPng === 'A4' ? true : false,
 					drawSubtitle: false,
 					// drawMeasureNumbers: false,
 					autoResize: false,
@@ -173,6 +173,7 @@ export default defineComponent({
 				}
 			}
 			if (query.downPng === 'A4') {
+				osmd.EngravingRules.PageTopMargin = 5
 				osmd.setPageFormat('794x1100')
 				osmd.zoom = 0.3;
 			} else {

vite.config.ts

@@ -52,7 +52,7 @@ export default defineConfig({
     // https: true,
     proxy: {
       "^/instrument/.*": {
-        target: "https://dev.gym.lexiaoya.cn",
+        target: "https://test.gym.lexiaoya.cn",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),
       },