Skip to content

Commit 111d784

Browse files
committed
Support column display control
1 parent d691373 commit 111d784

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/renderer/app/views/object_designer/layout/content/components/preview/database/detail.database.view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ng-container *ngIf="!isCreateTable(); else createTable">
22
<nz-card [nzTitle]="titleTemplate" [nzLoading]="loading.tableContainer">
3-
<div *ngIf="applyResultColumns.length > 0" style="margin-top: 4px;">
3+
<div style="margin-top: 4px;">
44
<nz-table #tableContainer nzSize="small" [nzData]="applyResultColumns">
55
<thead>
66
<tr>

src/renderer/app/views/object_designer/layout/content/components/preview_table/preview.table.component.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class PreviewTableComponent implements AfterViewInit {
2323
checkedColumns: []
2424
}
2525
applyVisible = {
26-
columnDrawer: false
26+
columnDrawer: null
2727
}
2828

2929
constructor(private pluginFactory: PluginFactory,
@@ -43,25 +43,23 @@ export class PreviewTableComponent implements AfterViewInit {
4343
.getResponse(request, sql)
4444
.then(response => {
4545
if (response.status) {
46-
if (response.data.rows > 0) {
47-
Object.keys(response.data.columns[0]).forEach(column => {
48-
this.applyResult.headers.push(column);
49-
this.applyResult.checkedColumns.push({label: column, value: column, checked: true})
50-
})
51-
this.applyResult.columns = response.data.columns;
52-
}
46+
response.data.headers.forEach(column => {
47+
this.applyResult.headers.push(column['name']);
48+
this.applyResult.checkedColumns.push({label: column['name'], value: column['name'], checked: true})
49+
})
50+
this.applyResult.columns = response.data.columns;
5351
}
5452
this.loading.tableContainer = false;
5553
});
5654
}, 0);
5755
}
5856

59-
handlerShowColumnDrawer() {
60-
this.applyVisible.columnDrawer = true;
57+
handlerShowColumnDrawer(value: string) {
58+
this.applyVisible.columnDrawer = value;
6159
}
6260

6361
handlerCloseColumnDrawer() {
64-
this.applyVisible.columnDrawer = false;
62+
this.applyVisible.columnDrawer = null;
6563
}
6664

6765
handlerColumnChecked() {

src/renderer/app/views/object_designer/layout/content/components/preview_table/preview.table.view.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
</nz-table>
2424

2525
<ng-template #titleTemplate>
26-
<button nz-button nzSize="small" nzType="text"
27-
nz-tooltip nzTooltipTitle="{{'common.column'|translate}}" (click)="handlerShowColumnDrawer()">
28-
<i nz-icon nzType="table" class="action-button-1890"></i>
29-
</button>
26+
<nz-radio-group [(ngModel)]="applyVisible.columnDrawer" nzSize="small"
27+
(ngModelChange)="handlerShowColumnDrawer($event)">
28+
<label nz-radio-button nzValue="column">
29+
<i nz-icon nzType="table" class="action-button-1890"></i>
30+
</label>
31+
</nz-radio-group>
3032
</ng-template>
3133
</nz-card>
3234

0 commit comments

Comments
 (0)