From 533739104e80668a388824c492461f63a1fda569 Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Thu, 30 Oct 2025 00:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85=E5=92=8C?=
 =?UTF-8?q?=E5=9C=86=E5=BD=A2=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.json         |  2 +-
 design1.html      | 20 ++++++++----
 package copy.json | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json      | 57 +++++++++++++++++++++------------
 4 files changed, 132 insertions(+), 28 deletions(-)
 create mode 100644 package copy.json

diff --git a/data.json b/data.json
index 724d7e4..af0535c 100644
--- a/data.json
+++ b/data.json
@@ -1 +1 @@
-{"history":[{"time":"2025-6-2","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi6.soon"},{"time":"2025-6-3","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi7.soon"},{"time":"2025-4-9","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi5.soon"},{"time":"2025-4-9","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi.soon"}]}
\ No newline at end of file
+{"history":[{"time":"2025-6-3","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi7.soon"},{"time":"2025-4-9","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi5.soon"},{"time":"2025-4-9","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi.soon"},{"time":"2025-10-22","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi6.soon"},{"time":"2025-10-29","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\示例模版.soon"}]}
\ No newline at end of file
diff --git a/design1.html b/design1.html
index 1e4c4b1..5cee212 100644
--- a/design1.html
+++ b/design1.html
@@ -194,6 +194,10 @@
                                 <select class="ui-select" id="circle_text_font_family">
                                 </select>
                             </div>
+                            <div class="component-line">
+                                <span class="name" language="m" zh="自动圆心：" ozh="自動圆心：" en="Automatic center:"></span>
+                                <input type="checkbox" name="circle_text_center" id="circle_text_center" class="radio">
+                            </div>
                             <div class="component-line">
                                 <span class="name" language="m" zh="字号：" ozh="字號：" en="Size:"></span>
                                 <div id="circle_text_size"
@@ -1308,8 +1312,8 @@
                     let url1 = new fabric.Group(g1).toDataURL({
                         height: 2787,
                         width: 2787,
-                        top: top,
-                        left: left
+                        top: all_top,
+                        left: all_left
                     });
 
                     g3.push(img1);
@@ -1991,8 +1995,8 @@
                             let url1 = new fabric.Group(g1).toDataURL({
                                 height: 2787,
                                 width: 2787,
-                                top: top,
-                                left: left
+                                top: all_top,
+                                left: all_left
                             });
                             g3.push(img1);
                             let url3 = new fabric.Group(g3).toDataURL({
@@ -2591,8 +2595,8 @@
                             let url1 = new fabric.Group(g1).toDataURL({
                                 height: 2787,
                                 width: 2787,
-                                top: top,
-                                left: left
+                                top: all_top,
+                                left: all_left
                             });
                             g3.push(img1);
                             let url3 = new fabric.Group(g3).toDataURL({
@@ -4953,6 +4957,7 @@
                     } else {
                         $("#text_linethrough").removeClass("ui-radio-acitve")
                     }
+                    $("#circle_text_control").hide();
                     $("#pic_control").hide();
                     $("#set_bg").hide();
                     $("#out_pic_control").hide();
@@ -5029,6 +5034,7 @@
                     $("#circle_text_back_color").val(canvas.getActiveObject().get("textBackgroundColor") == "" ? '#ffffff' : canvas.getActiveObject().get("textBackgroundColor"));
                     circle_text_size.setValue(canvas.getActiveObject().get("fontSize") - 10);
                     circle_text_diameter.setValue(canvas.getActiveObject().get("diameter")-500);
+                    // $("#circle_text_center").prop("checked", true);
                     $("#circle_text_text").val(canvas.getActiveObject().get("text"));
                     $("#circle_text_font_family").val(canvas.getActiveObject().get("fontFamily"));
 
@@ -6213,7 +6219,7 @@
                 });
                 canvas1.on("object:moving", function (e) {
                     let obj = canvas.getActiveObject()
-                    if (objs[getIndex(e.target) - 1].type && objs[getIndex(e.target) - 1].type ===11) {
+                    if (objs[getIndex(e.target) - 1].type && objs[getIndex(e.target) - 1].type ===11&&$("#circle_text_center").prop("checked")) {
                         let pointer = {
                             x: obj.left,
                             y: obj.top
diff --git a/package copy.json b/package copy.json
new file mode 100644
index 0000000..c5f8a00
--- /dev/null
+++ b/package copy.json	
@@ -0,0 +1,81 @@
+{
+  "name": "soondesign",
+  "version": "2.1.248",
+  "description": "tools of design soon files",
+  "main": "main.js",
+  "scripts": {
+    "start": "electron .",
+    "package": "electron-packager ./ SoonDesign --out ./OutApp --platform=win32 --arch=x64 --electron-version 15.1.1 --icon public/images/favicon.ico --asar --overwrite --download.mirrorOptions.mirror=https://npmmirror.com/mirrors/electron/",
+    "dist": "webpack",
+    "build": "electron-builder"
+  },
+  "electronPackagerConfig": {
+    "packageManager": "npm",
+    "icon": "public/images/favicon.ico"
+  },
+  "build": {
+    "productName": "SoonDesign",
+    "appId": "com.SoonDesign",
+    "copyright": "Copyright@2023 cardsoon.com",
+    "directories": {
+      "output": "build"
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowElevation": true,
+      "allowToChangeInstallationDirectory": true,
+      "installerIcon": "./public/images/favicon.ico",
+      "uninstallerIcon": "./public/images/favicon.ico",
+      "installerHeaderIcon": "./public/images/favicon.ico",
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true
+    },
+    "fileAssociations": [
+      {
+        "name": "SoonDesign file",
+        "ext": "soon",
+        "icon": "./public/images/favicon.ico",
+        "description": "SoonDesign file associations"
+      }
+    ],
+    "asar": true,
+    "win": {
+      "icon": "public/images/favicon.ico",
+      "requestedExecutionLevel": "requireAdministrator",
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64"
+          ]
+        }
+      ]
+    }
+  },
+  "repository": "",
+  "keywords": [
+    "Electron",
+    "quick",
+    "start",
+    "tutorial",
+    "demo"
+  ],
+  "author": "",
+  "license": "MIT",
+  "devDependencies": {
+    "electron": "^15.2.0",
+    "electron-builder": "^23.3.3",
+    "electron-packager": "^15.5.2"
+  },
+  "dependencies": {
+    "@electron/remote": "^2.0.8",
+    "buffer": "^6.0.3",
+    "bytenode": "^1.3.4",
+    "font-list": "^1.4.2",
+    "jr-qrcode": "^1.1.4",
+    "jsbarcode": "^3.11.5",
+    "less": "^4.1.2",
+    "less-loader": "^10.2.0",
+    "save": "^2.9.0"
+  }
+}
diff --git a/package.json b/package.json
index c5f8a00..d986b87 100644
--- a/package.json
+++ b/package.json
@@ -1,32 +1,38 @@
 {
-  "name": "soondesign",
+  "name": "SoonDesign",
   "version": "2.1.248",
   "description": "tools of design soon files",
   "main": "main.js",
   "scripts": {
-    "start": "electron .",
-    "package": "electron-packager ./ SoonDesign --out ./OutApp --platform=win32 --arch=x64 --electron-version 15.1.1 --icon public/images/favicon.ico --asar --overwrite --download.mirrorOptions.mirror=https://npmmirror.com/mirrors/electron/",
-    "dist": "webpack",
-    "build": "electron-builder"
+    "start": "electron-forge start",
+    "build": "node electron-vue/build.js && electron-builder",
+    "builder": "electron-builder",
+    "packmain": "node electron-vue/build.js",
+    "build:dir": "node electron-vue/build.js && electron-builder --dir",
+    "build:clean": "cross-env BUILD_TARGET=clean node electron-vue/build.js",
+    "build:web": "cross-env BUILD_TARGET=web node electron-vue/build.js",
+    "package:x64": "electron-forge package --arch=x64",
+    "package:arm64": "electron-forge package --arch=arm64",
+    "merge": "node ./merge.js",
+    "package:universal": "npm run package:x64 && npm run package:arm64 && npm run merge"
   },
-  "electronPackagerConfig": {
-    "packageManager": "npm",
-    "icon": "public/images/favicon.ico"
-  },
-  "build": {
+    "build": {
     "productName": "SoonDesign",
     "appId": "com.SoonDesign",
-    "copyright": "Copyright@2023 cardsoon.com",
+    "copyright": "",
     "directories": {
       "output": "build"
     },
+    "extraFiles": [
+      "lib"
+    ],
     "nsis": {
       "oneClick": false,
       "allowElevation": true,
       "allowToChangeInstallationDirectory": true,
-      "installerIcon": "./public/images/favicon.ico",
-      "uninstallerIcon": "./public/images/favicon.ico",
-      "installerHeaderIcon": "./public/images/favicon.ico",
+      "installerIcon": "public/images/favicon.ico",
+      "uninstallerIcon": "public/images/favicon.ico",
+      "installerHeaderIcon": "public/images/favicon.ico",
       "createDesktopShortcut": true,
       "createStartMenuShortcut": true
     },
@@ -34,14 +40,14 @@
       {
         "name": "SoonDesign file",
         "ext": "soon",
-        "icon": "./public/images/favicon.ico",
+        "icon": "public/images/favicon.ico",
         "description": "SoonDesign file associations"
       }
     ],
     "asar": true,
     "win": {
-      "icon": "public/images/favicon.ico",
-      "requestedExecutionLevel": "requireAdministrator",
+      "icon":  "public/images/favicon.ico",
+      "requestedExecutionLevel": "asInvoker",
       "target": [
         {
           "target": "nsis",
@@ -52,6 +58,17 @@
       ]
     }
   },
+  "electronPackagerConfig": {
+    "packageManager": "npm",
+    "icon":  "./public/images/favicon.ico"
+  },
+  "config": {
+    "forge": {
+      "packagerConfig": {
+        "icon": "./public/images/favicon.icns"
+      }
+    }
+  },
   "repository": "",
   "keywords": [
     "Electron",
@@ -63,14 +80,14 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "electron": "^15.2.0",
-    "electron-builder": "^23.3.3",
-    "electron-packager": "^15.5.2"
+    "@electron-forge/cli": "^6.2.0",
+    "electron": "^25.0.0"
   },
   "dependencies": {
     "@electron/remote": "^2.0.8",
     "buffer": "^6.0.3",
     "bytenode": "^1.3.4",
+    "electron-squirrel-startup": "^1.0.1",
     "font-list": "^1.4.2",
     "jr-qrcode": "^1.1.4",
     "jsbarcode": "^3.11.5",