This commit is contained in:
@@ -510,6 +510,43 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals("${result}", ((Map<String, Object>) api.get("responseData")).get("&"));
|
assertEquals("${result}", ((Map<String, Object>) api.get("responseData")).get("&"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根因修复(用车申请 dogfooding):「添加」按钮 pageid 指向真实 view_page 时,dialog 应加载该
|
||||||
|
* <b>view_page 本体</b>(schemaApi + defaults 均用 view_page_id),而非包壳它的 type=7 表单模板 id。
|
||||||
|
* view_page 转换产物 actions 为空、提交按钮只由 dialog.actions(按钮 <method>)出一套 → 不双套;
|
||||||
|
* 且 defaults/__egtpl/引用显名 全按 view_page_id 解析(后端契约一致),申请人等默认值方能带出。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void insert按钮pageid是真实viewPage_dialog加载viewPage本体且单套按钮() {
|
||||||
|
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||||
|
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||||
|
.thenReturn("OA_X"); // 实体表名解析
|
||||||
|
lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class)))
|
||||||
|
.thenReturn(1); // viewPageExists(bcd) count>0 → pageid 是真实 view_page
|
||||||
|
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<button type='insert' name='添加' isshow='true' pageid='bcd'"
|
||||||
|
+ " editFormTemplate='tpl-wrap'>"
|
||||||
|
+ "<method name='保存' servicename='OA_X_ADD'/>"
|
||||||
|
+ "<method name='保存并提交审批' servicename='OA_X_SUBMIT'/></button></crud>";
|
||||||
|
Map<String, Object> schema = c.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
|
||||||
|
Map<String, Object> dlg = (Map<String, Object>) findToolbarButton(body(schema), "添加").get("dialog");
|
||||||
|
Map<String, Object> service = (Map<String, Object>) dlg.get("body");
|
||||||
|
// 关键:schemaApi + defaults 用 view_page id(bcd),不是包壳表单模板 id(tpl-wrap)
|
||||||
|
assertEquals("get:/api/page/schema/bcd?format=amis", service.get("schemaApi"),
|
||||||
|
"弹窗应加载 view_page 本体(bcd),而非表单模板包壳");
|
||||||
|
assertEquals("/api/form/OA_X/defaults?templateId=bcd",
|
||||||
|
((Map<String, Object>) service.get("api")).get("url"),
|
||||||
|
"defaults 端点应按 view_page_id 解析 initvalue 默认值");
|
||||||
|
// 提交按钮只此一套(dialog.actions 来自按钮 <method>);view_page 本体 actions 为空 → 不双套
|
||||||
|
List<Object> actions = (List<Object>) dlg.get("actions");
|
||||||
|
assertEquals(3, actions.size(), "保存/保存并提交审批/取消 一套");
|
||||||
|
assertEquals("保存", ((Map<String, Object>) actions.get(0)).get("label"));
|
||||||
|
assertEquals("保存并提交审批", ((Map<String, Object>) actions.get(1)).get("label"));
|
||||||
|
assertEquals("取消", ((Map<String, Object>) actions.get(2)).get("label"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void c1_补读requirederror与minlength() {
|
void c1_补读requirederror与minlength() {
|
||||||
|
|||||||
Reference in New Issue
Block a user