lex il y a 11 mois
Parent
commit
2bff9532e1
1 fichiers modifiés avec 19 ajouts et 12 suppressions
  1. 19 12
      src/page-instrument/view-figner/index.tsx

+ 19 - 12
src/page-instrument/view-figner/index.tsx

@@ -1305,18 +1305,17 @@ export default defineComponent({
             </div>
           </div>
 
-          <Popup
-            class="tonePopup"
-            v-model:show={data.tnoteShow}
-            position={state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? "bottom" : "right"}
-            onClick={(e: any) => {
-              e.stopPropagation();
-            }}
-          >
+          <Popup class="tonePopup" v-model:show={data.tnoteShow} position={state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? "bottom" : "right"}>
             <div class={styles.tones}>
               <div class={styles.toneTitle}>
                 <div class={styles.tipTitleName}>移调</div>
-                <Button class={styles.tipClose} onClick={() => (data.tnoteShow = false)}>
+                <Button
+                  class={styles.tipClose}
+                  onClick={(e: any) => {
+                    e.stopPropagation();
+                    data.tnoteShow = false;
+                  }}
+                >
                   <Icon name="cross" size={19} color="#fff" />
                 </Button>
               </div>
@@ -1332,7 +1331,8 @@ export default defineComponent({
                             round
                             plain
                             type={data.popupActiveTone.realName === tone.realName ? "primary" : "default"}
-                            onClick={() => {
+                            onClick={(e: any) => {
+                              e.stopPropagation();
                               data.popupActiveTone = tone;
                               setNotes();
                             }}
@@ -1361,9 +1361,16 @@ export default defineComponent({
                     </Space>
                   </div>
                   <div class={styles.toneAction}>
-                    <img onClick={() => (data.tnoteShow = false)} src={icons.icon_action_cancel} />
                     <img
-                      onClick={() => {
+                      onClick={(e: any) => {
+                        e.stopPropagation();
+                        data.tnoteShow = false;
+                      }}
+                      src={icons.icon_action_cancel}
+                    />
+                    <img
+                      onClick={(e: any) => {
+                        e.stopPropagation();
                         data.activeTone = data.popupActiveTone;
                         setNotes();
                         data.tnoteShow = false;