From f305506a4cfde2d350f7c8d40d04c4471f32448c Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 19 May 2026 17:02:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E7=95=8C=E9=9D=A2=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=94=AF=E6=8C=81=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - VoFormModel支持extendParameters对应FormFormat同名字段。 --- .../viewmodel/formentity/VoFormModel.java | 74 +++++-------------- .../VoBuildFormFormatServiceImpl.java | 3 + 2 files changed, 22 insertions(+), 55 deletions(-) diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java index 4efd5de..1f807f8 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/formentity/VoFormModel.java @@ -1,9 +1,27 @@ +/* + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.inspur.edp.formserver.viewmodel.formentity; import lombok.Getter; +import lombok.Setter; import java.util.List; +@Setter @Getter public class VoFormModel { private String id; @@ -18,59 +36,5 @@ public class VoFormModel { private List buttonGroup; private ObjectData objectAuthInfo; private List methodGroup; - private List attachmentGroup; - - - public void setId(String id) { - this.id = id; - } - - public void setCode(String code) { - this.code = code; - } - - public void setName(String name) { - this.name = name; - } - - public void setUrlType(String urlType) { - this.urlType = urlType; - } - - public void setUrl(String url) { - this.url = url; - } - - public void setUrlParameters(List urlParameters) { - this.urlParameters = urlParameters; - } - - public void setFormatType(String formatType) { - this.formatType = formatType; - } - - public void setTerminal(String terminal) { - this.terminal = terminal; - } - - public void setButtonGroup(List buttonGroup) { - this.buttonGroup = buttonGroup; - } - - public void setObjectAuthInfo(ObjectData objectData) { - this.objectAuthInfo = objectData; - } - - public void setMethods(List methodGroup) { - this.methodGroup = methodGroup; - } - - public void setProjectPath(String projectPath) { - this.projectPath = projectPath; - } - - public void setAttachmentGroup(List attachmentGroup) { - this.attachmentGroup = attachmentGroup; - } - + private String extendParameters; } diff --git a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java index 15ee44b..0667048 100644 --- a/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java +++ b/view-object-webapi/src/main/java/com/inspur/edp/formserver/viewmodel/core/buildformformat/VoBuildFormFormatServiceImpl.java @@ -137,6 +137,9 @@ public class VoBuildFormFormatServiceImpl implements VoBuildFormFormatService { List formMethods = buildMethod(methodGroups, formId); format.setFormMethods(formMethods); } + + format.setExtendParameters(voFormModel.getExtendParameters()); + //检测已建表单VO内是否存在对应流程自定义变量 checkFormConfigID(voId, voFormModel.getProjectPath()); //调用流程rpc服务推送 -- Gitee From ef618eec525a3be45c8efed854d8b20e7ddf4db8 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 19 May 2026 17:03:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=E7=95=8C=E9=9D=A2=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=94=AF=E6=8C=81=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新wf依赖包版本为1.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7e86cd..00908c8 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 0.2.0-rc.4 0.1.0 0.1.17 - 0.3.5 + 1.6.0 0.2.56 1.0.0-rc.4 -- Gitee From 89e1be659a03fb94eb23ebc6f216773972fe1ee2 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 26 May 2026 17:48:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0be-model?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA0.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00908c8..5ae2ec1 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 0.1.3 0.1.0 0.1.9 - 0.2.2-SNAPSHOT + 0.2.2 0.2.0-rc.6 0.3.0-rc.4 0.2.0-rc.4 -- Gitee From 94ed3081b39d950272bb79e64ce57ac690d4c530 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 26 May 2026 09:53:35 +0000 Subject: [PATCH 4/5] [maven-release-plugin] prepare release v0.2.2 --- pom.xml | 4 ++-- view-object-api/pom.xml | 2 +- view-object-manager/pom.xml | 2 +- view-object-model/pom.xml | 2 +- view-object-rtapi/pom.xml | 2 +- view-object-rtwebapi/pom.xml | 2 +- view-object-voextendinfo-server-api/pom.xml | 2 +- view-object-voextendinfo-server-core/pom.xml | 2 +- view-object-webapi/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 5ae2ec1..51af557 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.inspur.edp viewObject-model1 pom - 0.2.2-SNAPSHOT + 0.2.2 view-object-model view-object-manager @@ -43,7 +43,7 @@ scm:git:git://git.iec.io/gsp-cloud-ds/bef/ubml/view-object-model.git scm:git:ssh://git@git.iec.io:6060/gsp-cloud-ds/bef/ubml/view-object-model.git https://git.iec.io/gsp-cloud-ds/bef/ubml/view-object-model - HEAD + v0.2.2 diff --git a/view-object-api/pom.xml b/view-object-api/pom.xml index def07df..2f7b738 100644 --- a/view-object-api/pom.xml +++ b/view-object-api/pom.xml @@ -20,7 +20,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 view-object-api diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index 7b76283..f86bc6a 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -21,7 +21,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 view-object-manager diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml index 7df9427..67f3a01 100644 --- a/view-object-model/pom.xml +++ b/view-object-model/pom.xml @@ -21,7 +21,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 view-object-model diff --git a/view-object-rtapi/pom.xml b/view-object-rtapi/pom.xml index c973698..00794fa 100644 --- a/view-object-rtapi/pom.xml +++ b/view-object-rtapi/pom.xml @@ -20,7 +20,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 view-object-rtapi diff --git a/view-object-rtwebapi/pom.xml b/view-object-rtwebapi/pom.xml index 4159bfb..1fe3cbe 100644 --- a/view-object-rtwebapi/pom.xml +++ b/view-object-rtwebapi/pom.xml @@ -20,7 +20,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 view-object-rtwebapi diff --git a/view-object-voextendinfo-server-api/pom.xml b/view-object-voextendinfo-server-api/pom.xml index 931a6cf..8f269dd 100644 --- a/view-object-voextendinfo-server-api/pom.xml +++ b/view-object-voextendinfo-server-api/pom.xml @@ -19,7 +19,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 4.0.0 diff --git a/view-object-voextendinfo-server-core/pom.xml b/view-object-voextendinfo-server-core/pom.xml index 035aa66..c2e1cc2 100644 --- a/view-object-voextendinfo-server-core/pom.xml +++ b/view-object-voextendinfo-server-core/pom.xml @@ -19,7 +19,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 4.0.0 diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml index 1a7dbbd..5334d39 100644 --- a/view-object-webapi/pom.xml +++ b/view-object-webapi/pom.xml @@ -21,7 +21,7 @@ com.inspur.edp viewObject-model1 - 0.2.2-SNAPSHOT + 0.2.2 view-object-webapi -- Gitee From ca45d3a72e7d00247e2d8f847a2623ecc828feca Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 26 May 2026 09:53:35 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- view-object-api/pom.xml | 2 +- view-object-manager/pom.xml | 2 +- view-object-model/pom.xml | 2 +- view-object-rtapi/pom.xml | 2 +- view-object-rtwebapi/pom.xml | 2 +- view-object-voextendinfo-server-api/pom.xml | 2 +- view-object-voextendinfo-server-core/pom.xml | 2 +- view-object-webapi/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 51af557..1f0573b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.inspur.edp viewObject-model1 pom - 0.2.2 + 0.2.3-SNAPSHOT view-object-model view-object-manager @@ -43,7 +43,7 @@ scm:git:git://git.iec.io/gsp-cloud-ds/bef/ubml/view-object-model.git scm:git:ssh://git@git.iec.io:6060/gsp-cloud-ds/bef/ubml/view-object-model.git https://git.iec.io/gsp-cloud-ds/bef/ubml/view-object-model - v0.2.2 + HEAD diff --git a/view-object-api/pom.xml b/view-object-api/pom.xml index 2f7b738..ef25802 100644 --- a/view-object-api/pom.xml +++ b/view-object-api/pom.xml @@ -20,7 +20,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT view-object-api diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index f86bc6a..9aca5c1 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -21,7 +21,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT view-object-manager diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml index 67f3a01..4457027 100644 --- a/view-object-model/pom.xml +++ b/view-object-model/pom.xml @@ -21,7 +21,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT view-object-model diff --git a/view-object-rtapi/pom.xml b/view-object-rtapi/pom.xml index 00794fa..ae22ebb 100644 --- a/view-object-rtapi/pom.xml +++ b/view-object-rtapi/pom.xml @@ -20,7 +20,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT view-object-rtapi diff --git a/view-object-rtwebapi/pom.xml b/view-object-rtwebapi/pom.xml index 1fe3cbe..923805b 100644 --- a/view-object-rtwebapi/pom.xml +++ b/view-object-rtwebapi/pom.xml @@ -20,7 +20,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT view-object-rtwebapi diff --git a/view-object-voextendinfo-server-api/pom.xml b/view-object-voextendinfo-server-api/pom.xml index 8f269dd..b79c362 100644 --- a/view-object-voextendinfo-server-api/pom.xml +++ b/view-object-voextendinfo-server-api/pom.xml @@ -19,7 +19,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT 4.0.0 diff --git a/view-object-voextendinfo-server-core/pom.xml b/view-object-voextendinfo-server-core/pom.xml index c2e1cc2..491a129 100644 --- a/view-object-voextendinfo-server-core/pom.xml +++ b/view-object-voextendinfo-server-core/pom.xml @@ -19,7 +19,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT 4.0.0 diff --git a/view-object-webapi/pom.xml b/view-object-webapi/pom.xml index 5334d39..6df8b61 100644 --- a/view-object-webapi/pom.xml +++ b/view-object-webapi/pom.xml @@ -21,7 +21,7 @@ com.inspur.edp viewObject-model1 - 0.2.2 + 0.2.3-SNAPSHOT view-object-webapi -- Gitee