From 1b1441e04a42fd4b4e30eff3669b3e85c9c37523 Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Mon, 31 Aug 2026 12:07:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D`:[modelValueProp]=3D"?=
 =?UTF-8?q?currentSelect"`=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/icon-picker/icon-picker.vue    | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/effects/common-ui/src/components/icon-picker/icon-picker.vue b/packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
index 536fd8c4b..32624f5ef 100644
--- a/packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
+++ b/packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
@@ -1,7 +1,14 @@
 <script setup lang="ts">
 import type { IconPickerProps } from './types';
 
-import { computed, ref, useAttrs, watch, watchEffect } from 'vue';
+import {
+  computed,
+  onBeforeUpdate,
+  ref,
+  useAttrs,
+  watch,
+  watchEffect,
+} from 'vue';
 
 import { usePagination } from '@vben/hooks';
 import { EmptyIcon, Grip, listIcons } from '@vben/icons';
@@ -100,7 +107,17 @@ const { paginationList, total, setCurrentPage, currentPage } = usePagination(
 );
 
 watchEffect(() => {
-  currentSelect.value = modelValue.value;
+  currentSelect.value =
+    props.modelValueProp === 'modelValue'
+      ? modelValue.value
+      : ((attrs[props.modelValueProp] as string) ?? '');
+});
+
+onBeforeUpdate(() => {
+  if (props.modelValueProp !== 'modelValue') {
+    currentSelect.value =
+      (attrs[props.modelValueProp] as string | undefined) ?? '';
+  }
 });
 
 watch(
@@ -111,8 +128,7 @@ watch(
 );
 
 const handleClick = (icon: string) => {
-  currentSelect.value = icon;
-  modelValue.value = icon;
+  updateCurrentSelect(icon);
   close();
 };