Commit 9f0d2290 authored by 李维's avatar 李维

Bug fix

parent a5182118
......@@ -156,6 +156,20 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
}
}
setAudioByUID(audio_url, uid) {
let mached = false;
this.hotZoneArr.forEach(element => {
if(element.uid == uid) {
console.log(uid, element)
element.audio_url = audio_url;
mached = true;
}
});
if(mached) {
this.autoSave()
}
}
refreshImage(img) {
this.hideAllLineDash();
img.picItem = this.getPicItem(img);
......@@ -203,7 +217,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
} else {
item.uid = uuid.v4()
item.initFont(this.fontSize, this.fontName, this.fontColor)
item.init(this.defaultItemBG, "Text", "Text", () => {
item.init(this.defaultItemBG, "", "Text", () => {
item.x = this.canvasWidth / 2 - this.itemWidth / 2;
item.y = this.canvasHeight / 2 - 20;
}, () => this.autoSave());
......
......@@ -65,7 +65,7 @@
音频
</div>
<div style="float: left;">
<app-audio-recorder id="index_audio_1" [audioUrl]="it.media.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it.media)" > </app-audio-recorder>
<app-audio-recorder id="index_audio_1" [audioUrl]="it.media.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it.media, it.uid)" > </app-audio-recorder>
</div>
</nz-form-control>
<nz-form-control [nzSpan]="8">
......@@ -214,7 +214,7 @@
音频
</div>
<div style="float: left;">
<app-audio-recorder id="index_audio_1" [audioUrl]="it.media.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it.media)" > </app-audio-recorder>
<app-audio-recorder id="index_audio_1" [audioUrl]="it.media.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it.media, it.uid)" > </app-audio-recorder>
</div>
</nz-form-control>
<nz-form-control [nzSpan]="8">
......@@ -363,7 +363,7 @@
音频
</div>
<div style="float: left;">
<app-audio-recorder id="index_audio_1" [audioUrl]="it.media.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it.media)" > </app-audio-recorder>
<app-audio-recorder id="index_audio_1" [audioUrl]="it.media.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', it.media, it.uid)" > </app-audio-recorder>
</div>
</nz-form-control>
<nz-form-control [nzSpan]="8">
......
......@@ -308,12 +308,19 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.save();
}
onAudioUploadSuccess(e, key, item?) {
onAudioUploadSuccess(e, key, item?, uid?) {
if(item) {
item[key] = e.url;
item[key] = e.url;
if(uid) {
this.hotZooLeftEL.setAudioByUID(e.url, uid)
this.hotZooMiddleEL.setAudioByUID(e.url, uid)
this.hotZooRightEL.setAudioByUID(e.url, uid)
}
} else {
this[key] = e.url;
}
this.save();
}
......
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