feat: add framework script editor actions
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
This commit is contained in:
@@ -95,13 +95,33 @@ public final class EngineclassDelta {
|
||||
EngineclassDelta::processFormRemoveCrudAnchor);
|
||||
|
||||
// 流程监控:ProcessMonitorComponentNew 原有「处理 / 高级处理 / 结束流程」。
|
||||
// EIP4 当前只注入真实可用的「处理」明细查看与「结束流程」;高级处理(Groovy)需权限/审计另案。
|
||||
// 高级处理接网关 Groovy 执行端点,按旧系统绑定 processid/businessKey。
|
||||
register("com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew",
|
||||
EngineclassDelta::processMonitorDetailButton,
|
||||
EngineclassDelta::processMonitorAdvancedScriptButton,
|
||||
EngineclassDelta::processMonitorTerminateButton);
|
||||
registerMutator("com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew",
|
||||
EngineclassDelta::processMonitorCrudAnchor);
|
||||
|
||||
// 定义定时任务:ScheduleJobDesignComponent 在 treegrid 右侧列表增加「编辑任务脚本」。
|
||||
register("com.dsasp.client.tools.schedulejob.ScheduleJobDesignComponent",
|
||||
EngineclassDelta::scheduleJobScriptButton);
|
||||
|
||||
// 数据导入配置管理:DataImportConfigView 加「编辑转换脚本 / 编辑保存脚本」。
|
||||
register("com.dsasp.client.dataimport.view.DataImportConfigView",
|
||||
EngineclassDelta::dataImportConvertScriptButton,
|
||||
EngineclassDelta::dataImportSaveScriptButton);
|
||||
|
||||
// 功能/视图管理与自定义列表:先补高级配置 XML 源码编辑入口;可视化设计器另走独立路由。
|
||||
register("com.dsasp.client.viewframework.component.UserFunDesignComponent",
|
||||
EngineclassDelta::viewTemplateXmlButton);
|
||||
register("com.dsasp.client.viewframework.component.UserPageDesignComponent",
|
||||
EngineclassDelta::viewPageXmlButton);
|
||||
register("com.dsasp.client.viewframework.component.UserFunDesignCustomComponent",
|
||||
EngineclassDelta::viewTemplateCustomXmlButton);
|
||||
register("com.dsasp.client.viewframework.component.UserPageDesignCustomComponent",
|
||||
EngineclassDelta::viewPageCustomXmlButton);
|
||||
|
||||
// 消息查看:MessageReceiveView/MessageSendView 在默认 GridTemplateComponent 之上加「查看」按钮。
|
||||
// 收到消息按 SYS_MESSAGEUSER_ID 打开并置已读;已发送消息按 SYS_MESSAGE_ID 打开只读详情。
|
||||
register("com.dsasp.client.tools.message.MessageReceiveView",
|
||||
@@ -147,14 +167,10 @@ public final class EngineclassDelta {
|
||||
if (builders == null || builders.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Object bodyObj = schema.get("body");
|
||||
if (!(bodyObj instanceof Map)) {
|
||||
Map<String, Object> body = firstCrud(schema);
|
||||
if (body == null) {
|
||||
return;
|
||||
}
|
||||
Map<String, Object> body = (Map<String, Object>) bodyObj;
|
||||
if (!"crud".equals(body.get("type"))) {
|
||||
return; // 仅 crud 列表页注入工具栏按钮(tree/group/page 等暂不在此机制)
|
||||
}
|
||||
Object tbObj = body.get("headerToolbar");
|
||||
if (!(tbObj instanceof List)) {
|
||||
return;
|
||||
@@ -174,6 +190,39 @@ public final class EngineclassDelta {
|
||||
}
|
||||
}
|
||||
|
||||
/** 优先取顶层 body crud;非顶层页面(treegrid/grid)递归找第一个 crud。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> firstCrud(Map<String, Object> schema) {
|
||||
Object bodyObj = schema.get("body");
|
||||
if (bodyObj instanceof Map<?, ?> body && "crud".equals(body.get("type"))) {
|
||||
return (Map<String, Object>) bodyObj;
|
||||
}
|
||||
return findFirstCrud(schema);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> findFirstCrud(Object node) {
|
||||
if (node instanceof Map<?, ?> map) {
|
||||
if ("crud".equals(map.get("type"))) {
|
||||
return (Map<String, Object>) node;
|
||||
}
|
||||
for (Object value : map.values()) {
|
||||
Map<String, Object> found = findFirstCrud(value);
|
||||
if (found != null) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
} else if (node instanceof List<?> list) {
|
||||
for (Object value : list) {
|
||||
Map<String, Object> found = findFirstCrud(value);
|
||||
if (found != null) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** ② 整页改写器:对注册的 mutator 逐个施加到整页 schema(任意 body 类型);未注册 → no-op。 */
|
||||
private static void applyMutators(Map<String, Object> schema, String engineclass, ConversionResult result) {
|
||||
List<BiConsumer<Map<String, Object>, ConversionResult>> mutators = MUTATORS.get(engineclass);
|
||||
@@ -446,6 +495,36 @@ public final class EngineclassDelta {
|
||||
return btn;
|
||||
}
|
||||
|
||||
/** 流程监控「高级处理」:打开标准代码编辑弹窗,提交 Groovy 到网关执行。 */
|
||||
private static Map<String, Object> processMonitorAdvancedScriptButton(String pkField) {
|
||||
Map<String, Object> form = mapOf(
|
||||
"type", "form",
|
||||
"id", "process-monitor-advanced-script-form",
|
||||
"wrapWithPanel", false,
|
||||
"api", mapOf(
|
||||
"method", "post",
|
||||
"url", "/api/workflow/process/" + selectedSingleFieldExpr(pkField) + "/advanced-script",
|
||||
"data", mapOf(
|
||||
"script", "${script}",
|
||||
"businessKey", "${selectedItems[0].businessKey || selectedItems[0].BUSINESSKEY || ''}",
|
||||
"tableName", "${selectedItems[0].businessTable || selectedItems[0].BUSINESSTABLE || ''}")),
|
||||
"body", List.of(codeEditor("script", "高级处理脚本", "java", "")));
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("id", "高级处理");
|
||||
btn.put("label", "高级处理");
|
||||
btn.put("icon", "fa fa-code");
|
||||
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("dialog", mapOf(
|
||||
"type", "dialog",
|
||||
"title", "高级处理",
|
||||
"size", "xl",
|
||||
"body", form,
|
||||
"actions", formActions()));
|
||||
return btn;
|
||||
}
|
||||
|
||||
/** 流程监控「结束流程」:按流程实例作废活动流程。 */
|
||||
private static Map<String, Object> processMonitorTerminateButton(String pkField) {
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
@@ -480,6 +559,103 @@ public final class EngineclassDelta {
|
||||
}
|
||||
}
|
||||
|
||||
// ── 通用脚本/XML 编辑器按钮 ────────────────────────────────────────────
|
||||
|
||||
private static Map<String, Object> scheduleJobScriptButton(String pkField) {
|
||||
return fieldEditorButton("编辑任务脚本", "fa fa-code",
|
||||
"SYS_SCHEDULEJOB", "SYS_SCHEDULEJOB_ID", pkField, "RUNSCRIPT", "java");
|
||||
}
|
||||
|
||||
private static Map<String, Object> dataImportConvertScriptButton(String pkField) {
|
||||
return fieldEditorButton("编辑转换脚本", "fa fa-code",
|
||||
"SYS_DATAIMPORTCONFIG", "SYS_DATAIMPORTCONFIG_ID", pkField, "CONVERTSCRIPT", "java");
|
||||
}
|
||||
|
||||
private static Map<String, Object> dataImportSaveScriptButton(String pkField) {
|
||||
return fieldEditorButton("编辑保存脚本", "fa fa-code",
|
||||
"SYS_DATAIMPORTCONFIG", "SYS_DATAIMPORTCONFIG_ID", pkField, "SAVESCRIPT", "java");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewTemplateXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_TEMPLATE", "VIEW_TEMPLATE_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewPageXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_PAGE", "VIEW_PAGE_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewTemplateCustomXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_TEMPLATE_CUSTOM", "VIEW_TEMPLATE_CUSTOM_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewPageCustomXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_PAGE_CUSTOM", "VIEW_PAGE_CUSTOM_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> fieldEditorButton(String label, String icon, String tableName,
|
||||
String idField, String pkField,
|
||||
String fieldName, String language) {
|
||||
String selectedId = selectedSingleFieldExpr(pkField == null || pkField.isBlank() ? idField : pkField);
|
||||
Map<String, Object> requestData = mapOf(
|
||||
"tableName", tableName,
|
||||
"idField", idField,
|
||||
"id", selectedId,
|
||||
"fieldName", fieldName);
|
||||
Map<String, Object> saveData = new LinkedHashMap<>(requestData);
|
||||
saveData.put("value", "${value}");
|
||||
Map<String, Object> form = mapOf(
|
||||
"type", "form",
|
||||
"id", "field-editor-" + tableName.toLowerCase() + "-" + fieldName.toLowerCase(),
|
||||
"wrapWithPanel", false,
|
||||
"initApi", mapOf(
|
||||
"method", "post",
|
||||
"url", "/api/field-editor/load",
|
||||
"data", requestData),
|
||||
"api", mapOf(
|
||||
"method", "post",
|
||||
"url", "/api/field-editor/save",
|
||||
"data", saveData),
|
||||
"body", List.of(codeEditor("value", label, language, "")));
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("id", label);
|
||||
btn.put("label", label);
|
||||
btn.put("icon", icon);
|
||||
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("dialog", mapOf(
|
||||
"type", "dialog",
|
||||
"title", label,
|
||||
"size", "xl",
|
||||
"body", form,
|
||||
"actions", formActions()));
|
||||
return btn;
|
||||
}
|
||||
|
||||
private static Map<String, Object> codeEditor(String name, String label, String language, String value) {
|
||||
return mapOf(
|
||||
"type", "editor",
|
||||
"name", name,
|
||||
"label", label,
|
||||
"language", language,
|
||||
"value", value,
|
||||
"size", "lg",
|
||||
"options", mapOf(
|
||||
"minimap", mapOf("enabled", false),
|
||||
"wordWrap", "on",
|
||||
"fontSize", 14));
|
||||
}
|
||||
|
||||
private static List<Object> formActions() {
|
||||
return List.of(
|
||||
mapOf("type", "button", "label", "保存", "level", "primary", "actionType", "submit", "close", true),
|
||||
mapOf("type", "button", "label", "取消", "actionType", "close"));
|
||||
}
|
||||
|
||||
private static Map<String, Object> approvalDrawerButton(String label, String icon, String pkField,
|
||||
boolean readOnly) {
|
||||
Map<String, Object> args = mapOf(
|
||||
|
||||
@@ -1112,10 +1112,10 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("主动召回", data.get("comment"));
|
||||
}
|
||||
|
||||
/** engineclass=ProcessMonitorComponentNew → 流程监控注入处理明细和结束流程按钮,不注入高级处理假入口。 */
|
||||
/** engineclass=ProcessMonitorComponentNew → 流程监控注入处理明细、高级处理和结束流程按钮。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void engineclass_ProcessMonitorComponentNew_注入处理和结束流程按钮() {
|
||||
void engineclass_ProcessMonitorComponentNew_注入处理高级处理和结束流程按钮() {
|
||||
String xml = "<crud entityid='e1'><display/></crud>";
|
||||
ConversionResult r = converter.convertGraded(xml, null,
|
||||
"com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew",
|
||||
@@ -1128,13 +1128,14 @@ class TemplateToAmisConverterTest {
|
||||
Map<String, Object> terminate = toolbar.stream()
|
||||
.filter(o -> o instanceof Map && "结束流程".equals(((Map<String, Object>) o).get("label")))
|
||||
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
|
||||
boolean hasAdvanced = toolbar.stream()
|
||||
.anyMatch(o -> o instanceof Map && "高级处理".equals(((Map<String, Object>) o).get("label")));
|
||||
Map<String, Object> advanced = toolbar.stream()
|
||||
.filter(o -> o instanceof Map && "高级处理".equals(((Map<String, Object>) o).get("label")))
|
||||
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
|
||||
|
||||
assertEquals("process-monitor-crud", crud.get("id"));
|
||||
assertNotNull(handle, "流程监控应注入「处理」");
|
||||
assertNotNull(advanced, "流程监控应注入真实「高级处理」");
|
||||
assertNotNull(terminate, "流程监控应注入「结束流程」");
|
||||
assertFalse(hasAdvanced, "高级处理需要权限/审计端点,不能生成假入口");
|
||||
|
||||
Map<String, Object> action = (Map<String, Object>) ((List<Object>) ((Map<String, Object>)
|
||||
((Map<String, Object>) handle.get("onEvent")).get("click")).get("actions")).get(0);
|
||||
@@ -1143,6 +1144,14 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("processInstanceId"));
|
||||
assertEquals(true, args.get("readOnly"));
|
||||
|
||||
assertEquals("dialog", advanced.get("actionType"));
|
||||
Map<String, Object> advancedDialog = (Map<String, Object>) advanced.get("dialog");
|
||||
Map<String, Object> advancedForm = (Map<String, Object>) advancedDialog.get("body");
|
||||
Map<String, Object> advancedApi = (Map<String, Object>) advancedForm.get("api");
|
||||
assertEquals("/api/workflow/process/${selectedItems[0].PM_DEMO_ID}/advanced-script", advancedApi.get("url"));
|
||||
List<Object> advancedFields = (List<Object>) advancedForm.get("body");
|
||||
assertEquals("editor", ((Map<String, Object>) advancedFields.get(0)).get("type"));
|
||||
|
||||
assertEquals("ajax", terminate.get("actionType"));
|
||||
assertEquals("danger", terminate.get("level"));
|
||||
assertEquals("process-monitor-crud", terminate.get("reload"));
|
||||
@@ -1153,6 +1162,56 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("流程有误作废处理", data.get("comment"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void engineclass_ScheduleJobDesignComponent_treegrid右侧列表注入编辑任务脚本() {
|
||||
Map<String, Object> crud = new LinkedHashMap<>();
|
||||
crud.put("type", "crud");
|
||||
crud.put("primaryField", "SYS_SCHEDULEJOB_ID");
|
||||
crud.put("headerToolbar", new ArrayList<>(List.of("pagination")));
|
||||
Map<String, Object> schema = Map.of(
|
||||
"type", "page",
|
||||
"body", Map.of(
|
||||
"type", "grid",
|
||||
"columns", List.of(
|
||||
Map.of("body", Map.of("type", "input-tree")),
|
||||
Map.of("body", crud))));
|
||||
|
||||
EngineclassDelta.apply(schema,
|
||||
"com.dsasp.client.tools.schedulejob.ScheduleJobDesignComponent", null);
|
||||
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
Map<String, Object> scriptBtn = toolbar.stream()
|
||||
.filter(o -> o instanceof Map && "编辑任务脚本".equals(((Map<String, Object>) o).get("label")))
|
||||
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
|
||||
|
||||
assertNotNull(scriptBtn);
|
||||
Map<String, Object> form = (Map<String, Object>) ((Map<String, Object>) scriptBtn.get("dialog")).get("body");
|
||||
Map<String, Object> api = (Map<String, Object>) form.get("api");
|
||||
assertEquals("/api/field-editor/save", api.get("url"));
|
||||
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
||||
assertEquals("SYS_SCHEDULEJOB", data.get("tableName"));
|
||||
assertEquals("RUNSCRIPT", data.get("fieldName"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void engineclass_DataImportConfigView_注入转换和保存脚本编辑按钮() {
|
||||
String xml = "<crud entityid='e1'><display/></crud>";
|
||||
ConversionResult r = converter.convertGraded(xml, null,
|
||||
"com.dsasp.client.dataimport.view.DataImportConfigView",
|
||||
"数据导入配置管理", new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
List<String> labels = toolbar.stream()
|
||||
.filter(Map.class::isInstance)
|
||||
.map(o -> String.valueOf(((Map<String, Object>) o).get("label")))
|
||||
.toList();
|
||||
|
||||
assertTrue(labels.contains("编辑转换脚本"));
|
||||
assertTrue(labels.contains("编辑保存脚本"));
|
||||
}
|
||||
|
||||
/** engineclass=ProcessFormRemoveComponent → 审批表单删除注入查看和历史删除按钮。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
Reference in New Issue
Block a user