From 55814a6a3036751d8fdbe57b822158a7476e350d Mon Sep 17 00:00:00 2001
From: valarchie <343928303@qq.com>
Date: Sat, 5 Aug 2023 14:34:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95ico?=
 =?UTF-8?q?n=E5=92=8C=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/form.vue       | 36 ++++++++++++++++++++++------
 src/views/system/menu/utils/hook.tsx | 11 +++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
index 29408ab..d7d488c 100644
--- a/src/views/system/menu/form.vue
+++ b/src/views/system/menu/form.vue
@@ -4,6 +4,7 @@ import ReCol from "@/components/ReCol";
 import { formRules } from "./utils/rule";
 import { usePublicHooks } from "../hooks";
 import { MenuRequest } from "@/api/system/menu";
+import IconSelect from "@/components/ReIcon/src/Select.vue";
 
 interface FormProps {
   formInline: MenuRequest;
@@ -101,7 +102,13 @@ defineExpose({ getRef });
         </re-col>
       </template>
     </el-row>
-
+    <el-row :gutter="30">
+      <re-col :value="12" :xs="24" :sm="24">
+        <el-form-item :label="`${typeName}图标`" prop="meta.icon">
+          <IconSelect v-model="newFormInline.meta.icon" />
+        </el-form-item>
+      </re-col>
+    </el-row>
     <el-row :gutter="30">
       <re-col :value="12" :xs="24" :sm="24">
         <el-form-item :label="`${typeName}名称`" prop="menuName">
@@ -188,12 +195,15 @@ defineExpose({ getRef });
 
     <el-row>
       <re-col :value="12" :xs="24" :sm="24">
-        <el-form-item label="排序">
-          <el-input-number
-            v-model="newFormInline.meta.rank"
-            :min="0"
-            :max="999"
-            controls-position="right"
+        <el-form-item label="显示">
+          <el-switch
+            v-model="newFormInline.meta.showLink"
+            inline-prompt
+            :active-value="true"
+            :inactive-value="false"
+            active-text="显示"
+            inactive-text="隐藏"
+            :style="switchStyle"
           />
         </el-form-item>
       </re-col>
@@ -211,5 +221,17 @@ defineExpose({ getRef });
         </el-form-item>
       </re-col>
     </el-row>
+    <el-row>
+      <re-col :value="12" :xs="24" :sm="24">
+        <el-form-item label="排序">
+          <el-input-number
+            v-model="newFormInline.meta.rank"
+            :min="0"
+            :max="999"
+            controls-position="right"
+          />
+        </el-form-item>
+      </re-col>
+    </el-row>
   </el-form>
 </template>
diff --git a/src/views/system/menu/utils/hook.tsx b/src/views/system/menu/utils/hook.tsx
index 1a62c75..5265ae7 100644
--- a/src/views/system/menu/utils/hook.tsx
+++ b/src/views/system/menu/utils/hook.tsx
@@ -17,6 +17,7 @@ import { usePublicHooks } from "../../hooks";
 import { addDialog } from "@/components/ReDialog";
 import { reactive, ref, onMounted, h, computed } from "vue";
 import { isAllEmpty } from "@pureadmin/utils";
+import { IconifyIconOnline } from "@/components/ReIcon";
 
 export function useHook() {
   const searchFormParams = reactive({
@@ -65,6 +66,16 @@ export function useHook() {
       width: 160,
       align: "center"
     },
+    {
+      label: "图标",
+      prop: "row.icon",
+      minWidth: 40,
+      cellRenderer: ({ row }) => (
+        <div class="flex justify-center">
+          <IconifyIconOnline icon={row.icon} />
+        </div>
+      )
+    },
     {
       label: "状态",
       prop: "status",