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

refactoring

Browse Source
This commit is contained in:
mpetrov 2024-11-07 11:44:54 +02:00
parent 3c7dc0cc03
commit bc5d15553e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/pages/rulechain/debug-strategy-button.component.ts
View File

@ -99,7 +99,7 @@ export class DebugStrategyButtonComponent implements ControlValueAccessor {
{},
{}, {}, true);
debugStrategyPopover.tbComponentRef.instance.popover = debugStrategyPopover;
debugStrategyPopover.tbComponentRef.instance.onStrategyApplied.subscribe((strategy: DebugStrategy) => {
debugStrategyPopover.tbComponentRef.instance.onStrategyApplied.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((strategy: DebugStrategy) => {
this.debugStrategyFormControl.patchValue(strategy);
this.cdr.markForCheck();
debugStrategyPopover.hide();

8
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
View File

@ -29,7 +29,7 @@ import { PageComponent } from '@shared/components/page.component';
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { DebugStrategy, FcRuleNode, RuleNodeType } from '@shared/models/rule-node.models';
import { FcRuleNode, RuleNodeType } from '@shared/models/rule-node.models';
import { EntityType } from '@shared/models/entity-type.models';
import { Subject } from 'rxjs';
import { RuleNodeConfigComponent } from './rule-node-config.component';
@ -92,7 +92,7 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
if (this.ruleNode) {
this.ruleNodeFormGroup = this.fb.group({
name: [this.ruleNode.name, [Validators.required, Validators.pattern('(.|\\s)*\\S(.|\\s)*'), Validators.maxLength(255)]],
debugStrategy: [this.ruleNode.debugStrategy ?? DebugStrategy.DISABLED],
debugStrategy: [this.ruleNode.debugStrategy],
singletonMode: [this.ruleNode.singletonMode, []],
configuration: [this.ruleNode.configuration, [Validators.required]],
additionalInfo: this.fb.group(
@ -171,7 +171,9 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
if ($event) {
$event.stopPropagation();
}
this.ruleNodeFormGroup.get('singletonMode').patchValue(!this.ruleNodeFormGroup.get('singletonMode').value);
const singleModeControl = this.ruleNodeFormGroup.get('singletonMode');
singleModeControl.patchValue(!singleModeControl.value);
singleModeControl.markAsDirty();
}
openRuleChain($event: Event) {

11
ui-ngx/src/styles.scss
View File

@ -1272,17 +1272,18 @@ pre.tb-highlight {
border-radius: 20px;
padding: 0 16px;
&:not(.active) {
color: rgba(0, 0, 0, 0.76);
background: rgba(0, 0, 0, 0.06);
}
&.active:not(:disabled) {
border-color: $primary !important;
}
&:disabled, &:not(.active) {
&:disabled {
background: rgba(0, 0, 0, 0.06);
}
&:not(.active) {
color: rgba(0, 0, 0, 0.76);
}
}
}