zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update Dockerfile version and improve code formatting in PermissionConfiguration.vue

Browse Source
This commit is contained in:
wxg0103 2025-07-08 20:00:30 +08:00
parent 9fb5ef4f80
commit dc51cc1f2a
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/1panel-dev/maxkb-vector-model:v2.0.1 AS vector-model FROM ghcr.io/1panel-dev/maxkb-vector-model:v2.0.2 AS vector-model
FROM node:18-alpine3.18 AS web-build FROM node:18-alpine3.18 AS web-build
COPY ui ui COPY ui ui
RUN cd ui && \ RUN cd ui && \

40
ui/src/views/system/role/component/PermissionConfiguration.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-scrollbar v-loading="loading"> <el-scrollbar v-loading="loading">
<app-table :data="tableData" border :span-method="objectSpanMethod"> <app-table :data="tableData" border :span-method="objectSpanMethod">
<el-table-column prop="module" :width="130" :label="$t('views.role.permission.moduleName')" /> <el-table-column prop="module" :width="130" :label="$t('views.role.permission.moduleName')"/>
<el-table-column <el-table-column
prop="name" prop="name"
:width="150" :width="150"
@ -49,17 +49,19 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch, computed } from 'vue' import {ref, watch, computed} from 'vue'
import type { import type {
RoleItem, RoleItem,
RolePermissionItem, RolePermissionItem,
RoleTableDataItem, RoleTableDataItem,
ChildrenPermissionItem, ChildrenPermissionItem,
} from '@/api/type/role' } from '@/api/type/role'
import { loadPermissionApi } from '@/utils/dynamics-api/permission-api' import {loadPermissionApi} from '@/utils/dynamics-api/permission-api'
import RoleApi from '@/api/system/role' import RoleApi from '@/api/system/role'
import { MsgSuccess } from '@/utils/message' import {MsgSuccess} from '@/utils/message'
import { t } from '@/locales' import {t} from '@/locales'
import {hasPermission} from "@/utils/permission";
import {EditionConst, RoleConst} from "@/utils/permission/data.ts";
const props = defineProps<{ const props = defineProps<{
currentRole?: RoleItem currentRole?: RoleItem
@ -67,7 +69,29 @@ const props = defineProps<{
const loading = ref(false) const loading = ref(false)
const tableData = ref<RoleTableDataItem[]>([]) const tableData = ref<RoleTableDataItem[]>([])
const disabled = computed(() => props.currentRole?.internal) // TODO 权限 const needDisable = computed(() => {
const isEeOrPe = hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')
const isAdminOrExtendAdmin = hasPermission([RoleConst.ADMIN, RoleConst.EXTENDS_ADMIN], 'OR')
const isWorkspaceManage =
hasPermission(
[
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
RoleConst.EXTENDS_WORKSPACE_MANAGE.getWorkspaceRole,
],
'OR'
)
if (!isEeOrPe) {
return false
}
if (isAdminOrExtendAdmin) {
return false
}
return isWorkspaceManage
})
const disabled = computed(() => props.currentRole?.internal || needDisable.value)
function transformData(data: RolePermissionItem[]) { function transformData(data: RolePermissionItem[]) {
const transformedData: RoleTableDataItem[] = [] const transformedData: RoleTableDataItem[] = []
@ -136,7 +160,7 @@ function handleCheckAll(checked: boolean) {
}) })
} }
const objectSpanMethod = ({ row, column, rowIndex, columnIndex }: any) => { const objectSpanMethod = ({row, column, rowIndex, columnIndex}: any) => {
if (columnIndex === 0) { if (columnIndex === 0) {
const sameModuleRows = tableData.value.filter((item) => item.module === row.module) const sameModuleRows = tableData.value.filter((item) => item.module === row.module)
const firstRowIndex = tableData.value.findIndex((item) => item.module === row.module) const firstRowIndex = tableData.value.findIndex((item) => item.module === row.module)
@ -154,7 +178,7 @@ const objectSpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
} }
} }
watch(() => props.currentRole?.id, getRolePermission, { immediate: true }) watch(() => props.currentRole?.id, getRolePermission, {immediate: true})
async function handleSave() { async function handleSave() {
try { try {