yangchunjin/SoonDesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
24kycj
2025-04-09 14:23:44 +08:00
parent 1e4407871e
commit 55d475f4a9
7 changed files with 781 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data.json
+1 -1
View File
@@ -1 +1 @@
{"history":[{"time":"2025-3-30","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi6.soon"},{"time":"2025-3-30","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi7.soon"}]} {"history":[{"time":"2025-3-30","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi6.soon"},{"time":"2025-4-9","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi7.soon"},{"time":"2025-4-9","path":"E:\\project\\sideline\\shanghaikashu\\文件\\soon文件\\ceshi5.soon"}]}
design1.html
+37 -29
View File
@@ -757,6 +757,7 @@
ipcRenderer.send('get-sys-fonts'); ipcRenderer.send('get-sys-fonts');
ipcRenderer.send('get-scale-rate'); ipcRenderer.send('get-scale-rate');
const { clipboard } = require('electron') const { clipboard } = require('electron')
const dpi = 600
//var encrypt = new JSEncrypt(); //var encrypt = new JSEncrypt();
//encrypt.setPublicKey(`-----BEGIN PUBLIC KEY----- //encrypt.setPublicKey(`-----BEGIN PUBLIC KEY-----
//MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDAbKQ46WevL9PapJ+AlZqSzczkTovu7STH //MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDAbKQ46WevL9PapJ+AlZqSzczkTovu7STH
@@ -3148,7 +3149,7 @@
title: language_str("selectPic"),//请选择图片 title: language_str("selectPic"),//请选择图片
buttonLabel: language_str("comf"),//"确认" buttonLabel: language_str("comf"),//"确认"
filters: [ filters: [
{ name: 'Image File Type', extensions: ['png', 'jpg'] }, { name: 'Image File Type', extensions: ['png', 'jpg', 'jpeg'] },
] ]
}).then(result => { }).then(result => {
if (result.canceled) return; if (result.canceled) return;
@@ -4409,14 +4410,14 @@
] ]
}).then(result => { }).then(result => {
if (result.canceled) return; if (result.canceled) return;
//console.log(result.filePaths) console.log(result.filePaths)
let fs = require('fs') let fs = require('fs')
var fsData = fs.readFileSync(result.filePaths[0]) var fsData = fs.readFileSync(result.filePaths[0])
openAs.name = result.filePaths[0]; openAs.name = result.filePaths[0];
let j = JSON.parse(fsData.toString()); let j = JSON.parse(fsData.toString());
let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1; let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1;
if (type == 2) { if (type == 2) {
ipcRenderer.send('open-design-page', $(this).attr("data"), type); ipcRenderer.send('open-design-page', openAs.name, type);
return return
} }
let left = background_image.left; let left = background_image.left;
@@ -4842,7 +4843,7 @@
$("#text_control").show(); $("#text_control").show();
$("#text_color").val(canvas.getActiveObject().get("fill")); $("#text_color").val(canvas.getActiveObject().get("fill"));
$("#text_back_color").val(canvas.getActiveObject().get("textBackgroundColor") == "" ? '#ffffff' : canvas.getActiveObject().get("textBackgroundColor")); $("#text_back_color").val(canvas.getActiveObject().get("textBackgroundColor") == "" ? '#ffffff' : canvas.getActiveObject().get("textBackgroundColor"));
let val = parseFloat(canvas.getActiveObject().get("fontSize"))*72/600 let val = parseFloat(canvas.getActiveObject().get("fontSize"))*72/dpi
if (val%0.5!==0) val = Math.round(val*2)/2 if (val%0.5!==0) val = Math.round(val*2)/2
$("#text_size").val(val); $("#text_size").val(val);
$("#text_text").val(canvas.getActiveObject().get("text")); $("#text_text").val(canvas.getActiveObject().get("text"));
@@ -5028,7 +5029,7 @@
$("#out_text_control").show(); $("#out_text_control").show();
$("#out_text_color").val(canvas.getActiveObject().get("fill")); $("#out_text_color").val(canvas.getActiveObject().get("fill"));
$("#out_text_text").val(canvas.getActiveObject().get("text")); $("#out_text_text").val(canvas.getActiveObject().get("text"));
let val = parseFloat(canvas.getActiveObject().get("fontSize"))*72/600 let val = parseFloat(canvas.getActiveObject().get("fontSize"))*72/dpi
if (val%0.5!==0) val = Math.round(val*2)/2 if (val%0.5!==0) val = Math.round(val*2)/2
$("#out_text_size").val(val); $("#out_text_size").val(val);
$("#out_text_back_color").val(canvas.getActiveObject().get("textBackgroundColor") == "" ? '#ffffff' : canvas.getActiveObject().get("textBackgroundColor")); $("#out_text_back_color").val(canvas.getActiveObject().get("textBackgroundColor") == "" ? '#ffffff' : canvas.getActiveObject().get("textBackgroundColor"));
@@ -5248,7 +5249,7 @@
let idx = getIndex(canvas.getActiveObject()); let idx = getIndex(canvas.getActiveObject());
$("#barcode_field_name").val(objs[idx - 1].name); $("#barcode_field_name").val(objs[idx - 1].name);
$("#barcode_font_family").val(objs[idx - 1].font); $("#barcode_font_family").val(objs[idx - 1].font);
let val = parseFloat(objs[idx - 1].fontSize)*72/600 let val = parseFloat(objs[idx - 1].fontSize)*72/dpi
if (val%0.5!==0) val = Math.round(val*2)/2 if (val%0.5!==0) val = Math.round(val*2)/2
$("#barcode_size").val(val); $("#barcode_size").val(val);
$("#barcode_val").val(objs[idx - 1].val); $("#barcode_val").val(objs[idx - 1].val);
@@ -5291,7 +5292,7 @@
$("#counter_add").val(objs[idx - 1].add); $("#counter_add").val(objs[idx - 1].add);
$("#counter_color").val(canvas.getActiveObject().get("fill")); $("#counter_color").val(canvas.getActiveObject().get("fill"));
$("#count_font_family").val(canvas.getActiveObject().get("fontFamily")); $("#count_font_family").val(canvas.getActiveObject().get("fontFamily"));
let val = parseFloat(canvas.getActiveObject().get("fontSize"))*72/600 let val = parseFloat(canvas.getActiveObject().get("fontSize"))*72/dpi
if (val%0.5!==0) val = Math.round(val*2)/2 if (val%0.5!==0) val = Math.round(val*2)/2
$("#count_size").val(val); $("#count_size").val(val);
@@ -5627,15 +5628,15 @@
val = parseFloat($("#text_size").val()) val = parseFloat($("#text_size").val())
if (val < 1) { if (val < 1) {
val = 1 val = 1
} else if (val > 600) { } else if (val > dpi) {
val = 600 val = dpi
} else if (val%0.5!==0) { } else if (val%0.5!==0) {
val = Math.round(val*2)/2 val = Math.round(val*2)/2
} }
} }
$("#text_size").val(val) $("#text_size").val(val)
canvas.getActiveObject().set("fontSize", val*600/72); canvas.getActiveObject().set("fontSize", val*dpi/72);
$("#text_h").val((canvas.getActiveObject().get("height")).toFixed(0)); $("#text_h").val((canvas.getActiveObject().get("height")).toFixed(0));
$("#text_w").val((canvas.getActiveObject().get("width")).toFixed(0)); $("#text_w").val((canvas.getActiveObject().get("width")).toFixed(0));
canvas.renderAll(); canvas.renderAll();
@@ -5653,12 +5654,8 @@
recordState(); recordState();
}) })
$("#circle_text_text").bind('input propertychange', function () { $("#circle_text_text").bind('input propertychange', function () {
let val = $("#circle_text_text").val() let val = $("#circle_text_text").val().trim()
if (!val) { canvas.getActiveObject().set("text", ` ${val} `);
val = 'Circle TEXT'
$("#circle_text_text").val(val)
}
canvas.getActiveObject().set("text", val);
canvas.renderAll(); canvas.renderAll();
updateList(); updateList();
recordState(); recordState();
@@ -5680,22 +5677,23 @@
val = parseFloat($("#out_text_size").val()) val = parseFloat($("#out_text_size").val())
if (val < 1) { if (val < 1) {
val = 1 val = 1
} else if (val > 600) { } else if (val > dpi) {
val = 600 val = dpi
} else if (val%0.5!==0) { } else if (val%0.5!==0) {
val = Math.round(val*2)/2 val = Math.round(val*2)/2
} }
} }
$("#out_text_size").val(val) $("#out_text_size").val(val)
canvas.getActiveObject().set("fontSize", val*600/72); canvas.getActiveObject().set("fontSize", val*dpi/72);
$("#text_h").val((canvas.getActiveObject().get("height")).toFixed(0)); $("#text_h").val((canvas.getActiveObject().get("height")).toFixed(0));
$("#text_w").val((canvas.getActiveObject().get("width")).toFixed(0)); $("#text_w").val((canvas.getActiveObject().get("width")).toFixed(0));
canvas.renderAll(); canvas.renderAll();
recordState(); recordState();
}) })
$("#out_text_text").bind('input propertychange', function () { $("#out_text_text").bind('input propertychange', function () {
canvas.getActiveObject().set("text", $("#out_text_text").val()); let val = $("#out_text_text").val().trim()
canvas.getActiveObject().set("text", ` ${val} `);
canvas.renderAll(); canvas.renderAll();
updateList(); updateList();
recordState(); recordState();
@@ -5781,15 +5779,15 @@
val = parseFloat($("#count_size").val()) val = parseFloat($("#count_size").val())
if (val < 1) { if (val < 1) {
val = 1 val = 1
} else if (val > 600) { } else if (val > dpi) {
val = 600 val = dpi
} else if (val%0.5!==0) { } else if (val%0.5!==0) {
val = Math.round(val*2)/2 val = Math.round(val*2)/2
} }
} }
$("#count_size").val(val) $("#count_size").val(val)
canvas.getActiveObject().set("fontSize", val*600/72); canvas.getActiveObject().set("fontSize", val*dpi/72);
$("#text_h").val((canvas.getActiveObject().get("height")).toFixed(0)); $("#text_h").val((canvas.getActiveObject().get("height")).toFixed(0));
$("#text_w").val((canvas.getActiveObject().get("width")).toFixed(0)); $("#text_w").val((canvas.getActiveObject().get("width")).toFixed(0));
canvas.renderAll(); canvas.renderAll();
@@ -5809,7 +5807,8 @@
recordState(); recordState();
}) })
$("#text_text").bind('input propertychange', function () { $("#text_text").bind('input propertychange', function () {
canvas.getActiveObject().set("text", $("#text_text").val()); let val = $("#text_text").val().trim()
canvas.getActiveObject().set("text", ` ${val} `);
canvas.renderAll(); canvas.renderAll();
updateList(); updateList();
recordState(); recordState();
@@ -5837,7 +5836,7 @@
} else { } else {
objs[idx - 1].show = false; objs[idx - 1].show = false;
} }
JsBarcode("#barcode", objs[idx - 1].val, { margin: 0, lineColor: objs[idx - 1].color, fontSize: val*600/72, font: objs[idx - 1].font }); JsBarcode("#barcode", objs[idx - 1].val, { margin: 0, lineColor: objs[idx - 1].color, fontSize: val*dpi/72, font: objs[idx - 1].font });
let barcode = document.getElementById('barcode'); let barcode = document.getElementById('barcode');
let bar = barcode.toDataURL("image/png"); let bar = barcode.toDataURL("image/png");
item.setSrc(bar, function (img) { item.setSrc(bar, function (img) {
@@ -5853,15 +5852,15 @@
val = parseFloat($(this).val()) val = parseFloat($(this).val())
if (val < 1) { if (val < 1) {
val = 1 val = 1
} else if (val > 600) { } else if (val > dpi) {
val = 600 val = dpi
} else if (val%0.5!==0) { } else if (val%0.5!==0) {
val = Math.round(val*2)/2 val = Math.round(val*2)/2
} }
} }
$("#barcode_size").val(val) $("#barcode_size").val(val)
objs[idx - 1].fontSize = val*600/72; objs[idx - 1].fontSize = val*dpi/72;
JsBarcode("#barcode", objs[idx - 1].val, { margin: 0, lineColor: objs[idx - 1].color, fontSize: objs[idx - 1].fontSize, font: objs[idx - 1].font }); JsBarcode("#barcode", objs[idx - 1].val, { margin: 0, lineColor: objs[idx - 1].color, fontSize: objs[idx - 1].fontSize, font: objs[idx - 1].font });
let barcode = document.getElementById('barcode'); let barcode = document.getElementById('barcode');
@@ -6132,7 +6131,7 @@
let angleDeg = getDeg(pointer) let angleDeg = getDeg(pointer)
let flipped = pointer.y > canvas.height/2 ? true : false let flipped = pointer.y > canvas.height/2 ? true : false
obj.set("diameter", distance*2); obj.set("diameter", distance*2);
obj.set("angle", angleDeg); // obj.set("angle", angleDeg);
obj.set("flipped", flipped); obj.set("flipped", flipped);
// canvas.renderAll(); // canvas.renderAll();
} }
@@ -6682,6 +6681,15 @@
canvas.renderAll(); canvas.renderAll();
} }
}); });
var out_pic_op = slider.render({
elem: '#out_pic_op',
change: function (value) {
console.log(value)
console.log(canvas.getActiveObject())
canvas.getActiveObject().set('opacity', (100 - value) / 100)
canvas.renderAll()
}
})
var pic_op = slider.render({ var pic_op = slider.render({
elem: '#pic_op' elem: '#pic_op'
, change: function (value) { , change: function (value) {
design2.html
+742 -384
View File
File diff suppressed because it is too large Load Diff
output.pdf
BIN
View File
Binary file not shown.
print.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 288 KiB

After

Width:  |  Height:  |  Size: 44 KiB

print3.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

print4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB