优化对齐方式，卡片直径、打印等
This commit is contained in:
24kycj
+79
-9
@@ -246,6 +246,23 @@
|
||||
<input min="1" max="600" step="0.5" lay-affix="number" type="number" class="ui-input"
|
||||
style="width: 50%" id="out_text_size" />
|
||||
</div>
|
||||
<div class="component-line" style="margin-left: 2px;display: flex; align-items: center;gap: 10px;">
|
||||
<span class="name" language="m" zh="对齐方式：" ozh="對齊方式：" en="Alignment:"></span>
|
||||
<div class="mode2" style="margin-left: 2px;border: none;display: flex; align-items: center;gap: 10px;">
|
||||
<div class="tool">
|
||||
<img src="public/images/left24.png" id="out_left_alignment" language="t" zh="左对齐" ozh="左對齊"
|
||||
en="Left Alignment" />
|
||||
</div>
|
||||
<div class="tool">
|
||||
<img src="public/images/right24.png" id="out_right_alignment" language="t" zh="右对齐" ozh="右對齊"
|
||||
en="Right Alignment" />
|
||||
</div>
|
||||
<div class="tool">
|
||||
<img src="public/images/center_x24.png" id="out_center_alignment" language="t" zh="居中对齐"
|
||||
ozh="居中對齊" en="Center Alignment" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-line">
|
||||
<span class="name" language="m" zh="颜色：" ozh="顏色：" en="Color:"></span>
|
||||
<input type="color" id="out_text_color" class="input_color">
|
||||
@@ -494,11 +511,11 @@
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
<!-- <select class="ui-select" id="language_select" style="margin-left: 10px">
|
||||
<select class="ui-select" id="language_select" style="margin-left: 10px">
|
||||
<option value='zh'>中文-简体</option>
|
||||
<option value='ozh'>中文-繁體</option>
|
||||
<option value='en'>English</option>
|
||||
</select> -->
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mode3">
|
||||
@@ -2221,7 +2238,8 @@
|
||||
"y": parseInt((xy[1] - background_image1.top).toFixed(0)),
|
||||
"h": parseInt((item.get("scaleY") * item.get("height")).toFixed(0)),
|
||||
"w": parseInt((item.get("scaleX") * item.get("width")).toFixed(0)),
|
||||
"rotate": parseInt(item.get("angle").toFixed(0))
|
||||
"rotate": parseInt(item.get("angle").toFixed(0)),
|
||||
align: objs1[idx - 1].align
|
||||
});
|
||||
} else if (type == 8) {
|
||||
//二维码
|
||||
@@ -2360,7 +2378,8 @@
|
||||
"y": parseInt((xy[1] - background_image2.top).toFixed(0)),
|
||||
"h": parseInt((item.get("scaleY") * item.get("height")).toFixed(0)),
|
||||
"w": parseInt((item.get("scaleX") * item.get("width")).toFixed(0)),
|
||||
"rotate": parseInt(item.get("angle").toFixed(0))
|
||||
"rotate": parseInt(item.get("angle").toFixed(0)),
|
||||
align: objs2[idx - 1].align
|
||||
});
|
||||
} else if (type == 8) {
|
||||
//二维码
|
||||
@@ -2819,7 +2838,8 @@
|
||||
"y": parseInt((xy[1] - background_image1.top).toFixed(0)),
|
||||
"h": parseInt((item.get("scaleY") * item.get("height")).toFixed(0)),
|
||||
"w": parseInt((item.get("scaleX") * item.get("width")).toFixed(0)),
|
||||
"rotate": parseInt(item.get("angle").toFixed(0))
|
||||
"rotate": parseInt(item.get("angle").toFixed(0)),
|
||||
align: objs1[idx - 1].align
|
||||
});
|
||||
} else if (type == 8) {
|
||||
//二维码
|
||||
@@ -2958,7 +2978,8 @@
|
||||
"y": parseInt((xy[1] - background_image2.top).toFixed(0)),
|
||||
"h": parseInt((item.get("scaleY") * item.get("height")).toFixed(0)),
|
||||
"w": parseInt((item.get("scaleX") * item.get("width")).toFixed(0)),
|
||||
"rotate": parseInt(item.get("angle").toFixed(0))
|
||||
"rotate": parseInt(item.get("angle").toFixed(0)),
|
||||
align: objs2[idx - 1].align
|
||||
});
|
||||
} else if (type == 8) {
|
||||
//二维码
|
||||
@@ -3899,6 +3920,46 @@
|
||||
canvas.renderAll();
|
||||
});
|
||||
|
||||
$('#out_left_alignment').click(function () {
|
||||
$('#out_left_alignment').parent().removeClass('tool1')
|
||||
$('#out_right_alignment').parent().removeClass('tool1')
|
||||
$('#out_center_alignment').parent().removeClass('tool1')
|
||||
setTimeout(() => {
|
||||
$('#out_left_alignment').parent().addClass('tool1')
|
||||
});
|
||||
canvas.getActiveObject().set('textAlign', 'left')
|
||||
let idx = getIndex(canvas.getActiveObject())
|
||||
objs[idx - 1].align = 'left'
|
||||
recordState()
|
||||
canvas.renderAll()
|
||||
})
|
||||
$('#out_right_alignment').click(function () {
|
||||
$('#out_left_alignment').parent().removeClass('tool1')
|
||||
$('#out_right_alignment').parent().removeClass('tool1')
|
||||
$('#out_center_alignment').parent().removeClass('tool1')
|
||||
setTimeout(() => {
|
||||
$('#out_right_alignment').parent().addClass('tool1')
|
||||
});
|
||||
canvas.getActiveObject().set('textAlign', 'right')
|
||||
let idx = getIndex(canvas.getActiveObject())
|
||||
objs[idx - 1].align = 'right'
|
||||
recordState()
|
||||
canvas.renderAll()
|
||||
})
|
||||
$('#out_center_alignment').click(function () {
|
||||
$('#out_left_alignment').parent().removeClass('tool1')
|
||||
$('#out_right_alignment').parent().removeClass('tool1')
|
||||
$('#out_center_alignment').parent().removeClass('tool1')
|
||||
setTimeout(() => {
|
||||
$('#out_center_alignment').parent().addClass('tool1')
|
||||
});
|
||||
canvas.getActiveObject().set('textAlign', 'center')
|
||||
let idx = getIndex(canvas.getActiveObject())
|
||||
objs[idx - 1].align = 'center'
|
||||
recordState()
|
||||
canvas.renderAll()
|
||||
})
|
||||
|
||||
$("#out_text_italics").click(function () {
|
||||
if ($(this).hasClass("ui-radio-acitve")) {
|
||||
//已选
|
||||
@@ -4995,7 +5056,8 @@
|
||||
textBackgroundColor: "",
|
||||
underline: false,
|
||||
linethrough: false,
|
||||
fontFamily: 'Arial'
|
||||
fontFamily: 'Arial',
|
||||
textAlign: 'center'
|
||||
});
|
||||
|
||||
//text.on({
|
||||
@@ -5018,7 +5080,7 @@
|
||||
text.setControlVisible("mb", false);
|
||||
|
||||
canvas.add(text);
|
||||
objs.push({ type: 4, name: resName("OUT_TEXT_"), exceed: false, autoWrap: false, fixSize: false, black: false });
|
||||
objs.push({ type: 4, name: resName("OUT_TEXT_"), exceed: false, autoWrap: false, fixSize: false, black: false, align: 'center' });
|
||||
canvas.renderAll();
|
||||
updateList();
|
||||
recordState();
|
||||
@@ -5026,6 +5088,14 @@
|
||||
function selectOutText() {
|
||||
//color
|
||||
//size
|
||||
const align = canvas.getActiveObject().get('textAlign')
|
||||
if (align === 'left') {
|
||||
$('#out_left_alignment').parent().addClass('tool1')
|
||||
} else if (align === 'right') {
|
||||
$('#out_right_alignment').parent().addClass('tool1')
|
||||
} else {
|
||||
$('#out_center_alignment').parent().addClass('tool1')
|
||||
}
|
||||
$("#out_text_control").show();
|
||||
$("#out_text_color").val(canvas.getActiveObject().get("fill"));
|
||||
$("#out_text_text").val(canvas.getActiveObject().get("text"));
|
||||
@@ -5987,7 +6057,7 @@
|
||||
, area: '450px;'
|
||||
, id: 'LAY_layuipro' //设定一个id，防止重复弹出
|
||||
, moveType: 1 //拖拽模式，0或者1
|
||||
, content: '<div style="padding-top:20px;padding-bottom:30px;background-color: #32363A; color: #fff; font-weight: 300;text-align:center;"><div style="width: 120px;margin: 0 auto;"><img style="width: 120px;" src="./public/images/IconA.png"></div><div style="font-size:24px;">Soon Design</div><div style="font-size:14px;">' + language_str("vers") + ' 2.1.2</div><div style="font-size:14px;">' + language_str("copyright") + '</div></div>'
|
||||
, content: '<div style="padding-top:20px;padding-bottom:30px;background-color: #32363A; color: #fff; font-weight: 300;text-align:center;"><div style="width: 120px;margin: 0 auto;"><img style="width: 120px;" src="./public/images/IconA.png"></div><div style="font-size:24px;">Soon Design</div><div style="font-size:14px;">' + language_str("vers") + ' 3.0.1</div><div style="font-size:14px;">' + language_str("copyright") + '</div></div>'
|
||||
});
|
||||
})
|
||||
$("#help").click(function () {
|
||||
|
||||
Reference in New Issue
Block a user