Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/view/selection/index.tsx

@@ -10,6 +10,7 @@ import { useRoute } from "vue-router";
 import { getQuery } from "/src/utils/queryString";
 import IntonationDown from "./imgs/down_icon.png"
 import IntonationUp from "./imgs/up_icon.png"
+import MultipleRestMeasures from "./multipleRestMeasures"
 
 const selectData = reactive({
 	notes: [] as any[],
@@ -330,9 +331,8 @@ export default defineComponent({
 										)}
 										{!state.isReport &&
 											!!item.multipleRestMeasures &&
-											state.activeMeasureIndex == item.MeasureNumberXML && (
-												<div class={styles.dotWrap}>{item.multipleRestMeasures}</div>
-											)}
+											<MultipleRestMeasures item = {item}></MultipleRestMeasures>
+										}
 										<Transition
 											name="centerTop"
 											onAfterEnter={() => {

src/view/selection/multipleRestMeasures.tsx

@@ -0,0 +1,22 @@
+import { defineComponent } from "vue"
+import state from "/src/state"
+import styles from "./index.module.less"
+
+export default defineComponent({
+   name: "multipleRestMeasures",
+   props: {
+      item: {
+         type: Object,
+         required: true
+      }
+   },
+   setup(props) {
+      return () => 
+         <>
+            {
+               state.activeMeasureIndex == props.item.MeasureNumberXML 
+                  && <div class={styles.dotWrap}>{props.item.multipleRestMeasures}</div>
+            }
+         </>
+   }
+})