From 3ded1868a3fffec8e3ece356b57b1ab26de20e04 Mon Sep 17 00:00:00 2001
From: zhouxiaofeng <2946471396@qq.com>
Date: Tue, 14 Jul 2026 12:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/ContractCollectModal.vue | 1 +
.../ContractTemplateFillDemoModal.vue | 2 +-
.../components/TemplateRichTextEditor.vue | 809 ++++++++++++++----
.../contract/shared/templateDocxRenderer.js | 2 +-
4 files changed, 664 insertions(+), 150 deletions(-)
diff --git a/src/views/contract/launch/components/ContractCollectModal.vue b/src/views/contract/launch/components/ContractCollectModal.vue
index a1f9967..58901a5 100644
--- a/src/views/contract/launch/components/ContractCollectModal.vue
+++ b/src/views/contract/launch/components/ContractCollectModal.vue
@@ -8,6 +8,7 @@
ok-text="确认采集"
cancel-text="取消"
@ok="handleSubmit"
+ centered
>
diff --git a/src/views/contract/launch/components/ContractTemplateFillDemoModal.vue b/src/views/contract/launch/components/ContractTemplateFillDemoModal.vue
index 3752314..1f6e977 100644
--- a/src/views/contract/launch/components/ContractTemplateFillDemoModal.vue
+++ b/src/views/contract/launch/components/ContractTemplateFillDemoModal.vue
@@ -1354,7 +1354,7 @@ onBeforeUnmount(() => {
.contract-template-layout {
display: grid;
- grid-template-columns: 460px minmax(0, 1fr);
+ grid-template-columns: 560px minmax(0, 1fr);
height: 100%;
min-height: 0;
}
diff --git a/src/views/contract/launch/components/TemplateRichTextEditor.vue b/src/views/contract/launch/components/TemplateRichTextEditor.vue
index 5e8d4cb..9b090ec 100644
--- a/src/views/contract/launch/components/TemplateRichTextEditor.vue
+++ b/src/views/contract/launch/components/TemplateRichTextEditor.vue
@@ -1,29 +1,111 @@
-
-
-
- 支持普通文字、列表和表格。复制带合并单元格的表格时会自动规整结构,建议粘贴后结合右侧预览确认最终 Word 效果。
+
+
+
+
+
+ 复制 Word 表格时会优先保留原始合并结构。表格较宽或包含合并单元格时,使用“宽屏编辑”可避免内容被压缩成竖排。
+
+
+
+
+
diff --git a/src/views/contract/shared/templateDocxRenderer.js b/src/views/contract/shared/templateDocxRenderer.js
index cfb6ba9..b288d8c 100644
--- a/src/views/contract/shared/templateDocxRenderer.js
+++ b/src/views/contract/shared/templateDocxRenderer.js
@@ -602,7 +602,7 @@ function buildWordTableCellXml(
]
if (cellEntry?.kind === 'continuation') {
- tcProps.push('
')
+ tcProps.push('
')
return `
${tcProps.filter(Boolean).join('')}${buildParagraphXml('', { align: defaultCellAlign })}`
}