mirror of
https://github.com/goharbor/harbor.git
synced 2024-11-23 02:35:17 +01:00
fix component namespace duplicated bug
This commit is contained in:
parent
16df9fec5d
commit
8173aaeac2
@ -24,7 +24,7 @@
|
|||||||
<a href="javascript:void(0)" clrDropdownItem>中文繁體</a>
|
<a href="javascript:void(0)" clrDropdownItem>中文繁體</a>
|
||||||
</div>
|
</div>
|
||||||
</clr-dropdown>
|
</clr-dropdown>
|
||||||
<clr-dropdown [clrMenuPosition]="'bottom-left'" class="dropdown" *ngIf="isSessionValid">
|
<clr-dropdown [clrMenuPosition]="'bottom-right'" class="dropdown" *ngIf="isSessionValid">
|
||||||
<button class="nav-text" clrDropdownToggle>
|
<button class="nav-text" clrDropdownToggle>
|
||||||
<clr-icon shape="user" class="is-inverse" size="24" style="left: -2px;"></clr-icon>
|
<clr-icon shape="user" class="is-inverse" size="24" style="left: -2px;"></clr-icon>
|
||||||
<span>{{accountName}}</span>
|
<span>{{accountName}}</span>
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
import {Component} from "@angular/core";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: "clr-dg-action-overflow",
|
|
||||||
templateUrl: "datagrid-action-overflow.html"
|
|
||||||
})
|
|
||||||
|
|
||||||
export class DatagridActionOverflow {
|
|
||||||
}
|
|
@ -0,0 +1,9 @@
|
|||||||
|
import {Component} from "@angular/core";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: "harbor-action-overflow",
|
||||||
|
templateUrl: "harbor-action-overflow.html"
|
||||||
|
})
|
||||||
|
|
||||||
|
export class HarborActionOverflow {
|
||||||
|
}
|
@ -7,7 +7,7 @@ import { MessageComponent } from '../global-message/message.component';
|
|||||||
import { MessageService } from '../global-message/message.service';
|
import { MessageService } from '../global-message/message.service';
|
||||||
import { MaxLengthExtValidatorDirective } from './max-length-ext.directive';
|
import { MaxLengthExtValidatorDirective } from './max-length-ext.directive';
|
||||||
import { FilterComponent } from './filter/filter.component';
|
import { FilterComponent } from './filter/filter.component';
|
||||||
import { DatagridActionOverflow } from './clg-dg-action-overflow/datagrid-action-overflow';
|
import { HarborActionOverflow } from './harbor-action-overflow/harbor-action-overflow';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@ -17,14 +17,14 @@ import { DatagridActionOverflow } from './clg-dg-action-overflow/datagrid-action
|
|||||||
MessageComponent,
|
MessageComponent,
|
||||||
MaxLengthExtValidatorDirective,
|
MaxLengthExtValidatorDirective,
|
||||||
FilterComponent,
|
FilterComponent,
|
||||||
DatagridActionOverflow
|
HarborActionOverflow
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
CoreModule,
|
CoreModule,
|
||||||
MessageComponent,
|
MessageComponent,
|
||||||
MaxLengthExtValidatorDirective,
|
MaxLengthExtValidatorDirective,
|
||||||
FilterComponent,
|
FilterComponent,
|
||||||
DatagridActionOverflow
|
HarborActionOverflow
|
||||||
],
|
],
|
||||||
providers: [SessionService, MessageService]
|
providers: [SessionService, MessageService]
|
||||||
})
|
})
|
||||||
|
@ -23,11 +23,11 @@
|
|||||||
<clr-dg-cell>{{user.email}}</clr-dg-cell>
|
<clr-dg-cell>{{user.email}}</clr-dg-cell>
|
||||||
<clr-dg-cell>
|
<clr-dg-cell>
|
||||||
{{user.creation_time}}
|
{{user.creation_time}}
|
||||||
<clr-dg-action-overflow>
|
<harbor-action-overflow>
|
||||||
<a href="javascript:void(0)" class="dropdown-item" (click)="changeAdminRole(user)">{{user.has_admin_role?"Disable administrator":"Enable administrator"}}</a>
|
<a href="javascript:void(0)" class="dropdown-item" (click)="changeAdminRole(user)">{{user.has_admin_role?"Disable administrator":"Enable administrator"}}</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a href="javascript:void(0)" class="dropdown-item" (click)="deleteUser(user.user_id)">Delete</a>
|
<a href="javascript:void(0)" class="dropdown-item" (click)="deleteUser(user.user_id)">Delete</a>
|
||||||
</clr-dg-action-overflow>
|
</harbor-action-overflow>
|
||||||
</clr-dg-cell>
|
</clr-dg-cell>
|
||||||
</clr-dg-row>
|
</clr-dg-row>
|
||||||
<clr-dg-footer>{{users.length}} users</clr-dg-footer>
|
<clr-dg-footer>{{users.length}} users</clr-dg-footer>
|
||||||
|
Loading…
Reference in New Issue
Block a user