update

kooriookami · Aug 9, 2023 · 06869ab · 06869ab
1 parent 5eac389
commit 06869ab
Show file tree

Hide file tree

Showing 7 changed files with 653 additions and 635 deletions.
diff --git a/docs/assets/index-39d241f9.js b/docs/assets/index-39d241f9.js
diff --git a/docs/assets/index-9acee7d0.js b/docs/assets/index-9acee7d0.js
diff --git a/docs/index.html b/docs/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="./vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Compress Text</title>
-    <script type="module" crossorigin src="./assets/index-39d241f9.js"></script>
+    <script type="module" crossorigin src="./assets/index-9acee7d0.js"></script>
     <link rel="stylesheet" href="./assets/index-2d5204f1.css">
   </head>
   <body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@element-plus/icons-vue": "^2.1.0",
     "element-plus": "^2.3.9",
     "leafer-compress-text": "workspace:*",
-    "leafer-ui": "^1.0.0-beta.8",
+    "leafer-ui": "^1.0.0-beta.9",
     "lodash": "^4.17.21",
     "normalize.css": "^8.0.1",
     "vue": "^3.3.4"
@@ -46,6 +46,6 @@
     "jsonfile": "^6.1.0",
     "rollup-plugin-copy": "^3.4.0",
     "sass": "^1.64.2",
-    "vite": "^4.4.8"
+    "vite": "^4.4.9"
   }
 }
diff --git a/packages/compress-text/package.json b/packages/compress-text/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leafer-compress-text",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "main": "src/index.js",
   "module": "src/index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "kooriookami",
   "license": "ISC",
   "dependencies": {
-    "leafer-ui": "^1.0.0-beta.8",
+    "leafer-ui": "^1.0.0-beta.9",
     "lodash": "^4.17.21"
   }
 }
diff --git a/packages/compress-text/src/compress-text.js b/packages/compress-text/src/compress-text.js
@@ -413,12 +413,31 @@ export class CompressText extends Group {
 
   // 添加行
   addRow() {
+    this.removeLineLastSpace(this.currentLine);
     const fontSize = this.isSmallSize ? this.smallFontSize : this.fontSize;
     this.currentX = 0;
     this.currentY += fontSize * this.lineHeight * this.fontScale;
     this.currentLine++;
   }
 
+  // 删除行尾空格
+  removeLineLastSpace(line) {
+    const charList = this.parseList.map(item => item.ruby.charList).flat();
+    const lineList = charList.filter(item => item.line === line);
+    if (lineList.length) {
+      const lastChar = lineList[lineList.length - 1];
+      if (lastChar.text === ' ') {
+        const lastCharLeaf = lastChar.charLeaf;
+        const lastPaddingLeft = lastChar.paddingLeft || 0;
+        const lastPaddingRight = lastChar.paddingRight || 0;
+        this.currentX -= lastChar.width + lastPaddingLeft + lastPaddingRight;
+        lastCharLeaf.remove();
+        lastChar.line = -1;
+        this.removeLineLastSpace(line);
+      }
+    }
+  }
+
   // 定位rt
   positionRt(item) {
     const ruby = item.ruby;