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

UI: Refactoring

Browse Source
This commit is contained in:
Artem Dzhereleiko 2024-05-30 10:22:07 +03:00
parent 011fcf1cbd
commit 00f081aa5a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
View File

@ -80,7 +80,7 @@ import { RuleChainService } from '@core/http/rule-chain.service';
import { NEVER, Observable, of, ReplaySubject, skip, startWith, Subject } from 'rxjs'; import { NEVER, Observable, of, ReplaySubject, skip, startWith, Subject } from 'rxjs';
import { debounceTime, distinctUntilChanged, mergeMap, takeUntil, tap } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged, mergeMap, takeUntil, tap } from 'rxjs/operators';
import { ISearchableComponent } from '../../models/searchable-component.models'; import { ISearchableComponent } from '../../models/searchable-component.models';
import { deepClone, isDefinedAndNotNull, isEqual } from '@core/utils'; import { deepClone, isDefinedAndNotNull } from '@core/utils';
import { RuleNodeDetailsComponent } from '@home/pages/rulechain/rule-node-details.component'; import { RuleNodeDetailsComponent } from '@home/pages/rulechain/rule-node-details.component';
import { RuleNodeLinkComponent } from './rule-node-link.component'; import { RuleNodeLinkComponent } from './rule-node-link.component';
import { DialogComponent } from '@shared/components/dialog.component'; import { DialogComponent } from '@shared/components/dialog.component';
@ -367,29 +367,29 @@ export class RuleChainPageComponent extends PageComponent
if (!this.hotKeys.length) { if (!this.hotKeys.length) {
this.hotKeys.push( this.hotKeys.push(
new Hotkey('ctrl+a', (event: KeyboardEvent) => { new Hotkey('ctrl+a', (event: KeyboardEvent) => {
if (this.enableHotKeys && isEqual(event.currentTarget, event.target)) { if (this.enableHotKeys) {
event.preventDefault(); event.preventDefault();
this.ruleChainCanvas.modelService.selectAll(); this.ruleChainCanvas.modelService.selectAll();
return false; return false;
} }
return true; return true;
}, ['INPUT', 'SELECT', 'TEXTAREA'], }, [],
this.translate.instant('rulenode.select-all-objects')) this.translate.instant('rulenode.select-all-objects'))
); );
this.hotKeys.push( this.hotKeys.push(
new Hotkey('ctrl+c', (event: KeyboardEvent) => { new Hotkey('ctrl+c', (event: KeyboardEvent) => {
if (this.enableHotKeys && isEqual(event.currentTarget, event.target)) { if (this.enableHotKeys) {
event.preventDefault(); event.preventDefault();
this.copyRuleNodes(); this.copyRuleNodes();
return false; return false;
} }
return true; return true;
}, ['INPUT', 'SELECT', 'TEXTAREA'], }, [],
this.translate.instant('rulenode.copy-selected')) this.translate.instant('rulenode.copy-selected'))
); );
this.hotKeys.push( this.hotKeys.push(
new Hotkey('ctrl+v', (event: KeyboardEvent) => { new Hotkey('ctrl+v', (event: KeyboardEvent) => {
if (this.enableHotKeys && isEqual(event.currentTarget, event.target)) { if (this.enableHotKeys) {
event.preventDefault(); event.preventDefault();
if (this.itembuffer.hasRuleNodes()) { if (this.itembuffer.hasRuleNodes()) {
this.pasteRuleNodes(); this.pasteRuleNodes();
@ -397,7 +397,7 @@ export class RuleChainPageComponent extends PageComponent
return false; return false;
} }
return true; return true;
}, ['INPUT', 'SELECT', 'TEXTAREA'], }, [],
this.translate.instant('action.paste')) this.translate.instant('action.paste'))
); );
this.hotKeys.push( this.hotKeys.push(
@ -436,13 +436,13 @@ export class RuleChainPageComponent extends PageComponent
); );
this.hotKeys.push( this.hotKeys.push(
new Hotkey('del', (event: KeyboardEvent) => { new Hotkey('del', (event: KeyboardEvent) => {
if (this.enableHotKeys && isEqual(event.currentTarget, event.target)) { if (this.enableHotKeys) {
event.preventDefault(); event.preventDefault();
this.ruleChainCanvas.modelService.deleteSelected(); this.ruleChainCanvas.modelService.deleteSelected();
return false; return false;
} }
return true; return true;
}, ['INPUT', 'SELECT', 'TEXTAREA'], }, [],
this.translate.instant('rulenode.delete-selected-objects')) this.translate.instant('rulenode.delete-selected-objects'))
); );
this.hotKeys.push( this.hotKeys.push(