From c288d6cb4509e5ff0d836d2022ab5857c25dde76 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Dec 2024 18:32:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=92=8C=E8=A1=A8=E5=8D=95=E5=8F=A6=E5=AD=98?= =?UTF-8?q?=E4=B8=BA=E6=98=AF=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6uuid?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1304407751229440]表单复制和表单另存为是表单组件uuid保持不变 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1304407751229440 --- .../Matrix2FormAttributeDependencyHandler.java | 11 +++++++++-- .../handler/MatrixAttr2FormAttrDependencyHandler.java | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/framework/dependency/handler/Matrix2FormAttributeDependencyHandler.java b/src/main/java/neatlogic/module/framework/dependency/handler/Matrix2FormAttributeDependencyHandler.java index 1ffc0d86e..29b3fd541 100644 --- a/src/main/java/neatlogic/module/framework/dependency/handler/Matrix2FormAttributeDependencyHandler.java +++ b/src/main/java/neatlogic/module/framework/dependency/handler/Matrix2FormAttributeDependencyHandler.java @@ -35,7 +35,11 @@ public class Matrix2FormAttributeDependencyHandler extends DefaultDependencyHand @Override public int delete(Object to, JSONObject config) { - return super.delete(getGenerateTo(to, config), config); + int count = super.delete(getGenerateTo(to, config), config); + if (count == 0) { + count = super.delete(to, config); + } + return count; } @Override @@ -67,7 +71,10 @@ public class Matrix2FormAttributeDependencyHandler extends DefaultDependencyHand String uuid = config.getString("uuid"); FormAttributeVo formAttribute = FormUtil.getFormAttribute(formVersionVo.getFormConfig(), uuid, sceneUuid); if (formAttribute == null) { - return null; + formAttribute = FormUtil.getFormAttribute(formVersionVo.getFormConfig(), dependencyVo.getTo(), sceneUuid); + if (formAttribute == null) { + return null; + } } List parentNameList = new ArrayList<>(); FormAttributeParentVo parent = formAttribute.getParent(); diff --git a/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java b/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java index 8ba344da0..c2eec1dfd 100644 --- a/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java +++ b/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java @@ -55,7 +55,11 @@ public class MatrixAttr2FormAttrDependencyHandler extends DefaultDependencyHandl @Override public int delete(Object to, JSONObject config) { - return super.delete(getGenerateTo(to, config), config); + int count = super.delete(getGenerateTo(to, config), config); + if (count == 0) { + count = super.delete(to, config); + } + return count; } @Override @@ -63,6 +67,7 @@ public class MatrixAttr2FormAttrDependencyHandler extends DefaultDependencyHandl JSONObject config = dependencyVo.getConfig(); if (MapUtils.isNotEmpty(config)) { String formVersionUuid = config.getString("formVersionUuid"); + String uuid = config.getString("uuid"); if (StringUtils.isNotBlank(formVersionUuid)) { FormVersionVo formVersionVo = formMapper.getFormVersionByUuid(formVersionUuid); if (formVersionVo != null) { @@ -73,7 +78,7 @@ public class MatrixAttr2FormAttrDependencyHandler extends DefaultDependencyHandl List formAttributeList = formVersionVo.getFormAttributeList(); if (CollectionUtils.isNotEmpty(formAttributeList)) { for (FormAttributeVo formAttributeVo : formAttributeList) { - if (Objects.equals(formAttributeVo.getUuid(), dependencyVo.getTo())) { + if (Objects.equals(formAttributeVo.getUuid(), dependencyVo.getTo()) || Objects.equals(formAttributeVo.getUuid(), uuid)) { JSONObject dependencyInfoConfig = new JSONObject(); dependencyInfoConfig.put("formUuid", formVo.getUuid()); // dependencyInfoConfig.put("formName", formVo.getName()); -- Gitee