feat(setting): 权限/角色/自动回复左侧树面板统一,小程序配置表单改版
左侧树面板统一(对齐 setting/role) - 新增 permission/components/PermissionTreePanel.vue:220px 白底面板 + 右侧分隔线 + 顶部搜索(仅过滤树节点,不影响右侧列表),「全部类型」根节点默认展开 - 权限页改用该组件,移除页内树与冗余样式,容器改为整页贴边卡片 - RoleTreePanel 增加默认展开根节点,并在树数据重建后保持展开状态 - 自动回复页左侧同步该样式:220px、隐藏滚动条、搜索框置顶; 「新增类型 / 刷新」按钮暂时注释 - 自动回复「系统预设」类型/子类型改为只读摘要卡片(替代整张禁用表单), 自定义类型/子类型仍为可编辑表单 基础管理 / 小程序配置(MiniProgramConfigForm) - 「代注册企业小程序」「发起微信认证」两个弹窗改为 task-panel 风格: 自定义头部 + 关闭按钮、min(px, 94vw) 宽度、字段栅格化 - 表单项 label 宽度统一为 110px,顶部 alert 说明改为底部提示文案 - 信息表单类名改为 mp-form--rows,与弹窗字段行样式保持一致 工具栏按钮与配置 - basicManagement/newview、role 页面补上 category 透传,避免按钮样式全部落到 默认灰边分支 - basicManagement 模板配置 category 语义改为 refresh / setting / action / cancel, 与 OrderToolbarButtonGroup 对齐 订单导出 - ORDER_EXPORT_ALL_COLUMNS 新增「拦截状态」(流程状态组),总数 53 → 54; 注释标注:接口文档枚举暂未收录,需后端同步支持该表头 其他 - 配送计划复制 / 编辑弹窗、店铺快递绑定策略的多选下拉统一开启 collapse-tags + collapse-tags-tooltip,避免标签横向溢出 - RolePermissionDialog 宽度收窄为 min(880px, 96vw)
This commit is contained in:
parent
7958f0fd12
commit
267b97330d
@ -1,50 +1,44 @@
|
||||
<template>
|
||||
<div class="order-sub-container auto-reply-page">
|
||||
<!-- ========== 左:类型 / 子类型 树 ========== -->
|
||||
<!-- ========== 左:类型 / 子类型 树(对齐 setting/permission 左侧面板) ========== -->
|
||||
<aside class="ar-side">
|
||||
<div class="ar-toolbar">
|
||||
<div class="ar-toolbar__left">
|
||||
<span class="ar-toolbar__title">回信规则</span>
|
||||
<span class="ar-toolbar__sub">类型 / 子类型</span>
|
||||
</div>
|
||||
<div class="ar-toolbar__right">
|
||||
<el-button size="small" type="primary" plain @click="openTypeCreate">新增类型</el-button>
|
||||
<el-button size="small" type="primary" :loading="treeLoading" @click="handleTreeRefresh">刷新</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ar-side__filter">
|
||||
<div class="ar-side__body">
|
||||
<el-input
|
||||
v-model="treeKeyword"
|
||||
class="ar-side__search"
|
||||
size="small"
|
||||
placeholder="搜索类型 / 子类型"
|
||||
clearable
|
||||
:prefix-icon="Search"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div v-loading="treeLoading" class="ar-side__tree">
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
:data="treeData"
|
||||
node-key="key"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:expand-on-click-node="false"
|
||||
:filter-node-method="filterTreeNode"
|
||||
@node-click="handleNodeClick"
|
||||
>
|
||||
<template #default="{ data }">
|
||||
<span class="ar-tree-node" :class="{ 'ar-tree-node--system': data.isSystem }">
|
||||
<span class="ar-tree-node-label" :title="data.label">{{ data.label }}</span>
|
||||
<span class="ar-tree-node-code">{{ data.typeCode }}</span>
|
||||
<span v-if="data.isSystem" class="ar-tree-badge">系统</span>
|
||||
<span v-if="!data.isEnabled" class="ar-tree-badge ar-tree-badge--danger">停用</span>
|
||||
</span>
|
||||
</template>
|
||||
</el-tree>
|
||||
<div v-if="!treeData.length && !treeLoading" class="ar-inline-empty">
|
||||
暂无类型数据,请先「新增类型」
|
||||
<!-- <div class="ar-side__actions">
|
||||
<el-button size="small" type="primary" plain @click="openTypeCreate">新增类型</el-button>
|
||||
<el-button size="small" :loading="treeLoading" @click="handleTreeRefresh">刷新</el-button>
|
||||
</div> -->
|
||||
|
||||
<div v-loading="treeLoading" class="ar-side__tree">
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
:data="treeData"
|
||||
node-key="key"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:expand-on-click-node="false"
|
||||
:filter-node-method="filterTreeNode"
|
||||
@node-click="handleNodeClick"
|
||||
>
|
||||
<template #default="{ data }">
|
||||
<span class="ar-tree-node" :class="{ 'ar-tree-node--system': data.isSystem }">
|
||||
<span class="ar-tree-node-label" :title="data.label">{{ data.label }}</span>
|
||||
<span v-if="data.isSystem" class="ar-tree-badge">系统</span>
|
||||
<span v-if="!data.isEnabled" class="ar-tree-badge ar-tree-badge--danger">停用</span>
|
||||
</span>
|
||||
</template>
|
||||
</el-tree>
|
||||
<div v-if="!treeData.length && !treeLoading" class="ar-inline-empty">
|
||||
暂无类型数据,请先「新增类型」
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
@ -72,12 +66,44 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ar-form-card">
|
||||
<!-- 系统预设类型:只读摘要(不渲染整张禁用表单) -->
|
||||
<div v-if="isTypeReadOnly" class="ar-form-card">
|
||||
<div class="task-panel">
|
||||
<div class="task-panel__body">
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">类型编码</span>
|
||||
<strong class="task-panel__field-value">{{ currentType.type || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">类型名称</span>
|
||||
<strong class="task-panel__field-value">{{ currentType.name || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">排序值</span>
|
||||
<strong class="task-panel__field-value">{{ Number(currentType.sort_order) || 0 }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<strong class="task-panel__field-value">
|
||||
{{ toFlag(currentType.is_enabled, 1) === 1 ? '启用' : '停用' }}
|
||||
</strong>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
系统预设类型由系统维护,编码 / 名称 / 排序 / 状态均不可修改,也不能删除;可在下方新增子类型,并为子类型维护关键词与回复配置。
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 仓库自定义类型:可编辑表单 -->
|
||||
<div v-else class="ar-form-card">
|
||||
<div class="task-panel">
|
||||
<div class="task-panel__body">
|
||||
<el-form
|
||||
:model="typeForm"
|
||||
:disabled="isTypeReadOnly"
|
||||
class="task-panel__form"
|
||||
@submit.prevent
|
||||
>
|
||||
@ -274,11 +300,40 @@
|
||||
<div class="ar-tabs-card">
|
||||
<el-tabs v-model="activeTab" class="ar-tabs">
|
||||
<el-tab-pane label="基本信息" name="base">
|
||||
<div class="task-panel ar-tab-panel">
|
||||
<!-- 系统预设子类型:只读摘要(不渲染整张禁用表单) -->
|
||||
<div v-if="isSubTypeReadOnly" class="task-panel ar-tab-panel">
|
||||
<div class="task-panel__body">
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">子类型编码</span>
|
||||
<strong class="task-panel__field-value">{{ currentSubType.sub_type || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">子类型名称</span>
|
||||
<strong class="task-panel__field-value">{{ currentSubType.name || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">排序值</span>
|
||||
<strong class="task-panel__field-value">{{ Number(currentSubType.sort_order) || 0 }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<strong class="task-panel__field-value">
|
||||
{{ toFlag(currentSubType.is_enabled, 1) === 1 ? '启用' : '停用' }}
|
||||
</strong>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
系统预设子类型只读,编码 / 名称 / 排序 / 状态不可修改;关键词与回复配置仍支持仓库级配置,处理函数 / 取号规则 / 群白名单在系统预设子类型下不可修改。
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else class="task-panel ar-tab-panel">
|
||||
<div class="task-panel__body">
|
||||
<el-form
|
||||
:model="subTypeForm"
|
||||
:disabled="isSubTypeReadOnly"
|
||||
class="task-panel__form"
|
||||
@submit.prevent
|
||||
>
|
||||
@ -878,13 +933,16 @@ loadTreeData()
|
||||
@use "./components/panel.scss";
|
||||
|
||||
.auto-reply-page {
|
||||
gap: 10px;
|
||||
padding: 10px;
|
||||
/* 与 setting/permission 一致:整页贴边卡片,左侧面板自带右边框 */
|
||||
border: 1px solid #e8eef7;
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 右侧主内容区:内边距由页面统一控制,避免与容器 padding 叠加 */
|
||||
/* 右侧主内容区:内边距 / 间距对齐 order 页 */
|
||||
.order-sub-container .ar-main {
|
||||
padding: 0;
|
||||
padding: 10px;
|
||||
gap: 10px;
|
||||
|
||||
/* 子类型面板:填充剩余高度 */
|
||||
@ -895,36 +953,68 @@ loadTreeData()
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 左侧树 ====================
|
||||
// ==================== 左侧树(对齐 setting/permission 左侧面板) ====================
|
||||
|
||||
.ar-side {
|
||||
flex: 0 0 288px;
|
||||
width: 288px;
|
||||
flex: 0 0 220px;
|
||||
width: 220px;
|
||||
min-width: 160px;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
min-height: 0;
|
||||
background: #fff;
|
||||
border-right: 1px solid #e8e8e8;
|
||||
box-shadow: 1px 0 2px rgba(0, 0, 0, 0.05);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.ar-side__filter {
|
||||
.ar-side__body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 12px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.ar-side__search {
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.ar-side__actions {
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
margin-bottom: 8px;
|
||||
|
||||
:deep(.el-button) {
|
||||
flex: 1;
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.ar-side__tree {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
padding: 4px;
|
||||
background: #fff;
|
||||
border: 1px solid #ebeef5;
|
||||
border-radius: 4px;
|
||||
overflow-y: auto;
|
||||
padding-bottom: 8px;
|
||||
|
||||
/* 隐藏滚动条(与 RoleTreePanel / PermissionTreePanel 一致) */
|
||||
&::-webkit-scrollbar {
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
-ms-overflow-style: none;
|
||||
scrollbar-width: none;
|
||||
|
||||
:deep(.el-tree) {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
:deep(.el-tree-node__content) {
|
||||
height: 32px;
|
||||
height: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -938,17 +1028,13 @@ loadTreeData()
|
||||
}
|
||||
|
||||
.ar-tree-node-label {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.ar-tree-node-code {
|
||||
color: #c0c4cc;
|
||||
font-size: 12px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.ar-tree-node--system {
|
||||
color: #606266;
|
||||
}
|
||||
@ -980,9 +1066,6 @@ loadTreeData()
|
||||
gap: 8px;
|
||||
color: #909399;
|
||||
font-size: 14px;
|
||||
background: #fff;
|
||||
border: 1px solid #ebeef5;
|
||||
border-radius: 4px;
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
|
||||
@ -364,12 +364,14 @@ export type OrderExportColumnOption = {
|
||||
}
|
||||
|
||||
/**
|
||||
* order.export 全部可导出字段(共 53 个 = 接口文档枚举 52 个 + 「复核时间」):
|
||||
* order.export 全部可导出字段(共 54 个 = 接口文档枚举 52 个 + 「复核时间」+「拦截状态」):
|
||||
* 仅 waybill 模式输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细;
|
||||
* 仅 item 模式输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量;
|
||||
* 其余为两种模式通用(选了当前模式不存在的表头时后端会自动忽略该列)。
|
||||
* ⚠️ 接口白名单**不含**「领料状态」「确认打印状态」(列表页仍有这两列,但导出不支持,传入非法表头会直接报错)。
|
||||
* ⚠️ 「复核时间」(recheck_time) 刚由后端支持(2026-10-08),文档 52 项的枚举暂未收录,勿以为多余而删除。
|
||||
* ⚠️ 「拦截状态」(intercept_status) 由前端于 2026-11-02 按需求先加入(配送订单等列表页均有该列);
|
||||
* 接口文档 52 项枚举尚未收录,需后端同步支持该表头,否则传入会按「非法表头」报错。
|
||||
* 「来源」列(字段 create_channel)位于「平台」列之后,waybill/item 两种模式均输出。
|
||||
*/
|
||||
export const ORDER_EXPORT_ALL_COLUMNS: OrderExportColumnOption[] = [
|
||||
@ -424,6 +426,7 @@ export const ORDER_EXPORT_ALL_COLUMNS: OrderExportColumnOption[] = [
|
||||
{ label: '复核完成状态', modes: ['waybill', 'item'], group: '流程状态' },
|
||||
{ label: '配货状态', modes: ['waybill', 'item'], group: '流程状态' },
|
||||
{ label: '打包状态', modes: ['waybill', 'item'], group: '流程状态' },
|
||||
{ label: '拦截状态', modes: ['waybill', 'item'], group: '流程状态' },
|
||||
// ===== 时间信息 =====
|
||||
{ label: '创建时间', modes: ['waybill', 'item'], group: '时间信息' },
|
||||
{ label: '支付时间', modes: ['waybill', 'item'], group: '时间信息' },
|
||||
|
||||
@ -1166,15 +1166,17 @@ export function buildWhereConditions(rawConditions: Record<string, any>): Record
|
||||
// ============================================================
|
||||
// 十、工具栏按钮系统
|
||||
// ============================================================
|
||||
// 按钮分为三类:
|
||||
// common — 公共按钮(刷新、导出)
|
||||
// function — 功能按钮(打开表单/确认窗口)
|
||||
// basic — 基础操作(字段设置、隐藏详情)
|
||||
// category 与 OrderToolbarButtonGroup.resolveButtonStyle 的取值保持一致
|
||||
// (对齐 setting/permission 页的工具栏按钮规则):
|
||||
// refresh — 蓝底白字(primary)
|
||||
// setting — 白底黑字(默认,用于导出 / 字段设置 / 显示详情)
|
||||
// action — 白底 + 主色描边蓝字(primary + plain,用于新增类按钮)
|
||||
// cancel — 白底红边红字(danger + plain,用于删除类按钮)
|
||||
|
||||
export interface ToolbarButtonConfig {
|
||||
key: string
|
||||
label: string
|
||||
category: 'common' | 'function' | 'basic'
|
||||
category: 'refresh' | 'setting' | 'action' | 'cancel'
|
||||
size?: '' | 'default' | 'small' | 'large'
|
||||
type?: '' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
|
||||
plain?: boolean
|
||||
@ -1193,8 +1195,7 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
||||
refresh: {
|
||||
key: 'refresh',
|
||||
label: '刷新',
|
||||
category: 'common',
|
||||
type: 'primary',
|
||||
category: 'refresh',
|
||||
size: 'small',
|
||||
loadingKey: 'loading',
|
||||
action: 'loadData'
|
||||
@ -1202,7 +1203,7 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
||||
export: {
|
||||
key: 'export',
|
||||
label: '导出',
|
||||
category: 'common',
|
||||
category: 'setting',
|
||||
size: 'small',
|
||||
loadingKey: 'exportLoading',
|
||||
action: 'handleExport',
|
||||
@ -1216,14 +1217,14 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
||||
columnConfig: {
|
||||
key: 'columnConfig',
|
||||
label: '字段设置',
|
||||
category: 'basic',
|
||||
category: 'setting',
|
||||
size: 'small',
|
||||
action: 'openColumnConfigPanel'
|
||||
},
|
||||
toggleDetail: {
|
||||
key: 'toggleDetail',
|
||||
label: '显示详情',
|
||||
category: 'basic',
|
||||
category: 'setting',
|
||||
dynamicLabelKey: 'detailToggleLabel',
|
||||
size: 'small',
|
||||
action: 'toggleDetailVisible'
|
||||
@ -1233,8 +1234,7 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
||||
createApiApp: {
|
||||
key: 'createApiApp',
|
||||
label: '创建应用',
|
||||
category: 'function',
|
||||
type: 'primary',
|
||||
category: 'action',
|
||||
size: 'small',
|
||||
action: 'openCreateApiApp',
|
||||
onlyForTabs: ['apiOpen']
|
||||
@ -1243,8 +1243,7 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
||||
createPlan: {
|
||||
key: 'createPlan',
|
||||
label: '新增计划',
|
||||
category: 'function',
|
||||
type: 'primary',
|
||||
category: 'action',
|
||||
size: 'small',
|
||||
action: 'openCreatePlan',
|
||||
onlyForTabs: ['plan']
|
||||
@ -1253,8 +1252,7 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
|
||||
createDefinition: {
|
||||
key: 'createDefinition',
|
||||
label: '新增定义',
|
||||
category: 'function',
|
||||
type: 'primary',
|
||||
category: 'action',
|
||||
size: 'small',
|
||||
action: 'openCreateDefinition',
|
||||
onlyForTabs: ['definition']
|
||||
|
||||
@ -461,6 +461,10 @@ const currentToolbarButtons = computed<OrderToolbarButtonConfig[]>(() => {
|
||||
key: btn.key,
|
||||
label: btn.label,
|
||||
size: btn.size,
|
||||
// category 必须透传:OrderToolbarButtonGroup.resolveButtonStyle 优先按它决定样式
|
||||
// (refresh=蓝底 / setting=白底 / action=白底蓝边 / cancel=红边红字),
|
||||
// 漏传会全部落到 default 分支,变成统一的灰边按钮
|
||||
category: btn.category,
|
||||
type: btn.type,
|
||||
plain: btn.plain,
|
||||
loadingKey: btn.loadingKey,
|
||||
|
||||
@ -47,6 +47,8 @@
|
||||
v-model="form.store_ids"
|
||||
multiple
|
||||
filterable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="选择要复制到的货主(可多选,不含源货主)"
|
||||
style="width: 100%"
|
||||
>
|
||||
|
||||
@ -140,6 +140,8 @@
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
:remote-method="searchGroups"
|
||||
:loading="groupSearchLoading"
|
||||
placeholder="输入群名称或外部群ID搜索"
|
||||
@ -159,6 +161,8 @@
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
:remote-method="searchMembers"
|
||||
:loading="memberSearchLoading"
|
||||
placeholder="先选择通知群,再搜索成员"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,178 @@
|
||||
<!--
|
||||
PermissionTreePanel — 权限类型树(左侧面板)
|
||||
|
||||
样式与交互对齐 setting/role 的 RoleTreePanel:
|
||||
220px 白底、右侧分隔线 + 轻投影、顶部搜索框只过滤树节点(不影响右侧列表),
|
||||
根节点「全部类型」默认展开,点击节点抛出权限类型('' 表示全部)。
|
||||
-->
|
||||
<template>
|
||||
<div class="perm-tree-panel">
|
||||
<div class="perm-tree-panel__body">
|
||||
<el-input
|
||||
v-model="searchText"
|
||||
class="perm-tree-panel__search"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="搜索权限类型"
|
||||
:prefix-icon="Search"
|
||||
/>
|
||||
|
||||
<div class="perm-tree-panel__tree">
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
:data="nodes"
|
||||
:props="treeProps"
|
||||
node-key="value"
|
||||
highlight-current
|
||||
:expand-on-click-node="false"
|
||||
:default-expanded-keys="expandedKeys"
|
||||
:filter-node-method="filterNode"
|
||||
@node-click="handleNodeClick"
|
||||
>
|
||||
<template #default="{ data }">
|
||||
<span class="perm-node">
|
||||
<span class="perm-node__label">{{ data.label }}</span>
|
||||
</span>
|
||||
</template>
|
||||
</el-tree>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, watch, nextTick } from 'vue'
|
||||
import { ElTree } from 'element-plus'
|
||||
import { Search } from '@element-plus/icons-vue'
|
||||
import { permissionTypeOptions } from '../permission-config'
|
||||
|
||||
defineOptions({ name: 'PermissionTreePanel' })
|
||||
|
||||
/** 树节点(value 为权限类型,根节点使用 ROOT_KEY) */
|
||||
interface TypeTreeNode {
|
||||
value: string
|
||||
label: string
|
||||
children?: TypeTreeNode[]
|
||||
}
|
||||
|
||||
const props = defineProps<{
|
||||
/** 当前选中的权限类型('' = 全部类型) */
|
||||
currentType: string
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
/** 点击树节点('' 表示「全部类型」) */
|
||||
(e: 'node-click', type: string): void
|
||||
}>()
|
||||
|
||||
/** 根节点(全部类型)的 key,空字符串不能作为 el-tree 的 node-key */
|
||||
const ROOT_KEY = '__all__'
|
||||
|
||||
const treeProps = { label: 'label', children: 'children' } as const
|
||||
const treeRef = ref<InstanceType<typeof ElTree> | null>(null)
|
||||
const searchText = ref('')
|
||||
|
||||
/** 虚拟根节点「全部类型」+ 权限类型列表 */
|
||||
const nodes = computed<TypeTreeNode[]>(() => [
|
||||
{
|
||||
value: ROOT_KEY,
|
||||
label: '全部类型',
|
||||
children: permissionTypeOptions.map(item => ({ value: item.value, label: item.label }))
|
||||
}
|
||||
])
|
||||
|
||||
/** 默认展开首级(「全部类型」根节点) */
|
||||
const expandedKeys = [ROOT_KEY]
|
||||
|
||||
function filterNode(value: string, data: Record<string, unknown>) {
|
||||
if (!value) return true
|
||||
return String(data?.label ?? '').toLowerCase().includes(String(value).toLowerCase())
|
||||
}
|
||||
|
||||
function handleNodeClick(data: TypeTreeNode) {
|
||||
const value = String(data?.value ?? '')
|
||||
emit('node-click', value === ROOT_KEY ? '' : value)
|
||||
}
|
||||
|
||||
watch(searchText, (val) => {
|
||||
treeRef.value?.filter(val)
|
||||
})
|
||||
|
||||
/** 树数据重建后确保根节点仍是展开状态 */
|
||||
watch(nodes, async () => {
|
||||
await nextTick()
|
||||
treeRef.value?.getNode?.(ROOT_KEY)?.expand?.()
|
||||
})
|
||||
|
||||
/** 外部选中项变化(含重建树)→ 同步高亮 */
|
||||
watch(
|
||||
() => props.currentType,
|
||||
async (type) => {
|
||||
await nextTick()
|
||||
treeRef.value?.setCurrentKey(type || ROOT_KEY)
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.perm-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;
|
||||
}
|
||||
|
||||
.perm-tree-panel__body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 12px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.perm-tree-panel__search {
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.perm-tree-panel__tree {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
padding-bottom: 8px;
|
||||
|
||||
/* 隐藏滚动条(与 RoleTreePanel 一致) */
|
||||
&::-webkit-scrollbar {
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
-ms-overflow-style: none;
|
||||
scrollbar-width: none;
|
||||
}
|
||||
|
||||
.perm-node {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
font-size: 13px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.perm-node__label {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
:deep(.el-tree-node__content) {
|
||||
height: 30px;
|
||||
}
|
||||
</style>
|
||||
@ -1,24 +1,7 @@
|
||||
<template>
|
||||
<div class="order-sub-container permission-page" :style="{ height: containerHeight }">
|
||||
<!-- 左侧:权限类型(白色栏条 + 树卡片,布局对齐 order 页导航区) -->
|
||||
<aside class="permission-side">
|
||||
<div class="permission-toolbar">
|
||||
<span class="permission-toolbar__title">权限类型</span>
|
||||
<span class="permission-toolbar__sub">点击筛选</span>
|
||||
</div>
|
||||
|
||||
<div class="permission-tree">
|
||||
<el-tree
|
||||
:data="typeTreeData"
|
||||
:props="{ label: 'label' }"
|
||||
node-key="value"
|
||||
:current-node-key="currentType"
|
||||
highlight-current
|
||||
:expand-on-click-node="false"
|
||||
@node-click="handleNodeClick"
|
||||
/>
|
||||
</div>
|
||||
</aside>
|
||||
<!-- 左侧:权限类型树(样式 / 交互对齐 setting/role 的 RoleTreePanel) -->
|
||||
<PermissionTreePanel :current-type="currentType" @node-click="handleNodeClick" />
|
||||
|
||||
<!-- 右侧:工具栏 + 树形列表(对齐 order/waveOrder 列表页结构) -->
|
||||
<section class="main-content">
|
||||
@ -393,6 +376,7 @@ import { getStatusTextClass } from '@/views/order/orderManagement/config/order-c
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import PermissionTreePanel from './components/PermissionTreePanel.vue'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import {
|
||||
permissionRules,
|
||||
@ -471,15 +455,11 @@ function handleToolbarButtonClick(action: string) {
|
||||
toolbarActionMap[action]?.()
|
||||
}
|
||||
|
||||
// 左侧树数据
|
||||
const typeTreeData = ref([
|
||||
{ label: '全部类型', value: '' },
|
||||
...permissionTypeOptions.map(p => ({ label: p.label, value: p.value }))
|
||||
])
|
||||
// 左侧树:权限类型(组件内部补「全部类型」根节点,「搜索」只过滤树节点)
|
||||
const currentType = ref<string>('')
|
||||
|
||||
const handleNodeClick = (data: any) => {
|
||||
currentType.value = data.value
|
||||
const handleNodeClick = (type: string) => {
|
||||
currentType.value = type
|
||||
currentPage.value = 1
|
||||
}
|
||||
|
||||
@ -799,68 +779,12 @@ onMounted(() => {
|
||||
<style scoped lang="scss">
|
||||
@use "../../../order/orderManagement/styles/order-sub.scss";
|
||||
|
||||
/* 页面容器:对齐 order 页(左侧树卡片 + 右侧工具栏/表格) */
|
||||
/* 页面容器:与 setting/role 一致——整页贴边卡片,左侧面板自带右边框,右侧内容区保留 10px 内边距 */
|
||||
.permission-page {
|
||||
gap: 10px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
/* 右侧主内容区内边距由页面统一控制,避免与容器 padding 叠加 */
|
||||
.order-sub-container.permission-page .main-content {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* ==================== 左侧:权限类型树 ==================== */
|
||||
|
||||
.permission-side {
|
||||
flex: 0 0 240px;
|
||||
width: 240px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.permission-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 10px;
|
||||
flex-shrink: 0;
|
||||
min-height: 34px;
|
||||
box-sizing: border-box;
|
||||
padding: 6px 10px;
|
||||
border: 1px solid #ebeef5;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.permission-toolbar__title {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.permission-toolbar__sub {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.permission-tree {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
padding: 4px;
|
||||
background: #fff;
|
||||
border: 1px solid #ebeef5;
|
||||
border-radius: 4px;
|
||||
|
||||
:deep(.el-tree) {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
:deep(.el-tree-node__content) {
|
||||
height: 32px;
|
||||
}
|
||||
border: 1px solid #e8eef7;
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* ==================== 表格微调(树形表格对齐 order 页行高) ==================== */
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
node-key="role_id"
|
||||
highlight-current
|
||||
:expand-on-click-node="false"
|
||||
:default-expanded-keys="expandedKeys"
|
||||
:filter-node-method="filterNode"
|
||||
@node-click="handleNodeClick"
|
||||
>
|
||||
@ -82,6 +83,18 @@ const nodes = computed(() => [
|
||||
{ role_id: 0, role_name: '全部角色', children: props.treeData }
|
||||
])
|
||||
|
||||
/** 默认展开首级(「全部角色」根节点) */
|
||||
const expandedKeys = [0]
|
||||
|
||||
/** 树数据重建后确保根节点仍是展开状态 */
|
||||
watch(
|
||||
() => props.treeData,
|
||||
async () => {
|
||||
await nextTick()
|
||||
treeRef.value?.getNode?.(0)?.expand?.()
|
||||
}
|
||||
)
|
||||
|
||||
function isDisabledRole(data: any) {
|
||||
return Number(data?.role_id) > 0 && Number(data?.status) === 0
|
||||
}
|
||||
|
||||
@ -187,6 +187,10 @@ const currentToolbarButtons = computed<OrderToolbarButtonConfig[]>(() => {
|
||||
key: btn.key,
|
||||
label: btn.label,
|
||||
size: btn.size,
|
||||
// category 必须透传:OrderToolbarButtonGroup.resolveButtonStyle 优先按它决定样式
|
||||
// (refresh=蓝底 / setting=白底 / action=白底蓝边 / cancel=红边红字),
|
||||
// 漏传会全部落到 default 分支,变成统一的灰边按钮
|
||||
category: btn.category,
|
||||
type: btn.type,
|
||||
plain: btn.plain,
|
||||
loadingKey: btn.loadingKey,
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
class="role-permission-dialog"
|
||||
width="min(900px, 96vw)"
|
||||
width="min(880px, 96vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
|
||||
@ -190,6 +190,8 @@
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
@ -211,6 +213,8 @@
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user