From 6abc69e1d89736ec5a1c63ef6fb59f52661e9553 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Mon, 30 Jan 2023 15:04:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PermissionButton/index.vue | 39 +++++++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index d211e2ee..735fbf69 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -4,25 +4,50 @@
       <a-popconfirm v-bind="popConfirm" :disabled="!isPermission || props.disabled">
         <a-tooltip v-if="tooltip" v-bind="tooltip">
           <slot v-if="noButton"></slot>
-          <a-button v-else v-bind="buttonProps" :disabled="_isPermission"></a-button>
+          <a-button v-else v-bind="buttonProps" :disabled="_isPermission">
+            <slot></slot>
+            <template #icon>
+              <slot name="icon"></slot>
+            </template>
+          </a-button>
         </a-tooltip>
-        <a-button v-else v-bind="buttonProps" :disabled="_isPermission"></a-button>
+        <a-button v-else v-bind="buttonProps" :disabled="_isPermission">
+          <slot></slot>
+          <template #icon>
+            <slot name="icon"></slot>
+          </template>
+        </a-button>
       </a-popconfirm>
     </template>
     <template v-else-if="tooltip">
       <a-tooltip v-bind="tooltip">
         <slot v-if="noButton"></slot>
-        <a-button v-else v-bind="buttonProps" :disabled="_isPermission"></a-button>
+        <a-button v-else v-bind="buttonProps" :disabled="_isPermission">
+          <slot></slot>
+          <template #icon>
+            <slot name="icon"></slot>
+          </template>
+        </a-button>
       </a-tooltip>
     </template>
     <template v-else>
       <slot v-if="noButton"></slot>
-      <a-button v-else v-bind="buttonProps" :disabled="_isPermission"></a-button>
+      <a-button v-else v-bind="buttonProps" :disabled="_isPermission">
+        <slot></slot>
+        <template #icon>
+          <slot name="icon"></slot>
+        </template>
+      </a-button>
     </template>
   </template>
   <a-tooltip v-else title="没有权限">
     <slot v-if="noButton"></slot>
-    <a-button v-else v-bind="buttonProps" :disabled="_isPermission"></a-button>
+    <a-button v-else v-bind="buttonProps" :disabled="_isPermission">
+      <slot></slot>
+      <template #icon>
+        <slot name="icon"></slot>
+      </template>
+    </a-button>
   </a-tooltip>
 </template>
 <script setup lang="ts" name="PermissionButton">
@@ -49,13 +74,13 @@ const isPermission = computed(() => {
   return permissionStore.hasPermission(props.hasPermission)
 })
 const _isPermission = computed(() =>
-  'hasPermission' in props && isPermission
+  'hasPermission' in props && isPermission.value
     ? 'disabled' in buttonProps
       ? buttonProps.disabled
       : false
     : true
 )
 </script>
-<style scoped lang="scss">
+<style scoped lang="less">
 
 </style>
\ No newline at end of file