From 487008281c7ba87712a1647d09899383e12fa759 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 29 七月 2026 15:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue b/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
index 3a23f26..42e4957 100644
--- a/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
+++ b/src/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
@@ -12,11 +12,12 @@
   nextTick,
   onUnmounted,
   ref,
+  toRaw,
   useTemplateRef,
   watch,
 } from 'vue';
 
-import { ChevronsDown, CircleAlert } from '..\..\..\..\base\icons\src';
+import { ChevronsDown, CircleAlert } from '../../../../base/icons/src';
 import {
   Button,
   FormControl,
@@ -27,8 +28,8 @@
   VbenCollapsible,
   VbenRenderContent,
   VbenTooltip,
-} from '..\..\..\shadcn-ui\src';
-import { cn, isFunction, isObject, isString } from '..\..\..\..\base\shared\src\utils';
+} from '../../../shadcn-ui/src';
+import { cn, isFunction, isObject, isString } from '../../../../base/shared/src/utils';
 
 import { toTypedSchema } from '@vee-validate/zod';
 import { useFieldError, useFormValues } from 'vee-validate';
@@ -88,16 +89,15 @@
   return formApi;
 }
 
-const FieldComponent = computed(() => {
-  const finalComponent = isString(component)
-    ? componentMap.value[component]
-    : component;
-  if (!finalComponent) {
-    // 缁勪欢鏈敞鍐�
-    console.warn(`Component ${component} is not registered`);
-  }
-  return finalComponent;
-});
+const FieldComponent = isString(component)
+  ? computed(() => {
+      const comp = componentMap.value[component];
+      if (!comp) {
+        console.warn(`Component ${component} is not registered`);
+      }
+      return comp;
+    })
+  : toRaw(component);
 
 const {
   dynamicComponentProps,

--
Gitblit v1.9.3