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

Fixed an issue when the user could break the pagination settings validation by switching between the basic/advanced mode tabs in table-widgets

Browse Source
This commit is contained in:
Tarnavskiy 2025-04-23 17:55:51 +03:00
parent d6fb28ebd7
commit 49289da5a8
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
View File

@ -392,10 +392,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
this.rowStylesInfo = getRowStyleInfo(this.ctx, this.settings, 'alarm, ctx'); this.rowStylesInfo = getRowStyleInfo(this.ctx, this.settings, 'alarm, ctx');
const pageSize = this.settings.defaultPageSize; const pageSize = this.settings.defaultPageSize;
let pageStepIncrement = this.settings.pageStepIncrement; let pageStepIncrement = Number.isInteger(this.settings.pageStepIncrement) && this.settings.pageStepIncrement > 0 ?
let pageStepCount = this.settings.pageStepCount; this.settings.pageStepIncrement : null;
let pageStepCount = Number.isInteger(this.settings.pageStepCount) && this.settings.pageStepCount > 0
&& this.settings.pageStepCount <= 100 ? this.settings.pageStepCount : null;
if (isDefined(pageSize) && isNumber(pageSize) && pageSize > 0) { if (Number.isInteger(pageSize) && pageSize > 0) {
this.defaultPageSize = pageSize; this.defaultPageSize = pageSize;
} }

8
ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
View File

@ -311,10 +311,12 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
this.rowStylesInfo = getRowStyleInfo(this.ctx, this.settings, 'entity, ctx'); this.rowStylesInfo = getRowStyleInfo(this.ctx, this.settings, 'entity, ctx');
const pageSize = this.settings.defaultPageSize; const pageSize = this.settings.defaultPageSize;
let pageStepIncrement = this.settings.pageStepIncrement; let pageStepIncrement = Number.isInteger(this.settings.pageStepIncrement) && this.settings.pageStepIncrement > 0 ?
let pageStepCount = this.settings.pageStepCount; this.settings.pageStepIncrement : null;
let pageStepCount = Number.isInteger(this.settings.pageStepCount) && this.settings.pageStepCount > 0
&& this.settings.pageStepCount <= 100 ? this.settings.pageStepCount : null;
if (isDefined(pageSize) && isNumber(pageSize) && pageSize > 0) { if (Number.isInteger(pageSize) && pageSize > 0) {
this.defaultPageSize = pageSize; this.defaultPageSize = pageSize;
} }

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

@ -207,10 +207,12 @@ export class PersistentTableComponent extends PageComponent implements OnInit, O
this.displayedColumns = [...this.displayTableColumns]; this.displayedColumns = [...this.displayTableColumns];
const pageSize = this.settings.defaultPageSize; const pageSize = this.settings.defaultPageSize;
let pageStepIncrement = this.settings.pageStepIncrement; let pageStepIncrement = Number.isInteger(this.settings.pageStepIncrement) && this.settings.pageStepIncrement > 0 ?
let pageStepCount = this.settings.pageStepCount; this.settings.pageStepIncrement : null;
let pageStepCount = Number.isInteger(this.settings.pageStepCount) && this.settings.pageStepCount > 0
&& this.settings.pageStepCount <= 100 ? this.settings.pageStepCount : null;
if (isDefined(pageSize) && isNumber(pageSize) && pageSize > 0) { if (Number.isInteger(pageSize) && pageSize > 0) {
this.defaultPageSize = pageSize; this.defaultPageSize = pageSize;
} }

6
ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
View File

@ -16,7 +16,7 @@
import { EntityId } from '@shared/models/id/entity-id'; import { EntityId } from '@shared/models/id/entity-id';
import { DataKey, FormattedData, WidgetActionDescriptor, WidgetConfig } from '@shared/models/widget.models'; import { DataKey, FormattedData, WidgetActionDescriptor, WidgetConfig } from '@shared/models/widget.models';
import { getDescendantProp, isDefined, isDefinedAndNotNull, isNotEmptyStr } from '@core/utils'; import { getDescendantProp, isDefined, isNotEmptyStr } from '@core/utils';
import { AlarmDataInfo, alarmFields } from '@shared/models/alarm.models'; import { AlarmDataInfo, alarmFields } from '@shared/models/alarm.models';
import tinycolor from 'tinycolor2'; import tinycolor from 'tinycolor2';
import { Direction } from '@shared/models/page/sort-order'; import { Direction } from '@shared/models/page/sort-order';
@ -564,8 +564,8 @@ export function getHeaderTitle(dataKey: DataKey, keySettings: TableWidgetDataKey
export function buildPageStepSizeValues(pageStepCount: number, pageStepIncrement: number): Array<number> { export function buildPageStepSizeValues(pageStepCount: number, pageStepIncrement: number): Array<number> {
const pageSteps: Array<number> = []; const pageSteps: Array<number> = [];
if (isDefinedAndNotNull(pageStepCount) && pageStepCount > 0 && pageStepCount <= 100 && if (Number.isInteger(pageStepCount) && pageStepCount > 0 && pageStepCount <= 100 &&
isDefinedAndNotNull(pageStepIncrement) && pageStepIncrement > 0) { Number.isInteger(pageStepIncrement) && pageStepIncrement > 0) {
for (let i = 1; i <= pageStepCount; i++) { for (let i = 1; i <= pageStepCount; i++) {
pageSteps.push(pageStepIncrement * i); pageSteps.push(pageStepIncrement * i);
} }

8
ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts
View File

@ -352,10 +352,12 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI
this.rowStylesInfo = getRowStyleInfo(this.ctx, this.settings, 'rowData, ctx'); this.rowStylesInfo = getRowStyleInfo(this.ctx, this.settings, 'rowData, ctx');
const pageSize = this.settings.defaultPageSize; const pageSize = this.settings.defaultPageSize;
let pageStepIncrement = this.settings.pageStepIncrement; let pageStepIncrement = Number.isInteger(this.settings.pageStepIncrement) && this.settings.pageStepIncrement > 0 ?
let pageStepCount = this.settings.pageStepCount; this.settings.pageStepIncrement : null;
let pageStepCount = Number.isInteger(this.settings.pageStepCount) && this.settings.pageStepCount > 0
&& this.settings.pageStepCount <= 100 ? this.settings.pageStepCount : null;
if (isDefined(pageSize) && isNumber(pageSize) && pageSize > 0) { if (Number.isInteger(pageSize) && pageSize > 0) {
this.defaultPageSize = pageSize; this.defaultPageSize = pageSize;
} }