From 83597e946dd04596245d2046ff89065592b7d11b Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 4 Dec 2024 17:49:36 +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 --- .../module/tenant/api/form/FormCopyApi.java | 16 ++++++---- .../module/tenant/api/form/FormSaveApi.java | 29 +++++++++---------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java index d96e70a9..facf0e6b 100644 --- a/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java +++ b/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java @@ -88,9 +88,11 @@ public class FormCopyApi extends PrivateApiComponentBase { throw new FormNotFoundException(formVersionVo.getFormUuid()); } newFrom.setIsActive(formVo.getIsActive()); - Map formAttributeOldUuid2NewUuidMap = new HashMap<>(); - FormVersionVo newFormVersion = copyFormVersion(formVersionVo, newFrom.getUuid(), formAttributeOldUuid2NewUuidMap); - newFormVersionList.add(newFormVersion); + formVersionVo.setFormUuid(newFrom.getUuid()); + newFormVersionList.add(formVersionVo); +// Map formAttributeOldUuid2NewUuidMap = new HashMap<>(); +// FormVersionVo newFormVersion = copyFormVersion(formVersionVo, newFrom.getUuid(), formAttributeOldUuid2NewUuidMap); +// newFormVersionList.add(newFormVersion); } else if(StringUtils.isNotBlank(uuid)) { FormVo formVo = formMapper.getFormByUuid(uuid); if (formVo == null) { @@ -99,9 +101,11 @@ public class FormCopyApi extends PrivateApiComponentBase { newFrom.setIsActive(formVo.getIsActive()); List formVersionList = formMapper.getFormVersionByFormUuid(uuid); for (FormVersionVo formVersionVo : formVersionList) { - Map formAttributeOldUuid2NewUuidMap = new HashMap<>(); - FormVersionVo newFormVersion = copyFormVersion(formVersionVo, newFrom.getUuid(), formAttributeOldUuid2NewUuidMap); - newFormVersionList.add(newFormVersion); + formVersionVo.setFormUuid(newFrom.getUuid()); + newFormVersionList.add(formVersionVo); +// Map formAttributeOldUuid2NewUuidMap = new HashMap<>(); +// FormVersionVo newFormVersion = copyFormVersion(formVersionVo, newFrom.getUuid(), formAttributeOldUuid2NewUuidMap); +// newFormVersionList.add(newFormVersion); } } else { throw new ParamNotExistsException("uuid", "currentVersionUuid"); diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java index cfff62a0..f90198d0 100644 --- a/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java +++ b/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java @@ -20,7 +20,6 @@ import neatlogic.framework.restful.core.IValid; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.FormUtil; import neatlogic.framework.util.RegexUtils; -import neatlogic.framework.util.UuidUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -155,20 +154,20 @@ public class FormSaveApi extends PrivateApiComponentBase { version += 1; formVersionVo.setIsActive(0); //另存为新版时，需要对表单组件的uuid重新生成新值，既同一个表单的不同版本中组件uuid不同 - if (CollectionUtils.isNotEmpty(formAttributeList)) { - String formConfigStr = formVersionVo.getFormConfig().toJSONString(); - for (FormAttributeVo formAttributeVo : formAttributeList) { - String oldUuid = formAttributeVo.getUuid(); - String newUuid = UuidUtil.randomUuid(); - formConfigStr = formConfigStr.replace(oldUuid, newUuid); - formAttributeOldUuid2NewUuidMap.put(oldUuid, newUuid); - } - formVersionVo.setFormConfig(JSONObject.parseObject(formConfigStr)); - mainSceneUuid = formVersionVo.getFormConfig().getString("uuid"); - formVersionVo.setSceneUuid(mainSceneUuid); - formVersionVo.setFormAttributeList(null); - formAttributeList = formVersionVo.getFormAttributeList(); - } +// if (CollectionUtils.isNotEmpty(formAttributeList)) { +// String formConfigStr = formVersionVo.getFormConfig().toJSONString(); +// for (FormAttributeVo formAttributeVo : formAttributeList) { +// String oldUuid = formAttributeVo.getUuid(); +// String newUuid = UuidUtil.randomUuid(); +// formConfigStr = formConfigStr.replace(oldUuid, newUuid); +// formAttributeOldUuid2NewUuidMap.put(oldUuid, newUuid); +// } +// formVersionVo.setFormConfig(JSONObject.parseObject(formConfigStr)); +// mainSceneUuid = formVersionVo.getFormConfig().getString("uuid"); +// formVersionVo.setSceneUuid(mainSceneUuid); +// formVersionVo.setFormAttributeList(null); +// formAttributeList = formVersionVo.getFormAttributeList(); +// } } formVersionVo.setVersion(version); formMapper.insertFormVersion(formVersionVo); -- Gitee