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

UI: bug-fix to tables basic settings columns error appearence

Browse Source
This commit is contained in:
Dmitriymush 2023-10-31 13:35:56 +02:00
parent fd735c3d82
commit b206061e60
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarms-table-basic-config.component.html
View File

@ -40,6 +40,7 @@
keySettingsTitle="{{ 'widgets.table.column-settings' | translate }}" keySettingsTitle="{{ 'widgets.table.column-settings' | translate }}"
removeKeyTitle="{{ 'widgets.table.remove-column' | translate }}" removeKeyTitle="{{ 'widgets.table.remove-column' | translate }}"
noKeysText="{{ 'widgets.table.no-columns' | translate }}" noKeysText="{{ 'widgets.table.no-columns' | translate }}"
requiredKeysText="{{ 'widgets.table.alarm-column-error' | translate }}"
hideDataKeyColor hideDataKeyColor
hideUnits hideUnits
hideDecimals hideDecimals

6
ui-ngx/src/app/shared/components/tb-error.component.ts
View File

@ -14,7 +14,7 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Component, Input } from '@angular/core'; import { ChangeDetectorRef, Component, Input } from '@angular/core';
import { animate, state, style, transition, trigger } from '@angular/animations'; import { animate, state, style, transition, trigger } from '@angular/animations';
import { coerceBoolean } from '@shared/decorators/coercion'; import { coerceBoolean } from '@shared/decorators/coercion';
@ -61,12 +61,16 @@ export class TbErrorComponent {
if (value && !this.message) { if (value && !this.message) {
this.message = value; this.message = value;
this.state = 'hide'; this.state = 'hide';
setTimeout(() => { setTimeout(() => {
this.state = 'show'; this.state = 'show';
this.cd.markForCheck();
}); });
} else { } else {
this.errorValue = value; this.errorValue = value;
this.state = value ? 'show' : 'hide'; this.state = value ? 'show' : 'hide';
} }
} }
constructor(private cd: ChangeDetectorRef) {}
} }

1
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -6193,6 +6193,7 @@
"pagination": "Pagination", "pagination": "Pagination",
"rows": "Rows", "rows": "Rows",
"timeseries-column-error": "At least one timeseries column should be specified", "timeseries-column-error": "At least one timeseries column should be specified",
"alarm-column-error": "At least one alarm column should be specified",
"table-tabs": "Table tabs", "table-tabs": "Table tabs",
"show-cell-actions-menu-mobile": "Show cell actions dropdown menu in mobile mode" "show-cell-actions-menu-mobile": "Show cell actions dropdown menu in mobile mode"
}, },