Browse Source

refactoring

pull/22829/head
erdemcaygor 1 year ago
parent
commit
a4ea45486b
  1. 1
      npm/ng-packs/packages/components/chart.js/src/chart.component.ts
  2. 28
      npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
  3. 1
      npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts
  4. 1
      npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts
  5. 29
      npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts

1
npm/ng-packs/packages/components/chart.js/src/chart.component.ts

@ -16,7 +16,6 @@ import {
let Chart: any; let Chart: any;
@Component({ @Component({
standalone: false,
selector: 'abp-chart', selector: 'abp-chart',
template: ` template: `
<div <div

28
npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts

@ -11,24 +11,44 @@ import {
TemplateRef, TemplateRef,
ViewEncapsulation, ViewEncapsulation,
} from '@angular/core'; } from '@angular/core';
import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdown, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap';
import { NzFormatBeforeDropEvent, NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/tree'; import {
import { LazyLoadService, LOADING_STRATEGY, SubscriptionService } from '@abp/ng.core'; NzFormatBeforeDropEvent,
NzFormatEmitEvent,
NzTreeComponent,
NzTreeNode,
} from 'ng-zorro-antd/tree';
import {
InitDirective,
LazyLoadService,
LOADING_STRATEGY,
SubscriptionService,
} from '@abp/ng.core';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { DISABLE_TREE_STYLE_LOADING_TOKEN } from '../disable-tree-style-loading.token'; import { DISABLE_TREE_STYLE_LOADING_TOKEN } from '../disable-tree-style-loading.token';
import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive'; import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive';
import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive'; import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive';
import { CommonModule } from '@angular/common';
import { NzNoAnimationDirective } from 'ng-zorro-antd/core/no-animation';
export type DropEvent = NzFormatEmitEvent & { pos: number }; export type DropEvent = NzFormatEmitEvent & { pos: number };
@Component({ @Component({
standalone: false,
selector: 'abp-tree', selector: 'abp-tree',
templateUrl: 'tree.component.html', templateUrl: 'tree.component.html',
styleUrls: ['tree.component.scss'], styleUrls: ['tree.component.scss'],
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
providers: [SubscriptionService], providers: [SubscriptionService],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
imports: [
CommonModule,
NzTreeComponent,
NgbDropdown,
NgbDropdownMenu,
NgbDropdownToggle,
InitDirective,
NzNoAnimationDirective,
],
}) })
export class TreeComponent implements OnInit { export class TreeComponent implements OnInit {
private lazyLoadService = inject(LazyLoadService); private lazyLoadService = inject(LazyLoadService);

1
npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts

@ -1,7 +1,6 @@
import { Directive, TemplateRef } from '@angular/core'; import { Directive, TemplateRef } from '@angular/core';
@Directive({ @Directive({
standalone: false,
selector: '[abpTreeExpandedIconTemplate],[abp-tree-expanded-icon-template]', selector: '[abpTreeExpandedIconTemplate],[abp-tree-expanded-icon-template]',
}) })
export class ExpandedIconTemplateDirective { export class ExpandedIconTemplateDirective {

1
npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts

@ -1,7 +1,6 @@
import { Directive, TemplateRef } from '@angular/core'; import { Directive, TemplateRef } from '@angular/core';
@Directive({ @Directive({
standalone: false,
selector: '[abpTreeNodeTemplate],[abp-tree-node-template]', selector: '[abpTreeNodeTemplate],[abp-tree-node-template]',
}) })
export class TreeNodeTemplateDirective { export class TreeNodeTemplateDirective {

29
npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts

@ -1,21 +1,42 @@
import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap';
import { collapse, ToasterService } from '@abp/ng.theme.shared'; import {
ButtonComponent,
collapse,
ModalCloseDirective,
ModalComponent,
ToasterService,
} from '@abp/ng.theme.shared';
import { Component, inject, OnInit } from '@angular/core'; import { Component, inject, OnInit } from '@angular/core';
import { toSignal } from '@angular/core/rxjs-interop'; import { toSignal } from '@angular/core/rxjs-interop';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import {
ReactiveFormsModule,
UntypedFormBuilder,
UntypedFormGroup,
Validators,
} from '@angular/forms';
import { finalize } from 'rxjs/operators'; import { finalize } from 'rxjs/operators';
import { SettingManagementPolicyNames } from '../../enums/policy-names'; import { SettingManagementPolicyNames } from '../../enums/policy-names';
import { EmailSettingsService } from '@abp/ng.setting-management/proxy'; import { EmailSettingsService } from '@abp/ng.setting-management/proxy';
import { EmailSettingsDto } from '../../proxy/models'; import { EmailSettingsDto } from '../../proxy/models';
import { ConfigStateService, LocalizationService } from '@abp/ng.core'; import { ConfigStateService, LocalizationPipe, LocalizationService } from '@abp/ng.core';
import { NgxValidateCoreModule, ValidationDirective } from '@ngx-validate/core';
import { CommonModule } from '@angular/common';
const { required, email } = Validators; const { required, email } = Validators;
@Component({ @Component({
standalone: false,
selector: 'abp-email-setting-group', selector: 'abp-email-setting-group',
templateUrl: 'email-setting-group.component.html', templateUrl: 'email-setting-group.component.html',
animations: [collapse], animations: [collapse],
imports: [
ReactiveFormsModule,
CommonModule,
LocalizationPipe,
ButtonComponent,
ModalComponent,
ModalCloseDirective,
NgxValidateCoreModule,
],
}) })
export class EmailSettingGroupComponent implements OnInit { export class EmailSettingGroupComponent implements OnInit {
protected readonly localizationService = inject(LocalizationService); protected readonly localizationService = inject(LocalizationService);

Loading…
Cancel
Save