Commit 43228064 authored by 李维's avatar 李维

Bug fix

parent 07320d5e
...@@ -105,4 +105,8 @@ ...@@ -105,4 +105,8 @@
.d-flex{ .d-flex{
display: flex; display: flex;
}
.anticon {
vertical-align: 0;
} }
\ No newline at end of file
...@@ -35,8 +35,10 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy { ...@@ -35,8 +35,10 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
@Input() fontName: string = "FuturaBT-Medium"; @Input() fontName: string = "FuturaBT-Medium";
@Input() fontColor: string = "#000"; @Input() fontColor: string = "#000";
@Input() customBackground: boolean = true; @Input() customBackground: boolean = true;
@Input() enableResize: boolean = true;
@Output() save = new EventEmitter(); @Output() save = new EventEmitter();
@ViewChild('canvas') canvas: ElementRef; @ViewChild('canvas') canvas: ElementRef;
@ViewChild('wrap') wrap: ElementRef; @ViewChild('wrap') wrap: ElementRef;
@HostListener('window:resize', ['$event']) @HostListener('window:resize', ['$event'])
...@@ -325,17 +327,17 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy { ...@@ -325,17 +327,17 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
if (item) { if (item) {
if (this.checkClickTarget(item)) { if (this.checkClickTarget(item)) {
if (item.lineDashFlag && this.checkClickTarget(item.arrow)) { if (item.lineDashFlag && this.checkClickTarget(item.arrow)) {
if(item.type == "Text"){ if(!this.enableResize){
return return
} }
this.changeItemSize(item); this.changeItemSize(item);
} else if (item.lineDashFlag && this.checkClickTarget(item.arrowTop)) { } else if (item.lineDashFlag && this.checkClickTarget(item.arrowTop)) {
if(item.type == "Text"){ if(!this.enableResize){
return return
} }
this.changeItemTopSize(item); this.changeItemTopSize(item);
} else if (item.lineDashFlag && this.checkClickTarget(item.arrowRight)) { } else if (item.lineDashFlag && this.checkClickTarget(item.arrowRight)) {
if(item.type == "Text"){ if(!this.enableResize){
return return
} }
this.changeItemRightSize(item); this.changeItemRightSize(item);
......
...@@ -334,7 +334,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -334,7 +334,7 @@ export class PlayComponent implements OnInit, OnDestroy {
y: (65*this.g_mapScale)/2 y: (65*this.g_mapScale)/2
} }
}) })
element.ref.x = this.g_partTitle_x - 20 * this.g_mapScale + (57*this.g_mapScale)/2; element.ref.x = this.g_partTitle_x - 12 * this.g_mapScale + (57*this.g_mapScale)/2;
let text = this.g_cartoon.createLabel(this.g_formData.title.NO, "BerlinSansFBDemi-Bold", "#FFFFFF", 48) let text = this.g_cartoon.createLabel(this.g_formData.title.NO, "BerlinSansFBDemi-Bold", "#FFFFFF", 48)
element.ref.addChild(text) element.ref.addChild(text)
...@@ -803,7 +803,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -803,7 +803,7 @@ export class PlayComponent implements OnInit, OnDestroy {
} }
}) })
let number_text = this.g_cartoon.createCartoonElementLabelFunc(`question-index-${side}-${index}`, index + "", "TCB___", "#FFF", 36, (w, h)=>{ let number_text = this.g_cartoon.createCartoonElementLabelFunc(`question-index-${side}-${index}`, (index+1) + "", "TCB___", "#FFF", 36, (w, h)=>{
return { return {
x: 0, x: 0,
y: 2 y: 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment