dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5954 from vvlladd28/improvemen/persistent-table/renaim-double-text

Browse Source 
[3.3.3] UI: Rename Persistent table widget; Fixed double text in data not resolve
This commit is contained in:
Igor Kulikov 2022-01-26 19:44:05 +02:00 committed by GitHub
commit 888e8b5b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/data/json/system/widget_bundles/control_widgets.json
View File

File diff suppressed because one or more lines are too long

2
ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-table.component.html
View File

@ -107,7 +107,7 @@
<mat-row *matRowDef="let column; columns: displayedColumns"
[fxShow]="!persistentDatasource.dataLoading"></mat-row>
</table>
<span [fxShow]="(persistentDatasource.isEmpty() | async) && !persistentDatasource.dataLoading"
<span [fxShow]="(persistentDatasource.isEmpty() | async) && !persistentDatasource.dataLoading && hasData"
fxLayoutAlign="center center"
class="no-data-found">{{ noDataDisplayMessageText }}</span>
<span [fxShow]="persistentDatasource.dataLoading"

2
ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-table.component.ts
View File

@ -134,6 +134,7 @@ export class PersistentTableComponent extends PageComponent implements OnInit {
public actionCellButtonAction: PersistentTableWidgetActionDescriptor[] = [];
public displayedColumns: string[];
public hidePageSize = false;
hasData = false;
constructor(protected store: Store<AppState>,
private elementRef: ElementRef,
@ -154,6 +155,7 @@ export class PersistentTableComponent extends PageComponent implements OnInit {
this.widgetConfig = this.ctx.widgetConfig;
this.subscription = this.ctx.defaultSubscription;
this.initializeConfig();
this.hasData = this.ctx.defaultSubscription.hasResolvedData;
this.ctx.updateWidgetParams();
if (this.displayPagination) {
this.widgetResize$ = new ResizeObserver(() => {