mirror of
https://gitee.com/dromara/MaxKey.git
synced 2025-12-06 17:08:29 +08:00
Compare commits
2 Commits
d43cc4b817
...
0809627a2e
| Author | SHA1 | Date | |
|---|---|---|---|
|
0809627a2e | ||
|
|
72034a04b3 |
@ -1,6 +1,7 @@
|
|||||||
#MaxKey Frontend Docker Build
|
#MaxKey Frontend Docker Build
|
||||||
|
|
||||||
FROM node:16.14.2 as builder
|
FROM node:16.14.2
|
||||||
|
#FROM node:16.14.2 as builder
|
||||||
|
|
||||||
LABEL authors="MaxKey <support@maxsso.net>"
|
LABEL authors="MaxKey <support@maxsso.net>"
|
||||||
|
|
||||||
@ -22,7 +23,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf
|
|||||||
|
|
||||||
#RUN rm -rf /usr/share/nginx/html/*
|
#RUN rm -rf /usr/share/nginx/html/*
|
||||||
|
|
||||||
COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/maxkey
|
COPY dist /usr/share/nginx/html/maxkey
|
||||||
|
#COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/maxkey
|
||||||
|
|
||||||
#CMD ["nginx", "-g", "daemon off;"]
|
#CMD ["nginx", "-g", "daemon off;"]
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#MaxKey Mgt Frontend Docker Build
|
#MaxKey Mgt Frontend Docker Build
|
||||||
|
|
||||||
FROM node:16.14.2 as builder
|
FROM node:16.14.2
|
||||||
|
#FROM node:16.14.2 as builder
|
||||||
|
|
||||||
LABEL authors="MaxKey <support@maxsso.net>"
|
LABEL authors="MaxKey <support@maxsso.net>"
|
||||||
|
|
||||||
@ -22,7 +23,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf
|
|||||||
|
|
||||||
#RUN rm -rf /usr/share/nginx/html/*
|
#RUN rm -rf /usr/share/nginx/html/*
|
||||||
|
|
||||||
COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/maxkey-mgt
|
COPY dist /usr/share/nginx/html/maxkey-mgt
|
||||||
|
#COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/maxkey-mgt
|
||||||
|
|
||||||
#CMD ["nginx", "-g", "daemon off;"]
|
#CMD ["nginx", "-g", "daemon off;"]
|
||||||
|
|
||||||
|
|||||||
@ -34,9 +34,6 @@
|
|||||||
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">
|
<button nz-button type="button" [nzType]="'primary'" (click)="onAdd($event)">
|
||||||
{{ 'mxk.text.add' | i18n }}
|
{{ 'mxk.text.add' | i18n }}
|
||||||
</button>
|
</button>
|
||||||
<button nz-button type="button" [nzType]="'primary'" (click)="changePassword($event)">
|
|
||||||
{{ 'mxk.text.changepassword' | i18n }}
|
|
||||||
</button>
|
|
||||||
<button
|
<button
|
||||||
nz-button
|
nz-button
|
||||||
type="button"
|
type="button"
|
||||||
@ -111,7 +108,7 @@
|
|||||||
<th nzAlign="center">{{ 'mxk.users.jobTitle' | i18n }}</th>
|
<th nzAlign="center">{{ 'mxk.users.jobTitle' | i18n }}</th>
|
||||||
<th nzAlign="center">{{ 'mxk.users.gender' | i18n }}</th>
|
<th nzAlign="center">{{ 'mxk.users.gender' | i18n }}</th>
|
||||||
<th nzAlign="center">{{ 'mxk.text.status' | i18n }}</th>
|
<th nzAlign="center">{{ 'mxk.text.status' | i18n }}</th>
|
||||||
<th nzAlign="center" class="table_cell_action_2">{{ 'mxk.text.action' | i18n }}</th>
|
<th nzAlign="center">{{ 'mxk.text.action' | i18n }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@ -147,55 +144,47 @@
|
|||||||
<i nz-icon nzType="close-circle" nzTheme="fill" style="color: red"></i>
|
<i nz-icon nzType="close-circle" nzTheme="fill" style="color: red"></i>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td nzAlign="center" nzBreakWord="false">
|
<td nzAlign="center" nzBreakWord="false" width="180px">
|
||||||
<div nz-col>
|
<button nz-button type="button" (click)="onEdit($event, data.id)">
|
||||||
<button nz-button type="button" (click)="onEdit($event, data.id)">
|
{{ 'mxk.text.edit' | i18n }}
|
||||||
{{ 'mxk.text.edit' | i18n }}
|
</button>
|
||||||
</button>
|
<button *ngIf="data.status == 9" nz-button nz-dropdown>
|
||||||
<button *ngIf="data.status == 9" nz-button nz-dropdown>
|
{{ 'mxk.text.moreaction' | i18n }}
|
||||||
{{ 'mxk.text.moreaction' | i18n }}
|
<i nz-icon nzType="down"></i>
|
||||||
<i nz-icon nzType="down"></i>
|
</button>
|
||||||
</button>
|
<button *ngIf="data.status !== 9" nz-button nz-dropdown [nzDropdownMenu]="menuMoreAction">
|
||||||
<button *ngIf="data.status !== 9" nz-button nz-dropdown [nzDropdownMenu]="menuMoreAction">
|
{{ 'mxk.text.moreaction' | i18n }}
|
||||||
{{ 'mxk.text.moreaction' | i18n }}
|
<i nz-icon nzType="down"></i>
|
||||||
<i nz-icon nzType="down"></i>
|
</button>
|
||||||
</button>
|
<nz-dropdown-menu #menuMoreAction="nzDropdownMenu">
|
||||||
<nz-dropdown-menu #menuMoreAction="nzDropdownMenu">
|
<ul nz-menu>
|
||||||
<ul nz-menu>
|
<li nz-menu-item *ngIf="data.status == 1" (click)="onNavToUrl($event, data.id, data.username, 'groups')">{{
|
||||||
<li nz-menu-item *ngIf="data.status == 1" (click)="onNavToUrl($event, data.id, data.username, 'groups')">{{
|
'mxk.text.groups' | i18n
|
||||||
'mxk.text.groups' | i18n
|
}}</li>
|
||||||
}}</li>
|
<li nz-menu-item *ngIf="data.status == 1" (click)="changePasswordById($event, data.id)">{{
|
||||||
<li nz-menu-item *ngIf="data.status == 1" (click)="changePasswordById($event, data.id)">{{
|
'mxk.text.changepassword' | i18n
|
||||||
'mxk.text.changepassword' | i18n
|
}}</li>
|
||||||
}}</li>
|
<li nz-menu-item *ngIf="data.status == 1" (click)="changeMfaById(data.id)">{{ 'mxk.users.authnType' | i18n }}</li>
|
||||||
<li nz-menu-item *ngIf="data.status == 1" (click)="changeMfaById(data.id)">{{ 'mxk.users.authnType' | i18n }}</li>
|
<li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 5)">{{ 'mxk.text.lock' | i18n }}</li>
|
||||||
<li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 5)">{{ 'mxk.text.lock' | i18n }}</li>
|
<li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 4)">{{
|
||||||
<li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 4)">{{
|
'mxk.text.disable' | i18n
|
||||||
'mxk.text.disable' | i18n
|
}}</li>
|
||||||
}}</li>
|
<li nz-menu-item *ngIf="data.status == 2" (click)="onUpdateStatus($event, data.id, 1)">{{ 'mxk.text.enable' | i18n }}</li>
|
||||||
<li nz-menu-item *ngIf="data.status == 2" (click)="onUpdateStatus($event, data.id, 1)">{{
|
<li nz-menu-item *ngIf="data.status == 4" (click)="onUpdateStatus($event, data.id, 1)">{{ 'mxk.text.enable' | i18n }}</li>
|
||||||
'mxk.text.enable' | i18n
|
<li nz-menu-item *ngIf="data.status == 5" (click)="onUpdateStatus($event, data.id, 1)">{{ 'mxk.text.unlock' | i18n }}</li>
|
||||||
}}</li>
|
<li
|
||||||
<li nz-menu-item *ngIf="data.status == 4" (click)="onUpdateStatus($event, data.id, 1)">{{
|
nz-menu-item
|
||||||
'mxk.text.enable' | i18n
|
nz-popconfirm
|
||||||
}}</li>
|
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
|
||||||
<li nz-menu-item *ngIf="data.status == 5" (click)="onUpdateStatus($event, data.id, 1)">{{
|
nzPopconfirmPlacement="left"
|
||||||
'mxk.text.unlock' | i18n
|
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
|
||||||
}}</li>
|
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
|
||||||
<li
|
(nzOnConfirm)="onDelete(data.id)"
|
||||||
nz-menu-item
|
nzDanger
|
||||||
nz-popconfirm
|
>{{ 'mxk.text.delete' | i18n }}</li
|
||||||
nzPopconfirmTitle="{{ 'mxk.text.delete.popconfirm.title' | i18n }}"
|
>
|
||||||
nzPopconfirmPlacement="left"
|
</ul>
|
||||||
[nzCancelText]="'mxk.text.delete.popconfirm.cancelText' | i18n"
|
</nz-dropdown-menu>
|
||||||
[nzOkText]="'mxk.text.delete.popconfirm.okText' | i18n"
|
|
||||||
(nzOnConfirm)="onDelete(data.id)"
|
|
||||||
nzDanger
|
|
||||||
>{{ 'mxk.text.delete' | i18n }}</li
|
|
||||||
>
|
|
||||||
</ul>
|
|
||||||
</nz-dropdown-menu>
|
|
||||||
</div>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user