优化打包和圆形文字
This commit is contained in:
+13
-7
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user