feat: 修改印章保存绘制

xxss0903 · Nov 24, 2024 · aaa84b1 · aaa84b1
1 parent 12f500a
commit aaa84b1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/src/DrawStampTypes.ts b/src/DrawStampTypes.ts
@@ -157,7 +157,6 @@ export type IDrawStampConfig = {
     primaryColor: string // 印章主色
     refreshSecurityPattern: boolean // 是否刷新防伪纹路
     refreshOld: boolean // 是否刷新做旧效果
-    shouldDrawRuler: boolean // 是否绘制标尺
     innerCircle: IInnerCircle // 内圈圆
     outThinCircle: IInnerCircle // 比外圈细的稍微内圈
     openManualAging: boolean // 是否开启手动做旧效果

diff --git a/src/DrawStampUtils.ts b/src/DrawStampUtils.ts
@@ -187,7 +187,6 @@ export class DrawStampUtils {
         refreshOld: false,
         taxNumber: this.taxNumber,
         agingEffect: this.agingEffect,
-        shouldDrawRuler: true,
         innerCircle: this.innerCircle,
         outThinCircle: this.outThinCircle,
         openManualAging: false,
@@ -1224,7 +1223,12 @@ export class DrawStampUtils {
      */
     saveStampAsPNG(outputSize: number = 512) {
         // 首先隐藏虚线
-        this.drawStampConfigs.shouldDrawRuler = false
+        this.drawStampConfigs.ruler.showCrossLine = false
+        this.drawStampConfigs.ruler.showRuler = false
+        this.drawStampConfigs.ruler.showDashLine = false
+        this.drawStampConfigs.ruler.showSideRuler = false
+        this.drawStampConfigs.ruler.showFullRuler = false
+        this.drawStampConfigs.ruler.showCurrentPositionText = false
         this.refreshStamp()
         setTimeout(() => {
             // 创建一个新的 canvas 元素，大小为 outputSize x outputSize
@@ -1237,7 +1241,7 @@ export class DrawStampUtils {
             // 清除画布，使背景透明
             saveCtx.clearRect(0, 0, outputSize, outputSize)
 
-            // 计算原始 canvas 中��章的位置和大小
+            // 计算原始 canvas 中印章的位置和大小
             const originalStampSize =
                 (Math.max(this.drawStampConfigs.width, this.drawStampConfigs.height) + 2) * this.mmToPixel
             const sourceX =
@@ -1278,8 +1282,13 @@ export class DrawStampUtils {
             link.click()
             document.body.removeChild(link)
 
-            // 首先隐藏虚线
-            this.drawStampConfigs.shouldDrawRuler = true
+            // 恢复标尺
+            this.drawStampConfigs.ruler.showCrossLine = true
+            this.drawStampConfigs.ruler.showRuler = true
+            this.drawStampConfigs.ruler.showDashLine = true
+            this.drawStampConfigs.ruler.showSideRuler = true
+            this.drawStampConfigs.ruler.showFullRuler = true
+            this.drawStampConfigs.ruler.showCurrentPositionText = true
             this.refreshStamp()
         }, 50)
     }

diff --git a/src/DrawStampUtilsDemo.vue b/src/DrawStampUtilsDemo.vue
@@ -25,7 +25,7 @@
       <div class="disclaimer-content">
         <div class="warning-icon">⚠️</div>
         <div class="warning-text">
-          <h3>安���警告</h3>
+          <h3>安全警告</h3>
           <p><strong>本项目仅供学习和参考！严禁用于任何非法用途！</strong></p>
           <p>
             1. 本项目开源代码仅用于技术学习和交流。<br>

diff --git a/src/assets/templates/companyStamp1.json b/src/assets/templates/companyStamp1.json
@@ -1555,7 +1555,6 @@
     "agingIntensity": 50,
     "agingEffectParams": []
   },
-  "shouldDrawRuler": true,
   "innerCircle": {
     "drawInnerCircle": true,
     "innerCircleLineWidth": 0.5,

diff --git a/src/assets/templates/companyStamp2.json b/src/assets/templates/companyStamp2.json
@@ -1555,7 +1555,6 @@
     "agingIntensity": 50,
     "agingEffectParams": []
   },
-  "shouldDrawRuler": true,
   "innerCircle": {
     "drawInnerCircle": true,
     "innerCircleLineWidth": 0.5,