楚江ERP：规格展示优化

@@ -13,6 +13,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.*;
 import java.awt.Color;
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -138,34 +139,51 @@ public class LatexFormulaExcelExporterUtil {
      * 将LaTeX公式作为图片插入到指定单元格
      * 将LaTeX公式作为图片插入到指定单元格
      */
      */
     public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
     public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
-        // 1. 将LaTeX渲染为图片字节
+        // 设置固定30像素行高
+        Row row = sheet.getRow(rowIndex);
+        if (row == null) {
+            row = sheet.createRow(rowIndex);
+        }
+
+        row.setHeightInPoints(22.5f); // 30像素
+
         byte[] imageBytes = latexToImageBytes(latex, 48);
         byte[] imageBytes = latexToImageBytes(latex, 48);
+        ByteArrayInputStream bais = new ByteArrayInputStream(imageBytes);
+        BufferedImage image = ImageIO.read(bais);
+        bais.close();
+
+        // 如果图片高度超过30像素，按比例缩小
+        double scale = 1.0;
+        if (image.getHeight() > 30) {
+            scale = 30.0 / image.getHeight();
+            System.out.println("图片需要缩放: " + scale);
+        }
 
 
-        // 2. 将图片添加到工作簿
         int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
         int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
-
-        // 3. 创建绘图对象
         Drawing<?> drawing = sheet.createDrawingPatriarch();
         Drawing<?> drawing = sheet.createDrawingPatriarch();
 
 
-        // 4. 创建锚点，确定图片位置
         ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
         ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
-        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
-        anchor.setCol1(colIndex); // C列 (从0开始计数)
-        anchor.setRow1(rowIndex); // 当前数据行 (表头在第0行)
-        anchor.setCol2(colIndex + 1); // 结束于D列
-        anchor.setRow2(rowIndex + 1); // 结束于下一行
-
-        // 设置较小的起始偏移
-        anchor.setDx1(50);   // 水平偏移（建议值：10-100）
-        anchor.setDy1(25);   // 垂直偏移（建议值：10-50）
+        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
+
+        anchor.setCol1(colIndex);
+        anchor.setRow1(rowIndex);
+        anchor.setCol2(colIndex);
+        anchor.setRow2(rowIndex);
+
+        int scaledWidth = (int) (image.getWidth() * scale);
+        int rate = 1;
+        if (scaledWidth >= 60 && scaledWidth <= 150) {
+            rate = 2;
+        } else if (scaledWidth > 150) {
+            rate = 3;
+        }
 
 
+        anchor.setDx1(25);
+        anchor.setDy1(25);
+        anchor.setDx2(330 * rate);
+        anchor.setDy2(235);
 
 
-        // 5. 创建图片并插入
-        Picture pict = drawing.createPicture(anchor, pictureIdx);
-
-        // 6. 自动调整图片大小以适应单元格 (可选)
-        // 取消注释此行使图片自动适应锚点区域
-//        pict.resize(0.95); // 缩小到90%，自然产生边距
+        drawing.createPicture(anchor, pictureIdx);
     }
     }
 
 
     /**
     /**