Commit 63b265c3 authored by 李维's avatar 李维

Bug fix

parent d0773456
<div class="content-border"> <div class="content-border">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2" >左上</nz-form-label> <div nz-col nzSpan="22"></div>
<nz-form-control [nzSpan]="6"> <div nz-col nzSpan="2">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('leftTop')" [picUrl]="items.leftTop" <button nz-button nzType="danger" (click)="cleanAll()">清空背景</button>
</div>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="1" >左上</nz-form-label>
<nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" [picUrl]="items.leftTop"
(imageUploaded)="onImageUploadSuccess($event, items, 'leftTop')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'leftTop')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2" >中上</nz-form-label> <nz-form-label [nzSpan]="1" >中上</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('middleTop')" [picUrl]="items.middleTop" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.middleTop"
(imageUploaded)="onImageUploadSuccess($event, items, 'middleTop')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'middleTop')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2" >右上</nz-form-label> <nz-form-label [nzSpan]="1" >右上</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('rightTop')" [picUrl]="items.rightTop" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.rightTop"
(imageUploaded)="onImageUploadSuccess($event, items, 'rightTop')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'rightTop')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2" >左中</nz-form-label> <nz-form-label [nzSpan]="1" >左中</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('leftMiddle')" [picUrl]="items.leftMiddle" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.leftMiddle"
(imageUploaded)="onImageUploadSuccess($event, items, 'leftMiddle')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'leftMiddle')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
<div nz-col nzSpan="8"></div> <div nz-col nzSpan="8"></div>
<nz-form-label [nzSpan]="2" >右中</nz-form-label> <nz-form-label [nzSpan]="1" >右中</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('rightMiddle')" [picUrl]="items.rightMiddle" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.rightMiddle"
(imageUploaded)="onImageUploadSuccess($event, items, 'rightMiddle')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'rightMiddle')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2" >左下</nz-form-label> <nz-form-label [nzSpan]="1" >左下</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('leftBottom')" [picUrl]="items.leftBottom" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.leftBottom"
(imageUploaded)="onImageUploadSuccess($event, items, 'leftBottom')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'leftBottom')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2" >中下</nz-form-label> <nz-form-label [nzSpan]="1" >中下</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('middleBottom')" [picUrl]="items.middleBottom" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.middleBottom"
(imageUploaded)="onImageUploadSuccess($event, items, 'middleBottom')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'middleBottom')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2">右下</nz-form-label> <nz-form-label [nzSpan]="1">右下</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="7">
<app-upload-image-with-preview style="width: 100%" canDelete="true" (delete)="deletePic('rightBottom')" [picUrl]="items.rightBottom" <app-upload-image-with-preview style="width: 100%" [picUrl]="items.rightBottom"
(imageUploaded)="onImageUploadSuccess($event, items, 'rightBottom')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, items, 'rightBottom')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
......
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
border-radius: 0.5rem; border-radius: 0.5rem;
min-width: 1200px; min-width: 1200px;
border: 2px solid #ddd; border: 2px solid #ddd;
padding: 5px;
} }
\ No newline at end of file
...@@ -16,6 +16,13 @@ export class BackgroundUploadComponent { ...@@ -16,6 +16,13 @@ export class BackgroundUploadComponent {
this.change.emit(items) this.change.emit(items)
} }
cleanAll() {
if(confirm("确定清空所有背景吗?")) {
this.items = {"leftTop": '', "middleTop": '', "rightTop": '', "leftMiddle": '', "rightMiddle": '', "leftBottom": '', "middleBottom": '', "rightBottom": ''}
this.change.emit(this.items)
}
}
deletePic(key) { deletePic(key) {
this.items[key] = "" this.items[key] = ""
this.change.emit(this.items) this.change.emit(this.items)
......
...@@ -34,12 +34,12 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges { ...@@ -34,12 +34,12 @@ export class UploadImageWithPreviewComponent implements OnDestroy, OnChanges {
constructor(private nzMessageService: NzMessageService) { constructor(private nzMessageService: NzMessageService) {
this.uploadUrl = (<any> window).courseware.uploadUrl(); this.uploadUrl = (<any> window).courseware.uploadUrl();
console.log("constructor", this.uploadUrl) // console.log("constructor", this.uploadUrl)
this.uploadData = (<any> window).courseware.uploadData(); this.uploadData = (<any> window).courseware.uploadData();
window['air'].getUploadCallback = (url, data) => { window['air'].getUploadCallback = (url, data) => {
this.uploadUrl = url; this.uploadUrl = url;
this.uploadData = data; this.uploadData = data;
console.log("getUploadCallback", this.uploadUrl) // console.log("getUploadCallback", this.uploadUrl)
}; };
} }
ngOnChanges() { ngOnChanges() {
......
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