From 5c8ff76a4a889de24e77d806d298dfb1314e3d9d Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Sat, 5 Oct 2024 21:18:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.js                                         | 1 -
 src/views/system/menuIcon/index.vue                      | 7 ++++---
 src/views/system/menuIcon/menu-icon-dialog.vue           | 2 +-
 src/views/system/menuIcon/menu-icon-select-icon-name.vue | 6 ++++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 1296cbf..faab037 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -153,7 +153,6 @@ export default defineFlatConfig([
 			'no-undef': 'off',
 			'no-unused-vars': 'off',
 			'vue/no-v-html': 'off',
-			'vue/no-mutating-props': 'off',
 			'vue/require-default-prop': 'off',
 			'vue/require-explicit-emits': 'off',
 			'vue/multi-word-component-names': 'off',
diff --git a/src/views/system/menuIcon/index.vue b/src/views/system/menuIcon/index.vue
index 64a4cad..c865db2 100644
--- a/src/views/system/menuIcon/index.vue
+++ b/src/views/system/menuIcon/index.vue
@@ -12,6 +12,7 @@ import Refresh from '@iconify-icons/ep/refresh';
 import { selectUserinfo } from '@/components/Table/Userinfo/columns';
 import { $t } from '@/plugins/i18n';
 import { useMenuIconStore } from '@/store/system/menuIcon';
+import MenuIconSelectIconName from '@/views/system/menuIcon/menu-icon-select-icon-name.vue';
 
 const tableRef = ref();
 const formRef = ref();
@@ -60,12 +61,12 @@ onMounted(() => {
 <template>
 	<div class="main">
 		<el-form ref="formRef" :inline="true" :model="menuIconStore.form" class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto">
-			<el-form-item :label="$t('menuIcon_iconName')" prop="iconName">
-				<el-input v-model="menuIconStore.form.iconName" :placeholder="`${$t('input')} ${$t('iconName')}`" class="!w-[180px]" clearable />
-			</el-form-item>
 			<el-form-item :label="$t('menuIcon_iconCode')" prop="iconCode">
 				<el-input v-model="menuIconStore.form.iconCode" :placeholder="`${$t('input')} ${$t('iconCode')}`" class="!w-[180px]" clearable />
 			</el-form-item>
+			<el-form-item :label="$t('menuIcon_iconName')" prop="iconName">
+				<MenuIconSelectIconName :form-inline="menuIconStore.form" class="!w-[180px]" />
+			</el-form-item>
 			<el-form-item>
 				<el-button :icon="useRenderIcon('ri:search-line')" :loading="menuIconStore.loading" type="primary" @click="onSearch"> {{ $t('search') }} </el-button>
 				<el-button :icon="useRenderIcon(Refresh)" @click="resetForm(formRef)"> {{ $t('buttons.reset') }}</el-button>
diff --git a/src/views/system/menuIcon/menu-icon-dialog.vue b/src/views/system/menuIcon/menu-icon-dialog.vue
index 2bad767..45532ed 100644
--- a/src/views/system/menuIcon/menu-icon-dialog.vue
+++ b/src/views/system/menuIcon/menu-icon-dialog.vue
@@ -26,7 +26,7 @@ defineExpose({ formRef });
 			<el-input v-model="form.iconCode" autocomplete="off" type="text" />
 		</el-form-item>
 		<el-form-item :label="$t('menuIcon_iconName')" prop="iconName">
-			<MenuIconSelectIconName :form="form" />
+			<MenuIconSelectIconName :formInline="form" />
 		</el-form-item>
 
 		<el-form-item v-show="form.iconCode" :label="$t('menuIcon_preview')">
diff --git a/src/views/system/menuIcon/menu-icon-select-icon-name.vue b/src/views/system/menuIcon/menu-icon-select-icon-name.vue
index 2f18d0a..515daea 100644
--- a/src/views/system/menuIcon/menu-icon-select-icon-name.vue
+++ b/src/views/system/menuIcon/menu-icon-select-icon-name.vue
@@ -3,13 +3,15 @@ import { $t } from '@/plugins/i18n';
 import { ref } from 'vue';
 import { fetchGetIconNameList } from '@/api/v1/menuIcon';
 import LoadingSvg from '@/assets/svg/loading.svg';
+import { FormProps } from '@/views/system/menuIcon/utils/types';
 
-defineProps({
-	form: { type: Object as PropType<any> },
+const props = withDefaults(defineProps<FormProps>(), {
+	formInline: () => ({}),
 });
 
 const loading = ref(false);
 const iconNameList = ref([]);
+const form = ref(props.formInline);
 
 /**
  * * 搜索