Browse Source

refactoring

pull/12820/head
mpetrov 2 years ago
parent
commit
8d4d5ebb16
  1. 3
      ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
  2. 2
      ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
  3. 2
      ui-ngx/src/app/shared/models/calculated-field.models.ts

3
ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts

@ -114,8 +114,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
expressionColumn.sortable = false; expressionColumn.sortable = false;
expressionColumn.cellContentFunction = entity => { expressionColumn.cellContentFunction = entity => {
const expressionLabel = this.getExpressionLabel(entity); const expressionLabel = this.getExpressionLabel(entity);
return expressionLabel.length < 50 return expressionLabel.length < 50 ? expressionLabel : `<span style="display: inline-block; width: 50ch">${expressionLabel.substring(0, 49)}…</span>`;
? expressionLabel : `<span style="display: inline-block; width: 50ch">${expressionLabel.substring(0, 49)}…</span>`;
} }
expressionColumn.cellTooltipFunction = entity => { expressionColumn.cellTooltipFunction = entity => {
const expressionLabel = this.getExpressionLabel(entity); const expressionLabel = this.getExpressionLabel(entity);

2
ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts

@ -35,7 +35,7 @@ import {
AceHighlightRule, AceHighlightRule,
AceHighlightRules, AceHighlightRules,
dotOperatorHighlightRule, dotOperatorHighlightRule,
endGroupHighlightRule, endGroupHighlightRule
} from '@shared/models/ace/ace.models'; } from '@shared/models/ace/ace.models';
import { HelpLinks, ValueType } from '@shared/models/constants'; import { HelpLinks, ValueType } from '@shared/models/constants';
import { formPropertyCompletions } from '@shared/models/dynamic-form.models'; import { formPropertyCompletions } from '@shared/models/dynamic-form.models';

2
ui-ngx/src/app/shared/models/calculated-field.models.ts

@ -32,7 +32,7 @@ import {
AceHighlightRule, AceHighlightRule,
AceHighlightRules, AceHighlightRules,
dotOperatorHighlightRule, dotOperatorHighlightRule,
endGroupHighlightRule, endGroupHighlightRule
} from '@shared/models/ace/ace.models'; } from '@shared/models/ace/ace.models';
export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasEntityDebugSettings, HasTenantId, ExportableEntity<CalculatedFieldId> { export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasEntityDebugSettings, HasTenantId, ExportableEntity<CalculatedFieldId> {

Loading…
Cancel
Save