From 37a7b506023d37d32cbcfc3b8757f88226cdbb44 Mon Sep 17 00:00:00 2001
From: Eiinu <eiinu@qq.com>
Date: Wed, 23 Aug 2023 19:55:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(actionsheet):=20=E4=BF=AE=E5=A4=8D=20close-?=
 =?UTF-8?q?abled=20=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=20(#2496)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/actionsheet/index.taro.vue | 12 +++++++-----
 src/packages/__VUE/actionsheet/index.vue      |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/packages/__VUE/actionsheet/index.taro.vue b/src/packages/__VUE/actionsheet/index.taro.vue
index c63cfffb58..cea5894e86 100644
--- a/src/packages/__VUE/actionsheet/index.taro.vue
+++ b/src/packages/__VUE/actionsheet/index.taro.vue
@@ -33,10 +33,10 @@
 import { createComponent } from '@/packages/utils/create';
 import { computed, useSlots } from 'vue';
 import type { PropType } from 'vue';
-const { componentName, create } = createComponent('action-sheet');
-import Popup from '../popup/index.taro.vue';
 import { popupProps } from '../popup/props';
+import Popup from '../popup/index.taro.vue';
 import { Loading } from '@nutui/icons-vue-taro';
+const { componentName, create } = createComponent('action-sheet');
 export interface menuItems {
   disable: boolean;
   loading: boolean;
@@ -89,7 +89,7 @@ export default create({
       default: true
     }
   },
-  emits: ['cancel', 'choose', 'update:visible', 'close'],
+  emits: ['cancel', 'close', 'choose', 'update:visible'],
 
   setup(props, { emit }) {
     const slotDefault = !!useSlots().default;
@@ -117,8 +117,10 @@ export default create({
     };
 
     const close = (e: Event) => {
-      emit('close', e);
-      emit('update:visible', false);
+      if (props.closeAbled) {
+        emit('close', e);
+        emit('update:visible', false);
+      }
     };
 
     return {
diff --git a/src/packages/__VUE/actionsheet/index.vue b/src/packages/__VUE/actionsheet/index.vue
index cbcb4b882e..6e70e262b1 100644
--- a/src/packages/__VUE/actionsheet/index.vue
+++ b/src/packages/__VUE/actionsheet/index.vue
@@ -117,8 +117,10 @@ export default create({
     };
 
     const close = (e: Event) => {
-      emit('close', e);
-      emit('update:visible', false);
+      if (props.closeAbled) {
+        emit('close', e);
+        emit('update:visible', false);
+      }
     };
 
     return {