fix: office-viewer excel 去掉字母间距导致显示不正确问题

baidu · Mar 22, 2024 · e76d6a0 · e76d6a0
1 parent 3ea2bb6
commit e76d6a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/packages/amis/package.json b/packages/amis/package.json
@@ -62,7 +62,7 @@
     "moment": "^2.19.4",
     "moment-timezone": "^0.5.34",
     "mpegts.js": "^1.6.10",
-    "office-viewer": "^0.3.7",
+    "office-viewer": "^0.3.8",
     "prop-types": "^15.6.1",
     "qrcode.react": "^3.1.0",
     "react-cropper": "^2.1.8",

diff --git a/packages/office-viewer/package.json b/packages/office-viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "office-viewer",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "office 文档在线预览",
   "main": "lib/index.js",
   "module": "esm/index.js",

diff --git a/packages/office-viewer/src/excel/render/cell/drawMultiLineText.ts b/packages/office-viewer/src/excel/render/cell/drawMultiLineText.ts
@@ -38,8 +38,6 @@ export function drawMultiLineText(
 
   const defaultFontHeight = dataProvider.getDefaultFontSize().height;
 
-  const latterSpace = defaultFontHeight * 0.1;
-
   const textPositions: Rect[] = [];
 
   const totalLineHeight = lines.reduce((acc, line) => {
@@ -65,9 +63,6 @@ export function drawMultiLineText(
       return acc + (token.w || 0);
     }, 0);
 
-    // 加上字母间距
-    totalLineWidth += latterSpace * (tokens.length - 1);
-
     if (horizontal === 'center') {
       currentX = x + (width - totalLineWidth) / 2;
     } else if (horizontal === 'right') {
@@ -97,7 +92,7 @@ export function drawMultiLineText(
         height: fontHeight
       });
       // 这里其实不大可能为零
-      currentX = currentX + (token.w || 0) + latterSpace;
+      currentX = currentX + (token.w || 0);
     }
     const lineHeight = line.maxHeight || defaultFontHeight;
     textHeight += lineHeight;