From 39cd9f4a449cad7428c61e30403a8cb91be73147 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 8 Mar 2022 14:36:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96TableAction=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/js/components/TableAction.vue      | 24 ++++++++++++++++---
 resources/assets/sass/pages/common.scss       |  3 +++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/components/TableAction.vue b/resources/assets/js/components/TableAction.vue
index 2c377d1a2..b23a24c4a 100644
--- a/resources/assets/js/components/TableAction.vue
+++ b/resources/assets/js/components/TableAction.vue
@@ -21,7 +21,16 @@
                     trigger="click"
                     class="menu-dropdown"
                     @command="onClick">
-                    <i class="aliicon menu-icon" v-html="item.icon" :style="item.style || {}"></i>
+                    <i
+                        v-if="isAliIcon(item.icon)"
+                        class="aliicon menu-icon"
+                        v-html="item.icon"
+                        :style="item.style || {}"/>
+                    <Icon
+                        v-else
+                        class="menu-icon"
+                        :type="item.icon"
+                        :style="item.style || {}"/>
                     <EDropdownMenu slot="dropdown">
                         <EDropdownItem
                             v-for="(d, k) in item.children"
@@ -34,11 +43,17 @@
                     </EDropdownMenu>
                 </EDropdown>
                 <i
-                    v-else
+                    v-else-if="isAliIcon(item.icon)"
                     class="aliicon menu-icon"
                     v-html="item.icon"
                     :style="item.style || {}"
-                    @click="onClick(item.action)"></i>
+                    @click="onClick(item.action)"/>
+                <Icon
+                    v-else
+                    class="menu-icon"
+                    :type="item.icon"
+                    :style="item.style || {}"
+                    @click="onClick(item.action)"/>
             </ETooltip>
         </div>
     </div>
@@ -111,6 +126,9 @@ Vue.use(VueResizeObserver);
             }
         },
         methods: {
+            isAliIcon(icon) {
+                return $A.leftExists(icon, '&#')
+            },
             handleIn() {
                 if (this.$refs.action.offsetWidth != this.width) {
                     this.onUpdate();
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 26322debd..a3c490b54 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -133,6 +133,9 @@ body {
                         cursor: pointer;
                         font-size: 21px;
                         padding: 0 6px;
+                        &.ivu-icon {
+                            font-size: 16px;
+                        }
                     }
                 }
             }