From cadad25176f06231370afa219e7a379c687238e8 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 20 Sep 2022 18:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E8=B5=84=E8=AE=AF=E5=9B=BE=E6=A0=87=E9=A2=84=E8=A7=88=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/image-contain/index.vue | 6 +++++-
 admin/src/views/article/lists/index.vue      | 5 +++--
 admin/src/views/permission/menu/edit.vue     | 9 +++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/admin/src/components/image-contain/index.vue b/admin/src/components/image-contain/index.vue
index e0285b92..1961025b 100644
--- a/admin/src/components/image-contain/index.vue
+++ b/admin/src/components/image-contain/index.vue
@@ -20,7 +20,11 @@ const props = defineProps({
         type: [String, Number],
         default: 0
     },
-    ...imageProps
+    ...imageProps,
+    hideOnClickModal: {
+        type: Boolean,
+        default: true
+    }
 })
 
 const styles = computed<CSSProperties>(() => {
diff --git a/admin/src/views/article/lists/index.vue b/admin/src/views/article/lists/index.vue
index 1e8b4ce2..82e0da29 100644
--- a/admin/src/views/article/lists/index.vue
+++ b/admin/src/views/article/lists/index.vue
@@ -54,10 +54,11 @@
                 <el-table-column label="ID" prop="id" min-width="80" />
                 <el-table-column label="封面" min-width="100">
                     <template #default="{ row }">
-                        <el-image
+                        <image-contain
                             v-if="row.image"
                             :src="row.image"
-                            class="w-[60px] h-[45px]"
+                            :width="60"
+                            :height="45"
                             :preview-src-list="[row.image]"
                             preview-teleported
                             fit="contain"
diff --git a/admin/src/views/permission/menu/edit.vue b/admin/src/views/permission/menu/edit.vue
index 2b2305c5..891f29cc 100644
--- a/admin/src/views/permission/menu/edit.vue
+++ b/admin/src/views/permission/menu/edit.vue
@@ -73,7 +73,7 @@
                         </div>
                     </div>
                 </el-form-item>
-                <el-form-item label="选中菜单" prop="p" v-if="formData.menuType == MenuEnum.MENU">
+                <el-form-item label="选中菜单" prop="selected" v-if="formData.menuType == MenuEnum.MENU">
                     <div class="flex-1">
                         <el-input
                             v-model="formData.selected"
@@ -259,15 +259,12 @@ const formRules = {
 }
 const menuOptions = ref<any[]>([])
 
-const pageOptions = ref<any[]>([])
-
 const getMenu = async () => {
     const data: any = await menuLists()
-    const menu = { id: 0, menuName: '顶级', children: [] }
-    pageOptions.value = arrayToTree(
+    const menu: any = { id: 0, menuName: '顶级', children: [] }
+    menu.children = arrayToTree(
         treeToArray(data).filter((item) => item.menuType != MenuEnum.BUTTON)
     )
-    menu.children = data
     menuOptions.value.push(menu)
 }