From 6f3fac4493995e16ee0f37c6cf2b06e5de2a6a72 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 02 七月 2025 16:27:37 +0800
Subject: [PATCH] 1. 将场景图片的分类修改为从服务端动态获取； 2. 问题整改节目中的问题复现功能修改为可拖动对话框且移除背景模态框；
---
src/utils/doc.js | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/utils/doc.js b/src/utils/doc.js
index 25115f2..a757cfc 100644
--- a/src/utils/doc.js
+++ b/src/utils/doc.js
@@ -81,10 +81,20 @@
let width = image.width;
let height = image.height;
- if (width > height && horizontalHeight && height > horizontalHeight && scale) {
+ if (
+ width > height &&
+ horizontalHeight &&
+ height > horizontalHeight &&
+ scale
+ ) {
height = horizontalHeight;
width = horizontalHeight * scale;
- } else if (width <= height && verticalWidth && width > verticalWidth && scale) {
+ } else if (
+ width <= height &&
+ verticalWidth &&
+ width > verticalWidth &&
+ scale
+ ) {
width = verticalWidth;
height = verticalWidth * scale;
}
@@ -144,12 +154,15 @@
throw error;
}
const zip = new Pizzip(content);
- const imageOptions = getImageOptions(imageSize);
let doc = new docxtemplater()
.setOptions({ paragraphLoop: true })
- .loadZip(zip)
- .attachModule(new ImageModule(imageOptions))
- .compile();
+ .loadZip(zip);
+
+ if (imageSize) {
+ const imageOptions = getImageOptions(imageSize);
+ doc.attachModule(new ImageModule(imageOptions));
+ }
+ doc.compile();
doc.resolveData(data).then(() => {
try {
doc.render();
--
Gitblit v1.9.3