feat(tab-order): 统一标签排序与默认页签配置,构建按需引入 Element Plus/ECharts
- 新增 useTabOrder、tab-order 工具与 tab-order-registry 注册表,按模块集中登记 页面标签并懒加载默认标签;新增 TabOrderSettingsDialog、TabOrderDragList, 支持拖拽排序、设置默认页签与重置,SortSettingDialog / TabArea 迁移到同一套实现 - 用户偏好存储新增「用户级」globalMap(不随仓库隔离),tabOrder 写入用户级 scope, 旧 scope 一次性迁移并对齐回退读取;各页面 config 接入统一注册表, 移除页面内自写的排序与默认页签逻辑 - 新增 tbyc-config 统一配置文件与分区注册表,UpperTable 的配置导出/导入 升级为 tbyc-config.json(字段列、标签排序、界面显示、快捷键), 兼容旧版「全局字段配置」与 tabOrders 文件 - Element Plus 改为 unplugin-vue-components 按需自动引入,移除 app.use(ElementPlus)、dts 生成与强制 vendor-element-plus 分包 - ECharts 改为按需注册(折线/饼图 + 所需组件),dashboard 图表统一走 @/utils/echarts;移除 three.js 及 overlookControls / threeScene / threeUtils, 同步清理依赖、manualChunks 与 optimizeDeps - vue-devtools 支持 VITE_VUE_DEVTOOLS=off 关闭;抽离 wavePrintPayload 供订单、 复核页面复用,scanFields 承接批量搜索操作符与「包含商品」筛选项 - 补充标签排序与默认页签统一方案、tbyc-config 说明文档, 更新标签页性能测量结论与用户偏好保存方案
This commit is contained in:
parent
3b09d45f08
commit
f41b37aa54
183
docs/标签排序与默认页签-统一方案.md
Normal file
183
docs/标签排序与默认页签-统一方案.md
Normal file
@ -0,0 +1,183 @@
|
||||
# 标签排序与默认页签:统一方案(已落地)
|
||||
|
||||
- 日期:2026-11-07
|
||||
- 状态:**已实现**(P0–P4 全部完成)
|
||||
- 目标:把原先散落在页面里的 4 份标签排序逻辑收敛为「1 注册表 + 1 组合式 + 1 渲染组件」,并新增「默认页签」与「全项目统一管理面板」
|
||||
- 取代文档:`docs/用户偏好配置-浏览器本地保存方案.md` 中关于「标签排序」的章节(该文档的存储/接口设计已不再适用)
|
||||
|
||||
---
|
||||
|
||||
## 1. 整体结构
|
||||
|
||||
```
|
||||
src/config/tab-order-registry.ts 唯一注册表(页面 key / 标题 / 分组 / 默认标签 / 旧 scope)
|
||||
src/utils/tab-order.ts 配置文档读写与归一化(纯函数 + store 适配)
|
||||
src/composables/useTabOrder.ts 唯一读取/排序/默认页签/保存逻辑
|
||||
src/components/TabArea/index.vue 唯一标签渲染组件(含排序入口 + 插槽)
|
||||
src/components/SortSettingDialog.vue 单页排序弹窗(TabArea 内置入口调用)
|
||||
src/components/TabOrderDragList.vue 拖拽列表(单页弹窗与全局面板共用)
|
||||
src/components/TabOrderSettingsDialog.vue 全项目标签排序面板(字段设置入口)
|
||||
src/components/UpperTable/index.vue 字段设置工具栏入口 + 全局配置导出/导入 + 故障修复
|
||||
```
|
||||
|
||||
```mermaid
|
||||
flowchart LR
|
||||
R[tab-order-registry] --> H[useTabOrder]
|
||||
S[(userPreference 用户级 scope tabOrder)] --> H
|
||||
H --> T[TabArea]
|
||||
H --> P[页面 activeTab / 单页模式默认标签]
|
||||
T --> D1[SortSettingDialog]
|
||||
D1 --> H
|
||||
F[TabOrderSettingsDialog] --> S
|
||||
U[UpperTable 字段设置] --> F
|
||||
S --> G[全局配置 导出/导入]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 2. 配置存储
|
||||
|
||||
**位置**:`userPreference` 的「用户级」scope(key = `user_prefs_{userId}`,**不分仓库**)。
|
||||
|
||||
```jsonc
|
||||
{
|
||||
"tabOrder": {
|
||||
"value": {
|
||||
"version": 1,
|
||||
"orders": {
|
||||
"order.management": ["pendingOrder", "reviewOrder", "..."]
|
||||
},
|
||||
"defaults": {
|
||||
"order.management": "pendingOrder"
|
||||
}
|
||||
},
|
||||
"updated_at": 1762500000000
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- `orders[pageKey]`:标签 name 顺序;**不存在该键 = 使用默认顺序**
|
||||
- `defaults[pageKey]`:默认打开的标签;不存在 = 用页面兜底默认
|
||||
- 一个 scope 存全项目,导出/导入/清理都只处理这一处
|
||||
|
||||
### store 变更(`stores/modules/userPreference.ts`)
|
||||
|
||||
| 新增/调整 | 说明 |
|
||||
|---|---|
|
||||
| `globalMap` | 用户级层(读 `user_prefs_{userId}`),与仓库级 `map` 分离 |
|
||||
| `getGlobal / setGlobal / resetGlobal` | 用户级 scope 读写;`getGlobal` 会回退 `map`(兼容历史上写进仓库 key 的数据) |
|
||||
| `load()` 迁移调整 | 旧 key → 仓库 key 的迁移**排除** `USER_GLOBAL_SCOPES`(当前为 `tabOrder`),避免产生陈旧副本 |
|
||||
| `persist / persistGlobal` | 无仓库上下文(两个 key 相同)时合并写入,避免互相覆盖 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 读取与优先级
|
||||
|
||||
### 顺序配置
|
||||
|
||||
1. `tabOrder.orders[pageKey]`
|
||||
2. 旧 scope(`legacyScopes`,命中后**一次性迁移**进新文档,旧 key 保留)
|
||||
3. 页面传入的默认顺序
|
||||
|
||||
### 初始激活标签
|
||||
|
||||
```
|
||||
URL ?tab=(合法) > 用户默认(defaults) > 页面兜底默认 > 排序后第一项
|
||||
```
|
||||
|
||||
- **排序不影响默认**:显式设置过默认就一直用它
|
||||
- 默认标签失效(权限/页面改版)时静默回退,不报错
|
||||
- 单页模式(`ORDER_PAGE_CONFIG.singlePage` / `WAVE_PAGE_CONFIG.singlePage`)同样使用该默认
|
||||
|
||||
---
|
||||
|
||||
## 4. 注册表
|
||||
|
||||
`src/config/tab-order-registry.ts`:新增页面只需加一条。
|
||||
|
||||
| 字段 | 作用 |
|
||||
|---|---|
|
||||
| `key` | 稳定主键,同时是配置键 |
|
||||
| `title` / `group` | 全局面板展示与分组 |
|
||||
| `loadTabs` | 懒加载默认标签(动态 `import()`,不进入主包) |
|
||||
| `legacyScopes` | 旧配置 key(兼容读取) |
|
||||
| `matchPaths` | 全局面板高亮当前页的兜底匹配 |
|
||||
| `enabled` | `false` 时面板内只展示、不可编辑 |
|
||||
|
||||
已注册:订单管理、波次管理、缺货补货、商品管理、库存盘点、通用报表、售后类型、运单管理、退回记录(未接入)、订单汇总、页面模板示例、基础设置、编码管理、工作台管理、打印电脑管理、摄像头管理、录像机管理。
|
||||
|
||||
### pageKey 与旧 scope 对照
|
||||
|
||||
| pageKey | 旧 scope |
|
||||
|---|---|
|
||||
| `order.management` | `order.tabs.order` |
|
||||
| `order.wave` | `order.wave.tabs.order` |
|
||||
| `stock.management` | `stock.tabs.order` |
|
||||
| `setting.basicManagement` | `setting.basicManagement.tabs.order` |
|
||||
| 其余 TabArea 页面 | `tab-order:{当时的路由 path}`(动态兼容) |
|
||||
|
||||
---
|
||||
|
||||
## 5. 页面接入方式
|
||||
|
||||
```ts
|
||||
const { orderedTabs, defaultTabName, resolveInitialTab, saveOrder, setDefault, reset } =
|
||||
useTabOrder('order.management', () => tabs.value, { legacyScopes: ['order.tabs.order'] })
|
||||
```
|
||||
|
||||
- `TabArea` 只需传 `page-key`(排序/入口/弹窗全部内置)
|
||||
- 页面自己维护 `activeTab`,初始值用 `resolveInitialTab(route.query.tab)`
|
||||
- 单页模式默认组件用 `defaultTabName` 对应的标签
|
||||
|
||||
已收敛页面:订单管理、波次管理、商品管理、基础设置(newview)、编码管理,以及全部 TabArea 页面(显式 `page-key`)。
|
||||
|
||||
---
|
||||
|
||||
## 6. 全局面板(字段设置 → 标签排序)
|
||||
|
||||
- 入口:`UpperTable` 字段设置工具栏「标签排序」(所有页面显示)
|
||||
- 左侧:注册表中**标签数 ≥ 2** 的页面(打开时并行懒加载标签数量,加载完成前显示「加载中…」,避免单标签页面闪入闪出);按分组 + 搜索 + 已自定义标记,当前页面用蓝点标记
|
||||
- 右侧:拖拽排序 + 圆点设为默认;标题栏常驻显示「默认:XXX」(**用户未设置时也展示页面兜底默认**,便于确认当前生效值);默认行带「默认」标签
|
||||
- 保存:一次写入 `tabOrder` 文档;`useTabOrder` 为响应式读取,**保存后页面立即生效**
|
||||
- 「全部恢复默认」= 清空整个 `tabOrder` 文档(保存时生效)
|
||||
- 未显式设置默认时不写入 `defaults`,继续跟随页面兜底默认(如订单管理 = 待处理订单)
|
||||
|
||||
### 页面兜底默认
|
||||
|
||||
注册表 `defaultTabName` 声明,缺省用默认顺序的第一个标签:
|
||||
|
||||
| 页面 | 兜底默认 |
|
||||
|---|---|
|
||||
| 订单管理 | `pendingOrder`(待处理订单) |
|
||||
| 商品管理 | `stockDetail`(另有 combo 路径推断,优先于用户默认) |
|
||||
| 其他 | 默认顺序第一个 |
|
||||
|
||||
---
|
||||
|
||||
## 7. 统一配置文件与故障修复
|
||||
|
||||
- 配置文件已升级为 **`tbyc-config.json`**(分区结构,见 `docs/统一配置文件-tbyc-config.md`)
|
||||
- 分区:`fieldColumns`(字段设置)、`tabOrder`(标签排序/默认页签)、`display`(界面显示)、`shortcuts`(快捷键)
|
||||
- 导入策略:**覆盖同名项、保留文件中未涉及的配置**;兼容旧版字段配置导出文件
|
||||
- 「故障修复」:清除字段配置、显示设置、快捷键,**以及标签排序/默认页签**
|
||||
|
||||
---
|
||||
|
||||
## 8. 未纳入改造
|
||||
|
||||
| 页面 | 原因 |
|
||||
|---|---|
|
||||
| `data/returnrecord`(退回记录,6 个标签) | 存在「未保存离开」拦截(`before-leave`),切换需确认,暂不改为 TabArea;注册表中标记 `enabled: false` |
|
||||
| 各页面内「明细面板」二级标签 | 属于记录明细,不是页面级标签 |
|
||||
|
||||
---
|
||||
|
||||
## 9. 验证清单
|
||||
|
||||
1. 老用户(已有 `order.tabs.order` 等配置)进入订单管理/波次/商品/基础设置:顺序保持,且配置被迁移进 `tabOrder`
|
||||
2. 字段设置 → 标签排序:只列出**可排序(标签 ≥ 2)**的页面;标题栏显示当前默认标签;修改顺序/默认后保存,当前页面**无需刷新**即生效
|
||||
3. 单页模式(`ORDER_PAGE_CONFIG.singlePage = true`)渲染的是用户设置的默认标签;未设置时渲染 `pendingOrder`
|
||||
4. 排序后刷新页面:默认标签不变(排序不影响默认)
|
||||
5. 导出全局配置 → 清空标签排序 → 导入:顺序与默认恢复
|
||||
6. 故障修复:标签排序一并清除
|
||||
7. 视觉回归:订单/波次/商品/基础设置/编码的标签栏与改造前一致(34px 标签、激活态圆点、右侧角标/chip 位置)
|
||||
@ -396,7 +396,7 @@ async function measureTab(name) {
|
||||
|
||||
| # | 项 | 规模 | 说明 |
|
||||
|---|---|---|---|
|
||||
| A | `wave-config.ts` 被订单页静态引入 | **211 KB** | 仅因 3 个打印工具 import 了其中的 `unwrapWavePlatformPrintPayload`;把该函数(含 3 个内部 helper + `WavePlatformPrintDataPayload` 类型)抽到 `views/order/shared/wavePrintPayload.ts` 并从 wave-config 转发即可 |
|
||||
| A | ~~`wave-config.ts` 被订单页静态引入~~ | ~~211 KB~~ | ✅ **已完成**,见 §11 |
|
||||
| B | `order-common-config.ts` | **351 KB** | 订单业务字典(工具栏按钮/筛选字段/导出列);split 属于 P6「业务配置归位」,改动面大 |
|
||||
| C | `ScanBox` / `UpperTable` | 335 / 272 KB | 首屏必需组件,只能靠内部拆分或虚拟化 |
|
||||
| D | 生产构建实测 | — | 建议 `npm run build` + `vite preview` 测一次,排除 dev 工具干扰 |
|
||||
@ -406,3 +406,286 @@ async function measureTab(name) {
|
||||
- 首屏正常渲染 20 行,工具栏 28 个按钮齐备,无 Vue 报错
|
||||
- 首次切到未访问过的 tab:dev 下约 1.2s 完成(含 chunk 加载 + 挂载),之后走缓存
|
||||
- `npm run build` 通过
|
||||
|
||||
---
|
||||
|
||||
## 11. 第三轮:`wave-config` 首屏依赖切断
|
||||
|
||||
### 11.1 根因
|
||||
|
||||
`orderManagement` 首屏加载了 211KB 的 `views/order/waveOrder/config/wave-config.ts`,原因只有一条运行期依赖边:
|
||||
|
||||
```
|
||||
pendingOrder.vue
|
||||
├─ utils/use-order-batch-print.ts ─┐
|
||||
├─ utils/use-sub-waybill-print.ts ─┤ import { unwrapWavePlatformPrintPayload }
|
||||
├─ utils/use-delivery-sub-waybill-print.ts┤ ↓
|
||||
└─ exceptionOrder.vue ─┘ wave-config.ts(整套波次业务配置)
|
||||
```
|
||||
|
||||
`unwrapWavePlatformPrintPayload` 是个**纯函数**(约 120 行,无外部依赖),却和「工具栏按钮 / 状态字典 / 筛选项 / 策略参数」等 200KB 配置放在同一个文件里。
|
||||
|
||||
### 11.2 改动
|
||||
|
||||
| 文件 | 动作 |
|
||||
|---|---|
|
||||
| `views/order/shared/wavePrintPayload.ts` | **新增**,容纳 `unwrapWavePlatformPrintPayload` 及其 3 个内部 helper |
|
||||
| `views/order/waveOrder/config/wave-config.ts` | 删除实现,改为 `export { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'`(兼容历史引用);顺带移除已无用的 `WavePlatformPrintDataPayload` 类型导入 |
|
||||
| `orderManagement/utils/use-order-batch-print.ts` 等 3 个打印工具 + `exceptionOrder.vue` | import 改指向新模块 |
|
||||
| `orderreview/index.vue` | 同上(复核页也不再为这一个函数拖入整套波次配置) |
|
||||
|
||||
类型 `WavePlatformPrintDataPayload` 本来就定义在 `@/api/order.print/orderprint`,无需搬移。
|
||||
|
||||
### 11.3 验证
|
||||
|
||||
静态依赖图遍历(只跟随静态 `import` / `export from`,动态 `import()` 属懒加载不计):
|
||||
|
||||
| 入口 | 结果 |
|
||||
|---|---|
|
||||
| `src/views/order/orderManagement/pendingOrder.vue` | 82 个运行期模块,**不含** `wave-config` ✅ |
|
||||
| `src/views/order/orderManagement/index.vue` | 89 个运行期模块,**不含** `wave-config` ✅ |
|
||||
| `src/main.ts` | 55 个运行期模块,**不含** `wave-config` ✅ |
|
||||
|
||||
`npm run build` 通过(1m19s)。`waveOrder` 路由本身仍懒加载 `wave-config`,符合预期(只有进波次页才需要)。
|
||||
|
||||
> 顺带确认:`router/map.ts` 中所有页面组件都是 `() => import(...)`,路由级懒加载本来就是正确的,之前 `/order/orderManagement` 的 `No match found` 警告与性能无关。
|
||||
|
||||
---
|
||||
|
||||
## 12. 全站加载优化第一轮(P1 + P5,2026-11-07)
|
||||
|
||||
### 12.1 背景:全站摸底结论
|
||||
|
||||
- 生产产物最大 chunk:`vendor-echarts` 1093KB、`vendor-element-plus.js` 791KB + `vendor-element-plus.css` 348KB、`vendor-xlsx` 419KB、`vendor-china-division` 134KB
|
||||
- 源码静态闭包最重的页面:`order/waveOrder` 1555KB/107 模块、`storage/receiving` 1204KB/95、`basicManagement/newview` 1058KB/83、`stock/stockManagement` 1053KB/100
|
||||
- `order-common-config.ts`(源码 119KB,生产独立 chunk **54KB**)被 91 个文件引用,是覆盖面最广的一笔重复账
|
||||
|
||||
### 12.2 P1:切断页面 → `order-common-config` 的运行期依赖
|
||||
|
||||
**问题**:storage / store / stock / inbox / express 等页面只是想用一个 `getStatusTextClass()`,却整包引入了订单业务字典(工具栏配置、筛选字段、导出列定义…)。
|
||||
|
||||
**改动**:
|
||||
|
||||
| 动作 | 影响文件 |
|
||||
|---|---|
|
||||
| 把 `getStatusTextClass`、`SCAN_BASIC_INFO_GROUP/scanBasicField/scanWorkflowField`、`ORDER_BULK_SEARCH_OPERATORS`、`stockQueryScanField`、`extractStoreListFromResponse` 等选项映射的 import 改指向 `@/utils/statusText`、`@/utils/scanFields`、`@/utils/storeScanOptions` | 66 个 |
|
||||
| 把 `ToolbarButtonConfig` / `ToolbarApiActionConfig` 的**纯类型** import 指向 `@/components/ToolbarButtonGroup/types`(类型真实所在) | 66 个 |
|
||||
| `ORDER_BULK_SEARCH_OPERATORS` / `stockQueryScanField` 定义迁到 `@/utils/scanFields.ts`,`order-common-config` 转发 | 2 个 |
|
||||
|
||||
**结果**:引用 `order-common-config` 的源文件 **91 → 4**(只剩真正需要业务字典的:`orderreview/recheck-config.ts`、`order/shared/toolbarActions.ts`、`waveOrder/component/PendingOrderListPanel.vue`、`waveOrder/config/wave-config.ts`);生产产物中引用该 chunk 的文件 31 个(含订单页自身)。
|
||||
|
||||
代表性页面源码闭包变化:
|
||||
|
||||
| 页面 | 之前 | 之后 |
|
||||
|---|---|---|
|
||||
| `storage/receiving` | 1204KB / 95 模块 | **1083KB / 93** |
|
||||
| `store/stores` | 861KB / 75 | **739KB / 72** |
|
||||
| `storage/stockout` | 854KB / 74 | **731KB / 71** |
|
||||
| `stock/stockManagement` | 1053KB / 100 | **935KB / 99** |
|
||||
| `warehouses` | 752KB / 71 | **630KB / 68** |
|
||||
|
||||
### 12.3 P5:清理
|
||||
|
||||
| 项 | 动作 |
|
||||
|---|---|
|
||||
| `three` | 全项目无人引用(`threeScene.js`/`threeUtils.js`/`overlookControls.js` 只互相引用)。删除 3 个死文件 + `npm uninstall three @types/three`,移除 `vite.config` 里已无用的 `vendor-three` 分包规则 |
|
||||
| `vue-devtools` | 加环境开关:`VITE_VUE_DEVTOOLS=off` 启动即可关闭(dev 下该插件会注入约 3MB 模块,影响性能基线;生产本来就不包含) |
|
||||
|
||||
`npm run build` 通过(1m25s),产物中已无 `vendor-three`。
|
||||
|
||||
### 12.4 下一轮(P0)待评估项
|
||||
|
||||
Element Plus 全量注册 → 按需引入(见 §13 执行记录)。
|
||||
|
||||
---
|
||||
|
||||
## 13. P0:Element Plus 按需引入 + 分包策略修正(2026-11-07)
|
||||
|
||||
### 13.1 改了什么
|
||||
|
||||
| # | 改动 | 文件 |
|
||||
|---|---|---|
|
||||
| 13.1 | 接入 `unplugin-vue-components` + `ElementPlusResolver`,模板里的 `<el-xxx>` 与 `v-loading` 等指令自动按需 import | `vite.config.ts` |
|
||||
| 13.2 | 移除 `main.ts` 的 `import ElementPlus from 'element-plus'` + `app.use(ElementPlus)` 全量注册(**这是 791KB 的根源**) | `src/main.ts` |
|
||||
| 13.3 | 移除 `manualChunks` 里的 `element-plus → vendor-element-plus` 规则:按需引入后若仍强制合并成一个 chunk,等于没做 | `vite.config.ts` |
|
||||
| 13.4 | 移除 `manualChunks` 的 `return 'vendor'` catch-all:它把「只有某个懒加载页才用到」的库也塞进首屏 | `vite.config.ts` |
|
||||
|
||||
> 样式仍走 `element-plus/dist/index.css` 全量引入(`importStyle: false`),**没有做 CSS 按需** —— 全量 CSS 348KB(gzip 约 50KB),而代码里有一百多处显式 `import { ElMessage } from 'element-plus'`,切到按需样式需要额外补 message / message-box / notification / loading 的样式入口,回归面大、收益小,暂不处理。
|
||||
|
||||
### 13.2 效果(生产产物,首屏沿静态 import 递归统计)
|
||||
|
||||
| 阶段 | 首屏必载 JS | 说明 |
|
||||
|---|---|---|
|
||||
| 全量注册(改前基线) | **1608 KB** | `element-plus` 独立 chunk 791KB + vendor 389 + index 223 + vendor-vue 206 |
|
||||
| 仅按需引入(保留 EP 独立分包) | 1373 KB | EP chunk 791→556 |
|
||||
| 再去掉 EP 独立分包 | 1375 KB | EP 并进 `vendor`,收益被 catch-all 抵消 |
|
||||
| **再去掉 vendor catch-all** | **768 KB** | index 449 + vendor-vue 319 |
|
||||
|
||||
**首屏 JS 从 1608KB 降到 768KB(−840KB,−52%)**;产物总量 6635KB → 6748KB(+113KB,+1.7% 的重复代码),用极小的总体积代价换首屏减半。
|
||||
|
||||
**权衡**:第三方依赖不再集中在一个哈希稳定的 `vendor` chunk,改应用代码会连带改变含第三方代码的 chunk 哈希,发版后重复下载会略增;强烈重缓存场景可以反过来保留 catch-all,但那会让首屏回到 1.3MB 以上。
|
||||
|
||||
### 13.3 两个必须知道的点
|
||||
|
||||
1. **`dts: false`**:开启组件类型声明会给 `<el-*>` 带上严格 props 类型,实测会暴露 **113 处**历史宽松写法(如 `:type="某字符串变量"`、`el-button` 上用已废弃的 `type="link"`)。这些是既有问题、与本次优化无关,因此先关闭类型生成(等于回到改动前的宽松状态,运行期按需引入不受影响)。后续清理完这 113 处可再打开。
|
||||
2. **`type="link"` 在 Element Plus 2.13 已不合法**(应改用 `link` 属性),登录页等位置控制台一直有该 prop 校验告警,属于同一批历史遗留。
|
||||
|
||||
### 13.4 验证
|
||||
|
||||
| 项 | 结果 |
|
||||
|---|---|
|
||||
| `npm run build` | 通过(1m48s) |
|
||||
| 页面渲染抽查 | `/order/orderManagement`(20 行/40 按钮/40 选择器/7 个弹窗)、`/order/waveOrder`(18 个弹窗)、`/storage/stockout`、`/storage/receiving`、`/warehouse/warehouse` 均正常 |
|
||||
| 组件解析 | 全程无 `Failed to resolve component` 告警 |
|
||||
| `v-loading` 指令 | 各页 `.el-loading-mask` 正常存在 |
|
||||
| 控制台 | 仅剩既有噪声(本地未启动的打印/摄像头 WebSocket、`data/reviewingflow/index` 缺失) |
|
||||
|
||||
### 13.5 仍可继续的项
|
||||
|
||||
- CSS 按需(需补 message/message-box/notification/loading 样式入口 + 全站视觉回归)
|
||||
- ~~dashboard 的 echarts 按需~~ → 见 §14
|
||||
- 剩余 5 处 xlsx 静态 import(`vendor-xlsx` 419KB)
|
||||
|
||||
---
|
||||
|
||||
## 14. dashboard:ECharts 按需引入(2026-11-07)
|
||||
|
||||
### 14.1 问题
|
||||
|
||||
`OrderTrend.vue` / `PlatformDistribution.vue` / `ExpressRatio.vue` 三个组件都是 `import * as echarts from 'echarts'`,产物里 `vendor-echarts` 达 **1094KB**。虽然三个组件是 `defineAsyncComponent`,但 dashboard 一挂载就全部渲染,等于首屏整包拉取。
|
||||
|
||||
实际只用到了:折线图、饼图、grid、tooltip(含 axisPointer cross)、legend。
|
||||
|
||||
### 14.2 改动
|
||||
|
||||
| 文件 | 动作 |
|
||||
|---|---|
|
||||
| `src/utils/echarts.ts` | **新增**:`echarts/core` + `LineChart/PieChart` + `Grid/Tooltip/Legend/AxisPointer` + `LabelLayout` + `CanvasRenderer`,统一 `echarts.use([...])`,并导出 `echarts` 与 `ECharts` 类型 |
|
||||
| 上述 3 个组件 | `import * as echarts from 'echarts'` → `import { echarts, type ECharts } from '@/utils/echarts'`;`echarts.ECharts` → `ECharts` |
|
||||
| `vite.config.ts` | `optimizeDeps.include` 预构建 echarts 5 个子路径,避免首次访问 dashboard 触发「504 Outdated Optimize Dep」整页刷新 |
|
||||
|
||||
> 以后新增图表类型(如柱状图、dataZoom)只需在 `src/utils/echarts.ts` 的 `use([...])` 里补一行。
|
||||
|
||||
### 14.3 效果
|
||||
|
||||
| 指标 | 之前 | 之后 |
|
||||
|---|---|---|
|
||||
| `vendor-echarts` chunk | **1094 KB** | **522 KB**(−52%) |
|
||||
| dashboard 图表渲染 | 3 个 canvas | 3 个 canvas,均有实际绘制内容(非空白像素占比 3.7% / 5.7% / 8.7%) |
|
||||
| 控制台 | — | 无 echarts 相关报错 |
|
||||
|
||||
### 14.4 验证
|
||||
|
||||
- `npm run build` 通过(1m28s)
|
||||
- `/dashboard` 加载后 3 个图表实例全部 `[_echarts_instance_]` 就位、canvas 有绘制内容
|
||||
- 折线图 tooltip 的 axisPointer 已注册,无需额外依赖
|
||||
|
||||
---
|
||||
|
||||
## 15. 剩余 xlsx 静态引入全部改为按需(2026-11-07)
|
||||
|
||||
### 15.1 问题
|
||||
|
||||
`vendor-xlsx` 是 **419KB** 的独立 chunk。虽然订单导出处早已改动态加载,但仍有 8 个文件是 `import * as XLSX from 'xlsx'`,把它们所在的页面/chunk 一起拖上这 419KB:
|
||||
|
||||
| 文件 | 所在页面 |
|
||||
|---|---|
|
||||
| `storage/receiving/component/Product.vue` | 收货单(130KB 大组件) |
|
||||
| `storage/stockout/index.vue` | 出库单 |
|
||||
| `storage/validityperiod/index.vue` | 有效期商品 |
|
||||
| `storage/entry/utils/direct-inbound-xlsx-import.ts` | 收货入库 |
|
||||
| `stock/stock/component/ImportDialog.vue` | 库存管理 |
|
||||
| `warehouse/components/RackBulkModifyDialog.vue` | 库位管理 |
|
||||
| `material/packageMaterial/component/BatchImportDialog.vue` | 包材管理 |
|
||||
| `order/shared/createOrderSession/CreatePendingOrderDialog.vue` | 建单弹窗 |
|
||||
|
||||
### 15.2 改动
|
||||
|
||||
- 删除全部 `import * as XLSX from 'xlsx'`,改为在**用到的那几个函数里** `const XLSX = await import('xlsx')`
|
||||
- 相应把「下载导入模板」这类原本同步的函数改成 `async`(Vue 模板里 `@click` 直接绑函数,忽略返回的 Promise,行为不变)
|
||||
- `downloadDirectInboundImportTemplate` 导出函数签名改为 `async`,唯一调用方 `DirectInboundImportDialog.vue` 无需改动
|
||||
|
||||
### 15.3 效果与验证
|
||||
|
||||
| 项 | 结果 |
|
||||
|---|---|
|
||||
| 源码中 `from 'xlsx'` 静态引用 | **0** |
|
||||
| 产物中 `vendor-xlsx` chunk 的**静态** import 引用数 | **0** |
|
||||
| 产物中 `vendor-xlsx` chunk 的**动态** import 引用数 | 9(都是点击导入/导出时才触发) |
|
||||
| `npm run build` | 通过(1m20s) |
|
||||
|
||||
> 行为差异:导入/导出首次点击时会多一次 chunk 下载(419KB,内网可忽略),之后浏览器缓存复用。
|
||||
|
||||
---
|
||||
|
||||
## 16. waveOrder:省市区字典与修改地址弹窗改为按需(2026-11-07)
|
||||
|
||||
### 16.1 摸底结论(先测再改)
|
||||
|
||||
| 检查项 | 结果 |
|
||||
|---|---|
|
||||
| `order/waveOrder` 首屏脚本数 | 190 个 / 解码 11846KB(dev) |
|
||||
| 切页签过渡时长 | **已经是 0.12s**(与 orderManagement 一致),无需再调 |
|
||||
| `<component :key="activeTab">` | 与 orderManagement 不同,但 5 个页签是**不同组件类型**,keep-alive 本就按类型缓存,去掉 key 无实际收益 → 保留 |
|
||||
| 默认页签 chunk 是否静态引用 `china-division` | **是** → 打开波次页就下载 134KB 省市区字典 |
|
||||
|
||||
真正的问题只有一个:**省市区字典(134KB JSON)在模块顶层被静态引入并立即解析**,而它只服务于「抓取团购单 / 波次策略」弹窗里的省份选择。
|
||||
|
||||
### 16.2 改动
|
||||
|
||||
| 文件 | 动作 |
|
||||
|---|---|
|
||||
| `waveOrder/GroupWaveBatchListPanel.vue` | 删除 `import pcasCodeData from 'china-division/dist/pca-code.json'`,改为 `ensureProvinceOptionsFromDict()`:首次需要时才 `import(...)`,加载完成后自动重算一次省份选项 |
|
||||
| `waveOrder/WaveStrategyListPanel.vue` | 同上 |
|
||||
| `orderManagement/exceptionOrder.vue` | 「修改地址」弹窗改 `defineAsyncComponent` + 模板加 `v-if="updateAddressDialogVisible"`(该弹窗会连带拉入省市区字典 + 整套快递接口配置) |
|
||||
|
||||
> `refreshWaveStrategyProvinceOptions()` 仍保持同步语义:先用手上已有的省份(字典未就绪时来自表单/列表数据)构建一次,字典加载完再补全,调用点无需改成 `await`。
|
||||
|
||||
### 16.3 效果与验证
|
||||
|
||||
| 项 | 结果 |
|
||||
|---|---|
|
||||
| 波次页打开时是否请求 `pca-code.json` | **否**(改前:是) |
|
||||
| 产物中 `vendor-china-division` 静态引用者 | 仅剩 `express-interface-config-*.js`(快递接口页自身确实需要) |
|
||||
| 产物中 `vendor-china-division` 动态引用 | 2 处(两个波次面板) |
|
||||
| `/order/waveOrder` 渲染 | 20 行、85 个按钮正常 |
|
||||
| `npm run build` | 通过(1m52s) |
|
||||
|
||||
### 16.4 未采纳
|
||||
|
||||
- 把 `GroupWaveBatchListPanel`(172KB 源 / 83KB chunk)改成 async:它是**默认页签**,进页面就要渲染,异步化只会多一次往返,没有收益。
|
||||
- 去掉 `:key="activeTab"`:页签均为不同组件类型,keep-alive 按类型缓存,去掉无收益(避免无谓改动)。
|
||||
|
||||
---
|
||||
|
||||
## 17. 大组件按页签/弹窗按需(2026-11-07)
|
||||
|
||||
### 17.1 改动
|
||||
|
||||
| 页面 | 改动 | 省掉的静态体积 |
|
||||
|---|---|---|
|
||||
| `storage/receiving/index.vue` | 详情页签 `Storage` / `Logs` / `Product` 改 `defineAsyncComponent`(默认「收货明细」保持同步);`batch-receiving-print-dialog` 加 `v-if="printDialogVisible"` | `Product.vue` 130KB + `BatchReceivingPrintDialog` 46KB(含 jsbarcode/qrcode) |
|
||||
| `basicManagement/newview/config/template-config.ts` | `MiniProgramConfigForm` / `FrontConfigForm` / `WarehouseSettingsForm` 改 `defineAsyncComponent`(都在 `COMPONENT_REGISTRY` 里,只被 `<component :is>` 使用) | 140 + 51 + 36 = **227KB** |
|
||||
| `stock/stock/index.vue` | 详情页签 `erpStock` / `storage` / `barcode` / `log` 改 `defineAsyncComponent`(默认「信息」保持同步) | 数十 KB |
|
||||
|
||||
### 17.2 验证
|
||||
|
||||
| 项 | 结果 |
|
||||
|---|---|
|
||||
| `/storage/receiving` | 20 行正常;选中行后切「商品明细」才请求 `Product.vue`,明细表格正常渲染 |
|
||||
| `/setting/basicManagement` | 7 个页签正常;切「微信小程序」才请求 `MiniProgramConfigForm.vue`,内容正常渲染 |
|
||||
| `/stock/stock` | 页面正常(该环境无库存数据,未做页签切换验证;改动与上面同一模式) |
|
||||
| 控制台 | 无 `Failed to resolve component` / 组件解析错误 |
|
||||
| `npm run build` | 通过(1m42s) |
|
||||
|
||||
---
|
||||
|
||||
## 18. 到此为止:评估后**不做**的项
|
||||
|
||||
| 项 | 评估结论 |
|
||||
|---|---|
|
||||
| Element Plus CSS 按需 | 全量 CSS 348KB ≈ **gzip 50KB**;代码里一百多处显式 `import { ElMessage } from 'element-plus'`,切按需必须额外补 message / message-box / notification / loading 的样式入口,且需要全站视觉回归。**收益小、风险大,不做** |
|
||||
| `order-common-config` 进一步拆分为业务配置模块(P6) | 属于结构调整(要动导出列/工具栏/筛选项的归属),影响面覆盖订单全部页签,与性能收益不成比例。**留作独立重构任务** |
|
||||
| `print.ts`(91KB)拆分 | 里面是打印数据转换 + 模板配置的混合,拆开能省的量有限,且改动会影响波次打印主流程。**暂不做** |
|
||||
| 去掉 `<component :key="activeTab">` | 页签类型各不相同,keep-alive 按类型缓存,去掉无收益 |
|
||||
| `GroupWaveBatchListPanel` 改 async | 默认页签,进页面就要渲染,异步化只多一次往返 |
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
# 用户偏好配置:每账号每页面自定义配置(浏览器本地保存方案)
|
||||
|
||||
> ⚠️ **本文档关于「标签排序」的章节已过期(2026-11-07)**:
|
||||
> 标签排序与默认页签已统一为注册表 + `useTabOrder` + `TabArea`,配置写入 `userPreference` 用户级 scope `tabOrder`,
|
||||
> 并可在「字段设置 → 标签排序」中统一管理。请以 **`docs/标签排序与默认页签-统一方案.md`** 为准。
|
||||
|
||||
- 状态:**已决策(正式方案)**
|
||||
- 日期:2026-09-01
|
||||
- 版本:v1.1
|
||||
|
||||
98
docs/统一配置文件-tbyc-config.md
Normal file
98
docs/统一配置文件-tbyc-config.md
Normal file
@ -0,0 +1,98 @@
|
||||
# 统一配置文件:tbyc-config.json
|
||||
|
||||
- 日期:2026-11-07
|
||||
- 入口:`字段设置 → 导出配置 / 导入配置`
|
||||
- 目标:配置文件不再局限于「字段设置」,而是一个可扩展的分区容器,后续功能只需注册分区即可接入
|
||||
|
||||
---
|
||||
|
||||
## 1. 文件结构
|
||||
|
||||
```jsonc
|
||||
{
|
||||
"format": "tbyc-config",
|
||||
"version": 1,
|
||||
"exportedAt": 1762500000000,
|
||||
"user": { "userId": "zhangsan", "roleId": 3 },
|
||||
"sections": {
|
||||
"fieldColumns": [ /* 字段设置:表格列配置档案数组 */ ],
|
||||
"tabOrder": {
|
||||
"version": 1,
|
||||
"orders": { "order.management": ["pendingOrder", "reviewOrder"] },
|
||||
"defaults": { "order.management": "pendingOrder" }
|
||||
},
|
||||
"display": {
|
||||
"showSettings": true,
|
||||
"tagsView": true,
|
||||
"fixedHeader": true,
|
||||
"sidebarLogo": true,
|
||||
"shortcutExpanded": false,
|
||||
"layoutMode": "top-bottom",
|
||||
"toolbarMode": "tile",
|
||||
"scanBoxMode": "compact"
|
||||
},
|
||||
"shortcuts": [{ "title": "订单管理", "path": "/order/orderManagement" }]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- `format` 固定为 `tbyc-config`,`version` 为文件结构版本
|
||||
- `sections` 内每个 key 对应一个「配置分区」,互不影响
|
||||
- 空分区(无数据)不会被写入文件
|
||||
- 导入时**未知分区只忽略并提示**,不会阻断其它配置导入
|
||||
|
||||
---
|
||||
|
||||
## 2. 已支持的分区
|
||||
|
||||
| key | 名称 | 数据来源 | 存储位置 |
|
||||
|---|---|---|---|
|
||||
| `fieldColumns` | 字段设置 | UpperTable 列配置 | `upper_table_columns_{user}_{role}_{tableId}` |
|
||||
| `tabOrder` | 标签排序 / 默认页签 | 标签排序面板 | `user_prefs_{userId}` → scope `tabOrder` |
|
||||
| `display` | 界面显示 | settings store | `settings_{user}_{role}` |
|
||||
| `shortcuts` | 快捷键 | shortcuts store | `shortcuts_{user}_{role}` |
|
||||
|
||||
---
|
||||
|
||||
## 3. 新增一类配置(扩展方式)
|
||||
|
||||
1. 在 `src/config/tbyc-config-sections.ts` 里定义分区对象:
|
||||
|
||||
```ts
|
||||
const mySection: TbycConfigSection = {
|
||||
key: 'myFeature',
|
||||
title: '我的功能',
|
||||
collect: () => {
|
||||
// 返回要导出的数据;返回 undefined/null 表示本次不导出该分区
|
||||
},
|
||||
apply: (data) => {
|
||||
// 校验并写入,返回成功应用的条数(0 表示无变化)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
2. 加入 `TBYC_CONFIG_SECTIONS` 数组。
|
||||
|
||||
无需修改 `src/utils/tbyc-config.ts` 或 `UpperTable`。
|
||||
|
||||
---
|
||||
|
||||
## 4. 兼容策略
|
||||
|
||||
| 文件来源 | 处理 |
|
||||
|---|---|
|
||||
| `tbyc-config` 新格式 | 按 `sections` 逐个分区应用 |
|
||||
| 旧「全局字段配置」(`format: 'upper-table-global-columns'`,含 `tables` + `tabOrders`) | 映射为 `fieldColumns` + `tabOrder` 两个分区 |
|
||||
| 更早的单表导出文件(`tableId` + `columns`) | 映射为 `fieldColumns`(单条档案) |
|
||||
|
||||
导入策略:**覆盖同名项,保留文件中未涉及的配置**(不做整包清空)。
|
||||
|
||||
---
|
||||
|
||||
## 5. 注意事项
|
||||
|
||||
- `fieldColumns` / `display` / `shortcuts` 仍是「用户 + 角色」维度;`tabOrder` 是「仅用户」维度(不分仓库、不分角色)
|
||||
- 导入 `display` 时通过 `settingsStore.changeSetting` 逐项应用并持久化,无需刷新页面
|
||||
- 导入 `shortcuts` 时直接赋值 store(store 内部 `watch(deep)` 自动持久化)
|
||||
- 导入 `fieldColumns` 后会调用 `rebuildColumnConfig()` 让当前表格立即刷新
|
||||
159
package-lock.json
generated
159
package-lock.json
generated
@ -26,7 +26,6 @@
|
||||
"qrcode": "^1.5.4",
|
||||
"sortablejs": "^1.15.7",
|
||||
"spark-md5": "^3.0.2",
|
||||
"three": "^0.183.2",
|
||||
"uuid": "^13.0.0",
|
||||
"vue": "^3.5.29",
|
||||
"vue-draggable-plus": "^0.6.1",
|
||||
@ -44,7 +43,6 @@
|
||||
"@types/qrcode": "^1.5.6",
|
||||
"@types/sortablejs": "^1.15.9",
|
||||
"@types/spark-md5": "^3.0.5",
|
||||
"@types/three": "^0.183.1",
|
||||
"@vitejs/plugin-vue": "^6.0.4",
|
||||
"@vue/tsconfig": "^0.8.1",
|
||||
"eslint": "^10.2.0",
|
||||
@ -532,13 +530,6 @@
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/@dimforge/rapier3d-compat": {
|
||||
"version": "0.12.0",
|
||||
"resolved": "https://registry.npmjs.org/@dimforge/rapier3d-compat/-/rapier3d-compat-0.12.0.tgz",
|
||||
"integrity": "sha512-uekIGetywIgopfD97oDL5PfeezkFpNhwlzlaEYNOA0N6ghdsOvh/HYjSMek5Q2O1PYvRSDFcqFVJl4r4ZBwOow==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@element-plus/icons-vue": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz",
|
||||
@ -555,6 +546,7 @@
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -571,6 +563,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -587,6 +580,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -603,6 +597,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -619,6 +614,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -635,6 +631,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -651,6 +648,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -667,6 +665,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -683,6 +682,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -699,6 +699,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -715,6 +716,7 @@
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -731,6 +733,7 @@
|
||||
"cpu": [
|
||||
"loong64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -747,6 +750,7 @@
|
||||
"cpu": [
|
||||
"mips64el"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -763,6 +767,7 @@
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -779,6 +784,7 @@
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -795,6 +801,7 @@
|
||||
"cpu": [
|
||||
"s390x"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -811,6 +818,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -827,6 +835,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -843,6 +852,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -859,6 +869,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -875,6 +886,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -891,6 +903,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -907,6 +920,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -923,6 +937,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -939,6 +954,7 @@
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -955,6 +971,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1300,6 +1317,7 @@
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
|
||||
"integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@ -1339,6 +1357,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1359,6 +1378,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1379,6 +1399,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1399,6 +1420,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1419,6 +1441,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1439,6 +1462,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1459,6 +1483,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1479,6 +1504,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1499,6 +1525,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1519,6 +1546,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1539,6 +1567,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1559,6 +1588,7 @@
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1579,6 +1609,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1624,6 +1655,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1637,6 +1669,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1650,6 +1683,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1663,6 +1697,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1676,6 +1711,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1689,6 +1725,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1702,6 +1739,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1715,6 +1753,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1728,6 +1767,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1741,6 +1781,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1754,6 +1795,7 @@
|
||||
"cpu": [
|
||||
"loong64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1767,6 +1809,7 @@
|
||||
"cpu": [
|
||||
"loong64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1780,6 +1823,7 @@
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1793,6 +1837,7 @@
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1806,6 +1851,7 @@
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1819,6 +1865,7 @@
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1832,6 +1879,7 @@
|
||||
"cpu": [
|
||||
"s390x"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1845,6 +1893,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1858,6 +1907,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1871,6 +1921,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1884,6 +1935,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1897,6 +1949,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1910,6 +1963,7 @@
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1923,6 +1977,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1936,6 +1991,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@ -1959,13 +2015,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@tweenjs/tween.js": {
|
||||
"version": "23.1.3",
|
||||
"resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.3.tgz",
|
||||
"integrity": "sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/esrecurse": {
|
||||
"version": "4.3.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz",
|
||||
@ -2014,7 +2063,7 @@
|
||||
"version": "24.11.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.11.0.tgz",
|
||||
"integrity": "sha512-fPxQqz4VTgPI/IQ+lj9r0h+fDR66bzoeMGHp8ASee+32OSGIkeASsoZuJixsQoVef1QJbeubcPBxKk22QVoWdw==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"undici-types": "~7.16.0"
|
||||
@ -2056,13 +2105,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/stats.js": {
|
||||
"version": "0.17.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/stats.js/-/stats.js-0.17.4.tgz",
|
||||
"integrity": "sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/svgo": {
|
||||
"version": "2.6.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/svgo/-/svgo-2.6.4.tgz",
|
||||
@ -2073,35 +2115,12 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/three": {
|
||||
"version": "0.183.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/three/-/three-0.183.1.tgz",
|
||||
"integrity": "sha512-f2Pu5Hrepfgavttdye3PsH5RWyY/AvdZQwIVhrc4uNtvF7nOWJacQKcoVJn0S4f0yYbmAE6AR+ve7xDcuYtMGw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@dimforge/rapier3d-compat": "~0.12.0",
|
||||
"@tweenjs/tween.js": "~23.1.3",
|
||||
"@types/stats.js": "*",
|
||||
"@types/webxr": ">=0.5.17",
|
||||
"@webgpu/types": "*",
|
||||
"fflate": "~0.8.2",
|
||||
"meshoptimizer": "~1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/web-bluetooth": {
|
||||
"version": "0.0.21",
|
||||
"resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
|
||||
"integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/webxr": {
|
||||
"version": "0.5.24",
|
||||
"resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.24.tgz",
|
||||
"integrity": "sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@typescript-eslint/eslint-plugin": {
|
||||
"version": "8.58.2",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.2.tgz",
|
||||
@ -2720,13 +2739,6 @@
|
||||
"vue": "^3.5.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@webgpu/types": {
|
||||
"version": "0.1.69",
|
||||
"resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.69.tgz",
|
||||
"integrity": "sha512-RPmm6kgRbI8e98zSD3RVACvnuktIja5+yLgDAkTmxLr90BEwdTXRQWNLF3ETTTyH/8mKhznZuN5AveXYFEsMGQ==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/acorn": {
|
||||
"version": "8.19.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz",
|
||||
@ -3970,6 +3982,7 @@
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
|
||||
"integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
@ -4371,6 +4384,7 @@
|
||||
"devOptional": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"esbuild": "bin/esbuild"
|
||||
},
|
||||
@ -4849,13 +4863,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/fflate": {
|
||||
"version": "0.8.2",
|
||||
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
|
||||
"integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/file-entry-cache": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
|
||||
@ -5029,6 +5036,7 @@
|
||||
"version": "2.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
|
||||
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@ -5469,7 +5477,7 @@
|
||||
"version": "5.1.5",
|
||||
"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
|
||||
"integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/imurmurhash": {
|
||||
@ -5700,7 +5708,7 @@
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
@ -5755,7 +5763,7 @@
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"is-extglob": "^2.1.1"
|
||||
@ -6417,13 +6425,6 @@
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/meshoptimizer": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-1.0.1.tgz",
|
||||
"integrity": "sha512-Vix+QlA1YYT3FwmBBZ+49cE5y/b+pRrcXKqGpS5ouh33d3lSp2PoTpCw19E0cKDFWalembrHnIaZetf27a+W2g==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/micromatch": {
|
||||
"version": "4.0.8",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
|
||||
@ -6696,6 +6697,7 @@
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
|
||||
"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
@ -7614,6 +7616,7 @@
|
||||
"integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
|
||||
"devOptional": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@types/estree": "1.0.8"
|
||||
},
|
||||
@ -7794,7 +7797,7 @@
|
||||
"version": "1.97.3",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.97.3.tgz",
|
||||
"integrity": "sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"chokidar": "^4.0.0",
|
||||
@ -7815,7 +7818,7 @@
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
|
||||
"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"readdirp": "^4.0.1"
|
||||
@ -7831,7 +7834,7 @@
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
|
||||
"integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 14.18.0"
|
||||
@ -8713,12 +8716,6 @@
|
||||
"node": ">=10.13.0"
|
||||
}
|
||||
},
|
||||
"node_modules/three": {
|
||||
"version": "0.183.2",
|
||||
"resolved": "https://registry.npmjs.org/three/-/three-0.183.2.tgz",
|
||||
"integrity": "sha512-di3BsL2FEQ1PA7Hcvn4fyJOlxRRgFYBpMTcyOgkwJIaDOdJMebEFPA+t98EvjuljDx4hNulAGwF6KIjtwI5jgQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/tinyglobby": {
|
||||
"version": "0.2.17",
|
||||
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
|
||||
@ -9070,7 +9067,7 @@
|
||||
"version": "7.16.0",
|
||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
|
||||
"integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
|
||||
"devOptional": true,
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/unimport": {
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
"qrcode": "^1.5.4",
|
||||
"sortablejs": "^1.15.7",
|
||||
"spark-md5": "^3.0.2",
|
||||
"three": "^0.183.2",
|
||||
"uuid": "^13.0.0",
|
||||
"vue": "^3.5.29",
|
||||
"vue-draggable-plus": "^0.6.1",
|
||||
@ -64,7 +63,6 @@
|
||||
"@types/qrcode": "^1.5.6",
|
||||
"@types/sortablejs": "^1.15.9",
|
||||
"@types/spark-md5": "^3.0.5",
|
||||
"@types/three": "^0.183.1",
|
||||
"@vitejs/plugin-vue": "^6.0.4",
|
||||
"@vue/tsconfig": "^0.8.1",
|
||||
"eslint": "^10.2.0",
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
<!--
|
||||
SortSettingDialog — 标签排序弹窗(通用)
|
||||
作用:调整页面顶部多标签页的显示顺序(如把「待处理订单」拖到「待审核订单」前面)
|
||||
存储:localStorage(key=user_prefs_{userId},scope 由调用方传入,value=tab.name 数组)
|
||||
设计文档:docs/用户偏好配置-浏览器本地保存方案.md
|
||||
SortSettingDialog — 单页「标签排序」弹窗(由 TabArea 内置入口调用)
|
||||
|
||||
作用:调整当前页面顶部标签的显示顺序,并选择默认打开的标签
|
||||
存储:由调用方通过 useTabOrder 写入 userPreference 用户级 scope `tabOrder`(按账号,不分仓库)
|
||||
设计文档:docs/标签排序与默认页签-统一方案.md
|
||||
用法:
|
||||
<SortSettingDialog
|
||||
v-model:visible="visible"
|
||||
:tabs="DEFAULT_TAB_OPTIONS" // { name, label }[],顺序即默认顺序
|
||||
:scope="'order.tabs.order'" // 存储 scope,按页面区分
|
||||
@saved="handleSortSaved" // (order: string[])
|
||||
:tabs="tabs" // { name, label }[],顺序即默认顺序
|
||||
:page-key="'order.management'" // 注册表 key(配置键)
|
||||
@saved="handleSortSaved" // (order: string[], defaultName: string)
|
||||
/>
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
title="标签排序"
|
||||
width="520px"
|
||||
width="560px"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@ -24,24 +25,14 @@
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<div class="tab-order-tip">
|
||||
拖动左侧把手调整标签页显示顺序,保存后刷新/重新登录仍生效(按当前账号保存在浏览器本地)。
|
||||
拖动左侧把手调整标签页显示顺序;右侧圆点选择默认打开的页签。保存后刷新/重新登录仍生效(按当前账号保存在浏览器本地)。
|
||||
</div>
|
||||
|
||||
<VueDraggable
|
||||
<TabOrderDragList
|
||||
v-model="orderList"
|
||||
:animation="180"
|
||||
handle=".tab-order-handle"
|
||||
ghost-class="tab-order-ghost"
|
||||
class="tab-order-list"
|
||||
>
|
||||
<div v-for="(tab, idx) in orderList" :key="tab.name" class="tab-order-row">
|
||||
<span class="tab-order-handle">
|
||||
<el-icon><Rank /></el-icon>
|
||||
</span>
|
||||
<span class="tab-order-index">{{ idx + 1 }}</span>
|
||||
<span class="tab-order-label">{{ tab.label }}</span>
|
||||
</div>
|
||||
</VueDraggable>
|
||||
v-model:default-name="defaultName"
|
||||
:can-set-default="orderList.length > 1"
|
||||
/>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleClosed">取消</el-button>
|
||||
@ -53,64 +44,96 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, watch } from 'vue'
|
||||
import { Rank } from '@element-plus/icons-vue'
|
||||
import { VueDraggable } from 'vue-draggable-plus'
|
||||
import TabOrderDragList from '@/components/TabOrderDragList.vue'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import {
|
||||
applyTabOrder,
|
||||
isValidTabName,
|
||||
normalizeTabOrder,
|
||||
readTabOrderDoc,
|
||||
type TabOption
|
||||
} from '@/utils/tab-order'
|
||||
|
||||
defineOptions({ name: 'SortSettingDialog' })
|
||||
|
||||
export interface TabOrderOption {
|
||||
name: string
|
||||
label: string
|
||||
}
|
||||
/** 兼容旧命名 */
|
||||
export type TabOrderOption = TabOption
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
/** 该页面全部 tab(name + 中文 label),顺序即默认顺序 */
|
||||
tabs: TabOrderOption[]
|
||||
/** 存储 scope(如 order.tabs.order / stock.tabs.order) */
|
||||
scope: string
|
||||
}>()
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
visible: boolean
|
||||
/** 该页面全部标签(name + 中文 label),顺序即默认顺序 */
|
||||
tabs: TabOption[]
|
||||
/** 排序配置主键(注册表 key,如 order.management) */
|
||||
pageKey?: string
|
||||
/** 旧存储 scope(兼容读取,优先从 pageKey 读新文档) */
|
||||
scope?: string
|
||||
}>(),
|
||||
{
|
||||
pageKey: '',
|
||||
scope: ''
|
||||
}
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:visible', v: boolean): void
|
||||
(e: 'saved', order: string[]): void
|
||||
/** 保存:顺序 + 默认标签(持久化由调用方完成,保证单一写入口) */
|
||||
(e: 'saved', order: string[], defaultName: string): void
|
||||
}>()
|
||||
|
||||
const pref = useUserPreferenceStore()
|
||||
|
||||
const orderList = ref<TabOrderOption[]>([])
|
||||
const orderList = ref<TabOption[]>([])
|
||||
const defaultName = ref('')
|
||||
|
||||
watch(
|
||||
() => props.visible,
|
||||
(v) => {
|
||||
if (!v) return
|
||||
orderList.value = buildOrderList()
|
||||
buildOrderList()
|
||||
}
|
||||
)
|
||||
|
||||
/** 读取已保存顺序;非法项剔除,缺失的 tab 按 props.tabs 补在末尾(防新增 tab 丢项) */
|
||||
function buildOrderList(): TabOrderOption[] {
|
||||
const byName = new Map(props.tabs.map((t) => [t.name, t]))
|
||||
const saved = pref.get(props.scope)
|
||||
const names = Array.isArray(saved)
|
||||
? saved.filter((n: unknown) => typeof n === 'string' && byName.has(n))
|
||||
: []
|
||||
const result = Array.from(new Set(names)).map((n) => byName.get(n)!)
|
||||
for (const t of props.tabs) {
|
||||
if (!result.some((r) => r.name === t.name)) result.push({ ...t })
|
||||
/** 读取已保存顺序;非法项剔除,缺失的标签按 props.tabs 补在末尾(防新增标签丢项) */
|
||||
function buildOrderList() {
|
||||
const doc = readTabOrderDoc()
|
||||
const key = props.pageKey
|
||||
let savedOrder: string[] = []
|
||||
let savedDefault = ''
|
||||
|
||||
if (key) {
|
||||
if (Array.isArray(doc.orders[key]) && doc.orders[key].length) {
|
||||
savedOrder = doc.orders[key]
|
||||
}
|
||||
savedDefault = doc.defaults[key] || ''
|
||||
}
|
||||
return result
|
||||
|
||||
// 兼容旧 scope(新文档无配置时)
|
||||
if (!savedOrder.length) {
|
||||
const scopes = [props.scope].filter(Boolean) as string[]
|
||||
for (const scope of scopes) {
|
||||
const value = pref.get(scope) ?? pref.getGlobal(scope)
|
||||
if (Array.isArray(value) && value.length) {
|
||||
savedOrder = value as string[]
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
orderList.value = savedOrder.length
|
||||
? applyTabOrder(savedOrder, props.tabs)
|
||||
: props.tabs.map((tab) => ({ ...tab }))
|
||||
defaultName.value = isValidTabName(savedDefault, props.tabs) ? savedDefault : ''
|
||||
}
|
||||
|
||||
function resetOrder() {
|
||||
orderList.value = props.tabs.map((t) => ({ ...t }))
|
||||
orderList.value = props.tabs.map((tab) => ({ ...tab }))
|
||||
defaultName.value = ''
|
||||
}
|
||||
|
||||
function handleSave() {
|
||||
const names = orderList.value.map((t) => t.name)
|
||||
pref.set(props.scope, names)
|
||||
emit('saved', names)
|
||||
const names = normalizeTabOrder(orderList.value.map((tab) => tab.name), props.tabs)
|
||||
emit('saved', names, defaultName.value)
|
||||
handleClosed()
|
||||
}
|
||||
|
||||
@ -126,47 +149,4 @@ function handleClosed() {
|
||||
margin-bottom: 12px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.tab-order-list {
|
||||
max-height: 320px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.tab-order-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 9px 12px;
|
||||
margin-bottom: 8px;
|
||||
border: 1px solid #e8eef7;
|
||||
border-radius: 6px;
|
||||
background: #fafbfe;
|
||||
|
||||
.tab-order-handle {
|
||||
cursor: grab;
|
||||
color: #909399;
|
||||
display: inline-flex;
|
||||
&:active {
|
||||
cursor: grabbing;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-order-index {
|
||||
width: 20px;
|
||||
text-align: center;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.tab-order-label {
|
||||
font-size: 13px;
|
||||
color: #303133;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-order-ghost {
|
||||
opacity: 0.4;
|
||||
border-style: dashed;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -18,7 +18,10 @@
|
||||
</div>
|
||||
-->
|
||||
<template>
|
||||
<div class="tab-area-wrapper" :class="{ 'has-sort': showSortEntry }">
|
||||
<div
|
||||
class="tab-area-wrapper"
|
||||
:class="{ 'has-sort': showSortEntry, 'has-header-action': hasHeaderAction }"
|
||||
>
|
||||
<div v-if="showSortEntry" class="tab-sort-entry">
|
||||
<el-tooltip content="标签排序" placement="bottom">
|
||||
<el-button class="sort-entry-btn" size="small" link @click="sortDialogVisible = true">
|
||||
@ -27,6 +30,11 @@
|
||||
</el-tooltip>
|
||||
</div>
|
||||
|
||||
<!-- 右侧操作区(可选):如「刷新角标」按钮、状态 chip -->
|
||||
<div v-if="hasHeaderAction" class="tab-header-action">
|
||||
<slot name="header-action" />
|
||||
</div>
|
||||
|
||||
<el-tabs
|
||||
v-model="activeTab"
|
||||
tab-position="top"
|
||||
@ -41,7 +49,12 @@
|
||||
:lazy="false"
|
||||
>
|
||||
<template #label>
|
||||
<span class="custom-tab-label">{{ tab.label }}</span>
|
||||
<span class="custom-tab-label">
|
||||
<!-- 标签内容插槽:优先 label-{name},其次通用 label,最后纯文本 -->
|
||||
<slot :name="`label-${tab.name}`" :tab="tab">
|
||||
<slot name="label" :tab="tab">{{ tab.label }}</slot>
|
||||
</slot>
|
||||
</span>
|
||||
</template>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
@ -49,38 +62,47 @@
|
||||
<SortSettingDialog
|
||||
v-if="showSortEntry"
|
||||
v-model:visible="sortDialogVisible"
|
||||
:tabs="tabs"
|
||||
:scope="resolvedScope"
|
||||
:tabs="props.tabs"
|
||||
:page-key="pageKeyValue"
|
||||
@saved="handleSortSaved"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { computed, ref, useSlots, watch } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { Sort } from '@element-plus/icons-vue'
|
||||
import SortSettingDialog from '@/components/SortSettingDialog.vue'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
import type { TabOption } from '@/utils/tab-order'
|
||||
|
||||
defineOptions({ name: 'TabArea' })
|
||||
|
||||
export interface TabAreaItem {
|
||||
name: string
|
||||
label: string
|
||||
/** 允许页面携带额外字段(如角标 count),排序只依赖 name */
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
tabs?: TabAreaItem[]
|
||||
defaultActive?: string
|
||||
/** 排序存储 scope;不传则按当前路由路径自动生成 */
|
||||
/** 排序配置主键(注册表 key,如 order.management);缺省时按路由路径生成兜底 key */
|
||||
pageKey?: string
|
||||
/** 旧排序 scope(兼容旧调用,作为 legacyScopes 首项读取) */
|
||||
sortScope?: string
|
||||
/** 是否显示排序入口(默认显示;单标签页面始终不显示) */
|
||||
showSort?: boolean
|
||||
}>(),
|
||||
{
|
||||
tabs: () => [],
|
||||
defaultActive: '',
|
||||
sortScope: ''
|
||||
pageKey: '',
|
||||
sortScope: '',
|
||||
showSort: true
|
||||
}
|
||||
)
|
||||
|
||||
@ -88,44 +110,32 @@ const emit = defineEmits<{
|
||||
(e: 'tab-change', tabName: string): void
|
||||
}>()
|
||||
|
||||
const slots = useSlots()
|
||||
const route = useRoute()
|
||||
const preferenceStore = useUserPreferenceStore()
|
||||
|
||||
const activeTab = ref(props.defaultActive || props.tabs[0]?.name || '')
|
||||
/** 右侧操作区插槽是否存在 */
|
||||
const hasHeaderAction = computed(() => !!slots['header-action'])
|
||||
|
||||
/** 排序入口:只有多标签页面才出现 */
|
||||
const showSortEntry = computed(() => props.tabs.length > 1)
|
||||
/** 排序入口:多标签 + 未显式关闭 */
|
||||
const showSortEntry = computed(() => props.showSort && props.tabs.length > 1)
|
||||
|
||||
/** 排序存储 scope:未显式传入时按路由区分,避免不同页面互相覆盖 */
|
||||
const resolvedScope = computed(() => props.sortScope || `tab-order:${route.path}`)
|
||||
/** 排序配置主键:未显式传入时按路由路径兜底(仅用于兼容) */
|
||||
const pageKeyValue = computed(() => props.pageKey || `route:${route.path}`)
|
||||
|
||||
const { orderedTabs, defaultTabName, saveOrder, setDefault, seedLegacyIfNeeded } = useTabOrder(
|
||||
pageKeyValue,
|
||||
() => props.tabs as TabOption[],
|
||||
{
|
||||
// 兼容:旧 TabArea 用 tab-order:{path},旧内联页面用各自 scope
|
||||
legacyScopes: () => [props.sortScope, `tab-order:${route.path}`].filter(Boolean) as string[],
|
||||
// TabArea 不是 UpperTable 的祖先,pageKey 由页面自己 provide
|
||||
provideKey: false
|
||||
}
|
||||
)
|
||||
|
||||
const sortDialogVisible = ref(false)
|
||||
/** 已保存的标签顺序(name 数组);空数组表示使用传入顺序 */
|
||||
const sortOrder = ref<string[]>([])
|
||||
|
||||
/** 按保存顺序重排 tabs;缺失项按原顺序补在末尾 */
|
||||
const orderedTabs = computed<TabAreaItem[]>(() => {
|
||||
if (!sortOrder.value.length) return props.tabs
|
||||
const byName = new Map(props.tabs.map((t) => [t.name, t]))
|
||||
const ordered: TabAreaItem[] = []
|
||||
for (const name of sortOrder.value) {
|
||||
const hit = byName.get(name)
|
||||
if (hit) {
|
||||
ordered.push(hit)
|
||||
byName.delete(name)
|
||||
}
|
||||
}
|
||||
for (const t of props.tabs) {
|
||||
if (byName.has(t.name)) ordered.push(t)
|
||||
}
|
||||
return ordered
|
||||
})
|
||||
|
||||
/** 读取本地保存的标签顺序 */
|
||||
function applySavedOrder() {
|
||||
const saved = preferenceStore.get(resolvedScope.value)
|
||||
if (Array.isArray(saved) && saved.length) sortOrder.value = saved as string[]
|
||||
}
|
||||
const activeTab = ref(props.defaultActive || defaultTabName.value || props.tabs[0]?.name || '')
|
||||
|
||||
function handleTabChange(name: string | number) {
|
||||
const next = String(name)
|
||||
@ -133,20 +143,17 @@ function handleTabChange(name: string | number) {
|
||||
emit('tab-change', next)
|
||||
}
|
||||
|
||||
function handleSortSaved(order: string[]) {
|
||||
sortOrder.value = Array.isArray(order) ? order : []
|
||||
/** 弹窗保存:写顺序 + 默认标签(store 更新后 orderedTabs 立即重排) */
|
||||
function handleSortSaved(order: string[], defaultName: string) {
|
||||
saveOrder(order)
|
||||
setDefault(defaultName)
|
||||
}
|
||||
|
||||
// 页签集合变化(如权限变化)时,丢弃已失效的顺序并重新读取
|
||||
/** 标签集合变化(如权限变化)时补一次旧配置迁移 */
|
||||
watch(
|
||||
() => props.tabs.map((t) => t.name).join(','),
|
||||
() => {
|
||||
sortOrder.value = []
|
||||
applySavedOrder()
|
||||
}
|
||||
() => seedLegacyIfNeeded()
|
||||
)
|
||||
|
||||
onMounted(applySavedOrder)
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@ -179,6 +186,18 @@ onMounted(applySavedOrder)
|
||||
}
|
||||
}
|
||||
|
||||
/* 右侧操作区(可选):与排序入口同一高度,绝对定位覆盖在标签栏右侧 */
|
||||
.tab-header-action {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 16px;
|
||||
height: 38px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.tab-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
146
src/components/TabOrderDragList.vue
Normal file
146
src/components/TabOrderDragList.vue
Normal file
@ -0,0 +1,146 @@
|
||||
<!--
|
||||
TabOrderDragList — 标签顺序拖拽列表(页面弹窗与「字段设置 → 标签排序」全局面板共用)
|
||||
|
||||
用法:
|
||||
<TabOrderDragList v-model="list" v-model:default-name="defaultName" />
|
||||
|
||||
- v-model:标签数组,数组顺序即显示顺序
|
||||
- v-model:default-name:默认打开的标签 name(单标签页面禁用设置)
|
||||
-->
|
||||
<template>
|
||||
<VueDraggable
|
||||
v-model="list"
|
||||
:animation="180"
|
||||
handle=".tab-order-handle"
|
||||
ghost-class="tab-order-ghost"
|
||||
class="tab-order-list"
|
||||
>
|
||||
<div
|
||||
v-for="(tab, idx) in list"
|
||||
:key="tab.name"
|
||||
class="tab-order-row"
|
||||
:class="{ 'is-default': defaultName === tab.name }"
|
||||
>
|
||||
<span class="tab-order-handle">
|
||||
<el-icon><Rank /></el-icon>
|
||||
</span>
|
||||
<span class="tab-order-index">{{ idx + 1 }}</span>
|
||||
<span class="tab-order-label">{{ tab.label }}</span>
|
||||
<el-tag
|
||||
v-if="defaultName === tab.name"
|
||||
size="small"
|
||||
effect="plain"
|
||||
class="tab-order-default-tag"
|
||||
>默认</el-tag>
|
||||
<el-tooltip
|
||||
:content="defaultName === tab.name ? '已设为默认打开页签' : '设为默认打开页签'"
|
||||
placement="left"
|
||||
>
|
||||
<el-radio
|
||||
class="tab-order-default-radio"
|
||||
:model-value="defaultName"
|
||||
:value="tab.name"
|
||||
:disabled="!canSetDefault"
|
||||
:aria-label="`设为默认页签:${tab.label}`"
|
||||
@change="handleDefaultChange(tab.name)"
|
||||
@update:model-value="handleDefaultChange(tab.name)"
|
||||
/>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</VueDraggable>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { Rank } from '@element-plus/icons-vue'
|
||||
import { VueDraggable } from 'vue-draggable-plus'
|
||||
import type { TabOption } from '@/utils/tab-order'
|
||||
|
||||
defineOptions({ name: 'TabOrderDragList' })
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
modelValue: TabOption[]
|
||||
defaultName?: string
|
||||
/** 是否允许设置默认标签(单标签页面禁用) */
|
||||
canSetDefault?: boolean
|
||||
}>(),
|
||||
{
|
||||
defaultName: '',
|
||||
canSetDefault: true
|
||||
}
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', value: TabOption[]): void
|
||||
(e: 'update:defaultName', value: string): void
|
||||
}>()
|
||||
|
||||
const list = computed<TabOption[]>({
|
||||
get: () => props.modelValue,
|
||||
set: (value) => emit('update:modelValue', value)
|
||||
})
|
||||
|
||||
function handleDefaultChange(name: string) {
|
||||
emit('update:defaultName', name)
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.tab-order-list {
|
||||
max-height: 380px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.tab-order-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 9px 12px;
|
||||
margin-bottom: 8px;
|
||||
border: 1px solid #e8eef7;
|
||||
border-radius: 6px;
|
||||
background: #fafbfe;
|
||||
|
||||
&.is-default {
|
||||
border-color: #c6ddfb;
|
||||
background: #f2f8ff;
|
||||
}
|
||||
|
||||
.tab-order-handle {
|
||||
cursor: grab;
|
||||
color: #909399;
|
||||
display: inline-flex;
|
||||
&:active {
|
||||
cursor: grabbing;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-order-index {
|
||||
width: 20px;
|
||||
text-align: center;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.tab-order-label {
|
||||
flex: 1;
|
||||
font-size: 13px;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.tab-order-default-tag {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.tab-order-default-radio {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-order-ghost {
|
||||
opacity: 0.4;
|
||||
border-style: dashed;
|
||||
}
|
||||
</style>
|
||||
516
src/components/TabOrderSettingsDialog.vue
Normal file
516
src/components/TabOrderSettingsDialog.vue
Normal file
@ -0,0 +1,516 @@
|
||||
<!--
|
||||
TabOrderSettingsDialog — 全项目标签排序 / 默认页签管理(唯一入口)
|
||||
|
||||
入口:UpperTable「字段设置」工具栏 → 标签排序
|
||||
- 左侧:注册表内所有支持标签的页面(按分组,标注是否已自定义)
|
||||
- 右侧:拖拽调整顺序 + 圆点选择默认打开的页签
|
||||
- 保存:一次性写入 userPreference 的用户级 scope `tabOrder`(按账号,不分仓库)
|
||||
- 排序与默认值保存后,所有页面立即生效(useTabOrder 为响应式读取)
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
title="标签排序"
|
||||
width="920px"
|
||||
align-center
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@update:model-value="(v: boolean) => emit('update:visible', v)"
|
||||
@open="handleOpen"
|
||||
>
|
||||
<div class="tab-order-panel">
|
||||
<!-- 左侧:页面列表 -->
|
||||
<div class="panel-left">
|
||||
<el-input
|
||||
v-model="keyword"
|
||||
size="small"
|
||||
placeholder="搜索页面名称"
|
||||
clearable
|
||||
class="panel-search"
|
||||
/>
|
||||
<div class="page-groups">
|
||||
<div v-if="!itemsReady" class="panel-loading">加载中…</div>
|
||||
<template v-else>
|
||||
<div v-for="group in filteredGroups" :key="group.name" class="group">
|
||||
<div class="group-title">{{ group.name }}</div>
|
||||
<div
|
||||
v-for="item in group.items"
|
||||
:key="item.key"
|
||||
class="page-item"
|
||||
:class="{
|
||||
'is-active': item.key === selectedKey,
|
||||
'is-disabled': item.enabled === false,
|
||||
'is-current': item.key === effectiveCurrentKey
|
||||
}"
|
||||
@click="selectPage(item)"
|
||||
>
|
||||
<span class="page-title">
|
||||
{{ item.title }}
|
||||
<span v-if="item.key === effectiveCurrentKey" class="current-dot" title="当前页面" />
|
||||
</span>
|
||||
<el-tag v-if="item.enabled === false" size="small" type="info" effect="plain">未接入</el-tag>
|
||||
<el-tag v-else-if="isCustomized(item.key)" size="small" effect="plain">已自定义</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
<el-empty v-if="!filteredGroups.length" description="没有可排序的页面" :image-size="60" />
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 右侧:当前页面的排序/默认设置 -->
|
||||
<div class="panel-right">
|
||||
<template v-if="currentItem">
|
||||
<div class="panel-head">
|
||||
<div class="panel-head-main">
|
||||
<span class="current-title">{{ currentItem.title }}</span>
|
||||
<span class="current-sub">{{ currentTabs.length }} 个标签</span>
|
||||
</div>
|
||||
<div class="panel-head-actions">
|
||||
<span class="current-default">默认:{{ effectiveDefaultLabel }}</span>
|
||||
<el-button size="small" link @click="resetCurrent">恢复本页默认</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="loading" class="panel-loading">加载中…</div>
|
||||
<template v-else-if="currentTabs.length > 1">
|
||||
<div class="panel-tip">
|
||||
拖动左侧把手调整标签顺序,右侧圆点选择打开页面时默认展示的标签。
|
||||
</div>
|
||||
<TabOrderDragList
|
||||
v-model="currentOrder"
|
||||
v-model:default-name="currentDefault"
|
||||
:can-set-default="true"
|
||||
/>
|
||||
</template>
|
||||
<div v-else class="panel-loading">
|
||||
该页面当前只有 1 个标签,暂无需排序。
|
||||
</div>
|
||||
</template>
|
||||
<el-empty v-else description="请从左侧选择一个页面" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="resetAll">全部恢复默认</el-button>
|
||||
<el-button size="small" @click="handleClose">取消</el-button>
|
||||
<el-button size="small" type="primary" :disabled="!isDirty" @click="handleSave">
|
||||
保存
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import TabOrderDragList from '@/components/TabOrderDragList.vue'
|
||||
import {
|
||||
TAB_ORDER_GROUPS,
|
||||
TAB_ORDER_REGISTRY,
|
||||
matchTabOrderPageKey,
|
||||
type TabOrderRegistryItem
|
||||
} from '@/config/tab-order-registry'
|
||||
import {
|
||||
applyTabOrder,
|
||||
isValidTabName,
|
||||
normalizeTabOrder,
|
||||
readTabOrderDoc,
|
||||
writeTabOrderDoc,
|
||||
type TabOption
|
||||
} from '@/utils/tab-order'
|
||||
|
||||
defineOptions({ name: 'TabOrderSettingsDialog' })
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
visible: boolean
|
||||
/** 当前所在页面的注册表 key(用于高亮,可空) */
|
||||
currentPageKey?: string
|
||||
}>(),
|
||||
{ currentPageKey: '' }
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:visible', v: boolean): void
|
||||
}>()
|
||||
|
||||
const keyword = ref('')
|
||||
const selectedKey = ref('')
|
||||
const loading = ref(false)
|
||||
/** 标签数量预加载完成(未完成前不渲染页面列表,避免单标签页面闪入闪出) */
|
||||
const itemsReady = ref(false)
|
||||
const route = useRoute()
|
||||
|
||||
/** 当前页面 key:优先页面 provide,其次按路由路径兜底匹配 */
|
||||
const effectiveCurrentKey = computed(
|
||||
() => props.currentPageKey || matchTabOrderPageKey(route.path)
|
||||
)
|
||||
/** 页面 key → 已加载的默认标签 */
|
||||
const tabsCache = reactive<Record<string, TabOption[]>>({})
|
||||
/** 页面 key → 草稿(顺序 + 默认标签) */
|
||||
const drafts = reactive<Record<string, { order: TabOption[]; defaultName: string }>>({})
|
||||
/** 「全部恢复默认」标记:保存时清空整个文档 */
|
||||
const clearAll = ref(false)
|
||||
|
||||
const doc = computed(() => readTabOrderDoc())
|
||||
|
||||
const filteredGroups = computed(() => {
|
||||
const kw = keyword.value.trim().toLowerCase()
|
||||
return TAB_ORDER_GROUPS.map((name) => ({
|
||||
name,
|
||||
items: TAB_ORDER_REGISTRY.filter((item) => {
|
||||
if (item.group !== name) return false
|
||||
// 只有 1 个标签的页面无需排序,不展示
|
||||
const tabs = tabsCache[item.key]
|
||||
if (!tabs || tabs.length < 2) return false
|
||||
if (!kw) return true
|
||||
return item.title.toLowerCase().includes(kw) || item.key.toLowerCase().includes(kw)
|
||||
})
|
||||
})).filter((group) => group.items.length > 0)
|
||||
})
|
||||
|
||||
const currentItem = computed(() =>
|
||||
TAB_ORDER_REGISTRY.find((item) => item.key === selectedKey.value)
|
||||
)
|
||||
|
||||
const currentTabs = computed<TabOption[]>(() => tabsCache[selectedKey.value] || [])
|
||||
|
||||
const currentOrder = computed<TabOption[]>({
|
||||
get: () => drafts[selectedKey.value]?.order || [],
|
||||
set: (value) => {
|
||||
const draft = drafts[selectedKey.value]
|
||||
if (draft) draft.order = value
|
||||
clearAll.value = false
|
||||
}
|
||||
})
|
||||
|
||||
/** 页面兜底默认标签:注册表声明 > 默认顺序首个 */
|
||||
function fallbackDefaultName(key: string): string {
|
||||
const item = TAB_ORDER_REGISTRY.find((entry) => entry.key === key)
|
||||
const tabs = tabsCache[key] || []
|
||||
if (item?.defaultTabName && tabs.some((tab) => tab.name === item.defaultTabName)) {
|
||||
return item.defaultTabName
|
||||
}
|
||||
return tabs[0]?.name || ''
|
||||
}
|
||||
|
||||
/** 当前生效的默认标签:用户已设置 > 页面兜底(便于未设置时也能看出默认是哪个) */
|
||||
const effectiveDefaultName = computed(() => {
|
||||
const key = selectedKey.value
|
||||
if (!key) return ''
|
||||
return drafts[key]?.defaultName || fallbackDefaultName(key)
|
||||
})
|
||||
|
||||
const effectiveDefaultLabel = computed(() => {
|
||||
const name = effectiveDefaultName.value
|
||||
return currentTabs.value.find((tab) => tab.name === name)?.label || '—'
|
||||
})
|
||||
|
||||
const currentDefault = computed<string>({
|
||||
get: () => effectiveDefaultName.value,
|
||||
set: (value) => {
|
||||
const draft = drafts[selectedKey.value]
|
||||
if (draft) draft.defaultName = value || ''
|
||||
clearAll.value = false
|
||||
}
|
||||
})
|
||||
|
||||
/** 是否已有自定义配置(用于列表标注) */
|
||||
function isCustomized(key: string): boolean {
|
||||
return !!doc.value.orders[key]?.length || !!doc.value.defaults[key]
|
||||
}
|
||||
|
||||
function sameOrder(a: string[], b: string[]): boolean {
|
||||
return a.length === b.length && a.every((name, index) => name === b[index])
|
||||
}
|
||||
|
||||
function isPageDirty(key: string): boolean {
|
||||
const draft = drafts[key]
|
||||
const tabs = tabsCache[key]
|
||||
if (!draft || !tabs) return false
|
||||
const names = draft.order.map((tab) => tab.name)
|
||||
const savedNames = normalizeTabOrder(doc.value.orders[key], tabs)
|
||||
return (
|
||||
!sameOrder(names, savedNames) || draft.defaultName !== (doc.value.defaults[key] || '')
|
||||
)
|
||||
}
|
||||
|
||||
const isDirty = computed(
|
||||
() => clearAll.value || Object.keys(drafts).some((key) => isPageDirty(key))
|
||||
)
|
||||
|
||||
function initDraft(item: TabOrderRegistryItem, tabs: TabOption[]) {
|
||||
const savedOrder = doc.value.orders[item.key]
|
||||
const order = savedOrder?.length ? applyTabOrder(savedOrder, tabs) : tabs.map((tab) => ({ ...tab }))
|
||||
const savedDefault = doc.value.defaults[item.key] || ''
|
||||
drafts[item.key] = {
|
||||
order,
|
||||
defaultName: isValidTabName(savedDefault, tabs) ? savedDefault : ''
|
||||
}
|
||||
}
|
||||
|
||||
async function ensureTabs(item: TabOrderRegistryItem) {
|
||||
if (tabsCache[item.key]) return tabsCache[item.key]
|
||||
loading.value = true
|
||||
try {
|
||||
const tabs = await item.loadTabs()
|
||||
tabsCache[item.key] = tabs
|
||||
initDraft(item, tabs)
|
||||
return tabs
|
||||
} catch (error) {
|
||||
console.error('[TabOrderSettingsDialog] loadTabs failed:', item.key, error)
|
||||
tabsCache[item.key] = []
|
||||
drafts[item.key] = { order: [], defaultName: '' }
|
||||
return []
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadAllTabs() {
|
||||
await Promise.all(
|
||||
TAB_ORDER_REGISTRY.map(async (item) => {
|
||||
if (tabsCache[item.key]) return
|
||||
try {
|
||||
const tabs = await item.loadTabs()
|
||||
tabsCache[item.key] = tabs
|
||||
initDraft(item, tabs)
|
||||
} catch (error) {
|
||||
console.error('[TabOrderSettingsDialog] loadTabs failed:', item.key, error)
|
||||
tabsCache[item.key] = []
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
async function selectPage(item: TabOrderRegistryItem) {
|
||||
if (item.enabled === false) return
|
||||
selectedKey.value = item.key
|
||||
await ensureTabs(item)
|
||||
}
|
||||
|
||||
function resetCurrent() {
|
||||
const item = currentItem.value
|
||||
const tabs = tabsCache[selectedKey.value]
|
||||
if (!item || !tabs) return
|
||||
drafts[item.key] = {
|
||||
order: tabs.map((tab) => ({ ...tab })),
|
||||
defaultName: ''
|
||||
}
|
||||
clearAll.value = false
|
||||
}
|
||||
|
||||
function resetAll() {
|
||||
Object.keys(drafts).forEach((key) => {
|
||||
const tabs = tabsCache[key]
|
||||
drafts[key] = {
|
||||
order: (tabs || []).map((tab) => ({ ...tab })),
|
||||
defaultName: ''
|
||||
}
|
||||
})
|
||||
clearAll.value = true
|
||||
}
|
||||
|
||||
async function handleOpen() {
|
||||
keyword.value = ''
|
||||
clearAll.value = false
|
||||
itemsReady.value = false
|
||||
Object.keys(drafts).forEach((key) => delete drafts[key])
|
||||
Object.keys(tabsCache).forEach((key) => delete tabsCache[key])
|
||||
|
||||
await loadAllTabs()
|
||||
itemsReady.value = true
|
||||
|
||||
const isSortable = (item: TabOrderRegistryItem) =>
|
||||
item.enabled !== false && (tabsCache[item.key]?.length || 0) > 1
|
||||
|
||||
const preferred = TAB_ORDER_REGISTRY.find(
|
||||
(item) => item.key === effectiveCurrentKey.value && isSortable(item)
|
||||
)
|
||||
const fallback = TAB_ORDER_REGISTRY.find(isSortable)
|
||||
const target = preferred || fallback
|
||||
if (target) {
|
||||
await selectPage(target)
|
||||
} else {
|
||||
selectedKey.value = ''
|
||||
}
|
||||
}
|
||||
|
||||
function handleSave() {
|
||||
const base = readTabOrderDoc()
|
||||
const orders: Record<string, string[]> = clearAll.value ? {} : { ...base.orders }
|
||||
const defaults: Record<string, string> = clearAll.value ? {} : { ...base.defaults }
|
||||
|
||||
Object.keys(drafts).forEach((key) => {
|
||||
const draft = drafts[key]
|
||||
const tabs = tabsCache[key]
|
||||
if (!draft || !tabs || !tabs.length) return
|
||||
const names = draft.order.map((tab) => tab.name)
|
||||
const defaultNames = tabs.map((tab) => tab.name)
|
||||
if (sameOrder(names, defaultNames)) {
|
||||
delete orders[key]
|
||||
} else {
|
||||
orders[key] = normalizeTabOrder(names, tabs)
|
||||
}
|
||||
if (draft.defaultName) {
|
||||
defaults[key] = draft.defaultName
|
||||
} else {
|
||||
delete defaults[key]
|
||||
}
|
||||
})
|
||||
|
||||
writeTabOrderDoc({ version: 1, orders, defaults })
|
||||
ElMessage.success('标签排序已保存,页面已即时生效')
|
||||
handleClose()
|
||||
}
|
||||
|
||||
function handleClose() {
|
||||
emit('update:visible', false)
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.tab-order-panel {
|
||||
display: flex;
|
||||
gap: 16px;
|
||||
height: 460px;
|
||||
}
|
||||
|
||||
.panel-left {
|
||||
width: 260px;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border-right: 1px solid #ebeef5;
|
||||
padding-right: 12px;
|
||||
}
|
||||
|
||||
.panel-search {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.page-groups {
|
||||
flex: 1;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.group + .group {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.group-title {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
padding: 4px 8px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.page-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
padding: 7px 10px;
|
||||
border-radius: 6px;
|
||||
font-size: 13px;
|
||||
color: #303133;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.15s;
|
||||
|
||||
&:hover {
|
||||
background: #f5f7fa;
|
||||
}
|
||||
|
||||
&.is-active {
|
||||
background: #ecf5ff;
|
||||
color: #2f80ed;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
&.is-disabled {
|
||||
color: #c0c4cc;
|
||||
cursor: not-allowed;
|
||||
|
||||
&:hover {
|
||||
background: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.page-title {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.current-dot {
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
border-radius: 50%;
|
||||
background: #2f80ed;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.panel-right {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.panel-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 8px;
|
||||
|
||||
.panel-head-main {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.current-title {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.current-sub {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.panel-head-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.current-default {
|
||||
font-size: 12px;
|
||||
color: #2f80ed;
|
||||
background: rgba(47, 128, 237, 0.08);
|
||||
border-radius: 10px;
|
||||
padding: 2px 10px;
|
||||
line-height: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
.panel-tip {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
line-height: 1.6;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.panel-loading {
|
||||
padding: 40px 0;
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
color: #909399;
|
||||
}
|
||||
</style>
|
||||
@ -255,16 +255,18 @@
|
||||
>
|
||||
<div class="column-config-toolbar">
|
||||
<el-button size="small" @click="resetColumnConfig">恢复默认</el-button>
|
||||
<el-button size="small" @click="exportGlobalColumnConfig">导出全局配置</el-button>
|
||||
<el-button size="small" @click="exportGlobalColumnConfig">导出配置</el-button>
|
||||
<el-upload
|
||||
accept=".json"
|
||||
:show-file-list="false"
|
||||
:auto-upload="false"
|
||||
:on-change="handleImportColumnConfig"
|
||||
>
|
||||
<el-button size="small">导入全局配置</el-button>
|
||||
<el-button size="small">导入配置</el-button>
|
||||
</el-upload>
|
||||
<el-button size="small" type="danger" plain @click="handleRepairColumnConfig">故障修复</el-button>
|
||||
<!-- 标签排序:全项目标签顺序 + 默认页签统一管理 -->
|
||||
<el-button size="small" @click="tabOrderDialogVisible = true">标签排序</el-button>
|
||||
<!-- 更多设置:表格工作模式、页面缓存 / tab 缓存等设置已迁移至该表单 -->
|
||||
<el-button size="small" @click="moreSettingsDialogVisible = true">更多设置</el-button>
|
||||
</div>
|
||||
@ -376,6 +378,11 @@
|
||||
<qrcode-dialog v-model:visible="waybillQrVisible" :code="waybillQrCode" />
|
||||
|
||||
<more-settings-dialog v-model:visible="moreSettingsDialogVisible" />
|
||||
|
||||
<tab-order-settings-dialog
|
||||
v-model:visible="tabOrderDialogVisible"
|
||||
:current-page-key="tabOrderPageKey"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -391,6 +398,17 @@ import { useExperimentalStore } from '@/stores/modules/experimental'
|
||||
import defaultSettings from '@/settings'
|
||||
import QrcodeDialog from '@/components/QR/qrcode.vue'
|
||||
import MoreSettingsDialog from './MoreSettingsDialog.vue'
|
||||
import TabOrderSettingsDialog from '@/components/TabOrderSettingsDialog.vue'
|
||||
import { injectTabOrderPageKey } from '@/composables/useTabOrder'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import { TAB_ORDER_SCOPE } from '@/utils/tab-order'
|
||||
import {
|
||||
TBYC_CONFIG_FILENAME,
|
||||
buildTbycConfig,
|
||||
downloadJsonFile,
|
||||
isTbycConfig
|
||||
} from '@/utils/tbyc-config'
|
||||
import { TBYC_CONFIG_SECTIONS, getTbycConfigSection } from '@/config/tbyc-config-sections'
|
||||
|
||||
defineOptions({
|
||||
name: 'UpperTable'
|
||||
@ -608,6 +626,10 @@ const tableRef = ref<any>(null)
|
||||
const userStore = useUserStore()
|
||||
const experimentalStore = useExperimentalStore()
|
||||
const moreSettingsDialogVisible = ref(false)
|
||||
/** 标签排序全局面板(排序 + 默认页签统一管理) */
|
||||
const tabOrderDialogVisible = ref(false)
|
||||
/** 当前页面 key(由页面 useTabOrder provide,用于面板高亮;单标签页面为空) */
|
||||
const tabOrderPageKey = injectTabOrderPageKey()
|
||||
|
||||
type ColumnItem = {
|
||||
prop?: string
|
||||
@ -1727,37 +1749,53 @@ function resetColumnConfig() {
|
||||
ElMessage.success('已恢复默认字段配置')
|
||||
}
|
||||
|
||||
/** 导出统一配置文件(tbyc-config.json:字段设置 / 标签排序 / 界面显示 / 快捷键 …) */
|
||||
function exportGlobalColumnConfig() {
|
||||
const userId = String(userStore.user?.username || userStore.user?.id || 'unknown')
|
||||
const roleId = userStore.roleId || 'default'
|
||||
const tableProfiles: TableColumnProfile[] = []
|
||||
const prefix = globalColumnConfigStoragePrefix.value
|
||||
Object.keys(localStorage).forEach((key) => {
|
||||
if (!key.startsWith(prefix)) return
|
||||
const identity = {
|
||||
userId: String(userStore.user?.username || userStore.user?.id || 'unknown'),
|
||||
roleId: String(userStore.roleId || 'default')
|
||||
}
|
||||
const sections: Record<string, unknown> = {}
|
||||
TBYC_CONFIG_SECTIONS.forEach((section) => {
|
||||
try {
|
||||
const parsed = JSON.parse(localStorage.getItem(key) || '{}') as TableColumnProfile
|
||||
if (parsed && parsed.tableId && Array.isArray(parsed.columns)) {
|
||||
tableProfiles.push(parsed)
|
||||
}
|
||||
} catch {
|
||||
// ignore invalid profile
|
||||
const data = section.collect()
|
||||
if (data === undefined || data === null) return
|
||||
sections[section.key] = data
|
||||
} catch (error) {
|
||||
console.error(`[tbyc-config] collect ${section.key} failed:`, error)
|
||||
}
|
||||
})
|
||||
const payload = {
|
||||
format: 'upper-table-global-columns',
|
||||
schemaVersion: props.columnConfigSchemaVersion,
|
||||
userId,
|
||||
roleId,
|
||||
updatedAt: Date.now(),
|
||||
tables: tableProfiles
|
||||
|
||||
if (!Object.keys(sections).length) {
|
||||
ElMessage.warning('当前没有可导出的配置')
|
||||
return
|
||||
}
|
||||
const blob = new Blob([JSON.stringify(payload, null, 2)], { type: 'application/json;charset=utf-8' })
|
||||
const url = URL.createObjectURL(blob)
|
||||
const link = document.createElement('a')
|
||||
link.href = url
|
||||
link.download = `upper-table-global-columns-config.json`
|
||||
link.click()
|
||||
URL.revokeObjectURL(url)
|
||||
|
||||
downloadJsonFile(TBYC_CONFIG_FILENAME, buildTbycConfig(identity, sections))
|
||||
ElMessage.success('配置文件已导出')
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析导入文件 → 分区数据
|
||||
* - 新格式:{ format: 'tbyc-config', sections: { ... } }
|
||||
* - 旧格式:{ tables | tableId/columns } + { tabOrders }(兼容旧版「全局字段配置」导出文件)
|
||||
*/
|
||||
function resolveConfigSections(parsed: any): Record<string, unknown> {
|
||||
if (!parsed || typeof parsed !== 'object') return {}
|
||||
if (isTbycConfig(parsed) || (parsed.sections && typeof parsed.sections === 'object')) {
|
||||
return parsed.sections || {}
|
||||
}
|
||||
|
||||
const sections: Record<string, unknown> = {}
|
||||
if (Array.isArray(parsed.tables)) {
|
||||
sections.fieldColumns = parsed.tables
|
||||
} else if (parsed.tableId && Array.isArray(parsed.columns)) {
|
||||
sections.fieldColumns = [
|
||||
{ tableId: parsed.tableId, columns: parsed.columns, schemaVersion: parsed.schemaVersion }
|
||||
]
|
||||
}
|
||||
if (parsed.tabOrders) sections.tabOrder = parsed.tabOrders
|
||||
return sections
|
||||
}
|
||||
|
||||
function handleImportColumnConfig(file: UploadFile) {
|
||||
@ -1765,54 +1803,40 @@ function handleImportColumnConfig(file: UploadFile) {
|
||||
const reader = new FileReader()
|
||||
reader.onload = () => {
|
||||
try {
|
||||
const parsed = JSON.parse(String(reader.result || '{}')) as {
|
||||
tables?: TableColumnProfile[]
|
||||
tableId?: string
|
||||
columns?: ColumnConfigItem[]
|
||||
}
|
||||
if (!parsed) {
|
||||
ElMessage.error('配置文件格式不正确')
|
||||
const parsed = JSON.parse(String(reader.result || '{}'))
|
||||
const sections = resolveConfigSections(parsed)
|
||||
const sectionKeys = Object.keys(sections)
|
||||
if (!sectionKeys.length) {
|
||||
ElMessage.error('未找到可导入的配置')
|
||||
return
|
||||
}
|
||||
|
||||
const importProfiles: TableColumnProfile[] = []
|
||||
if (Array.isArray(parsed.tables)) {
|
||||
importProfiles.push(...parsed.tables)
|
||||
} else if (parsed.tableId && Array.isArray(parsed.columns)) {
|
||||
importProfiles.push({
|
||||
schemaVersion: props.columnConfigSchemaVersion,
|
||||
tableId: parsed.tableId,
|
||||
userId: String(userStore.user?.username || userStore.user?.id || 'unknown'),
|
||||
roleId: userStore.roleId || 'default',
|
||||
updatedAt: Date.now(),
|
||||
columns: parsed.columns
|
||||
})
|
||||
}
|
||||
const applied: string[] = []
|
||||
let columnImported = false
|
||||
|
||||
if (importProfiles.length === 0) {
|
||||
ElMessage.error('未找到可导入的全局配置')
|
||||
return
|
||||
}
|
||||
|
||||
const prefix = globalColumnConfigStoragePrefix.value
|
||||
let importedCount = 0
|
||||
importProfiles.forEach((profile) => {
|
||||
if (!profile?.tableId || !Array.isArray(profile.columns)) return
|
||||
const key = `${prefix}${profile.tableId}`
|
||||
const payload: TableColumnProfile = {
|
||||
schemaVersion: profile.schemaVersion ?? props.columnConfigSchemaVersion,
|
||||
tableId: profile.tableId,
|
||||
userId: String(userStore.user?.username || userStore.user?.id || 'unknown'),
|
||||
roleId: userStore.roleId || 'default',
|
||||
updatedAt: Date.now(),
|
||||
columns: profile.columns
|
||||
TBYC_CONFIG_SECTIONS.forEach((section) => {
|
||||
if (!(section.key in sections)) return
|
||||
try {
|
||||
const count = section.apply(sections[section.key])
|
||||
if (count > 0) {
|
||||
applied.push(`${section.title} ${count} 项`)
|
||||
if (section.key === 'fieldColumns') columnImported = true
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[tbyc-config] apply ${section.key} failed:`, error)
|
||||
}
|
||||
localStorage.setItem(key, JSON.stringify(payload))
|
||||
importedCount += 1
|
||||
})
|
||||
|
||||
rebuildColumnConfig()
|
||||
ElMessage.success(`全局配置导入成功,已更新 ${importedCount} 个表`)
|
||||
// 来自更新版本的未知分区:只提示,不阻断其它配置导入
|
||||
const unknownCount = sectionKeys.filter((key) => !getTbycConfigSection(key)).length
|
||||
if (!applied.length) {
|
||||
ElMessage.error(unknownCount ? '配置文件中的配置项当前版本不支持' : '未找到可导入的配置')
|
||||
return
|
||||
}
|
||||
|
||||
if (columnImported) rebuildColumnConfig()
|
||||
const suffix = unknownCount ? `(${unknownCount} 个未知配置项已忽略)` : ''
|
||||
ElMessage.success(`配置导入成功:${applied.join('、')}${suffix}`)
|
||||
} catch {
|
||||
ElMessage.error('配置文件解析失败')
|
||||
}
|
||||
@ -1823,7 +1847,7 @@ function handleImportColumnConfig(file: UploadFile) {
|
||||
async function handleRepairColumnConfig() {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'故障修复会清除当前电脑中此账号的全部字段配置、显示设置及快捷键,并恢复所有默认配置。是否继续?',
|
||||
'故障修复会清除当前电脑中此账号的全部字段配置、标签排序、显示设置及快捷键,并恢复所有默认配置。是否继续?',
|
||||
'确认故障修复',
|
||||
{
|
||||
type: 'warning',
|
||||
@ -1887,12 +1911,18 @@ async function handleRepairColumnConfig() {
|
||||
localStorage.removeItem(shortcutsKey)
|
||||
shortcutsStore.shortcuts = []
|
||||
|
||||
// 4. 清除标签排序 / 默认页签(用户级配置,不分仓库)
|
||||
const preferenceStore = useUserPreferenceStore()
|
||||
const hadTabOrder = !!preferenceStore.getGlobal(TAB_ORDER_SCOPE)
|
||||
if (hadTabOrder) preferenceStore.resetGlobal(TAB_ORDER_SCOPE)
|
||||
|
||||
rebuildColumnConfig()
|
||||
|
||||
const parts: string[] = []
|
||||
if (columnCount > 0) parts.push(`${columnCount} 个字段配置`)
|
||||
if (hadSettings) parts.push('显示设置')
|
||||
if (hadShortcuts) parts.push('快捷键')
|
||||
if (hadTabOrder) parts.push('标签排序')
|
||||
ElMessage.success(`故障修复完成${parts.length > 0 ? ',已恢复 ' + parts.join('、') : ''}`)
|
||||
} catch {
|
||||
// user cancelled
|
||||
|
||||
181
src/composables/useTabOrder.ts
Normal file
181
src/composables/useTabOrder.ts
Normal file
@ -0,0 +1,181 @@
|
||||
/**
|
||||
* useTabOrder — 标签排序 / 默认页签的唯一实现
|
||||
*
|
||||
* 页面接入示例:
|
||||
* const { orderedTabs, defaultTabName, resolveInitialTab, saveOrder, setDefault, reset } =
|
||||
* useTabOrder('order.management', () => tabList.value, { legacyScopes: ['order.tabs.order'] })
|
||||
*
|
||||
* 读取优先级:
|
||||
* 1. 新文档(userPreference 用户级 scope `tabOrder`)
|
||||
* 2. 旧 scope(legacyScopes,命中后一次性迁移进新文档)
|
||||
* 3. 传入的默认顺序(tabs 原顺序)
|
||||
*
|
||||
* 初始激活页签优先级:
|
||||
* URL ?tab=(合法时) > 用户默认 > 页面兜底默认 > 排序后第一项
|
||||
*/
|
||||
import { computed, inject, onMounted, provide, watch, type ComputedRef, type InjectionKey } from 'vue'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import {
|
||||
applyTabOrder,
|
||||
isValidTabName,
|
||||
normalizeTabOrder,
|
||||
readTabOrderDoc,
|
||||
updateTabOrderDoc,
|
||||
type TabOption
|
||||
} from '@/utils/tab-order'
|
||||
|
||||
/** 页面 key 注入键:字段设置里的「标签排序」用它高亮当前页 */
|
||||
export const TAB_ORDER_PAGE_KEY: InjectionKey<ComputedRef<string>> = Symbol('tabOrderPageKey')
|
||||
|
||||
export interface UseTabOrderOptions {
|
||||
/** 旧配置 scope(按顺序尝试;命中的顺序会在挂载时迁移到新文档) */
|
||||
legacyScopes?: string[] | (() => string[])
|
||||
/** 页面级默认标签兜底(用户未设置默认时使用;返回空则用排序后第一项) */
|
||||
fallbackTabName?: string | (() => string | undefined)
|
||||
/** 是否把 pageKey provide 给后代(默认开启,供字段设置高亮当前页) */
|
||||
provideKey?: boolean
|
||||
}
|
||||
|
||||
type ValueOrGetter<T> = T | (() => T)
|
||||
|
||||
function resolveValue<T>(input: ValueOrGetter<T> | { value: T }): T {
|
||||
const raw: any = input
|
||||
if (typeof raw === 'function') return raw() as T
|
||||
if (raw && typeof raw === 'object' && 'value' in raw) return raw.value as T
|
||||
return raw as T
|
||||
}
|
||||
|
||||
export function useTabOrder(
|
||||
pageKey: ValueOrGetter<string> | ComputedRef<string>,
|
||||
tabs: () => TabOption[],
|
||||
options: UseTabOrderOptions = {}
|
||||
) {
|
||||
const pref = useUserPreferenceStore()
|
||||
|
||||
const key = computed(() => String(resolveValue(pageKey) || ''))
|
||||
|
||||
/** 响应式文档:store 变更后所有页面立即重排(字段设置里保存即生效) */
|
||||
const doc = computed(() => readTabOrderDoc())
|
||||
|
||||
/** 旧配置顺序(兼容读取) */
|
||||
const legacyOrder = computed<string[]>(() => {
|
||||
const scopes = resolveValue<string[]>(options.legacyScopes ?? [])
|
||||
if (!Array.isArray(scopes) || !scopes.length) return []
|
||||
for (const scope of scopes) {
|
||||
const value = pref.get(scope) ?? pref.getGlobal(scope)
|
||||
if (Array.isArray(value) && value.length) {
|
||||
return value.filter((name): name is string => typeof name === 'string' && !!name)
|
||||
}
|
||||
}
|
||||
return []
|
||||
})
|
||||
|
||||
/** 当前生效的 name 顺序(自定义 → 旧配置 → 空表示默认顺序) */
|
||||
const savedOrder = computed<string[]>(() => {
|
||||
const explicit = doc.value.orders[key.value]
|
||||
if (Array.isArray(explicit) && explicit.length) return explicit
|
||||
return legacyOrder.value
|
||||
})
|
||||
|
||||
/** 排序后的标签(保留原始对象,页面自定义字段如 count 不丢) */
|
||||
const orderedTabs = computed<TabOption[]>(() => {
|
||||
const list = tabs()
|
||||
if (!savedOrder.value.length) return list
|
||||
return applyTabOrder(savedOrder.value, list)
|
||||
})
|
||||
|
||||
/** 用户设置的默认标签(非法时返回空串) */
|
||||
const userDefaultTab = computed(() => {
|
||||
const name = doc.value.defaults[key.value]
|
||||
return isValidTabName(name, tabs()) ? String(name) : ''
|
||||
})
|
||||
|
||||
/** 页面兜底默认(未设置或已失效时使用) */
|
||||
const fallbackTab = computed(() => {
|
||||
const name = resolveValue<string | undefined>(options.fallbackTabName ?? '')
|
||||
return isValidTabName(name, tabs()) ? String(name) : ''
|
||||
})
|
||||
|
||||
/** 最终默认标签:用户默认 → 页面兜底 → 排序后第一项 */
|
||||
const defaultTabName = computed(
|
||||
() => userDefaultTab.value || fallbackTab.value || orderedTabs.value[0]?.name || ''
|
||||
)
|
||||
|
||||
/** 是否被用户自定义过(顺序或默认) */
|
||||
const isCustomized = computed(
|
||||
() => !!doc.value.orders[key.value]?.length || !!doc.value.defaults[key.value]
|
||||
)
|
||||
|
||||
/** 解析初始激活标签:合法 URL tab 优先,其次默认标签 */
|
||||
function resolveInitialTab(urlTab?: string | null): string {
|
||||
const raw = urlTab === undefined || urlTab === null ? '' : String(urlTab).trim()
|
||||
if (raw && isValidTabName(raw, tabs())) return raw
|
||||
return defaultTabName.value
|
||||
}
|
||||
|
||||
/** 保存顺序(自动剔除非法项、补齐缺失项) */
|
||||
function saveOrder(order: unknown): string[] {
|
||||
const normalized = normalizeTabOrder(order, tabs())
|
||||
updateTabOrderDoc((draft) => {
|
||||
draft.orders[key.value] = normalized
|
||||
})
|
||||
return normalized
|
||||
}
|
||||
|
||||
/** 设置默认标签;传空表示清除 */
|
||||
function setDefault(name: string | null): void {
|
||||
updateTabOrderDoc((draft) => {
|
||||
if (!name || !isValidTabName(name, tabs())) {
|
||||
delete draft.defaults[key.value]
|
||||
return
|
||||
}
|
||||
draft.defaults[key.value] = name
|
||||
})
|
||||
}
|
||||
|
||||
/** 恢复默认(同时清除顺序与默认标签) */
|
||||
function reset(): void {
|
||||
updateTabOrderDoc((draft) => {
|
||||
delete draft.orders[key.value]
|
||||
delete draft.defaults[key.value]
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 旧配置一次性迁移:新文档无该页配置、但旧 scope 有值时,写入新文档。
|
||||
* 旧 key 不删除(便于回滚);迁移后「恢复默认」才会真正回到默认顺序。
|
||||
*/
|
||||
function seedLegacyIfNeeded() {
|
||||
if (!key.value) return
|
||||
if (doc.value.orders[key.value]?.length) return
|
||||
if (!legacyOrder.value.length) return
|
||||
updateTabOrderDoc((draft) => {
|
||||
draft.orders[key.value] = normalizeTabOrder(legacyOrder.value, tabs())
|
||||
})
|
||||
}
|
||||
|
||||
if (options.provideKey !== false) provide(TAB_ORDER_PAGE_KEY, key)
|
||||
|
||||
onMounted(seedLegacyIfNeeded)
|
||||
watch(key, () => seedLegacyIfNeeded())
|
||||
|
||||
return {
|
||||
pageKey: key,
|
||||
orderedTabs,
|
||||
savedOrder,
|
||||
defaultTabName,
|
||||
userDefaultTab,
|
||||
isCustomized,
|
||||
resolveInitialTab,
|
||||
saveOrder,
|
||||
setDefault,
|
||||
reset,
|
||||
seedLegacyIfNeeded
|
||||
}
|
||||
}
|
||||
|
||||
/** 供 UpperTable 等后代组件读取当前页面 key(无注入时返回空串) */
|
||||
export function injectTabOrderPageKey(): string {
|
||||
const key = inject(TAB_ORDER_PAGE_KEY, null)
|
||||
return key?.value || ''
|
||||
}
|
||||
238
src/config/tab-order-registry.ts
Normal file
238
src/config/tab-order-registry.ts
Normal file
@ -0,0 +1,238 @@
|
||||
/**
|
||||
* 标签排序注册表(唯一事实来源)
|
||||
*
|
||||
* 新增一个支持「标签排序 / 默认页签」的页面 = 在这里加一条:
|
||||
* { key, title, group, loadTabs, legacyScopes?, matchPaths }
|
||||
*
|
||||
* 约定:
|
||||
* - key 全局唯一、稳定不变(配置以它为键),建议 `<模块>.<页面>` 全小写
|
||||
* - loadTabs 用动态 import 拿默认标签,避免把各页面配置打进主包
|
||||
* - legacyScopes 为历史配置 scope(旧代码写过的键),用于无缝兼容
|
||||
* - matchPaths 仅用于全局面板「高亮当前页」的兜底匹配(菜单 path 由后端下发,可能不匹配)
|
||||
*/
|
||||
import type { TabOption } from '@/utils/tab-order'
|
||||
|
||||
export interface TabOrderRegistryItem {
|
||||
/** 稳定主键,同时是配置键 */
|
||||
key: string
|
||||
/** 面板展示名称 */
|
||||
title: string
|
||||
/** 分组(面板左侧列表) */
|
||||
group: string
|
||||
/** 默认标签(顺序即默认顺序);懒加载 */
|
||||
loadTabs: () => Promise<TabOption[]>
|
||||
/** 页面兜底默认标签:用户未设置默认时使用(缺省则用第一个标签) */
|
||||
defaultTabName?: string
|
||||
/** 旧配置 scope(按优先级读取,命中后一次性迁移) */
|
||||
legacyScopes?: string[]
|
||||
/** 路由别名(后缀匹配,用于高亮当前页) */
|
||||
matchPaths?: string[]
|
||||
/** 是否已接入排序(false 时不参与保存,仅展示) */
|
||||
enabled?: boolean
|
||||
}
|
||||
|
||||
function fromTabPages(
|
||||
loader: () => Promise<{ tabPages: { name: string; label: string }[] }>
|
||||
): () => Promise<TabOption[]> {
|
||||
return async () => {
|
||||
const mod = await loader()
|
||||
return (mod.tabPages || []).map((tab) => ({ name: tab.name, label: tab.label }))
|
||||
}
|
||||
}
|
||||
|
||||
export const TAB_ORDER_REGISTRY: TabOrderRegistryItem[] = [
|
||||
// ==================== 订单 ====================
|
||||
{
|
||||
key: 'order.management',
|
||||
title: '订单管理',
|
||||
group: '订单',
|
||||
legacyScopes: ['order.tabs.order'],
|
||||
matchPaths: ['order', 'orderManagement'],
|
||||
/** 页面默认打开「待处理订单」 */
|
||||
defaultTabName: 'pendingOrder',
|
||||
loadTabs: async () => {
|
||||
const mod = await import('@/views/order/orderManagement/config/order-common-config')
|
||||
return mod.ORDER_TAB_LIST.map((tab) => ({ name: tab.name, label: tab.label }))
|
||||
}
|
||||
},
|
||||
{
|
||||
key: 'order.wave',
|
||||
title: '波次管理',
|
||||
group: '订单',
|
||||
legacyScopes: ['order.wave.tabs.order'],
|
||||
matchPaths: ['wave', 'waveOrder'],
|
||||
// name/label 与 views/order/waveOrder/index.vue 的 tabs 保持一致(name 为配置键,必须一致)
|
||||
loadTabs: async () => [
|
||||
{ name: 'groupWave', label: '团购波次' },
|
||||
{ name: 'sandanWave', label: '散单波次' },
|
||||
{ name: 'sandanFallbackOrders', label: '不符合波次策略订单列表' },
|
||||
{ name: 'sandanWaveStrategy', label: '波次策略' },
|
||||
{ name: 'pickTaskWave', label: '拣货中任务' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'order.pickingShortage',
|
||||
title: '缺货补货',
|
||||
group: '订单',
|
||||
matchPaths: ['pickingShortage'],
|
||||
loadTabs: fromTabPages(() => import('@/views/stock/pickingShortage/config/picking-shortage-config'))
|
||||
},
|
||||
|
||||
// ==================== 仓储 ====================
|
||||
{
|
||||
key: 'stock.management',
|
||||
title: '商品管理',
|
||||
group: '仓储',
|
||||
legacyScopes: ['stock.tabs.order'],
|
||||
matchPaths: ['stockManagement', 'stock/index'],
|
||||
loadTabs: async () => [
|
||||
{ name: 'stockDetail', label: '商品明细' },
|
||||
{ name: 'comboStock', label: '组合商品' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'storage.stockcheck',
|
||||
title: '库存盘点',
|
||||
group: '仓储',
|
||||
matchPaths: ['stockcheck'],
|
||||
loadTabs: fromTabPages(() => import('@/views/storage/stockcheck/config/template-config'))
|
||||
},
|
||||
{
|
||||
key: 'storage.generalreport',
|
||||
title: '通用报表',
|
||||
group: '仓储',
|
||||
matchPaths: ['generalreport'],
|
||||
loadTabs: fromTabPages(() => import('@/views/storage/generalreport/config/template-config'))
|
||||
},
|
||||
|
||||
// ==================== 售后 / 快递 ====================
|
||||
{
|
||||
key: 'afterSale.typelist',
|
||||
title: '售后类型',
|
||||
group: '售后',
|
||||
matchPaths: ['typelist'],
|
||||
loadTabs: fromTabPages(() => import('@/views/afterSale/typelist/config/template-config'))
|
||||
},
|
||||
{
|
||||
key: 'express.waybill',
|
||||
title: '运单管理',
|
||||
group: '售后',
|
||||
matchPaths: ['waybill', 'express/index'],
|
||||
loadTabs: fromTabPages(() => import('@/views/express/waybill/config/template-config'))
|
||||
},
|
||||
{
|
||||
key: 'data.returnrecord',
|
||||
title: '退回记录',
|
||||
group: '售后',
|
||||
// 含「未保存离开」拦截,暂未接入 TabArea,先只做展示(不参与排序保存)
|
||||
enabled: false,
|
||||
matchPaths: ['returnrecord'],
|
||||
loadTabs: async () => [
|
||||
{ name: 'returnReceivedTask', label: '退回收件任务' },
|
||||
{ name: 'returnReceived', label: '退回收件登记' },
|
||||
{ name: 'returnUnpack', label: '退回拆包单' },
|
||||
{ name: 'returnwaybill', label: '未退登记' },
|
||||
{ name: 'receive', label: '收件' },
|
||||
{ name: 'unpackwork', label: '退回拆包作业' }
|
||||
]
|
||||
},
|
||||
|
||||
// ==================== 数据 ====================
|
||||
{
|
||||
key: 'data.ordersummary',
|
||||
title: '订单汇总',
|
||||
group: '数据',
|
||||
matchPaths: ['ordersummary'],
|
||||
loadTabs: fromTabPages(() => import('@/views/data/ordersummary/config/template-config'))
|
||||
},
|
||||
{
|
||||
key: 'mode',
|
||||
title: '页面模板示例',
|
||||
group: '数据',
|
||||
matchPaths: ['mode'],
|
||||
loadTabs: fromTabPages(() => import('@/views/mode/config/template-config'))
|
||||
},
|
||||
|
||||
// ==================== 设置 ====================
|
||||
{
|
||||
key: 'setting.basicManagement',
|
||||
title: '基础设置',
|
||||
group: '设置',
|
||||
legacyScopes: ['setting.basicManagement.tabs.order'],
|
||||
matchPaths: ['basicManagement'],
|
||||
loadTabs: fromTabPages(() => import('@/views/system/setting/basicManagement/newview/config/template-config'))
|
||||
},
|
||||
{
|
||||
key: 'system.setting.encoding',
|
||||
title: '编码管理',
|
||||
group: '设置',
|
||||
matchPaths: ['encoding'],
|
||||
loadTabs: async () => [
|
||||
{ name: 'courierCode', label: '快递编码管理' },
|
||||
{ name: 'platformCode', label: '平台编码管理' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'system.setting.workbench',
|
||||
title: '工作台管理',
|
||||
group: '设置',
|
||||
matchPaths: ['workbench'],
|
||||
loadTabs: fromTabPages(() => import('@/views/system/setting/workbench2/config/template-config'))
|
||||
},
|
||||
{
|
||||
key: 'system.setting.printcomputer',
|
||||
title: '打印电脑管理',
|
||||
group: '设置',
|
||||
matchPaths: ['printcomputer'],
|
||||
loadTabs: fromTabPages(() => import('@/views/system/setting/printcomputer/config/template-config'))
|
||||
},
|
||||
|
||||
// ==================== 视频 ====================
|
||||
{
|
||||
key: 'video.camera',
|
||||
title: '摄像头管理',
|
||||
group: '视频',
|
||||
matchPaths: ['camera/index', 'newcamara'],
|
||||
loadTabs: fromTabPages(() => import('@/views/video/newcamara/config/camara-config'))
|
||||
},
|
||||
{
|
||||
key: 'video.cameraServer',
|
||||
title: '录像机管理',
|
||||
group: '视频',
|
||||
matchPaths: ['cameraServer', 'newcamaraserver'],
|
||||
loadTabs: fromTabPages(() => import('@/views/video/newcamaraserver/config/camaraserver-config'))
|
||||
}
|
||||
]
|
||||
|
||||
/** 全部分组(保持注册表顺序) */
|
||||
export const TAB_ORDER_GROUPS: string[] = Array.from(new Set(TAB_ORDER_REGISTRY.map((item) => item.group)))
|
||||
|
||||
/** 按 key 取注册项 */
|
||||
export function getTabOrderRegistryItem(key: string): TabOrderRegistryItem | undefined {
|
||||
return TAB_ORDER_REGISTRY.find((item) => item.key === key)
|
||||
}
|
||||
|
||||
/** 全部可保存的页面 key(导出/导入/清理时使用) */
|
||||
export function getTabOrderPageKeys(): string[] {
|
||||
return TAB_ORDER_REGISTRY.map((item) => item.key)
|
||||
}
|
||||
|
||||
/** 按路由 path 兜底匹配页面 key(仅用于高亮,匹配不到返回空串) */
|
||||
export function matchTabOrderPageKey(path: string): string {
|
||||
const normalized = String(path || '').toLowerCase()
|
||||
if (!normalized) return ''
|
||||
let best = ''
|
||||
let bestScore = 0
|
||||
TAB_ORDER_REGISTRY.forEach((item) => {
|
||||
;(item.matchPaths || []).forEach((candidate) => {
|
||||
const token = candidate.toLowerCase()
|
||||
if (!token) return
|
||||
if (!normalized.includes(token)) return
|
||||
if (token.length > bestScore) {
|
||||
bestScore = token.length
|
||||
best = item.key
|
||||
}
|
||||
})
|
||||
})
|
||||
return best
|
||||
}
|
||||
238
src/config/tbyc-config-sections.ts
Normal file
238
src/config/tbyc-config-sections.ts
Normal file
@ -0,0 +1,238 @@
|
||||
/**
|
||||
* tbyc-config.json 的配置分区注册表
|
||||
*
|
||||
* 每个分区提供两件事:
|
||||
* collect() 导出时收集当前配置(返回 undefined/null 则本次不写入该分区)
|
||||
* apply(data) 导入时应用配置,返回成功应用的条数(0 表示无变化)
|
||||
*
|
||||
* 新增一类可导入导出的配置:在此数组里加一项即可(无需改 UpperTable / 文件格式)。
|
||||
*/
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import { useShortcutsStore } from '@/stores/modules/shortcuts'
|
||||
import { getTabOrderPageKeys } from '@/config/tab-order-registry'
|
||||
import {
|
||||
normalizeTabOrderDoc,
|
||||
readTabOrderDoc,
|
||||
writeTabOrderDoc
|
||||
} from '@/utils/tab-order'
|
||||
|
||||
/** 表格列配置项(与 UpperTable 内部结构保持一致) */
|
||||
export interface TbycColumnConfigItem {
|
||||
prop: string
|
||||
label?: string
|
||||
visible: boolean
|
||||
order: number
|
||||
width?: number | string
|
||||
fixed?: 'left' | 'right' | false
|
||||
}
|
||||
|
||||
/** 单张表的列配置档案(与 UpperTable 的 TableColumnProfile 保持一致) */
|
||||
export interface TbycColumnProfile {
|
||||
schemaVersion: number
|
||||
tableId: string
|
||||
userId: string
|
||||
roleId: string | number
|
||||
updatedAt: number
|
||||
columns: TbycColumnConfigItem[]
|
||||
}
|
||||
|
||||
export interface TbycConfigSection {
|
||||
/** 分区 key(写入 sections[ key ]) */
|
||||
key: string
|
||||
/** 展示名称(导入结果提示用) */
|
||||
title: string
|
||||
collect: () => unknown
|
||||
apply: (data: unknown) => number
|
||||
}
|
||||
|
||||
const COLUMN_STORAGE_PREFIX = 'upper_table_columns_'
|
||||
|
||||
/** 当前身份(与 UpperTable 的字段配置 key 规则保持一致) */
|
||||
function currentIdentity(): { userId: string; roleId: string | number } {
|
||||
const userStore = useUserStore()
|
||||
const userId = String(userStore.user?.username || userStore.user?.id || 'unknown')
|
||||
const roleId = userStore.roleId || 'default'
|
||||
return { userId, roleId }
|
||||
}
|
||||
|
||||
function columnStoragePrefix(): string {
|
||||
const { userId, roleId } = currentIdentity()
|
||||
return `${COLUMN_STORAGE_PREFIX}${userId}_${roleId}_`
|
||||
}
|
||||
|
||||
/** ============ 分区 1:字段设置(表格列配置) ============ */
|
||||
const fieldColumnsSection: TbycConfigSection = {
|
||||
key: 'fieldColumns',
|
||||
title: '字段设置',
|
||||
collect: () => {
|
||||
const prefix = columnStoragePrefix()
|
||||
const profiles: TbycColumnProfile[] = []
|
||||
Object.keys(localStorage).forEach((key) => {
|
||||
if (!key.startsWith(prefix)) return
|
||||
try {
|
||||
const parsed = JSON.parse(localStorage.getItem(key) || '{}') as TbycColumnProfile
|
||||
if (parsed?.tableId && Array.isArray(parsed.columns)) profiles.push(parsed)
|
||||
} catch {
|
||||
// 忽略损坏的配置
|
||||
}
|
||||
})
|
||||
return profiles.length ? profiles : undefined
|
||||
},
|
||||
apply: (data) => {
|
||||
if (!Array.isArray(data)) return 0
|
||||
const prefix = columnStoragePrefix()
|
||||
const { userId, roleId } = currentIdentity()
|
||||
let count = 0
|
||||
data.forEach((profile: any) => {
|
||||
if (!profile?.tableId || !Array.isArray(profile.columns)) return
|
||||
const payload: TbycColumnProfile = {
|
||||
schemaVersion: Number(profile.schemaVersion) || 1,
|
||||
tableId: String(profile.tableId),
|
||||
userId,
|
||||
roleId,
|
||||
updatedAt: Date.now(),
|
||||
columns: profile.columns as TbycColumnConfigItem[]
|
||||
}
|
||||
try {
|
||||
localStorage.setItem(`${prefix}${payload.tableId}`, JSON.stringify(payload))
|
||||
count += 1
|
||||
} catch {
|
||||
// localStorage 不可用时跳过
|
||||
}
|
||||
})
|
||||
return count
|
||||
}
|
||||
}
|
||||
|
||||
/** ============ 分区 2:标签排序 / 默认页签 ============ */
|
||||
const tabOrderSection: TbycConfigSection = {
|
||||
key: 'tabOrder',
|
||||
title: '标签排序',
|
||||
collect: () => {
|
||||
const doc = readTabOrderDoc()
|
||||
return Object.keys(doc.orders).length || Object.keys(doc.defaults).length ? doc : undefined
|
||||
},
|
||||
apply: (data) => {
|
||||
const incoming = normalizeTabOrderDoc(data)
|
||||
const known = new Set(getTabOrderPageKeys())
|
||||
const current = readTabOrderDoc()
|
||||
const orders = { ...current.orders }
|
||||
const defaults = { ...current.defaults }
|
||||
let orderCount = 0
|
||||
let defaultCount = 0
|
||||
|
||||
Object.keys(incoming.orders).forEach((key) => {
|
||||
if (!known.has(key)) return
|
||||
const order = incoming.orders[key]
|
||||
if (!order) return
|
||||
orders[key] = order
|
||||
orderCount += 1
|
||||
})
|
||||
Object.keys(incoming.defaults).forEach((key) => {
|
||||
if (!known.has(key)) return
|
||||
const defaultName = incoming.defaults[key]
|
||||
if (!defaultName) return
|
||||
defaults[key] = defaultName
|
||||
defaultCount += 1
|
||||
})
|
||||
|
||||
// 注意:用户可能只设置了“默认标签”而不调整顺序(orders 为空),
|
||||
// 此时也必须写回,否则默认标签会丢失。
|
||||
if (orderCount > 0 || defaultCount > 0) {
|
||||
writeTabOrderDoc({ version: 1, orders, defaults })
|
||||
}
|
||||
return orderCount + defaultCount
|
||||
}
|
||||
}
|
||||
|
||||
/** ============ 分区 3:界面显示(settings store) ============ */
|
||||
const DISPLAY_BOOLEAN_KEYS = [
|
||||
'showSettings',
|
||||
'tagsView',
|
||||
'fixedHeader',
|
||||
'sidebarLogo',
|
||||
'shortcutExpanded'
|
||||
] as const
|
||||
|
||||
const DISPLAY_ENUM_KEYS: Record<string, readonly string[]> = {
|
||||
layoutMode: ['sidebar', 'top-bottom'],
|
||||
toolbarMode: ['tile', 'collapse'],
|
||||
scanBoxMode: ['standard', 'compact']
|
||||
}
|
||||
|
||||
const displaySection: TbycConfigSection = {
|
||||
key: 'display',
|
||||
title: '界面显示',
|
||||
collect: () => {
|
||||
const settings = useSettingsStore()
|
||||
return {
|
||||
showSettings: settings.showSettings,
|
||||
tagsView: settings.tagsView,
|
||||
fixedHeader: settings.fixedHeader,
|
||||
sidebarLogo: settings.sidebarLogo,
|
||||
shortcutExpanded: settings.shortcutExpanded,
|
||||
layoutMode: settings.layoutMode,
|
||||
toolbarMode: settings.toolbarMode,
|
||||
scanBoxMode: settings.scanBoxMode
|
||||
}
|
||||
},
|
||||
apply: (data) => {
|
||||
if (!data || typeof data !== 'object' || Array.isArray(data)) return 0
|
||||
const source = data as Record<string, any>
|
||||
const settings = useSettingsStore()
|
||||
let count = 0
|
||||
|
||||
DISPLAY_BOOLEAN_KEYS.forEach((key) => {
|
||||
const value = source[key]
|
||||
if (typeof value !== 'boolean') return
|
||||
settings.changeSetting({ key, value })
|
||||
count += 1
|
||||
})
|
||||
Object.keys(DISPLAY_ENUM_KEYS).forEach((key) => {
|
||||
const value = source[key]
|
||||
if (typeof value !== 'string') return
|
||||
if (!DISPLAY_ENUM_KEYS[key]!.includes(value)) return
|
||||
settings.changeSetting({ key, value })
|
||||
count += 1
|
||||
})
|
||||
|
||||
return count
|
||||
}
|
||||
}
|
||||
|
||||
/** ============ 分区 4:快捷键 ============ */
|
||||
const shortcutsSection: TbycConfigSection = {
|
||||
key: 'shortcuts',
|
||||
title: '快捷键',
|
||||
collect: () => {
|
||||
const shortcuts = useShortcutsStore().shortcuts
|
||||
return shortcuts.length ? shortcuts : undefined
|
||||
},
|
||||
apply: (data) => {
|
||||
if (!Array.isArray(data)) return 0
|
||||
const items = data
|
||||
.filter((item: any) => item && typeof item.path === 'string' && typeof item.title === 'string')
|
||||
.map((item: any) => ({
|
||||
title: String(item.title),
|
||||
path: String(item.path),
|
||||
...(typeof item.icon === 'string' ? { icon: item.icon } : {})
|
||||
}))
|
||||
if (!items.length) return 0
|
||||
// store 内部 watch(deep) 会自动持久化
|
||||
useShortcutsStore().shortcuts = items
|
||||
return items.length
|
||||
}
|
||||
}
|
||||
|
||||
export const TBYC_CONFIG_SECTIONS: TbycConfigSection[] = [
|
||||
fieldColumnsSection,
|
||||
tabOrderSection,
|
||||
displaySection,
|
||||
shortcutsSection
|
||||
]
|
||||
|
||||
/** 按 key 取分区 */
|
||||
export function getTbycConfigSection(key: string): TbycConfigSection | undefined {
|
||||
return TBYC_CONFIG_SECTIONS.find((section) => section.key === key)
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
import { createApp, watch } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import ElementPlus from 'element-plus'
|
||||
// Element Plus 组件由 unplugin-vue-components 按需自动引入(见 vite.config.ts),
|
||||
// 这里只保留全量样式,避免漏样式。
|
||||
import 'element-plus/dist/index.css'
|
||||
import 'virtual:svg-icons-register'
|
||||
|
||||
@ -39,7 +40,6 @@ const pinia = createPinia()
|
||||
app.use(pinia)
|
||||
app.use(router)
|
||||
app.use(i18n)
|
||||
app.use(ElementPlus)
|
||||
|
||||
// 加载服务器国际化翻译
|
||||
loadServerMessages()
|
||||
|
||||
@ -18,8 +18,10 @@ interface PreferenceEntry {
|
||||
}
|
||||
|
||||
interface State {
|
||||
/** scope → { value, updated_at } */
|
||||
/** 仓库级 scope → { value, updated_at }(分用户 + 分仓库) */
|
||||
map: Record<string, PreferenceEntry>
|
||||
/** 用户级 scope → { value, updated_at }(仅分用户,不分仓库) */
|
||||
globalMap: Record<string, PreferenceEntry>
|
||||
/** 会话内是否已 load 过 */
|
||||
isLoaded: boolean
|
||||
/** 最近一次 load 时间戳 */
|
||||
@ -28,6 +30,13 @@ interface State {
|
||||
|
||||
const STORAGE_PREFIX = 'user_prefs_'
|
||||
|
||||
/**
|
||||
* 用户级(不分仓库)scope 白名单:
|
||||
* - 读取:getGlobal 优先 globalMap,其次回退 map(兼容历史上写进仓库 key 的旧数据)
|
||||
* - 迁移:旧 key → 仓库 key 时**排除**这些 scope,避免在仓库 key 里留下会被回滚读到的陈旧副本
|
||||
*/
|
||||
export const USER_GLOBAL_SCOPES = ['tabOrder']
|
||||
|
||||
/** 稳定取当前用户标识:employees_id > id > roleId,取不到用 'unknown' */
|
||||
function currentUserId(): string {
|
||||
const userStore = useUserStore()
|
||||
@ -70,6 +79,7 @@ function readParsed(key: string): Record<string, PreferenceEntry> | null {
|
||||
export const useUserPreferenceStore = defineStore('userPreference', {
|
||||
state: (): State => ({
|
||||
map: {},
|
||||
globalMap: {},
|
||||
isLoaded: false,
|
||||
lastLoadedAt: 0
|
||||
}),
|
||||
@ -88,18 +98,30 @@ export const useUserPreferenceStore = defineStore('userPreference', {
|
||||
if (!parsed && key !== legacy) {
|
||||
const fromLegacy = readParsed(legacy)
|
||||
if (fromLegacy) {
|
||||
parsed = fromLegacy
|
||||
// 一次性迁移:写回新 key;旧 key 保留(保守,便于回滚)
|
||||
try {
|
||||
localStorage.setItem(key, JSON.stringify(fromLegacy))
|
||||
} catch {
|
||||
// 忽略:降级为内存态
|
||||
// 一次性迁移:只迁移「仓库级」scope;用户级 scope 留在旧 key(globalMap)读取
|
||||
const migrated: Record<string, PreferenceEntry> = {}
|
||||
Object.keys(fromLegacy).forEach((scope) => {
|
||||
if (USER_GLOBAL_SCOPES.includes(scope)) return
|
||||
const entry = fromLegacy[scope]
|
||||
if (!entry) return
|
||||
migrated[scope] = entry
|
||||
})
|
||||
parsed = migrated
|
||||
if (Object.keys(migrated).length) {
|
||||
try {
|
||||
localStorage.setItem(key, JSON.stringify(migrated))
|
||||
} catch {
|
||||
// 忽略:降级为内存态
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.map = parsed ?? {}
|
||||
// 用户级层:无仓库上下文时与 map 共用同一份数据(key === legacy)
|
||||
this.globalMap = key === legacy ? {} : (readParsed(legacy) ?? {})
|
||||
} catch {
|
||||
this.map = {}
|
||||
this.globalMap = {}
|
||||
}
|
||||
this.isLoaded = true
|
||||
this.lastLoadedAt = Date.now()
|
||||
@ -124,11 +146,60 @@ export const useUserPreferenceStore = defineStore('userPreference', {
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 读取「用户级(不分仓库)」scope:
|
||||
* 优先 globalMap;缺失时回退 map(兼容历史上写进仓库 key 的旧数据)。
|
||||
*/
|
||||
getGlobal(scope: string): any {
|
||||
return (this.globalMap[scope] ?? this.map[scope])?.value
|
||||
},
|
||||
|
||||
/** 写入「用户级(不分仓库)」scope:本地立即生效 + 持久化到 user_prefs_{userId} */
|
||||
setGlobal(scope: string, value: any) {
|
||||
this.globalMap[scope] = { value, updated_at: Date.now() }
|
||||
this.persistGlobal()
|
||||
},
|
||||
|
||||
/** 删除「用户级(不分仓库)」scope */
|
||||
resetGlobal(scope: string) {
|
||||
let changed = false
|
||||
if (scope in this.globalMap) {
|
||||
delete this.globalMap[scope]
|
||||
changed = true
|
||||
}
|
||||
// 同步清掉可能残留在仓库层的旧副本
|
||||
if (scope in this.map) {
|
||||
delete this.map[scope]
|
||||
this.persist()
|
||||
changed = true
|
||||
}
|
||||
if (changed) this.persistGlobal()
|
||||
},
|
||||
|
||||
/** 写入 localStorage(按当前 identity key);禁用/超限等异常静默降级为内存态,不阻塞页面 */
|
||||
persist() {
|
||||
const key = currentStorageKey()
|
||||
const legacy = legacyStorageKey()
|
||||
try {
|
||||
localStorage.setItem(key, JSON.stringify(this.map))
|
||||
// 无仓库上下文时仓库层与用户层共用同一个 key,需要合并写入
|
||||
const payload = key === legacy ? { ...this.map, ...this.globalMap } : this.map
|
||||
localStorage.setItem(key, JSON.stringify(payload))
|
||||
} catch {
|
||||
// 忽略:降级为内存态
|
||||
}
|
||||
},
|
||||
|
||||
/** 写入用户级 localStorage(user_prefs_{userId});与已有内容合并,避免抹掉其它仓库的回退数据 */
|
||||
persistGlobal() {
|
||||
const key = currentStorageKey()
|
||||
const legacy = legacyStorageKey()
|
||||
try {
|
||||
if (key === legacy) {
|
||||
localStorage.setItem(legacy, JSON.stringify({ ...this.map, ...this.globalMap }))
|
||||
return
|
||||
}
|
||||
const existing = readParsed(legacy) ?? {}
|
||||
localStorage.setItem(legacy, JSON.stringify({ ...existing, ...this.globalMap }))
|
||||
} catch {
|
||||
// 忽略:降级为内存态
|
||||
}
|
||||
|
||||
0
src/types/components.d.ts
vendored
0
src/types/components.d.ts
vendored
30
src/utils/echarts.ts
Normal file
30
src/utils/echarts.ts
Normal file
@ -0,0 +1,30 @@
|
||||
/**
|
||||
* ECharts 按需引入(目前仅 dashboard 图表使用)
|
||||
*
|
||||
* 全量 `import * as echarts from 'echarts'` 会把整个 echarts(约 1.1MB)打进产物,
|
||||
* 而项目只用到「折线图 + 饼图 + 网格/提示框/图例」这几样。
|
||||
* 这里统一注册所需模块,新增图表类型时在下方 use([...]) 里补充即可。
|
||||
*
|
||||
* 用法:
|
||||
* import { echarts, type ECharts } from '@/utils/echarts'
|
||||
*/
|
||||
import * as echarts from 'echarts/core'
|
||||
import { LineChart, PieChart } from 'echarts/charts'
|
||||
import { AxisPointerComponent, GridComponent, LegendComponent, TooltipComponent } from 'echarts/components'
|
||||
import { LabelLayout } from 'echarts/features'
|
||||
import { CanvasRenderer } from 'echarts/renderers'
|
||||
|
||||
echarts.use([
|
||||
LineChart,
|
||||
PieChart,
|
||||
GridComponent,
|
||||
TooltipComponent,
|
||||
LegendComponent,
|
||||
// 折线图 tooltip 用了 axisPointer: { type: 'cross' }
|
||||
AxisPointerComponent,
|
||||
LabelLayout,
|
||||
CanvasRenderer
|
||||
])
|
||||
|
||||
export { echarts }
|
||||
export type { ECharts } from 'echarts/core'
|
||||
@ -1,371 +0,0 @@
|
||||
//src/utils/overlookControls.js
|
||||
|
||||
import * as THREE from 'three'
|
||||
|
||||
// 辅助函数:厘米转Three.js单位(1单位=1cm)
|
||||
const cm = (value) => value // Three.js中直接使用厘米为单位
|
||||
|
||||
export class OverlookControls {
|
||||
constructor(camera, domElement, scene, config = {}) {
|
||||
this.camera = camera
|
||||
this.domElement = domElement
|
||||
this.scene = scene
|
||||
this.enabled = true
|
||||
|
||||
// 2.5D视角固定参数
|
||||
this.cameraAngle = Math.PI / 4 // 45度固定角度
|
||||
this.cameraPitch = 70 // 70度俯仰角(LOL风格)
|
||||
this.targetHeight = cm(0) // 目标在地面
|
||||
|
||||
// 相机高度(缩放)
|
||||
this.cameraHeight = cm(8000) // 初始高度80米
|
||||
this.minHeight = cm(4000) // 最小高度40米
|
||||
this.maxHeight = cm(20000) // 最大高度200米
|
||||
|
||||
// 目标位置(镜头中心点)
|
||||
this.target = new THREE.Vector3(0, 0, 0)
|
||||
|
||||
// 视野边界参数(类似LOL地图边界)
|
||||
this.boundaryMinX = config.boundaryMinX || cm(-30000)
|
||||
this.boundaryMaxX = config.boundaryMaxX || cm(30000)
|
||||
this.boundaryMinZ = config.boundaryMinZ || cm(-30000)
|
||||
this.boundaryMaxZ = config.boundaryMaxZ || cm(30000)
|
||||
|
||||
// 移动速度(厘米/秒)- 键盘速度加速2倍
|
||||
this.moveSpeed = {
|
||||
keyboard: cm(1600), // 键盘移动速度(原800 * 2)
|
||||
drag: cm(0.5) // 拖拽灵敏度系数
|
||||
}
|
||||
|
||||
// 鼠标拖拽控制
|
||||
this.isDragging = false
|
||||
this.dragStart = new THREE.Vector2()
|
||||
this.dragCurrent = new THREE.Vector2()
|
||||
this.lastDragPos = new THREE.Vector2()
|
||||
|
||||
// 点击地面检测
|
||||
this.raycaster = new THREE.Raycaster()
|
||||
this.mouse = new THREE.Vector2()
|
||||
this.groundObjects = []
|
||||
|
||||
// 键盘控制状态
|
||||
this.keys = {
|
||||
w: false, a: false, s: false, d: false,
|
||||
up: false, left: false, down: false, right: false
|
||||
}
|
||||
|
||||
// 区域边界检测
|
||||
this.areaBoundaries = []
|
||||
this.onAreaClick = null
|
||||
|
||||
// 初始化
|
||||
this.initControls()
|
||||
this.updateCameraPosition()
|
||||
}
|
||||
|
||||
initControls() {
|
||||
const canvas = this.domElement
|
||||
|
||||
// 鼠标按下开始拖拽
|
||||
const onMouseDown = (e) => {
|
||||
if (!this.enabled || e.button !== 0) return // 只响应左键
|
||||
|
||||
e.preventDefault()
|
||||
this.isDragging = true
|
||||
this.dragStart.set(e.clientX, e.clientY)
|
||||
this.lastDragPos.set(e.clientX, e.clientY)
|
||||
canvas.style.cursor = 'grabbing'
|
||||
}
|
||||
|
||||
// 鼠标移动处理拖拽
|
||||
const onMouseMove = (e) => {
|
||||
if (!this.enabled) return
|
||||
|
||||
this.dragCurrent.set(e.clientX, e.clientY)
|
||||
|
||||
if (this.isDragging) {
|
||||
const deltaX = this.dragCurrent.x - this.lastDragPos.x
|
||||
const deltaY = this.dragCurrent.y - this.lastDragPos.y
|
||||
|
||||
// 根据拖拽距离移动视角
|
||||
const moveX = -deltaX * this.moveSpeed.drag
|
||||
const moveZ = -deltaY * this.moveSpeed.drag
|
||||
|
||||
// 根据固定45度角度旋转移动方向
|
||||
const angle = -this.cameraAngle
|
||||
const cos = Math.cos(angle)
|
||||
const sin = Math.sin(angle)
|
||||
|
||||
const worldMoveX = (moveX * cos - moveZ * sin)
|
||||
const worldMoveZ = (moveX * sin + moveZ * cos)
|
||||
|
||||
this.setTargetPosition(
|
||||
this.target.x + worldMoveX,
|
||||
this.target.z + worldMoveZ
|
||||
)
|
||||
|
||||
this.lastDragPos.set(e.clientX, e.clientY)
|
||||
}
|
||||
}
|
||||
|
||||
// 鼠标释放停止拖拽
|
||||
const onMouseUp = (e) => {
|
||||
if (!this.enabled || e.button !== 0) return
|
||||
|
||||
this.isDragging = false
|
||||
canvas.style.cursor = 'grab'
|
||||
|
||||
// 检查是否是点击(移动距离很小)
|
||||
const dx = this.dragCurrent.x - this.dragStart.x
|
||||
const dy = this.dragCurrent.y - this.dragStart.y
|
||||
const dragDistance = Math.sqrt(dx * dx + dy * dy)
|
||||
|
||||
if (dragDistance < 5) {
|
||||
this.handleClick(e)
|
||||
}
|
||||
}
|
||||
|
||||
// 鼠标滚轮缩放
|
||||
const onWheel = (e) => {
|
||||
if (!this.enabled) return
|
||||
|
||||
e.preventDefault()
|
||||
const delta = e.deltaY > 0 ? 1.2 : 0.8
|
||||
const newHeight = this.cameraHeight * delta
|
||||
this.cameraHeight = THREE.MathUtils.clamp(newHeight, this.minHeight, this.maxHeight)
|
||||
this.updateCameraPosition()
|
||||
}
|
||||
|
||||
// 点击检测
|
||||
const handleClick = (e) => {
|
||||
const rect = canvas.getBoundingClientRect()
|
||||
this.mouse.x = ((e.clientX - rect.left) / rect.width) * 2 - 1
|
||||
this.mouse.y = -((e.clientY - rect.top) / rect.height) * 2 + 1
|
||||
|
||||
this.raycaster.setFromCamera(this.mouse, this.camera)
|
||||
|
||||
// 1. 先检测是否点击了区域边界
|
||||
let areaClicked = false
|
||||
for (const area of this.areaBoundaries) {
|
||||
const intersects = this.raycaster.intersectObject(area.boundary)
|
||||
if (intersects.length > 0) {
|
||||
if (this.onAreaClick) {
|
||||
this.onAreaClick(area.areaId, area.areaName, area.areaType)
|
||||
}
|
||||
areaClicked = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 如果没有点击区域,检测地面(仅显示标记,不移动)
|
||||
if (!areaClicked) {
|
||||
const intersects = this.raycaster.intersectObjects(this.groundObjects)
|
||||
if (intersects.length > 0) {
|
||||
const point = intersects[0].point
|
||||
this.showClickMarker(point)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 键盘事件
|
||||
const onKeyDown = (e) => {
|
||||
if (!this.enabled) return
|
||||
|
||||
switch(e.key.toLowerCase()) {
|
||||
case 'w': case 'arrowup': this.keys.w = this.keys.up = true; break
|
||||
case 'a': case 'arrowleft': this.keys.a = this.keys.left = true; break
|
||||
case 's': case 'arrowdown': this.keys.s = this.keys.down = true; break
|
||||
case 'd': case 'arrowright': this.keys.d = this.keys.right = true; break
|
||||
}
|
||||
}
|
||||
|
||||
const onKeyUp = (e) => {
|
||||
switch(e.key.toLowerCase()) {
|
||||
case 'w': case 'arrowup': this.keys.w = this.keys.up = false; break
|
||||
case 'a': case 'arrowleft': this.keys.a = this.keys.left = false; break
|
||||
case 's': case 'arrowdown': this.keys.s = this.keys.down = false; break
|
||||
case 'd': case 'arrowright': this.keys.d = this.keys.right = false; break
|
||||
}
|
||||
}
|
||||
|
||||
// 添加事件监听器
|
||||
canvas.addEventListener('mousedown', onMouseDown)
|
||||
canvas.addEventListener('mousemove', onMouseMove)
|
||||
canvas.addEventListener('mouseup', onMouseUp)
|
||||
canvas.addEventListener('wheel', onWheel)
|
||||
|
||||
// 键盘事件监听在window上
|
||||
window.addEventListener('keydown', onKeyDown)
|
||||
window.addEventListener('keyup', onKeyUp)
|
||||
|
||||
// 鼠标离开画布时停止拖拽
|
||||
canvas.addEventListener('mouseleave', () => {
|
||||
if (this.isDragging) {
|
||||
this.isDragging = false
|
||||
canvas.style.cursor = 'grab'
|
||||
}
|
||||
})
|
||||
|
||||
// 初始化光标样式
|
||||
canvas.style.cursor = 'grab'
|
||||
|
||||
// 保存事件处理器以便清理
|
||||
this.eventHandlers = {
|
||||
onMouseDown, onMouseMove, onMouseUp, onWheel,
|
||||
onKeyDown, onKeyUp, handleClick
|
||||
}
|
||||
this.handleClick = handleClick
|
||||
}
|
||||
|
||||
setTargetPosition(x, z) {
|
||||
// 限制目标位置在边界内
|
||||
const clampedX = THREE.MathUtils.clamp(x, this.boundaryMinX, this.boundaryMaxX)
|
||||
const clampedZ = THREE.MathUtils.clamp(z, this.boundaryMinZ, this.boundaryMaxZ)
|
||||
|
||||
this.target.x = clampedX
|
||||
this.target.z = clampedZ
|
||||
|
||||
this.updateCameraPosition()
|
||||
}
|
||||
|
||||
updateCameraPosition() {
|
||||
// 固定2.5D视角计算
|
||||
const phi = THREE.MathUtils.degToRad(90 - this.cameraPitch)
|
||||
const theta = this.cameraAngle
|
||||
|
||||
const x = this.target.x + this.cameraHeight * Math.sin(phi) * Math.cos(theta)
|
||||
const y = this.target.y + this.cameraHeight * Math.cos(phi)
|
||||
const z = this.target.z + this.cameraHeight * Math.sin(phi) * Math.sin(theta)
|
||||
|
||||
this.camera.position.set(x, y, z)
|
||||
this.camera.lookAt(this.target)
|
||||
}
|
||||
|
||||
update(deltaTime) {
|
||||
if (!this.enabled) return
|
||||
|
||||
// 键盘控制(速度加倍)
|
||||
let moveX = 0, moveZ = 0
|
||||
if (this.keys.w || this.keys.up) moveZ += 1
|
||||
if (this.keys.s || this.keys.down) moveZ -= 1
|
||||
if (this.keys.a || this.keys.left) moveX -= 1
|
||||
if (this.keys.d || this.keys.right) moveX += 1
|
||||
|
||||
if (moveX !== 0 || moveZ !== 0) {
|
||||
const speed = deltaTime ? this.moveSpeed.keyboard * deltaTime * 0.16: this.moveSpeed.keyboard * 0.066
|
||||
|
||||
// 根据固定45度角度旋转移动方向
|
||||
const angle = -this.cameraAngle
|
||||
const cos = Math.cos(angle)
|
||||
const sin = Math.sin(angle)
|
||||
|
||||
const worldMoveX = (moveX * cos - moveZ * sin) * speed
|
||||
const worldMoveZ = (moveX * sin + moveZ * cos) * speed
|
||||
|
||||
this.setTargetPosition(
|
||||
this.target.x + worldMoveX,
|
||||
this.target.z + worldMoveZ
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
showClickMarker(position) {
|
||||
// 移除旧的标记
|
||||
if (this.clickMarker) {
|
||||
this.scene.remove(this.clickMarker)
|
||||
}
|
||||
|
||||
// 创建新的标记(圆形标记)
|
||||
const markerGeometry = new THREE.RingGeometry(cm(50), cm(70), 32)
|
||||
const markerMaterial = new THREE.MeshBasicMaterial({
|
||||
color: 0x00ffff,
|
||||
side: THREE.DoubleSide,
|
||||
transparent: true,
|
||||
opacity: 0.7
|
||||
})
|
||||
const marker = new THREE.Mesh(markerGeometry, markerMaterial)
|
||||
marker.position.copy(position)
|
||||
marker.position.y += cm(5) // 稍微高于地面
|
||||
marker.rotation.x = -Math.PI / 2 // 水平放置
|
||||
|
||||
this.scene.add(marker)
|
||||
this.clickMarker = marker
|
||||
|
||||
// 2秒后淡出移除
|
||||
setTimeout(() => {
|
||||
if (this.clickMarker === marker) {
|
||||
const fadeOut = () => {
|
||||
markerMaterial.opacity -= 0.05
|
||||
if (markerMaterial.opacity > 0) {
|
||||
requestAnimationFrame(fadeOut)
|
||||
} else {
|
||||
this.scene.remove(marker)
|
||||
if (this.clickMarker === marker) {
|
||||
this.clickMarker = null
|
||||
}
|
||||
}
|
||||
}
|
||||
fadeOut()
|
||||
}
|
||||
}, 2000)
|
||||
}
|
||||
|
||||
// 设置边界
|
||||
setBoundary(minX, maxX, minZ, maxZ) {
|
||||
this.boundaryMinX = cm(minX)
|
||||
this.boundaryMaxX = cm(maxX)
|
||||
this.boundaryMinZ = cm(minZ)
|
||||
this.boundaryMaxZ = cm(maxZ)
|
||||
|
||||
// 确保当前目标在边界内
|
||||
this.setTargetPosition(this.target.x, this.target.z)
|
||||
}
|
||||
|
||||
// 添加区域边界(用于区域点击检测)
|
||||
addAreaBoundary(boundaryMesh, areaId, areaName, areaType) {
|
||||
this.areaBoundaries.push({
|
||||
boundary: boundaryMesh,
|
||||
areaId,
|
||||
areaName,
|
||||
areaType
|
||||
})
|
||||
}
|
||||
|
||||
// 设置区域点击回调
|
||||
setOnAreaClick(callback) {
|
||||
this.onAreaClick = callback
|
||||
}
|
||||
|
||||
addGroundObject(object) {
|
||||
this.groundObjects.push(object)
|
||||
}
|
||||
|
||||
// 重置视角到指定位置
|
||||
resetView(x = 0, z = 0) {
|
||||
this.setTargetPosition(x, z)
|
||||
this.cameraHeight = cm(8000)
|
||||
this.updateCameraPosition()
|
||||
}
|
||||
|
||||
dispose() {
|
||||
const canvas = this.domElement
|
||||
const handlers = this.eventHandlers
|
||||
|
||||
if (canvas && handlers) {
|
||||
canvas.removeEventListener('mousedown', handlers.onMouseDown)
|
||||
canvas.removeEventListener('mousemove', handlers.onMouseMove)
|
||||
canvas.removeEventListener('mouseup', handlers.onMouseUp)
|
||||
canvas.removeEventListener('wheel', handlers.onWheel)
|
||||
|
||||
window.removeEventListener('keydown', handlers.onKeyDown)
|
||||
window.removeEventListener('keyup', handlers.onKeyUp)
|
||||
|
||||
canvas.style.cursor = 'default'
|
||||
}
|
||||
|
||||
if (this.clickMarker) {
|
||||
this.scene.remove(this.clickMarker)
|
||||
this.clickMarker = null
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -8,6 +8,21 @@
|
||||
/** ScanBox 筛选字段分组:基础信息 + 工作流程(工作流程字段以 label 为分组名) */
|
||||
export const SCAN_BASIC_INFO_GROUP = '基础信息'
|
||||
|
||||
/**
|
||||
* 通用批量查询操作符(单号类 / 文本类字段):支持 IN(逗号分隔)批量查询
|
||||
* 从 order-common-config 抽离,与订单业务无关。
|
||||
*/
|
||||
export const ORDER_BULK_SEARCH_OPERATORS = ['eq', 'ne', 'like', 'notlike', 'contains', 'in', 'notin', 'startswith', 'endswith']
|
||||
|
||||
/** 「包含商品」通用筛选项 */
|
||||
export const stockQueryScanField = scanBasicField({
|
||||
label: '包含商品',
|
||||
value: 'stock_query',
|
||||
type: 'text',
|
||||
operators: ORDER_BULK_SEARCH_OPERATORS,
|
||||
defaultOperator: 'like'
|
||||
})
|
||||
|
||||
/** 为 ScanBox 基础信息字段附加分组标签 */
|
||||
export function scanBasicField(field: Record<string, any>) {
|
||||
return { ...field, group: SCAN_BASIC_INFO_GROUP }
|
||||
|
||||
119
src/utils/tab-order.ts
Normal file
119
src/utils/tab-order.ts
Normal file
@ -0,0 +1,119 @@
|
||||
/**
|
||||
* 标签排序 / 默认页签:配置文档读写与归一化
|
||||
*
|
||||
* - 存储位置:`userPreference` 的「用户级」scope `tabOrder`(按账号保存,不分仓库)
|
||||
* - 文档结构:{ version, orders: { [pageKey]: name[] }, defaults: { [pageKey]: name } }
|
||||
* - 设计文档:docs/标签排序与默认页签-统一方案.md
|
||||
*/
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
|
||||
/** 用户级 scope(写进 user_prefs_{userId},不随仓库变化) */
|
||||
export const TAB_ORDER_SCOPE = 'tabOrder'
|
||||
|
||||
/** 文档版本(结构变化时递增,读取时做兜底归一化) */
|
||||
export const TAB_ORDER_VERSION = 1
|
||||
|
||||
/** 标签项:name 为唯一键,label 仅用于展示;允许携带页面自定义字段(如角标 count) */
|
||||
export interface TabOption {
|
||||
name: string
|
||||
label: string
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
export interface TabOrderDoc {
|
||||
version: number
|
||||
/** 页面 key → 标签 name 顺序 */
|
||||
orders: Record<string, string[]>
|
||||
/** 页面 key → 默认打开的标签 name */
|
||||
defaults: Record<string, string>
|
||||
}
|
||||
|
||||
export function createEmptyTabOrderDoc(): TabOrderDoc {
|
||||
return { version: TAB_ORDER_VERSION, orders: {}, defaults: {} }
|
||||
}
|
||||
|
||||
/** 把任意来源(localStorage / 导入文件)归一化为合法文档,非法项直接丢弃 */
|
||||
export function normalizeTabOrderDoc(raw: unknown): TabOrderDoc {
|
||||
const doc = createEmptyTabOrderDoc()
|
||||
if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return doc
|
||||
const source = raw as Record<string, any>
|
||||
|
||||
const orders = source.orders
|
||||
if (orders && typeof orders === 'object' && !Array.isArray(orders)) {
|
||||
Object.keys(orders).forEach((key) => {
|
||||
const value = orders[key]
|
||||
if (!Array.isArray(value)) return
|
||||
const names = value.filter((n): n is string => typeof n === 'string' && !!n)
|
||||
const unique = Array.from(new Set(names))
|
||||
if (unique.length) doc.orders[key] = unique
|
||||
})
|
||||
}
|
||||
|
||||
const defaults = source.defaults
|
||||
if (defaults && typeof defaults === 'object' && !Array.isArray(defaults)) {
|
||||
Object.keys(defaults).forEach((key) => {
|
||||
const value = defaults[key]
|
||||
if (typeof value === 'string' && value) doc.defaults[key] = value
|
||||
})
|
||||
}
|
||||
|
||||
return doc
|
||||
}
|
||||
|
||||
/** 读取当前账号的排序文档(用户级,不分仓库) */
|
||||
export function readTabOrderDoc(): TabOrderDoc {
|
||||
return normalizeTabOrderDoc(useUserPreferenceStore().getGlobal(TAB_ORDER_SCOPE))
|
||||
}
|
||||
|
||||
/** 写回排序文档(整体覆盖,调用方负责合并) */
|
||||
export function writeTabOrderDoc(doc: TabOrderDoc): void {
|
||||
useUserPreferenceStore().setGlobal(TAB_ORDER_SCOPE, normalizeTabOrderDoc(doc))
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改文档:浅拷贝后交给 mutator,再整体写回。
|
||||
* 返回写入后的文档,便于调用方继续使用。
|
||||
*/
|
||||
export function updateTabOrderDoc(mutator: (draft: TabOrderDoc) => void): TabOrderDoc {
|
||||
const doc = readTabOrderDoc()
|
||||
const draft: TabOrderDoc = {
|
||||
version: TAB_ORDER_VERSION,
|
||||
orders: { ...doc.orders },
|
||||
defaults: { ...doc.defaults }
|
||||
}
|
||||
mutator(draft)
|
||||
writeTabOrderDoc(draft)
|
||||
return draft
|
||||
}
|
||||
|
||||
/** 判断标签名是否属于当前页面的可用标签集合 */
|
||||
export function isValidTabName(name: unknown, tabs: TabOption[]): boolean {
|
||||
if (typeof name !== 'string' || !name) return false
|
||||
return tabs.some((tab) => tab.name === name)
|
||||
}
|
||||
|
||||
/**
|
||||
* 归一化顺序:剔除非法 / 重复项,缺失的标签按「传入默认顺序」补在末尾。
|
||||
* 返回的一定是当前 tabs 的完整 name 列表(顺序可能被调整)。
|
||||
*/
|
||||
export function normalizeTabOrder(order: unknown, tabs: TabOption[]): string[] {
|
||||
const byName = new Map(tabs.map((tab) => [tab.name, tab]))
|
||||
const result: string[] = []
|
||||
if (Array.isArray(order)) {
|
||||
order.forEach((name) => {
|
||||
if (typeof name !== 'string' || !byName.has(name)) return
|
||||
if (result.includes(name)) return
|
||||
result.push(name)
|
||||
})
|
||||
}
|
||||
tabs.forEach((tab) => {
|
||||
if (!result.includes(tab.name)) result.push(tab.name)
|
||||
})
|
||||
return result
|
||||
}
|
||||
|
||||
/** 按 name 顺序重排标签对象数组(缺失项补末尾,非法项剔除) */
|
||||
export function applyTabOrder(order: unknown, tabs: TabOption[]): TabOption[] {
|
||||
const byName = new Map(tabs.map((tab) => [tab.name, tab]))
|
||||
return normalizeTabOrder(order, tabs).map((name) => byName.get(name)!)
|
||||
}
|
||||
75
src/utils/tbyc-config.ts
Normal file
75
src/utils/tbyc-config.ts
Normal file
@ -0,0 +1,75 @@
|
||||
/**
|
||||
* 天豹云仓统一配置文件(tbyc-config.json)
|
||||
*
|
||||
* 结构:
|
||||
* {
|
||||
* "format": "tbyc-config",
|
||||
* "version": 1,
|
||||
* "exportedAt": 1762500000000,
|
||||
* "user": { "userId": "...", "roleId": "..." },
|
||||
* "sections": {
|
||||
* "fieldColumns": [...], // 字段设置(表格列配置)
|
||||
* "tabOrder": { ... }, // 标签排序 / 默认页签
|
||||
* "display": { ... }, // 界面显示
|
||||
* "shortcuts": [...] // 快捷键
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* 新增一类可导入导出的配置 = 在 `src/config/tbyc-config-sections.ts` 注册一个分区,
|
||||
* 本文件与调用方(UpperTable)无需改动。
|
||||
*/
|
||||
|
||||
export const TBYC_CONFIG_FORMAT = 'tbyc-config'
|
||||
export const TBYC_CONFIG_VERSION = 1
|
||||
export const TBYC_CONFIG_FILENAME = 'tbyc-config.json'
|
||||
|
||||
export interface TbycConfigUser {
|
||||
userId: string
|
||||
roleId: string
|
||||
}
|
||||
|
||||
export interface TbycConfigFile {
|
||||
format: string
|
||||
version: number
|
||||
exportedAt: number
|
||||
user: TbycConfigUser
|
||||
sections: Record<string, unknown>
|
||||
}
|
||||
|
||||
/** 组装配置文件对象(空分区自动剔除) */
|
||||
export function buildTbycConfig(
|
||||
user: TbycConfigUser,
|
||||
sections: Record<string, unknown>
|
||||
): TbycConfigFile {
|
||||
const cleaned: Record<string, unknown> = {}
|
||||
Object.keys(sections).forEach((key) => {
|
||||
const value = sections[key]
|
||||
if (value === undefined || value === null) return
|
||||
cleaned[key] = value
|
||||
})
|
||||
return {
|
||||
format: TBYC_CONFIG_FORMAT,
|
||||
version: TBYC_CONFIG_VERSION,
|
||||
exportedAt: Date.now(),
|
||||
user,
|
||||
sections: cleaned
|
||||
}
|
||||
}
|
||||
|
||||
/** 是否为新版统一配置文件 */
|
||||
export function isTbycConfig(raw: unknown): raw is TbycConfigFile {
|
||||
return !!raw && typeof raw === 'object' && (raw as any).format === TBYC_CONFIG_FORMAT
|
||||
}
|
||||
|
||||
/** 下载 JSON 文件 */
|
||||
export function downloadJsonFile(filename: string, data: unknown): void {
|
||||
const blob = new Blob([JSON.stringify(data, null, 2)], {
|
||||
type: 'application/json;charset=utf-8'
|
||||
})
|
||||
const url = URL.createObjectURL(blob)
|
||||
const link = document.createElement('a')
|
||||
link.href = url
|
||||
link.download = filename
|
||||
link.click()
|
||||
URL.revokeObjectURL(url)
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,390 +0,0 @@
|
||||
|
||||
import * as THREE from 'three'
|
||||
|
||||
// 使用 Three.js 自带的 OrbitControls
|
||||
let OrbitControls = null
|
||||
|
||||
// 异步加载 OrbitControls
|
||||
export const loadOrbitControls = async () => {
|
||||
if (typeof window === 'undefined') return null
|
||||
|
||||
try {
|
||||
const module = await import('three/examples/jsm/controls/OrbitControls.js')
|
||||
OrbitControls = module.OrbitControls
|
||||
console.log('OrbitControls 加载成功')
|
||||
return OrbitControls
|
||||
} catch (error) {
|
||||
console.warn('无法加载 OrbitControls:', error.message)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
// 辅助函数:厘米转Three.js单位(1单位=1cm)
|
||||
const cm = (value) => value// Three.js中直接使用厘米为单位
|
||||
|
||||
// 俯瞰模式控制器(增强版)
|
||||
|
||||
|
||||
// 漫游模式控制器(第一人称)- 增强版
|
||||
export class RoamControls {
|
||||
constructor(camera, domElement, scene) {
|
||||
this.camera = camera
|
||||
this.domElement = domElement
|
||||
this.scene = scene
|
||||
this.enabled = true
|
||||
|
||||
// 漫游参数 - 厘米为单位
|
||||
this.moveSpeed = cm(30)// 每秒移动30厘米
|
||||
this.rotateSpeed = 0.002
|
||||
this.jumpForce = cm(50)
|
||||
this.gravity = cm(2)
|
||||
|
||||
// 移动状态
|
||||
this.moveForward = false
|
||||
this.moveBackward = false
|
||||
this.moveLeft = false
|
||||
this.moveRight = false
|
||||
this.moveUp = false
|
||||
this.moveDown = false
|
||||
|
||||
// 视角控制
|
||||
this.isMouseDown = false
|
||||
this.lastMouseX = 0
|
||||
this.lastMouseY = 0
|
||||
this.yaw = 0
|
||||
this.pitch = 0
|
||||
|
||||
// 物理参数
|
||||
this.velocity = new THREE.Vector3()
|
||||
this.onGround = true
|
||||
this.groundHeight = 0
|
||||
|
||||
// 碰撞检测
|
||||
this.collisionObjects = []
|
||||
this.raycaster = new THREE.Raycaster()
|
||||
this.mouse = new THREE.Vector2()
|
||||
|
||||
// 点击检测
|
||||
this.clickableObjects = []// 可点击对象(货架格子)
|
||||
this.onObjectClick = null// 对象点击回调
|
||||
|
||||
// 控制面板
|
||||
this.showUI = true
|
||||
this.uiElements = {}
|
||||
|
||||
this.initControls()
|
||||
this.updateCameraRotation()
|
||||
}
|
||||
|
||||
initControls() {
|
||||
const canvas = this.domElement
|
||||
|
||||
// 鼠标控制
|
||||
const onMouseDown = (e) => {
|
||||
this.isMouseDown = true
|
||||
this.lastMouseX = e.clientX
|
||||
this.lastMouseY = e.clientY
|
||||
canvas.style.cursor = 'none'
|
||||
|
||||
// 请求指针锁定
|
||||
if (canvas.requestPointerLock) {
|
||||
canvas.requestPointerLock()
|
||||
} else if (canvas.mozRequestPointerLock) {
|
||||
canvas.mozRequestPointerLock()
|
||||
} else if (canvas.webkitRequestPointerLock) {
|
||||
canvas.webkitRequestPointerLock()
|
||||
}
|
||||
}
|
||||
|
||||
const onMouseMove = (e) => {
|
||||
if (!this.isMouseDown || !this.enabled) return
|
||||
|
||||
const movementX = e.movementX || e.mozMovementX || e.webkitMovementX || 0
|
||||
const movementY = e.movementY || e.mozMovementY || e.webkitMovementY || 0
|
||||
|
||||
// 更新视角
|
||||
this.yaw -= movementX * this.rotateSpeed
|
||||
this.pitch -= movementY * this.rotateSpeed
|
||||
|
||||
// 限制俯仰角度
|
||||
this.pitch = Math.max(-Math.PI/2, Math.min(Math.PI/2, this.pitch))
|
||||
|
||||
this.updateCameraRotation()
|
||||
}
|
||||
|
||||
const onMouseUp = (e) => {
|
||||
this.isMouseDown = false
|
||||
canvas.style.cursor = 'grab'
|
||||
|
||||
// 退出指针锁定
|
||||
if (document.exitPointerLock) {
|
||||
document.exitPointerLock()
|
||||
} else if (document.mozExitPointerLock) {
|
||||
document.mozExitPointerLock()
|
||||
} else if (document.webkitExitPointerLock) {
|
||||
document.webkitExitPointerLock()
|
||||
}
|
||||
|
||||
// 检测点击对象
|
||||
if (this.clickableObjects.length > 0 && this.onObjectClick) {
|
||||
const rect = canvas.getBoundingClientRect()
|
||||
this.mouse.x = ((e.clientX - rect.left) / rect.width) * 2 - 1
|
||||
this.mouse.y = -((e.clientY - rect.top) / rect.height) * 2 + 1
|
||||
|
||||
this.raycaster.setFromCamera(this.mouse, this.camera)
|
||||
const intersects = this.raycaster.intersectObjects(this.clickableObjects, true)
|
||||
|
||||
if (intersects.length > 0) {
|
||||
const object = intersects[0].object
|
||||
let shelfCell = object
|
||||
// 向上查找带有货架信息的父对象
|
||||
while (shelfCell && !shelfCell.userData.shelfCellId) {
|
||||
shelfCell = shelfCell.parent
|
||||
}
|
||||
if (shelfCell && shelfCell.userData.shelfCellId) {
|
||||
this.onObjectClick(
|
||||
shelfCell.userData.shelfCellId,
|
||||
shelfCell.userData.shelfRow,
|
||||
shelfCell.userData.shelfColumn,
|
||||
shelfCell.userData.shelfLevel
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 键盘控制
|
||||
const onKeyDown = (e) => {
|
||||
switch(e.code){
|
||||
case 'KeyW':
|
||||
case 'ArrowUp':
|
||||
this.moveForward = true
|
||||
break
|
||||
case 'KeyS':
|
||||
case 'ArrowDown':
|
||||
this.moveBackward = true
|
||||
break
|
||||
case 'KeyA':
|
||||
case 'ArrowLeft':
|
||||
this.moveLeft = true
|
||||
break
|
||||
case 'KeyD':
|
||||
case 'ArrowRight':
|
||||
this.moveRight = true
|
||||
break
|
||||
case 'Space':
|
||||
if (this.onGround) {
|
||||
this.velocity.y = this.jumpForce
|
||||
this.onGround = false
|
||||
}
|
||||
break
|
||||
case 'ShiftLeft':
|
||||
case 'ShiftRight':
|
||||
this.moveDown = true
|
||||
break
|
||||
case 'Escape':
|
||||
// ESC键返回俯瞰模式
|
||||
if (this.onExitRoam) {
|
||||
this.onExitRoam()
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
const onKeyUp = (e) => {
|
||||
switch(e.code){
|
||||
case 'KeyW':
|
||||
case 'ArrowUp':
|
||||
this.moveForward = false
|
||||
break
|
||||
case 'KeyS':
|
||||
case 'ArrowDown':
|
||||
this.moveBackward = false
|
||||
break
|
||||
case 'KeyA':
|
||||
case 'ArrowLeft':
|
||||
this.moveLeft = false
|
||||
break
|
||||
case 'KeyD':
|
||||
case 'ArrowRight':
|
||||
this.moveRight = false
|
||||
break
|
||||
case 'ShiftLeft':
|
||||
case 'ShiftRight':
|
||||
this.moveDown = false
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// 防止右键菜单
|
||||
canvas.addEventListener('contextmenu', (e) => e.preventDefault())
|
||||
|
||||
canvas.addEventListener('mousedown', onMouseDown)
|
||||
canvas.addEventListener('mousemove', onMouseMove)
|
||||
canvas.addEventListener('mouseup', onMouseUp)
|
||||
window.addEventListener('keydown', onKeyDown)
|
||||
window.addEventListener('keyup', onKeyUp)
|
||||
|
||||
// 退出指针锁定时的处理
|
||||
const onPointerLockChange = () => {
|
||||
const pointerLockElement =
|
||||
document.pointerLockElement ||
|
||||
document.mozPointerLockElement ||
|
||||
document.webkitPointerLockElement
|
||||
|
||||
if (pointerLockElement !== canvas) {
|
||||
this.isMouseDown = false
|
||||
canvas.style.cursor = 'grab'
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener('pointerlockchange', onPointerLockChange)
|
||||
document.addEventListener('mozpointerlockchange', onPointerLockChange)
|
||||
document.addEventListener('webkitpointerlockchange', onPointerLockChange)
|
||||
|
||||
// 保存事件处理器以便清理
|
||||
this.eventHandlers = {
|
||||
onMouseDown, onMouseMove, onMouseUp,
|
||||
onKeyDown, onKeyUp,
|
||||
onPointerLockChange
|
||||
}
|
||||
}
|
||||
|
||||
updateCameraRotation() {
|
||||
this.camera.rotation.order = 'YXZ'
|
||||
this.camera.rotation.y = this.yaw
|
||||
this.camera.rotation.x = this.pitch
|
||||
}
|
||||
|
||||
update() {
|
||||
if (!this.enabled) return
|
||||
|
||||
// 计算移动方向
|
||||
const direction = new THREE.Vector3()
|
||||
|
||||
if (this.moveForward) {
|
||||
direction.z -= 1
|
||||
}
|
||||
if (this.moveBackward) {
|
||||
direction.z += 1
|
||||
}
|
||||
if (this.moveLeft) {
|
||||
direction.x -= 1
|
||||
}
|
||||
if (this.moveRight) {
|
||||
direction.x += 1
|
||||
}
|
||||
|
||||
// 根据相机方向旋转移动向量
|
||||
direction.applyQuaternion(this.camera.quaternion)
|
||||
direction.y = 0
|
||||
direction.normalize()
|
||||
|
||||
// 垂直移动
|
||||
if (this.moveUp) {
|
||||
direction.y += 1
|
||||
}
|
||||
if (this.moveDown) {
|
||||
direction.y -= 1
|
||||
}
|
||||
|
||||
// 应用移动
|
||||
this.velocity.x = direction.x * this.moveSpeed
|
||||
this.velocity.z = direction.z * this.moveSpeed
|
||||
this.velocity.y = direction.y * this.moveSpeed
|
||||
|
||||
// 应用重力(如果不在跳跃状态)
|
||||
if (!this.onGround) {
|
||||
this.velocity.y -= this.gravity
|
||||
}
|
||||
|
||||
// 碰撞检测
|
||||
const newPosition = this.camera.position.clone()
|
||||
newPosition.x += this.velocity.x
|
||||
newPosition.z += this.velocity.z
|
||||
newPosition.y += this.velocity.y
|
||||
|
||||
// 简单的边界检查
|
||||
let canMove = true
|
||||
for (const obj of this.collisionObjects) {
|
||||
if (obj.geometry.boundingBox) {
|
||||
const box = obj.geometry.boundingBox.clone()
|
||||
box.applyMatrix4(obj.matrixWorld)
|
||||
|
||||
// 检查是否与物体碰撞 - 厘米为单位
|
||||
const playerBox = new THREE.Box3(
|
||||
new THREE.Vector3(newPosition.x - cm(30), newPosition.y - cm(50), newPosition.z - cm(30)),
|
||||
new THREE.Vector3(newPosition.x + cm(30), newPosition.y + cm(170), newPosition.z + cm(30))
|
||||
)
|
||||
|
||||
if (box.intersectsBox(playerBox)) {
|
||||
canMove = false
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (canMove) {
|
||||
this.camera.position.copy(newPosition)
|
||||
}
|
||||
|
||||
// 限制在地面之上 - 厘米为单位
|
||||
if (this.camera.position.y < this.groundHeight + cm(170)) {
|
||||
this.camera.position.y = this.groundHeight + cm(170)
|
||||
this.onGround = true
|
||||
this.velocity.y = 0
|
||||
} else {
|
||||
this.onGround = false
|
||||
}
|
||||
}
|
||||
|
||||
// 添加可点击对象(货架格子)
|
||||
addClickableObject(object, shelfCellId, row, column, level) {
|
||||
object.userData = {
|
||||
shelfCellId,
|
||||
shelfRow: row,
|
||||
shelfColumn: column,
|
||||
shelfLevel: level,
|
||||
isClickable: true
|
||||
}
|
||||
this.clickableObjects.push(object)
|
||||
}
|
||||
|
||||
// 设置货架格子点击回调
|
||||
setOnObjectClick(callback) {
|
||||
this.onObjectClick = callback
|
||||
}
|
||||
|
||||
// 设置退出漫游回调
|
||||
setOnExitRoam(callback) {
|
||||
this.onExitRoam = callback
|
||||
}
|
||||
|
||||
addCollisionObject(object) {
|
||||
this.collisionObjects.push(object)
|
||||
}
|
||||
|
||||
setGroundHeight(height) {
|
||||
this.groundHeight = height
|
||||
}
|
||||
|
||||
dispose() {
|
||||
const canvas = this.domElement
|
||||
const handlers = this.eventHandlers
|
||||
|
||||
if (canvas && handlers) {
|
||||
canvas.removeEventListener('mousedown', handlers.onMouseDown)
|
||||
canvas.removeEventListener('mousemove', handlers.onMouseMove)
|
||||
canvas.removeEventListener('mouseup', handlers.onMouseUp)
|
||||
canvas.removeEventListener('contextmenu', (e) => e.preventDefault())
|
||||
}
|
||||
|
||||
window.removeEventListener('keydown', handlers.onKeyDown)
|
||||
window.removeEventListener('keyup', handlers.onKeyUp)
|
||||
|
||||
document.removeEventListener('pointerlockchange', handlers.onPointerLockChange)
|
||||
document.removeEventListener('mozpointerlockchange', handlers.onPointerLockChange)
|
||||
document.removeEventListener('webkitpointerlockchange', handlers.onPointerLockChange)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 售后模块 - 枚举常量与标签映射
|
||||
|
||||
@ -308,7 +308,8 @@ import {
|
||||
CLAIM_STATUS_TAG_MAP,
|
||||
} from './afterSale-config'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
<TabArea
|
||||
:tabs="tabList"
|
||||
:default-active="activeTabName"
|
||||
page-key="afterSale.typelist"
|
||||
@tab-change="handleTabChange"
|
||||
/>
|
||||
</div>
|
||||
@ -255,6 +256,7 @@ import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import TabArea from '@/components/TabArea/index.vue'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
import ColumnCellRenderer from './components/ColumnCellRenderer.vue'
|
||||
import OperationCellRenderer from './components/OperationCellRenderer.vue'
|
||||
import TypeFormDialog from './pages/TypeFormDialog.vue'
|
||||
@ -292,7 +294,11 @@ const containerHeight = computed(() =>
|
||||
const tabList = computed(() =>
|
||||
tabPages.map((t) => ({ name: t.name, label: t.label }))
|
||||
)
|
||||
const activeTabName = ref(tabPages[0]?.name ?? 'tab1')
|
||||
const { defaultTabName } = useTabOrder(
|
||||
'afterSale.typelist',
|
||||
() => tabPages.map((tab) => ({ name: tab.name, label: tab.label }))
|
||||
)
|
||||
const activeTabName = ref(defaultTabName.value || tabPages[0]?.name || 'tab1')
|
||||
|
||||
/** 当前激活标签页的完整配置 */
|
||||
const currentTabConfig = computed<TabPageConfig | undefined>(() => {
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onBeforeUnmount, watch, computed, nextTick } from 'vue'
|
||||
import * as echarts from 'echarts'
|
||||
import { echarts, type ECharts } from '@/utils/echarts'
|
||||
import { Refresh } from '@element-plus/icons-vue'
|
||||
import { useDashboard } from '../composables/useDashboard'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
@ -64,7 +64,7 @@ const { loading, error, data, loadData, refreshData } = useDashboard({
|
||||
})
|
||||
|
||||
const chartRef = ref<HTMLElement | null>(null)
|
||||
let chartInstance: echarts.ECharts | null = null
|
||||
let chartInstance: ECharts | null = null
|
||||
const chartData = computed(() => data.value || [])
|
||||
|
||||
const initChart = () => {
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
|
||||
import * as echarts from 'echarts'
|
||||
import { echarts, type ECharts } from '@/utils/echarts'
|
||||
import { useDashboard } from '../composables/useDashboard'
|
||||
import { Refresh } from '@element-plus/icons-vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
@ -71,7 +71,7 @@ const props = defineProps({
|
||||
|
||||
const dateRange = ref('day')
|
||||
const chartRef = ref<HTMLElement | null>(null)
|
||||
let chartInstance: echarts.ECharts | null = null
|
||||
let chartInstance: ECharts | null = null
|
||||
|
||||
const queryParams = computed(() => ({
|
||||
range: dateRange.value
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onBeforeUnmount, watch, computed, nextTick } from 'vue'
|
||||
import * as echarts from 'echarts'
|
||||
import { echarts, type ECharts } from '@/utils/echarts'
|
||||
import { Refresh } from '@element-plus/icons-vue'
|
||||
import { useDashboard } from '../composables/useDashboard'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
@ -60,7 +60,7 @@ const { loading, error, data, loadData, refreshData } = useDashboard({
|
||||
})
|
||||
|
||||
const chartRef = ref<HTMLElement | null>(null)
|
||||
let chartInstance: echarts.ECharts | null = null
|
||||
let chartInstance: ECharts | null = null
|
||||
const chartData = computed(() => data.value || [])
|
||||
|
||||
const initChart = () => {
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
<TabArea
|
||||
:tabs="tabList"
|
||||
:default-active="activeTabName"
|
||||
page-key="data.ordersummary"
|
||||
@tab-change="handleTabChange"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -399,8 +399,8 @@ import {
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import WarehouseSelect from '@/components/WarehouseSelect.vue'
|
||||
import VideoButton, { type VideoItem } from './components/VideoButton.vue'
|
||||
import VideoListDialog from './components/VideoListDialog.vue'
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import dayjs from 'dayjs'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// =============================================================================
|
||||
// 工具栏按钮配置(对齐 order/waveOrder?tab=sandanWave)
|
||||
|
||||
@ -134,8 +134,8 @@ import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { returnReceivedCreate, returnReceivedList } from '@/api/returnreceived'
|
||||
import { returnReceivedColumns } from '@/views/express/returnReceived/returnReceived-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import { useBarcodeScan } from '@/composables/useBarcodeScan'
|
||||
|
||||
@ -171,7 +171,7 @@ import {
|
||||
returnReceivedTaskDelete,
|
||||
returnReceivedTaskBatchDelete,
|
||||
} from '@/api/returnreceivedtask'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import {
|
||||
returnReceivedTaskAvailableFields,
|
||||
returnReceivedTaskColumns,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 退回收件任务(returnReceivedTask) - ScanBox 筛选字段
|
||||
|
||||
@ -181,8 +181,9 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { returnReceivedList, returnReceivedDetail, returnReceivedDelete, returnReceivedExport, returnReceivedExportTaskProgress } from '@/api/returnreceived'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { returnReceivedAvailableFields, returnReceivedColumns, returnReceivedToolbarButtons } from './returnReceived-config'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 退回收件(returnReceived) - ScanBox 筛选字段
|
||||
|
||||
@ -111,7 +111,7 @@ import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
|
||||
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
|
||||
import { returnUnpackExport, returnUnpackExportTaskProgress } from '@/api/returnunpack'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/utils/storeScanOptions'
|
||||
|
||||
defineOptions({ name: 'ReturnUnpackExportDialog' })
|
||||
|
||||
|
||||
@ -162,7 +162,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
<script setup lang="ts">
|
||||
import { VideoPlay } from '@element-plus/icons-vue'
|
||||
import type { VideoItem } from './VideoButton.vue'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
|
||||
defineProps<{
|
||||
visible: boolean
|
||||
|
||||
@ -359,8 +359,9 @@ import {
|
||||
returnUnpackExportTaskProgress,
|
||||
} from '@/api/returnunpack'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { returnUnpackAvailableFields, returnUnpackColumns, returnUnpackToolbarButtons } from './returnUnpack-config'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 退回拆包(returnUnpack) - ScanBox 筛选字段
|
||||
|
||||
@ -302,13 +302,9 @@ import {
|
||||
returnWaybillDelete,
|
||||
} from '@/api/returnwaybill'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import {
|
||||
extractStoreListFromResponse,
|
||||
getStatusTextClass,
|
||||
mapStoreListToSelectOptions,
|
||||
fillStoreScanFieldOptions,
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions, fillStoreScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { returnWaybillAvailableFields, returnWaybillColumns, returnWaybillToolbarButtons } from './returnwaybill-config'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 运单退回登记(returnWaybill) - ScanBox 筛选字段
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
<TabArea
|
||||
:tabs="tabList"
|
||||
:default-active="activeTabName"
|
||||
page-key="express.waybill"
|
||||
@tab-change="handleTabChange"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 站内信群组 - ScanBox 筛选字段
|
||||
|
||||
@ -476,13 +476,14 @@ import {
|
||||
inboxBindCode,
|
||||
} from '@/api/inbox/inbox'
|
||||
import { loadStores, loadExpressInterfaces } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, getStatusTextClass, mapStoreListToSelectOptions } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, mapStoreListToSelectOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { expressIndexGetExpressList } from '@/api/setting.express/express'
|
||||
import { groupAvailableFields, groupColumns, groupToolbarButtons } from './group-config'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
|
||||
// ==================== 常量 ====================
|
||||
|
||||
@ -370,12 +370,13 @@ import {
|
||||
inboxStats,
|
||||
} from '@/api/inbox/inbox'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { messageAvailableFields, messageColumns } from './message-config'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
|
||||
// ==================== 常量 ====================
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
// ============================================================
|
||||
// 站内信消息列表 - ScanBox 筛选字段(对齐 inbox.message.list 接口文档)
|
||||
|
||||
@ -149,7 +149,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, nextTick, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import * as XLSX from 'xlsx'
|
||||
// xlsx(约 420KB)改为按需动态加载:使用处 await import('xlsx')
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import { packageMaterialCreate } from '@/api/setting.packagematerial/packagematerial'
|
||||
import type { PackageMaterialRecord } from '../package-material-config'
|
||||
@ -241,7 +241,8 @@ function triggerFileSelect() {
|
||||
importInputRef.value?.click()
|
||||
}
|
||||
|
||||
function downloadTemplate() {
|
||||
async function downloadTemplate() {
|
||||
const XLSX = await import('xlsx')
|
||||
const headers = [
|
||||
'包材编码',
|
||||
'包材名称',
|
||||
@ -317,6 +318,7 @@ function formatStatusLabel(status: any): string {
|
||||
|
||||
async function parseExcelFile(file: File) {
|
||||
const buffer = await file.arrayBuffer()
|
||||
const XLSX = await import('xlsx')
|
||||
const workbook = XLSX.read(buffer, { type: 'array', dense: true })
|
||||
const sheetName = workbook.SheetNames[0]
|
||||
if (!sheetName) {
|
||||
|
||||
@ -278,8 +278,8 @@ import type { FormInstance, FormRules } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import BatchImportDialog from './component/BatchImportDialog.vue'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
/** 包材列表主工具栏按钮(action 与 packageMaterial/index.vue 内 toolbarActionMap 键一致)
|
||||
* 排序与样式分类对齐 storage/receiving:
|
||||
|
||||
@ -182,8 +182,8 @@ import type { FormInstance, FormRules } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
/** 包装供应商列表主工具栏按钮(action 与 packageSupplier/index.vue 内 toolbarActionMap 键一致)
|
||||
* 排序与样式分类对齐 storage/receiving:
|
||||
|
||||
@ -215,7 +215,7 @@ import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
|
||||
import { afterSaleCreate, type AfterSaleCreateParams } from '@/api/aftersale/index'
|
||||
import { AFTER_SALE_TYPE_MAP } from '@/views/afterSale/list/afterSale-config'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/utils/storeScanOptions'
|
||||
import { orderDeliveryOrderQuickSearch } from '@/api/order.deliveryorder/orderdeliveryOrder'
|
||||
import { getEntryList } from '@/api/storage.entry/entry'
|
||||
import { stockoutList } from '@/api/storage.stockout/stockout'
|
||||
|
||||
@ -281,8 +281,9 @@ import {
|
||||
CLAIM_STATUS_TAG_MAP,
|
||||
} from '@/views/afterSale/list/afterSale-config'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions, getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, fillStoreScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
<TabArea
|
||||
:tabs="tabList"
|
||||
:default-active="activeTabName"
|
||||
page-key="mode"
|
||||
@tab-change="handleTabChange"
|
||||
/>
|
||||
</div>
|
||||
@ -251,6 +252,7 @@ import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import TabArea from '@/components/TabArea/index.vue'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
import ColumnCellRenderer from './components/ColumnCellRenderer.vue'
|
||||
import OperationCellRenderer from './components/OperationCellRenderer.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
@ -279,7 +281,10 @@ const containerHeight = computed(() =>
|
||||
const tabList = computed(() =>
|
||||
tabPages.map((t) => ({ name: t.name, label: t.label }))
|
||||
)
|
||||
const activeTabName = ref(tabPages[0]?.name ?? 'tab1')
|
||||
const { defaultTabName } = useTabOrder('mode', () =>
|
||||
tabPages.map((tab) => ({ name: tab.name, label: tab.label }))
|
||||
)
|
||||
const activeTabName = ref(defaultTabName.value || tabPages[0]?.name || 'tab1')
|
||||
|
||||
/** 当前激活标签页的完整配置 */
|
||||
const currentTabConfig = computed<TabPageConfig | undefined>(() => {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import type { ToolbarButtonConfig, ToolbarApiActionConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { scanBasicField, scanWorkflowField } from '@/utils/scanFields'
|
||||
import { ORDER_BULK_SEARCH_OPERATORS, scanBasicField, scanWorkflowField, stockQueryScanField } from '@/utils/scanFields'
|
||||
|
||||
/**
|
||||
* 已抽离到公共层的类型与工具,此处保留转发以兼容存量 import
|
||||
@ -18,7 +18,7 @@ export {
|
||||
mapStoreListToSelectOptions,
|
||||
resolveStoreOptionLabel
|
||||
} from '@/utils/storeScanOptions'
|
||||
export { SCAN_BASIC_INFO_GROUP } from '@/utils/scanFields'
|
||||
export { ORDER_BULK_SEARCH_OPERATORS, SCAN_BASIC_INFO_GROUP, stockQueryScanField } from '@/utils/scanFields'
|
||||
export { scanBasicField, scanWorkflowField }
|
||||
|
||||
/** 订单管理页面配置 */
|
||||
@ -1381,8 +1381,7 @@ export const lockStatusFilterOptions = [
|
||||
{ label: '已锁定', value: '__lock_status_locked__', operator: 'ne', conditionValue: 'none' },
|
||||
]
|
||||
|
||||
/** 单号类字段:支持 IN(逗号分隔)批量查询 */
|
||||
export const ORDER_BULK_SEARCH_OPERATORS = ['eq', 'ne', 'like', 'notlike', 'contains', 'in', 'notin', 'startswith', 'endswith']
|
||||
/** 单号类字段:支持 IN(逗号分隔)批量查询 —— 定义已迁至 @/utils/scanFields */
|
||||
|
||||
/** 可复用 ScanBox 字段片段(基础信息) */
|
||||
export const storeScanField = scanBasicField({ label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] })
|
||||
@ -1456,7 +1455,7 @@ export const recheckTimeRangeScanField = scanBasicField({ label: '复核时间',
|
||||
export const isUrgencyScanField = scanBasicField({ label: '是否紧急', value: 'is_urgency', type: 'select', options: isUrgencyFilterOptions })
|
||||
export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', value: 'buyer_message_has', type: 'select', options: buyerMessageHasFilterOptions })
|
||||
export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' })
|
||||
export const stockQueryScanField = scanBasicField({ label: '包含商品', value: 'stock_query', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'like' })
|
||||
/** 「包含商品」筛选项定义已迁至 @/utils/scanFields(此处仅转发) */
|
||||
|
||||
/**
|
||||
* 数量类数值筛选字段操作符(商品种类数量 / 商品总数)。
|
||||
|
||||
@ -228,7 +228,7 @@
|
||||
/>
|
||||
<update-order-meta-form
|
||||
v-model="updateOrderMetaDialogVisible"
|
||||
v-model:code="updateOrderMetaForm.code"
|
||||
v-model:code="updateOrderMetaState.code"
|
||||
:mode="updateOrderMetaDialogMode"
|
||||
:order-count="updateOrderMetaOrderIds.length"
|
||||
:loading="updateOrderMetaLoading"
|
||||
@ -246,7 +246,7 @@
|
||||
/>
|
||||
<manual-waybill-form
|
||||
v-model="manualWaybillDialogVisible"
|
||||
v-model:waybill-code="manualWaybillForm.waybill_code"
|
||||
v-model:waybill-code="manualWaybillState.waybill_code"
|
||||
:loading="manualWaybillLoading"
|
||||
:order-id="manualWaybillOrderId"
|
||||
:order-code="manualWaybillOrderCode"
|
||||
@ -277,8 +277,9 @@
|
||||
@success="handleBatchQuickRecheckSuccess"
|
||||
/>
|
||||
<update-address-form
|
||||
v-if="updateAddressDialogVisible"
|
||||
v-model="updateAddressDialogVisible"
|
||||
v-model:form="updateAddressForm"
|
||||
v-model:form="updateAddressState"
|
||||
:order-count="updateAddressOrderIds.length"
|
||||
:loading="updateAddressLoading"
|
||||
@closed="resetUpdateAddressDialog"
|
||||
@ -286,7 +287,7 @@
|
||||
/>
|
||||
<update-remark-form
|
||||
v-model="updateRemarkDialogVisible"
|
||||
v-model:form="updateRemarkForm"
|
||||
v-model:form="updateRemarkState"
|
||||
:order-count="updateRemarkOrderIds.length"
|
||||
:loading="updateRemarkLoading"
|
||||
@closed="resetUpdateRemarkDialog"
|
||||
@ -419,7 +420,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted, onUnmounted, onActivated, onDeactivated, computed } from 'vue'
|
||||
import { ref, reactive, onMounted, onUnmounted, onActivated, onDeactivated, computed, defineAsyncComponent } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { ArrowDown } from '@element-plus/icons-vue'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
@ -455,7 +456,8 @@ import CloneOrderForm from './form/CloneOrderForm.vue'
|
||||
import ManualWaybillForm from '@/views/order/shared/form/ManualWaybillForm.vue'
|
||||
import SyncOrderIdsForm from '@/views/order/shared/form/SyncOrderIdsForm.vue'
|
||||
import BatchQuickRecheckForm from './form/BatchQuickRecheckForm.vue'
|
||||
import UpdateAddressForm from '@/views/order/shared/form/UpdateAddressForm.vue'
|
||||
// 修改地址弹窗按需加载:它依赖省市区字典(约 134KB)与整套快递接口配置,不必随页签首屏加载
|
||||
const UpdateAddressForm = defineAsyncComponent(() => import('@/views/order/shared/form/UpdateAddressForm.vue'))
|
||||
import UpdateRemarkForm from './form/UpdateRemarkForm.vue'
|
||||
import BatchAsyncTaskForm from '@/views/order/shared/form/BatchAsyncTaskForm.vue'
|
||||
import AllocateSubOrderNumberForm from './form/AllocateSubOrderNumberForm.vue'
|
||||
@ -471,7 +473,7 @@ import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import WavePlatformPrintPreviewDialog from '@/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue'
|
||||
import { getOrderPrintData } from '@/api/order.print/orderprint'
|
||||
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/waveOrder/config/wave-config'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
import TaskProgressDialog from '@/components/TaskProgressDialog.vue'
|
||||
|
||||
@ -959,7 +961,7 @@ const {
|
||||
updateOrderMetaDialogVisible,
|
||||
updateOrderMetaDialogMode,
|
||||
updateOrderMetaOrderIds,
|
||||
updateOrderMetaForm,
|
||||
updateOrderMetaState,
|
||||
updateOrderMetaOptions,
|
||||
updateOrderMetaLoading,
|
||||
cloneOrderDialogVisible,
|
||||
@ -970,7 +972,7 @@ const {
|
||||
manualWaybillLoading,
|
||||
manualWaybillOrderId,
|
||||
manualWaybillOrderCode,
|
||||
manualWaybillForm,
|
||||
manualWaybillState,
|
||||
syncOrderIdsDialogVisible,
|
||||
syncOrderIdsLoading,
|
||||
syncOrderIdsRequestId,
|
||||
@ -987,11 +989,11 @@ const {
|
||||
updateAddressDialogVisible,
|
||||
updateAddressLoading,
|
||||
updateAddressOrderIds,
|
||||
updateAddressForm,
|
||||
updateAddressState,
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
batchAsyncTaskDialogVisible,
|
||||
batchAsyncTaskLoading,
|
||||
batchAsyncTaskConfig,
|
||||
|
||||
@ -2,47 +2,29 @@
|
||||
<div class="order-management-wrapper">
|
||||
<!-- 多标签模式 -->
|
||||
<template v-if="!singlePage">
|
||||
<!-- 顶部多标签页区域(对齐 stock/stockManagement 的 tab-section) -->
|
||||
<!-- 顶部多标签页区域(统一组件:视觉/排序/默认页签均由 TabArea 负责) -->
|
||||
<div class="tab-section">
|
||||
<!-- 排序设置入口(tab 区域左侧,样式对齐 scan-box 模式切换按钮) -->
|
||||
<div class="tab-sort-entry">
|
||||
<el-tooltip content="标签排序" placement="bottom">
|
||||
<el-button class="sort-entry-btn" size="small" link @click="openSortDialog">
|
||||
<el-icon><Sort /></el-icon>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<div class="tabs-header-action">
|
||||
<!-- <el-button size="small" @click="workbenchDialogVisible = true">统一查询</el-button> -->
|
||||
<!-- <el-button size="small" @click="bindByWaybillDialogVisible = true">按运单绑定包材</el-button> -->
|
||||
<el-button size="small" :loading="badgeLoading" @click="refreshBadgeCounts">刷新角标</el-button>
|
||||
</div>
|
||||
<el-tabs
|
||||
v-model="activeTab"
|
||||
<TabArea
|
||||
:tabs="tabs"
|
||||
:default-active="activeTab"
|
||||
page-key="order.management"
|
||||
@tab-change="handleTabChange"
|
||||
tab-position="top"
|
||||
type="border-card"
|
||||
class="tab-container"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="tab in tabs"
|
||||
:key="tab.name"
|
||||
:name="tab.name"
|
||||
:lazy="false"
|
||||
>
|
||||
<template #label>
|
||||
<span class="custom-tab-label">
|
||||
{{ tab.label }}
|
||||
<el-badge
|
||||
:value="tab.count"
|
||||
:max="99"
|
||||
:hidden="tab.count === 0"
|
||||
class="tab-badge"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<template #header-action>
|
||||
<!-- <el-button size="small" @click="workbenchDialogVisible = true">统一查询</el-button> -->
|
||||
<!-- <el-button size="small" @click="bindByWaybillDialogVisible = true">按运单绑定包材</el-button> -->
|
||||
<el-button size="small" :loading="badgeLoading" @click="refreshBadgeCounts">刷新角标</el-button>
|
||||
</template>
|
||||
<template #label="{ tab }">
|
||||
{{ tab.label }}
|
||||
<el-badge
|
||||
:value="tab.count"
|
||||
:max="99"
|
||||
:hidden="tab.count === 0"
|
||||
class="tab-badge"
|
||||
/>
|
||||
</template>
|
||||
</TabArea>
|
||||
</div>
|
||||
|
||||
<!-- 主内容区容器(对齐 stock/stockManagement 的 main-container) -->
|
||||
@ -68,7 +50,6 @@
|
||||
|
||||
<order-workbench-list-dialog v-model="workbenchDialogVisible" />
|
||||
<BindPackageMaterialByWaybillDialog v-model="bindByWaybillDialogVisible" />
|
||||
<SortSettingDialog v-model:visible="sortDialogVisible" :tabs="ORDER_TAB_LIST" scope="order.tabs.order" @saved="handleSortSaved" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -89,11 +70,10 @@ const DeliveryException = defineAsyncComponent(() => import('./deliveryException
|
||||
const ArchiveOrder = defineAsyncComponent(() => import('./archiveOrder.vue'))
|
||||
import OrderWorkbenchListDialog from './component/OrderWorkbenchListDialog.vue'
|
||||
import BindPackageMaterialByWaybillDialog from './component/BindPackageMaterialByWaybillDialog.vue'
|
||||
import SortSettingDialog from '@/components/SortSettingDialog.vue'
|
||||
import { Sort } from '@element-plus/icons-vue'
|
||||
import TabArea from '@/components/TabArea/index.vue'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import { ORDER_PAGE_CONFIG, ORDER_TAB_LIST } from './config/order-common-config'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import { ORDER_PAGE_CONFIG } from './config/order-common-config'
|
||||
|
||||
const route = useRoute()
|
||||
const settingsStore = useSettingsStore()
|
||||
@ -107,43 +87,6 @@ const badgeLoading = ref(false)
|
||||
const workbenchDialogVisible = ref(false)
|
||||
const bindByWaybillDialogVisible = ref(false)
|
||||
|
||||
// 标签排序弹窗
|
||||
const sortDialogVisible = ref(false)
|
||||
const preferenceStore = useUserPreferenceStore()
|
||||
|
||||
function openSortDialog() {
|
||||
sortDialogVisible.value = true
|
||||
}
|
||||
|
||||
/** 保存标签顺序:按新顺序重排 tabs 数组(组件对象原样复用,缺失项留在末尾) */
|
||||
function handleSortSaved(order: string[]) {
|
||||
applyTabOrder(order)
|
||||
}
|
||||
|
||||
/** 读取本账号保存的标签顺序并应用;无配置时保持默认顺序 */
|
||||
function applySavedTabOrder() {
|
||||
const saved = preferenceStore.get('order.tabs.order')
|
||||
if (!Array.isArray(saved) || !saved.length) return
|
||||
applyTabOrder(saved)
|
||||
}
|
||||
|
||||
/** 按给定 tab.name 顺序重排 tabs;非法项剔除,缺失项按当前 tabs 补在末尾 */
|
||||
function applyTabOrder(order: string[]) {
|
||||
const byName = new Map(tabs.value.map((t) => [t.name, t]))
|
||||
const ordered: OrderTabItem[] = []
|
||||
for (const name of order) {
|
||||
if (byName.has(name)) ordered.push(byName.get(name)!)
|
||||
}
|
||||
for (const t of tabs.value) {
|
||||
if (!ordered.some((x) => x.name === t.name)) ordered.push(t)
|
||||
}
|
||||
tabs.value = ordered
|
||||
}
|
||||
|
||||
/** 单页模式下使用的默认标签(始终为 tabs 第一项) */
|
||||
const defaultTab = computed(() => tabs.value[0]!)
|
||||
|
||||
const activeTab = ref('pendingOrder')
|
||||
type OrderTabItem = {
|
||||
name: string
|
||||
label: string
|
||||
@ -208,6 +151,22 @@ const tabs = ref<OrderTabItem[]>([
|
||||
}
|
||||
])
|
||||
|
||||
// ============================================================
|
||||
// 标签排序 / 默认页签(统一由 useTabOrder 负责,配置按账号保存)
|
||||
// ============================================================
|
||||
const { defaultTabName, resolveInitialTab } = useTabOrder('order.management', () => tabs.value, {
|
||||
legacyScopes: ['order.tabs.order'],
|
||||
// 页面默认打开「待处理订单」
|
||||
fallbackTabName: 'pendingOrder'
|
||||
})
|
||||
|
||||
/** 单页模式下使用的默认标签(跟随用户设置的默认页签,未设置时回退第一项) */
|
||||
const defaultTab = computed(
|
||||
() => tabs.value.find((tab) => tab.name === defaultTabName.value) ?? tabs.value[0]!
|
||||
)
|
||||
|
||||
const activeTab = ref(resolveInitialTab(route.query.tab as string | undefined))
|
||||
|
||||
const badgeToTabMap: Record<string, string> = {
|
||||
reviewOrder: 'reviewOrder',
|
||||
pendingOrder: 'pendingOrder',
|
||||
@ -265,21 +224,12 @@ function refreshBadgeCounts() {
|
||||
watch(
|
||||
() => route.query.tab,
|
||||
(newTab) => {
|
||||
const validTabs = tabs.value.map((tab) => tab.name)
|
||||
const raw = newTab === undefined || newTab === null ? '' : String(newTab).trim()
|
||||
|
||||
if (raw && validTabs.includes(raw)) {
|
||||
activeTab.value = raw
|
||||
return
|
||||
}
|
||||
|
||||
activeTab.value = 'pendingOrder'
|
||||
activeTab.value = resolveInitialTab(newTab === undefined || newTab === null ? '' : String(newTab))
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
onMounted(() => {
|
||||
applySavedTabOrder()
|
||||
loadBadgeCounts()
|
||||
})
|
||||
|
||||
@ -321,40 +271,6 @@ const handleTabChange = (tabName: string | number) => {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.tabs-header-action {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 16px;
|
||||
height: 38px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
/* 排序设置入口(tab 区域左侧,样式对齐 scan-box 模式切换按钮) */
|
||||
.tab-sort-entry {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
left: 12px;
|
||||
height: 38px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
z-index: 2;
|
||||
|
||||
.sort-entry-btn {
|
||||
color: #606266;
|
||||
font-size: 15px;
|
||||
padding: 4px 6px;
|
||||
border-radius: 4px;
|
||||
transition: all 0.2s;
|
||||
|
||||
&:hover {
|
||||
color: #409eff;
|
||||
background-color: rgba(64, 158, 255, 0.08);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tab-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -228,7 +228,7 @@
|
||||
<update-order-meta-form
|
||||
v-if="updateOrderMetaDialogVisible"
|
||||
v-model="updateOrderMetaDialogVisible"
|
||||
v-model:code="updateOrderMetaForm.code"
|
||||
v-model:code="updateOrderMetaState.code"
|
||||
:mode="updateOrderMetaDialogMode"
|
||||
:order-count="updateOrderMetaOrderIds.length"
|
||||
:loading="updateOrderMetaLoading"
|
||||
@ -248,7 +248,7 @@
|
||||
<manual-waybill-form
|
||||
v-if="manualWaybillDialogVisible"
|
||||
v-model="manualWaybillDialogVisible"
|
||||
v-model:waybill-code="manualWaybillForm.waybill_code"
|
||||
v-model:waybill-code="manualWaybillState.waybill_code"
|
||||
:loading="manualWaybillLoading"
|
||||
:order-id="manualWaybillOrderId"
|
||||
:order-code="manualWaybillOrderCode"
|
||||
@ -283,7 +283,7 @@
|
||||
<update-address-form
|
||||
v-if="updateAddressDialogVisible"
|
||||
v-model="updateAddressDialogVisible"
|
||||
v-model:form="updateAddressForm"
|
||||
v-model:form="updateAddressState"
|
||||
:order-count="updateAddressOrderIds.length"
|
||||
:loading="updateAddressLoading"
|
||||
@closed="resetUpdateAddressDialog"
|
||||
@ -292,7 +292,7 @@
|
||||
<update-remark-form
|
||||
v-if="updateRemarkDialogVisible"
|
||||
v-model="updateRemarkDialogVisible"
|
||||
v-model:form="updateRemarkForm"
|
||||
v-model:form="updateRemarkState"
|
||||
:order-count="updateRemarkOrderIds.length"
|
||||
:loading="updateRemarkLoading"
|
||||
@closed="resetUpdateRemarkDialog"
|
||||
@ -905,7 +905,7 @@ const {
|
||||
updateOrderMetaDialogVisible,
|
||||
updateOrderMetaDialogMode,
|
||||
updateOrderMetaOrderIds,
|
||||
updateOrderMetaForm,
|
||||
updateOrderMetaState,
|
||||
updateOrderMetaOptions,
|
||||
updateOrderMetaLoading,
|
||||
cloneOrderDialogVisible,
|
||||
@ -916,7 +916,7 @@ const {
|
||||
manualWaybillLoading,
|
||||
manualWaybillOrderId,
|
||||
manualWaybillOrderCode,
|
||||
manualWaybillForm,
|
||||
manualWaybillState,
|
||||
syncOrderIdsDialogVisible,
|
||||
syncOrderIdsLoading,
|
||||
syncOrderIdsRequestId,
|
||||
@ -933,11 +933,11 @@ const {
|
||||
updateAddressDialogVisible,
|
||||
updateAddressLoading,
|
||||
updateAddressOrderIds,
|
||||
updateAddressForm,
|
||||
updateAddressState,
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
batchAsyncTaskDialogVisible,
|
||||
batchAsyncTaskLoading,
|
||||
batchAsyncTaskConfig,
|
||||
|
||||
@ -148,7 +148,7 @@
|
||||
|
||||
<update-remark-form
|
||||
v-model="updateRemarkDialogVisible"
|
||||
v-model:form="updateRemarkForm"
|
||||
v-model:form="updateRemarkState"
|
||||
:order-count="updateRemarkOrderIds.length"
|
||||
:loading="updateRemarkLoading"
|
||||
@closed="resetUpdateRemarkDialog"
|
||||
@ -496,7 +496,7 @@ const {
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
submitUpdateRemark,
|
||||
resetUpdateRemarkDialog
|
||||
} = createReviewToolbarController({
|
||||
|
||||
@ -4,7 +4,7 @@ import {
|
||||
getPrintDataByWaybillCodes,
|
||||
type WavePlatformPrintDataPayload
|
||||
} from '@/api/order.print/orderprint'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/waveOrder/config/wave-config'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'
|
||||
import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder'
|
||||
import {
|
||||
isOrderIndexApiSuccess,
|
||||
|
||||
@ -2,7 +2,7 @@ import { ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { getOrderPrintData } from '@/api/order.print/orderprint'
|
||||
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/waveOrder/config/wave-config'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
|
||||
type OrderBatchPrintRequestMeta = {
|
||||
|
||||
@ -4,7 +4,7 @@ import {
|
||||
getPrintDataByWaybillCodes,
|
||||
type WavePlatformPrintDataPayload
|
||||
} from '@/api/order.print/orderprint'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/waveOrder/config/wave-config'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'
|
||||
import { orderDetail } from '@/api/order.index/orderindex'
|
||||
import { isOrderIndexApiSuccess, parseOrderDetailPayload, normalizeOrderExpressList } from '@/views/order/shared/orderListExport'
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
/**
|
||||
* 运单称重页面配置(样式与结构对齐 order/waveOrder)
|
||||
|
||||
@ -145,8 +145,8 @@ import { ElMessage } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import { orderPendingOrderList } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import {
|
||||
|
||||
@ -298,15 +298,15 @@ import type { FormInstance, FormRules, InputInstance } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import BatchQuickRecheckDialog from './component/BatchQuickRecheckDialog.vue'
|
||||
import RecheckOrderSingleListForm from './form/RecheckOrderSingleListForm.vue'
|
||||
import * as stationApi from '@/api/print/print'
|
||||
import { getOrderPrintData } from '@/api/order.print/orderprint'
|
||||
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/waveOrder/config/wave-config'
|
||||
import { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import { recheckAvailableFields } from './recheck-config'
|
||||
|
||||
@ -499,7 +499,7 @@ import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch }
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import type { DialogBeforeCloseFn } from 'element-plus'
|
||||
import { useCreateOrderSession, type CreateOrderDraftSnapshot } from './useCreateOrderSession'
|
||||
import * as XLSX from 'xlsx'
|
||||
// xlsx(约 420KB)改为按需动态加载:使用处 await import('xlsx')
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import SelectProductDialog from '@/views/order/shared/component/SelectProductDialog.vue'
|
||||
import type { SelectProductItem } from '@/views/order/shared/component/SelectProductDialog.vue'
|
||||
@ -529,11 +529,8 @@ import {
|
||||
getDistrictNodes,
|
||||
resolveRegionCodesFromNames
|
||||
} from '@/views/system/setting/expressinterface/express-interface-config'
|
||||
import {
|
||||
extractStoreListFromResponse,
|
||||
getStatusTextClass,
|
||||
mapStoreListToSelectOptions
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/utils/storeScanOptions'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
|
||||
const visible = defineModel<boolean>({ default: false })
|
||||
|
||||
@ -1737,6 +1734,7 @@ async function fetchCreateTemplateLayout(): Promise<{ header: string[]; sheetNam
|
||||
const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
|
||||
const base64 = String(res?.base64 || res?.data?.base64 || '').trim()
|
||||
if (!ok || !base64) return { header: FALLBACK_EXPORT_HEADER, sheetName: 'Sheet1' }
|
||||
const XLSX = await import('xlsx')
|
||||
const workbook = XLSX.read(base64, { type: 'base64' })
|
||||
const sheetName = workbook.SheetNames[0] || 'Sheet1'
|
||||
const sheet = workbook.Sheets[sheetName]
|
||||
@ -1807,6 +1805,7 @@ async function handleExportSelectedPreviewRows() {
|
||||
}
|
||||
}
|
||||
|
||||
const XLSX = await import('xlsx')
|
||||
const worksheet = XLSX.utils.aoa_to_sheet(matrix)
|
||||
const workbook = XLSX.utils.book_new()
|
||||
XLSX.utils.book_append_sheet(workbook, worksheet, sheetName)
|
||||
@ -1905,6 +1904,7 @@ async function parseImportPreviewFromFile(file: File) {
|
||||
clearPreviewRowSelection()
|
||||
try {
|
||||
const buffer = await file.arrayBuffer()
|
||||
const XLSX = await import('xlsx')
|
||||
const workbook = XLSX.read(buffer, { type: 'array', dense: true })
|
||||
const sheetName = workbook.SheetNames[0]
|
||||
if (!sheetName) {
|
||||
|
||||
@ -174,7 +174,7 @@ function createUpdateRemarkController(params: {
|
||||
const updateRemarkDialogVisible = ref(false)
|
||||
const updateRemarkLoading = ref(false)
|
||||
const updateRemarkOrderIds = ref<number[]>([])
|
||||
const updateRemarkForm = reactive({ remark: '' })
|
||||
const updateRemarkState = reactive({ remark: '' })
|
||||
|
||||
function openUpdateRemarkDialog() {
|
||||
const ids = params
|
||||
@ -186,7 +186,7 @@ function createUpdateRemarkController(params: {
|
||||
return
|
||||
}
|
||||
updateRemarkOrderIds.value = [...ids]
|
||||
updateRemarkForm.remark = ''
|
||||
updateRemarkState.remark = ''
|
||||
updateRemarkDialogVisible.value = true
|
||||
}
|
||||
|
||||
@ -197,7 +197,7 @@ function createUpdateRemarkController(params: {
|
||||
ElMessage.error('没有可提交的订单')
|
||||
return
|
||||
}
|
||||
const remark = String(updateRemarkForm.remark ?? '').trim()
|
||||
const remark = String(updateRemarkState.remark ?? '').trim()
|
||||
if (!remark) {
|
||||
ElMessage.warning('请填写留言内容')
|
||||
return
|
||||
@ -228,14 +228,14 @@ function createUpdateRemarkController(params: {
|
||||
|
||||
function resetUpdateRemarkDialog() {
|
||||
updateRemarkOrderIds.value = []
|
||||
updateRemarkForm.remark = ''
|
||||
updateRemarkState.remark = ''
|
||||
}
|
||||
|
||||
return {
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
openUpdateRemarkDialog,
|
||||
submitUpdateRemark,
|
||||
resetUpdateRemarkDialog
|
||||
@ -349,7 +349,7 @@ export function createReviewToolbarController(params: {
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
openUpdateRemarkDialog,
|
||||
submitUpdateRemark,
|
||||
resetUpdateRemarkDialog
|
||||
@ -410,7 +410,7 @@ export function createReviewToolbarController(params: {
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
submitUpdateRemark,
|
||||
resetUpdateRemarkDialog
|
||||
}
|
||||
@ -540,7 +540,7 @@ export function createPendingToolbarController(params: {
|
||||
const updateOrderMetaDialogMode = ref<'express' | 'platform'>('express')
|
||||
const updateOrderMetaOrderIds = ref<number[]>([])
|
||||
const updateOrderMetaLoading = ref(false)
|
||||
const updateOrderMetaForm = reactive({ code: '' })
|
||||
const updateOrderMetaState = reactive({ code: '' })
|
||||
const updateOrderMetaOptions = computed(() =>
|
||||
updateOrderMetaDialogMode.value === 'express'
|
||||
? params.expressCodeOptions.value
|
||||
@ -556,7 +556,7 @@ export function createPendingToolbarController(params: {
|
||||
const manualWaybillLoading = ref(false)
|
||||
const manualWaybillOrderId = ref<number | null>(null)
|
||||
const manualWaybillOrderCode = ref('')
|
||||
const manualWaybillForm = reactive({ waybill_code: '' })
|
||||
const manualWaybillState = reactive({ waybill_code: '' })
|
||||
|
||||
const syncOrderIdsDialogVisible = ref(false)
|
||||
const syncOrderIdsLoading = ref(false)
|
||||
@ -576,13 +576,13 @@ export function createPendingToolbarController(params: {
|
||||
const updateAddressDialogVisible = ref(false)
|
||||
const updateAddressLoading = ref(false)
|
||||
const updateAddressOrderIds = ref<number[]>([])
|
||||
const updateAddressForm = reactive(createEmptyUpdateAddressForm())
|
||||
const updateAddressState = reactive(createEmptyUpdateAddressForm())
|
||||
|
||||
const {
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
openUpdateRemarkDialog,
|
||||
submitUpdateRemark,
|
||||
resetUpdateRemarkDialog
|
||||
@ -925,14 +925,14 @@ export function createPendingToolbarController(params: {
|
||||
}
|
||||
updateOrderMetaDialogMode.value = mode
|
||||
updateOrderMetaOrderIds.value = [...ids]
|
||||
updateOrderMetaForm.code = ''
|
||||
updateOrderMetaState.code = ''
|
||||
updateOrderMetaDialogVisible.value = true
|
||||
}
|
||||
|
||||
async function submitUpdateOrderMeta() {
|
||||
if (updateOrderMetaLoading.value) return
|
||||
const order_ids = [...updateOrderMetaOrderIds.value]
|
||||
const code = normalizeCode(updateOrderMetaForm.code)
|
||||
const code = normalizeCode(updateOrderMetaState.code)
|
||||
if (!order_ids.length) {
|
||||
ElMessage.error('没有可提交的订单')
|
||||
return
|
||||
@ -976,13 +976,13 @@ export function createPendingToolbarController(params: {
|
||||
}
|
||||
manualWaybillOrderId.value = orderId
|
||||
manualWaybillOrderCode.value = String(row?.delivery_order_code || '')
|
||||
manualWaybillForm.waybill_code = ''
|
||||
manualWaybillState.waybill_code = ''
|
||||
manualWaybillDialogVisible.value = true
|
||||
}
|
||||
|
||||
async function submitManualWaybill() {
|
||||
if (!manualWaybillOrderId.value || manualWaybillLoading.value) return
|
||||
const waybill_code = normalizeCode(manualWaybillForm.waybill_code)
|
||||
const waybill_code = normalizeCode(manualWaybillState.waybill_code)
|
||||
if (!waybill_code) {
|
||||
ElMessage.warning('请输入运单号')
|
||||
return
|
||||
@ -1015,7 +1015,7 @@ export function createPendingToolbarController(params: {
|
||||
function resetManualWaybillDialog() {
|
||||
manualWaybillOrderId.value = null
|
||||
manualWaybillOrderCode.value = ''
|
||||
manualWaybillForm.waybill_code = ''
|
||||
manualWaybillState.waybill_code = ''
|
||||
}
|
||||
|
||||
function openCloneOrderDialog() {
|
||||
@ -1286,7 +1286,7 @@ export function createPendingToolbarController(params: {
|
||||
function resetUpdateOrderMetaDialog() {
|
||||
updateOrderMetaDialogMode.value = 'express'
|
||||
updateOrderMetaOrderIds.value = []
|
||||
updateOrderMetaForm.code = ''
|
||||
updateOrderMetaState.code = ''
|
||||
}
|
||||
|
||||
function resetCloneOrderDialog() {
|
||||
@ -1312,7 +1312,7 @@ export function createPendingToolbarController(params: {
|
||||
return
|
||||
}
|
||||
updateAddressOrderIds.value = [...ids]
|
||||
Object.assign(updateAddressForm, createEmptyUpdateAddressForm())
|
||||
Object.assign(updateAddressState, createEmptyUpdateAddressForm())
|
||||
updateAddressDialogVisible.value = true
|
||||
}
|
||||
|
||||
@ -1323,7 +1323,7 @@ export function createPendingToolbarController(params: {
|
||||
ElMessage.error('没有可提交的订单')
|
||||
return
|
||||
}
|
||||
const { payload, hasUpdateField } = buildUpdateAddressPayload(ids, updateAddressForm)
|
||||
const { payload, hasUpdateField } = buildUpdateAddressPayload(ids, updateAddressState)
|
||||
if (!hasUpdateField) {
|
||||
ElMessage.warning('请至少填写一项地址字段或留言')
|
||||
return
|
||||
@ -1350,7 +1350,7 @@ export function createPendingToolbarController(params: {
|
||||
|
||||
function resetUpdateAddressDialog() {
|
||||
updateAddressOrderIds.value = []
|
||||
Object.assign(updateAddressForm, createEmptyUpdateAddressForm())
|
||||
Object.assign(updateAddressState, createEmptyUpdateAddressForm())
|
||||
}
|
||||
|
||||
function resetBatchAsyncTaskDialog() {
|
||||
@ -1511,7 +1511,7 @@ export function createPendingToolbarController(params: {
|
||||
updateOrderMetaDialogVisible,
|
||||
updateOrderMetaDialogMode,
|
||||
updateOrderMetaOrderIds,
|
||||
updateOrderMetaForm,
|
||||
updateOrderMetaState,
|
||||
updateOrderMetaOptions,
|
||||
updateOrderMetaLoading,
|
||||
cloneOrderDialogVisible,
|
||||
@ -1522,7 +1522,7 @@ export function createPendingToolbarController(params: {
|
||||
manualWaybillLoading,
|
||||
manualWaybillOrderId,
|
||||
manualWaybillOrderCode,
|
||||
manualWaybillForm,
|
||||
manualWaybillState,
|
||||
syncOrderIdsDialogVisible,
|
||||
syncOrderIdsLoading,
|
||||
syncOrderIdsRequestId,
|
||||
@ -1539,11 +1539,11 @@ export function createPendingToolbarController(params: {
|
||||
updateAddressDialogVisible,
|
||||
updateAddressLoading,
|
||||
updateAddressOrderIds,
|
||||
updateAddressForm,
|
||||
updateAddressState,
|
||||
updateRemarkDialogVisible,
|
||||
updateRemarkLoading,
|
||||
updateRemarkOrderIds,
|
||||
updateRemarkForm,
|
||||
updateRemarkState,
|
||||
batchAsyncTaskDialogVisible,
|
||||
batchAsyncTaskLoading,
|
||||
batchAsyncTaskConfig,
|
||||
|
||||
120
src/views/order/shared/wavePrintPayload.ts
Normal file
120
src/views/order/shared/wavePrintPayload.ts
Normal file
@ -0,0 +1,120 @@
|
||||
/**
|
||||
* 波次/批量打印数据解包
|
||||
*
|
||||
* 从 `@/views/order/waveOrder/config/wave-config` 抽出:
|
||||
* 订单、复核等页面只需要这一个纯函数,却因为同文件里还有整套波次业务配置
|
||||
* (工具栏、状态字典、筛选项等,约 200KB 源码)而被整包带入首屏。
|
||||
* 抽出后 `wave-config.ts` 仍保留同名 re-export,历史引用不受影响。
|
||||
*/
|
||||
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
|
||||
|
||||
/** 解析 order.print.getWavePlatformPrintData 响应(支持 res.data 包裹) */
|
||||
export function unwrapWavePlatformPrintPayload(res: unknown): WavePlatformPrintDataPayload {
|
||||
const toObject = (v: unknown): Record<string, unknown> | undefined => {
|
||||
if (!v || typeof v !== 'object' || Array.isArray(v)) return undefined
|
||||
return v as Record<string, unknown>
|
||||
}
|
||||
|
||||
const toOrderList = (v: unknown): Record<string, unknown>[] => {
|
||||
if (!Array.isArray(v)) return []
|
||||
return v.filter((x) => x && typeof x === 'object') as Record<string, unknown>[]
|
||||
}
|
||||
|
||||
// 兼容后端直接返回数组:[{ wave_id, wave_no, order_count, platforms: [...] }]
|
||||
const normalizeWaveGroups = (list: unknown): unknown[] | undefined => {
|
||||
if (!Array.isArray(list)) return undefined
|
||||
const groups = list
|
||||
.filter((x) => x && typeof x === 'object')
|
||||
.map((wave) => {
|
||||
const waveObj = wave as Record<string, unknown>
|
||||
const rawPlatforms = Array.isArray(waveObj.platforms) ? waveObj.platforms : []
|
||||
const platforms = rawPlatforms
|
||||
.filter((p) => p && typeof p === 'object')
|
||||
.map((p) => {
|
||||
const platformObj = p as Record<string, unknown>
|
||||
const orders = toOrderList(platformObj.orders ?? platformObj.order_list)
|
||||
return {
|
||||
...platformObj,
|
||||
orders
|
||||
}
|
||||
})
|
||||
return {
|
||||
wave_id: waveObj.wave_id,
|
||||
wave_no: waveObj.wave_no,
|
||||
order_count: waveObj.order_count,
|
||||
platforms
|
||||
}
|
||||
})
|
||||
return groups
|
||||
}
|
||||
|
||||
const r = res as Record<string, unknown> | null | undefined
|
||||
|
||||
// 情况1:顶层就是波次数组
|
||||
if (Array.isArray(res)) {
|
||||
const waveGroups = normalizeWaveGroups(res)
|
||||
const wave_ids = (waveGroups || [])
|
||||
.map((x) => (x && typeof x === 'object' ? (x as Record<string, unknown>).wave_id : undefined))
|
||||
.filter((id) => id !== undefined && id !== null && id !== '') as Array<number | string>
|
||||
return {
|
||||
wave_ids: wave_ids.length ? wave_ids : undefined,
|
||||
waveGroups,
|
||||
platform_groups: undefined,
|
||||
order_list: undefined,
|
||||
summary: undefined,
|
||||
ext: undefined
|
||||
}
|
||||
}
|
||||
|
||||
const inner =
|
||||
r?.data !== undefined && r?.data !== null && typeof r.data === 'object' && !Array.isArray(r.data)
|
||||
? (r.data as Record<string, unknown>)
|
||||
: (r as Record<string, unknown>) || {}
|
||||
|
||||
// 情况2:res.data 是波次数组
|
||||
if (Array.isArray(r?.data)) {
|
||||
const waveGroups = normalizeWaveGroups(r.data)
|
||||
const wave_ids = (waveGroups || [])
|
||||
.map((x) => (x && typeof x === 'object' ? (x as Record<string, unknown>).wave_id : undefined))
|
||||
.filter((id) => id !== undefined && id !== null && id !== '') as Array<number | string>
|
||||
return {
|
||||
wave_ids: wave_ids.length ? wave_ids : undefined,
|
||||
waveGroups,
|
||||
platform_groups: undefined,
|
||||
order_list: undefined,
|
||||
summary: undefined,
|
||||
ext: undefined
|
||||
}
|
||||
}
|
||||
|
||||
const summaryRaw = inner?.summary
|
||||
const summary = toObject(summaryRaw)
|
||||
const wave_ids = Array.isArray(inner?.wave_ids) ? (inner.wave_ids as Array<number | string>) : undefined
|
||||
const waveGroups = Array.isArray(inner?.waveGroups)
|
||||
? inner.waveGroups
|
||||
: normalizeWaveGroups((inner as Record<string, unknown>).wave_list)
|
||||
const locked_wave_groups = Array.isArray(inner?.locked_wave_groups)
|
||||
? normalizeWaveGroups(inner.locked_wave_groups)
|
||||
: undefined
|
||||
const locked_orders = toOrderList(inner?.locked_orders)
|
||||
const locked_count_raw = (inner as Record<string, unknown>)?.locked_count
|
||||
const locked_count =
|
||||
locked_count_raw !== undefined && locked_count_raw !== null && Number.isFinite(Number(locked_count_raw))
|
||||
? Number(locked_count_raw)
|
||||
: undefined
|
||||
const platform_groups = Array.isArray(inner?.platform_groups) ? inner.platform_groups : undefined
|
||||
const order_list = toOrderList(inner?.order_list)
|
||||
const extRaw = inner?.ext
|
||||
const ext = toObject(extRaw)
|
||||
return {
|
||||
summary,
|
||||
wave_ids,
|
||||
waveGroups,
|
||||
locked_wave_groups,
|
||||
locked_orders: locked_orders.length ? locked_orders : undefined,
|
||||
locked_count,
|
||||
platform_groups,
|
||||
order_list: order_list.length ? order_list : undefined,
|
||||
ext
|
||||
}
|
||||
}
|
||||
@ -101,7 +101,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import {
|
||||
waveScanBoxConfig,
|
||||
fallbackOrderAvailableFields,
|
||||
|
||||
@ -920,8 +920,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import {
|
||||
waveUpperTableDefaults,
|
||||
waveAvailableFields,
|
||||
@ -1029,7 +1029,7 @@ import { useUserStore } from '@/stores/modules/user'
|
||||
import { getWavePlatformPrintData } from '@/api/order.print/orderprint'
|
||||
import { orderPendingOrderList, orderPendingOrderDetail } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
|
||||
import pcasCodeData from 'china-division/dist/pca-code.json'
|
||||
// 省市区字典(约 134KB JSON)改为按需动态加载:仅打开含省份选择的弹窗时才需要
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
@ -3178,14 +3178,34 @@ function patchSelectOptionsByValues(
|
||||
}
|
||||
|
||||
type RegionNode = { code: string; name: string; children?: RegionNode[] }
|
||||
const chinaRegionTree = (Array.isArray(pcasCodeData) ? pcasCodeData : []) as RegionNode[]
|
||||
const allProvinceOptionsFromDict = chinaRegionTree.map((item) => ({
|
||||
label: String(item?.name || '').trim(),
|
||||
value: String(item?.name || '').trim()
|
||||
})).filter((item) => item.value)
|
||||
|
||||
/** 省市区字典选项(懒加载):首屏不下载该 134KB chunk,等真正用到省份选项时再拉 */
|
||||
let provinceOptionsFromDict: Array<{ label: string; value: string }> = []
|
||||
let provinceOptionsLoading: Promise<void> | null = null
|
||||
|
||||
function ensureProvinceOptionsFromDict() {
|
||||
if (provinceOptionsFromDict.length || provinceOptionsLoading) return
|
||||
provinceOptionsLoading = import('china-division/dist/pca-code.json')
|
||||
.then((mod) => {
|
||||
const tree = (Array.isArray((mod as any).default) ? (mod as any).default : []) as RegionNode[]
|
||||
provinceOptionsFromDict = tree
|
||||
.map((item) => ({
|
||||
label: String(item?.name || '').trim(),
|
||||
value: String(item?.name || '').trim()
|
||||
}))
|
||||
.filter((item) => item.value)
|
||||
provinceOptionsLoading = null
|
||||
// 字典就绪后重建一次省份选项,把完整省份名补进去
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
})
|
||||
.catch(() => {
|
||||
provinceOptionsLoading = null
|
||||
})
|
||||
}
|
||||
|
||||
function refreshWaveStrategyProvinceOptions() {
|
||||
const provinceSet = new Set<string>(allProvinceOptionsFromDict.map((item) => item.value))
|
||||
ensureProvinceOptionsFromDict()
|
||||
const provinceSet = new Set<string>(provinceOptionsFromDict.map((item) => item.value))
|
||||
waveStrategyFormModel.allowed_provinces.forEach((item) => {
|
||||
const value = normalizeCode(item)
|
||||
if (value) provinceSet.add(value)
|
||||
|
||||
@ -508,8 +508,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import {
|
||||
waveUpperTableDefaults,
|
||||
waveAvailableFields,
|
||||
|
||||
@ -279,8 +279,8 @@ import { useResizeObserver } from '@vueuse/core'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
|
||||
@ -547,8 +547,8 @@ import { ElMessage } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import {
|
||||
waveScanBoxConfig,
|
||||
waveStrategyAvailableFields,
|
||||
@ -575,7 +575,7 @@ import type {
|
||||
WaveStrategyUpdateParams,
|
||||
WaveListRpcSort
|
||||
} from '@/api/order.wave/orderwave'
|
||||
import pcasCodeData from 'china-division/dist/pca-code.json'
|
||||
// 省市区字典(约 134KB JSON)改为按需动态加载:仅打开含省份选择的表单时才需要
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
/** 与路由 path 组合,隔离 ScanBox 筛选缓存 */
|
||||
@ -909,14 +909,33 @@ function patchSelectOptionsByValues(
|
||||
}
|
||||
|
||||
type RegionNode = { code: string; name: string; children?: RegionNode[] }
|
||||
const chinaRegionTree = (Array.isArray(pcasCodeData) ? pcasCodeData : []) as RegionNode[]
|
||||
const allProvinceOptionsFromDict = chinaRegionTree.map((item) => ({
|
||||
label: String(item?.name || '').trim(),
|
||||
value: String(item?.name || '').trim()
|
||||
})).filter((item) => item.value)
|
||||
|
||||
/** 省市区字典选项(懒加载):首屏不下载该 134KB chunk */
|
||||
let provinceOptionsFromDict: Array<{ label: string; value: string }> = []
|
||||
let provinceOptionsLoading: Promise<void> | null = null
|
||||
|
||||
function ensureProvinceOptionsFromDict() {
|
||||
if (provinceOptionsFromDict.length || provinceOptionsLoading) return
|
||||
provinceOptionsLoading = import('china-division/dist/pca-code.json')
|
||||
.then((mod) => {
|
||||
const tree = (Array.isArray((mod as any).default) ? (mod as any).default : []) as RegionNode[]
|
||||
provinceOptionsFromDict = tree
|
||||
.map((item) => ({
|
||||
label: String(item?.name || '').trim(),
|
||||
value: String(item?.name || '').trim()
|
||||
}))
|
||||
.filter((item) => item.value)
|
||||
provinceOptionsLoading = null
|
||||
refreshWaveStrategyProvinceOptions()
|
||||
})
|
||||
.catch(() => {
|
||||
provinceOptionsLoading = null
|
||||
})
|
||||
}
|
||||
|
||||
function refreshWaveStrategyProvinceOptions() {
|
||||
const provinceSet = new Set<string>(allProvinceOptionsFromDict.map((item) => item.value))
|
||||
ensureProvinceOptionsFromDict()
|
||||
const provinceSet = new Set<string>(provinceOptionsFromDict.map((item) => item.value))
|
||||
waveStrategyFormModel.allowed_provinces.forEach((item) => {
|
||||
const value = normalizeCode(item)
|
||||
if (value) provinceSet.add(value)
|
||||
|
||||
@ -151,7 +151,7 @@
|
||||
/>
|
||||
<manual-waybill-form
|
||||
v-model="manualWaybillDialogVisible"
|
||||
v-model:waybill-code="manualWaybillForm.waybill_code"
|
||||
v-model:waybill-code="manualWaybillState.waybill_code"
|
||||
:loading="manualWaybillLoading"
|
||||
:order-id="manualWaybillOrderId"
|
||||
:order-code="manualWaybillOrderCode"
|
||||
@ -182,18 +182,9 @@ import {
|
||||
resolveOrderRecheckStatus,
|
||||
sanitizeOrderListWhere
|
||||
} from '@/views/order/shared/orderListExport'
|
||||
import {
|
||||
buildPendingStyleColumns,
|
||||
pendingAvailableFields,
|
||||
pickToolbarButtons,
|
||||
type ToolbarButtonConfig,
|
||||
translateOrderField,
|
||||
translateInterceptStatus,
|
||||
getInterceptStatusTagType,
|
||||
getTagType,
|
||||
getStatusTextClass,
|
||||
fillExpressCompanyScanFieldOptions
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { fillExpressCompanyScanFieldOptions } from '@/utils/storeScanOptions'
|
||||
import { buildPendingStyleColumns, pendingAvailableFields, pickToolbarButtons, type ToolbarButtonConfig, translateOrderField, translateInterceptStatus, getInterceptStatusTagType, getTagType } from '@/views/order/orderManagement/config/order-common-config'
|
||||
|
||||
const props = defineProps<{
|
||||
waveNo: string
|
||||
@ -396,7 +387,7 @@ const {
|
||||
manualWaybillLoading,
|
||||
manualWaybillOrderId,
|
||||
manualWaybillOrderCode,
|
||||
manualWaybillForm
|
||||
manualWaybillState
|
||||
},
|
||||
submitStorageAllocate,
|
||||
submitAllocateExpress,
|
||||
|
||||
@ -105,7 +105,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import {
|
||||
waveStatusTextMap,
|
||||
waveStorageAssignmentStatusTextMap,
|
||||
|
||||
@ -9,14 +9,8 @@ export const WAVE_PAGE_CONFIG = {
|
||||
tabCacheMax: 5
|
||||
}
|
||||
|
||||
import {
|
||||
buyerMessageHasFilterOptions,
|
||||
scanBasicField,
|
||||
scanWorkflowField,
|
||||
type ToolbarButtonConfig,
|
||||
type UpperTableCopyAction
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
|
||||
import { scanBasicField, scanWorkflowField } from '@/utils/scanFields'
|
||||
import { buyerMessageHasFilterOptions, type ToolbarButtonConfig, type UpperTableCopyAction } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { WaveStrategyCreateParams, WaveStrategyUpdateParams } from '@/api/order.wave/orderwave'
|
||||
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
|
||||
import {
|
||||
@ -821,116 +815,12 @@ export function getWaveToolbarButtons(waveType: 1 | 2): WaveToolbarButtonConfig[
|
||||
)
|
||||
}
|
||||
|
||||
/** 解析 order.print.getWavePlatformPrintData 响应(支持 res.data 包裹) */
|
||||
export function unwrapWavePlatformPrintPayload(res: unknown): WavePlatformPrintDataPayload {
|
||||
const toObject = (v: unknown): Record<string, unknown> | undefined => {
|
||||
if (!v || typeof v !== 'object' || Array.isArray(v)) return undefined
|
||||
return v as Record<string, unknown>
|
||||
}
|
||||
|
||||
const toOrderList = (v: unknown): Record<string, unknown>[] => {
|
||||
if (!Array.isArray(v)) return []
|
||||
return v.filter((x) => x && typeof x === 'object') as Record<string, unknown>[]
|
||||
}
|
||||
|
||||
// 兼容后端直接返回数组:[{ wave_id, wave_no, order_count, platforms: [...] }]
|
||||
const normalizeWaveGroups = (list: unknown): unknown[] | undefined => {
|
||||
if (!Array.isArray(list)) return undefined
|
||||
const groups = list
|
||||
.filter((x) => x && typeof x === 'object')
|
||||
.map((wave) => {
|
||||
const waveObj = wave as Record<string, unknown>
|
||||
const rawPlatforms = Array.isArray(waveObj.platforms) ? waveObj.platforms : []
|
||||
const platforms = rawPlatforms
|
||||
.filter((p) => p && typeof p === 'object')
|
||||
.map((p) => {
|
||||
const platformObj = p as Record<string, unknown>
|
||||
const orders = toOrderList(platformObj.orders ?? platformObj.order_list)
|
||||
return {
|
||||
...platformObj,
|
||||
orders
|
||||
}
|
||||
})
|
||||
return {
|
||||
wave_id: waveObj.wave_id,
|
||||
wave_no: waveObj.wave_no,
|
||||
order_count: waveObj.order_count,
|
||||
platforms
|
||||
}
|
||||
})
|
||||
return groups
|
||||
}
|
||||
|
||||
const r = res as Record<string, unknown> | null | undefined
|
||||
|
||||
// 情况1:顶层就是波次数组
|
||||
if (Array.isArray(res)) {
|
||||
const waveGroups = normalizeWaveGroups(res)
|
||||
const wave_ids = (waveGroups || [])
|
||||
.map((x) => (x && typeof x === 'object' ? (x as Record<string, unknown>).wave_id : undefined))
|
||||
.filter((id) => id !== undefined && id !== null && id !== '') as Array<number | string>
|
||||
return {
|
||||
wave_ids: wave_ids.length ? wave_ids : undefined,
|
||||
waveGroups,
|
||||
platform_groups: undefined,
|
||||
order_list: undefined,
|
||||
summary: undefined,
|
||||
ext: undefined
|
||||
}
|
||||
}
|
||||
|
||||
const inner =
|
||||
r?.data !== undefined && r?.data !== null && typeof r.data === 'object' && !Array.isArray(r.data)
|
||||
? (r.data as Record<string, unknown>)
|
||||
: (r as Record<string, unknown>) || {}
|
||||
|
||||
// 情况2:res.data 是波次数组
|
||||
if (Array.isArray(r?.data)) {
|
||||
const waveGroups = normalizeWaveGroups(r.data)
|
||||
const wave_ids = (waveGroups || [])
|
||||
.map((x) => (x && typeof x === 'object' ? (x as Record<string, unknown>).wave_id : undefined))
|
||||
.filter((id) => id !== undefined && id !== null && id !== '') as Array<number | string>
|
||||
return {
|
||||
wave_ids: wave_ids.length ? wave_ids : undefined,
|
||||
waveGroups,
|
||||
platform_groups: undefined,
|
||||
order_list: undefined,
|
||||
summary: undefined,
|
||||
ext: undefined
|
||||
}
|
||||
}
|
||||
|
||||
const summaryRaw = inner?.summary
|
||||
const summary = toObject(summaryRaw)
|
||||
const wave_ids = Array.isArray(inner?.wave_ids) ? (inner.wave_ids as Array<number | string>) : undefined
|
||||
const waveGroups = Array.isArray(inner?.waveGroups)
|
||||
? inner.waveGroups
|
||||
: normalizeWaveGroups((inner as Record<string, unknown>).wave_list)
|
||||
const locked_wave_groups = Array.isArray(inner?.locked_wave_groups)
|
||||
? normalizeWaveGroups(inner.locked_wave_groups)
|
||||
: undefined
|
||||
const locked_orders = toOrderList(inner?.locked_orders)
|
||||
const locked_count_raw = (inner as Record<string, unknown>)?.locked_count
|
||||
const locked_count =
|
||||
locked_count_raw !== undefined && locked_count_raw !== null && Number.isFinite(Number(locked_count_raw))
|
||||
? Number(locked_count_raw)
|
||||
: undefined
|
||||
const platform_groups = Array.isArray(inner?.platform_groups) ? inner.platform_groups : undefined
|
||||
const order_list = toOrderList(inner?.order_list)
|
||||
const extRaw = inner?.ext
|
||||
const ext = toObject(extRaw)
|
||||
return {
|
||||
summary,
|
||||
wave_ids,
|
||||
waveGroups,
|
||||
locked_wave_groups,
|
||||
locked_orders: locked_orders.length ? locked_orders : undefined,
|
||||
locked_count,
|
||||
platform_groups,
|
||||
order_list: order_list.length ? order_list : undefined,
|
||||
ext
|
||||
}
|
||||
}
|
||||
/**
|
||||
* ⚠️ 已迁移到 `@/views/order/shared/wavePrintPayload`
|
||||
* 此处保留 re-export 仅为兼容历史引用;新代码请直接从新模块引入,
|
||||
* 避免「只为用一个纯函数」把整套波次配置拖进订单页首屏。
|
||||
*/
|
||||
export { unwrapWavePlatformPrintPayload } from '@/views/order/shared/wavePrintPayload'
|
||||
|
||||
/** 异步任务状态文案 */
|
||||
export const waveFetchTaskStatusTextMap: Record<string, string> = {
|
||||
|
||||
@ -2,70 +2,52 @@
|
||||
<div class="order-management-wrapper">
|
||||
<!-- 多标签模式 -->
|
||||
<template v-if="!singlePage">
|
||||
<!-- 顶部多标签页区域(对齐 order/orderManagement 的 tab-section) -->
|
||||
<!-- 顶部多标签页区域(统一组件:视觉/排序/默认页签均由 TabArea 负责) -->
|
||||
<div class="tab-section">
|
||||
<!-- 标签排序入口(tab 区域左侧,对齐 order/orderManagement) -->
|
||||
<div class="tab-sort-entry">
|
||||
<el-tooltip content="标签排序" placement="bottom">
|
||||
<el-button class="sort-entry-btn" size="small" link @click="openSortDialog">
|
||||
<el-icon><Sort /></el-icon>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<div class="tabs-header-action">
|
||||
<!-- 可抓取订单数(order.wave.fetchableOrderCount):当前仓库团购可抓取订单数,点击刷新 -->
|
||||
<el-tooltip placement="bottom">
|
||||
<template #content>
|
||||
<template v-if="fetchableOrderCount">
|
||||
<div>当前仓库可抓取团购订单:{{ fetchableOrderCount.order_count }} 单</div>
|
||||
<div>
|
||||
命中 {{ fetchableOrderCount.group_count }} 组 · 阈值 {{ fetchableOrderCount.same_order_quantity }} · 候选 {{ fetchableOrderCount.raw_order_count }} 单
|
||||
</div>
|
||||
</template>
|
||||
<div v-else-if="fetchableOrderCountError">{{ fetchableOrderCountError }}</div>
|
||||
<div v-else>统计中…</div>
|
||||
<div>点击「可抓取订单」可刷新统计</div>
|
||||
</template>
|
||||
<span
|
||||
class="fetchable-order-chip"
|
||||
:class="{
|
||||
'is-active': !fetchableOrderCountLoading && !fetchableOrderCountError && (fetchableOrderCount?.order_count ?? 0) > 0,
|
||||
'is-error': !!fetchableOrderCountError
|
||||
}"
|
||||
@click="fetchFetchableOrderCount"
|
||||
>
|
||||
<span class="chip-label">可抓取订单</span>
|
||||
<em class="chip-count">{{ fetchableOrderCountLoading ? '…' : (fetchableOrderCount ? fetchableOrderCount.order_count : '—') }}</em>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
<!-- 已确认打印未领单波次数量(order.wave.confirmPrintUnclaimedWaveCount 长轮询实时刷新) -->
|
||||
<el-tooltip
|
||||
content="已确认打印但未领单的波次数量,实时刷新"
|
||||
placement="bottom"
|
||||
>
|
||||
<span class="unclaimed-print-chip" :class="{ 'is-active': confirmPrintUnclaimedWaveCount > 0 }">
|
||||
<span class="chip-label">确认打印未领单</span>
|
||||
<em class="chip-count">{{ confirmPrintUnclaimedWaveCount }}</em>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<el-tabs
|
||||
v-model="activeTab"
|
||||
tab-position="top"
|
||||
type="border-card"
|
||||
class="tab-container"
|
||||
<TabArea
|
||||
:tabs="tabs"
|
||||
:default-active="activeTab"
|
||||
page-key="order.wave"
|
||||
@tab-change="handleTabChange"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="tab in tabs"
|
||||
:key="tab.name"
|
||||
:name="tab.name"
|
||||
:lazy="false"
|
||||
>
|
||||
<template #label>
|
||||
<span class="custom-tab-label">{{ tab.label }}</span>
|
||||
</template>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<template #header-action>
|
||||
<!-- 可抓取订单数(order.wave.fetchableOrderCount):当前仓库团购可抓取订单数,点击刷新 -->
|
||||
<el-tooltip placement="bottom">
|
||||
<template #content>
|
||||
<template v-if="fetchableOrderCount">
|
||||
<div>当前仓库可抓取团购订单:{{ fetchableOrderCount.order_count }} 单</div>
|
||||
<div>
|
||||
命中 {{ fetchableOrderCount.group_count }} 组 · 阈值 {{ fetchableOrderCount.same_order_quantity }} · 候选 {{ fetchableOrderCount.raw_order_count }} 单
|
||||
</div>
|
||||
</template>
|
||||
<div v-else-if="fetchableOrderCountError">{{ fetchableOrderCountError }}</div>
|
||||
<div v-else>统计中…</div>
|
||||
<div>点击「可抓取订单」可刷新统计</div>
|
||||
</template>
|
||||
<span
|
||||
class="fetchable-order-chip"
|
||||
:class="{
|
||||
'is-active': !fetchableOrderCountLoading && !fetchableOrderCountError && (fetchableOrderCount?.order_count ?? 0) > 0,
|
||||
'is-error': !!fetchableOrderCountError
|
||||
}"
|
||||
@click="fetchFetchableOrderCount"
|
||||
>
|
||||
<span class="chip-label">可抓取订单</span>
|
||||
<em class="chip-count">{{ fetchableOrderCountLoading ? '…' : (fetchableOrderCount ? fetchableOrderCount.order_count : '—') }}</em>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
<!-- 已确认打印未领单波次数量(order.wave.confirmPrintUnclaimedWaveCount 长轮询实时刷新) -->
|
||||
<el-tooltip
|
||||
content="已确认打印但未领单的波次数量,实时刷新"
|
||||
placement="bottom"
|
||||
>
|
||||
<span class="unclaimed-print-chip" :class="{ 'is-active': confirmPrintUnclaimedWaveCount > 0 }">
|
||||
<span class="chip-label">确认打印未领单</span>
|
||||
<em class="chip-count">{{ confirmPrintUnclaimedWaveCount }}</em>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</TabArea>
|
||||
</div>
|
||||
|
||||
<!-- 主内容区容器(对齐 order/orderManagement 的 main-container) -->
|
||||
@ -98,13 +80,6 @@
|
||||
/>
|
||||
</keep-alive>
|
||||
</div>
|
||||
|
||||
<SortSettingDialog
|
||||
v-model:visible="sortDialogVisible"
|
||||
:tabs="DEFAULT_TAB_OPTIONS"
|
||||
scope="order.wave.tabs.order"
|
||||
@saved="handleSortSaved"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -114,9 +89,8 @@ import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import { useExperimentalStore } from '@/stores/modules/experimental'
|
||||
import { Sort } from '@element-plus/icons-vue'
|
||||
import SortSettingDialog from '@/components/SortSettingDialog.vue'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import TabArea from '@/components/TabArea/index.vue'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
// 默认页签(团购波次)保持同步加载,其余页签按需加载
|
||||
import GroupWaveBatchListPanel from './GroupWaveBatchListPanel.vue'
|
||||
const SandanWaveBatchListPanel = defineAsyncComponent(() => import('./SandanWaveBatchListPanel.vue'))
|
||||
@ -140,11 +114,6 @@ const tabCacheMax = computed(() => WAVE_PAGE_CONFIG.tabCacheMax ?? experimentalS
|
||||
|
||||
const singlePage = WAVE_PAGE_CONFIG.singlePage
|
||||
|
||||
/** 单页模式下使用的默认标签(始终为 tabs 第一项) */
|
||||
const defaultTab = computed(() => tabs.value[0]!)
|
||||
|
||||
const activeTab = ref('groupWave')
|
||||
|
||||
/** 当前激活页签对应的组件(渲染在主内容区 main-container 中,对齐 order/orderManagement) */
|
||||
const activeComponent = computed(() => {
|
||||
const tab = tabs.value.find((t) => t.name === activeTab.value)
|
||||
@ -198,41 +167,21 @@ const tabs = ref<WaveTabItem[]>([
|
||||
])
|
||||
|
||||
// ============================================================
|
||||
// 标签排序(浏览器本地保存,scope=order.wave.tabs.order)
|
||||
// 标签排序 / 默认页签(统一由 useTabOrder 负责,配置按账号保存)
|
||||
// ============================================================
|
||||
/** 默认 tab 顺序(弹窗选项 / 恢复默认用) */
|
||||
const DEFAULT_TAB_OPTIONS = tabs.value.map(({ name, label }) => ({ name, label }))
|
||||
const sortDialogVisible = ref(false)
|
||||
const preferenceStore = useUserPreferenceStore()
|
||||
const TAB_ORDER_SCOPE = 'order.wave.tabs.order'
|
||||
const { defaultTabName, resolveInitialTab } = useTabOrder('order.wave', () => tabs.value, {
|
||||
legacyScopes: ['order.wave.tabs.order']
|
||||
})
|
||||
|
||||
function openSortDialog() {
|
||||
sortDialogVisible.value = true
|
||||
}
|
||||
/** 单页模式默认标签(跟随用户设置的默认页签,未设置时回退第一项) */
|
||||
const defaultTab = computed(
|
||||
() => tabs.value.find((tab) => tab.name === defaultTabName.value) ?? tabs.value[0]!
|
||||
)
|
||||
|
||||
/** 保存标签顺序:按新顺序重排 tabs 数组(组件对象原样复用,缺失项留在末尾) */
|
||||
function handleSortSaved(order: string[]) {
|
||||
applyTabOrder(order)
|
||||
}
|
||||
const activeTab = ref(resolveInitialTab(route.query.tab as string | undefined))
|
||||
|
||||
/** 读取本账号保存的标签顺序并应用;无配置时保持默认顺序 */
|
||||
function applySavedTabOrder() {
|
||||
const saved = preferenceStore.get(TAB_ORDER_SCOPE)
|
||||
if (!Array.isArray(saved) || !saved.length) return
|
||||
applyTabOrder(saved)
|
||||
}
|
||||
|
||||
/** 按给定 tab.name 顺序重排 tabs;非法项剔除,缺失项按当前 tabs 补在末尾 */
|
||||
function applyTabOrder(order: string[]) {
|
||||
const byName = new Map(tabs.value.map((t) => [t.name, t]))
|
||||
const ordered: WaveTabItem[] = []
|
||||
for (const name of order) {
|
||||
if (byName.has(name)) ordered.push(byName.get(name)!)
|
||||
}
|
||||
for (const t of tabs.value) {
|
||||
if (!ordered.some((x) => x.name === t.name)) ordered.push(t)
|
||||
}
|
||||
tabs.value = ordered
|
||||
function handleTabChange(name: string | number) {
|
||||
activeTab.value = String(name)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -245,9 +194,7 @@ function applyTabOrder(order: string[]) {
|
||||
watch(
|
||||
() => route.query.tab,
|
||||
(newTab) => {
|
||||
const validTabs = tabs.value.map((t) => t.name)
|
||||
const raw = newTab === undefined || newTab === null ? '' : String(newTab).trim()
|
||||
activeTab.value = raw && validTabs.includes(raw) ? raw : 'groupWave'
|
||||
activeTab.value = resolveInitialTab(newTab === undefined || newTab === null ? '' : String(newTab))
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
@ -397,10 +344,6 @@ onUnmounted(stopConfirmPrintUnclaimedWaveCountPoll)
|
||||
onActivated(() => { void pollConfirmPrintUnclaimedWaveCount() })
|
||||
onDeactivated(stopConfirmPrintUnclaimedWaveCountPoll)
|
||||
|
||||
onMounted(() => {
|
||||
applySavedTabOrder()
|
||||
})
|
||||
|
||||
// ============================================================
|
||||
// 可抓取订单数(tab 区展示,order.wave.fetchableOrderCount)
|
||||
// ============================================================
|
||||
@ -480,17 +423,6 @@ watch(activeTab, (name) => {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.tabs-header-action {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 16px;
|
||||
height: 38px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
/* 已确认打印未领单波次数量(tab 区常显;>0 时高亮提醒) */
|
||||
.unclaimed-print-chip {
|
||||
display: inline-flex;
|
||||
@ -572,30 +504,7 @@ watch(activeTab, (name) => {
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签排序入口(tab 区域左侧,样式对齐 order/orderManagement) */
|
||||
.tab-sort-entry {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
left: 12px;
|
||||
height: 38px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
z-index: 2;
|
||||
|
||||
.sort-entry-btn {
|
||||
color: #606266;
|
||||
font-size: 15px;
|
||||
padding: 4px 6px;
|
||||
border-radius: 4px;
|
||||
transition: all 0.2s;
|
||||
|
||||
&:hover {
|
||||
color: #409eff;
|
||||
background-color: rgba(64, 158, 255, 0.08);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签排序入口已由 TabArea 统一提供 */
|
||||
.tab-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import type { ComboGoodsListItem } from '@/api/combogoods/combogoods'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
export type ComboGoodsRecord = ComboGoodsListItem & {
|
||||
created_at?: string
|
||||
|
||||
@ -221,10 +221,7 @@ import {
|
||||
parseComboNameNotation,
|
||||
parseComboSimpleNotation
|
||||
} from '@/views/stock/utils/stockPickerHelpers'
|
||||
import {
|
||||
extractStoreListFromResponse,
|
||||
mapStoreListToSelectOptions
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/utils/storeScanOptions'
|
||||
|
||||
const visible = defineModel<boolean>({ default: false })
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@
|
||||
import { ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { comboGoodsSearch } from '@/api/combogoods/combogoods'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import {
|
||||
formatComboGoodsStatus,
|
||||
isComboGoodsApiSuccess,
|
||||
|
||||
@ -102,11 +102,11 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { comboGoodsDelete, comboGoodsList } from '@/api/combogoods/combogoods'
|
||||
import ComboGoodsFormDialog from './component/ComboGoodsFormDialog.vue'
|
||||
import ComboGoodsSearchDialog from './component/ComboGoodsSearchDialog.vue'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import {
|
||||
buildComboGoodsListPayload,
|
||||
comboGoodsColumns,
|
||||
|
||||
@ -294,8 +294,8 @@ import ErpStock from '@/views/stock/stock/component/erpStock.vue'
|
||||
import Log from '@/views/stock/stock/component/log.vue'
|
||||
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import { buildStockQuery } from '@/utils/stockQueryBuilder'
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
import { computed } from 'vue'
|
||||
import type { ColumnSlotConfig } from '../config/picking-shortage-config'
|
||||
import { TAG_RESOLVERS, translate, formatTime } from '../config/picking-shortage-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
|
||||
defineOptions({ name: 'PickingShortageColumnCellRenderer' })
|
||||
|
||||
|
||||
@ -120,12 +120,9 @@ import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig as OrderToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig as OrderToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { loadStores } from '@/api/index/index'
|
||||
import {
|
||||
extractStoreListFromResponse,
|
||||
mapStoreListToSelectOptions
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/utils/storeScanOptions'
|
||||
import {
|
||||
exportReplenishmentDemandCsv,
|
||||
isReplenishmentDemandSuccess,
|
||||
|
||||
@ -168,7 +168,7 @@
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import type { DialogBeforeCloseFn } from 'element-plus'
|
||||
import * as XLSX from 'xlsx'
|
||||
// xlsx(约 420KB)改为按需动态加载:使用处 await import('xlsx')
|
||||
import * as stockApi from '@/api/stock/stock'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
|
||||
@ -340,7 +340,8 @@ function revalidateRow(r: ImportRow) {
|
||||
}
|
||||
}
|
||||
|
||||
function downloadTemplate() {
|
||||
async function downloadTemplate() {
|
||||
const XLSX = await import('xlsx')
|
||||
const headers = ['SKU', '商品编码', '商品名称', '货物编码', '条码', 'SKU规格', '库存单位', '品牌', '毛重', '标价', '零售价', '是否需要复核', '货主']
|
||||
const ws = XLSX.utils.aoa_to_sheet([headers])
|
||||
ws['!cols'] = headers.map(() => ({ wch: 20 }))
|
||||
@ -435,6 +436,7 @@ function validateAllRows(): number {
|
||||
async function parseExcel(file: File) {
|
||||
try {
|
||||
const buf = await file.arrayBuffer()
|
||||
const XLSX = await import('xlsx')
|
||||
const wb = XLSX.read(buf, { type: 'array', dense: true })
|
||||
const ws = wb.Sheets[wb.SheetNames?.[0] || '']
|
||||
if (!ws) { ElMessage.error('未读取到工作表'); return }
|
||||
|
||||
@ -225,7 +225,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, computed, onMounted, shallowRef, markRaw } from 'vue'
|
||||
import { ref, reactive, computed, onMounted, shallowRef, markRaw, defineAsyncComponent } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import {
|
||||
ArrowDown, User
|
||||
@ -235,14 +235,15 @@ import {
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import Info from './component/info.vue'
|
||||
import Images from '@/components/ImagesUpload/index.vue'
|
||||
import ErpStock from './component/erpStock.vue'
|
||||
import Storage from './component/storage.vue'
|
||||
import Barcode from './component/barcode.vue'
|
||||
import Log from './component/log.vue'
|
||||
// 其余详情页签改为按需加载:默认只看「信息」页签,其余切到了才下载
|
||||
const ErpStock = defineAsyncComponent(() => import('./component/erpStock.vue'))
|
||||
const Storage = defineAsyncComponent(() => import('./component/storage.vue'))
|
||||
const Barcode = defineAsyncComponent(() => import('./component/barcode.vue'))
|
||||
const Log = defineAsyncComponent(() => import('./component/log.vue'))
|
||||
import StockFormDialog from './component/StockFormDialog.vue'
|
||||
import RecycleDialog from './component/RecycleDialog.vue'
|
||||
import StockBatchEditDialog from './component/StockBatchEditDialog.vue'
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
import {
|
||||
scanWorkflowField,
|
||||
type ToolbarButtonConfig
|
||||
} from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { scanWorkflowField } from '@/utils/scanFields'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { normalizeBarcodeList } from '@/utils/barcode'
|
||||
|
||||
/** ScanBox 筛选字段分组(商品模块专用,保留供其他场景复用) */
|
||||
|
||||
@ -2,29 +2,12 @@
|
||||
<div class="stock-management-wrapper" :style="{ height: containerHeight }">
|
||||
<!-- ===== 顶部多标签页区域(对齐 setting/encoding / waveOrder2 的 TabArea) ===== -->
|
||||
<div class="tab-section">
|
||||
<!-- 标签排序入口(tab 区域左侧) -->
|
||||
<div class="tab-sort-entry">
|
||||
<el-tooltip content="标签排序" placement="bottom">
|
||||
<el-button class="sort-entry-btn" size="small" link @click="openSortDialog">
|
||||
<el-icon><Sort /></el-icon>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<el-tabs
|
||||
v-model="activeTab"
|
||||
tab-position="top"
|
||||
type="border-card"
|
||||
class="tab-container"
|
||||
<TabArea
|
||||
:tabs="tabs"
|
||||
:default-active="activeTab"
|
||||
page-key="stock.management"
|
||||
@tab-change="handleTabChange"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="tab in tabs"
|
||||
:key="tab.name"
|
||||
:name="tab.name"
|
||||
:label="tab.label"
|
||||
:lazy="false"
|
||||
/>
|
||||
</el-tabs>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- ===== 主内容区容器(对齐 setting/encoding / waveOrder2 的 main-container) ===== -->
|
||||
@ -36,24 +19,16 @@
|
||||
<component v-else :is="tabs.find(t => t.name === activeTab)?.component" :key="activeTab" />
|
||||
</transition>
|
||||
</div>
|
||||
|
||||
<SortSettingDialog
|
||||
v-model:visible="sortDialogVisible"
|
||||
:tabs="DEFAULT_TAB_OPTIONS"
|
||||
scope="stock.tabs.order"
|
||||
@saved="handleSortSaved"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, markRaw, ref, watch, onMounted } from 'vue'
|
||||
import { computed, markRaw, ref, watch } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { useSettingsStore } from '@/stores/modules/settings'
|
||||
import { useExperimentalStore } from '@/stores/modules/experimental'
|
||||
import { Sort } from '@element-plus/icons-vue'
|
||||
import SortSettingDialog from '@/components/SortSettingDialog.vue'
|
||||
import { useUserPreferenceStore } from '@/stores/modules/userPreference'
|
||||
import TabArea from '@/components/TabArea/index.vue'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import StockDetail from '../stock/index.vue'
|
||||
import ComboStock from '../combo_stock/index.vue'
|
||||
@ -90,51 +65,24 @@ const tabs = ref<StockTabItem[]>([
|
||||
])
|
||||
|
||||
// ============================================================
|
||||
// 标签排序(浏览器本地保存,scope=stock.tabs.order)
|
||||
// 标签排序 / 默认页签(统一由 useTabOrder 负责,配置按账号保存)
|
||||
// ============================================================
|
||||
/** 默认 tab 顺序(弹窗选项 / 恢复默认用) */
|
||||
const DEFAULT_TAB_OPTIONS = tabs.value.map(({ name, label }) => ({ name, label }))
|
||||
const sortDialogVisible = ref(false)
|
||||
const preferenceStore = useUserPreferenceStore()
|
||||
const TAB_ORDER_SCOPE = 'stock.tabs.order'
|
||||
const { defaultTabName, resolveInitialTab } = useTabOrder('stock.management', () => tabs.value, {
|
||||
legacyScopes: ['stock.tabs.order'],
|
||||
// 页面兜底默认:combo 路由默认打开组合商品
|
||||
fallbackTabName: () => (String(route.path || '').toLowerCase().includes('combo') ? 'comboStock' : 'stockDetail')
|
||||
})
|
||||
|
||||
function openSortDialog() {
|
||||
sortDialogVisible.value = true
|
||||
}
|
||||
const activeTab = ref(resolveInitialTab(route.query.tab as string | undefined))
|
||||
|
||||
/** 保存标签顺序:按新顺序重排 tabs 数组(组件对象原样复用,缺失项留在末尾) */
|
||||
function handleSortSaved(order: string[]) {
|
||||
applyTabOrder(order)
|
||||
}
|
||||
|
||||
/** 读取本账号保存的标签顺序并应用;无配置时保持默认顺序 */
|
||||
function applySavedTabOrder() {
|
||||
const saved = preferenceStore.get(TAB_ORDER_SCOPE)
|
||||
if (!Array.isArray(saved) || !saved.length) return
|
||||
applyTabOrder(saved)
|
||||
}
|
||||
|
||||
/** 按给定 tab.name 顺序重排 tabs;非法项剔除,缺失项按当前 tabs 补在末尾 */
|
||||
function applyTabOrder(order: string[]) {
|
||||
const byName = new Map(tabs.value.map((t) => [t.name, t]))
|
||||
const ordered: StockTabItem[] = []
|
||||
for (const name of order) {
|
||||
if (byName.has(name)) ordered.push(byName.get(name)!)
|
||||
}
|
||||
for (const t of tabs.value) {
|
||||
if (!ordered.some((x) => x.name === t.name)) ordered.push(t)
|
||||
}
|
||||
tabs.value = ordered
|
||||
}
|
||||
|
||||
const activeTab = ref('stockDetail')
|
||||
|
||||
function resolveDefaultTab(): string {
|
||||
/** combo 路由是显式入口,优先级高于用户默认页签 */
|
||||
function resolveRouteTab(rawTab: unknown): string {
|
||||
const raw = rawTab === undefined || rawTab === null ? '' : String(rawTab).trim()
|
||||
const withUrl = resolveInitialTab(raw)
|
||||
if (raw && withUrl === raw) return raw
|
||||
const path = String(route.path || '').toLowerCase()
|
||||
if (path.includes('combo')) {
|
||||
return 'comboStock'
|
||||
}
|
||||
return 'stockDetail'
|
||||
if (path.includes('combo') && tabs.value.some((tab) => tab.name === 'comboStock')) return 'comboStock'
|
||||
return withUrl || defaultTabName.value
|
||||
}
|
||||
|
||||
/**
|
||||
@ -148,15 +96,7 @@ function resolveDefaultTab(): string {
|
||||
watch(
|
||||
() => [route.query.tab, route.path] as const,
|
||||
([newTab]) => {
|
||||
const validTabs = tabs.value.map((tab) => tab.name)
|
||||
const raw = newTab === undefined || newTab === null ? '' : String(newTab).trim()
|
||||
|
||||
if (raw && validTabs.includes(raw)) {
|
||||
activeTab.value = raw
|
||||
return
|
||||
}
|
||||
|
||||
activeTab.value = resolveDefaultTab()
|
||||
activeTab.value = resolveRouteTab(newTab)
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
@ -171,10 +111,6 @@ const handleTabChange = (tabName: string | number) => {
|
||||
activeTab.value = name
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
applySavedTabOrder()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@ -203,30 +139,7 @@ onMounted(() => {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 标签排序入口(tab 区域左侧) */
|
||||
.tab-sort-entry {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
left: 12px;
|
||||
height: 38px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
z-index: 2;
|
||||
|
||||
.sort-entry-btn {
|
||||
color: #606266;
|
||||
font-size: 15px;
|
||||
padding: 4px 6px;
|
||||
border-radius: 4px;
|
||||
transition: all 0.2s;
|
||||
|
||||
&:hover {
|
||||
color: #409eff;
|
||||
background-color: rgba(64, 158, 255, 0.08);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签排序入口已由 TabArea 统一提供 */
|
||||
.tab-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch, onActivated, onMounted } from 'vue'
|
||||
import { useResizeObserver } from '@vueuse/core'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import {
|
||||
getEntryDetail,
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch, onMounted } from 'vue'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import {
|
||||
|
||||
@ -705,7 +705,7 @@ export function formatEntryBindingStatus(status: unknown): string {
|
||||
return map[key] || String(status)
|
||||
}
|
||||
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
|
||||
/** 入库单列表主工具栏按钮(action 与 entry/index.vue 内 toolbarActionMap 键一致)
|
||||
* 排序与样式分类对齐 storage/receiving:
|
||||
|
||||
@ -402,8 +402,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import * as entryApi from '@/api/storage.entry/entry'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import * as XLSX from 'xlsx'
|
||||
// xlsx(约 420KB)改为按需动态加载:使用处 await import('xlsx')
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import * as warehouseApi from '@/api/warehouse/warehouse'
|
||||
import { entrydetail } from '../entry-config'
|
||||
@ -293,6 +293,7 @@ export function parseDirectInboundXlsxRows(
|
||||
|
||||
export async function readDirectInboundXlsxFile(file: File): Promise<Record<string, unknown>[]> {
|
||||
const buffer = await file.arrayBuffer()
|
||||
const XLSX = await import('xlsx')
|
||||
const workbook = XLSX.read(buffer, { type: 'array', dense: true })
|
||||
const sheetName = workbook.SheetNames[0]
|
||||
if (!sheetName) return []
|
||||
@ -301,10 +302,11 @@ export async function readDirectInboundXlsxFile(file: File): Promise<Record<stri
|
||||
return XLSX.utils.sheet_to_json<Record<string, unknown>>(worksheet, { defval: '' })
|
||||
}
|
||||
|
||||
export function downloadDirectInboundImportTemplate(
|
||||
export async function downloadDirectInboundImportTemplate(
|
||||
entryItems: DirectInboundImportRow[],
|
||||
fileName?: string
|
||||
) {
|
||||
const XLSX = await import('xlsx')
|
||||
const exportData = entryItems.map((item) => {
|
||||
const mapped: Record<string, unknown> = {}
|
||||
entrydetail.forEach((column: any) => {
|
||||
|
||||
@ -187,8 +187,8 @@ import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import WarehouseSelect from '@/components/WarehouseSelect.vue'
|
||||
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import * as entryApi from '@/api/storage.entry/entry'
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
<TabArea
|
||||
:tabs="tabList"
|
||||
:default-active="activeTabName"
|
||||
page-key="storage.generalreport"
|
||||
@tab-change="handleTabChange"
|
||||
/>
|
||||
</div>
|
||||
@ -253,6 +254,7 @@ import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import TabArea from '@/components/TabArea/index.vue'
|
||||
import { useTabOrder } from '@/composables/useTabOrder'
|
||||
import ColumnCellRenderer from './components/ColumnCellRenderer.vue'
|
||||
import OperationCellRenderer from './components/OperationCellRenderer.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
@ -285,7 +287,10 @@ const containerHeight = computed(() =>
|
||||
const tabList = computed(() =>
|
||||
tabPages.map((t) => ({ name: t.name, label: t.label }))
|
||||
)
|
||||
const activeTabName = ref(tabPages[0]?.name ?? 'tab1')
|
||||
const { defaultTabName } = useTabOrder('storage.generalreport', () =>
|
||||
tabPages.map((tab) => ({ name: tab.name, label: tab.label }))
|
||||
)
|
||||
const activeTabName = ref(defaultTabName.value || tabPages[0]?.name || 'tab1')
|
||||
|
||||
/** 当前激活标签页的完整配置 */
|
||||
const currentTabConfig = computed<TabPageConfig | undefined>(() => {
|
||||
|
||||
@ -182,8 +182,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import ScanBox from '@/components/ScanBox/index.vue'
|
||||
import UpperTable from '@/components/UpperTable/index.vue'
|
||||
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
|
||||
import { getStatusTextClass } from '@/utils/statusText'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
|
||||
import { useAsyncExportTask, type AsyncExportPayload } from '@/composables/useAsyncExportTask'
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user