()
+
+ disabled = false
+
+ menus: NzSafeAny[] = []
+
+ checkAll = false
+
+ indeterminate = false
+
+ ngOnInit(): void {
+ this.api.getMenus().subscribe((res) => {
+ this.menus = res.body
+ this.refreashCheckStatus()
+ })
+ }
+
+ onTouched = () => {}
+
+ onCheckAll(checked: any) {
+ if (checked) {
+ this.value = new Set(this.menus.map((i) => i.menuId))
+ } else {
+ this.value.clear()
+ }
+ this.refreashCheckStatus()
+ }
+
+ onMenuChange(checked: NzSafeAny, item: NzSafeAny) {
+ if (checked) {
+ this.value.add(item.menuId)
+ } else {
+ this.value.delete(item.menuId)
+ }
+ this.refreashCheckStatus()
+ }
+
+ refreashCheckStatus() {
+ this.indeterminate = this.menus.length !== 0 && this.value.size > 0 && this.menus.length !== this.value.size
+ this.checkAll = this.menus.length === this.value.size
+ this.onChange(Array.from(this.value))
+ }
+
+ onChange(v: NzSafeAny[]) {}
+
+ writeValue(v: NzSafeAny[]): void {
+ if (Array.isArray(v) && v.length > 0) {
+ this.value = new Set(v)
+ this.refreashCheckStatus()
+ }
+ }
+
+ registerOnChange(fn: any): void {
+ this.onChange = fn
+ }
+
+ registerOnTouched(fn: any): void {
+ this.onTouched = fn
+ }
+
+ setDisabledState?(isDisabled: boolean): void {
+ this.disabled = isDisabled
+ }
+}
diff --git a/web-admin-app/src/app/guards/auth.guard.ts b/web-admin-app/src/app/guards/auth.guard.ts
index 11ea492..78bdefd 100644
--- a/web-admin-app/src/app/guards/auth.guard.ts
+++ b/web-admin-app/src/app/guards/auth.guard.ts
@@ -1,19 +1,18 @@
import { inject } from '@angular/core'
import { CanActivateFn, Router, UrlTree } from '@angular/router'
-import { ApiService, LocalHttpInterceptorService } from 'app/services'
-import { map } from 'rxjs'
+import { ApiService } from 'app/services'
+import { PermissionService } from 'app/shared/permission/permission.service'
export const authGuard: CanActivateFn = (route, state) => {
- // const local = inject(LocalHttpInterceptorService)
- // const accessData = local.getAccess()
- // let token = accessData?.access_token
- // if (token) {
- // return true
- // }
const router = inject(Router)
+ const permission = inject(PermissionService)
const api = inject(ApiService)
+ const authInfo = api.authInfo
if (!api.authInfo) {
return router.createUrlTree(['/login'])
}
+ permission.loadPermission(authInfo?.permissions ?? [])
+ permission.isRoot = Boolean(authInfo?.roles.includes('admin'))
+ // console.log('authInfo', authInfo, Boolean(authInfo?.roles.includes('admin')), permission)
return true
}
diff --git a/web-admin-app/src/app/pages/home/home.component.html b/web-admin-app/src/app/pages/home/home.component.html
new file mode 100644
index 0000000..5f2c53f
--- /dev/null
+++ b/web-admin-app/src/app/pages/home/home.component.html
@@ -0,0 +1 @@
+home works!
diff --git a/web-admin-app/src/app/pages/home/home.component.less b/web-admin-app/src/app/pages/home/home.component.less
new file mode 100644
index 0000000..e69de29
diff --git a/web-admin-app/src/app/pages/home/home.component.ts b/web-admin-app/src/app/pages/home/home.component.ts
new file mode 100644
index 0000000..85e02f7
--- /dev/null
+++ b/web-admin-app/src/app/pages/home/home.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core'
+import { Router } from '@angular/router'
+import { PermissionService } from 'app/shared/permission/permission.service'
+import { NzMessageService } from 'ng-zorro-antd/message'
+
+@Component({
+ selector: 'app-home',
+ standalone: true,
+ imports: [],
+ templateUrl: './home.component.html',
+ styleUrl: './home.component.less',
+})
+export class HomeComponent {
+ constructor(
+ private permission: PermissionService,
+ private router: Router,
+ private msg: NzMessageService,
+ ) {}
+
+ ngOnInit(): void {
+ if (this.permission.hasPermission('dashboard:view') || this.permission.isRoot) {
+ this.router.navigate(['/dashboard'])
+ return
+ }
+ this.router.navigate(['/profile/basic'])
+ }
+}
diff --git a/web-admin-app/src/app/pages/org-setting/org-setting.component.html b/web-admin-app/src/app/pages/org-setting/org-setting.component.html
index 1cd0bbe..b136e80 100644
--- a/web-admin-app/src/app/pages/org-setting/org-setting.component.html
+++ b/web-admin-app/src/app/pages/org-setting/org-setting.component.html
@@ -146,6 +146,14 @@
+
+ 角色
+
+
+
+
+
+
状态
diff --git a/web-admin-app/src/app/pages/org-setting/org-setting.component.ts b/web-admin-app/src/app/pages/org-setting/org-setting.component.ts
index 5fbbd66..9e4addc 100644
--- a/web-admin-app/src/app/pages/org-setting/org-setting.component.ts
+++ b/web-admin-app/src/app/pages/org-setting/org-setting.component.ts
@@ -10,8 +10,10 @@ import { NzSafeAny } from 'ng-zorro-antd/core/types'
import { NzModalService } from 'ng-zorro-antd/modal'
import { NzMessageService } from 'ng-zorro-antd/message'
import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer'
-import { lastValueFrom } from 'rxjs'
+import { Subject, lastValueFrom, switchMap } from 'rxjs'
import { FormValidators } from 'app/utils'
+import { MAX_PAGE_SIZE } from 'app/constants'
+import { Observable } from 'tinymce'
@Component({
selector: 'app-org-setting',
@@ -27,9 +29,19 @@ export class OrgSettingComponent implements OnInit {
private drawer: NzDrawerService,
private api: ApiService,
private fb: FormBuilder,
- ) {}
+ ) {
+ this.requestSubject
+ .pipe(switchMap((p: NzSafeAny, q: NzSafeAny) => this.fetchData(p, q)))
+ .subscribe((response) => {
+ console.log(response)
+ })
+ }
+
+ private requestSubject = new Subject()
- table = new TableOption(this.fetchData.bind(this))
+ table = new TableOption(this.fetchData.bind(this), {
+ manual: true,
+ })
queryForm!: FormGroup
@@ -43,6 +55,8 @@ export class OrgSettingComponent implements OnInit {
uploadLoading = false
+ roles: NzSafeAny[] = []
+
@ViewChild('drawerFooterTpl') drawerFooterTpl!: TemplateRef
@ViewChild('formContentTpl') formContentTpl!: TemplateRef
@@ -94,21 +108,23 @@ export class OrgSettingComponent implements OnInit {
])
this.initQueryForm()
this.initCreateForm()
+ this.api.getRolePage({ pageSize: MAX_PAGE_SIZE, pageNum: 1 }).subscribe((res) => {
+ this.roles = res.body.rows
+ })
}
fetchData(p: {}, q: AnyObject) {
- return this.api.getUserPage({ ...p, ...q, organizationId: this.organization?.organizationId })
+ return this.api.getUserPage({ ...p, ...q, organizationId: this.organization?.organizationId }).pipe()
}
onOrgSelectedChange(org: NzSafeAny) {
- console.log('org', org)
this.organization = org
this.table.ref.search()
}
onCreate(data?: NzSafeAny) {
if (data) {
- this.createForm.patchValue(data)
+ this.createForm.patchValue({ ...data, roleId: data._umsRole.roleId })
}
this.drawerRef = this.drawer.create({
nzTitle: data ? '编辑员工' : '新增员工',
diff --git a/web-admin-app/src/app/pages/system/system-role/system-role.component.html b/web-admin-app/src/app/pages/system/system-role/system-role.component.html
index b73b302..c2781e1 100644
--- a/web-admin-app/src/app/pages/system/system-role/system-role.component.html
+++ b/web-admin-app/src/app/pages/system/system-role/system-role.component.html
@@ -60,7 +60,9 @@
权限菜单
- 《权限菜单》
+
+
+
-
- 系统管理
-
-
-
+
+ 系统管理
+
diff --git a/web-admin-app/src/app/shared/components/server-paginated-table/server-paginated-table.component.ts b/web-admin-app/src/app/shared/components/server-paginated-table/server-paginated-table.component.ts
index 1640456..81dac91 100644
--- a/web-admin-app/src/app/shared/components/server-paginated-table/server-paginated-table.component.ts
+++ b/web-admin-app/src/app/shared/components/server-paginated-table/server-paginated-table.component.ts
@@ -17,7 +17,7 @@ import {
TableColumnsInterface,
persistKey,
} from './server-paginated-table.service'
-import { finalize, map } from 'rxjs'
+import { Subject, finalize, map, switchMap } from 'rxjs'
import { FormGroup } from '@angular/forms'
import { TableFormDirective } from './table-form.directive'
import { Router } from '@angular/router'
@@ -153,7 +153,35 @@ export class ServerPaginatedTableComponent implements OnInit, OnChanges {
private pageTable: ServerPaginatedTableService,
private router: Router,
private drawer: NzDrawerService,
- ) {}
+ ) {
+ this.trigger$
+ .pipe(
+ switchMap(() => {
+ const { pageIndex, pageSize } = this.pagination
+ const page = this.pageTable.globalConfig.formatPaginationData({ pageIndex, pageSize })
+ const query = this.formGroup?.value ?? {}
+
+ this.pagination.loading = true
+
+ return this.options.fetchData(page, query).pipe(
+ map(this.pageTable.globalConfig.formatServiceData),
+ finalize(() => {
+ this.saveCacheState()
+ this.pagination.loading = false
+ }),
+ )
+ }),
+ )
+ .subscribe((res) => {
+ this.pagination = {
+ ...this.pagination,
+ ...res,
+ }
+ // 不允许跨页选择
+ this.selected.clear()
+ this.onSelectChange()
+ })
+ }
@Input() options!: TableOption
@@ -276,30 +304,10 @@ export class ServerPaginatedTableComponent implements OnInit, OnChanges {
return persistKey + this.router.url.replaceAll('/', '_')
}
- private run() {
- const { pageIndex, pageSize } = this.pagination
- const page = this.pageTable.globalConfig.formatPaginationData({ pageIndex, pageSize })
- const query = this.formGroup?.value ?? {}
+ trigger$ = new Subject()
- this.pagination.loading = true
- this.options
- .fetchData(page, query)
- .pipe(
- map(this.pageTable.globalConfig.formatServiceData),
- finalize(() => {
- this.saveCacheState()
- this.pagination.loading = false
- }),
- )
- .subscribe((res) => {
- this.pagination = {
- ...this.pagination,
- ...res,
- }
- // 不允许跨页选择
- this.selected.clear()
- this.onSelectChange()
- })
+ private run() {
+ this.trigger$.next(null)
}
reload() {
diff --git a/web-admin-app/src/app/shared/permission/permission.directive.ts b/web-admin-app/src/app/shared/permission/permission.directive.ts
index b5211af..4ecddbf 100644
--- a/web-admin-app/src/app/shared/permission/permission.directive.ts
+++ b/web-admin-app/src/app/shared/permission/permission.directive.ts
@@ -19,7 +19,9 @@ export class PermissionDirective {
}
private checkPermission(): void {
- const hasPermission = this.permissionService.hasPermission(this.requiredPermission)
+ const hasPermission =
+ this.permissionService.isRoot || this.permissionService.hasPermission(this.requiredPermission)
+ console.log('hasPermission', this.permissionService)
if (hasPermission) {
this.viewContainerRef.createEmbeddedView(this.templateRef)
} else {
diff --git a/web-admin-app/src/app/shared/permission/permission.service.ts b/web-admin-app/src/app/shared/permission/permission.service.ts
index 36beeff..3159cab 100644
--- a/web-admin-app/src/app/shared/permission/permission.service.ts
+++ b/web-admin-app/src/app/shared/permission/permission.service.ts
@@ -4,7 +4,7 @@ import { Injectable } from '@angular/core'
export class PermissionService {
constructor() {}
- private permissons: string[] = []
+ permissons: string[] = []
isRoot = false