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 d96e70a9cf2edcfb31e6ad0d21e95d7008d0c523..facf0e6b7fe8e201514e3a778e332dfe89554636 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 cfff62a063d8db54b61435c65a03b6831f33670a..f90198d0dcb9e9f0b5f84b727f49247a61eb06f5 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);