Merge branch 'feature-pc-choose' into gyt-test

src/pages/detail/helpers.ts

@@ -530,6 +530,11 @@ export const getAllNodes = (osmd: any) => {
           }
           // console.log('👀看看endtime', relaEndtime, fixtime, i)
           const _noteLength = noteRealValue
+          // 如果该音符包含倚音，添加标记
+          let hasGraceNote = false;
+          if (svgElelent?.modifiers?.length) {
+            hasGraceNote = svgElelent?.modifiers.some((item: any) => item?.attrs?.type === "GraceNoteGroup")
+          }
           const nodeDetail = {
             _noteLength,
             fixtime,
@@ -553,6 +558,7 @@ export const getAllNodes = (osmd: any) => {
             measureLength,
             relaMeasureLength,
             id: svgElelent?.attrs.id,
+            hasGraceNote,
             note: note.halfTone + 12, // see issue #224
             relativeTime: retain(relativeTime),
             time: retain(relativeTime + fixtime),

src/subpages/colexiu/buttons/evaluating.tsx

@@ -444,7 +444,7 @@ const formatTimes = () => {
       measureIndex: measureIndex, //note.measureOpenIndex,
       // measureRenderIndex: note.noteElement.sourceMeasure.measureListIndex,
       measureRenderIndex: item.measureNumberPrinted >= 1 ? item.measureNumberPrinted - 1 : note.noteElement.sourceMeasure.measureListIndex,
-      dontEvaluating: ListenMode || dontEvaluatingMode || !!item?.voiceEntry?.ornamentContainer || !!item.noteElement?.speedInfo?.startWord?.includes('rit.') || !!item.skipMode,
+      dontEvaluating: item.hasGraceNote || ListenMode || dontEvaluatingMode || !!item?.voiceEntry?.ornamentContainer || !!item.noteElement?.speedInfo?.startWord?.includes('rit.') || !!item.skipMode,
       musicalNotesIndex: index, //item.i,
       denominator: note.noteElement?.Length.denominator,
       // isOrnament: !!note?.voiceEntry?.ornamentContainer,