diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index 7b360b4..6fcb830 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -31,8 +31,18 @@ <nz-form-item class="searchParams searchParamsLong"> <nz-form-control> <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch - [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"> + [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构" + [nzExpandedIcon]="multiExpandedIconTpl"> </nz-tree-select> + <ng-template #multiExpandedIconTpl let-node let-origin="origin"> + <ng-container *ngIf="node.children.length == 0; else elseTemplate"> + + </ng-container> + <ng-template #elseTemplate> + <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'" + class="ant-tree-switcher-line-icon"></i> + </ng-template> + </ng-template> </nz-form-control> </nz-form-item> diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html index 9cd92f0..c0ef09c 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -61,8 +61,17 @@ <nz-form-control> <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId" formControlName="organization" [nzNodes]="nodes" - nzPlaceHolder="请选择所属机构"> + nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl"> </nz-tree-select> + <ng-template #multiExpandedIconTpl let-node let-origin="origin"> + <ng-container *ngIf="node.children.length == 0; else elseTemplate"> + + </ng-container> + <ng-template #elseTemplate> + <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'" + class="ant-tree-switcher-line-icon"></i> + </ng-template> + </ng-template> </nz-form-control> </nz-form-item> diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html index 797d4d3..2ef8a00 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.html +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html @@ -23,8 +23,16 @@ <nz-form-item class="searchParams searchParamsLong"> <nz-form-control> <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch [(ngModel)]="defaultOrId" - formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"> + formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl"> </nz-tree-select> + <ng-template #multiExpandedIconTpl let-node let-origin="origin"> + <ng-container *ngIf="node.children.length == 0; else elseTemplate"> + + </ng-container> + <ng-template #elseTemplate> + <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'" class="ant-tree-switcher-line-icon"></i> + </ng-template> + </ng-template> </nz-form-control> </nz-form-item> diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html index 081dd41..f5b7bd9 100644 --- a/src/app/system-management/user/adduser/adduser.component.html +++ b/src/app/system-management/user/adduser/adduser.component.html @@ -16,15 +16,25 @@ </nz-form-item> <nz-form-item> <nz-form-control> - <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"> - + <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" formControlName="organization" [nzNodes]="nodes" + nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl"> </nz-tree-select> + <ng-template #multiExpandedIconTpl let-node let-origin="origin"> + <ng-container *ngIf="node.children.length == 0; else elseTemplate"> + + </ng-container> + <ng-template #elseTemplate> + <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'" + class="ant-tree-switcher-line-icon"></i> + </ng-template> + </ng-template> </nz-form-control> </nz-form-item> <nz-form-item> <nz-form-control> <nz-select formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple"> - <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName"></nz-option> + <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName"> + </nz-option> </nz-select> </nz-form-control> </nz-form-item> @@ -36,4 +46,4 @@ </nz-form-control> </nz-form-item> </form> -</div> +</div> \ No newline at end of file diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html index 1b2ecab..e4c332d 100644 --- a/src/app/system-management/user/edituser/edituser.component.html +++ b/src/app/system-management/user/edituser/edituser.component.html @@ -16,15 +16,26 @@ </nz-form-item> <nz-form-item> <nz-form-control> - <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"> - + <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [(ngModel)]="data.organizationUnitId" + formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构" + [nzExpandedIcon]="multiExpandedIconTpl"> </nz-tree-select> + <ng-template #multiExpandedIconTpl let-node let-origin="origin"> + <ng-container *ngIf="node.children.length == 0; else elseTemplate"> + + </ng-container> + <ng-template #elseTemplate> + <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'" + class="ant-tree-switcher-line-icon"></i> + </ng-template> + </ng-template> </nz-form-control> </nz-form-item> <nz-form-item> <nz-form-control> <nz-select [(ngModel)]="data.roleNames" formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple"> - <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName"></nz-option> + <nz-option *ngFor="let item of listOfData" [nzValue]="item.normalizedName" [nzLabel]="item.displayName"> + </nz-option> </nz-select> </nz-form-control> </nz-form-item> @@ -36,4 +47,4 @@ </nz-form-control> </nz-form-item> </form> -</div> +</div> \ No newline at end of file