From 761d7f1f74078ef4e9a4c2ae295ff94975e5680f Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 24 Apr 2023 17:18:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/systemMenus/index.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index c31cd2f84..0efe4847b 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -45,6 +45,11 @@
       >
         <vxe-table-column field="id" title="ID" tooltip min-width="70"></vxe-table-column>
         <vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="200"></vxe-table-column>
+        <vxe-table-column field="icon" title="图标" min-width="200" align="center">
+          <template v-slot="{ row }">
+            <Icon class="icon" :type="row.icon" />
+          </template>
+        </vxe-table-column>
         <vxe-table-column field="api_url" title="接口路径" min-width="150">
           <template v-slot="{ row }">
             <span>{{ row.methods ? '[' + row.methods + ']  ' + row.api_url : row.api_url }}</span>
@@ -452,6 +457,9 @@ export default {
   > .vxe-table--header-wrapper {
     background: #fff !important;
   }
+  .icon {
+    font-size: 20px;
+  }
 }
 
 .rule {

From 1c0810fe9b5ea1b67c6011c9af25cf7f8eb8411b Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 24 Apr 2023 17:23:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E4=BB=A3=E7=A0=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/system/codeGeneration/list.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue
index 87e35705e..99b1d8846 100644
--- a/template/admin/src/pages/system/codeGeneration/list.vue
+++ b/template/admin/src/pages/system/codeGeneration/list.vue
@@ -92,9 +92,9 @@
                 :icon="value.icon"
               >
                 <div
-                  :ref="'container_' + value.index"
+                  ref="container"
                   :id="'container_' + value.index"
-                  style="height: 100%; min-height: 560px"
+                  style="height: 100%; min-height: calc(100vh - 110px)"
                 ></div>
               </TabPane>
             </Tabs>
@@ -571,7 +571,6 @@ export default {
 
   .ivu-tabs-tabpane {
     min-height: 560px;
-    height: 73vh;
     margin-top: -1px;
   }
 }
@@ -612,4 +611,7 @@ export default {
     z-index: 99;
   }
 }
+.file-box {
+  height: 100%;
+}
 </style>