From 94ae3bb48a59f2492327668d8fa5ff62c232bc76 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 26 Dec 2025 21:08:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AEditor=20=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E3=80=81=E7=A6=81=E7=94=A8=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/src/Editor.vue                | 9 +++++++--
 src/views/mall/product/spu/form/DescriptionForm.vue | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
index c2905ff8b..36fe1650f 100644
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -8,6 +8,7 @@ import { ElMessage } from 'element-plus'
 import { useLocaleStore } from '@/store/modules/locale'
 import { getRefreshToken, getTenantId } from '@/utils/auth'
 import { getUploadUrl } from '@/components/UploadFile/src/useUpload'
+import merge from 'lodash-es/merge'
 
 defineOptions({ name: 'Editor' })
 
@@ -60,7 +61,11 @@ watch(
 )
 watch(
   () => props.readonly,
-  (val) => {
+  async (val) => {
+    // 特殊：等待 editorRef 渲染完成
+    if (!editorRef.value) {
+      await nextTick()
+    }
     if (val) {
       editorRef.value?.disable()
     } else {
@@ -75,7 +80,7 @@ const handleCreated = (editor: IDomEditor) => {
 
 // 编辑器配置
 const editorConfig = computed((): IEditorConfig => {
-  return Object.assign(
+  return merge(
     {
       placeholder: '请输入内容...',
       readOnly: props.readonly,
diff --git a/src/views/mall/product/spu/form/DescriptionForm.vue b/src/views/mall/product/spu/form/DescriptionForm.vue
index 600cb0087..63bc9d869 100644
--- a/src/views/mall/product/spu/form/DescriptionForm.vue
+++ b/src/views/mall/product/spu/form/DescriptionForm.vue
@@ -3,8 +3,7 @@
   <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" :disabled="isDetail">
     <!--富文本编辑器组件-->
     <el-form-item label="商品详情" prop="description">
-      <Editor v-if="!isDetail" v-model:modelValue="formData.description" />
-      <Editor v-else :modelValue="formData.description" readonly />
+      <Editor :readonly="isDetail" v-model:modelValue="formData.description" />
     </el-form-item>
   </el-form>
 </template>