This commit is contained in:
yin 2026-10-04 17:59:56 +08:00
parent 43cafbba83
commit bf5471bd1b
10 changed files with 1959 additions and 657 deletions

View File

@ -944,9 +944,12 @@ export function buildWhereConditions(rawConditions: Record<string, any>): Record
// 十、工具栏按钮系统
// ============================================================
// 按钮分为三类:
// common — 公共按钮(刷新、导出)
// common — 公共按钮(刷新)
// basic — 基础操作(字段设置、隐藏/显示详情)
// function — 功能按钮(打开表单/确认窗口)
// basic — 基础操作(字段设置、隐藏详情)
//
// ⚠️ 工具栏的渲染顺序 = 本对象键的书写顺序(getTabToolbarButtons 用 Object.values,保序),
// 调整按钮排列必须直接改这里的顺序。
export interface ToolbarButtonConfig {
key: string
@ -976,13 +979,30 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
loadingKey: 'loading',
action: 'loadData'
},
// ===== 基础操作 =====
columnConfig: {
key: 'columnConfig',
label: '字段设置',
category: 'basic',
size: 'small',
action: 'openColumnConfigPanel'
},
toggleDetail: {
key: 'toggleDetail',
label: '显示详情',
category: 'basic',
dynamicLabelKey: 'detailToggleLabel',
size: 'small',
action: 'toggleDetailVisible'
},
// ===== 功能按钮 =====
create: {
key: 'create',
label: '新建盘点',
category: 'function',
type: 'primary',
plain: false,
// 与「快速创建」保持同款样式(白底 + 主色描边),不再用实心主色块
plain: true,
size: 'small',
action: 'openCreateCheck'
},
@ -1002,7 +1022,9 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
},
/**
* 导出选中(stock.check.export):导出表格中勾选的盘点单(单次上限 50)。
* 无勾选时不置灰,点击后提示先勾选。
* 无勾选时不置灰,点击后提示先勾选;
* ⚠️ 未勾选时由 index.vue 的 currentToolbarButtons 把 type 降级为 default,
* 避免 primary 样式的浅蓝底色(勾选后恢复 primary + plain)。
*/
export: {
key: 'export',
@ -1028,22 +1050,6 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
loadingKey: 'batchDeleteLoading',
disabledKey: 'noSelection',
action: 'handleBatchDelete'
},
// ===== 基础操作 =====
columnConfig: {
key: 'columnConfig',
label: '字段设置',
category: 'basic',
size: 'small',
action: 'openColumnConfigPanel'
},
toggleDetail: {
key: 'toggleDetail',
label: '显示详情',
category: 'basic',
dynamicLabelKey: 'detailToggleLabel',
size: 'small',
action: 'toggleDetailVisible'
}
}

View File

@ -397,7 +397,8 @@ const currentToolbarButtons = computed<OrderToolbarButtonConfig[]>(() => {
key: btn.key,
label: btn.label,
size: btn.size,
type: btn.type,
// 「导出选中」在未勾选数据时不显示主色(避免 primary 的浅蓝底色),勾选后恢复 primary
type: btn.key === 'export' && selectedRows.value.length === 0 ? '' : btn.type,
plain: btn.plain,
loadingKey: btn.loadingKey,
disabledKey: btn.disabledKey,

View File

@ -0,0 +1,73 @@
<!--
ColumnCellRenderer — 通用表格列渲染器(views/mode 模板副本)
根据传入的 ColumnSlotConfig 决定如何渲染单元格:
- type='tag' → 状态文字颜色(ut-status-text,替代 el-tag;支持 tagResolver / tagType 颜色映射)
- type='text' → 纯文本(支持 datetime / date 格式化,空值显示 —)
- type='default' → 默认插槽渲染
- type='operation' → 操作列(由 OperationCellRenderer 处理)
-->
<template>
<template v-if="!config || config.type === 'default'">
<slot />
</template>
<template v-else-if="config.type === 'tag'">
<span :class="getStatusTextClass(resolvedTagType)">
{{ displayValue }}
</span>
</template>
<template v-else>
<span>{{ displayValue }}</span>
</template>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import type { ColumnSlotConfig } from '../config/template-config'
import { TAG_RESOLVERS, translate, formatTime, formatDate } from '../config/template-config'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
defineOptions({ name: 'RoleColumnCellRenderer' })
const props = defineProps<{
/** 列插槽渲染配置 */
config: ColumnSlotConfig | undefined
/** 单元格值 */
value: any
}>()
/** 显示文本:translateField 翻译 > format 格式化 > 原始值(空值统一 —) */
const displayValue = computed(() => {
const v = props.value
if (props.config?.format === 'datetime') {
return formatTime(v)
}
if (props.config?.format === 'date') {
return formatDate(v)
}
if (props.config?.translateField) {
return translate(props.config.translateField, v)
}
return v === undefined || v === null || v === '' ? '—' : v
})
const resolvedTagType = computed(() => {
if (!props.config || props.config.type !== 'tag') return ''
const { tagType, tagResolver } = props.config
// 优先使用 tagResolver(函数名映射)
if (tagResolver && TAG_RESOLVERS[tagResolver]) {
return TAG_RESOLVERS[tagResolver](props.value)
}
// 其次使用 tagType 映射表(用原始值查找)
if (tagType && typeof tagType === 'object') {
return tagType[String(props.value)] ?? 'info'
}
// 最后使用固定值
return typeof tagType === 'string' ? tagType : 'info'
})
</script>
<style lang="scss" scoped>
/* ut-status-text 系列状态文字颜色类定义在 order-sub.scss 里(scoped 样式需要本组件自行引入) */
@use "../../../../order/orderManagement/styles/order-sub.scss";
</style>

View File

@ -0,0 +1,110 @@
<!--
OperationCellRenderer — 表格操作列渲染组件(views/mode 模板副本,已按本页裁剪)
根据 operationButtons 配置渲染 link 按钮列表,支持:
- confirmMessage → 点击时先弹确认框(确认后才 emit)
- visibleWhen(row) 返回 false 不渲染;labelWhen(row) 动态覆盖文案;disabledOnField 字段为空则置灰
⚠️ 模板原版的 `actionType: 'form'`(通过 COMPONENT_REGISTRY 打开表单弹窗)在本页不使用:
本页的弹窗由 index.vue 直接挂载(RoleFormDialog / RolePermissionDialog),
因此已删除 COMPONENT_REGISTRY 与相关分支。
使用方式:在 index.vue 中通过插槽 column-operation 引入。
-->
<template>
<div class="operation-cell">
<template v-for="btn in buttons" :key="btn.key">
<el-button
v-if="isVisible(btn) && btn.actionType === 'action'"
link
:type="btn.type || 'primary'"
size="small"
:disabled="isDisabled(btn)"
@click.stop="handleActionClick(btn)"
>
{{ resolveLabel(btn) }}
</el-button>
</template>
</div>
</template>
<script setup lang="ts">
import { ElMessageBox } from 'element-plus'
import type { OperationButtonConfig } from '../config/template-config'
defineOptions({ name: 'RoleOperationCellRenderer' })
const props = defineProps<{
/** 操作按钮配置列表(来自 TabPageConfig.operationButtons) */
buttons?: OperationButtonConfig[]
/** 当前行数据 */
row: Record<string, any>
}>()
const emit = defineEmits<{
/** action 按钮点击事件(key: 按钮标识, row: 行数据) */
(e: 'operation-action', key: string, row: Record<string, any>): void
}>()
/** action 按钮:可选先弹确认框,再交给宿主处理 */
async function handleActionClick(btn: OperationButtonConfig) {
if (btn.confirmMessage) {
try {
await ElMessageBox.confirm(btn.confirmMessage, btn.confirmTitle || '确认操作', {
confirmButtonText: btn.confirmButtonText || '确定',
cancelButtonText: '取消',
type: (btn.confirmType || 'warning') as any
})
} catch {
return // 取消
}
}
emit('operation-action', btn.key, props.row)
}
// ============================================================
// 按钮显隐 / 文案 / 禁用
// ============================================================
/** 按行数据决定是否渲染(未配置 visibleWhen 则渲染) */
function isVisible(btn: OperationButtonConfig): boolean {
if (typeof btn.visibleWhen !== 'function') return true
try {
return btn.visibleWhen(props.row) !== false
} catch {
return true
}
}
/** 按钮文案:labelWhen(row) 优先,返回空则回退静态 label */
function resolveLabel(btn: OperationButtonConfig): string {
if (typeof btn.labelWhen === 'function') {
try {
const dynamic = btn.labelWhen(props.row)
if (dynamic) return dynamic
} catch {
/* 忽略,回退静态 label */
}
}
return btn.label
}
function isDisabled(btn: OperationButtonConfig): boolean {
if (btn.disabledOnField) {
const val = props.row[btn.disabledOnField]
if (val === undefined || val === null || val === '' || val === false) {
return true
}
}
return false
}
</script>
<style lang="scss" scoped>
.operation-cell {
display: flex;
flex-wrap: wrap;
gap: 2px;
justify-content: center;
}
</style>

View File

@ -0,0 +1,208 @@
<!--
RoleTreePanel — 角色架构树(左侧面板)
与 views/mode 模板里的 ScanBox 同宽同位(220px、白底、右侧分隔线 + 轻投影),
但承载的是角色层级树:根节点为虚拟的「全部角色」(role_id = 0),
点击任意节点 → @node-click 抛出 role_id,由宿主决定列表的过滤范围。
自带的搜索框只过滤树节点(不影响右侧列表);节点后面的「停用」小标提示该角色已停用。
-->
<template>
<div class="role-tree-panel">
<div class="role-tree-panel__header">
<span class="role-tree-panel__title">角色架构</span>
<el-tooltip content="刷新角色树" placement="bottom">
<el-button class="role-tree-panel__refresh" link size="small" :loading="loading" @click="emit('refresh')">
<el-icon><Refresh /></el-icon>
</el-button>
</el-tooltip>
</div>
<div class="role-tree-panel__body">
<el-input
v-model="searchText"
class="role-tree-panel__search"
size="small"
clearable
placeholder="搜索角色"
:prefix-icon="Search"
/>
<div class="role-tree-panel__tree">
<el-tree
ref="treeRef"
:data="nodes"
:props="treeProps"
node-key="role_id"
highlight-current
:expand-on-click-node="false"
:filter-node-method="filterNode"
@node-click="handleNodeClick"
>
<template #default="{ data }">
<span class="role-node">
<span class="role-node__label">{{ data.role_name }}</span>
<span v-if="isDisabledRole(data)" class="role-node__tag">停用</span>
</span>
</template>
</el-tree>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, computed, watch, nextTick } from 'vue'
import { Refresh, Search } from '@element-plus/icons-vue'
defineOptions({ name: 'RoleTreePanel' })
const props = defineProps<{
/** 角色树(不含虚拟根节点,由本组件补「全部角色」) */
treeData: Record<string, any>[]
/** 当前选中的角色ID(0 = 全部角色) */
currentId: number | null
/** 角色树加载中 */
loading?: boolean
}>()
const emit = defineEmits<{
/** 点击树节点(role_id = 0 表示「全部角色」) */
(e: 'node-click', roleId: number): void
/** 请求刷新角色树 */
(e: 'refresh'): void
}>()
const treeProps = { label: 'role_name', children: 'children' } as const
const treeRef = ref<any>(null)
const searchText = ref('')
/** 虚拟根节点 + 角色树 */
const nodes = computed(() => [
{ role_id: 0, role_name: '全部角色', children: props.treeData }
])
function isDisabledRole(data: any) {
return Number(data?.role_id) > 0 && Number(data?.status) === 0
}
function filterNode(value: string, data: any) {
if (!value) return true
return String(data?.role_name ?? '').toLowerCase().includes(String(value).toLowerCase())
}
function handleNodeClick(data: any) {
emit('node-click', Number(data?.role_id ?? 0))
}
watch(searchText, (val) => {
treeRef.value?.filter(val)
})
/** 外部选中项变化(含刷新后重建树)→ 同步高亮 */
watch(
() => props.currentId,
async (id) => {
await nextTick()
treeRef.value?.setCurrentKey(id ?? 0)
},
{ immediate: true }
)
</script>
<style scoped lang="scss">
.role-tree-panel {
flex: 0 0 220px;
width: 220px;
min-width: 160px;
height: 100%;
display: flex;
flex-direction: column;
background: #fff;
border-right: 1px solid #e8e8e8;
box-shadow: 1px 0 2px rgba(0, 0, 0, 0.05);
overflow: hidden;
}
.role-tree-panel__header {
flex-shrink: 0;
height: 39px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 12px;
background: #f8fbff;
border-bottom: 1px solid #e8eef7;
}
.role-tree-panel__title {
font-size: 14px;
font-weight: 600;
color: #303133;
}
.role-tree-panel__refresh {
color: #606266;
&:hover {
color: #409eff;
}
}
.role-tree-panel__body {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
padding: 12px;
overflow: hidden;
}
.role-tree-panel__search {
flex-shrink: 0;
margin-bottom: 8px;
}
.role-tree-panel__tree {
flex: 1;
min-height: 0;
overflow-y: auto;
padding-bottom: 8px;
/* 隐藏滚动条(与 ScanBox 一致) */
&::-webkit-scrollbar {
width: 0;
height: 0;
}
-ms-overflow-style: none;
scrollbar-width: none;
}
.role-node {
display: flex;
align-items: center;
gap: 6px;
font-size: 13px;
min-width: 0;
}
.role-node__label {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.role-node__tag {
flex-shrink: 0;
font-size: 11px;
line-height: 16px;
padding: 0 4px;
border-radius: 3px;
color: var(--el-color-danger);
background: var(--el-color-danger-light-9);
}
:deep(.el-tree-node__content) {
height: 30px;
}
</style>

View File

@ -0,0 +1,400 @@
/**
* 角色管理(system/setting/role)— 配置驱动页面(views/mode 模板 v2)
*
* ===== 与模板的差异(有意为之)=====
* 1. 左侧面板不是 ScanBox,而是「角色架构树」(RoleTreePanel):
* 本页筛选项只有「关键词 + 包含已停用」,放在工具栏右侧;角色层级用树更直观。
* 因此配置里**完全没有 ScanBox 相关字段**(FieldDefinition.scanBox / scanBoxFieldKeys / scanBoxFields 均已移除)。
* 2. 不配置 api.list:`setting.role.list` 返回的是**角色树**(不是分页列表),
* 需要「先展平 → 再重建树 → 前端按树节点/关键词过滤 → 前端分页」,
* 这套逻辑放在 index.vue 里,比塞进 parseListResponse 更清楚。
* 3. **不用「显示/隐藏详情」,也没有详情面板**(用户明确要求):
* 故无 DetailPanel / COMPONENT_REGISTRY / detailSections,表格区占满右侧全高。
* 4. **不使用「字段设置」**:工具栏无该按钮,且 upperTableDefaults.enableColumnConfig = false。
*
* ===== 页面结构 =====
* ┌────────────┬──────────────────────────────────────────────┐
* │ 角色架构树 │ OrderToolbarButtonGroup + 关键词/包含已停用 │
* │(220px) │ ┌──────────────────────────────────────────┐│
* │ │ │ UpperTable(角色列表 + 操作列,占满全高) ││
* │ │ └──────────────────────────────────────────┘│
* └────────────┴──────────────────────────────────────────────┘
*
* 接口:setting.role(src/api/setting.role/role.ts)
* list / add / update / delete(批量停用) / permission(角色权限树)
*/
// 注:本页是「左侧角色树 + 右侧单列表」页:
// · 没有顶部标签栏 → 不保留模板的 PAGE_CONFIG;
// · 没有详情面板 → 不保留 COMPONENT_REGISTRY / DetailPanel(组件文件已一并删除)。
// ============================================================
// 一、FieldDefinition — 字段定义
// ============================================================
export interface FieldDefinition {
key: string
label: string
table: {
minWidth?: number
width?: number
fixed?: 'left' | 'right' | boolean
align?: 'left' | 'center' | 'right'
sortable?: boolean
showOverflowTooltip?: boolean
copyAction?: 'copy' | 'copyQr'
copyValue?: (row: any) => any
} | null
slot: {
type: 'tag' | 'text' | 'default' | 'operation'
tagType?: string | Record<string, string>
tagResolver?: string
translateField?: string
format?: 'datetime' | 'date'
} | null
}
// ============================================================
// 二、VALUE_MAPS / 翻译 / 格式化工具
// ============================================================
export const VALUE_MAPS: Record<string, Record<string, string>> = {
/** 角色状态:后端 1=启用 0=停用 */
status: {
'1': '启用',
'0': '停用',
'启用': '启用',
'停用': '停用'
}
}
/** 翻译 value → label(无映射时原样返回,空值返回 —) */
export function translate(field: string, value: any): string {
const map = VALUE_MAPS[field]
if (!map) return value === undefined || value === null || value === '' ? '—' : String(value)
return map[String(value)] ?? String(value ?? '—')
}
/**
* 把后端各种时间形态归一化为 Date,识别不了返回 null。
*
* 兼容:
* - 数字/纯数字串:秒(10 位) / 毫秒(13 位) / 微秒(16 位) / 纳秒(19 位),含小数串
* - 紧凑串:'20261004'(YYYYMMDD)/ '20261004120000'(YYYYMMDDHHmmss)
* - 日期时间串:'2026-10-04'、'2026-10-04 12:00:00'、ISO
* - Date 实例
*/
function toDate(value: any): Date | null {
if (value === undefined || value === null || value === '') return null
if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value
const text = String(value).trim()
// 紧凑日期串(PHP 常见):8 位 = YYYYMMDD,14 位 = YYYYMMDDHHmmss
if (/^\d{8}$/.test(text)) {
const d = new Date(`${text.slice(0, 4)}-${text.slice(4, 6)}-${text.slice(6, 8)}T00:00:00`)
return Number.isNaN(d.getTime()) ? null : d
}
if (/^\d{14}$/.test(text)) {
const d = new Date(
`${text.slice(0, 4)}-${text.slice(4, 6)}-${text.slice(6, 8)}T${text.slice(8, 10)}:${text.slice(10, 12)}:${text.slice(12, 14)}`
)
return Number.isNaN(d.getTime()) ? null : d
}
// 时间戳(整数或小数)
if (/^-?\d+(\.\d+)?$/.test(text)) {
let num = Number(text)
if (!Number.isFinite(num) || num <= 0) return null
while (num > 1e14) num /= 1000
if (num < 1e10) num *= 1000
const d = new Date(num)
return Number.isNaN(d.getTime()) ? null : d
}
const d = new Date(text)
return Number.isNaN(d.getTime()) ? null : d
}
/** 格式化时间 → YYYY-MM-DD HH:mm:ss */
export function formatTime(value: any): string {
if (value === undefined || value === null || value === '') return '—'
const d = toDate(value)
if (!d) return String(value)
const pad = (n: number) => String(n).padStart(2, '0')
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
}
/** 格式化日期 → YYYY-MM-DD */
export function formatDate(value: any): string {
if (value === undefined || value === null || value === '') return '—'
const d = toDate(value)
if (!d) return String(value)
const pad = (n: number) => String(n).padStart(2, '0')
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
}
/** 业务成功判定:与 utils/request 的 SUCCESS_CODES(200/20000/1/0)对齐 */
export function isApiSuccess(res: any): boolean {
if (!res || typeof res !== 'object') return false
return [200, 20000, 1, 0].includes(Number(res.code))
}
// ============================================================
// 三、TAG_RESOLVERS — 状态文字颜色解析器
// ============================================================
// 轻量状态文字(ut-status-text)替代 el-tag,减少组件数
export const TAG_RESOLVERS: Record<string, (val: any) => string> = {
/** 角色状态:1/启用 = 绿,0/停用 = 红 */
resolveRoleStatusTag(v) {
if (v === 1 || v === '1' || v === '启用' || v === true) return 'success'
if (v === 0 || v === '0' || v === '停用' || v === false) return 'danger'
return 'info'
},
/** 是否系统内置角色 */
resolveRoleSystemTag(v) {
return v === 1 || v === '1' || v === true ? 'warning' : 'info'
}
}
// ============================================================
// 四、FIELD_DICT — 角色字段表
// ============================================================
export const FIELD_DICT: Record<string, FieldDefinition> = {
role_name: {
key: 'role_name',
label: '角色名称',
table: { minWidth: 180, fixed: 'left', showOverflowTooltip: true },
slot: null
},
/**
* 归属层级(虚拟字段):由 index.vue 在构建列表行时写入 `parent_path`
* (= getRolePath(pid),顶级角色为「顶级层级」),后端不返回该字段。
*/
parent_path: {
key: 'parent_path',
label: '归属层级',
table: { minWidth: 180, showOverflowTooltip: true },
slot: { type: 'text' }
},
role_code: {
key: 'role_code',
label: '角色编码',
table: { minWidth: 170, copyAction: 'copy', showOverflowTooltip: true },
slot: null
},
description: {
key: 'description',
label: '描述',
table: { minWidth: 220, showOverflowTooltip: true },
slot: { type: 'text' }
},
status: {
key: 'status',
label: '状态',
table: { width: 90, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveRoleStatusTag', translateField: 'status' }
},
/** 操作列(虚拟字段,仅用于表格列渲染) */
operation: {
key: 'operation',
label: '操作',
table: { width: 200, fixed: 'right', align: 'center' },
slot: { type: 'operation' }
}
}
// ============================================================
// 五、列 / 操作按钮配置
// ============================================================
export interface ColumnSlotConfig {
type: 'tag' | 'text' | 'default' | 'operation'
tagType?: string | Record<string, string>
tagResolver?: string
translateField?: string
/** 时间/日期列格式化:datetime=YYYY-MM-DD HH:mm:ss,date=YYYY-MM-DD */
format?: 'datetime' | 'date'
}
export interface OperationButtonConfig {
key: string
label: string
type?: 'primary' | 'success' | 'warning' | 'danger' | 'info' | ''
/** 本页只支持 action(form 弹窗机制已随 COMPONENT_REGISTRY 一并移除) */
actionType: 'action'
disabledOnField?: string
/** 按行数据决定是否渲染该按钮(返回 false 隐藏) */
visibleWhen?: (row: Record<string, any>) => boolean
/** 按行数据动态覆盖按钮文案(返回空串/undefined 时回退 label) */
labelWhen?: (row: Record<string, any>) => string
confirmMessage?: string
confirmTitle?: string
confirmType?: 'warning' | 'danger' | 'info'
confirmButtonText?: string
}
// ============================================================
// 六、TabPageRawConfig / TabPageConfig
// ============================================================
export interface TabPageRawConfig {
name: string
label: string
/** 表格需要的列 key 列表 */
tableColumnKeys: string[]
upperTableDefaults: {
title: string
enableColumnConfig?: boolean
showIndex?: boolean
showSelection?: boolean
emptyText?: string
}
operationButtons?: OperationButtonConfig[]
}
export interface TabPageConfig {
name: string
label: string
upperTable: {
title: string
enableColumnConfig: boolean
showIndex: boolean
showSelection: boolean
emptyText: string
columns: Record<string, any>[]
}
columnSlots: Record<string, ColumnSlotConfig>
operationButtons?: OperationButtonConfig[]
}
// ============================================================
// 七、resolveTabConfig — RawConfig → 完整配置
// ============================================================
export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig {
// 表格列
const columns: Record<string, any>[] = []
for (const key of raw.tableColumnKeys) {
const def = FIELD_DICT[key]
if (!def || !def.table) continue
columns.push({ prop: def.key, label: def.label, ...def.table })
}
// 列插槽
// 注:未显式配置 slot 的普通列也注册为「纯文本」插槽,统一交给 ColumnCellRenderer 渲染,
// 否则 UpperTable 直接输出原值,null/空串会显示成空白(需求:没有的显示 —)。
// 带 copyAction 的列保持默认渲染,避免丢失点击复制。
const columnSlots: Record<string, ColumnSlotConfig> = {}
for (const key of raw.tableColumnKeys) {
const def = FIELD_DICT[key]
if (!def || !def.table) continue
if (def.slot) {
columnSlots[def.key] = { ...def.slot }
continue
}
if (def.table.copyAction) continue
columnSlots[def.key] = { type: 'text' }
}
return {
name: raw.name,
label: raw.label,
upperTable: {
title: raw.upperTableDefaults.title,
enableColumnConfig: raw.upperTableDefaults.enableColumnConfig ?? true,
showIndex: raw.upperTableDefaults.showIndex ?? true,
showSelection: raw.upperTableDefaults.showSelection ?? false,
emptyText: raw.upperTableDefaults.emptyText ?? '暂无数据',
columns
},
columnSlots,
operationButtons: raw.operationButtons
}
}
// ============================================================
// 八、工具栏按钮系统
// ============================================================
// category 与 OrderToolbarButtonGroup.resolveButtonStyle 的取值保持一致:
// refresh — 蓝底白字;setting — 白底灰边;action — 白底 + 主色描边蓝字;cancel — 白底 + 红边红字
//
// 本页只保留三个按钮(刷新 / 新增角色 / 批量删除):
// ⚠️ 按需求不使用「字段设置」与「显示/隐藏详情」功能 ——
// 字段设置:不仅去掉按钮,`upperTableDefaults.enableColumnConfig` 也置为 false
// (UpperTable 内部据此完全跳过列配置的读取/持久化,不是只隐藏入口);
// 显示/隐藏详情:本页**没有详情面板**(DetailPanel 已删),表格占满右侧全高,
// 所以也没有开关按钮。
export interface ToolbarButtonConfig {
key: string
label: string
category: 'refresh' | 'setting' | 'action' | 'cancel'
size?: '' | 'default' | 'small' | 'large'
type?: '' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
plain?: boolean
loadingKey?: string
disabledKey?: string
action: string
dynamicLabelKey?: string
onlyForTabs?: string[]
buttonType?: 'default' | 'dropdown'
dropdownOptions?: Array<{ label: string; action: string; divided?: boolean }>
formKey?: string
}
export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
refresh: {
key: 'refresh',
label: '刷新',
category: 'refresh',
size: 'small',
loadingKey: 'loading',
action: 'loadData'
},
create: {
key: 'create',
label: '新增角色',
category: 'action',
size: 'small',
action: 'openCreateRole'
},
batchDelete: {
key: 'batchDelete',
label: '批量删除',
category: 'cancel',
size: 'small',
loadingKey: 'batchDeleteLoading',
disabledKey: 'noSelection',
action: 'handleBatchDelete'
}
}
/** 按标签页名称获取工具栏按钮列表 */
export function getTabToolbarButtons(tabName: string): ToolbarButtonConfig[] {
return Object.values(TOOLBAR_BUTTONS).filter((btn) => {
if (btn.onlyForTabs && !btn.onlyForTabs.includes(tabName)) return false
return true
})
}
// ============================================================
// 九、标签页注册表(单页:仅一个「角色列表」)
// ============================================================
export const tabPages: TabPageRawConfig[] = [
{
name: 'all',
label: '角色列表',
tableColumnKeys: ['role_name', 'parent_path', 'role_code', 'description', 'status', 'operation'],
upperTableDefaults: {
title: '角色列表',
// 不使用「字段设置」:这里置 false 后 UpperTable 不再提供/持久化列配置
enableColumnConfig: false,
showIndex: true,
showSelection: true,
emptyText: '暂无角色数据'
},
// ⚠️ 不配置 api.list:setting.role.list 返回角色树,展平/重建树/过滤/分页都在 index.vue
// ⚠️ 删除按钮不配 confirmMessage:确认框在 index.vue 里弹(文案要带角色名 + 提示已停用)
operationButtons: [
{ key: 'edit', label: '编辑', actionType: 'action', type: 'primary' },
{ key: 'permission', label: '权限', actionType: 'action', type: 'warning' },
{ key: 'delete', label: '删除', actionType: 'action', type: 'danger' }
]
}
]

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,284 @@
<!--
RoleFormDialog — 新增 / 编辑角色(setting.role.add / setting.role.update)
· 新增:可选父级角色(默认取当前树选中节点)+ 分配权限(权限树,提交 checked + halfChecked)
· 编辑:角色编码不可改,可改名称/描述/父级/状态;
⚠️ 权限不在本弹窗改(走「权限」按钮的 RolePermissionDialog),
但 roleUpdate 要求一次性提交 permission_ids ——
本弹窗打开时会用 setting.role.permission 拉取该角色**当前权限**原样回传,
避免「只改个名字却把权限清空」(老页面在这里有隐患)。
拉取失败时禁止提交,避免误清权限。
-->
<template>
<el-dialog
:title="isEdit ? '编辑角色' : '新增角色'"
:model-value="visible"
width="600px"
align-center
@update:model-value="handleVisibleChange"
@close="handleClosed"
>
<el-form ref="formRef" :model="form" :rules="roleRules" label-width="90px">
<el-form-item label="角色编码" prop="role_code">
<el-input
v-model="form.role_code"
:disabled="isEdit"
placeholder="主体内唯一,如:warehouse_admin"
/>
</el-form-item>
<el-form-item label="角色名称" prop="role_name">
<el-input v-model="form.role_name" placeholder="如:仓库管理员" />
</el-form-item>
<el-form-item label="描述">
<el-input v-model="form.description" type="textarea" :rows="2" placeholder="角色描述(可选)" />
</el-form-item>
<el-form-item label="父级角色">
<el-tree-select
v-model="form.pid"
:data="parentOptions"
:props="{ label: 'role_name', value: 'role_id', children: 'children' }"
check-strictly
clearable
placeholder="无(顶级角色)"
style="width: 100%"
/>
</el-form-item>
<el-form-item v-if="isEdit" label="状态">
<el-radio-group v-model="form.status">
<el-radio :value="1">启用</el-radio>
<el-radio :value="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<!-- 新增时才在表单里选权限;编辑走「权限」按钮 -->
<el-form-item v-if="!isEdit" label="分配权限">
<div v-loading="permLoading" class="perm-tree-wrapper">
<el-tree
ref="permTreeRef"
:data="permissionTree"
show-checkbox
node-key="permission_id"
:props="{ label: 'name', children: 'children' }"
/>
<div v-if="!permLoading && !permissionTree.length" class="perm-tree-empty">暂无可分配的权限</div>
</div>
</el-form-item>
<el-alert
v-if="isEdit && !permissionLoaded && !permLoading"
class="perm-load-alert"
type="warning"
:closable="false"
show-icon
title="未能读取该角色当前权限,已禁用提交"
description="保存会整体覆盖角色权限,为避免误清空,请关闭弹窗后重试。"
/>
</el-form>
<template #footer>
<el-button @click="handleVisibleChange(false)">取消</el-button>
<el-button type="primary" :loading="submitLoading" :disabled="submitDisabled" @click="handleSubmit">
确定
</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { ref, reactive, computed, watch, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { roleAdd, roleUpdate, permissionroleList } from '@/api/setting.role/role'
import { permissionList } from '@/api/setting.permission/permission'
import { roleRules, defaultRoleTemp, buildPermissionTree } from '../role-config'
defineOptions({ name: 'RoleFormDialog' })
const props = defineProps<{
visible: boolean
/** 编辑对象(null = 新增) */
role: Record<string, any> | null
/** 父级角色下拉数据(角色树) */
roleTree: Record<string, any>[]
/** 新增时的默认父级(当前树选中节点的 role_id,0 = 顶级) */
defaultParentId?: number | null
}>()
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
(e: 'success'): void
}>()
const formRef = ref<any>(null)
const permTreeRef = ref<any>(null)
const submitLoading = ref(false)
const permLoading = ref(false)
const permissionLoaded = ref(false)
const permissionTree = ref<any[]>([])
/** 编辑态:该角色当前权限 ID(原样回传,避免误清空) */
const currentPermissionIds = ref<number[]>([])
const form = reactive({ ...defaultRoleTemp })
const isEdit = computed(() => Number(form.role_id) > 0)
const submitDisabled = computed(() => isEdit.value && !permissionLoaded.value)
/** 父级下拉:编辑时排除自己及自己的后代,避免形成环 */
const parentOptions = computed(() => {
if (!isEdit.value) return props.roleTree
const excludeId = Number(form.role_id)
const prune = (nodes: Record<string, any>[]): Record<string, any>[] =>
nodes
.filter((n) => Number(n.role_id) !== excludeId)
.map((n) => ({ ...n, children: n.children ? prune(n.children) : undefined }))
return prune(props.roleTree)
})
function resetTemp() {
Object.assign(form, defaultRoleTemp)
permissionTree.value = []
currentPermissionIds.value = []
permissionLoaded.value = false
}
/** 打开弹窗:按新增/编辑分别准备数据 */
async function prepareDialog() {
resetTemp()
await nextTick()
formRef.value?.clearValidate()
if (props.role && props.role.role_id) {
Object.assign(form, {
role_id: props.role.role_id,
role_code: props.role.role_code ?? '',
role_name: props.role.role_name ?? '',
description: props.role.description ?? '',
pid: props.role.pid || undefined,
status: Number(props.role.status ?? 1),
permission_ids: []
})
await loadCurrentPermissionIds(Number(props.role.role_id))
return
}
// 新增:默认挂在当前选中的角色下(选中「全部角色」则建为顶级)
const pid = Number(props.defaultParentId ?? 0)
if (pid > 0) form.pid = pid
await loadPermissionTree()
}
/** 新增:拉全量权限树(默认不勾选) */
async function loadPermissionTree() {
permLoading.value = true
try {
const res = await permissionList({})
permissionTree.value = buildPermissionTree(res?.data?.permissions || [])
} catch (err) {
console.error('[role] 获取权限列表失败', err)
permissionTree.value = []
} finally {
permLoading.value = false
}
}
/** 编辑:读取该角色当前权限(原样回传) */
async function loadCurrentPermissionIds(roleId: number) {
permLoading.value = true
permissionLoaded.value = false
try {
const res = await permissionroleList({ role_id: roleId, includeDisabled: false })
const permissions: any[] = res?.data?.permissions || []
currentPermissionIds.value = permissions
.filter((p) => p.selected)
.map((p) => p.permission_id)
permissionLoaded.value = true
} catch (err) {
console.error('[role] 获取角色权限失败', err)
currentPermissionIds.value = []
} finally {
permLoading.value = false
}
}
function handleVisibleChange(value: boolean) {
emit('update:visible', value)
}
function handleClosed() {
formRef.value?.clearValidate()
}
async function handleSubmit() {
if (!formRef.value) return
await formRef.value.validate(async (valid: boolean) => {
if (!valid) return
if (submitDisabled.value) return
const permissionIds = isEdit.value
? currentPermissionIds.value
: [
...(permTreeRef.value?.getCheckedKeys() || []),
...(permTreeRef.value?.getHalfCheckedKeys() || [])
]
submitLoading.value = true
try {
if (isEdit.value) {
await roleUpdate({
role_id: Number(form.role_id),
role_name: form.role_name,
description: form.description || undefined,
pid: form.pid || 0,
status: form.status,
permission_ids: permissionIds
})
ElMessage.success('修改成功')
} else {
await roleAdd({
role_code: form.role_code,
role_name: form.role_name,
description: form.description || undefined,
pid: form.pid || 0,
permission_ids: permissionIds
})
ElMessage.success('新增成功')
}
emit('update:visible', false)
emit('success')
} catch (err) {
console.error('[role] 保存角色失败', err)
} finally {
submitLoading.value = false
}
})
}
watch(
() => props.visible,
(val) => {
if (val) void prepareDialog()
}
)
</script>
<style scoped lang="scss">
.perm-tree-wrapper {
width: 100%;
max-height: 300px;
overflow-y: auto;
padding: 8px;
border: 1px solid var(--el-border-color);
border-radius: 4px;
}
.perm-tree-empty {
padding: 16px 0;
text-align: center;
font-size: 13px;
color: #909399;
}
.perm-load-alert {
margin-bottom: 0;
}
</style>

View File

@ -0,0 +1,309 @@
<!--
RolePermissionDialog — 配置角色权限(setting.role.permission 读取 + setting.role.update 提交)
左侧:类型筛选 + 关键词 + 权限树表格(多选,支持跨筛选保留已选)
底部:已选数量 + 保存
⚠️ 提交走 roleUpdate,且 permission_ids 是「整体覆盖」——
因此这里会把角色本身的名称/描述/父级/状态一起带上(取自行数据),避免改权限把角色信息改没了。
-->
<template>
<el-dialog
title="配置角色权限"
:model-value="visible"
width="860px"
align-center
@update:model-value="handleVisibleChange"
@close="handleClosed"
>
<div class="perm-dialog-body">
<div class="perm-left">
<el-form :inline="true" :model="permFilter" class="perm-filter">
<el-form-item label="类型">
<el-select v-model="permFilter.type" placeholder="全部" clearable style="width: 130px" @change="applyPermFilter">
<el-option
v-for="item in permissionTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-input
v-model="permFilter.keyword"
placeholder="路径/名称"
clearable
style="width: 160px"
@input="applyPermFilter"
/>
</el-form-item>
</el-form>
<div class="perm-tree-header">
<span>权限列表</span>
<div>
<el-button size="small" @click="selectAllPerms">全选</el-button>
<el-button size="small" @click="deselectAllPerms">取消全选</el-button>
</div>
</div>
<el-table
ref="permTableRef"
v-loading="permLoading"
:data="filteredPerms"
row-key="permission_id"
border
height="440px"
size="small"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@selection-change="handlePermSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="标题/名称" min-width="160" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ permissionTitle(row) }}</span>
</template>
</el-table-column>
<el-table-column label="路径" prop="path" min-width="180" show-overflow-tooltip />
<el-table-column label="类型" prop="type" width="100" align="center">
<template #default="{ row }">
<span :class="getStatusTextClass(permissionTypeTag(row.type))">
{{ permissionTypeName(row.type) }}
</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<template #footer>
<span class="perm-footer-tip">已选 {{ selectedPermIds.length }} 个权限</span>
<el-button @click="handleVisibleChange(false)">取消</el-button>
<el-button type="primary" :loading="permSubmitting" @click="handleSubmit">保存权限</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { ref, reactive, watch, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { permissionroleList, roleUpdate } from '@/api/setting.role/role'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import {
permissionTypeOptions,
buildPermissionTree,
permissionTitle,
permissionTypeName,
permissionTypeTag
} from '../role-config'
defineOptions({ name: 'RolePermissionDialog' })
const props = defineProps<{
visible: boolean
/** 目标角色(行数据) */
role: Record<string, any> | null
}>()
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
(e: 'success'): void
}>()
const permTableRef = ref<any>(null)
const permLoading = ref(false)
const permSubmitting = ref(false)
const allPerms = ref<any[]>([])
const filteredPerms = ref<any[]>([])
const selectedPermIds = ref<number[]>([])
let isRestoringSelection = false
const permFilter = reactive({ type: '', keyword: '' })
/** 打开弹窗:拉取该角色的权限树(含已选标记) */
async function loadPermissions() {
const roleId = Number(props.role?.role_id ?? 0)
if (!roleId) return
permFilter.type = ''
permFilter.keyword = ''
selectedPermIds.value = []
allPerms.value = []
filteredPerms.value = []
permLoading.value = true
try {
const res = await permissionroleList({
role_id: roleId,
includeDisabled: false
})
const permissions: any[] = res?.data?.permissions || []
allPerms.value = permissions
selectedPermIds.value = permissions.filter((p) => p.selected).map((p) => p.permission_id)
filteredPerms.value = buildPermissionTree(permissions)
await nextTick()
restorePermSelection()
} catch (err) {
console.error('[role] 获取角色权限失败', err)
ElMessage.error('获取角色权限失败')
} finally {
permLoading.value = false
}
}
/** 本地过滤(不重新请求):按类型 + 关键词筛选平铺权限后重建树 */
async function applyPermFilter() {
const { type, keyword } = permFilter
const kw = keyword.trim().toLowerCase()
const filtered = allPerms.value.filter((p) => {
if (type && p.type !== type) return false
if (kw && ![p.path, p.name, p.meta_title].some((v) => v && String(v).toLowerCase().includes(kw))) {
return false
}
return true
})
filteredPerms.value = buildPermissionTree(filtered)
await nextTick()
restorePermSelection()
}
/** 把 selectedPermIds 回填到表格勾选状态 */
function restorePermSelection() {
if (!permTableRef.value) return
isRestoringSelection = true
permTableRef.value.clearSelection()
const selectInTree = (nodes: any[]) => {
nodes.forEach((node) => {
if (selectedPermIds.value.includes(node.permission_id)) {
permTableRef.value.toggleRowSelection(node, true)
}
if (node.children) selectInTree(node.children)
})
}
selectInTree(filteredPerms.value)
isRestoringSelection = false
}
/** 表格勾选变化:只更新当前可见节点,保留被筛掉的已选项 */
function handlePermSelectionChange(rows: any[]) {
if (isRestoringSelection) return
const visibleIds: number[] = []
const flatten = (nodes: any[]) => {
nodes.forEach((n) => {
visibleIds.push(n.permission_id)
if (n.children) flatten(n.children)
})
}
flatten(filteredPerms.value)
const selectedInView = rows.map((r) => r.permission_id)
const notVisible = selectedPermIds.value.filter((id) => !visibleIds.includes(id))
selectedPermIds.value = [...notVisible, ...selectedInView]
}
function flattenAll(nodes: any[]): any[] {
const out: any[] = []
const walk = (list: any[]) => {
list.forEach((n) => {
out.push(n)
if (n.children) walk(n.children)
})
}
walk(nodes)
return out
}
function selectAllPerms() {
const ids = flattenAll(filteredPerms.value).map((n) => n.permission_id)
selectedPermIds.value = Array.from(new Set([...selectedPermIds.value, ...ids]))
restorePermSelection()
}
function deselectAllPerms() {
const removeIds = new Set(flattenAll(filteredPerms.value).map((n) => n.permission_id))
selectedPermIds.value = selectedPermIds.value.filter((id) => !removeIds.has(id))
restorePermSelection()
}
async function handleSubmit() {
const role = props.role
if (!role?.role_id) return
permSubmitting.value = true
try {
await roleUpdate({
role_id: Number(role.role_id),
role_name: role.role_name,
description: role.description || undefined,
pid: role.pid || 0,
status: Number(role.status ?? 1),
permission_ids: selectedPermIds.value
})
ElMessage.success('权限保存成功')
emit('update:visible', false)
emit('success')
} catch (err) {
console.error('[role] 保存角色权限失败', err)
} finally {
permSubmitting.value = false
}
}
function handleVisibleChange(value: boolean) {
emit('update:visible', value)
}
function handleClosed() {
allPerms.value = []
filteredPerms.value = []
selectedPermIds.value = []
}
watch(
() => props.visible,
(val) => {
if (val) void loadPermissions()
}
)
</script>
<style scoped lang="scss">
.perm-dialog-body {
display: flex;
gap: 16px;
}
.perm-left {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
}
.perm-filter {
margin-bottom: 10px;
:deep(.el-form-item) {
margin-bottom: 0;
}
}
.perm-tree-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 8px;
font-size: 13px;
font-weight: 600;
color: #606266;
}
.perm-footer-tip {
margin-right: 12px;
font-size: 13px;
color: #606266;
}
</style>

View File

@ -39,3 +39,55 @@ export const permissionTypeOptions = [
{ label: '区块', value: 'block' },
{ label: '小程序页面', value: 'miniprogram_pages' }
]
/** 角色树里虚拟的「全部角色」节点 ID(RoleTreePanel 根节点 / 列表不过滤) */
export const ROLE_ROOT_ID = 0
/**
* 把权限平铺列表构建成树。
* - 名称为空的权限条目会被过滤(后端会返回无意义的空行)
* - 没有子节点的节点会删掉 children,避免 el-tree / el-table 渲染出空展开箭头
*/
export function buildPermissionTree(data: any[]): any[] {
const validData = (data || []).filter((item) => item?.name && String(item.name).trim() !== '')
const map = new Map<number, any>()
validData.forEach((item) => map.set(item.permission_id, { ...item, children: [] }))
const roots: any[] = []
map.forEach((item) => {
const pid = item.parent_id
if (!pid || pid === 0 || !map.has(pid)) {
roots.push(item)
} else {
map.get(pid)!.children.push(item)
}
})
const clean = (list: any[]) => {
list.forEach((node) => {
if (!node.children.length) delete node.children
else clean(node.children)
})
}
clean(roots)
return roots
}
/** 权限树标题:meta_title > name > path */
export function permissionTitle(row: any): string {
return row?.meta_title || row?.name || row?.path || '—'
}
/** 权限类型中文名(未知类型原样返回) */
export function permissionTypeName(type: unknown): string {
const key = String(type ?? '')
return permissionTypeNameMap[key] || key || '—'
}
/** 权限类型对应状态色(未知类型给 info) */
export function permissionTypeTag(type: unknown): string {
return permissionTypeTagMap[String(type ?? '')] || 'info'
}