From b6e6964913fae1776ddb6cdb9d18325fce715356 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 18 Jun 2026 15:35:17 +0800 Subject: [PATCH] fix framework p2 custom views --- docs/framework定制视图-TODO-2026-06-17.md | 23 +- .../platform/converter/EngineclassDelta.java | 5 +- .../converter/TemplateToAmisConverter.java | 319 +++++++++++++++++- .../eip4/platform/converter/UiTypeMapper.java | 37 +- .../TemplateToAmisConverterTest.java | 208 +++++++++++- .../flowgateway/web/TodoController.java | 14 + .../flowgateway/TodoControllerAmisTest.java | 27 ++ .../metadata/web/FieldEditorController.java | 21 +- .../metadata/web/TemplateTreeController.java | 19 ++ .../web/FieldEditorControllerTest.java | 16 + .../web/TemplateTreeControllerTest.java | 11 + 11 files changed, 653 insertions(+), 47 deletions(-) diff --git a/docs/framework定制视图-TODO-2026-06-17.md b/docs/framework定制视图-TODO-2026-06-17.md index ce8d955..f9f94ee 100644 --- a/docs/framework定制视图-TODO-2026-06-17.md +++ b/docs/framework定制视图-TODO-2026-06-17.md @@ -9,9 +9,9 @@ | 口径 | 数量 | 说明 | |---|---:|---| | framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 | -| 已逐功能验收 / 可算 Done | 约 8 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 | -| 代码已提交但待最终副作用验收 | 约 12 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;流程监控已补处理明细查看、结束流程和「高级处理」Groovy 执行入口;通用脚本/XML 编辑器已接入第一批页面;设置定时任务提醒人、数据导入下载/执行入口、功能/视图设计器入口、报表宿主、工作日历已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 | -| 仍需修或逐功能验收 | 约 38 | 含上面的待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 | +| 已逐功能验收 / 可算 Done | 约 13 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务、流程监控、通用脚本/XML 编辑器第一批、treeGrid 主键列隐藏、服务页实体显名、服务/实体配置下拉与子表加载。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 | +| 代码已提交但待最终副作用验收 | 约 10 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;设置定时任务提醒人、数据导入下载/执行入口、功能/视图设计器入口、报表宿主、工作日历已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 | +| 仍需修或逐功能验收 | 约 34 | 含上面的待验组;大多是通用页已产出,但 engineclass Java delta 未迁移或仍需真实业务副作用验收。 | | 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 | ## Done(已完成 / 已验收) @@ -32,6 +32,11 @@ | 2026-06-18 | 短消息 `MessageManageView`:发送消息弹窗、标准用户多选 picker、写 `sys_message/sys_messageuser`、发送后刷新已发列表 | Done | `eip4-platform 723443e` | `NoticeControllerTest`; `TemplateToAmisConverterTest#engineclass_MessageSendView_注入查看按钮,#engineclass_MessageManageView_注入发送消息弹窗`; live 浏览器验收 `ae79a47b`:打开「发送消息」→ 接收人标准 amis 表格 picker(搜索/分页/checkbox)→ 发送成功 → 不点搜索即在已发列表第一行出现 `codex短消息live刷新-*` | | 2026-06-18 | 查看审批 `WorkFlowHistoryDetailPanel`:通用审批业务列表「查看审批」从轨迹表弹窗升级为只读 `ApprovalDrawer`,支持 businessKey/processInstanceId 双路历史查看,展示业务单据 + 流程轨迹 | Done | `eip4-platform 21e3865`, `eip4-web d03c2ba` | `TemplateToAmisConverterTest#buildToolbar_审批列表补查看审批按钮`; `ApprovalControllerHistoryTest`; `registerApprovalAction.test.ts`; `npm run build`; `mvn -q -pl platform-app -am package -DskipTests`; 全量重转 2757 项,导入更新 636 项;浏览器验收 `18fb15c9`:选中第一行 →「查看审批」打开“审批详情”抽屉,含“业务单据(总包合同评审)/流程轨迹”,无旧“审批记录”弹窗 | | 2026-06-18 | 我的发起任务 `MySendTaskComponent`:列表改走 Flowable startedBy 聚合端点;查看详细打开只读 ApprovalDrawer;撤回桥接 Flowable changeActivityState + 挂起实例;起流写入 authenticated user,保证 startedBy 有数据 | Done | `61f3152` | `FlowControllerTest`; `FlowableClientTest`; `TodoControllerAmisTest`; `TemplateToAmisConverterTest#engineclass_MySendTaskComponent_注入查看详细和撤回按钮`; `registerApprovalAction.test.ts`; `npm run build`; `mvn -q -pl flowable-service,platform-app -am clean package -DskipTests`; 全量重转 2757 项、导入更新 641 项;接口 E2E:`20424028` 以 `ADMIN` 发起后 `/api/workflow/process/started-amis` 返回 `E2E-MYSEND-BROWSER-20260618-0250`;浏览器验收 `0db4af06`:列表出现测试行,选中后“查看详细/撤回”启用,“查看详细”打开业务单据+流程轨迹;撤回后实例 `suspended=true` | +| 2026-06-18 | 流程监控 `ProcessMonitorComponentNew`:列表改走 Flowable 全量实例聚合;「处理」打开只读审批详情;「结束流程」桥接 Flowable terminate 并回写 `SYS_DATASTATUS=6`;「高级处理」执行 Groovy 脚本 | Done | 本次提交 | `TodoControllerAmisTest`; `TemplateToAmisConverterTest#engineclass_ProcessMonitorComponentNew_注入处理高级处理和结束流程按钮`; 接口 E2E:`/api/workflow/process/monitor-amis` 返回运行中/已撤回数据和发起人显示名,`/terminate` 已结束流程 409、运行中流程 200 且状态回写作废,`/advanced-script` 成功/失败脚本均按预期返回;全量重转 2757 项、导入扫描 2685 项/更新 677 项;内置浏览器验收 `9f3b5a8b`:列表有数据,选中后「处理/高级处理/结束流程」启用,「处理」打开业务单据 + 流程轨迹 | +| 2026-06-18 | 通用脚本/XML 编辑器(P2 第一批):定时任务脚本、数据导入转换/保存脚本、功能/视图 XML 高级配置统一走 `/api/field-editor/load|save` | Done | 本次提交 | `FieldEditorControllerTest`; `TemplateToAmisConverterTest`; live 可逆保存:`RUNSCRIPT`、`CONVERTSCRIPT`、`SAVESCRIPT`、`VIEW_TEMPLATE.XML`、`VIEW_PAGE.XML` 均完成保存-回读-恢复;非法 XML 返回业务失败不再 500;内置浏览器验收:`d99b5760` 打开「编辑任务脚本」并加载脚本,`8b89fd29` 打开「高级配置」并加载 XML,`7821ef3b` 打开「编辑转换脚本」并加载脚本,弹窗层级 `z-index=1400` | +| 2026-06-18 | 引用式 treeGrid 右表主键列隐藏:`hidden=true` 或 `iskeycolumn=true` 的 display 列统一默认隐藏,修复功能/视图/定时任务等 treeGrid 列表露出 UUID 主键 | Done | 本次提交 | `TemplateToAmisConverterTest#tree_treeGrid右表引用模板主键列默认隐藏`; `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`; 全量重转 2757 项、导入扫描 2685 项/更新 800 项;HTTP schema 确认 `8b89fd29 VIEW_TEMPLATE_ID`、`d7e12a83 VIEW_PAGE_ID`、`d99b5760 SYS_SCHEDULEJOB_ID` 均为 `toggled=false`;内置浏览器刷新 `8b89fd29` 后表头只剩「功能名称/模板类型/可作为菜单/模板解析类」,行内不再显示 UUID | +| 2026-06-18 | 服务页 `76ff564a` 实体列显名:转换器按 `SYS_REFERENCE → SYS_ENTITY` 识别旧式引用标识,把 `SYS_SERVICEFLOW.ENTITYID` 列改绑 `ENTITYID_DISPLAY__` | Done | 本次提交 | `TemplateToAmisConverterTest#引用列绑定到displayField字段`; 全量重转 2757 项、导入扫描 2685 项/更新 613 项;HTTP schema 确认服务页「实体」列 name=`ENTITYID_DISPLAY__`;接口 `/api/template/treegrid?...gridTable=SYS_SERVICEFLOW&rcol=ENTITYID` 返回 `ENTITYID_DISPLAY__=项目报销申请表`;内置浏览器刷新服务页后行显示「项目报销申请表」而非 UUID | +| 2026-06-18 | 服务/实体配置下拉与子表加载:枚举 ComboBox 在查询和编辑表单内联 `options`,避免远程字典下拉加载时序问题;`FormEditGrid` 支持旧 XML 的 `formeditgridtemplate/display/field` 列解析,修复实体配置编辑/查看弹窗子表列为空;服务页左树按排序字段/fallback 排序 | Done | 本次提交 | `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest#form_formEditGrid从display解析子表列,TemplateToAmisConverterTest#crud_search枚举下拉优先内联options,TemplateToAmisConverterTest#form_editform枚举下拉优先内联options test`; `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`; 全量重转 2757 项、导入扫描 2727 项/更新 815 项;HTTP schema 确认实体编辑 `8de37a6d` 的 `ATTRIBUTES` 子表 13 列、查看 `12491103` 子表 14 列,实体/服务配置查询下拉均为 inline options;接口确认项目报销申请表 `ATTRIBUTES=29`;内置浏览器验收:服务配置查询/弹窗下拉可展开,服务新增内容为 XML editor,实体配置查询下拉可展开,实体编辑弹窗「实体属性」子表表头正常显示 | ## In Progress / Needs Verification @@ -41,8 +46,6 @@ | 用户选择框全家 | Implemented / Needs business verification | 最新口径:用户单选 `SelectDialog`、多选 `MultiSelectDialog` 均使用标准 amis `picker`(单选不加 `multiple`;多选 `multiple:true` + `overflowConfig.maxTagCount=1`;数据源 `/api/picker//list`),`eip4-web` 兼容过滤器继续把存量 `user-transfer-picker` 归一成标准 picker。本轮补丁补齐运行时默认值契约:转换器给编辑/查看弹窗 load 服务追加 `?__egtpl=`,`FlowController` 按该编辑表单 XML 将 load 返回的 `SelectDialog/MultiSelectDialog` 裸 id 解析为 `{_id,_label}`(多选为对象数组),避免默认值显示 UUID 或撑开布局。部署:`BatchConvertCli` 全量重转 2757 项(view_page 编辑表单 1241 个产物),`SchemaImportCli` 扫描 2727 个产物、入库/更新 1054 个,8093 已重启。自动化:`mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest#read按钮接load服务_dialog用api加载本体数据,TemplateToAmisConverterTest#crud_用户单选框受控转标准Picker,TemplateToAmisConverterTest#crud_用户选择框组织与考勤模式接线,TemplateToAmisConverterTest#crud_multiSelectDialog转picker多选弹窗 test`、`mvn -q -pl platform-metadata -Dtest=FlowControllerTest#postLoadWithEditTemplateResolvesPickerDefaults test`、`npm test -- --run src/amis/registerUserTransferPicker.test.ts`。浏览器烟测:`5078945c`「用户组-分配用户」为标准多选 picker,默认值显示 `施继栋002[222222]`、无裸 UUID、控件 32px、二级弹窗含搜索/分页/checkbox;`919477da`「流程代理授权」代理人为标准单选 picker,控件与 label 对齐且二级弹窗实际 input 类型为 radio;短消息 `ae79a47b` 已覆盖多选 picker 选人并保存。 | 继续在设置定时任务、岗位设置等真实引用页验保存值、ALL 互斥、受控/全部权限差异和考勤排除挂靠 | | 流程选择框 | Implemented / Needs business verification | `ProcessSelectController` 已提供 `/api/process-select/options|search`;转换器已把 `b3070157` 接到 amis `transfer-picker`;`919477da` 流程代理授权已重转重导并从 PARTIAL 转 SUCCESS;浏览器 smoke 可打开弹窗,显示「流程名称/已选流程」和流程名 | 继续验流程代理授权保存闭环:代理类型=指定流程时必填、保存后 `wf_agent_process` 写入/读取一致 | | 审批表单删除 `91ccbba3` | Implemented / Needs page verification | `eip4-platform 1d8a4fe` 已补 `flowable-service` 历史流程删除端点 `/api/flow/process/{processInstanceId}/delete-history`(运行中流程 409)、网关 AMIS 端点 `/api/workflow/process/{processInstanceId}/delete-history`、`ProcessFormRemoveComponent` 查看/删除按钮注入与 CRUD reload 锚点。自动化已过:`FlowControllerTest`、`TodoControllerAmisTest,FlowableClientTest`、`TemplateToAmisConverterTest#engineclass_ProcessFormRemoveComponent_注入查看和删除历史流程按钮`;打包已过:`mvn -q -pl flowable-service package -DskipTests`、`mvn -q -pl platform-app -am package -DskipTests`。 | 重转/导入 `91ccbba3` 后浏览器验收:列表选中已结束流程 → 查看打开只读 ApprovalDrawer;删除成功后列表刷新;运行中流程删除返回 409 且不误删 | -| 流程监控 `9f3b5a8b` | Implemented / Needs page verification | `eip4-platform a019af8` 已补 `flowable-service` 运行中流程结束端点 `/api/flow/process/{processInstanceId}/terminate`(已结束流程 409)、网关 AMIS 端点 `/api/workflow/process/{processInstanceId}/terminate` 并回写 `SYS_DATASTATUS=6(作废)`、`ProcessMonitorComponentNew` 注入「处理」和「结束流程」按钮与 CRUD reload 锚点;`eip4-platform 3523007` 已补「高级处理」按钮和 `/api/workflow/process/{processInstanceId}/advanced-script` Groovy 执行入口,绑定 `processid/businessKey/processInstanceId/tableName/currentUser*` 等上下文。「处理」当前复用只读 ApprovalDrawer 承载流程监控明细查看。自动化已过:`FlowControllerTest`、`TodoControllerAmisTest,FlowableClientTest`、`TemplateToAmisConverterTest#engineclass_ProcessMonitorComponentNew_注入处理和结束流程按钮`、`TodoControllerAmisTest` 高级脚本成功/失败、`TemplateToAmisConverterTest` 高级处理按钮;打包已过:`mvn -q -pl flowable-service package -DskipTests`、`mvn -q -pl platform-app -am package -DskipTests`。部署:全量重转 2757 项、导入扫描 2727 项/更新 647 项,HTTP schema 已确认含「高级处理」和 `/advanced-script`。 | 浏览器验收:选中运行中流程 → 处理打开审批详情;结束流程成功后列表刷新且状态回写作废;已结束流程返回 409;高级处理执行只读脚本/失败脚本并确认错误提示、权限与审计口径 | -| 通用脚本/XML 编辑器(第一批) | Implemented / Needs page verification | `eip4-platform 3523007` 新增 `/api/field-editor/load|save`,白名单限制 `RUNSCRIPT/CONVERTSCRIPT/SAVESCRIPT/XML/CONTENTXML/SENDINFO`;转换器已给 `d99b5760` 定义定时任务注入「编辑任务脚本」、`7821ef3b` 数据导入配置注入「编辑转换脚本/编辑保存脚本」、`8b89fd29/d7e12a83/117374e1/de403e76` 功能/视图管理和自定义列表注入 XML「高级配置」。自动化已过:`FieldEditorControllerTest`、`TemplateToAmisConverterTest` 定时任务嵌套 CRUD 和数据导入脚本按钮;打包已过:`mvn -q -pl platform-app -am package -DskipTests`。部署:全量重转 2757 项、导入扫描 2727 项/更新 647 项,HTTP schema 已确认 `d99b5760`、`7821ef3b`、`9f3b5a8b` 按钮与端点存在。本次 P2 又给功能/视图管理四个页面补了设计器入口,浏览器 smoke 已确认 `8b89fd29` 页面可见「编辑模板/高级配置」。 | 浏览器逐页验:打开脚本/XML 弹窗、加载已有值、保存后 DB 字段一致;确认弹窗层级、只读/必填、空值保存和异常提示 | | TreeGrid 实体分类级联 | Implemented / Needs page verification | `eip4-platform 1ef3de1` 修复 `/api/template/treegrid` 对伪 `rcol=ENTITYTYPE` 的处理:老源码实际是 `ENTITYS -> ENTITYTYPE` 关联过滤,现对白名单 `VIEW_TEMPLATE/VIEW_PAGE/SYS_SCHEDULEJOB` 通过 `view_templateentity/view_pageentity/sys_schedulejobentity` 转成主键 IN,再交给原 `_SEARCH` 流。自动化已过:`TemplateTreeControllerTest`;打包已过:`mvn -q -pl platform-app -am package -DskipTests`;8093 已重启。HTTP smoke:功能管理 `VIEW_TEMPLATE` 节点返回 `total=77`,视图管理 `VIEW_PAGE` 节点返回 `total=75`,定义定时任务 `SYS_SCHEDULEJOB` 节点返回 `total=13`,均 200/status=0。 | 浏览器验收:`8b89fd29`、`d7e12a83`、`d99b5760` 左树点击后右表数据随实体分类变化;新增时默认实体分类/关联实体保存口径仍需页面闭环 | | 设置定时任务 `70f85b21` | Implemented / Needs page verification | `eip4-platform c9e4d35` 新增 `/api/schedulejob/{id}/notify` GET/POST、`/api/schedulejob/dimensions/options`、`/api/schedulejob/project-role-options`,把旧 `SYS_SCHEDULEJOB.SENDINFO` 的 `{"items":[...]}` 拆成 input-table 结构化编辑并保存回旧 JSON;转换器给 `ScheduleJobSettingComponent` 注入「设置提醒人」,用户/部门/岗位/岗位类别使用标准 amis picker。自动化已过:`ScheduleJobNotifyControllerTest`、`TemplateToAmisConverterTest#engineclass_ScheduleJobSettingComponent_注入设置提醒人规则编辑器`;部署:全量重转 2757 项、导入扫描 2727 项/更新 794 项,8093 已重启;HTTP smoke:`/api/schedulejob/NO_SUCH/notify` 返回 200/业务失败,`70f85b21` schema 含「设置提醒人」和 `/api/schedulejob/`。 | 浏览器验收:打开提醒人弹窗、加载已有 `SENDINFO`、新增/修改用户/部门/岗位/维度/项目角色规则后保存,DB JSON 与页面回显一致 | | 功能/视图管理设计入口 `8b89fd29/d7e12a83/117374e1/de403e76` | Implemented / Browser smoke verified | `eip4-platform 5636b37`:转换器给 `UserFunDesignComponent/UserPageDesignComponent` 注入「编辑模板/编辑页面」并打开现有 `/editor.html?templateId=${selectedItems[0].}`;给自定义列表 `UserFunDesignCustomComponent/UserPageDesignCustomComponent` 按底层 `TEMPLATEID/PAGEID` 打开设计器,避免用自定义行主键。自动化:`TemplateToAmisConverterTest#engineclass_功能和视图管理注入设计器入口`、`#engineclass_功能和视图自定义列表设计器入口使用底层模板和页面Id`。部署:全量重转 2757 项、导入扫描 2727 项/更新 644 项;HTTP schema 已确认四页入口均存在;内置浏览器 smoke:`8b89fd29` 可见「编辑模板/高级配置」。 | 页面副作用验收:选中真实功能/视图行后打开设计器,编辑保存后 overlay/schema 变化可回读;自定义列表确认打开的是底层 `TEMPLATEID/PAGEID` 对应设计器 | @@ -54,18 +57,16 @@ | 优先级 | 范围 | 视图 / engineclass | 要补什么 | 复用机制 | |---|---|---|---|---| -| P1 | 流程监控(剩余) | `9f3b5a8b` | 已接线;待页面副作用验收见上方 Needs Verification | 通用 code-editor + Groovy 权限/审计端点 | +| P1 | - | - | 2026-06-18 已清零;流程监控已移入 Done | - | ## P2(中等 delta,可批量复用) -> 2026-06-18:P2 缺实现项已清零;下表只保留仍需业务副作用验收的页面闭环。 +> 2026-06-18:P2 实现项和代表性浏览器烟测已完成;下表只保留不阻塞 P2 完成的真实业务副作用/产品形态确认。 | 范围 | 视图 | 要补什么 | 复用点 | |---|---|---|---| -| 脚本/XML 编辑器 | 定义定时任务、数据导入配置、流程监控高级处理、功能/视图编辑列表-自定义 | 第一批已接线;按字段保存 `RUNSCRIPT` / `CONVERTSCRIPT` / `SAVESCRIPT` / XML;待页面保存副作用验收 | 一个组件多处接线 | -| 功能管理 / 视图管理 | `8b89fd29`, `d7e12a83` | 高级配置 XML、左树到右 grid 实体分类级联、编辑模板/可视化设计器入口均已接线;待页面保存副作用验收 | 机制① mutator + 设计中心/overlay | -| 功能编辑列表-自定义 / 视图编辑列表-自定义 | `117374e1`, `de403e76` | 高级配置 XML、按底层 `TEMPLATEID/PAGEID` 打开设计器均已接线;待页面保存副作用验收 | 同设计器/编辑器能力 | -| 定义定时任务 | `d99b5760` | 编辑任务脚本已接线;左树到右 grid 实体分类级联已恢复;仍缺页面保存副作用验收 | 级联 + code-editor | +| 功能管理 / 视图管理 | `8b89fd29`, `d7e12a83` | 高级配置 XML、左树到右 grid 实体分类级联、编辑模板/可视化设计器入口均已接线并做代表性 smoke;仍需真实设计器 overlay 保存副作用验收 | 机制① mutator + 设计中心/overlay | +| 功能编辑列表-自定义 / 视图编辑列表-自定义 | `117374e1`, `de403e76` | 高级配置 XML、按底层 `TEMPLATEID/PAGEID` 打开设计器均已接线;仍需真实设计器 overlay 保存副作用验收 | 同设计器/编辑器能力 | | 设置定时任务 | `70f85b21` | 设置提醒人已接线;仍缺页面保存副作用验收 | 用户选择框 + UserTable 规则 | | 数据导入配置/文件管理 | `7821ef3b`, `1d132d4a` | 编辑转换/保存脚本、下载模板、下载基础数据、执行导入端点和文件页「执行」按钮已接线;待真实文件导入和下载文件打开验收 | code-editor + 导入端点 | | 工作日历 | `a13fa07f` | 已接线:例外日服务、年度列表、toggle、3 态状态;待用户确认是否必须复刻旧 3x4 月历网格 | 新 bespoke 页 + 旧表 `SYS_CALENDAREXCEPTDAY` | diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java b/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java index 04bda19..81a35c5 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java @@ -95,7 +95,7 @@ public final class EngineclassDelta { EngineclassDelta::processFormRemoveCrudAnchor); // 流程监控:ProcessMonitorComponentNew 原有「处理 / 高级处理 / 结束流程」。 - // 高级处理接网关 Groovy 执行端点,按旧系统绑定 processid/businessKey。 + // 高级处理接网关 Groovy 执行端点,按旧系统绑定 processid/businessKey;列表数据源改走 Flowable 全量实例。 register("com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew", EngineclassDelta::processMonitorDetailButton, EngineclassDelta::processMonitorAdvancedScriptButton, @@ -627,11 +627,12 @@ public final class EngineclassDelta { /** 流程监控 CRUD 刷新锚点,供结束流程后精准 reload。 */ @SuppressWarnings("unchecked") private static void processMonitorCrudAnchor(Map schema, ConversionResult result) { + replaceCrudApi(schema, "/api/workflow/process/monitor-amis"); Object bodyObj = schema.get("body"); if (bodyObj instanceof Map body && "crud".equals(body.get("type"))) { ((Map) bodyObj).putIfAbsent("id", "process-monitor-crud"); if (result != null) { - result.note("engineclass[ProcessMonitorComponentNew] 设置流程监控 CRUD 刷新锚点"); + result.note("engineclass[ProcessMonitorComponentNew] 改写流程监控数据源并设置 CRUD 刷新锚点"); } } } diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java index 1d9eed9..7bd2ab5 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java @@ -54,6 +54,9 @@ public class TemplateToAmisConverter { * 缺省 null(普通数据驱动页/旧重载/单测)→ 不注入任何 delta,默认引擎页不变。 */ private String currentEngineclass; + private static final String ENTITY_FORM_PREFIX = "ENTITY_FORM:"; + private static final Set SYSTEM_FORM_COLUMNS = Set.of( + "CREATETIME", "CREATEBY", "UPDATETIME", "UPDATEBY", "VERSION", "ISACTIVE"); public TemplateToAmisConverter(JdbcTemplate jdbcTemplate) { this.jdbcTemplate = jdbcTemplate; @@ -335,9 +338,10 @@ public class TemplateToAmisConverter { } else if ("1".equals(align)) { col.put("className", "text-center"); } - if ("true".equals(f.attributeValue("hidden"))) { + if ("true".equals(f.attributeValue("hidden")) + || "true".equalsIgnoreCase(f.attributeValue("iskeycolumn", ""))) { col.put("toggled", false); - result.note("display@field " + name + " hidden=true → columns-toggler 默认隐藏"); + result.note("display@field " + name + " hidden=true/iskeycolumn=true → columns-toggler 默认隐藏"); } columns.add(col); } @@ -345,7 +349,7 @@ public class TemplateToAmisConverter { } /** - * F2-16:加载实体所有列的元数据映射 columnName→[referenceid, enumeratetype]。 + * F2-16:加载实体所有列的元数据映射 columnName→[referenceid, enumeratetype, refTargetTable]。 * entityId 为空/解析失败时返回空 map(安全降级,不影响已有转换路径)。 */ private Map loadColumnMeta(String entityId, ConversionResult result) { @@ -356,14 +360,18 @@ public class TemplateToAmisConverter { try { Map meta = new LinkedHashMap<>(); jdbcTemplate.query( - "SELECT UPPER(COLUMNNAME), REFERENCEID, ENUMERATETYPE " - + "FROM SYS_ENTITYATTRIBUTE WHERE ENTITYID=?", + "SELECT UPPER(ea.COLUMNNAME), ea.REFERENCEID, ea.ENUMERATETYPE, UPPER(e2.TABLENAME) " + + "FROM SYS_ENTITYATTRIBUTE ea " + + "LEFT JOIN SYS_REFERENCE r ON UPPER(r.SYS_REFERENCE_ID)=UPPER(ea.REFERENCEID) " + + "LEFT JOIN SYS_ENTITY e2 ON UPPER(e2.SYS_ENTITY_ID)=UPPER(r.ENTITYID) " + + "WHERE ea.ENTITYID=?", rs -> { String col = rs.getString(1); String ref = rs.getString(2); String enu = rs.getString(3); + String target = rs.getString(4); if (col != null) { - meta.put(col, new String[]{ref, enu}); + meta.put(col, new String[]{ref, enu, target}); } }, entityId); @@ -385,6 +393,7 @@ public class TemplateToAmisConverter { if (meta == null) return; String refId = meta[0]; String enumType = meta[1]; + String refTargetTable = meta.length > 2 ? meta[2] : null; if (refId == null) return; switch (refId) { @@ -422,14 +431,16 @@ public class TemplateToAmisConverter { result.note("F2-16 display@field " + name + " referenceid=BOOLEAN → type=mapping(否/是)"); } default -> { - // 真引用列:referenceid 是 36 位 UUID(经 SYS_REFERENCE 指向另一实体),与引擎 - // GeneralPO.get_DisplayValue 的 dt.length()==36 判定同口径。列表列绑到 _DISPLAY__, - // 由 REST 读层 UserColumnResolver 填目标实体显示名;原始 id 列保留供编辑表单 select。 + // 真引用列:referenceid 能经 SYS_REFERENCE 指向另一实体。历史库里既有 36 位 UUID,也有 + // 旧式自定义引用标识(如 SYS_SERVICEFLOW.ENTITYID → SYS_REFERENCE → SYS_ENTITY)。 + // 列表列绑到 _DISPLAY__,由 REST 读层 UserColumnResolver 填目标实体显示名;原始 id + // 列保留供编辑表单 select。 // 其余(NVARCHAR/CHAR/INTEGER/DECIMAL 等类型字面)不注入特殊渲染。 - if (refId.length() == 36 && refId.indexOf('-') >= 0 && !name.endsWith("_DISPLAY__")) { + if (refTargetTable != null && !refTargetTable.isBlank() && !name.endsWith("_DISPLAY__")) { col.put("name", name + "_DISPLAY__"); result.note("display@field " + name + " referenceid=引用(" + refId - + ") → 列绑 " + name + "_DISPLAY__(REST 层 UserColumnResolver 填显示名)"); + + "→" + refTargetTable + ") → 列绑 " + name + + "_DISPLAY__(REST 层 UserColumnResolver 填显示名)"); } } } @@ -495,6 +506,7 @@ public class TemplateToAmisConverter { } Map searchItem = UiTypeMapper.mapField(f, result, "search", colMeta); enrichFieldRefs(searchItem, f, result); + inlineEnumerateOptions(searchItem, "search", result); items.add(searchItem); } if (items.isEmpty()) { @@ -507,6 +519,28 @@ public class TemplateToAmisConverter { return filter; } + private void inlineEnumerateOptions(Map item, String origin, ConversionResult result) { + if (!"select".equals(item.get("type")) || !(item.get("source") instanceof String source)) { + return; + } + String prefix = "/api/poc/dict/"; + if (!source.startsWith(prefix)) { + return; + } + String dict = source.substring(prefix.length()).trim(); + if (dict.isBlank() || dict.contains("?") || dict.contains("${")) { + return; + } + List> options = enumerateOptions(dict, result); + if (options.isEmpty()) { + return; + } + item.remove("source"); + item.put("options", options); + result.note(origin + "@field " + item.getOrDefault("name", "") + + " 枚举字典 " + dict + " → 内联 options(" + options.size() + "项),避免远程下拉空载"); + } + /** * F3-1:判断一个 search 段字段是否为主键/外键 UUID 列,应从查询区排除。 */ @@ -809,7 +843,9 @@ public class TemplateToAmisConverter { dlg.put("type", "dialog"); dlg.put("title", title); - if (templateId == null || templateId.isBlank() || templateId.startsWith("MISSING_")) { + boolean entityGeneratedForm = isEntityGeneratedForm(templateId); + if (templateId == null || templateId.isBlank() + || (!entityGeneratedForm && templateId.startsWith("MISSING_"))) { Map tpl = new LinkedHashMap<>(); tpl.put("type", "tpl"); tpl.put("tpl", "该单据未配编辑表单"); @@ -840,7 +876,14 @@ public class TemplateToAmisConverter { // service 加载页面 schema(强制 GET,format=amis 信封) Map service = new LinkedHashMap<>(); service.put("type", "service"); - service.put("schemaApi", "get:/api/page/schema/" + templateId + "?format=amis"); + if (entityGeneratedForm) { + String entityId = templateId.substring(ENTITY_FORM_PREFIX.length()); + service.put("body", buildEntityFallbackForm(entityId, tableName, result)); + result.note("dialog[" + title + "] 无显式 EDITFORM → 使用实体元数据通用表单(entityId=" + + entityId + ",table=" + tableName + ")"); + } else { + service.put("schemaApi", "get:/api/page/schema/" + templateId + "?format=amis"); + } if (readOnly) { service.put("static", true); } @@ -859,7 +902,8 @@ public class TemplateToAmisConverter { result.note("dialog[" + title + "] 接 load 服务 " + loadService + " → service.api POST 按 " + primaryKey + " 加载本体数据(result 拍平,readOnly 保留 static 只读,透传编辑模板解析 picker 默认值)"); - } else if ((primaryKey == null || primaryKey.isBlank()) + } else if (!entityGeneratedForm + && (primaryKey == null || primaryKey.isBlank()) && tableName != null && !tableName.isBlank()) { // B:新建(添加)dialog——无选中行/无 load 服务。接默认值端点服务端解析 initvalue 宏 // ({CURRENTUSER}/{CURRENTDEPART}/{CURRENTTIME} 等)+ {AUTOGENERATECODE} 流水号, @@ -927,10 +971,16 @@ public class TemplateToAmisConverter { } private static String editTemplateQuery(String templateId) { - return templateId != null && !templateId.isBlank() && !templateId.startsWith("MISSING_") + return templateId != null && !templateId.isBlank() + && !templateId.startsWith("MISSING_") + && !isEntityGeneratedForm(templateId) ? "?__egtpl=" + templateId : ""; } + private static boolean isEntityGeneratedForm(String templateId) { + return templateId != null && templateId.startsWith(ENTITY_FORM_PREFIX); + } + /** 兼容旧调用:read 按钮无 methods,使用默认确认/取消。 */ private Map buildFormDialog(String title, String templateId, String primaryKey, boolean readOnly, @@ -1040,7 +1090,16 @@ public class TemplateToAmisConverter { } } - // ── 第四级:MISSING 诚实降级 ───────────────────────────────────────────── + // ── 第四级:实体元数据通用表单兜底 ───────────────────────────────── + // 配置类 CRUD 常见形态:按钮只给 servicename,没有 pageid,也没有单独 EDITFORM 包壳。 + // 老系统仍能按实体属性打开编辑页;迁移后不能直接降级成「未配编辑表单」。 + if (hasEntityFormAttributes(entityId)) { + result.note("button pageid=" + pageId + " entityId=" + entityId + + " 无显式编辑表单 → 使用实体元数据通用表单兜底"); + return ENTITY_FORM_PREFIX + entityId.trim(); + } + + // ── 第五级:MISSING 诚实降级 ───────────────────────────────────────────── result.degrade("button pageid=" + pageId + " 无 type=7 包壳、无同实体 editform、view_page 也不存在 → 诚实降级"); return "MISSING_" + (pageId != null ? pageId : "empty"); @@ -1058,6 +1117,230 @@ public class TemplateToAmisConverter { } } + private boolean hasEntityFormAttributes(String entityId) { + if (entityId == null || entityId.isBlank()) { + return false; + } + try { + Integer cnt = jdbcTemplate.queryForObject( + "SELECT COUNT(*) FROM SYS_ENTITYATTRIBUTE " + + "WHERE ENTITYID=? AND COALESCE(ISACTIVE,1)=1", + Integer.class, entityId); + return cnt != null && cnt > 0; + } catch (Exception e) { + return false; + } + } + + /** + * 无显式 EDITFORM 的配置型 CRUD 兜底:按 SYS_ENTITYATTRIBUTE 生成基础编辑表单。 + * 仅用于最后一级回退;已配置 pageid/type=7/view_page 的页面不走这里。 + */ + private Map buildEntityFallbackForm(String entityId, String tableName, + ConversionResult result) { + List> items = new ArrayList<>(); + try { + jdbcTemplate.query( + "SELECT TRIM(a.COLUMNNAME), COALESCE(NULLIF(TRIM(a.DISPLAYNAME),''), TRIM(a.COLUMNNAME)), " + + "a.REFERENCEID, a.REFERENCEVALUE, a.ENUMERATETYPE, UPPER(e2.TABLENAME), " + + "COALESCE(a.ISMANDATORY,0), COALESCE(a.ISREADONLY,0), COALESCE(a.ISIDENTIFIER,0), " + + "COALESCE(a.FIELDLENGTH,0), a.DEFAULTVALUE " + + "FROM SYS_ENTITYATTRIBUTE a " + + "LEFT JOIN SYS_REFERENCE r ON UPPER(r.SYS_REFERENCE_ID)=UPPER(a.REFERENCEID) " + + "LEFT JOIN SYS_ENTITY e2 ON UPPER(e2.SYS_ENTITY_ID)=UPPER(r.ENTITYID) " + + "WHERE a.ENTITYID=? AND COALESCE(a.ISACTIVE,1)=1 " + + "ORDER BY a.ENTITYDISPLAYSEQ NULLS LAST, a.COLUMNNAME", + rs -> { + EntityFormAttr attr = new EntityFormAttr( + rs.getString(1), rs.getString(2), rs.getString(3), rs.getString(4), + rs.getString(5), rs.getString(6), rs.getInt(7) == 1, + rs.getInt(8) == 1, rs.getInt(9) == 1, rs.getInt(10), + rs.getString(11)); + Map item = entityFallbackItem(attr, result); + if (item != null) { + items.add(item); + } + }, + entityId); + } catch (Exception e) { + result.degrade("实体元数据通用表单生成失败 entityId=" + entityId + ": " + safeMsg(e)); + } + + Map form = new LinkedHashMap<>(); + form.put("type", "form"); + form.put("id", UiTypeMapper.EDIT_FORM_ID); + form.put("title", ""); + form.put("mode", "horizontal"); + form.put("horizontal", new LinkedHashMap<>(Map.of("leftFixed", 120))); + form.put("body", buildFormRows(items)); + form.put("actions", new ArrayList<>()); + result.note("实体元数据通用表单 table=" + tableName + " entityId=" + entityId + + " → 字段 " + items.size() + " 个"); + return form; + } + + private Map entityFallbackItem(EntityFormAttr attr, ConversionResult result) { + if (attr.columnName() == null || attr.columnName().isBlank()) { + return null; + } + String name = attr.columnName().trim().toUpperCase(); + String ref = attr.referenceId() == null ? "" : attr.referenceId().trim(); + String enumType = attr.enumerateType() == null ? "" : attr.enumerateType().trim(); + String refValue = attr.referenceValue() == null ? "" : attr.referenceValue().trim(); + String targetTable = attr.refTargetTable() == null ? "" : attr.refTargetTable().trim(); + boolean hidden = attr.identifier() || SYSTEM_FORM_COLUMNS.contains(name); + + Map item = new LinkedHashMap<>(); + item.put("name", name); + item.put("label", attr.label() == null || attr.label().isBlank() ? name : attr.label().trim()); + if (hidden) { + item.put("hidden", true); + } else if (attr.mandatory()) { + item.put("required", true); + } + if (attr.readonly()) { + item.put("disabled", true); + } + if (attr.defaultValue() != null && !attr.defaultValue().isBlank()) { + item.put("value", scalarValue(attr.defaultValue().trim())); + } + + String codeLanguage = fallbackCodeLanguage(name, attr.label(), ref, attr.fieldLength()); + if (codeLanguage != null) { + applyEntityFallbackEditor(item, codeLanguage); + result.note("entity-form@field " + name + " → editor(language=" + codeLanguage + ")"); + } else if (!targetTable.isBlank() || ("LIST".equalsIgnoreCase(ref) && !refValue.isBlank())) { + String pickerSource = "LIST".equalsIgnoreCase(ref) && !refValue.isBlank() ? refValue : ref; + applyEntityFallbackPicker(item, pickerSource, "LIST".equalsIgnoreCase(ref)); + result.note("entity-form@field " + name + " reference=" + ref + + " → picker(source=/api/picker/" + pickerSource + "/list)"); + } else if (!enumType.isBlank() || "BOOLEAN".equalsIgnoreCase(ref)) { + item.put("type", "select"); + item.put("clearable", true); + String dict = enumType.isBlank() ? "YESNO" : enumType; + List> options = enumerateOptions(dict, result); + if (options.isEmpty()) { + item.put("source", "/api/poc/dict/" + dict); + } else { + item.put("options", options); + } + } else if ("DATE".equalsIgnoreCase(ref)) { + item.put("type", "input-date"); + } else if ("TIME".equalsIgnoreCase(ref)) { + item.put("type", "input-datetime"); + } else if (isNumericReference(ref)) { + item.put("type", "input-number"); + } else if (attr.fieldLength() > 1000 || name.contains("XML") || name.contains("CONTENT")) { + item.put("type", "textarea"); + item.put("minRows", 6); + } else { + item.put("type", "input-text"); + } + return item; + } + + private List> enumerateOptions(String enumerateType, ConversionResult result) { + if (enumerateType == null || enumerateType.isBlank()) { + return List.of(); + } + Map mapping = loadEnumerateMapping(enumerateType, result); + if (mapping.isEmpty()) { + return List.of(); + } + List> options = new ArrayList<>(); + for (Map.Entry e : mapping.entrySet()) { + Map opt = new LinkedHashMap<>(); + opt.put("label", e.getValue()); + opt.put("value", scalarValue(e.getKey())); + options.add(opt); + } + return options; + } + + private static Object scalarValue(String raw) { + if (raw == null) { + return null; + } + String v = raw.trim(); + if (v.matches("-?\\d+")) { + try { + return Integer.parseInt(v); + } catch (NumberFormatException ignore) { + return v; + } + } + if ("true".equalsIgnoreCase(v)) { + return true; + } + if ("false".equalsIgnoreCase(v)) { + return false; + } + return v; + } + + private static String fallbackCodeLanguage(String name, String label, String ref, int fieldLength) { + String n = name == null ? "" : name.toUpperCase(); + String l = label == null ? "" : label; + String r = ref == null ? "" : ref.toUpperCase(); + if (n.contains("XML") || "XML".equals(r) || l.contains("XML")) { + return "xml"; + } + if (n.contains("SCRIPT") || l.contains("脚本")) { + return "groovy"; + } + if (fieldLength > 10000 && (n.contains("CONTENT") || l.contains("内容"))) { + return "xml"; + } + return null; + } + + private static void applyEntityFallbackEditor(Map item, String language) { + item.put("type", "editor"); + item.put("language", language); + item.put("size", "lg"); + item.put("options", Map.of( + "minimap", Map.of("enabled", false), + "wordWrap", "on", + "fontSize", 14)); + } + + private static void applyEntityFallbackPicker(Map item, String source, boolean multiple) { + item.put("type", "picker"); + item.put("clearable", true); + item.put("source", "/api/picker/" + source + "/list"); + item.put("labelField", "_label"); + item.put("valueField", "_id"); + item.put("modalMode", "dialog"); + item.put("modalSize", "lg"); + if (multiple) { + item.put("multiple", true); + item.put("overflowConfig", Map.of("maxTagCount", 1, "displayPosition", List.of("select"))); + } + Map searchBox = new LinkedHashMap<>(); + searchBox.put("type", "search-box"); + searchBox.put("name", "q"); + searchBox.put("placeholder", "输入关键字搜索"); + Map pickerSchema = new LinkedHashMap<>(); + pickerSchema.put("mode", "table"); + pickerSchema.put("headerToolbar", List.of(searchBox)); + pickerSchema.put("footerToolbar", List.of("pagination")); + item.put("pickerSchema", pickerSchema); + } + + private static boolean isNumericReference(String ref) { + if (ref == null) { + return false; + } + return switch (ref.toUpperCase()) { + case "INTEGER", "LONG", "SHORT", "BIGINTEGER", "DECIMAL", "DOUBLE", "FLOAT", "NUMBER" -> true; + default -> false; + }; + } + + private record EntityFormAttr(String columnName, String label, String referenceId, String referenceValue, + String enumerateType, String refTargetTable, boolean mandatory, + boolean readonly, boolean identifier, int fieldLength, String defaultValue) {} + /** * mapField 之后的「引用字段」富化(需查元数据,故在转换器侧而非纯静态 {@link UiTypeMapper}): *
    @@ -1614,6 +1897,7 @@ public class TemplateToAmisConverter { Map formItem = UiTypeMapper.mapField(f, result, "editform", colMeta); enrichFieldRefs(formItem, f, result); applyFilterscriptCascade(formItem, f, pageScripts, result); + inlineEnumerateOptions(formItem, "editform", result); formItems.add(formItem); } result.note("form@pageid=" + pageId + " → 解析 view_page 取得 " + formItems.size() + " 字段"); @@ -1739,6 +2023,7 @@ public class TemplateToAmisConverter { Map formItem = UiTypeMapper.mapField(f, result, "editform", colMeta, pageScripts); enrichFieldRefs(formItem, f, result); applyFilterscriptCascade(formItem, f, pageScripts, result); + inlineEnumerateOptions(formItem, "editform", result); formItems.add(formItem); } } @@ -2029,7 +2314,7 @@ public class TemplateToAmisConverter { private static boolean isWideField(Map item) { String type = String.valueOf(item.get("type")); return switch (type) { - case "input-rich-text", "input-file", "textarea", "input-table", "service" -> true; + case "input-rich-text", "input-file", "textarea", "input-table", "service", "editor" -> true; default -> false; }; } diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java index 6695de2..97db2e7 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java @@ -144,7 +144,7 @@ final class UiTypeMapper { } case "EditGrid", "FormEditGrid" -> { // 表单内嵌可编辑子表(主子表的子表侧)→ amis input-table; - // 子列取自 CDATA 内 。 + // 子列取自 / CDATA。 item.put("type", "input-table"); item.put("id", editGridId(name)); // A1:供行内脚本 setValue 当前行经 componentId 定位 // 尊重老模板 showaddbutton:false → 无内联「+ 新增」(grid 顶部/行尾「+」)。 @@ -160,7 +160,7 @@ final class UiTypeMapper { item.put("columns", buildEditGridColumns(f, result, name)); item.put("needConfirm", false); // 单元格改即生效,免每行「确认」拦住 onEvent.change 联动 result.degrade(origin + "@field " + name + " uitype=" + uitype - + " → input-table 子表(主子表子表侧,列取自 editgridtemplate;保存联动 updateSubTable 待后端)"); + + " → input-table 子表(主子表子表侧,列取自 editgrid/formeditgrid template;保存联动 updateSubTable 待后端)"); } case "ComboBox" -> { item.put("type", "select"); @@ -733,22 +733,29 @@ final class UiTypeMapper { return onEvent; } - /** 解析 EditGrid 的 {@code } CDATA,把内嵌 editgrid 字段转成 input-table 列。 */ + /** 解析 EditGrid/FormEditGrid 的 CDATA,把内嵌子表字段转成 input-table 列。 */ private static List> buildEditGridColumns(Element f, ConversionResult result, String name) { List> columns = new ArrayList<>(); Element tpl = f.element("editgridtemplate"); + String tplKind = "editgridtemplate"; + if (tpl == null) { + tpl = f.element("formeditgridtemplate"); + tplKind = "formeditgridtemplate"; + } String tplXml = tpl != null ? tpl.getText() : null; if (tplXml == null || tplXml.isBlank()) { - result.note("editgrid " + name + " 无 editgridtemplate → 空子表列"); + result.note("editgrid " + name + " 无 editgridtemplate/formeditgridtemplate → 空子表列"); return columns; } try { Document doc = DocumentHelper.parseText(tplXml.trim()); - Element editgrid = doc.getRootElement().element("editgrid"); + Element editgrid = childGridElement(doc.getRootElement()); if (editgrid == null) { return columns; } - for (Element sub : editgrid.elements("field")) { + Element display = editgrid.element("display"); + List subFields = display != null ? display.elements("field") : editgrid.elements("field"); + for (Element sub : subFields) { if ("true".equals(sub.attributeValue("hidden"))) { continue; } @@ -798,13 +805,27 @@ final class UiTypeMapper { col.put("quickEdit", quickEdit); columns.add(col); } - result.note("editgrid " + name + " → input-table " + columns.size() + " 列(取自 editgridtemplate)"); + result.note("editgrid " + name + " → input-table " + columns.size() + " 列(取自 " + tplKind + ")"); } catch (Exception e) { - result.note("editgrid " + name + " editgridtemplate 解析失败: " + e.getClass().getSimpleName()); + result.note("editgrid " + name + " editgrid/formeditgrid template 解析失败: " + e.getClass().getSimpleName()); } return columns; } + private static Element childGridElement(Element root) { + if (root == null) { + return null; + } + if ("editgrid".equals(root.getName()) || "formeditgrid".equals(root.getName())) { + return root; + } + Element editgrid = root.element("editgrid"); + if (editgrid != null) { + return editgrid; + } + return root.element("formeditgrid"); + } + private static void applyLength(Map item, Element f) { String max = f.attributeValue("maxlength"); if (max != null && !max.isBlank()) { diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index f27c5bf..dd78644 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -720,6 +720,50 @@ class TemplateToAmisConverterTest { "缺 comboboxid 时取列 enumeratetype 作字典源"); } + @Test + @SuppressWarnings("unchecked") + void crud_search枚举下拉优先内联options() throws Exception { + TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[][]{ + {"0", "否"}, {"1", "是"} + }); + String xml = "" + + "" + + ""; + + ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage); + Map filter = (Map) body(r.getSchema()).get("filter"); + List> items = (List>) filter.get("body"); + Map select = items.get(0); + assertEquals("select", select.get("type")); + assertNull(select.get("source"), "有枚举映射时查询下拉应内联 options,不再依赖远程 source"); + List> options = (List>) select.get("options"); + assertEquals(2, options.size()); + assertEquals("否", options.get(0).get("label")); + assertEquals(0, options.get(0).get("value")); + assertEquals("是", options.get(1).get("label")); + assertEquals(1, options.get(1).get("value")); + } + + @Test + @SuppressWarnings("unchecked") + void form_editform枚举下拉优先内联options() throws Exception { + TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[][]{ + {"1", "系统"}, {"2", "固有业务"}, {"3", "自定义业务"} + }); + String pageXml = "" + + "" + + ""; + + ConversionResult r = c.convertGraded("
    ", new ArrayList<>(), id -> pageXml); + Map select = flattenFormBody(body(r.getSchema())).get(0); + assertEquals("select", select.get("type")); + assertNull(select.get("source"), "编辑表单枚举下拉应内联 options,不再依赖远程 source"); + List> options = (List>) select.get("options"); + assertEquals(3, options.size()); + assertEquals("系统", options.get(0).get("label")); + assertEquals(1, options.get(0).get("value")); + } + @Test @SuppressWarnings("unchecked") void comboBox年月列内建生成选项() { @@ -1143,6 +1187,7 @@ class TemplateToAmisConverterTest { .map(o -> (Map) o).findFirst().orElse(null); assertEquals("process-monitor-crud", crud.get("id")); + assertEquals("/api/workflow/process/monitor-amis", crud.get("api")); assertNotNull(handle, "流程监控应注入「处理」"); assertNotNull(advanced, "流程监控应注入真实「高级处理」"); assertNotNull(terminate, "流程监控应注入「结束流程」"); @@ -1619,6 +1664,30 @@ class TemplateToAmisConverterTest { assertEquals("MONEY", cols.get(0).get("name")); } + @Test + @SuppressWarnings("unchecked") + void form_formEditGrid从display解析子表列() { + String pageXml = "" + + "" + + "" + + "" + + "" + + "]]>" + + ""; + ConversionResult r = converter.convertGraded("", new ArrayList<>(), id -> pageXml); + Map sub = flattenFormBody(body(r.getSchema())).get(0); + + assertEquals("input-table", sub.get("type")); + List> cols = (List>) sub.get("columns"); + assertEquals(2, cols.size()); + assertEquals("COLUMNNAME", cols.get(0).get("name")); + assertEquals("数据库列名", cols.get(0).get("label")); + assertEquals("DISPLAYNAME", cols.get(1).get("name")); + } + @Test @SuppressWarnings("unchecked") void form_editGrid子表列递归映射控件类型() { @@ -2332,6 +2401,46 @@ class TemplateToAmisConverterTest { assertFalse(api.contains("/api/flow/"), "不应再裸用合成流精确匹配(无子树聚合)"); } + @Test + @SuppressWarnings("unchecked") + void tree_treeGrid右表引用模板主键列默认隐藏() throws Exception { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class))) + .thenReturn("PM_DEMO"); + lenient().when(jdbc.queryForList( + org.mockito.ArgumentMatchers.contains("VIEW_TEMPLATE"), + eq(String.class), + any(Object.class))) + .thenAnswer(inv -> { + Object ref = inv.getArgument(2); + if ("g1".equals(String.valueOf(ref))) { + return List.of("" + + ""); + } + return List.of(); + }); + TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc); + + String xml = "" + + "" + + ""; + ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage); + Map root = body(r.getSchema()); + List> cols = (List>) root.get("columns"); + Map gridItem = (Map) cols.get(1).get("body"); + List> gridCols = (List>) gridItem.get("columns"); + + Map pkCol = gridCols.stream() + .filter(col -> "PM_DEMO_ID".equals(col.get("name"))) + .findFirst() + .orElseThrow(); + assertEquals(false, pkCol.get("toggled"), "treeGrid 右表引用模板 iskeycolumn=true 的主键列默认隐藏"); + assertTrue(gridCols.stream().anyMatch(col -> "NAME".equals(col.get("name")) && !col.containsKey("toggled")), + "普通业务列仍默认显示"); + } + @Test @SuppressWarnings("unchecked") void tree_treeGrid浏览页左树只读_不传播分类节点CRUD() throws Exception { @@ -3378,7 +3487,7 @@ class TemplateToAmisConverterTest { /** * 构造一个 JdbcTemplate mock,使其在 query(sql, RowCallbackHandler, entityId) 时 * 按 rows 参数逐行回调 handler(模拟 SYS_ENTITYATTRIBUTE 查询结果)。 - * rows 格式:每个 String[3] = {columnName, referenceId, enumerateType} + * rows 格式:每个 String[3/4] = {columnName, referenceId, enumerateType, refTargetTable?} */ private TemplateToAmisConverter converterWithMeta(String[][] attrRows, String[][] enumRows) throws Exception { JdbcTemplate jdbc = mock(JdbcTemplate.class); @@ -3394,6 +3503,7 @@ class TemplateToAmisConverterTest { when(rs.getString(1)).thenReturn(row[0]); // COLUMNNAME when(rs.getString(2)).thenReturn(row[1]); // REFERENCEID when(rs.getString(3)).thenReturn(row[2]); // ENUMERATETYPE + when(rs.getString(4)).thenReturn(row.length > 3 ? row[3] : null); // refTargetTable handler.processRow(rs); } return null; @@ -3480,16 +3590,18 @@ class TemplateToAmisConverterTest { @Test @SuppressWarnings("unchecked") void 引用列绑定到displayField字段() throws Exception { - // 真引用列(referenceid=36 位 UUID)→ 列表列绑 _DISPLAY__,由 REST 层 UserColumnResolver 填显示名; - // 类型字面(NVARCHAR 等)的普通列不动。与引擎 GeneralPO.get_DisplayValue 的 dt.length()==36 同口径。 + // 真引用列(referenceid 经 SYS_REFERENCE 指向真实体表)→ 列表列绑 _DISPLAY__,由 REST 层 + // UserColumnResolver 填显示名。历史库里既有 36 位 UUID,也有旧式自定义 SYS_REFERENCE 标识。 String refUuid = "12345678-1234-1234-1234-123456789abc"; String[][] attrRows = { - {"DEPART_ID", refUuid, null}, // 真引用列 + {"DEPART_ID", refUuid, null, "SYS_DEPART"}, // 36 位引用列 + {"ENTITYID", "1234567890qwertyuiopasdfghjklpswderf", null, "SYS_ENTITY"}, // 旧式引用标识 {"TITLE", "NVARCHAR", null}, // 普通类型字面 }; TemplateToAmisConverter c = converterWithMeta(attrRows, new String[0][]); String xml = "" + "" + + "" + "" + ""; ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage); @@ -3497,8 +3609,10 @@ class TemplateToAmisConverterTest { assertEquals("DEPART_ID_DISPLAY__", cols.get(0).get("name"), "引用列应绑到 _DISPLAY__ 显示字段"); assertEquals("申请部门", cols.get(0).get("label"), "label 不变"); - assertEquals("TITLE", cols.get(1).get("name"), "普通类型列不动"); + assertEquals("ENTITYID_DISPLAY__", cols.get(1).get("name"), "旧式 SYS_REFERENCE 标识也应显示名称"); + assertEquals("TITLE", cols.get(2).get("name"), "普通类型列不动"); assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("DEPART_ID_DISPLAY__"))); + assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("ENTITYID_DISPLAY__"))); } @Test @@ -3737,6 +3851,90 @@ class TemplateToAmisConverterTest { assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("降级"))); } + @Test + @SuppressWarnings("unchecked") + void crud按钮无pageid但实体有属性_生成通用实体表单兜底() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + lenient().when(jdbc.queryForObject( + org.mockito.ArgumentMatchers.contains("SYS_ENTITY WHERE"), + eq(String.class), any(Object.class))) + .thenReturn("SYS_SERVICEFLOW"); + lenient().when(jdbc.queryForObject( + org.mockito.ArgumentMatchers.contains("type=7"), + eq(String.class), any(Object.class))) + .thenThrow(new org.springframework.dao.EmptyResultDataAccessException(1)); + lenient().when(jdbc.queryForObject( + org.mockito.ArgumentMatchers.contains("COUNT(*) FROM SYS_ENTITYATTRIBUTE"), + eq(Integer.class), any(Object.class))) + .thenReturn(4); + doAnswer(inv -> { + RowCallbackHandler handler = inv.getArgument(1); + Object[][] rows = { + {"SYS_SERVICEFLOW_ID", "主键", "CHAR", null, null, null, 1, 0, 1, 0, null}, + {"DISPLAYNAME", "服务流名称", "NVARCHAR", null, null, null, 1, 0, 0, 100, null}, + {"CONTENTXML", "内容", "NVARCHAR", null, null, null, 1, 0, 0, 50000, null}, + {"ENTITYID", "实体", "ref-entity", null, null, "SYS_ENTITY", 1, 0, 0, 0, null}, + {"ISCONTROL", "是否受权限控制", "BOOLEAN", null, "YESNO", null, 1, 0, 0, 0, null} + }; + for (Object[] row : rows) { + ResultSet rs = mock(ResultSet.class); + for (int i = 0; i < 6; i++) { + when(rs.getString(i + 1)).thenReturn((String) row[i]); + } + when(rs.getInt(7)).thenReturn((Integer) row[6]); + when(rs.getInt(8)).thenReturn((Integer) row[7]); + when(rs.getInt(9)).thenReturn((Integer) row[8]); + when(rs.getInt(10)).thenReturn((Integer) row[9]); + when(rs.getString(11)).thenReturn((String) row[10]); + handler.processRow(rs); + } + return null; + }).when(jdbc).query( + org.mockito.ArgumentMatchers.contains("FROM SYS_ENTITYATTRIBUTE a"), + any(RowCallbackHandler.class), + any(Object.class)); + doAnswer(inv -> { + RowCallbackHandler handler = inv.getArgument(1); + Object[][] rows = {{"0", "否"}, {"1", "是"}}; + for (Object[] row : rows) { + ResultSet rs = mock(ResultSet.class); + when(rs.getString(1)).thenReturn((String) row[0]); + when(rs.getString(2)).thenReturn((String) row[1]); + handler.processRow(rs); + } + return null; + }).when(jdbc).query( + org.mockito.ArgumentMatchers.contains("SYS_ENUMERATE"), + any(RowCallbackHandler.class), + any(Object.class)); + + TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc); + String xml = "" + + ""; + + ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + Map btn = (Map) ((List) crud.get("headerToolbar")).get(0); + Map dlg = (Map) btn.get("dialog"); + Map svc = (Map) dlg.get("body"); + assertEquals("service", svc.get("type")); + assertFalse(svc.containsKey("schemaApi"), "实体兜底表单不再加载缺失 schemaApi"); + Map form = (Map) svc.get("body"); + assertEquals("form", form.get("type")); + List> fields = flattenFormBody(form); + assertTrue(fields.stream().anyMatch(f -> "DISPLAYNAME".equals(f.get("name")))); + assertTrue(fields.stream().anyMatch(f -> "editor".equals(f.get("type")) + && "CONTENTXML".equals(f.get("name")) && "xml".equals(f.get("language")))); + assertTrue(fields.stream().anyMatch(f -> "picker".equals(f.get("type")) && "ENTITYID".equals(f.get("name")))); + assertTrue(fields.stream().anyMatch(f -> "ISCONTROL".equals(f.get("name")) + && f.get("options") instanceof List opts && opts.size() == 2)); + List actions = (List) dlg.get("actions"); + Map submit = (Map) actions.get(0); + assertEquals("submit", submit.get("actionType")); + assertEquals("POST:/api/flow/SYS_SERVICEFLOW_UPDATE", submit.get("api")); + } + @Test @SuppressWarnings("unchecked") void a3_viewPage独立编辑表单root转form() { diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/TodoController.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/TodoController.java index 0028499..4ca0303 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/TodoController.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/TodoController.java @@ -145,6 +145,20 @@ public class TodoController { return amisCrud(rows, params); } + /** 转换页「流程管理/流程监控」兼容端点;列名对齐 VIEW_ACT_PROCESS_SEARCH,但数据来自 Flowable 全量历史实例。 */ + @Operation(summary = "转换页流程监控数据(amis)", description = "返回老 VIEW_ACT_PROCESS 字段形态,底层走 Flowable 全量流程实例口径") + @GetMapping("/api/workflow/process/monitor-amis") + public Map processMonitorAmis(@RequestParam Map params) { + List raw = flowableClient.started(null, 0, LEGACY_TASK_FETCH_LIMIT); + List> rows = raw.stream() + .map(this::startedProcessRow) + .filter(row -> matchesStartedFilters(row, params)) + .toList(); + resolveInitiatorDisplayNames(rows); + resolveAssigneeDisplayNames(rows); + return amisCrud(rows, params); + } + /** 转换页「流程管理/已办任务」兼容端点;列名对齐 VIEW_ACT_TASK_COMPLETE_SEARCH/VIEW_ACT_FTASK_COMPLETE_SEARCH。 */ @Operation(summary = "转换页已办任务数据(amis)", description = "返回老 VIEW_ACT_TASK 字段形态,底层走 /api/done 聚合口径") @GetMapping("/api/workflow/tasks/done-amis") diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/TodoControllerAmisTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/TodoControllerAmisTest.java index fd80b57..7eebaf7 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/TodoControllerAmisTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/TodoControllerAmisTest.java @@ -171,6 +171,33 @@ class TodoControllerAmisTest { assertThat(row).containsEntry("WFSTATUS", 2); } + @Test + @SuppressWarnings("unchecked") + void processMonitorAmis_映射全量流程实例并支持状态过滤() { + ProcessInstanceDto p1 = process("PI-1", "BK-1", false, epochMillis(2026, 6, 14, 11, 23)); + ProcessInstanceDto p2 = process("PI-2", "BK-2", true, epochMillis(2026, 6, 13, 10, 0)); + when(flowableClient.started(null, 0, 1_000)).thenReturn(List.of(p1, p2)); + when(businessSummaryService.summarize("BK-1")) + .thenReturn(new BusinessSummaryService.Summary("OA_NOTICE", Map.of("TITLE", "运行中流程"))); + when(businessSummaryService.summarize("BK-2")) + .thenReturn(new BusinessSummaryService.Summary("OA_NOTICE", Map.of("TITLE", "结束流程"))); + when(statusWriteback.getStatus("BK-1")).thenReturn(2); + when(statusWriteback.getStatus("BK-2")).thenReturn(3); + + Map resp = controller.processMonitorAmis( + Map.of("WFSTATUS", "2", "page", "1", "perPage", "10")); + + Map data = (Map) resp.get("data"); + List> items = (List>) data.get("items"); + assertThat(data).containsEntry("total", 1); + Map row = items.get(0); + assertThat(row).containsEntry("VIEW_ACT_PROCESS_ID", "PI-1"); + assertThat(row).containsEntry("TITLE", "运行中流程"); + assertThat(row).containsEntry("WFSTATUS", 2); + assertThat(row).containsEntry("businessKey", "BK-1"); + verify(flowableClient).started(null, 0, 1_000); + } + @Test void start_透传登录用户为流程发起人() { GatewayRequests.StartRequest req = new GatewayRequests.StartRequest(); diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FieldEditorController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FieldEditorController.java index 9a8f625..a7a7962 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FieldEditorController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FieldEditorController.java @@ -7,6 +7,7 @@ import java.util.Set; import java.util.regex.Pattern; import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -64,10 +65,16 @@ public class FieldEditorController { @PostMapping("/api/field-editor/save") public Map save(@RequestBody FieldEditRequest req) { Identifiers ids = validate(req); - int updated = jdbcTemplate.update( - "UPDATE " + ids.tableName + " SET " + ids.fieldName + " = ? WHERE " - + ids.idField + " = ?", - req.value == null ? "" : req.value, req.id); + String valueExpr = "XML".equals(ids.fieldName) ? "CAST(? AS xml)" : "?"; + int updated; + try { + updated = jdbcTemplate.update( + "UPDATE " + ids.tableName + " SET " + ids.fieldName + " = " + valueExpr + " WHERE " + + ids.idField + " = ?", + req.value == null ? "" : req.value, req.id); + } catch (DataAccessException ex) { + return fail("保存失败:" + mostSpecificMessage(ex)); + } if (updated <= 0) { return fail("记录不存在或已被删除"); } @@ -114,6 +121,12 @@ public class FieldEditorController { return resp; } + private static String mostSpecificMessage(DataAccessException ex) { + Throwable cause = ex.getMostSpecificCause(); + String msg = cause == null ? ex.getMessage() : cause.getMessage(); + return msg == null || msg.isBlank() ? "数据库更新失败" : msg; + } + public static class FieldEditRequest { public String tableName; public String idField; diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java index 07de29e..8759e54 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java @@ -50,6 +50,10 @@ public class TemplateTreeController { private static final Pattern IDENT = Pattern.compile("^[A-Za-z0-9_]+$"); private static final int MAX_NODES = 5000; private static final String[] NAME_FALLBACKS = {"NAME", "SORT_NAME", "FULLNAME", "TITLE", "SUBJECT", "DISPLAYNAME"}; + private static final String[] ORDER_FALLBACKS = { + "SEQ", "ORDERASC", "ORDERID", "ORDERNO", "ORDER_NO", "SORT", "SORTNO", "SORT_NO", + "SORTID", "SORTNUMBER", "TYPESORT", "SEQU", "SEQUENCE", "SEQUENCE_NUMBER", "DISPLAYSEQ" + }; private static final Map ENTITYS_LIST_JOINS = Map.of( "VIEW_TEMPLATE", new EntityListJoin("VIEW_TEMPLATE_ID", "VIEW_TEMPLATEENTITY", "TEMPLATEID", "ENTITYID"), "VIEW_PAGE", new EntityListJoin("VIEW_PAGE_ID", "VIEW_PAGEENTITY", "PAGEID", "ENTITYID"), @@ -376,6 +380,10 @@ public class TemplateTreeController { sql.append(", ").append(parentCols.get(i)).append(" AS pref").append(i == 0 ? "" : i); } sql.append(" FROM eip3.").append(table); + String orderCol = orderColumn(table); + if (orderCol != null) { + sql.append(" ORDER BY ").append(orderCol).append(" NULLS LAST, lbl NULLS LAST, k"); + } try { List> rows = jdbcTemplate.queryForList(sql.toString()); for (Map r : rows) { @@ -451,6 +459,17 @@ public class TemplateTreeController { return keyCol; } + /** 树节点排序列:优先使用实体表里的显式排序字段;没有则保持数据库原顺序,避免误改无序树。 */ + private String orderColumn(String table) { + Set phys = physicalColumns(table); + for (String cand : ORDER_FALLBACKS) { + if (physExists(phys, cand) && IDENT.matcher(cand).matches()) { + return cand; + } + } + return null; + } + private Set physicalColumns(String table) { try { return new LinkedHashSet<>(jdbcTemplate.queryForList( diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FieldEditorControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FieldEditorControllerTest.java index ea02102..d2d0aae 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FieldEditorControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FieldEditorControllerTest.java @@ -56,6 +56,22 @@ class FieldEditorControllerTest { assertThat(ex.getMessage()).contains("只允许脚本/XML/配置字段"); } + @Test + void save_XML字段使用数据库xml类型转换() { + FieldEditorController.FieldEditRequest req = request("VIEW_TEMPLATE", "VIEW_TEMPLATE_ID", + "TPL-1", "XML", ""); + when(jdbcTemplate.update( + eq("UPDATE VIEW_TEMPLATE SET XML = CAST(? AS xml) WHERE VIEW_TEMPLATE_ID = ?"), + eq(""), eq("TPL-1"))).thenReturn(1); + + Map save = controller.save(req); + + assertThat(save).containsEntry("status", 0).containsEntry("msg", "保存成功"); + verify(whitelist).requireLegalTable("VIEW_TEMPLATE"); + verify(whitelist).requireLegalColumn("VIEW_TEMPLATE", "VIEW_TEMPLATE_ID", "主键列"); + verify(whitelist).requireLegalColumn("VIEW_TEMPLATE", "XML", "编辑字段"); + } + private static FieldEditorController.FieldEditRequest request(String tableName, String idField, String id, String fieldName, String value) { FieldEditorController.FieldEditRequest req = new FieldEditorController.FieldEditRequest(); diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java index b9ca877..2f79a36 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java @@ -98,6 +98,17 @@ class TemplateTreeControllerTest { assertEquals("C2", c2List.get(0).get("value")); } + @Test + @DisplayName("构树:实体表存在排序字段时按排序字段加载") + void tree_按排序字段加载层级() { + when(jdbc.queryForList(contains("information_schema"), eq(String.class), eq("CAT"))) + .thenReturn(List.of("CAT_ID", "NAME", "PARENTID", "SEQ")); + + controller.tree(TREE_REF); + + verify(jdbc).queryForList(contains("FROM eip3.CAT ORDER BY SEQ NULLS LAST")); + } + /** * 菜单维护树(b38737be 形态):两个 <node> 根 + SYS_MENU 条件父列。 * SYS_MENU 行有 PARENTID 则挂父菜单(自引用),否则按 MENUROOT 挂 sys_menu_root 根分组。