diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 21f88272b4..d63e69590f 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -112,7 +112,7 @@ "lerna": "^4.0.0", "lint-staged": "^13.0.0", "ng-packagr": "~19.1.0", - "ng-zorro-antd": "^19.0.0-beta.0", + "ng-zorro-antd": "~19.0.0", "nx": "~20.3.0", "postcss": "^8.0.0", "postcss-import": "14.1.0", diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 18b76419e9..28394bdd71 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "chart.js": "^3.5.1", - "ng-zorro-antd": "^19.0.0-beta.0", + "ng-zorro-antd": "~19.0.0", "@ctrl/tinycolor": "^4.0.0", "tslib": "^2.0.0" }, diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html index b670b0ed48..82b3048868 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html +++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html @@ -9,18 +9,18 @@ [nzExpandedKeys]="expandedKeys" [nzExpandedIcon]="expandedIconTemplate?.template || defaultIconTemplate" (nzExpandChange)="onExpandedKeysChange($event)" - (nzCheckBoxChange)="onCheckboxChange($event)" + (nzCheckboxChange)="onCheckboxChange($event)" (nzOnDrop)="onDrop($event)" [nzNoAnimation]="noAnimation" (nzContextMenu)="dropdowns[$event.node?.key]?.toggle()" -> +/>
- +
@@ -29,7 +29,7 @@ customNodeTemplate ? customNodeTemplate?.template : defaultNodeTemplate; context: { $implicit: node } " - > + />
@if (menu) { @@ -48,7 +48,7 @@ aria-hidden="true" >
- +
} @@ -62,8 +62,8 @@ + diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts index 51e4eb9eae..2d227787ca 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts +++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts @@ -4,21 +4,20 @@ import { Component, ContentChild, EventEmitter, - Inject, + inject, Input, OnInit, - Optional, Output, TemplateRef, ViewEncapsulation, } from '@angular/core'; +import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'; import { NzFormatBeforeDropEvent, NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/tree'; +import { LazyLoadService, LOADING_STRATEGY, SubscriptionService } from '@abp/ng.core'; import { of } from 'rxjs'; +import { DISABLE_TREE_STYLE_LOADING_TOKEN } from '../disable-tree-style-loading.token'; import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive'; import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive'; -import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'; -import { LazyLoadService, LOADING_STRATEGY, SubscriptionService } from '@abp/ng.core'; -import { DISABLE_TREE_STYLE_LOADING_TOKEN } from '../disable-tree-style-loading.token'; export type DropEvent = NzFormatEmitEvent & { pos: number }; @@ -32,19 +31,15 @@ export type DropEvent = NzFormatEmitEvent & { pos: number }; changeDetection: ChangeDetectionStrategy.OnPush, }) export class TreeComponent implements OnInit { + private lazyLoadService = inject(LazyLoadService); + private subscriptionService = inject(SubscriptionService); + private cdr = inject(ChangeDetectorRef); + private disableTreeStyleLoading = inject(DISABLE_TREE_STYLE_LOADING_TOKEN, { optional: true }); + dropPosition: number; dropdowns = {} as { [key: string]: NgbDropdown }; - constructor( - private lazyLoadService: LazyLoadService, - private subscriptionService: SubscriptionService, - @Optional() - @Inject(DISABLE_TREE_STYLE_LOADING_TOKEN) - private disableTreeStyleLoading: boolean | undefined, - private cdr: ChangeDetectorRef, - ) {} - @ContentChild('menu') menu: TemplateRef; @ContentChild(TreeNodeTemplateDirective) customNodeTemplate: TreeNodeTemplateDirective; @ContentChild(ExpandedIconTemplateDirective) expandedIconTemplate: ExpandedIconTemplateDirective; @@ -88,7 +83,7 @@ export class TreeComponent implements OnInit { return node; } if (node.children) { - let res = this.findNode(target, node.children); + const res = this.findNode(target, node.children); if (res) { return res; } @@ -138,7 +133,7 @@ export class TreeComponent implements OnInit { } setSelectedNode(node: any) { - let newSelectedNode = this.findNode(node, this.nodes); + const newSelectedNode = this.findNode(node, this.nodes); this.selectedNode = { ...newSelectedNode }; this.cdr.markForCheck(); }