🎨 更新用户版本

This commit is contained in:
2025-09-02 22:56:30 +08:00
parent 8276b3e87f
commit a1906d2a36
71 changed files with 4790 additions and 962 deletions

View File

@@ -531,7 +531,7 @@
if (res.code === 0) {
ElMessage({
type: 'success',
message: '添加成功',
message: '添加成功,请到角色管理页面分配权限',
showClose: true
})
syncApiData.value.newApis = syncApiData.value.newApis.filter(

View File

@@ -23,7 +23,7 @@
<template #default="{ node, data }">
<span class="custom-tree-node">
<span>{{ node.label }}</span>
<span v-if="node.checked">
<span v-if="node.checked && !data.name?.startsWith('http://') && !data.name?.startsWith('https://')">
<el-button
type="primary"
link
@@ -31,13 +31,13 @@
color:
row.defaultRouter === data.name ? '#E6A23C' : '#85ce61'
}"
@click="() => setDefault(data)"
@click.stop="() => setDefault(data)"
>
{{ row.defaultRouter === data.name ? '首页' : '设为首页' }}
</el-button>
</span>
<span v-if="data.menuBtn.length">
<el-button type="primary" link @click="() => OpenBtn(data)">
<el-button type="primary" link @click.stop="() => OpenBtn(data)">
分配按钮
</el-button>
</span>
@@ -132,7 +132,7 @@
defaultRouter: data.name
})
if (res.code === 0) {
ElMessage({ type: 'success', message: '设置成功' })
relation()
emit('changeRow', 'defaultRouter', res.data.authority.defaultRouter)
}
}

View File

@@ -119,287 +119,394 @@
</template>
<warning-bar title="新增菜单,需要在角色管理内配置权限才可使用" />
<el-form
v-if="dialogFormVisible"
ref="menuForm"
:inline="true"
:model="form"
:rules="rules"
label-position="top"
>
<el-row class="w-full">
<el-col :span="16">
<el-form-item label="文件路径" prop="component">
<components-cascader
:component="form.component"
@change="fmtComponent"
/>
<span style="font-size: 12px; margin-right: 12px"
>如果菜单包含子菜单请创建router-view二级路由页面或者</span
>
<el-button
style="margin-top: 4px"
@click="form.component = 'view/routerHolder.vue'"
>
点我设置
</el-button>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="展示名称" prop="meta.title">
<el-input v-model="form.meta.title" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row class="w-full">
<el-col :span="8">
<el-form-item label="路由Name" prop="path">
<el-input
v-model="form.name"
autocomplete="off"
placeholder="唯一英文字符串"
@change="changeName"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="path">
<template #label>
<span style="display: inline-flex; align-items: center">
<span>路由Path</span>
<el-checkbox
v-model="checkFlag"
style="margin-left: 12px; height: auto"
>添加参数</el-checkbox
<!-- 基础信息区域 -->
<div class="border-b border-gray-200">
<h3 class="font-semibold text-gray-700 mb-4">基础信息</h3>
<el-form
v-if="dialogFormVisible"
ref="menuForm"
:inline="true"
:model="form"
:rules="rules"
label-position="top"
>
<el-row class="w-full">
<el-col :span="24">
<el-form-item label="文件路径" prop="component">
<components-cascader
:component="form.component"
@change="fmtComponent"
/>
<div class="form-tip">
<el-icon><InfoFilled /></el-icon>
<span>如果菜单包含子菜单请创建router-view二级路由页面或者</span>
<el-button
size="small"
type="text"
@click="form.component = 'view/routerHolder.vue'"
>
</span>
</template>
<el-input
v-model="form.path"
:disabled="!checkFlag"
autocomplete="off"
placeholder="建议只在后方拼接参数"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否隐藏">
<el-select
v-model="form.hidden"
style="width: 100%"
placeholder="是否在列表隐藏"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row class="w-full">
<el-col :span="8">
<el-form-item label="父节点ID">
<el-cascader
v-model="form.parentId"
style="width: 100%"
:disabled="!isEdit"
:options="menuOption"
:props="{
checkStrictly: true,
label: 'title',
value: 'ID',
disabled: 'disabled',
emitPath: false
}"
:show-all-levels="false"
filterable
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="图标" prop="meta.icon">
<icon v-model="form.meta.icon" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="排序标记" prop="sort">
<el-input v-model.number="form.sort" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row class="w-full">
<el-col :span="8">
<el-form-item prop="meta.activeName">
<template #label>
<div>
<span> 高亮菜单 </span>
<el-tooltip
content="注当到达此路由时候指定左侧菜单指定name会处于活跃状态亮起可为空为空则为本路由Name。"
placement="top"
effect="light"
>
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
点我设置
</el-button>
</div>
</template>
<el-input
v-model="form.meta.activeName"
:placeholder="form.name"
autocomplete="off"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="KeepAlive" prop="meta.keepAlive">
<el-select
v-model="form.meta.keepAlive"
style="width: 100%"
placeholder="是否keepAlive缓存页面"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="CloseTab" prop="meta.closeTab">
<el-select
v-model="form.meta.closeTab"
style="width: 100%"
placeholder="是否自动关闭tab"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row class="w-full">
<el-col :span="8">
<el-form-item>
<template #label>
<div>
<span> 是否为基础页面 </span>
<el-tooltip
content="此项选择为是,则不会展示左侧菜单以及顶部信息。"
placement="top"
effect="light"
</el-form-item>
</el-col>
</el-row>
<el-row class="w-full">
<el-col :span="12">
<el-form-item label="展示名称" prop="meta.title">
<el-input
v-model="form.meta.title"
autocomplete="off"
placeholder="请输入菜单展示名称"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="路由Name" prop="path">
<el-input
v-model="form.name"
autocomplete="off"
placeholder="唯一英文字符串"
@change="changeName"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 路由配置区域 -->
<div class="border-b border-gray-200">
<h3 class="font-semibold text-gray-700 mb-4">路由配置</h3>
<el-form
:inline="true"
:model="form"
:rules="rules"
label-position="top"
>
<el-row class="w-full">
<el-col :span="12">
<el-form-item label="父节点ID">
<el-cascader
v-model="form.parentId"
style="width: 100%"
:disabled="!isEdit"
:options="menuOption"
:props="{
checkStrictly: true,
label: 'title',
value: 'ID',
disabled: 'disabled',
emitPath: false
}"
:show-all-levels="false"
filterable
placeholder="请选择父节点"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="path">
<template #label>
<div class="inline-flex items-center h-4">
<span>路由Path</span>
<el-checkbox
class="ml-2"
v-model="checkFlag"
>添加参数</el-checkbox
>
</div>
</template>
<el-input
v-model="form.path"
:disabled="!checkFlag"
autocomplete="off"
placeholder="建议只在后方拼接参数"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 显示设置区域 -->
<div class="border-b border-gray-200">
<h3 class="font-semibold text-gray-700 mb-4">显示设置</h3>
<el-form
:inline="true"
:model="form"
:rules="rules"
label-position="top"
>
<el-row class="w-full">
<el-col :span="8">
<el-form-item label="图标" prop="meta.icon">
<icon v-model="form.meta.icon" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="排序标记" prop="sort">
<el-input
v-model.number="form.sort"
autocomplete="off"
placeholder="请输入排序数字"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否隐藏">
<el-select
v-model="form.hidden"
style="width: 100%"
placeholder="是否在列表隐藏"
>
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-select
v-model="form.meta.defaultMenu"
style="width: 100%"
placeholder="是否为基础页面"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div>
<div class="flex items-center gap-2">
<el-button type="primary" icon="edit" @click="addParameter(form)">
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 高级配置区域 -->
<div class="border-b border-gray-200">
<h3 class="font-semibold text-gray-700 mb-4">高级配置</h3>
<el-form
:inline="true"
:model="form"
:rules="rules"
label-position="top"
>
<el-row class="w-full">
<el-col :span="12">
<el-form-item prop="meta.activeName">
<template #label>
<div class="label-with-tooltip">
<span>高亮菜单</span>
<el-tooltip
content="注当到达此路由时候指定左侧菜单指定name会处于活跃状态亮起可为空为空则为本路由Name。"
placement="top"
effect="light"
>
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-input
v-model="form.meta.activeName"
:placeholder="form.name || '请输入高亮菜单名称'"
autocomplete="off"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="KeepAlive" prop="meta.keepAlive">
<el-select
v-model="form.meta.keepAlive"
style="width: 100%"
placeholder="是否keepAlive缓存页面"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row class="w-full">
<el-col :span="8">
<el-form-item label="CloseTab" prop="meta.closeTab">
<el-select
v-model="form.meta.closeTab"
style="width: 100%"
placeholder="是否自动关闭tab"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<template #label>
<div class="label-with-tooltip">
<span>是否为基础页面</span>
<el-tooltip
content="此项选择为是,则不会展示左侧菜单以及顶部信息。"
placement="top"
effect="light"
>
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-select
v-model="form.meta.defaultMenu"
style="width: 100%"
placeholder="是否为基础页面"
>
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<template #label>
<div class="label-with-tooltip">
<span>路由切换动画</span>
<el-tooltip
content="如果设置了路由切换动画,在本路由下的动画优先级高于全局动画切换优先级。"
placement="top"
effect="light"
>
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-select
v-model="form.meta.transitionType"
style="width: 100%"
placeholder="跟随全局"
clearable
>
<el-option value="fade" label="淡入淡出" />
<el-option value="slide" label="滑动" />
<el-option value="zoom" label="缩放" />
<el-option value="none" label="无动画" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 菜单参数配置区域 -->
<div class="border-b border-gray-200">
<div class="flex justify-between items-center mb-4">
<h3 class="font-semibold text-gray-700">菜单参数配置</h3>
<el-button type="primary" size="small" @click="addParameter(form)">
新增菜单参数
</el-button>
</div>
<el-table :data="form.parameters" style="width: 100%; margin-top: 12px">
<el-table-column
align="left"
prop="type"
label="参数类型"
width="180"
>
<template #default="scope">
<el-select v-model="scope.row.type" placeholder="请选择">
<el-option key="query" value="query" label="query" />
<el-option key="params" value="params" label="params" />
</el-select>
</template>
</el-table-column>
<el-table-column align="left" prop="key" label="参数key" width="180">
<template #default="scope">
<div>
<el-input v-model="scope.row.key" />
</div>
</template>
</el-table-column>
<el-table-column align="left" prop="value" label="参数值">
<template #default="scope">
<div>
<el-input v-model="scope.row.value" />
</div>
</template>
</el-table-column>
<el-table-column align="left">
<template #default="scope">
<div>
<el-button
type="danger"
icon="delete"
@click="deleteParameter(form.parameters, scope.$index)"
>
删除
</el-button>
</div>
</template>
</el-table-column>
</el-table>
<div class="flex items-center gap-2 mt-3">
<el-button type="primary" icon="edit" @click="addBtn(form)">
新增可控按钮
</el-button>
<el-icon
class="cursor-pointer"
@click="
toDoc('https://www.gin-vue-admin.com/guide/web/button-auth.html')
"
>
<QuestionFilled />
</el-icon>
</div>
<el-table :data="form.menuBtn" style="width: 100%; margin-top: 12px">
<el-table-column
align="left"
prop="name"
label="按钮名称"
width="180"
>
<template #default="scope">
<div>
<el-input v-model="scope.row.name" />
</div>
</template>
</el-table-column>
<el-table-column align="left" prop="name" label="备注" width="180">
<template #default="scope">
<div>
<el-input v-model="scope.row.desc" />
</div>
</template>
</el-table-column>
<el-table-column align="left">
<template #default="scope">
<div>
<el-button
type="danger"
icon="delete"
@click="deleteBtn(form.menuBtn, scope.$index)"
>
删除
</el-button>
</div>
</template>
</el-table-column>
</el-table>
<el-table
:data="form.parameters"
style="width: 100%"
class="parameter-table"
>
<el-table-column
align="center"
prop="type"
label="参数类型"
width="150"
>
<template #default="scope">
<el-select
v-model="scope.row.type"
placeholder="请选择"
size="small"
>
<el-option key="query" value="query" label="query" />
<el-option key="params" value="params" label="params" />
</el-select>
</template>
</el-table-column>
<el-table-column align="center" prop="key" label="参数key" width="150">
<template #default="scope">
<el-input
v-model="scope.row.key"
size="small"
placeholder="请输入参数key"
/>
</template>
</el-table-column>
<el-table-column align="center" prop="value" label="参数值">
<template #default="scope">
<el-input
v-model="scope.row.value"
size="small"
placeholder="请输入参数值"
/>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100">
<template #default="scope">
<el-button
type="danger"
size="small"
@click="deleteParameter(form.parameters, scope.$index)"
>
<el-icon><Delete /></el-icon>
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 可控按钮配置区域 -->
<div class="mb-2 mt-2">
<div class="flex justify-between items-center mb-4">
<h3 class="font-semibold text-gray-700">可控按钮配置</h3>
<div class="flex items-center gap-2">
<el-button type="primary" size="small" @click="addBtn(form)">
新增可控按钮
</el-button>
<el-tooltip
content="点击查看按钮权限配置文档"
placement="top"
effect="light"
>
<el-icon
class="cursor-pointer text-blue-500 hover:text-blue-700"
@click="toDoc('https://www.gin-vue-admin.com/guide/web/button-auth.html')"
>
<QuestionFilled />
</el-icon>
</el-tooltip>
</div>
</div>
<el-table
:data="form.menuBtn"
style="width: 100%"
class="button-table"
>
<el-table-column
align="center"
prop="name"
label="按钮名称"
width="150"
>
<template #default="scope">
<el-input
v-model="scope.row.name"
size="small"
placeholder="请输入按钮名称"
/>
</template>
</el-table-column>
<el-table-column align="center" prop="desc" label="备注">
<template #default="scope">
<el-input
v-model="scope.row.desc"
size="small"
placeholder="请输入按钮备注"
/>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100">
<template #default="scope">
<el-button
type="danger"
size="small"
@click="deleteBtn(form.menuBtn, scope.$index)"
>
<el-icon><Delete /></el-icon>
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-drawer>
</div>
</template>
@@ -417,7 +524,7 @@
import { canRemoveAuthorityBtnApi } from '@/api/authorityBtn'
import { reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { QuestionFilled } from '@element-plus/icons-vue'
import { QuestionFilled, InfoFilled, Delete } from '@element-plus/icons-vue'
import { toDoc } from '@/utils/doc'
import { toLowerCase } from '@/utils/stringFun'
import ComponentsCascader from '@/view/superAdmin/menu/components/components-cascader.vue'
@@ -593,7 +700,7 @@
if (res.code === 0) {
ElMessage({
type: 'success',
message: isEdit.value ? '编辑成功' : '添加成功!'
message: isEdit.value ? '编辑成功' : '添加成功,请到角色管理页面分配权限'
})
getTableData()
}
@@ -677,4 +784,52 @@
margin-right: 8px;
}
}
.form-tip {
margin-top: 8px;
font-size: 12px;
color: #909399;
display: flex;
align-items: center;
gap: 8px;
.el-icon {
color: #409eff;
}
}
.label-with-tooltip {
display: flex;
align-items: center;
gap: 6px;
.el-icon {
color: #909399;
cursor: help;
&:hover {
color: #409eff;
}
}
}
.parameter-table,
.button-table {
border: 1px solid #ebeef5;
border-radius: 6px;
:deep(.el-table__header) {
background-color: #fafafa;
}
:deep(.el-table__body) {
.el-table__row {
&:hover {
background-color: #f5f7fa;
}
}
}
}
</style>

View File

@@ -268,16 +268,16 @@
>
<el-descriptions :column="1" border>
<el-descriptions-item label="参数名称">
{{ detailFrom.name }}
{{ detailForm.name }}
</el-descriptions-item>
<el-descriptions-item label="参数键">
{{ detailFrom.key }}
{{ detailForm.key }}
</el-descriptions-item>
<el-descriptions-item label="参数值">
{{ detailFrom.value }}
{{ detailForm.value }}
</el-descriptions-item>
<el-descriptions-item label="参数说明">
{{ detailFrom.desc }}
{{ detailForm.desc }}
</el-descriptions-item>
</el-descriptions>
</el-drawer>
@@ -574,7 +574,7 @@
})
}
const detailFrom = ref({})
const detailForm = ref({})
// 查看详情控制标记
const detailShow = ref(false)
@@ -589,7 +589,7 @@
// 打开弹窗
const res = await findSysParams({ ID: row.ID })
if (res.code === 0) {
detailFrom.value = res.data
detailForm.value = res.data
openDetailShow()
}
}
@@ -597,7 +597,7 @@
// 关闭详情弹窗
const closeDetailShow = () => {
detailShow.value = false
detailFrom.value = {}
detailForm.value = {}
}
</script>

View File

@@ -143,6 +143,38 @@
/>
</div>
</div>
<!-- 重置密码对话框 -->
<el-dialog
v-model="resetPwdDialog"
title="重置密码"
width="500px"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="resetPwdInfo" ref="resetPwdForm" label-width="100px">
<el-form-item label="用户账号">
<el-input v-model="resetPwdInfo.userName" disabled />
</el-form-item>
<el-form-item label="用户昵称">
<el-input v-model="resetPwdInfo.nickName" disabled />
</el-form-item>
<el-form-item label="新密码">
<div class="flex w-full">
<el-input class="flex-1" v-model="resetPwdInfo.password" placeholder="请输入新密码" show-password />
<el-button type="primary" @click="generateRandomPassword" style="margin-left: 10px">
生成随机密码
</el-button>
</div>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="closeResetPwdDialog">取 消</el-button>
<el-button type="primary" @click="confirmResetPassword">确 定</el-button>
</div>
</template>
</el-dialog>
<el-drawer
v-model="addUserDialog"
:size="appStore.drawerSize"
@@ -332,28 +364,81 @@
initPage()
const resetPasswordFunc = (row) => {
ElMessageBox.confirm('是否将此用户密码重置为123456?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const res = await resetPassword({
ID: row.ID
// 重置密码对话框相关
const resetPwdDialog = ref(false)
const resetPwdForm = ref(null)
const resetPwdInfo = ref({
ID: '',
userName: '',
nickName: '',
password: ''
})
// 生成随机密码
const generateRandomPassword = () => {
const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*'
let password = ''
for (let i = 0; i < 12; i++) {
password += chars.charAt(Math.floor(Math.random() * chars.length))
}
resetPwdInfo.value.password = password
// 复制到剪贴板
navigator.clipboard.writeText(password).then(() => {
ElMessage({
type: 'success',
message: '密码已复制到剪贴板'
})
}).catch(() => {
ElMessage({
type: 'error',
message: '复制失败,请手动复制'
})
if (res.code === 0) {
ElMessage({
type: 'success',
message: res.msg
})
} else {
ElMessage({
type: 'error',
message: res.msg
})
}
})
}
// 打开重置密码对话框
const resetPasswordFunc = (row) => {
resetPwdInfo.value.ID = row.ID
resetPwdInfo.value.userName = row.userName
resetPwdInfo.value.nickName = row.nickName
resetPwdInfo.value.password = ''
resetPwdDialog.value = true
}
// 确认重置密码
const confirmResetPassword = async () => {
if (!resetPwdInfo.value.password) {
ElMessage({
type: 'warning',
message: '请输入或生成密码'
})
return
}
const res = await resetPassword({
ID: resetPwdInfo.value.ID,
password: resetPwdInfo.value.password
})
if (res.code === 0) {
ElMessage({
type: 'success',
message: res.msg || '密码重置成功'
})
resetPwdDialog.value = false
} else {
ElMessage({
type: 'error',
message: res.msg || '密码重置失败'
})
}
}
// 关闭重置密码对话框
const closeResetPwdDialog = () => {
resetPwdInfo.value.password = ''
resetPwdDialog.value = false
}
const setAuthorityIds = () => {
tableData.value &&
tableData.value.forEach((user) => {