Skip to content

Commit bf0ce4b

Browse files
authored
Merge pull request #175 from CloudInn/edit-view-options
fix pop up design, refresh listing on clicking close button
2 parents 660ec7c + 0513462 commit bf0ce4b

File tree

6 files changed

+14
-4
lines changed

6 files changed

+14
-4
lines changed

projects/crud/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/crud/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-crud-ui",
3-
"version": "5.11.4",
3+
"version": "5.11.5",
44
"dependencies": {
55
"tslib": "^2.0.0"
66
},

projects/crud/src/lib/components/iframe-modal/iframe-modal.component.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ mat-icon{
2929
.grey {
3030
color: #606060;
3131
font-size: 30px;
32+
}
33+
34+
::ng-deep .edit-view-popup .mat-dialog-container {
35+
overflow: hidden;
3236
}

projects/crud/src/lib/components/iframe-modal/iframe-modal.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ export class IframeModalComponent implements OnInit {
2525
}
2626

2727
closeDialog() {
28-
this.iframeDialog.close();
28+
this.iframeDialog.close(true);
2929
}
3030
}

projects/crud/src/lib/components/listing/listing.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,20 @@ export class ListingComponent implements OnInit, AfterViewInit {
220220

221221
openEditView(id: number): void {
222222
if (this.viewConfig.iframeMode === IFrameMode.POP_UP) {
223-
const src = `${this.viewConfig.external_link.link}` + `${id}/?` + `${this.viewConfig.external_link.params.join('&')}`;
223+
const src = `${this.viewConfig.external_link.link}` + `${id}/?ispopup=1&` + `${this.viewConfig.external_link.params.join('&')}`;
224224
this.dialog.open(IframeModalComponent, {
225225
height: '95vh',
226226
width: '100vw',
227+
panelClass: 'edit-view-popup',
227228
data: {
228229
'src': `${src}`,
229230
'title': this.viewConfig?.title,
230231
'color': 'grey'
231232
}
233+
}).afterClosed().subscribe((res)=> {
234+
if(res) {
235+
window.postMessage("refreshForm", "*");
236+
}
232237
});
233238
} else {
234239
this.router.navigate([id], { relativeTo: this.activeRoute });

projects/crud/src/lib/components/model-form/model-form.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export class ModelFormComponent implements OnInit, OnDestroy {
113113
this.editForm(this.id);
114114
}
115115
} else if (typeof message.data === 'string' && message.data?.includes('refreshForm')) {
116+
this.dialog.closeAll();
116117
this._submitSearchFormWithFilters();
117118
}
118119
});

0 commit comments

Comments
 (0)