skyblued 2 年之前
父节点
当前提交
87f8ecbb12

+ 15 - 8
src/music-sheet/index.tsx

@@ -145,7 +145,7 @@ export default defineComponent({
         event.on('section-click', RuntimeUtils.noteClick)
       }
     }
-
+    const renderData = ref()
     // 直接读取渲染数据
     const productJsonAndSvg = async (renderData: any) => {
       await getSvgXml(renderData.svg)
@@ -167,18 +167,17 @@ export default defineComponent({
         setOsdm()
         return
       }
-      let renderData: any = null
       try {
         if (SettingState.sett.type === 'staff' && detailState.activeDetail?.musicSvg) {
-          renderData = JSON.parse(detailState.activeDetail.musicSvg)
+          renderData.value = JSON.parse(detailState.activeDetail.musicSvg)
         } else {
           if (SettingState.sett.keySignature && detailState.activeDetail?.musicFirstSvg) {
             //固定调
-            renderData = JSON.parse(detailState.activeDetail.musicFirstSvg)
+            renderData.value = JSON.parse(detailState.activeDetail.musicFirstSvg)
           } else {
             // 首调
             if (detailState.activeDetail?.musicJianSvg) {
-              renderData = JSON.parse(detailState.activeDetail.musicJianSvg)
+              renderData.value = JSON.parse(detailState.activeDetail.musicJianSvg)
             }
           }
         }
@@ -186,8 +185,8 @@ export default defineComponent({
         console.error(error)
         detailState.renderType = 'native'
       }
-      if (renderData && !props.isSoundEffect) {
-        productJsonAndSvg(renderData)
+      if (renderData.value && !props.isSoundEffect) {
+        productJsonAndSvg(renderData.value)
       } else {
         setOsdm()
       }
@@ -244,10 +243,18 @@ export default defineComponent({
     }
 
     const reRender = async () => {
+      if (detailState.renderType == 'native') {
+        await osmd.value?.render()
+      } else {
+        if (container.value) {
+          container.value.innerHTML = ''
+        }
+        productJsonAndSvg(renderData.value)
+      }
+      console.log(renderData.value)
       // if (detailState.renderType == 'cache'){
       //   detailState.times = getNotePosition(detailState.times)
       // }
-      await osmd.value?.render()
     }
 
     const resetFormate = () => {

+ 1 - 3
src/subpages/colexiu/buttons/index.tsx

@@ -180,9 +180,7 @@ export default defineComponent({
           style={search.headerHeight ? { height: '1rem', paddingTop: '0.25rem' } : ''}
         >
           <div class={styles.leftButton}>
-            {search?.modelType && !search.unitId ? null : (
-              <img class={styles.backbtn} src={iconBack} onClick={back} />
-            )}
+            {search?.modelType && !search.unitId ? null : <img class={styles.backbtn} src={iconBack} onClick={back} />}
             <div class={styles.titleWrap}>
               <div class={styles.title}>{detailState.activeDetail?.musicSheetName}</div>
               {search.albumName && <div class={styles.album}>{search.albumName}</div>}

+ 1 - 1
src/subpages/colexiu/index.tsx

@@ -285,7 +285,7 @@ export default defineComponent({
       const calcLeft = paddingLeft || '0px'
       const isVertical = direction === 'vertical'
       const calcRightWidth = direction === 'vertical' ? '20px' : '0px'
-      const needFingering = fingeringStatus.value === 'show' && SettingState.sett.fingering && !runtime.evaluatingStatus
+      const needFingering = fingeringStatus.value === 'show' && SettingState.sett.fingering //&& !runtime.evaluatingStatus
       const needFingeringWidth = direction === 'vertical' && needFingering
       const musicSheetStyle = {
         ...(isVertical && { margin: 'auto', marginRight: 0 }),

+ 1 - 1
src/subpages/colexiu/music-list/music-score.tsx

@@ -2,11 +2,11 @@ import { defineComponent } from 'vue'
 import { useOriginSearch } from '../uses'
 import List from './base-list'
 
-const search = useOriginSearch()
 
 export default defineComponent({
   name: 'MusicList-MusicScore',
   setup() {
+    const search = useOriginSearch()
     return () => {
       return (
         <List

+ 2 - 2
src/subpages/colexiu/popups/permission/demand.tsx

@@ -10,11 +10,11 @@ import * as RuntimeUtils from '/src/pages/detail/runtime'
 import { postMessage } from '/src/helpers/native-message'
 import { useClientType, useOriginSearch, useUpdateMember } from '../../uses'
 export const confirmShow: Ref<boolean> = ref(false)
-const search = useOriginSearch()
 
 export default defineComponent({
   name: 'ColexiuDemand',
   setup() {
+    const search = useOriginSearch()
     const client = useClientType()
     const buy = async () => {
       delete search.Authorization
@@ -34,7 +34,7 @@ export default defineComponent({
     }
 
     return () => (
-      <div style={{position: 'relative'}}>
+      <div style={{ position: 'relative' }}>
         <img class={styles.image} src={iconDemand} />
         <div class={styles.wrap}>
           <div class={styles.des}>

+ 2 - 1
src/subpages/colexiu/popups/permission/member.tsx

@@ -9,11 +9,12 @@ import * as RuntimeUtils from '/src/pages/detail/runtime'
 import { postMessage } from '/src/helpers/native-message'
 import { useClientType, useOriginSearch } from '../../uses'
 
-const search = useOriginSearch()
+
 
 export default defineComponent({
   name: 'ColexiuMember',
   setup() {
+    const search = useOriginSearch()
     const client = useClientType()
     const buy = () => {
       delete search.Authorization

+ 2 - 1
src/subpages/colexiu/popups/permission/memberAndDemand.tsx

@@ -11,11 +11,12 @@ import * as RuntimeUtils from '/src/pages/detail/runtime'
 import { postMessage } from '/src/helpers/native-message'
 import { useClientType, useOriginSearch } from '../../uses'
 export const confirmShow: Ref<boolean> = ref(false)
-const search = useOriginSearch()
+
 
 export default defineComponent({
   name: 'memberAndDemand',
   setup() {
+    const search = useOriginSearch()
     const client = useClientType()
     const buy = async () => {
       delete search.Authorization