Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/store/modules/permission.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const transformRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteRe
// 4. 递归处理子路由,实现无限层级菜单
if (normalizedRoute.children && normalizedRoute.children.length > 0) {
// normalizedRoute.children = transformRoutes(route.children);

// 非叶子路由
if (isTopLevel) {
// 顶级路由(一级目录),使用Layout组件
Expand Down
40 changes: 8 additions & 32 deletions frontend/src/views/module_generator/gencode/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -644,38 +644,22 @@
</el-table-column>
<el-table-column label="新增" min-width="10%">
<template #default="scope">
<el-checkbox
v-model="scope.row.is_insert"
true-value="1"
false-value="0"
></el-checkbox>
<el-checkbox v-model="scope.row.is_insert" />
</template>
</el-table-column>
<el-table-column label="编辑" min-width="10%">
<template #default="scope">
<el-checkbox
v-model="scope.row.is_edit"
true-value="1"
false-value="0"
></el-checkbox>
<el-checkbox v-model="scope.row.is_edit" />
</template>
</el-table-column>
<el-table-column label="列表" min-width="10%">
<template #default="scope">
<el-checkbox
v-model="scope.row.is_list"
true-value="1"
false-value="0"
></el-checkbox>
<el-checkbox v-model="scope.row.is_list" />
</template>
</el-table-column>
<el-table-column label="查询" min-width="10%">
<template #default="scope">
<el-checkbox
v-model="scope.row.is_query"
true-value="1"
false-value="0"
></el-checkbox>
<el-checkbox v-model="scope.row.is_query" />
</template>
</el-table-column>
<el-table-column label="查询方式" min-width="12%">
Expand Down Expand Up @@ -704,30 +688,22 @@
</el-table-column>
<el-table-column label="自增" min-width="10%">
<template #default="scope">
<el-checkbox v-model="scope.row.is_increment" true-value="1" false-value="0" />
<el-checkbox v-model="scope.row.is_increment" />
</template>
</el-table-column>
<el-table-column label="允许空" min-width="10%">
<template #default="scope">
<el-checkbox
v-model="scope.row.is_nullable"
true-value="0"
false-value="1"
></el-checkbox>
<el-checkbox v-model="scope.row.is_nullable" />
</template>
</el-table-column>
<el-table-column label="唯一" min-width="10%">
<template #default="scope">
<el-checkbox
v-model="scope.row.is_unique"
true-value="1"
false-value="0"
></el-checkbox>
<el-checkbox v-model="scope.row.is_unique" />
</template>
</el-table-column>
<el-table-column label="主键" min-width="10%">
<template #default="scope">
<el-checkbox v-model="scope.row.is_pk" true-value="1" false-value="0"></el-checkbox>
<el-checkbox v-model="scope.row.is_pk" />
</template>
</el-table-column>
<el-table-column label="表单类型" min-width="12%">
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/module_system/menu/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@
v-if="formData.type !== MenuTypeEnum.CATALOG"
label="父级菜单"
prop="parent_id"
if
>
<el-tree-select
v-model="formData.parent_id"
Expand Down Expand Up @@ -907,7 +906,8 @@ async function handleOpenDialog(
}
} else {
dialogVisible.title = "新增菜单";
formData.id = undefined;
// 重置表单为初始状态
Object.assign(formData, initialFormData);
// 设置父级部门
if (parentId) {
formData.parent_id = parentId;
Expand Down