From a9c207e488e9b74ad71462101554b0f27c94a3cc Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 17 Jun 2024 19:43:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1181253229838336]后端-表单新增数据转换功能 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1181253229838336 --- .../framework/form/dto/FormVersionVo.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java b/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java index 723f36b71..26f3b9214 100644 --- a/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java +++ b/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java @@ -36,6 +36,8 @@ public class FormVersionVo extends BaseEditorVo { private JSONObject formConfig; private String sceneUuid; @JSONField(serialize = false) + private List formCustomExtendAttributeList; + @JSONField(serialize = false) private List formExtendAttributeList; @JSONField(serialize = false) private List formAttributeList; @@ -320,4 +322,56 @@ public class FormVersionVo extends BaseEditorVo { public void setFormExtendAttributeList(List formExtendAttributeList) { this.formExtendAttributeList = formExtendAttributeList; } + + public List getFormCustomExtendAttributeList() { + if (formCustomExtendAttributeList == null) { + if (MapUtils.isNotEmpty(getFormConfig())) { + JSONObject formCustomExtendConfig = this.formConfig.getJSONObject("formCustomExtendConfig"); + if (MapUtils.isNotEmpty(formCustomExtendConfig)) { + JSONArray extendConfigList = formCustomExtendConfig.getJSONArray("extendConfigList"); + if (CollectionUtils.isNotEmpty(extendConfigList)) { + for (int i = 0; i < extendConfigList.size(); i++) { + JSONObject extendConfigObj = extendConfigList.getJSONObject(i); + if (MapUtils.isEmpty(extendConfigObj)) { + continue; + } + JSONArray attributeArray = extendConfigObj.getJSONArray("attributeList"); + if (CollectionUtils.isNotEmpty(attributeArray)) { + String mainSceneUuid = this.formConfig.getString("uuid"); + formCustomExtendAttributeList = new ArrayList<>(); + for (int j = 0; j < attributeArray.size(); j++) { + JSONObject attributeObj = attributeArray.getJSONObject(j); + if (MapUtils.isEmpty(attributeObj)) { + continue; + } + String tag = attributeObj.getString("tag"); + String key = attributeObj.getString("key"); + String label = attributeObj.getString("label"); + String type = attributeObj.getString("type"); + String handler = attributeObj.getString("handler"); + JSONObject config = attributeObj.getJSONObject("config"); + FormAttributeVo formAttributeVo = new FormAttributeVo(); + formAttributeVo.setFormUuid(formUuid); + formAttributeVo.setFormVersionUuid(uuid); + formAttributeVo.setTag(tag); + formAttributeVo.setKey(key); + formAttributeVo.setUuid(UuidUtil.getCustomUUID(mainSceneUuid + "#" + tag + "#" + key)); + formAttributeVo.setLabel(label); + formAttributeVo.setType(type); + formAttributeVo.setHandler(handler); + formAttributeVo.setConfig(config); + formCustomExtendAttributeList.add(formAttributeVo); + } + } + } + } + } + } + } + return formCustomExtendAttributeList; + } + + public void setFormCustomExtendAttributeList(List formCustomExtendAttributeList) { + this.formCustomExtendAttributeList = formCustomExtendAttributeList; + } } -- Gitee From 5a413176f11330d4fef303988f499c19acd9f275 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 17 Jun 2024 19:56:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1181253229838336]后端-表单新增数据转换功能 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1181253229838336 --- .../changelog/2024-06-17/neatlogic_tenant.sql | 2 ++ .../framework/changelog/2024-06-17/version.json | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/version.json diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/neatlogic_tenant.sql new file mode 100644 index 000000000..ebc2f0190 --- /dev/null +++ b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/neatlogic_tenant.sql @@ -0,0 +1,2 @@ +ALTER TABLE `form_extend_attribute` + CHANGE `parent_uuid` `parent_uuid` CHAR(32) CHARSET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '属性父级uuid'; \ No newline at end of file diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/version.json b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/version.json new file mode 100644 index 000000000..f210cce6c --- /dev/null +++ b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-17/version.json @@ -0,0 +1,10 @@ +{ + "content":[ + { + "type":"新增功能", + "detail":[ + {"msg":"1.表单新增数据转换功能"} + ] + } + ] +} -- Gitee