修改合并显示

public/osmd/index.html

@@ -118,14 +118,18 @@
       }, '*');
     }
 
-    function renderXml(xmlUrl, partIndex) {
+    function renderXml(xmlUrl, partIndex, isComberRender) {
       osmd
         .load(xmlUrl)
         .then(
           function () {
-            for (let i = 0; i < osmd.Sheet.Instruments.length; i++) {
-              osmd.Sheet.Instruments[i].Visible = i === partIndex;
+            // 是否合并显示
+            if (!isComberRender) {
+              for (let i = 0; i < osmd.Sheet.Instruments.length; i++) {
+                osmd.Sheet.Instruments[i].Visible = i === partIndex;
+              }
             }
+
             osmd.zoom = .5
             render();
           }

src/views/accompany/download.tsx

@@ -55,8 +55,8 @@ export default defineComponent({
           title: props.musicSheetName,
           size: 12
         })
-        // const canvas = await addWatermark(titleCanvas, '管乐团')
-        image.value = convasToImg(titleCanvas)
+        const canvas = await addWatermark(titleCanvas, '管乐团')
+        image.value = convasToImg(canvas)
         console.log(image.value, 'image.value')
         await saveImg()
       }

src/views/accompany/music-detail.tsx

@@ -34,6 +34,7 @@ export default defineComponent({
       open: false,
       audioReady: false,
       iframeSrc: '',
+      isComberRender: false, // 是否为
       musicXml: [] as any,
       instrumentName: '',
       iframeRef: null as any,
@@ -69,8 +70,16 @@ export default defineComponent({
         const res = await requestOrigin.get(staffData.details.xmlFileUrl, { mode: 'cors' })
         const parseXmlInfo = getCustomInfo(res)
         const xml = formatXML(parseXmlInfo.parsedXML)
-        const currentXml = onlyVisible(xml, staffData.partXmlIndex)
-        iframeRef.contentWindow.renderXml(currentXml, staffData.partXmlIndex)
+        if (staffData.isComberRender) {
+          iframeRef.contentWindow.renderXml(xml, staffData.partXmlIndex, staffData.isComberRender)
+        } else {
+          const currentXml = onlyVisible(xml, staffData.partXmlIndex)
+          iframeRef.contentWindow.renderXml(
+            currentXml,
+            staffData.partXmlIndex,
+            staffData.isComberRender
+          )
+        }
         // iframeRef.contentWindow.renderXml(staffData.details.xmlFileUrl, staffData.partXmlIndex)
       }
     }
@@ -87,8 +96,12 @@ export default defineComponent({
         const res = await requestOrigin.get(staffData.details.xmlFileUrl, { mode: 'cors' })
         const parseXmlInfo = getCustomInfo(res)
         const xml = formatXML(parseXmlInfo.parsedXML)
-        const currentXml = onlyVisible(xml, staffData.partXmlIndex)
-        iframeRef.contentWindow.renderXml(currentXml, 0)
+        if (staffData.isComberRender) {
+          iframeRef.contentWindow.renderXml(xml, staffData.partXmlIndex, staffData.isComberRender)
+        } else {
+          const currentXml = onlyVisible(xml, staffData.partXmlIndex)
+          iframeRef.contentWindow.renderXml(currentXml, 0, staffData.isComberRender)
+        }
       }
     }
 
@@ -159,6 +172,7 @@ export default defineComponent({
 
         staffData.details = data || {}
         showImg.value = staffData.details.musicImg?.split(',') || []
+        staffData.isComberRender = data.musicSubject === '1'
 
         nextTick(async () => {
           if (data.audioFileUrl) {