优化打包和圆形文字

This commit is contained in:
24kycj
2025-10-30 00:29:05 +08:00
parent 165f9d37be
commit 533739104e
4 changed files with 132 additions and 28 deletions
+1 -1
View File
@@ -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"}]} {"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"}]}
+13 -7
View File
@@ -194,6 +194,10 @@
<select class="ui-select" id="circle_text_font_family"> <select class="ui-select" id="circle_text_font_family">
</select> </select>
</div> </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"> <div class="component-line">
<span class="name" language="m" zh="字号:" ozh="字號:" en="Size:"></span> <span class="name" language="m" zh="字号:" ozh="字號:" en="Size:"></span>
<div id="circle_text_size" <div id="circle_text_size"
@@ -1308,8 +1312,8 @@
let url1 = new fabric.Group(g1).toDataURL({ let url1 = new fabric.Group(g1).toDataURL({
height: 2787, height: 2787,
width: 2787, width: 2787,
top: top, top: all_top,
left: left left: all_left
}); });
g3.push(img1); g3.push(img1);
@@ -1991,8 +1995,8 @@
let url1 = new fabric.Group(g1).toDataURL({ let url1 = new fabric.Group(g1).toDataURL({
height: 2787, height: 2787,
width: 2787, width: 2787,
top: top, top: all_top,
left: left left: all_left
}); });
g3.push(img1); g3.push(img1);
let url3 = new fabric.Group(g3).toDataURL({ let url3 = new fabric.Group(g3).toDataURL({
@@ -2591,8 +2595,8 @@
let url1 = new fabric.Group(g1).toDataURL({ let url1 = new fabric.Group(g1).toDataURL({
height: 2787, height: 2787,
width: 2787, width: 2787,
top: top, top: all_top,
left: left left: all_left
}); });
g3.push(img1); g3.push(img1);
let url3 = new fabric.Group(g3).toDataURL({ let url3 = new fabric.Group(g3).toDataURL({
@@ -4953,6 +4957,7 @@
} else { } else {
$("#text_linethrough").removeClass("ui-radio-acitve") $("#text_linethrough").removeClass("ui-radio-acitve")
} }
$("#circle_text_control").hide();
$("#pic_control").hide(); $("#pic_control").hide();
$("#set_bg").hide(); $("#set_bg").hide();
$("#out_pic_control").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_back_color").val(canvas.getActiveObject().get("textBackgroundColor") == "" ? '#ffffff' : canvas.getActiveObject().get("textBackgroundColor"));
circle_text_size.setValue(canvas.getActiveObject().get("fontSize") - 10); circle_text_size.setValue(canvas.getActiveObject().get("fontSize") - 10);
circle_text_diameter.setValue(canvas.getActiveObject().get("diameter")-500); 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_text").val(canvas.getActiveObject().get("text"));
$("#circle_text_font_family").val(canvas.getActiveObject().get("fontFamily")); $("#circle_text_font_family").val(canvas.getActiveObject().get("fontFamily"));
@@ -6213,7 +6219,7 @@
}); });
canvas1.on("object:moving", function (e) { canvas1.on("object:moving", function (e) {
let obj = canvas.getActiveObject() 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 = { let pointer = {
x: obj.left, x: obj.left,
y: obj.top y: obj.top
+81
View File
@@ -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"
}
}
+37 -20
View File
@@ -1,32 +1,38 @@
{ {
"name": "soondesign", "name": "SoonDesign",
"version": "2.1.248", "version": "2.1.248",
"description": "tools of design soon files", "description": "tools of design soon files",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron-forge start",
"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/", "build": "node electron-vue/build.js && electron-builder",
"dist": "webpack", "builder": "electron-builder",
"build": "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": { "build": {
"packageManager": "npm",
"icon": "public/images/favicon.ico"
},
"build": {
"productName": "SoonDesign", "productName": "SoonDesign",
"appId": "com.SoonDesign", "appId": "com.SoonDesign",
"copyright": "Copyright@2023 cardsoon.com", "copyright": "",
"directories": { "directories": {
"output": "build" "output": "build"
}, },
"extraFiles": [
"lib"
],
"nsis": { "nsis": {
"oneClick": false, "oneClick": false,
"allowElevation": true, "allowElevation": true,
"allowToChangeInstallationDirectory": true, "allowToChangeInstallationDirectory": true,
"installerIcon": "./public/images/favicon.ico", "installerIcon": "public/images/favicon.ico",
"uninstallerIcon": "./public/images/favicon.ico", "uninstallerIcon": "public/images/favicon.ico",
"installerHeaderIcon": "./public/images/favicon.ico", "installerHeaderIcon": "public/images/favicon.ico",
"createDesktopShortcut": true, "createDesktopShortcut": true,
"createStartMenuShortcut": true "createStartMenuShortcut": true
}, },
@@ -34,14 +40,14 @@
{ {
"name": "SoonDesign file", "name": "SoonDesign file",
"ext": "soon", "ext": "soon",
"icon": "./public/images/favicon.ico", "icon": "public/images/favicon.ico",
"description": "SoonDesign file associations" "description": "SoonDesign file associations"
} }
], ],
"asar": true, "asar": true,
"win": { "win": {
"icon": "public/images/favicon.ico", "icon": "public/images/favicon.ico",
"requestedExecutionLevel": "requireAdministrator", "requestedExecutionLevel": "asInvoker",
"target": [ "target": [
{ {
"target": "nsis", "target": "nsis",
@@ -52,6 +58,17 @@
] ]
} }
}, },
"electronPackagerConfig": {
"packageManager": "npm",
"icon": "./public/images/favicon.ico"
},
"config": {
"forge": {
"packagerConfig": {
"icon": "./public/images/favicon.icns"
}
}
},
"repository": "", "repository": "",
"keywords": [ "keywords": [
"Electron", "Electron",
@@ -63,14 +80,14 @@
"author": "", "author": "",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"electron": "^15.2.0", "@electron-forge/cli": "^6.2.0",
"electron-builder": "^23.3.3", "electron": "^25.0.0"
"electron-packager": "^15.5.2"
}, },
"dependencies": { "dependencies": {
"@electron/remote": "^2.0.8", "@electron/remote": "^2.0.8",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"bytenode": "^1.3.4", "bytenode": "^1.3.4",
"electron-squirrel-startup": "^1.0.1",
"font-list": "^1.4.2", "font-list": "^1.4.2",
"jr-qrcode": "^1.1.4", "jr-qrcode": "^1.1.4",
"jsbarcode": "^3.11.5", "jsbarcode": "^3.11.5",