diff --git a/docs/标签排序与默认页签-统一方案.md b/docs/标签排序与默认页签-统一方案.md index 19edc354..35c1de2b 100644 --- a/docs/标签排序与默认页签-统一方案.md +++ b/docs/标签排序与默认页签-统一方案.md @@ -16,7 +16,8 @@ src/composables/useTabOrder.ts 唯一读取/排序/默认页签/保存 src/components/TabArea/index.vue 唯一标签渲染组件(含排序入口 + 插槽) src/components/SortSettingDialog.vue 单页排序弹窗(TabArea 内置入口调用) src/components/TabOrderDragList.vue 拖拽列表(单页弹窗与全局面板共用) -src/components/TabOrderSettingsDialog.vue 全项目标签排序面板(字段设置入口) +src/components/TabOrderPanel.vue 全项目标签排序面板(设置中心 →导航→标签排序) +src/components/settings/SettingsDialog.vue 设置中心外壳(左导航 + 右内容) src/components/UpperTable/index.vue 字段设置工具栏入口 + 全局配置导出/导入 + 故障修复 ``` @@ -28,7 +29,7 @@ flowchart LR H --> P[页面 activeTab / 单页模式默认标签] T --> D1[SortSettingDialog] D1 --> H - F[TabOrderSettingsDialog] --> S + F[TabOrderPanel] --> S U[UpperTable 字段设置] --> F S --> G[全局配置 导出/导入] ``` @@ -133,9 +134,9 @@ const { orderedTabs, defaultTabName, resolveInitialTab, saveOrder, setDefault, r --- -## 6. 全局面板(字段设置 → 标签排序) +## 6. 标签排序面板 -- 入口:`UpperTable` 字段设置工具栏「标签排序」(所有页面显示) +- 入口:`设置`(Navbar 头像下拉)或列表页工具栏「字段设置」→ 设置中心 → 左侧「导航 → 标签排序」 - 左侧:注册表中**标签数 ≥ 2** 的页面(打开时并行懒加载标签数量,加载完成前显示「加载中…」,避免单标签页面闪入闪出);按分组 + 搜索 + 已自定义标记,当前页面用蓝点标记 - 右侧:拖拽排序 + 圆点设为默认;标题栏常驻显示「默认:XXX」(**用户未设置时也展示页面兜底默认**,便于确认当前生效值);默认行带「默认」标签 - 保存:一次写入 `tabOrder` 文档;`useTabOrder` 为响应式读取,**保存后页面立即生效** diff --git a/docs/统一配置文件-tbyc-config.md b/docs/统一配置文件-tbyc-config.md index 799ff179..731ed14f 100644 --- a/docs/统一配置文件-tbyc-config.md +++ b/docs/统一配置文件-tbyc-config.md @@ -1,7 +1,7 @@ # 统一配置文件:tbyc-config.json - 日期:2026-11-07 -- 入口:`字段设置 → 导出配置 / 导入配置` +- 入口:`设置 → 导入 / 导出与维护`(Navbar 头像下拉「设置」,或列表页工具栏「字段设置」打开设置中心) - 目标:配置文件不再局限于「字段设置」,而是一个可扩展的分区容器,后续功能只需注册分区即可接入 --- @@ -50,6 +50,8 @@ | `fieldColumns` | 字段设置 | UpperTable 列配置 | `upper_table_columns_{user}_{role}_{tableId}` | | `tabOrder` | 标签排序 / 默认页签 | 标签排序面板 | `user_prefs_{userId}` → scope `tabOrder` | | `display` | 界面显示 | settings store | `settings_{user}_{role}` | +| `experimental` | 表格与缓存 | experimental store | `experimental_{user}_{role}` | +| `printer` | 设备与打印 | userPreference | `user_prefs_{user}_{warehouse}` → scope `printer.autoReconnect` | | `shortcuts` | 快捷键 | shortcuts store | `shortcuts_{user}_{role}` | --- diff --git a/docs/设置中心-设计与实施.md b/docs/设置中心-设计与实施.md new file mode 100644 index 00000000..93ced5f5 --- /dev/null +++ b/docs/设置中心-设计与实施.md @@ -0,0 +1,148 @@ +# 设置中心:设计与实施 + +- 日期:2026-11-08 +- 状态:**已实现(P1–P5)** +- 定位:项目内**所有"本机可修改配置"的唯一入口**,取代原「字段设置」弹窗 + +--- + +## 1. 入口 + +| 入口 | 位置 | 行为 | +|---|---|---| +| 全局 | Navbar 头像下拉 →「设置」 | 打开设置中心;无表格上下文,隐藏「当前页面 → 列表字段」 | +| 页面 | 列表页工具栏「字段设置」 | 打开同一弹窗,定位到「列表字段」,行为与改造前一致 | + +--- + +## 2. 分区结构 + +``` +设置(左导航 + 右内容,1280px) +├─ 表格 +│ ├─ 列表字段 当前表格列显隐 / 顺序 / 固定(由 UpperTable 通过插槽注入) +│ └─ 所有表格字段 跨页面管理全部已登记表格(搜索 / 显隐 / 顺序 / 固定 / 恢复默认) +├─ 显示与交互 +│ ├─ 界面显示 布局模式 / 固定头部 / 侧栏 Logo / Scan-box / 工具栏 / 快捷键区域 +│ └─ 设备与打印 打印组件连接状态、失败自动重连、逐组件开关(账号 + 仓库) +├─ 性能 +│ ├─ 表格与性能 表格工作模式(低占用 / 高性能) +│ └─ 页面与标签缓存 页面缓存、tab 缓存(开关 + 上限) +├─ 导航 +│ ├─ 标签排序 全项目页面标签顺序 + 默认页签 +│ └─ 快捷入口 侧边栏收藏的快捷入口集中管理 +└─ 数据与维护 + ├─ 导出字段 订单管理各页「导出全部(不含明细)」的导出字段勾选(账号 + 角色) + └─ 导入 / 导出与维护 导出/导入 tbyc-config.json、恢复全部默认、故障修复、诊断信息 +``` + +作用域提示直接显示在导航项右侧:`当前表格 / 账号 + 角色 / 账号 / 本机`,避免用户误以为会同步到服务端。 + +--- + +## 3. 代码结构 + +``` +components/settings/ + SettingsDialog.vue 外壳(左导航 / 搜索 / 右侧动态分区 / 底部提示) + registry.ts 分区元数据(key/title/group/scope/slot/component 懒加载) + sections/ + DisplaySection.vue 界面显示(含布局 / 固定头部 / 侧栏 Logo) + DeviceSection.vue 设备与打印(复用 PrinterComponentConnectionPanel) + PerformanceSection.vue + CacheSection.vue + TabOrderSection.vue → 复用 components/TabOrderPanel.vue + ShortcutsSection.vue 快捷入口集中管理 + AllTablesSection.vue 所有表格字段(跨页面列配置管理) + ExportColumnsSection.vue 导出字段(订单管理各页 · 导出全部不含明细) + DataSection.vue 导入导出 / 恢复默认 / 故障修复 / 诊断 + shared.scss 分区通用样式 +``` + +### 所有表格字段(跨页面) + +| 项 | 说明 | +|---|---| +| 数据来源 | `upper_table_columns_{user}_{role}_{tableId}`(页面打开一次后由 UpperTable 自动登记) | +| 列表能力 | 按名称/tableId 搜索、仅看已自定义、显示已自定义标记 | +| 编辑能力 | 显隐、上移/下移、左/右固定与取消固定、恢复默认 | +| 即时生效 | 修改写入 localStorage + `tableColumnConfig.touch(tableId)`;已打开的表格监听版本号并重建列 | +| 恢复默认 | 依赖配置中的 `defaultColumns` 快照(首次生成配置时记录);旧配置在下一次打开页面时补齐 | +| 公共代码 | `utils/table-column-config.ts`(类型 / 读写 / 分区与归一化 / 自定义判定) | + +- 表级「列表字段」不放进 registry 组件,由 `UpperTable` 通过 `#field-section` 插槽注入(列配置逻辑与表格渲染强耦合,不搬动逻辑) +- 分区组件全部 `defineAsyncComponent`,打开设置中心不会一次性加载所有分区 + +### 导出字段(订单管理 · 导出全部不含明细) + +| 项 | 说明 | +|---|---| +| 数据来源 | `order_export_columns_{user}_{role}_{scopeKey}_{mode}`(与 `OrderExportColumnsDialog` 同一 key) | +| 页面范围 | `ORDER_TAB_LIST` ∩ `ORDER_INDEX_EXPORT_SCOPES`:待审核/待处理/待处理异常/待出库/委托外仓/配送/配送异常/归档 | +| 本期模式 | 仅 `waybill`(导出全部 · 不含明细);`item`(含明细)存储已在配置分区中兼容 | +| 字段来源 | `getOrderExportColumnGroupsByMode('waybill')`,与导出弹窗同一套中文表头分组 | +| 默认值 | 未配置(无 localStorage key)= 全选 | +| 即时生效 | 勾选即写 localStorage,下次打开导出弹窗读取;弹窗打开时不再回退为全选 | +| 恢复默认 | 删除该页 key(回到未配置 = 全选) | + +- 语义修正:`OrderExportColumnsDialog.loadSavedColumns()` 改为 `string[] \| null`,**空数组视为「显式清空」**而不是「未配置」,避免清空后在下次打开时被静默重置为全选 + +--- + +## 4. 交互约定 + +| 项 | 约定 | +|---|---| +| 保存 | **即时生效**(各分区直写对应 store),无全局"保存/取消" | +| 重置 | 分区内「恢复默认」;「数据与维护」内提供「恢复全部默认」(二次确认) | +| 危险操作 | 故障修复保留双重确认,并列出被清除的配置种类 | +| 弹窗嵌套 | 已消除:标签排序从"二级弹窗"改为"设置中心内嵌分区" | +| 底部提示 | `修改即时保存 · 仅保存在当前浏览器` | + +--- + +## 5. 事件与数据流 + +``` +UpperTable ──(openColumnConfig)──▶ SettingsDialog(initialSection='field') + ▲ │ + └──── @columns-changed ◀───────────────┘ + (DataSection 导入 / 恢复默认 / 故障修复 后需要重建列配置) + +DataSection ──▶ TBYC_CONFIG_SECTIONS(fieldColumns / tabOrder / display / experimental / printer / shortcuts / orderExportColumns) +``` + +- Navbar 入口没有 `#field-section`,`DataSection` 的 `columns-changed` 无人监听:配置仍已写入 localStorage,表格下次挂载时自然生效 + +--- + +## 6. 与统一配置文件的关系 + +- 设置中心的分区 = `tbyc-config.json` 的 sections(可编辑项与可导出项保持一致) +- `printer`(设备与打印)目前**仅参与导出/导入**,UI 后续补齐 +- `orderExportColumns`(订单导出字段):数据形如 `{ [scopeKey]: { waybill: string[], item: string[] } }`;导入时按 `ORDER_INDEX_EXPORT_SCOPES` 白名单过滤 scopeKey、按模式字段白名单过滤字段 +- 新增设置项:`registry.ts` 加一条 + `sections/` 新建组件(如需导出,再在 `tbyc-config-sections.ts` 加分区) + +--- + +## 7. 已删除 + +| 文件 | 替代 | +|---|---| +| `components/UpperTable/MoreSettingsDialog.vue` | 「界面显示」「表格与性能」「页面与标签缓存」分区 | +| `components/TabOrderSettingsDialog.vue` | 「标签排序」分区(`TabOrderPanel`) | + +--- + +## 8. 验证清单 + +1. 列表页「字段设置」→ 停在「列表字段」,列显隐/排序/固定/恢复默认均正常 +2. Navbar「设置」→ 无「列表字段」,默认停在「所有表格字段」 +3. 「所有表格字段」:搜索、仅看已自定义、修改后当前页面表格即时刷新、恢复默认生效 +4. 界面显示:布局模式/固定头部/侧栏 Logo/Scan-box/工具栏/快捷键区域 即时生效,刷新后保持 +5. 设备与打印:连接状态、主开关、逐组件开关、全部重连 +6. 快捷入口:列表与侧边栏星标一致,移除/清空生效 +4. 标签排序:只列多标签页面;默认标签展示与保存正常;保存后当前页即时生效 +5. 导出 → 重置 → 导入:字段、标签、显示、缓存、快捷键全部恢复 +6. 故障修复:二次确认后清除并给出恢复项摘要 +7. 诊断信息:账号/角色/仓库、配置版本、占用体积、存储 key 正确 diff --git a/src/components/TabOrderSettingsDialog.vue b/src/components/TabOrderPanel.vue similarity index 87% rename from src/components/TabOrderSettingsDialog.vue rename to src/components/TabOrderPanel.vue index af8e019a..d7421bc9 100644 --- a/src/components/TabOrderSettingsDialog.vue +++ b/src/components/TabOrderPanel.vue @@ -1,24 +1,17 @@ diff --git a/src/components/UpperTable/MoreSettingsDialog.vue b/src/components/UpperTable/MoreSettingsDialog.vue deleted file mode 100644 index f5b1d001..00000000 --- a/src/components/UpperTable/MoreSettingsDialog.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index de9489ce..1161db2e 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -246,169 +246,140 @@ /> - -
- 恢复默认 - 导出配置 - - 导入配置 - - 故障修复 - - 标签排序 - - 更多设置 -
-
- + + + + diff --git a/src/components/settings/registry.ts b/src/components/settings/registry.ts new file mode 100644 index 00000000..e949b636 --- /dev/null +++ b/src/components/settings/registry.ts @@ -0,0 +1,98 @@ +/** + * 设置中心分区注册表 + * + * - 新增一个设置分区 = 加一条 + 在 sections/ 下新建组件 + * - `slot: true` 的分区不在此渲染组件,由宿主(UpperTable)通过 #field-section 插槽注入 + * - 组件全部懒加载,避免设置弹窗拖慢首屏 + */ +import { defineAsyncComponent, type Component } from 'vue' + +export interface SettingsSectionMeta { + key: string + title: string + group: string + /** 作用域提示(右侧小字),帮助用户理解"这条配置影响谁" */ + scopeLabel?: string + /** 由宿主通过插槽提供内容(如表格列配置依赖当前表实例) */ + slot?: boolean + component?: Component +} + +export const SETTINGS_GROUPS = ['表格', '显示与交互', '性能', '导航', '数据与维护'] as const + +export const SETTINGS_SECTIONS: SettingsSectionMeta[] = [ + { + key: 'field', + title: '列表字段', + group: '表格', + scopeLabel: '当前表格', + slot: true + }, + { + key: 'tables', + title: '所有表格字段', + group: '表格', + scopeLabel: '账号 + 角色', + component: defineAsyncComponent(() => import('./sections/AllTablesSection.vue')) + }, + { + key: 'display', + title: '界面显示', + group: '显示与交互', + scopeLabel: '账号 + 角色', + component: defineAsyncComponent(() => import('./sections/DisplaySection.vue')) + }, + { + key: 'device', + title: '设备与打印', + group: '显示与交互', + scopeLabel: '账号 + 仓库', + component: defineAsyncComponent(() => import('./sections/DeviceSection.vue')) + }, + { + key: 'performance', + title: '表格与性能', + group: '性能', + scopeLabel: '账号 + 角色', + component: defineAsyncComponent(() => import('./sections/PerformanceSection.vue')) + }, + { + key: 'cache', + title: '页面与标签缓存', + group: '性能', + scopeLabel: '账号 + 角色', + component: defineAsyncComponent(() => import('./sections/CacheSection.vue')) + }, + { + key: 'tabOrder', + title: '标签排序', + group: '导航', + scopeLabel: '账号', + component: defineAsyncComponent(() => import('./sections/TabOrderSection.vue')) + }, + { + key: 'shortcuts', + title: '快捷入口', + group: '导航', + scopeLabel: '账号 + 角色', + component: defineAsyncComponent(() => import('./sections/ShortcutsSection.vue')) + }, + { + key: 'exportColumns', + title: '导出字段', + group: '数据与维护', + scopeLabel: '账号 + 角色', + component: defineAsyncComponent(() => import('./sections/ExportColumnsSection.vue')) + }, + { + key: 'data', + title: '导入 / 导出与维护', + group: '数据与维护', + scopeLabel: '本机', + component: defineAsyncComponent(() => import('./sections/DataSection.vue')) + } +] + +export function getSettingsSection(key: string): SettingsSectionMeta | undefined { + return SETTINGS_SECTIONS.find((section) => section.key === key) +} diff --git a/src/components/settings/sections/AllTablesSection.vue b/src/components/settings/sections/AllTablesSection.vue new file mode 100644 index 00000000..7939b4ae --- /dev/null +++ b/src/components/settings/sections/AllTablesSection.vue @@ -0,0 +1,418 @@ + + + + + + diff --git a/src/components/settings/sections/CacheSection.vue b/src/components/settings/sections/CacheSection.vue new file mode 100644 index 00000000..34402d0c --- /dev/null +++ b/src/components/settings/sections/CacheSection.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/components/settings/sections/DataSection.vue b/src/components/settings/sections/DataSection.vue new file mode 100644 index 00000000..14fb4519 --- /dev/null +++ b/src/components/settings/sections/DataSection.vue @@ -0,0 +1,398 @@ + + + + + + diff --git a/src/components/settings/sections/DeviceSection.vue b/src/components/settings/sections/DeviceSection.vue new file mode 100644 index 00000000..d61ef411 --- /dev/null +++ b/src/components/settings/sections/DeviceSection.vue @@ -0,0 +1,30 @@ + + + + + + diff --git a/src/components/settings/sections/DisplaySection.vue b/src/components/settings/sections/DisplaySection.vue new file mode 100644 index 00000000..e24e5dbc --- /dev/null +++ b/src/components/settings/sections/DisplaySection.vue @@ -0,0 +1,134 @@ + + + + + + diff --git a/src/components/settings/sections/ExportColumnsSection.vue b/src/components/settings/sections/ExportColumnsSection.vue new file mode 100644 index 00000000..db07ae35 --- /dev/null +++ b/src/components/settings/sections/ExportColumnsSection.vue @@ -0,0 +1,400 @@ + + + + + + diff --git a/src/components/settings/sections/PerformanceSection.vue b/src/components/settings/sections/PerformanceSection.vue new file mode 100644 index 00000000..b40f73f9 --- /dev/null +++ b/src/components/settings/sections/PerformanceSection.vue @@ -0,0 +1,52 @@ + + + + + + diff --git a/src/components/settings/sections/ShortcutsSection.vue b/src/components/settings/sections/ShortcutsSection.vue new file mode 100644 index 00000000..8a70d1e2 --- /dev/null +++ b/src/components/settings/sections/ShortcutsSection.vue @@ -0,0 +1,104 @@ + + + + + + diff --git a/src/components/settings/sections/TabOrderSection.vue b/src/components/settings/sections/TabOrderSection.vue new file mode 100644 index 00000000..56b6aa73 --- /dev/null +++ b/src/components/settings/sections/TabOrderSection.vue @@ -0,0 +1,16 @@ + + + + diff --git a/src/components/settings/sections/shared.scss b/src/components/settings/sections/shared.scss new file mode 100644 index 00000000..f2a6713e --- /dev/null +++ b/src/components/settings/sections/shared.scss @@ -0,0 +1,96 @@ +/* 设置中心分区通用样式 + 视觉基准:task-panel(order/waveOrder 新建波次策略、basicManagement 新增投递计划) + —— 输入/选项行透明无容器,12px 标签 #606266,间距 16px */ + +.settings-section { + display: flex; + flex-direction: column; + gap: 8px; +} + +/* ===== 分区标题区 ===== */ +.section-header { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 12px; + padding: 4px 0 0 12px; +} + +.section-title { + font-size: 13px; + line-height: 20px; + font-weight: 600; + color: #303133; +} + +.section-desc { + margin-top: 4px; + font-size: 12px; + line-height: 18px; + color: #909399; +} + +/* ===== 分组容器:保持透明,不再使用灰色圆角背景 ===== */ +.settings-card { + display: flex; + flex-direction: column; + padding: 0; + border: none; + border-radius: 0; + background: transparent; +} + +/* ===== 设置行(对齐 task-panel__field--input) ===== */ +.setting-row { + display: flex; + align-items: center; + gap: 16px; + min-height: 40px; + padding: 4px 0 0 12px; +} + +.setting-label { + flex: 0 0 88px; + width: 88px; + font-size: 12px; + line-height: 20px; + color: #606266; + text-align: left; +} + +.setting-hint { + font-size: 12px; + line-height: 18px; + color: #909399; +} + +/* ===== 数据/维护类区块 ===== */ +.section-block + .section-block { + margin-top: 12px; +} + +.block-title { + font-size: 13px; + line-height: 20px; + font-weight: 600; + color: #303133; + padding-left: 2px; +} + +.block-desc { + margin: 4px 0 8px; + padding-left: 2px; + font-size: 12px; + line-height: 18px; + color: #909399; +} + +.block-actions { + display: flex; + align-items: center; + gap: 8px; + flex-wrap: wrap; + padding-left: 2px; +} + diff --git a/src/config/tbyc-config-sections.ts b/src/config/tbyc-config-sections.ts index 14a4dee8..cffc30a8 100644 --- a/src/config/tbyc-config-sections.ts +++ b/src/config/tbyc-config-sections.ts @@ -10,7 +10,12 @@ import { useUserStore } from '@/stores/modules/user' import { useSettingsStore } from '@/stores/modules/settings' import { useShortcutsStore } from '@/stores/modules/shortcuts' +import { useExperimentalStore } from '@/stores/modules/experimental' +import { useUserPreferenceStore } from '@/stores/modules/userPreference' +import { PRINTER_AUTO_RECONNECT_SCOPE } from '@/stores/modules/printerComponent' import { getTabOrderPageKeys } from '@/config/tab-order-registry' +import { ORDER_INDEX_EXPORT_SCOPES } from '@/views/order/shared/orderListExport' +import { getOrderExportColumnsByMode } from '@/views/order/orderManagement/config/order-common-config' import { normalizeTabOrderDoc, readTabOrderDoc, @@ -201,7 +206,70 @@ const displaySection: TbycConfigSection = { } } -/** ============ 分区 4:快捷键 ============ */ +/** ============ 分区 4:表格与缓存(experimental store) ============ */ +const experimentalSection: TbycConfigSection = { + key: 'experimental', + title: '表格与缓存', + collect: () => { + const store = useExperimentalStore() + return { + tableMode: store.tableMode, + tabCacheEnabled: store.tabCacheEnabled, + tabCacheMax: store.tabCacheMax, + pageCacheEnabled: store.pageCacheEnabled, + pageCacheMax: store.pageCacheMax + } + }, + apply: (data) => { + if (!data || typeof data !== 'object' || Array.isArray(data)) return 0 + const source = data as Record + const store = useExperimentalStore() + let count = 0 + + if (source.tableMode === 'performance' || source.tableMode === 'resource') { + store.setTableMode(source.tableMode) + count += 1 + } + if (typeof source.tabCacheEnabled === 'boolean') { + store.setTabCacheEnabled(source.tabCacheEnabled) + count += 1 + } + if (Number.isInteger(source.tabCacheMax) && source.tabCacheMax > 0) { + store.setTabCacheMax(source.tabCacheMax) + count += 1 + } + if (typeof source.pageCacheEnabled === 'boolean') { + store.setPageCacheEnabled(source.pageCacheEnabled) + count += 1 + } + if (Number.isInteger(source.pageCacheMax) && source.pageCacheMax > 0) { + store.setPageCacheMax(source.pageCacheMax) + count += 1 + } + + return count + } +} + +/** + * ============ 分区 5:设备与打印(暂无 UI,仅导出/导入) ============ + * 数据源:userPreference 的仓库级 scope `printer.autoReconnect` + */ +const printerSection: TbycConfigSection = { + key: 'printer', + title: '设备与打印', + collect: () => { + const value = useUserPreferenceStore().get(PRINTER_AUTO_RECONNECT_SCOPE) + return value ?? undefined + }, + apply: (data) => { + if (!data || typeof data !== 'object' || Array.isArray(data)) return 0 + useUserPreferenceStore().set(PRINTER_AUTO_RECONNECT_SCOPE, data) + return 1 + } +} + +/** ============ 分区 6:快捷键 ============ */ const shortcutsSection: TbycConfigSection = { key: 'shortcuts', title: '快捷键', @@ -225,11 +293,69 @@ const shortcutsSection: TbycConfigSection = { } } +/** ============ 分区 7:订单导出字段(订单管理 · 导出弹窗的字段勾选) ============ */ +const ORDER_EXPORT_MODES = ['waybill', 'item'] as const + +const orderExportColumnsSection: TbycConfigSection = { + key: 'orderExportColumns', + title: '订单导出字段', + collect: () => { + const { userId, roleId } = currentIdentity() + const prefix = `order_export_columns_${userId}_${roleId}_` + const result: Record> = {} + Object.keys(localStorage).forEach((key) => { + if (!key.startsWith(prefix)) return + const [scopeKey, mode] = key.slice(prefix.length).split('_') + if (!scopeKey || !mode) return + try { + const parsed = JSON.parse(localStorage.getItem(key) || 'null') + if (!Array.isArray(parsed)) return + const scope = result[scopeKey] || (result[scopeKey] = {}) + scope[mode] = parsed.filter((field: unknown): field is string => typeof field === 'string') + } catch { + // 忽略损坏的配置 + } + }) + return Object.keys(result).length ? result : undefined + }, + apply: (data) => { + if (!data || typeof data !== 'object' || Array.isArray(data)) return 0 + const { userId, roleId } = currentIdentity() + const prefix = `order_export_columns_${userId}_${roleId}_` + const source = data as Record> + let count = 0 + + Object.keys(source).forEach((scopeKey) => { + if (!(scopeKey in ORDER_INDEX_EXPORT_SCOPES)) return + const scoped = source[scopeKey] + if (!scoped || typeof scoped !== 'object' || Array.isArray(scoped)) return + + ORDER_EXPORT_MODES.forEach((mode) => { + const list = scoped[mode] + if (!Array.isArray(list)) return + const valid = new Set(getOrderExportColumnsByMode(mode)) + const fields = list.filter((field): field is string => typeof field === 'string' && valid.has(field)) + try { + localStorage.setItem(`${prefix}${scopeKey}_${mode}`, JSON.stringify(fields)) + count += 1 + } catch { + // localStorage 不可用时跳过 + } + }) + }) + + return count + } +} + export const TBYC_CONFIG_SECTIONS: TbycConfigSection[] = [ fieldColumnsSection, tabOrderSection, displaySection, - shortcutsSection + experimentalSection, + printerSection, + shortcutsSection, + orderExportColumnsSection ] /** 按 key 取分区 */ diff --git a/src/layout/component/Navbar.vue b/src/layout/component/Navbar.vue index 1ff92436..5d8488a8 100644 --- a/src/layout/component/Navbar.vue +++ b/src/layout/component/Navbar.vue @@ -70,6 +70,10 @@ {{ tMenu('Profile') }} + + + 设置 + {{ $t('login.logOut') || 'Log Out' }} @@ -86,6 +90,9 @@
+ + + @@ -99,6 +106,7 @@ import { useFrontBrandStore, DEFAULT_BRAND_LOGO } from '@/stores/modules/frontBr import { useAiStore } from '@/stores/modules/ai' import { useRouter, useRoute } from 'vue-router' import Breadcrumb from '@/components/Breadcrumb/index.vue' +import SettingsDialog from '@/components/settings/SettingsDialog.vue' import LangSelect from '@/components/LangSelect/index.vue' import TopMenu from './TopMenu.vue' import dayjs from 'dayjs' @@ -115,6 +123,8 @@ const settingsStore = useSettingsStore() const aiStore = useAiStore() const router = useRouter() const route = useRoute() +/** 设置中心可见性(全局入口) */ +const settingsVisible = ref(false) const sidebar = computed(() => appStore.sidebar) const user = computed(() => userStore.user) diff --git a/src/stores/modules/tableColumnConfig.ts b/src/stores/modules/tableColumnConfig.ts new file mode 100644 index 00000000..6501ed19 --- /dev/null +++ b/src/stores/modules/tableColumnConfig.ts @@ -0,0 +1,20 @@ +import { defineStore } from 'pinia' + +/** + * 表格字段配置版本号(用于跨组件刷新) + * + * - 设置中心「所有表格字段」修改某张表的配置后调用 touch(tableId) + * - UpperTable 监听自己 tableId 的版本号变化,命中时重建列配置(rebuildColumnConfig) + * - 不落盘:纯粹是会话内的刷新信号 + */ +export const useTableColumnConfigStore = defineStore('tableColumnConfig', { + state: () => ({ + versions: {} as Record + }), + actions: { + touch(tableId: string) { + if (!tableId) return + this.versions[tableId] = (this.versions[tableId] || 0) + 1 + } + } +}) diff --git a/src/utils/table-column-config.ts b/src/utils/table-column-config.ts new file mode 100644 index 00000000..1d507c9f --- /dev/null +++ b/src/utils/table-column-config.ts @@ -0,0 +1,118 @@ +/** + * 表格字段配置(列配置)公共类型与存储工具 + * + * 存储:localStorage `upper_table_columns_{userId}_{roleId}_{tableId}` + * 结构:TableColumnProfile + * + * 说明: + * - 这类配置是「账号 + 角色 + 表」维度,由 UpperTable 在页面挂载时维护 + * - 本文件供「设置中心 → 表格 → 所有表格字段」跨页面管理使用 + */ + +export interface ColumnConfigItem { + prop: string + label?: string + visible: boolean + order: number + width?: number | string + fixed?: 'left' | 'right' | false +} + +export interface TableColumnProfile { + schemaVersion: number + tableId: string + userId: string + roleId: string | number + updatedAt: number + /** 表格名称(UpperTable 的 title prop,便于在管理面板中辨认) */ + title?: string + /** 首次生成配置时的默认布局(用于「恢复默认」) */ + defaultColumns?: ColumnConfigItem[] + columns: ColumnConfigItem[] +} + +const STORAGE_PREFIX = 'upper_table_columns_' + +/** 当前身份对应的配置 key 前缀 */ +export function getColumnConfigPrefix(userId: string, roleId: string | number): string { + return `${STORAGE_PREFIX}${userId}_${roleId}_` +} + +/** 读取某身份下的全部表格字段配置(按更新时间倒序) */ +export function readColumnProfiles(userId: string, roleId: string | number): TableColumnProfile[] { + const prefix = getColumnConfigPrefix(userId, roleId) + const profiles: TableColumnProfile[] = [] + Object.keys(localStorage).forEach((key) => { + if (!key.startsWith(prefix)) return + try { + const parsed = JSON.parse(localStorage.getItem(key) || 'null') as TableColumnProfile | null + if (!parsed?.tableId || !Array.isArray(parsed.columns)) return + profiles.push(parsed) + } catch { + // 忽略损坏的配置 + } + }) + return profiles.sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0)) +} + +/** 写入单张表的字段配置 */ +export function writeColumnProfile(profile: TableColumnProfile): void { + const prefix = getColumnConfigPrefix(profile.userId, profile.roleId) + try { + localStorage.setItem(`${prefix}${profile.tableId}`, JSON.stringify(profile)) + } catch { + // localStorage 不可用时静默失败 + } +} + +/** fixed 归一化:undefined / false 视为不固定 */ +function normalizedFixed(item: ColumnConfigItem): 'left' | 'right' | undefined { + return item.fixed === 'left' || item.fixed === 'right' ? item.fixed : undefined +} + +/** 按 fixed 拆成 左固定 / 不固定 / 右固定,各自按 order 排序 */ +export function partitionConfigColumns(columns: ColumnConfigItem[]) { + const left: ColumnConfigItem[] = [] + const mid: ColumnConfigItem[] = [] + const right: ColumnConfigItem[] = [] + columns.forEach((item) => { + const fixed = normalizedFixed(item) + if (fixed === 'left') left.push(item) + else if (fixed === 'right') right.push(item) + else mid.push(item) + }) + left.sort((a, b) => a.order - b.order) + mid.sort((a, b) => a.order - b.order) + right.sort((a, b) => a.order - b.order) + return { left, mid, right } +} + +/** 归一分组顺序:左固定 → 不固定 → 右固定,并重排 order 为连续整数 */ +export function normalizeConfigOrders(columns: ColumnConfigItem[]): ColumnConfigItem[] { + const { left, mid, right } = partitionConfigColumns(columns) + let order = 0 + return [...left, ...mid, ...right].map((item) => ({ ...item, order: order++ })) +} + +export function cloneColumns(columns: ColumnConfigItem[]): ColumnConfigItem[] { + return columns.map((item) => ({ ...item })) +} + +/** 当前配置是否与默认布局不一致(用于「已自定义」标记;无默认布局时视为未自定义) */ +export function isColumnCustomized(profile: TableColumnProfile): boolean { + const defaults = profile.defaultColumns + if (!Array.isArray(defaults) || !defaults.length) return false + + const current = normalizeConfigOrders(profile.columns) + const base = normalizeConfigOrders(cloneColumns(defaults)) + if (current.length !== base.length) return true + + return current.some((item, index) => { + const target = base[index]! + return ( + item.prop !== target.prop || + item.visible !== target.visible || + (normalizedFixed(item) || '') !== (normalizedFixed(target) || '') + ) + }) +} diff --git a/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue b/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue index da733d7b..05b3e210 100644 --- a/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue +++ b/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue @@ -160,7 +160,7 @@ watch( // 打开时优先读取持久化配置,否则默认全选 keyword.value = '' const saved = loadSavedColumns() - if (saved && saved.length) { + if (saved) { selected.value = saved } else { selected.value = columnGroups.value.flatMap((g) => g.fields) @@ -172,18 +172,18 @@ watch( { immediate: true } ) -/** 读取持久化的字段配置(过滤掉当前模式不存在的字段) */ -function loadSavedColumns(): string[] { - if (!props.storageKey) return [] +/** 读取持久化的字段配置(过滤掉当前模式不存在的字段);null = 未配置 */ +function loadSavedColumns(): string[] | null { + if (!props.storageKey) return null try { const raw = localStorage.getItem(props.storageKey) - if (!raw) return [] + if (raw === null) return null const parsed = JSON.parse(raw) - if (!Array.isArray(parsed)) return [] + if (!Array.isArray(parsed)) return null const valid = new Set(columnGroups.value.flatMap((g) => g.fields)) return parsed.filter((f: unknown): f is string => typeof f === 'string' && valid.has(f)) } catch { - return [] + return null } } diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 5487e43d..a4c531db 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1438,7 +1438,6 @@ export const receiverMobileScanField = scanBasicField({ label: '电话', value: export const receiverProvinceScanField = scanBasicField({ label: '省份', value: 'province', type: 'text' }) export const receiverCityScanField = scanBasicField({ label: '城市', value: 'city', type: 'text' }) export const receiverAreaScanField = scanBasicField({ label: '区县', value: 'area', type: 'text' }) -export const logisticsNameScanField = scanBasicField({ label: '物流公司', value: 'logistics_name', type: 'select', options: [] }) export const waybillCodesScanField = scanBasicField({ label: '快递单号', value: 'waybill_codes', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) export const expressCodeScanField = scanBasicField({ label: '快递单号', value: 'express_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) export const createAtRangeScanField = scanBasicField({ label: '创建时间', value: 'create_at', type: 'datetimerange' }) @@ -1598,7 +1597,6 @@ export const deliveryAvailableFields = [ { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...createChannelScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, @@ -1973,7 +1971,6 @@ export const pendingAvailableFields = [ { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...createChannelScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, @@ -2372,7 +2369,6 @@ export const expectionOrderAvailableFields = [ { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, { ...createChannelScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 78486b29..4a08ea92 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -521,15 +521,11 @@ async function loadOrderMetaOptions() { const expressRaw = expressData?.list || expressData || [] const platformRaw = platformData?.list || platformData || [] - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name']) fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = mapNameOptions(platformRaw, ['name', 'platform_name']) } catch { - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) logisticsField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) fillStoreScanFieldOptions(availableFieldsRef, []) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 2457475c..869a02f4 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -626,18 +626,6 @@ function mapCodeOptions(rawList: any[], codeKeys: string[], nameKeys: string[]) return result } -function mapNameOptions(rawList: any[], nameKeys: string[]) { - const result: Array<{ label: string; value: string }> = [] - const seen = new Set() - for (const item of rawList || []) { - const name = normalizeCode(nameKeys.map((k) => item?.[k]).find((v) => v !== undefined && v !== null && v !== '')) - if (!name || seen.has(name)) continue - result.push({ value: name, label: name }) - seen.add(name) - } - return result -} - function getSelectedIds(): number[] { const ids: number[] = [] for (const item of selectionRows.value) { @@ -791,16 +779,10 @@ async function loadOrderMetaOptions() { const platformRaw = platformData?.list || platformData || [] expressCodeOptions.value = mapCodeOptions(expressRaw, ['code', 'logistics_code', 'express_code'], ['name', 'logistics_name', 'express_name']) platformCodeOptions.value = mapCodeOptions(platformRaw, ['code', 'platform_code'], ['name', 'platform_name']) - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) { - logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name']) - } fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) } catch { expressCodeOptions.value = [] platformCodeOptions.value = [] - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) logisticsField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) } } diff --git a/src/views/order/orderManagement/outboundOrder.vue b/src/views/order/orderManagement/outboundOrder.vue index 4242fe68..cf00ae87 100644 --- a/src/views/order/orderManagement/outboundOrder.vue +++ b/src/views/order/orderManagement/outboundOrder.vue @@ -465,15 +465,11 @@ async function loadOrderMetaOptions() { const expressRaw = expressData?.list || expressData || [] const platformRaw = platformData?.list || platformData || [] - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name']) fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = mapNameOptions(platformRaw, ['name', 'platform_name']) } catch { - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) logisticsField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) fillStoreScanFieldOptions(availableFieldsRef, []) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 62cb809f..3dfc192c 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -1099,10 +1099,6 @@ async function loadOrderMetaOptions() { const platformRaw = platformData?.list || platformData || [] expressCodeOptions.value = mapCodeOptions(expressRaw, ['code', 'logistics_code', 'express_code'], ['name', 'logistics_name', 'express_name']) platformCodeOptions.value = mapCodeOptions(platformRaw, ['code', 'platform_code'], ['name', 'platform_name']) - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) { - logisticsField.options = mapNameOptions(expressRaw, ['name', 'logistics_name', 'express_name']) - } fillExpressCompanyScanFieldOptions(availableFieldsRef, expressRaw) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) { @@ -1111,8 +1107,6 @@ async function loadOrderMetaOptions() { } catch { expressCodeOptions.value = [] platformCodeOptions.value = [] - const logisticsField = availableFieldsRef.find((i: any) => i.value === 'logistics_name') - if (logisticsField) logisticsField.options = [] fillExpressCompanyScanFieldOptions(availableFieldsRef, []) const platformField = availableFieldsRef.find((i: any) => i.value === 'sys_platform_name') if (platformField) platformField.options = []