From f964cc2e69434a954f05501ee040d9bf45559c73 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Wed, 15 Jul 2026 14:43:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20VO=20=E4=BE=A7=20VoModelRule/Vo?= =?UTF-8?q?ObjectRule/VoElementRule=20=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controlrule/rule/VoControlRule.java | 34 ----- .../controlrule/rule/VoFeildControlRule.java | 12 -- .../controlrule/rule/VoModelRule.java | 46 ++++++ .../controlrule/rule/VoObjControlRule.java | 12 -- .../rule/convert/VoControlRuleConvertor.java | 66 --------- .../rule/convert/VoModelRuleConvertor.java | 73 ++++++++++ .../rule/parser/VoControlRuleParser.java | 20 --- .../rule/parser/VoFieldRuleParser.java | 13 -- .../parser/VoObjectControlRuleParser.java | 26 ---- .../VoFieldControlRuleSerializer.java | 6 - .../VoObjectControlRuleSerializer.java | 6 - .../rule/serializer/VoRuleSerializer.java | 6 - .../ruledefine/VoControlRuleDef.java | 113 --------------- .../ruledefine/VoControlRuleDefNames.java | 10 -- .../ruledefine/VoElementRuleDef.java | 74 ++++++++++ .../ruledefine/VoFieldControlRuleDef.java | 96 ------------- .../ruledefine/VoFieldControlRuleNames.java | 6 - .../ruledefine/VoModelRuleDef.java | 82 +++++++++++ .../ruledefine/VoModelRuleDefNames.java | 25 ++++ .../ruledefine/VoObjectControlRuleDef.java | 82 ----------- .../ruledefine/VoObjectRuleDef.java | 51 +++++++ .../ruledefine/VoObjectRuleDefNames.java | 5 - .../controlrule/ruledefine/VoRuleDefItem.java | 22 +++ .../parser/VoControlRuleDefParser.java | 23 --- .../parser/VoFieldControlRuleDefParser.java | 13 -- .../parser/VoObjectControlRuleDefParser.java | 21 --- .../VoControlRuleDefSerializer.java | 15 -- .../VoFieldControlRuleDefSerializer.java | 14 -- .../VoObjectControlRuleDefSerializer.java | 15 -- .../viewmodel/i18n/VMI8nResourceUtil.java | 3 + .../i18n/names/VoResourceKeyNames.java | 136 ------------------ 31 files changed, 376 insertions(+), 750 deletions(-) delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoControlRule.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoFeildControlRule.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoModelRule.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoObjControlRule.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoControlRuleConvertor.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoModelRuleConvertor.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoControlRuleParser.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoFieldRuleParser.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoObjectControlRuleParser.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoFieldControlRuleSerializer.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoObjectControlRuleSerializer.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoRuleSerializer.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDefNames.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoElementRuleDef.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleDef.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleNames.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDef.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDefNames.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectControlRuleDef.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDef.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDefNames.java create mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoRuleDefItem.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoControlRuleDefParser.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoFieldControlRuleDefParser.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoObjectControlRuleDefParser.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoControlRuleDefSerializer.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoFieldControlRuleDefSerializer.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoObjectControlRuleDefSerializer.java diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoControlRule.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoControlRule.java deleted file mode 100644 index 3289394..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoControlRule.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.basic.ControlRuleItem; -import com.inspur.edp.das.commonmodel.controlrule.CmControlRule; -import com.inspur.edp.das.commonmodel.controlrule.CmEntityControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.parser.VoControlRuleParser; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.serializer.VoRuleSerializer; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoControlRuleDefNames; - -@JsonSerialize(using = VoRuleSerializer.class) -@JsonDeserialize(using = VoControlRuleParser.class) -public class VoControlRule extends CmControlRule { - protected final CmEntityControlRule createMainEntityControlRule() { - return new VoObjControlRule(); - } - - public ControlRuleItem getAddCustomActonControlRule() { - return super.getControlRule(VoControlRuleDefNames.AddCustomAction); - } - - public void setAddCustomActonControlRule(ControlRuleItem ruleItem) { - super.setControlRule(VoControlRuleDefNames.AddCustomAction, ruleItem); - } - - public ControlRuleItem getAddVariableControlRule() { - return super.getControlRule(VoControlRuleDefNames.AddVariableDtm); - } - - public void setAddVariableControlRule(ControlRuleItem ruleItem) { - super.setControlRule(VoControlRuleDefNames.AddVariableDtm, ruleItem); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoFeildControlRule.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoFeildControlRule.java deleted file mode 100644 index 1d93c07..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoFeildControlRule.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.inspur.edp.das.commonmodel.controlrule.CmFieldControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.parser.VoFieldRuleParser; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.serializer.VoFieldControlRuleSerializer; - -@JsonSerialize(using = VoFieldControlRuleSerializer.class) -@JsonDeserialize(using = VoFieldRuleParser.class) -public class VoFeildControlRule extends CmFieldControlRule { -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoModelRule.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoModelRule.java new file mode 100644 index 0000000..cd50d5f --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoModelRule.java @@ -0,0 +1,46 @@ +/* + * 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.controlrule.rule; + +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.basic.ControlRuleItem; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonModelRule; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonObjectRule; +import lombok.Getter; +import lombok.Setter; + +/** + * VO 侧 Model 层控制规则。 + * + *

继承 {@link CommonModelRule}，在公共模型规则基础上扩展 + * VO 特有规则：CustomAction、VariableDtm、HelpConfig。 + * 主实体子规则类型为 {@link VoObjectRule}。 + */ +@Getter +@Setter +public class VoModelRule extends CommonModelRule { + + private ControlRuleItem addCustomActionRule; + private ControlRuleItem modifyCustomActionRule; + private ControlRuleItem addHelpConfigRule; + private ControlRuleItem modifyHelpConfigRule; + + @Override + protected final CommonObjectRule createMainObjectRule() { + return new CommonObjectRule(); + } + +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoObjControlRule.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoObjControlRule.java deleted file mode 100644 index df04b55..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/VoObjControlRule.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.inspur.edp.das.commonmodel.controlrule.CmEntityControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.parser.VoObjectControlRuleParser; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.serializer.VoObjectControlRuleSerializer; - -@JsonSerialize(using = VoObjectControlRuleSerializer.class) -@JsonDeserialize(using = VoObjectControlRuleParser.class) -public class VoObjControlRule extends CmEntityControlRule { -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoControlRuleConvertor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoControlRuleConvertor.java deleted file mode 100644 index 49ec1ab..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoControlRuleConvertor.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.convert; - -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.basic.convert.ControlRuleConvertor; -import com.inspur.edp.das.commonmodel.json.CommonModelNames; -import com.inspur.edp.formserver.viewmodel.GspViewModel; -import com.inspur.edp.formserver.viewmodel.GspViewObject; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoFeildControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoObjControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoControlRuleDef; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoFieldControlRuleDef; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoObjectControlRuleDef; -import lombok.var; - -import java.util.HashMap; - -public class VoControlRuleConvertor { - public static void convert2ControlRule(VoControlRuleDef ruleDef, VoControlRule rule, GspViewModel vo) { - - ControlRuleConvertor.convert2ControlRule(ruleDef, rule); - rule.setRuleId(vo.getId()); - - VoObjControlRule mainObjRule = convert2VoObjControlRule((VoObjectControlRuleDef) ruleDef.getChildControlRules().get(CommonModelNames.MainObject), vo.getMainObject()); - rule.setMainEntityControlRule(mainObjRule); - - } - - private static VoObjControlRule convert2VoObjControlRule(VoObjectControlRuleDef ruleDef, GspViewObject voObject) { - - VoObjControlRule objRule = new VoObjControlRule(); - ControlRuleConvertor.convert2ControlRule(ruleDef, objRule, voObject); - - dealChildObjs(ruleDef, objRule, voObject); - - VoFieldControlRuleDef elementRuleDef = (VoFieldControlRuleDef) ruleDef.getChildControlRules().get(CommonModelNames.Element); - dealElement(elementRuleDef, objRule, voObject); - - return objRule; - } - - private static void dealChildObjs(VoObjectControlRuleDef ruleDef, VoObjControlRule objRule, GspViewObject voObject) { - var childObjs = voObject.getContainChildObjects(); - if (childObjs == null || childObjs.size() < 1) - return; - objRule.getChildRules().put(CommonModelNames.ChildObject, new HashMap<>()); - - for (var childObj : childObjs) { - VoObjControlRule childRule = convert2VoObjControlRule(ruleDef, (GspViewObject) childObj); - objRule.getChildRules().get(CommonModelNames.ChildObject).put(childObj.getID(), childRule); - } - } - - private static void dealElement(VoFieldControlRuleDef ruleDef, VoObjControlRule objRule, GspViewObject voObject) { - var elements = voObject.getContainElements(); - if (elements == null || elements.size() < 1) - return; - objRule.getChildRules().put(CommonModelNames.Element, new HashMap<>()); - - for (var element : elements) { - VoFeildControlRule fieldRule = new VoFeildControlRule(); - ControlRuleConvertor.convert2ControlRule(ruleDef, fieldRule, element); - objRule.getChildRules().get(CommonModelNames.Element).put(element.getID(), fieldRule); - } - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoModelRuleConvertor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoModelRuleConvertor.java new file mode 100644 index 0000000..00d8669 --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/convert/VoModelRuleConvertor.java @@ -0,0 +1,73 @@ +package com.inspur.edp.formserver.viewmodel.controlrule.rule.convert; + +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.basic.convert.ControlRuleConvertor; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonObjectRule; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonElementRule; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonObjectRuleDef; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonElementRuleDef; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonModelRuleDef; +import com.inspur.edp.formserver.viewmodel.GspViewModel; +import com.inspur.edp.formserver.viewmodel.GspViewObject; +import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoModelRule; +import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoModelRuleDef; +import lombok.var; + +public class VoModelRuleConvertor extends ControlRuleConvertor { + + private static final VoModelRuleConvertor INSTANCE = new VoModelRuleConvertor(); + + public static VoModelRule convert2ControlRule(VoModelRuleDef ruleDef, GspViewModel vo) { + return INSTANCE.doConvert(ruleDef, vo); + } + + private VoModelRule doConvert(VoModelRuleDef ruleDef, GspViewModel vo) { + VoModelRule rule = new VoModelRule(); + convertModelRule(ruleDef, rule); + CommonObjectRule mainObjRule = convert2CommonObjectRule(ruleDef.getMainObjectRuleDef(), vo.getMainObject()); + rule.setMainObjectRule(mainObjRule); + return rule; + } + + private CommonObjectRule convert2CommonObjectRule(CommonObjectRuleDef ruleDef, GspViewObject voObject) { + CommonObjectRule objRule = new CommonObjectRule(); + convertObjectRule(ruleDef, objRule); + dealChildObjs(ruleDef, objRule, voObject); + dealElement(ruleDef, objRule, voObject); + return objRule; + } + + private void dealChildObjs(CommonObjectRuleDef ruleDef, CommonObjectRule objRule, GspViewObject voObject) { + var childObjs = voObject.getContainChildObjects(); + if (childObjs == null || childObjs.size() < 1) { + return; + } + for (var childObj : childObjs) { + CommonObjectRule childRule = convert2CommonObjectRule(ruleDef, (GspViewObject) childObj); + objRule.addChildObjectRule(childObj.getID(), childRule); + } + } + + private void dealElement(CommonObjectRuleDef ruleDef, CommonObjectRule objRule, GspViewObject voObject) { + var elements = voObject.getContainElements(); + if (elements == null || elements.size() < 1) { + return; + } + CommonElementRuleDef elementRuleDef = (CommonElementRuleDef) ruleDef.getElementRuleDef(); + for (var element : elements) { + CommonElementRule elementRule = new CommonElementRule(); + convertElementRule(elementRuleDef, elementRule); + objRule.addElementRule(element.getID(), elementRule); + } + } + + @Override + public void convertModelRule(CommonModelRuleDef def, com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonModelRule rule) { + super.convertModelRule(def, rule); + VoModelRuleDef voDef = (VoModelRuleDef) def; + VoModelRule voRule = (VoModelRule) rule; + voRule.setAddCustomActionRule(convert(voDef.getAddCustomActionRuleDef())); + voRule.setModifyCustomActionRule(convert(voDef.getModifyCustomActionRuleDef())); + voRule.setAddHelpConfigRule(convert(voDef.getAddHelpConfigRuleDef())); + voRule.setModifyHelpConfigRule(convert(voDef.getModifyHelpConfigRuleDef())); + } +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoControlRuleParser.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoControlRuleParser.java deleted file mode 100644 index 5f967de..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoControlRuleParser.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.parser; - -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.inspur.edp.das.commonmodel.controlrule.CmControlRule; -import com.inspur.edp.das.commonmodel.controlrule.parser.CmControlRuleParser; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoControlRule; - -public class VoControlRuleParser extends CmControlRuleParser { - - @Override - protected JsonDeserializer getChildDeserializer(String childTypeName) { - return new VoObjectControlRuleParser(); - } - - @Override - protected CmControlRule createCmRule() { - return new VoControlRule(); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoFieldRuleParser.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoFieldRuleParser.java deleted file mode 100644 index 46b7993..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoFieldRuleParser.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.parser; - -import com.inspur.edp.das.commonmodel.controlrule.CmFieldControlRule; -import com.inspur.edp.das.commonmodel.controlrule.parser.CmFieldRuleParser; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoFeildControlRule; - -public class VoFieldRuleParser extends CmFieldRuleParser { - - protected CmFieldControlRule createCmFieldRuleDefinition() { - return new VoFeildControlRule(); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoObjectControlRuleParser.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoObjectControlRuleParser.java deleted file mode 100644 index 50dc0e7..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/parser/VoObjectControlRuleParser.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.parser; - -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.inspur.edp.das.commonmodel.controlrule.CmEntityControlRule; -import com.inspur.edp.das.commonmodel.controlrule.parser.CmEntityControlRuleParser; -import com.inspur.edp.das.commonmodel.json.CommonModelNames; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoObjControlRule; - -public class VoObjectControlRuleParser extends CmEntityControlRuleParser { - - protected JsonDeserializer getChildDeserializer(String childTypeName) { - switch (childTypeName) { - case CommonModelNames.ChildObject: - return new VoObjectControlRuleParser(); - case CommonModelNames.Element: - return new VoFieldRuleParser(); - } - return null; - } - - @Override - protected CmEntityControlRule createCmEntityRule() { - return new VoObjControlRule(); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoFieldControlRuleSerializer.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoFieldControlRuleSerializer.java deleted file mode 100644 index 2e6922d..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoFieldControlRuleSerializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.serializer; - -import com.inspur.edp.das.commonmodel.controlrule.serializer.CmFieldControlRuleSerializer; - -public class VoFieldControlRuleSerializer extends CmFieldControlRuleSerializer { -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoObjectControlRuleSerializer.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoObjectControlRuleSerializer.java deleted file mode 100644 index 0be8ff0..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoObjectControlRuleSerializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.serializer; - -import com.inspur.edp.das.commonmodel.controlrule.serializer.CmEntityControlRuleSerializer; - -public class VoObjectControlRuleSerializer extends CmEntityControlRuleSerializer { -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoRuleSerializer.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoRuleSerializer.java deleted file mode 100644 index 5568543..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/rule/serializer/VoRuleSerializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.rule.serializer; - -import com.inspur.edp.das.commonmodel.controlrule.serializer.CmRuleSerializer; - -public class VoRuleSerializer extends CmRuleSerializer { -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java deleted file mode 100644 index 6a3c47e..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDef.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefItem; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmControlRuleDef; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmRuleNames; -import com.inspur.edp.das.commonmodel.json.CommonModelNames; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.parser.VoControlRuleDefParser; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.serializer.VoControlRuleDefSerializer; -import com.inspur.edp.formserver.viewmodel.i18n.VMI8nResourceUtil; -import com.inspur.edp.formserver.viewmodel.i18n.names.VoResourceKeyNames; - -@JsonSerialize(using = VoControlRuleDefSerializer.class) -@JsonDeserialize(using = VoControlRuleDefParser.class) -public class VoControlRuleDef extends CmControlRuleDef { - public VoControlRuleDef() { - super(null, VoControlRuleDefNames.VoControlRuleObjectType); - init(); - } - - private void init() { - - ControlRuleDefItem nameRule = new ControlRuleDefItem() { - { - this.setRuleName(CmRuleNames.Name); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_NAME)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_NAME_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Allow); - } - }; - setNameControlRule(nameRule); - -// setUsingTimeStampControlRule(); - - ControlRuleDefItem addActionRule = new ControlRuleDefItem() { - { - this.setRuleName(VoControlRuleDefNames.AddCustomAction); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_ADD_CUSTOM_ACTION)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_ADD_CUSTOM_ACTION_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setAddCustomActonControlRule(addActionRule); - - ControlRuleDefItem modifyActionRule = new ControlRuleDefItem() { - { - this.setRuleName(VoControlRuleDefNames.ModifyCustomActions); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setModifyCustomActonControlRule(modifyActionRule); - - ControlRuleDefItem addVarRule = new ControlRuleDefItem() { - { - this.setRuleName(VoControlRuleDefNames.AddVariableDtm); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_ADD_VARIABLE)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_ADD_VARIABLE_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setAddVariableDtmControlRule(addVarRule); - - ControlRuleDefItem modifyVarRule = new ControlRuleDefItem() { - { - this.setRuleName(VoControlRuleDefNames.ModifyVariableDtm); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_MODIFY_VARIABLE)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_VIEWMODEL_MODIFY_VARIABLE_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setModifyVariableDtmControlRule(modifyVarRule); - - VoObjectControlRuleDef objectRuleDef = new VoObjectControlRuleDef(this); - getChildControlRules().put(CommonModelNames.MainObject, objectRuleDef); - - } - - public ControlRuleDefItem getAddCustomActonControlRule() { - return super.getControlRuleItem(VoControlRuleDefNames.AddCustomAction); - } - - public void setAddCustomActonControlRule(ControlRuleDefItem ruleItem) { - super.setControlRuleItem(VoControlRuleDefNames.AddCustomAction, ruleItem); - } - - public ControlRuleDefItem getModifyCustomActonControlRule() { - return super.getControlRuleItem(VoControlRuleDefNames.ModifyCustomActions); - } - - public void setModifyCustomActonControlRule(ControlRuleDefItem ruleItem) { - super.setControlRuleItem(VoControlRuleDefNames.ModifyCustomActions, ruleItem); - } - - public ControlRuleDefItem getAddVariableDtmControlRule() { - return super.getControlRuleItem(VoControlRuleDefNames.AddVariableDtm); - } - - public void setAddVariableDtmControlRule(ControlRuleDefItem ruleItem) { - super.setControlRuleItem(VoControlRuleDefNames.AddVariableDtm, ruleItem); - } - - public ControlRuleDefItem getModifyVariableDtmControlRule() { - return super.getControlRuleItem(VoControlRuleDefNames.ModifyVariableDtm); - } - - public void setModifyVariableDtmControlRule(ControlRuleDefItem ruleItem) { - super.setControlRuleItem(VoControlRuleDefNames.ModifyVariableDtm, ruleItem); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDefNames.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDefNames.java deleted file mode 100644 index 364e397..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoControlRuleDefNames.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; - -public class VoControlRuleDefNames { - public static String VoControlRuleObjectType = "GspViewModel"; - public static String AddCustomAction = "AddCustomAction"; - public static String AddVariableDtm = "AddVariableDtm"; - public static String ModifyCustomActions = "ModifyCustomActions"; - public static String ModifyVariableDtm = "ModifyVariableDtm"; - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoElementRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoElementRuleDef.java new file mode 100644 index 0000000..98e5ae6 --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoElementRuleDef.java @@ -0,0 +1,74 @@ +package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; + +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonElementRuleDef; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonElementRuleNames; + +public class VoElementRuleDef extends CommonElementRuleDef { + + private VoElementRuleDef() { + super(); + } + + /** + * 完整初始化：全量配置所有 Allow / Forbidden 项。 + * + *

Name、Length、DefaultValue、CustomizeRef、IsDefaultNull 为 Allow； + * Precision、Required、ContainEnumValues、IsPersistent、Encryption 为 Forbidden。

+ */ + public static VoElementRuleDef create() { + VoElementRuleDef def = new VoElementRuleDef(); + // Name 规则用层级专属 ruleName（ElementName），使派生的 description key 与 Model/Object 层区分 + def.setNameRuleDef(new VoRuleDefItem(CommonElementRuleNames.ElementName, ControlRuleValue.Allow)); + + def.setLengthRuleDef(new VoRuleDefItem(CommonElementRuleNames.Length, ControlRuleValue.Allow)); + + def.setPrecisionRuleDef(new VoRuleDefItem(CommonElementRuleNames.Precision, ControlRuleValue.Forbidden)); + + def.setDefaultValueRuleDef(new VoRuleDefItem(CommonElementRuleNames.DefaultValue, ControlRuleValue.Allow)); + + def.setRequiredRuleDef(new VoRuleDefItem(CommonElementRuleNames.Required, ControlRuleValue.Forbidden)); + + def.setContainEnumValuesRuleDef(new VoRuleDefItem(CommonElementRuleNames.ContainEnumValues, ControlRuleValue.Forbidden)); + + def.setIsPersistentRuleDef(new VoRuleDefItem(CommonElementRuleNames.IsPersistent, ControlRuleValue.Forbidden)); + + def.setCustomizeRefRuleDef(new VoRuleDefItem(CommonElementRuleNames.CustomizeRef, ControlRuleValue.Allow)); + + def.setEncryptionRuleDef(new VoRuleDefItem(CommonElementRuleNames.Encryption, ControlRuleValue.Forbidden)); + + def.setIsDefaultNullRuleDef(new VoRuleDefItem(CommonElementRuleNames.IsDefaultNull, ControlRuleValue.Allow)); + + return def; + } + + /** + * 旧版识别范围冻结快照：只显式配置 Allow 项，Forbidden 项留 null。 + * + *

null 项由 {@code ControlRuleConvertor.convert(null)} 在运行时解析为 Forbidden， + * 与 {@link #create()} 经 convert 后产生完全一致的 rule 判定结果。

+ * + *

为什么需要这个方法

+ *

历史识别范围是"扩展可覆写哪些属性"。为支持后续扩大识别范围（新增 Allow 项）， + * 存量扩展元数据中的旧基础值会被误判为"扩展定制内容"而错误保留。 + * 此方法冻结历史时点的 Allow 项集合，供当前及将来同步遇到历史数据时判定变更范围， + * 避免上述误判。

+ * + *

维护约束

+ *

此方法独立于 {@link #create()}，后续规则演进只修改 {@code create()}，不得修改本方法。 + * 本方法是历史数据的"识别范围标尺"，任何修改都会导致误判历史产物。

+ * + *

与 BE 侧的差异

+ *

DefaultValue 在 VO 侧为 Allow（BE 侧为 Forbidden），createFrozen() 须显式配置此项。

+ */ + public static VoElementRuleDef createFrozen() { + VoElementRuleDef def = new VoElementRuleDef(); + // Allow 项（含 VO 侧独有的 DefaultValue=Allow） + def.setNameRuleDef(new VoRuleDefItem(CommonElementRuleNames.ElementName, ControlRuleValue.Allow)); + def.setLengthRuleDef(new VoRuleDefItem(CommonElementRuleNames.Length, ControlRuleValue.Allow)); + def.setDefaultValueRuleDef(new VoRuleDefItem(CommonElementRuleNames.DefaultValue, ControlRuleValue.Allow)); + def.setCustomizeRefRuleDef(new VoRuleDefItem(CommonElementRuleNames.CustomizeRef, ControlRuleValue.Allow)); + def.setIsDefaultNullRuleDef(new VoRuleDefItem(CommonElementRuleNames.IsDefaultNull, ControlRuleValue.Allow)); + return def; + } +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleDef.java deleted file mode 100644 index 1a37831..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleDef.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefItem; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefinition; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonFieldRuleNames; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmFieldControlRuleDef; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmRuleNames; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.parser.VoFieldControlRuleDefParser; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.serializer.VoFieldControlRuleDefSerializer; -import com.inspur.edp.formserver.viewmodel.i18n.VMI8nResourceUtil; -import com.inspur.edp.formserver.viewmodel.i18n.names.VoResourceKeyNames; - -@JsonSerialize(using = VoFieldControlRuleDefSerializer.class) -@JsonDeserialize(using = VoFieldControlRuleDefParser.class) -public class VoFieldControlRuleDef extends CmFieldControlRuleDef { - public VoFieldControlRuleDef(ControlRuleDefinition parentRuleDefinition) { - super(parentRuleDefinition); - super.setRuleObjectType(VoFieldControlRuleNames.VoFieldRuleObjectType); - init(); - } - - private void init() { - ControlRuleDefItem nameRule = new ControlRuleDefItem() { - { - this.setRuleName(CmRuleNames.Name); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_NAME)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_NAME_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Allow); - } - }; - setNameControlRule(nameRule); - - ControlRuleDefItem lengthRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonFieldRuleNames.Length); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_LENGTH)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_LENGTH_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setLengthControlRule(lengthRule); - - ControlRuleDefItem precisionRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonFieldRuleNames.Precision); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_PRECISION)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_PRECISION_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setPrecisionControlRule(precisionRule); - - ControlRuleDefItem defaultValueRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonFieldRuleNames.DefaultValue); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_DEFAULTVALUE)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_DEFAULTVALUE_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Allow); - } - }; - setDefaultValueControlRule(defaultValueRule); - - ControlRuleDefItem multiLanRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonFieldRuleNames.MultiLanField); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_MULTILANGUAGE)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_MULTILANGUAGE_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setMultiLanFieldControlRule(multiLanRule); - - ControlRuleDefItem readonlyRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonFieldRuleNames.Readonly); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_READONLY)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_READONLY_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setReadonlyControlRule(readonlyRule); - - ControlRuleDefItem requiredRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonFieldRuleNames.Required); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_REQUIRED)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_FIELD_REQUIRED_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setRequiredControlRule(requiredRule); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleNames.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleNames.java deleted file mode 100644 index d9dbd0f..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoFieldControlRuleNames.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; - -public class VoFieldControlRuleNames { - public static String VoFieldRuleObjectType = "GspViewElement"; - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDef.java new file mode 100644 index 0000000..fdd662f --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDef.java @@ -0,0 +1,82 @@ +/* + * 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.controlrule.ruledefine; + +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefItem; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonModelRuleDef; +import com.inspur.edp.das.commonmodel.controlruledef.entity.CommonModelRuleNames; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class VoModelRuleDef extends CommonModelRuleDef { + private ControlRuleDefItem addCustomActionRuleDef; + private ControlRuleDefItem modifyCustomActionRuleDef; + private ControlRuleDefItem addHelpConfigRuleDef; + private ControlRuleDefItem modifyHelpConfigRuleDef; + + private VoModelRuleDef() { + super(); + } + + /** + * 完整初始化：全量配置所有 Allow / Forbidden 项，级联 {@link VoObjectRuleDef#create()}。 + * + *

VO 侧独有 addHelpConfig / modifyHelpConfig（Allow），无 BE 侧的 Dtm/Val 扩展。

+ */ + public static VoModelRuleDef create() { + VoModelRuleDef def = new VoModelRuleDef(); + + // Name 规则用层级专属 ruleName（ModelName），使派生的 description key 与 Object/Element 层区分 + def.setNameRuleDef(new VoRuleDefItem(CommonModelRuleNames.ModelName, ControlRuleValue.Allow)); + + def.setAddCustomActionRuleDef(new VoRuleDefItem(VoModelRuleDefNames.AddCustomAction, ControlRuleValue.Forbidden)); + + def.setModifyCustomActionRuleDef(new VoRuleDefItem(VoModelRuleDefNames.ModifyCustomAction, ControlRuleValue.Forbidden)); + + def.setAddHelpConfigRuleDef(new VoRuleDefItem(VoModelRuleDefNames.AddHelpConfig, ControlRuleValue.Allow)); + + def.setModifyHelpConfigRuleDef(new VoRuleDefItem(VoModelRuleDefNames.ModifyHelpConfig, ControlRuleValue.Allow)); + + def.setMainObjectRuleDef(VoObjectRuleDef.create()); + + return def; + } + + /** + * 旧版识别范围冻结快照：只显式配置 Allow 项，Forbidden 项留 null， + * 级联 {@link VoObjectRuleDef#createFrozen()}。 + * + *

VO 侧 Allow 项：Name + AddHelpConfig + ModifyHelpConfig。

+ * + *

维护约束：后续规则演进只修改 {@link #create()}，不得修改本方法。

+ */ + public static VoModelRuleDef createFrozen() { + VoModelRuleDef def = new VoModelRuleDef(); + def.setNameRuleDef(new VoRuleDefItem(CommonModelRuleNames.ModelName, ControlRuleValue.Allow)); + def.setAddHelpConfigRuleDef(new VoRuleDefItem(VoModelRuleDefNames.AddHelpConfig, ControlRuleValue.Allow)); + def.setModifyHelpConfigRuleDef(new VoRuleDefItem(VoModelRuleDefNames.ModifyHelpConfig, ControlRuleValue.Allow)); + def.setMainObjectRuleDef(VoObjectRuleDef.createFrozen()); + return def; + } + + public VoObjectRuleDef getMainObjectRuleDef() { + return (VoObjectRuleDef) super.getMainObjectRuleDef(); + } +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDefNames.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDefNames.java new file mode 100644 index 0000000..e84502d --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoModelRuleDefNames.java @@ -0,0 +1,25 @@ +/* + * 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.controlrule.ruledefine; + +public class VoModelRuleDefNames { + public static String AddCustomAction = "RULE_MODEL_ADD_CUSTOM_ACTION"; + public static String ModifyCustomAction = "RULE_MODEL_MODIFY_CUSTOM_ACTION"; + public static String AddHelpConfig = "RULE_MODEL_ADD_HELP_CONFIG"; + public static String ModifyHelpConfig = "RULE_MODEL_MODIFY_HELP_CONFIG"; + +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectControlRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectControlRuleDef.java deleted file mode 100644 index a5e3948..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectControlRuleDef.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefItem; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefinition; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; -import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonDataTypeRuleNames; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmEntityControlRuleDef; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmEntityRuleNames; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmRuleNames; -import com.inspur.edp.das.commonmodel.json.CommonModelNames; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.parser.VoObjectControlRuleDefParser; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.serializer.VoObjectControlRuleDefSerializer; -import com.inspur.edp.formserver.viewmodel.i18n.VMI8nResourceUtil; -import com.inspur.edp.formserver.viewmodel.i18n.names.VoResourceKeyNames; - -@JsonSerialize(using = VoObjectControlRuleDefSerializer.class) -@JsonDeserialize(using = VoObjectControlRuleDefParser.class) -public class VoObjectControlRuleDef extends CmEntityControlRuleDef { - public VoObjectControlRuleDef(ControlRuleDefinition parentRuleDefinition) { - super(parentRuleDefinition); - super.setRuleObjectType(VoObjectRuleDefNames.VoObjectRuleObjectType); - init(); - } - - private void init() { - - ControlRuleDefItem nameRule = new ControlRuleDefItem() { - { - this.setRuleName(CmRuleNames.Name); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_NAME)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_NAME_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Allow); - } - }; - setNameControlRule(nameRule); - - ControlRuleDefItem addChildEntityRule = new ControlRuleDefItem() { - { - this.setRuleName(CmEntityRuleNames.AddChildEntity); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_ADD_CHILD_ENTITY)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_ADD_CHILD_ENTITY_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Allow); - } - }; - setAddChildEntityControlRule(addChildEntityRule); - - ControlRuleDefItem modifyChildEntityRule = new ControlRuleDefItem() { - { - this.setRuleName(CmEntityRuleNames.ModifyChildEntities); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_MODIFY_CHILD_ENTITY)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_MODIFY_CHILD_ENTITY_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setModifyChildEntitiesControlRule(modifyChildEntityRule); - - ControlRuleDefItem addElementRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonDataTypeRuleNames.AddField); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_ADD_FIELD)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_ADD_FIELD_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Allow); - } - }; - setAddFieldControlRule(addElementRule); - - ControlRuleDefItem modifyElementRule = new ControlRuleDefItem() { - { - this.setRuleName(CommonDataTypeRuleNames.ModifyFields); - this.setRuleDisplayName(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_MODIFY_FIELD)); - this.setDescription(VMI8nResourceUtil.getMessage(VoResourceKeyNames.RULE_OBJECT_MODIFY_FIELD_DESCRIPTION)); - this.setDefaultRuleValue(ControlRuleValue.Forbiddon); - } - }; - setModifyFieldsControlRule(modifyElementRule); - - VoFieldControlRuleDef fieldRuleDef = new VoFieldControlRuleDef(this); - getChildControlRules().put(CommonModelNames.Element, fieldRuleDef); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDef.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDef.java new file mode 100644 index 0000000..839830f --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDef.java @@ -0,0 +1,51 @@ +package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; + +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonObjectRuleDef; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.cm.CommonObjectRuleNames; + +public class VoObjectRuleDef extends CommonObjectRuleDef { + + private VoObjectRuleDef() { + super(); + } + + /** + * 完整初始化：全量配置所有 Allow / Forbidden 项，级联 {@link VoElementRuleDef#create()}。 + * + *

VO 侧无 BE 侧独有的 addDetermination / addValidation 规则。

+ */ + public static VoObjectRuleDef create() { + VoObjectRuleDef def = new VoObjectRuleDef(); + + // Name 规则用层级专属 ruleName（ObjectName），使派生的 description key 与 Model/Element 层区分 + def.setNameRuleDef(new VoRuleDefItem(CommonObjectRuleNames.ObjectName, ControlRuleValue.Allow)); + + def.setAddChildObjectRuleDef(new VoRuleDefItem(CommonObjectRuleNames.AddChildObject, ControlRuleValue.Allow)); + + def.setAddElementRuleDef(new VoRuleDefItem(CommonObjectRuleNames.AddElement, ControlRuleValue.Allow)); + + def.setDeleteElementRuleDef(new VoRuleDefItem(CommonObjectRuleNames.DeleteElement, ControlRuleValue.Forbidden)); + + def.setDeleteChildObjectRuleDef(new VoRuleDefItem(CommonObjectRuleNames.DeleteChildObject, ControlRuleValue.Forbidden)); + + def.setElementRuleDef(VoElementRuleDef.create()); + return def; + } + + /** + * 旧版识别范围冻结快照：只显式配置 Allow 项，Forbidden 项留 null， + * 级联 {@link VoElementRuleDef#createFrozen()}。 + * + *

维护约束：后续规则演进只修改 {@link #create()}，不得修改本方法。

+ */ + public static VoObjectRuleDef createFrozen() { + VoObjectRuleDef def = new VoObjectRuleDef(); + + def.setNameRuleDef(new VoRuleDefItem(CommonObjectRuleNames.ObjectName, ControlRuleValue.Allow)); + def.setAddChildObjectRuleDef(new VoRuleDefItem(CommonObjectRuleNames.AddChildObject, ControlRuleValue.Allow)); + def.setAddElementRuleDef(new VoRuleDefItem(CommonObjectRuleNames.AddElement, ControlRuleValue.Allow)); + def.setElementRuleDef(VoElementRuleDef.createFrozen()); + return def; + } +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDefNames.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDefNames.java deleted file mode 100644 index e0eeaae..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoObjectRuleDefNames.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; - -public class VoObjectRuleDefNames { - public static String VoObjectRuleObjectType = "GspViewObject"; -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoRuleDefItem.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoRuleDefItem.java new file mode 100644 index 0000000..8a33d6d --- /dev/null +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/VoRuleDefItem.java @@ -0,0 +1,22 @@ +package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine; + +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleDefItem; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlruledef.basic.entity.ControlRuleValue; +import com.inspur.edp.formserver.viewmodel.i18n.VMI8nResourceUtil; + +/** + * VO 侧 ControlRuleDefItem 子类：由 ruleName 推导国际化资源 key 并用 + * {@link VMI8nResourceUtil} 解析后，委托父类的四参值对象构造器。 + *

+ * displayName key = ruleName，description key = ruleName + "_DESCRIPTION"。 + */ +public class VoRuleDefItem extends ControlRuleDefItem { + private static final String DESCRIPTION_SUFFIX = "_DESCRIPTION"; + + public VoRuleDefItem(String ruleName, ControlRuleValue defaultRuleValue) { + super(ruleName, + VMI8nResourceUtil.getMessage(ruleName), + VMI8nResourceUtil.getMessage(ruleName + DESCRIPTION_SUFFIX), + defaultRuleValue); + } +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoControlRuleDefParser.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoControlRuleDefParser.java deleted file mode 100644 index f963543..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoControlRuleDefParser.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.parser; - -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmControlRuleDef; -import com.inspur.edp.das.commonmodel.controlruledef.parser.CmRuleDefParser; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoControlRuleDef; - -public class VoControlRuleDefParser extends CmRuleDefParser { - @Override - protected final CmControlRuleDef createCmRuleDef() { - return new VoControlRuleDef(); - } - -// protected Class getChildTypes(String childTypeName) { -// return BeEntityControlRuleDef.class; -// } - - @Override - protected JsonDeserializer getChildDeserializer(String childTypeName) { - return new VoObjectControlRuleDefParser(); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoFieldControlRuleDefParser.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoFieldControlRuleDefParser.java deleted file mode 100644 index b219efd..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoFieldControlRuleDefParser.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.parser; - -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmFieldControlRuleDef; -import com.inspur.edp.das.commonmodel.controlruledef.parser.CmFieldRuleDefParser; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoFieldControlRuleDef; - -public class VoFieldControlRuleDefParser extends CmFieldRuleDefParser { - @Override - protected final CmFieldControlRuleDef createCmFieldRuleDefinition() { - return new VoFieldControlRuleDef(null); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoObjectControlRuleDefParser.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoObjectControlRuleDefParser.java deleted file mode 100644 index 465fa35..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/parser/VoObjectControlRuleDefParser.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.parser; - -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmEntityControlRuleDef; -import com.inspur.edp.das.commonmodel.controlruledef.parser.CmEntityControlRuleDefParser; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoObjectControlRuleDef; - -public class VoObjectControlRuleDefParser extends CmEntityControlRuleDefParser { - - @Override - protected final CmEntityControlRuleDef createCmEntityRuleDef() { - return new VoObjectControlRuleDef(null); - } - - @Override - protected JsonDeserializer getChildDeserializer(String childTypeName) { - return new VoFieldControlRuleDefParser(); - } - -} - diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoControlRuleDefSerializer.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoControlRuleDefSerializer.java deleted file mode 100644 index f293730..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoControlRuleDefSerializer.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.inspur.edp.das.commonmodel.controlruledef.serializer.CmRuleDefSerializer; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoControlRuleDef; - -public class VoControlRuleDefSerializer extends CmRuleDefSerializer { - - @Override - protected final void writeCmRuleExtendInfos(T controlRuleDefinition, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) { - super.writeCmRuleExtendInfos(controlRuleDefinition, jsonGenerator, serializerProvider); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoFieldControlRuleDefSerializer.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoFieldControlRuleDefSerializer.java deleted file mode 100644 index dd5fcac..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoFieldControlRuleDefSerializer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.inspur.edp.das.commonmodel.controlruledef.serializer.CmFieldControlRuleDefSerializer; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoFieldControlRuleDef; - -public class VoFieldControlRuleDefSerializer extends CmFieldControlRuleDefSerializer { - - protected void writeCmFieldRuleExtendInfos(T controlRuleDefinition, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) { - - super.writeCmFieldRuleExtendInfos(controlRuleDefinition, jsonGenerator, serializerProvider); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoObjectControlRuleDefSerializer.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoObjectControlRuleDefSerializer.java deleted file mode 100644 index 713815e..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/controlrule/ruledefine/serializer/VoObjectControlRuleDefSerializer.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.inspur.edp.das.commonmodel.controlruledef.serializer.CmEntityControlRuleDefSerializer; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoObjectControlRuleDef; - -public class VoObjectControlRuleDefSerializer extends CmEntityControlRuleDefSerializer { - - @Override - protected final void writeCmEntityRuleExtendInfos(T controlRuleDefinition, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) { - super.writeCmEntityRuleExtendInfos(controlRuleDefinition, jsonGenerator, serializerProvider); - } - -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/VMI8nResourceUtil.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/VMI8nResourceUtil.java index 0370777..a42cc53 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/VMI8nResourceUtil.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/VMI8nResourceUtil.java @@ -29,6 +29,9 @@ public class VMI8nResourceUtil { public static String getResourceValue(String su, String resourceFile, String key) { ResourceLocalizer localizer = SpringBeanUtils.getBean(ResourceLocalizer.class); + if (localizer == null) { + return key; + } return localizer.getString(key, resourceFile, su, ""); } diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/names/VoResourceKeyNames.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/names/VoResourceKeyNames.java index cce416c..1f02d34 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/names/VoResourceKeyNames.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/i18n/names/VoResourceKeyNames.java @@ -23,144 +23,8 @@ public enum VoResourceKeyNames { * 视图对象 */ VIEWMODEL, - /** - * 名称 - */ - RULE_FIELD_NAME, - /** - * 字段名称 - */ - RULE_FIELD_NAME_DESCRIPTION, - /** - * 长度 - */ - RULE_FIELD_LENGTH, - /** - * 字段长度 - */ - RULE_FIELD_LENGTH_DESCRIPTION, - /** - * 精度 - */ - RULE_FIELD_PRECISION, - /** - * 字段精度 - */ - RULE_FIELD_PRECISION_DESCRIPTION, - /** - * 默认值 - */ - RULE_FIELD_DEFAULTVALUE, - /** - * 字段默认值 - */ - RULE_FIELD_DEFAULTVALUE_DESCRIPTION, - /** - * 是否多语 - */ - RULE_FIELD_MULTILANGUAGE, - /** - * 字段多语设置 - */ - RULE_FIELD_MULTILANGUAGE_DESCRIPTION, - /** - * 是否只读 - */ - RULE_FIELD_READONLY, - /** - * 字段只读设置 - */ - RULE_FIELD_READONLY_DESCRIPTION, - /** - * 是否必填 - */ - RULE_FIELD_REQUIRED, - /** - * 名称 - */ - RULE_VIEWMODEL_NAME, - /** - * 实体名称 - */ - RULE_VIEWMODEL_NAME_DESCRIPTION, - /** - * 添加自定义动作 - */ - RULE_VIEWMODEL_ADD_CUSTOM_ACTION, - /** - * 添加自定义动作 - */ - RULE_VIEWMODEL_ADD_CUSTOM_ACTION_DESCRIPTION, - /** - * 修改自定义动作 - */ - RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION, - /** - * 修改自定义动作 - */ - RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION_DESCRIPTION, - /** - * 添加自定义变量 - */ - RULE_VIEWMODEL_ADD_VARIABLE, - /** - * 添加自定义变量 - */ - RULE_VIEWMODEL_ADD_VARIABLE_DESCRIPTION, - /** - * 修改自定义变量 - */ - RULE_VIEWMODEL_MODIFY_VARIABLE, - /** - * 修改自定义变量 - */ - RULE_VIEWMODEL_MODIFY_VARIABLE_DESCRIPTION, - /** - * 名称 - */ - RULE_OBJECT_NAME, - /** - * 节点名称 - */ - RULE_OBJECT_NAME_DESCRIPTION, - /** - * 添加子节点 - */ - RULE_OBJECT_ADD_CHILD_ENTITY, - /** - * 添加子节点 - */ - RULE_OBJECT_ADD_CHILD_ENTITY_DESCRIPTION, - /** - * 修改子节点信息 - */ - RULE_OBJECT_MODIFY_CHILD_ENTITY, - /** - * 修改子节点信息 - */ - RULE_OBJECT_MODIFY_CHILD_ENTITY_DESCRIPTION, - /** - * 添加字段 - */ - RULE_OBJECT_ADD_FIELD, - /** - * 添加字段 - */ - RULE_OBJECT_ADD_FIELD_DESCRIPTION, - /** - * 修改字段信息 - */ - RULE_OBJECT_MODIFY_FIELD, - /** - * 修改字段信息 - */ - RULE_OBJECT_MODIFY_FIELD_DESCRIPTION, - /** - * 字段必填设置 - */ - RULE_FIELD_REQUIRED_DESCRIPTION, /** * 流程实例标识符 */ -- Gitee From 5243ebde1a15fe462197da3e21566f6ec59cb0df Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Wed, 15 Jul 2026 14:45:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20VO=20Extractor/Merger=20?= =?UTF-8?q?=E6=94=B9=E7=94=A8=20isAllow=20=E9=97=A8=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../increment/entity/ModifyHelpIncrement.java | 7 +- .../increment/extract/AddedHelpExtractor.java | 20 ------ .../extract/HelpIncrementExtractor.java | 64 +++++++++++------ .../increment/extract/ViewModelExtractor.java | 55 +++++--------- .../action/ActionIncrementExtractor.java | 52 ++++++++++---- .../extract/action/AddedActionExtractor.java | 20 ------ .../increment/merger/ViewModelMerger.java | 71 ++++++++++--------- 7 files changed, 143 insertions(+), 146 deletions(-) delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/AddedHelpExtractor.java delete mode 100644 view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/AddedActionExtractor.java diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/entity/ModifyHelpIncrement.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/entity/ModifyHelpIncrement.java index 7580131..415ed75 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/entity/ModifyHelpIncrement.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/entity/ModifyHelpIncrement.java @@ -5,6 +5,7 @@ import com.inspur.edp.cef.designtime.api.increment.ModifyIncrement; import com.inspur.edp.cef.designtime.api.increment.property.PropertyIncrement; import com.inspur.edp.formserver.viewmodel.common.ValueHelpConfig; +import javax.annotation.Nonnull; import java.util.HashMap; public class ModifyHelpIncrement extends HelpConfigIncrement implements ModifyIncrement { @@ -17,8 +18,12 @@ public class ModifyHelpIncrement extends HelpConfigIncrement implements ModifyIn } @Override + @Nonnull public HashMap getChangeProperties() { - return null; + if (changeProperties == null) { + changeProperties = new HashMap<>(); + } + return changeProperties; } private ValueHelpConfig helpConfig; diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/AddedHelpExtractor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/AddedHelpExtractor.java deleted file mode 100644 index 551c236..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/AddedHelpExtractor.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.increment.extract; - -import com.inspur.edp.formserver.viewmodel.common.ValueHelpConfig; -import com.inspur.edp.formserver.viewmodel.increment.entity.AddedHelpIncrement; - -public class AddedHelpExtractor { - - public AddedHelpExtractor() { - } - - public AddedHelpIncrement extract(ValueHelpConfig helpConfig) { - AddedHelpIncrement addedEntityIncrement = this.createIncrement(); - addedEntityIncrement.setHelpConfig(helpConfig); - return addedEntityIncrement; - } - - protected AddedHelpIncrement createIncrement() { - return new AddedHelpIncrement(); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/HelpIncrementExtractor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/HelpIncrementExtractor.java index cb3edbc..090c848 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/HelpIncrementExtractor.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/HelpIncrementExtractor.java @@ -1,35 +1,59 @@ +/* + * 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.increment.extract; -import com.inspur.edp.cef.designtime.api.increment.extractor.AbstractIncrementExtractor; -import com.inspur.edp.das.commonmodel.controlrule.CmControlRule; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmControlRuleDef; +import com.inspur.edp.cef.designtime.api.increment.extractor.ExtractUtils; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonModelRule; import com.inspur.edp.formserver.viewmodel.common.ValueHelpConfig; +import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoModelRule; +import com.inspur.edp.formserver.viewmodel.increment.entity.AddedHelpIncrement; import com.inspur.edp.formserver.viewmodel.increment.entity.HelpConfigIncrement; +import com.inspur.edp.formserver.viewmodel.increment.entity.ModifyHelpIncrement; + +import java.util.Objects; -public class HelpIncrementExtractor extends AbstractIncrementExtractor { +public class HelpIncrementExtractor { public HelpIncrementExtractor() { } - public HelpConfigIncrement extractorIncrement(ValueHelpConfig oldHelpConfig, ValueHelpConfig newHelpConfig, CmControlRule rule, CmControlRuleDef def) { + public HelpConfigIncrement extractorIncrement(ValueHelpConfig oldHelpConfig, ValueHelpConfig newHelpConfig, CommonModelRule rule) { if (oldHelpConfig == null && newHelpConfig == null) { return null; - } else if (oldHelpConfig == null && newHelpConfig != null) { - return this.getAddedHelpExtractor().extract(newHelpConfig); - } else { + } else if (oldHelpConfig == null) { + VoModelRule controlRule = (VoModelRule) rule; + if (ExtractUtils.isAllow(controlRule.getAddHelpConfigRule())) { + AddedHelpIncrement addedEntityIncrement = new AddedHelpIncrement(); + addedEntityIncrement.setHelpConfig(newHelpConfig); + return addedEntityIncrement; + } + return null; + } else if (newHelpConfig == null){ return null; -// return (CommonEntityIncrement)(oldHelpConfig != null && newHelpConfig == null ? this.getDeletedEntityExtractor().extract(oldHelpConfig) : this.getModifyEntityExtractor().extract(oldHelpConfig, newHelpConfig, rule, def)); + } else { + VoModelRule controlRule = (VoModelRule) rule; + if (ExtractUtils.isAllow(controlRule.getModifyHelpConfigRule())) { + if (!Objects.equals(oldHelpConfig.getHelperId(), newHelpConfig.getHelperId())) { + ModifyHelpIncrement modifyIncrement = new ModifyHelpIncrement(); + modifyIncrement.setHelpConfig(newHelpConfig); + return modifyIncrement; + } + } } + return null; } - protected AddedHelpExtractor getAddedHelpExtractor() { - return new AddedHelpExtractor(); - } - -// protected DeletedEntityExtractor getDeletedEntityExtractor() { -// return new DeletedEntityExtractor(); -// } - -// protected ModifyEntityExtractor getModifyEntityExtractor() { -// return new ModifyEntityExtractor(); -// } } diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/ViewModelExtractor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/ViewModelExtractor.java index baf6bfa..a310208 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/ViewModelExtractor.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/ViewModelExtractor.java @@ -16,8 +16,7 @@ package com.inspur.edp.formserver.viewmodel.increment.extract; -import com.inspur.edp.das.commonmodel.controlrule.CmControlRule; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmControlRuleDef; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonModelRule; import com.inspur.edp.das.commonmodel.entity.GspCommonModel; import com.inspur.edp.das.commonmodel.entity.increment.CommonModelIncrement; import com.inspur.edp.das.commonmodel.entity.increment.extract.CommonModelExtractor; @@ -25,7 +24,6 @@ import com.inspur.edp.formserver.viewmodel.GspViewModel; import com.inspur.edp.formserver.viewmodel.action.ViewModelAction; import com.inspur.edp.formserver.viewmodel.collection.VMActionCollection; import com.inspur.edp.formserver.viewmodel.increment.ViewModelIncrement; -import com.inspur.edp.formserver.viewmodel.increment.entity.ModifyHelpIncrement; import com.inspur.edp.formserver.viewmodel.increment.extract.action.ActionIncrementExtractor; import lombok.var; @@ -40,11 +38,6 @@ public class ViewModelExtractor extends CommonModelExtractor { public ViewModelExtractor() { super(); } - - public ViewModelExtractor(boolean includeAll) { - super(includeAll); - } - /** * 重写抽取器版本获取方法 * @return 抽取器扩展版本 @@ -55,29 +48,29 @@ public class ViewModelExtractor extends CommonModelExtractor { } @Override - protected void extractExtendInfo(CommonModelIncrement increment, GspCommonModel oldModel, GspCommonModel newModel, CmControlRule rule, CmControlRuleDef def) { - extractViewModelInfo(increment, (GspViewModel) oldModel, (GspViewModel) newModel, rule, def); + protected void extractExtendInfo(CommonModelIncrement increment, GspCommonModel oldModel, GspCommonModel newModel, CommonModelRule rule) { + extractViewModelInfo(increment, (GspViewModel) oldModel, (GspViewModel) newModel, rule); } - private void extractViewModelInfo(CommonModelIncrement increment, GspViewModel oldVo, GspViewModel newVo, CmControlRule rule, CmControlRuleDef def) { - extractHelpConfigs((ViewModelIncrement) increment, oldVo, newVo, rule, def); - extractVoActions((ViewModelIncrement) increment, oldVo, newVo, rule, def); + private void extractViewModelInfo(CommonModelIncrement increment, GspViewModel oldVo, GspViewModel newVo, CommonModelRule rule) { + extractHelpConfigs((ViewModelIncrement) increment, oldVo, newVo, rule); + extractVoActions((ViewModelIncrement) increment, oldVo, newVo, rule); } protected CommonModelIncrement createCommonModelIncrement() { return new ViewModelIncrement(); } - private void extractHelpConfigs(ViewModelIncrement increment, GspViewModel oldVo, GspViewModel newVo, CmControlRule rule, CmControlRuleDef def) { + private void extractHelpConfigs(ViewModelIncrement increment, GspViewModel oldVo, GspViewModel newVo, CommonModelRule rule) { var newHelpConfigs = newVo.getValueHelpConfigs(); var oldHelpConfigs = oldVo.getValueHelpConfigs(); - if (newHelpConfigs.size() < 1 && oldHelpConfigs.size() < 1) + if (newHelpConfigs.size() < 1 && oldHelpConfigs.size() < 1) { return; + } var extractor = new HelpIncrementExtractor(); if (newHelpConfigs.size() < 1) { - //TODO 暂不支持删除帮助 -// extractAllDeleteIncrement(increment, oldObj, extractor, rule, def); + // 设计取舍：当前仅支持帮助配置的新增/修改，不支持删除 return; } @@ -85,46 +78,36 @@ public class ViewModelExtractor extends CommonModelExtractor { for (var newHelpConfig : newHelpConfigs) { var oldHelpConfig = oldHelpConfigs.getItem(newHelpConfig.getElementId()); - if (oldHelpConfig != null) { - if (!oldHelpConfig.getHelperId().equals(newHelpConfig.getHelperId())) { - ModifyHelpIncrement modifyIncrement = new ModifyHelpIncrement(); - modifyIncrement.setHelpConfig(newHelpConfig); - increment.getValueHelpConfigs().put(newHelpConfig.getElementId(), modifyIncrement); - - } else { - //todo 帮助不变，只修改过滤或者帮助前事件 - } + var helpConfigIncrement = extractor.extractorIncrement(oldHelpConfig, newHelpConfig, rule); + if (helpConfigIncrement == null) { continue; } - - var helpConfigIncrement = extractor.extractorIncrement(oldHelpConfig, newHelpConfig, rule, def); - if (helpConfigIncrement == null) - continue; increment.getValueHelpConfigs().put(newHelpConfig.getElementId(), helpConfigIncrement); } } //region merge Action - private void extractVoActions(ViewModelIncrement increment, GspViewModel oldVo, GspViewModel newVo, CmControlRule rule, CmControlRuleDef def) { + private void extractVoActions(ViewModelIncrement increment, GspViewModel oldVo, GspViewModel newVo, CommonModelRule rule) { VMActionCollection oldActions = oldVo.getActions(); VMActionCollection newActions = newVo.getActions(); - if (oldActions.size() < 1 && newActions.size() < 1) + if (oldActions.size() < 1 && newActions.size() < 1) { return; + } if (newActions.size() < 1) { - //TODO 暂不支持删除动作 -// extractAllDeleteIncrement(increment, oldObj, extractor, rule, def); + // 设计取舍：当前仅支持自定义动作的新增/修改，不支持删除 return; } var extractor = new ActionIncrementExtractor(); for (ViewModelAction action : newActions) { ViewModelAction oldAction = oldActions.getItem(action.getID()); - var actionIncrement = extractor.extractorIncrement(oldAction, action, rule, def); - if (actionIncrement == null) + var actionIncrement = extractor.extractorIncrement(oldAction, action, rule); + if (actionIncrement == null) { continue; + } increment.getActions().put(action.getID(), actionIncrement); } } diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/ActionIncrementExtractor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/ActionIncrementExtractor.java index 13ace18..055acb6 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/ActionIncrementExtractor.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/ActionIncrementExtractor.java @@ -1,33 +1,55 @@ +/* + * 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.increment.extract.action; -import com.inspur.edp.cef.designtime.api.increment.extractor.AbstractIncrementExtractor; -import com.inspur.edp.das.commonmodel.controlrule.CmControlRule; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmControlRuleDef; +import com.inspur.edp.cef.designtime.api.increment.extractor.ExtractUtils; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonModelRule; import com.inspur.edp.formserver.viewmodel.action.ViewModelAction; +import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoModelRule; +import com.inspur.edp.formserver.viewmodel.increment.entity.action.AddedVoActionIncrement; import com.inspur.edp.formserver.viewmodel.increment.entity.action.ModifyVoActionIncrement; import com.inspur.edp.formserver.viewmodel.increment.entity.action.VoActionIncrement; -public class ActionIncrementExtractor extends AbstractIncrementExtractor { +public class ActionIncrementExtractor { - public VoActionIncrement extractorIncrement(ViewModelAction oldAction, ViewModelAction newAction, CmControlRule rule, CmControlRuleDef def) { + public VoActionIncrement extractorIncrement(ViewModelAction oldAction, ViewModelAction newAction, CommonModelRule rule) { if (oldAction == null && newAction == null) { return null; } else if (oldAction == null) { - return this.getAddedActionExtractor().extract(newAction); + VoModelRule controlRule = (VoModelRule) rule; + if (ExtractUtils.isAllow(controlRule.getAddCustomActionRule())) { + AddedVoActionIncrement addedEntityIncrement = new AddedVoActionIncrement(); + addedEntityIncrement.setAction(newAction); + return addedEntityIncrement; + } + return null; } else if (newAction == null) { return null; -// return (CommonEntityIncrement)(oldHelpConfig != null && newAction == null ? this.getDeletedEntityExtractor().extract(oldHelpConfig) : this.getModifyEntityExtractor().extract(oldHelpConfig, newAction, rule, def)); } else { - ModifyVoActionIncrement increment = new ModifyVoActionIncrement(); - increment.setActionId(newAction.getID()); - increment.setAction(newAction); - return increment; + VoModelRule controlRule = (VoModelRule) rule; + if (ExtractUtils.isAllow(controlRule.getModifyCustomActionRule())) { + ModifyVoActionIncrement increment = new ModifyVoActionIncrement(); + increment.setActionId(newAction.getID()); + increment.setAction(newAction); + return increment; + } } - } - - protected AddedActionExtractor getAddedActionExtractor() { - return new AddedActionExtractor(); + return null; } } diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/AddedActionExtractor.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/AddedActionExtractor.java deleted file mode 100644 index 3e146c9..0000000 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/extract/action/AddedActionExtractor.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.inspur.edp.formserver.viewmodel.increment.extract.action; - -import com.inspur.edp.formserver.viewmodel.action.ViewModelAction; -import com.inspur.edp.formserver.viewmodel.increment.entity.action.AddedVoActionIncrement; - -public class AddedActionExtractor { - - public AddedActionExtractor() { - } - - public AddedVoActionIncrement extract(ViewModelAction voAction) { - AddedVoActionIncrement addedEntityIncrement = this.createIncrement(); - addedEntityIncrement.setAction(voAction); - return addedEntityIncrement; - } - - protected AddedVoActionIncrement createIncrement() { - return new AddedVoActionIncrement(); - } -} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/merger/ViewModelMerger.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/merger/ViewModelMerger.java index 759a853..3c728cf 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/merger/ViewModelMerger.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/increment/merger/ViewModelMerger.java @@ -1,12 +1,13 @@ package com.inspur.edp.formserver.viewmodel.increment.merger; -import com.inspur.edp.das.commonmodel.controlrule.CmControlRule; -import com.inspur.edp.das.commonmodel.controlruledef.entity.CmControlRuleDef; +import com.inspur.edp.cef.designtime.api.changecontrolrule.controlrule.cm.CommonModelRule; +import com.inspur.edp.cef.designtime.api.increment.merger.MergeUtils; import com.inspur.edp.das.commonmodel.entity.GspCommonModel; import com.inspur.edp.das.commonmodel.entity.increment.CommonModelIncrement; import com.inspur.edp.das.commonmodel.entity.increment.merger.CommonModelMerger; import com.inspur.edp.formserver.viewmodel.GspViewModel; import com.inspur.edp.formserver.viewmodel.common.ValueHelpConfig; +import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoModelRule; import com.inspur.edp.formserver.viewmodel.increment.ViewModelIncrement; import com.inspur.edp.formserver.viewmodel.increment.entity.AddedHelpIncrement; import com.inspur.edp.formserver.viewmodel.increment.entity.HelpConfigIncrement; @@ -17,6 +18,7 @@ import com.inspur.edp.formserver.viewmodel.increment.entity.action.VoActionIncre import lombok.var; import java.util.HashMap; +import java.util.Objects; public class ViewModelMerger extends CommonModelMerger { @@ -24,35 +26,32 @@ public class ViewModelMerger extends CommonModelMerger { super(); } - public ViewModelMerger(boolean includeAll) { - super(includeAll); - } - @Override - protected void mergeExtendInfo(GspCommonModel extendModel, CommonModelIncrement extendIncrement, CommonModelIncrement baseIncrement, CmControlRule rule, CmControlRuleDef def) { - mergeHelp((GspViewModel) extendModel, (ViewModelIncrement) extendIncrement, (ViewModelIncrement) baseIncrement, rule, def); - mergeAction((GspViewModel) extendModel, (ViewModelIncrement) extendIncrement, (ViewModelIncrement) baseIncrement, rule, def); + protected void mergeExtendInfo(GspCommonModel extendModel, CommonModelIncrement extendIncrement, CommonModelIncrement baseIncrement, CommonModelRule rule) { + mergeHelp((GspViewModel) extendModel, (ViewModelIncrement) extendIncrement, (ViewModelIncrement) baseIncrement, rule); + mergeAction((GspViewModel) extendModel, (ViewModelIncrement) extendIncrement, (ViewModelIncrement) baseIncrement, rule); } //region merge help - private void mergeHelp(GspViewModel extendModel, ViewModelIncrement extendIncrement, ViewModelIncrement baseIncrement, CmControlRule rule, CmControlRuleDef def) { + private void mergeHelp(GspViewModel extendModel, ViewModelIncrement extendIncrement, ViewModelIncrement baseIncrement, CommonModelRule rule) { var extendHelpConfigs = extendIncrement.getValueHelpConfigs(); var baseHelpConfigs = baseIncrement.getValueHelpConfigs(); - if (extendHelpConfigs.size() < 1 && baseHelpConfigs.size() < 1) + if (extendHelpConfigs.size() < 1 && baseHelpConfigs.size() < 1) { return; + } for (var helpConfigPair : baseHelpConfigs.entrySet()) { HelpConfigIncrement helpConfigIncrement = helpConfigPair.getValue(); switch (helpConfigIncrement.getIncrementType()) { case Added: - mergeAddedHelp(extendModel, (AddedHelpIncrement) helpConfigIncrement, extendHelpConfigs, rule, def); + mergeAddedHelp(extendModel, (AddedHelpIncrement) helpConfigIncrement, extendHelpConfigs, rule); break; case Deleted: - extendModel.getValueHelpConfigs().remove(helpConfigIncrement); + // 无 delete 规则 → 拦截，不删除 break; case Modify: - dealModifyHelp(extendModel, (ModifyHelpIncrement) helpConfigIncrement, extendHelpConfigs, rule, def); + dealModifyHelp(extendModel, (ModifyHelpIncrement) helpConfigIncrement, extendHelpConfigs, rule); } } @@ -62,25 +61,27 @@ public class ViewModelMerger extends CommonModelMerger { GspViewModel extendModel, AddedHelpIncrement helpConfigIncrement, HashMap extendHelpConfigs, - CmControlRule rule, - CmControlRuleDef def) { + CommonModelRule rule) { -// if (isAllowAddChildObj(rule, def)) - extendModel.getValueHelpConfigs().add(helpConfigIncrement.getHelpConfig()); + if (MergeUtils.isAllow(((VoModelRule) rule).getAddHelpConfigRule())) { + extendModel.getValueHelpConfigs().add(helpConfigIncrement.getHelpConfig()); + } } private void dealModifyHelp( GspViewModel extendModel, ModifyHelpIncrement helpConfigIncrement, HashMap extendIncrement, - CmControlRule rule, - CmControlRuleDef def) { + CommonModelRule rule) { + if (!MergeUtils.isAllow(((VoModelRule) rule).getModifyHelpConfigRule())) { + return; + } ValueHelpConfig config = helpConfigIncrement.getHelpConfig(); if (extendModel.getValueHelpConfigs().contains(config)) { String newHelpId = config.getHelperId(); String oldHelpId = extendModel.getValueHelpConfigs().getItem(config.getElementId()).getHelperId(); //todo 帮助数据源变化 - if (!newHelpId.equals(oldHelpId)) { + if (!Objects.equals(newHelpId, oldHelpId)) { extendModel.getValueHelpConfigs().remove(config); extendModel.getValueHelpConfigs().add(config); } else { @@ -92,23 +93,24 @@ public class ViewModelMerger extends CommonModelMerger { //region merge actions - private void mergeAction(GspViewModel extendModel, ViewModelIncrement extendIncrement, ViewModelIncrement baseIncrement, CmControlRule rule, CmControlRuleDef def) { + private void mergeAction(GspViewModel extendModel, ViewModelIncrement extendIncrement, ViewModelIncrement baseIncrement, CommonModelRule rule) { var extendActions = extendIncrement.getActions(); var baseActions = baseIncrement.getActions(); - if (extendActions.size() < 1 && baseActions.size() < 1) + if (extendActions.size() < 1 && baseActions.size() < 1) { return; + } for (var actionPair : baseActions.entrySet()) { VoActionIncrement actionIncrement = actionPair.getValue(); switch (actionIncrement.getIncrementType()) { case Added: - mergeAddedAction(extendModel, (AddedVoActionIncrement) actionIncrement, extendActions, rule, def); + mergeAddedAction(extendModel, (AddedVoActionIncrement) actionIncrement, extendActions, rule); break; case Deleted: - extendModel.getActions().removeById(actionIncrement.getActionId()); + // 无 delete 规则 → 拦截，不删除 break; case Modify: - dealModifyAction(extendModel, (ModifyVoActionIncrement) actionIncrement, extendActions, rule, def); + dealModifyAction(extendModel, (ModifyVoActionIncrement) actionIncrement, extendActions, rule); } } @@ -119,21 +121,22 @@ public class ViewModelMerger extends CommonModelMerger { GspViewModel extendModel, AddedVoActionIncrement actionIncrement, HashMap extendHelpConfigs, - CmControlRule rule, - CmControlRuleDef def) { + CommonModelRule rule) { -// if (isAllowAddChildObj(rule, def)) - extendModel.getActions().add(actionIncrement.getAction()); + if (MergeUtils.isAllow(((VoModelRule) rule).getAddCustomActionRule())) { + extendModel.getActions().add(actionIncrement.getAction()); + } } private void dealModifyAction( GspViewModel extendModel, ModifyVoActionIncrement baseActionIncrement, HashMap extendIncrement, - CmControlRule rule, - CmControlRuleDef def) { - extendModel.getActions().removeById(baseActionIncrement.getActionId()); - extendModel.getActions().add(baseActionIncrement.getAction()); + CommonModelRule rule) { + if (MergeUtils.isAllow(((VoModelRule) rule).getModifyCustomActionRule())) { + extendModel.getActions().removeById(baseActionIncrement.getActionId()); + extendModel.getActions().add(baseActionIncrement.getAction()); + } } //endregion } -- Gitee From 3a5ec44381d562e947f5b0b30ff298d46fcf8170 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Wed, 15 Jul 2026 14:46:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20Manager=20=E5=B1=82=E4=B8=8E=20Runt?= =?UTF-8?q?ime=20=E6=94=AF=E6=8C=81=20Frozen=20=E5=8E=86=E5=8F=B2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=AF=86=E5=88=AB=E8=8C=83=E5=9B=B4=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../increment/ViewModelExtHandler.java | 87 ++++++++++++------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/increment/ViewModelExtHandler.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/increment/ViewModelExtHandler.java index 98df41f..56d6192 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/increment/ViewModelExtHandler.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/increment/ViewModelExtHandler.java @@ -21,9 +21,9 @@ import com.inspur.edp.das.commonmodel.entity.increment.CommonModelIncrement; import com.inspur.edp.formserver.viewmodel.GspViewModel; import com.inspur.edp.formserver.viewmodel.GspViewObject; import com.inspur.edp.formserver.viewmodel.common.ViewModelMapping; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoControlRule; -import com.inspur.edp.formserver.viewmodel.controlrule.rule.convert.VoControlRuleConvertor; -import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoControlRuleDef; +import com.inspur.edp.formserver.viewmodel.controlrule.rule.VoModelRule; +import com.inspur.edp.formserver.viewmodel.controlrule.rule.convert.VoModelRuleConvertor; +import com.inspur.edp.formserver.viewmodel.controlrule.ruledefine.VoModelRuleDef; import com.inspur.edp.formserver.viewmodel.exception.ViewModelException; import com.inspur.edp.formserver.viewmodel.increment.ViewModelIncrement; import com.inspur.edp.formserver.viewmodel.increment.extract.ViewModelExtractor; @@ -47,6 +47,8 @@ import org.apache.commons.lang3.StringUtils; @Slf4j public class ViewModelExtHandler implements CustomizationExtHandler { + // 历史版本（1.1） + public static final String EXTRACTOR_VERSION_1_1 = "1.1"; private static CustomizationService customizationService = null; private static CustomizationService getCustomizationService() { if (customizationService == null) { @@ -55,6 +57,15 @@ public class ViewModelExtHandler implements CustomizationExtHandler { return customizationService; } + /** + * 判定扩展元数据是否为历史产物（extMergerVersion 为 null 或 "1.1"）， + * 历史产物在抽取和合并时使用冻结的识别范围。 + */ + private static boolean isHistory(GspMetadata extMetadata) { + String v = VoExtendProperties.of(extMetadata).getExtMergerVersion(); + return StringUtils.isEmpty(v) || EXTRACTOR_VERSION_1_1.equals(v); + } + @Override public AbstractCustomizedContent getExtContent(ExtContentArgs args) { GspMetadata oldMetadata = args.getBasicMetadata(); @@ -67,11 +78,20 @@ public class ViewModelExtHandler implements CustomizationExtHandler { GspViewModel oldVo = (GspViewModel) oldMetadata.getContent(); GspViewModel newVo = (GspViewModel) newMetadata.getContent(); - VoControlRuleDef def = new VoControlRuleDef(); - VoControlRule rule = new VoControlRule(); - VoControlRuleConvertor.convert2ControlRule(def, rule, oldVo); + VoModelRuleDef def; + if (isHistory(newMetadata)) { + def = VoModelRuleDef.createFrozen(); + } else { + def = VoModelRuleDef.create(); + } + VoModelRule rule = VoModelRuleConvertor.convert2ControlRule(def, oldVo); - return extractor.extract(oldVo, newVo, rule, def); + CommonModelIncrement increment = extractor.extract(oldVo, newVo, rule); + // 历史产物保持旧版本号，标记此 change 不可信 + if (isHistory(newMetadata)) { + increment.setVersion(null); + } + return increment; } @Override @@ -81,24 +101,26 @@ public class ViewModelExtHandler implements CustomizationExtHandler { // 克隆后对其合并变更集作为同步后元数据内容 GspViewModel clone = ((GspViewModel) mergedMetadata.getContent()).clone(); // 构造合并工具类 - ViewModelMerger merger = new ViewModelMerger(true); + ViewModelMerger merger = new ViewModelMerger(); - // 构造合并规则类 - VoControlRuleDef def = new VoControlRuleDef(); - VoControlRule rule = new VoControlRule(); + // 待同步扩展元数据 + GspMetadata extendMetadata = args.getExtendMetadata(); + + // 构造合并规则类：历史产物使用冻结范围 + VoModelRuleDef def = isHistory(extendMetadata) + ? VoModelRuleDef.createFrozen() : VoModelRuleDef.create(); GspMetadata baseVoMetadata = args.getRootMetadata(); - VoControlRuleConvertor.convert2ControlRule(def, rule, (GspViewModel) baseVoMetadata.getContent()); + VoModelRule rule = VoModelRuleConvertor.convert2ControlRule(def, (GspViewModel) baseVoMetadata.getContent()); // 获取原定制元数据与原上层元数据的变更集。 AbstractCustomizedContent changeToParent = args.getCustomizedContent(); // 变更集与更新后的上层元数据合并得到同步后扩展元数据 GspViewModel merge = (GspViewModel)merger.merge(clone, (GspViewModel)baseVoMetadata.getContent(), new ViewModelIncrement(), (ViewModelIncrement)changeToParent, - rule, def); + rule); - // 待同步扩展元数据 - GspMetadata extendMetadata = args.getExtendMetadata(); + // 待同步扩展元数据（声明提前至上方 def 处） // 克隆元数据,作为同步后的元数据 GspMetadata metadata = (GspMetadata) extendMetadata.clone(); // 异常场景，不应出现 @@ -180,27 +202,28 @@ public class ViewModelExtHandler implements CustomizationExtHandler { int res = changeToParent == null? 3 : extractor.compareTo(changeToParent.getVersion()); - if (res == 0) { - return changeToParent; - } else if (res < 0) { - log.warn("同步元数据[{}]时记录的变更集版本[{}]高于当前应用，升级应用补丁", currentMetadata.getHeader().getId(), changeToParent.getVersion()); + // !isHistory 且版本匹配(或更新) → 不重算 + if (!isHistory(currentMetadata) && res <= 0) { + if (res < 0) { + log.warn("同步元数据[{}]时记录的变更集版本[{}]高于当前应用，升级应用补丁", currentMetadata.getHeader().getId(), changeToParent.getVersion()); + } return changeToParent; - } else { - log.error("同步元数据[{}]时记录的变更集版本[{}]低于当前应用，升级应用补丁", - currentMetadata.getHeader().getId(), - changeToParent == null? null : changeToParent.getVersion()); - // 获取更新后的上层元数据 - GspMetadata parentMetadata = changeMergeArgs.getParentMetadata(); + } + // isHistory（不论版本）或 change 过期（res > 0）→ 重算 + log.error("同步元数据[{}]时记录的变更集版本[{}]低于当前应用，升级应用补丁", + currentMetadata.getHeader().getId(), + changeToParent == null? null : changeToParent.getVersion()); + // 获取更新后的上层元数据 + GspMetadata parentMetadata = changeMergeArgs.getParentMetadata(); - // 重新获取数据库中元数据，为了获取更新前且linkBe后的VO - MetadataQueryParam param = new MetadataQueryParam(); - param.setMetadataId(parentMetadata.getHeader().getId()); - param.setMetadataScopeEnum(MetadataScopeEnum.CUSTOMIZING); - parentMetadata = getCustomizationService().getGspMetadata(param); + // 重新获取数据库中元数据，为了获取更新前且linkBe后的VO + MetadataQueryParam param = new MetadataQueryParam(); + param.setMetadataId(parentMetadata.getHeader().getId()); + param.setMetadataScopeEnum(MetadataScopeEnum.CUSTOMIZING); + parentMetadata = getCustomizationService().getGspMetadata(param); - return getExtContent(new ExtContentArgs(parentMetadata, currentMetadata, changeMergeArgs.getRootMetadata())); + return getExtContent(new ExtContentArgs(parentMetadata, currentMetadata, changeMergeArgs.getRootMetadata())); - } } } -- Gitee From 9444009f3edaa8ceae4cd57c10361a1e3a42f26b Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Wed, 15 Jul 2026 14:46:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20i18n=20?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E4=B8=8E=E6=9D=82=E9=A1=B9?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../viewobject_model_designtime.en.properties | 78 ++++++++++--------- .../viewobject_model_designtime.properties | 78 ++++++++++--------- ...wobject_model_designtime.zh-CHT.properties | 78 ++++++++++--------- .../viewmodel/formentity/VoFormModel.java | 73 ++++++++++++----- 5 files changed, 185 insertions(+), 124 deletions(-) diff --git a/pom.xml b/pom.xml index 1f0573b..f958efb 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 0.1.3 0.1.0 0.1.9 - 0.2.2 + 0.2.3-SNAPSHOT 0.2.0-rc.6 0.3.0-rc.4 0.2.0-rc.4 diff --git a/resources/en/viewobject_model_designtime.en.properties b/resources/en/viewobject_model_designtime.en.properties index a46c42e..854bdf0 100644 --- a/resources/en/viewobject_model_designtime.en.properties +++ b/resources/en/viewobject_model_designtime.en.properties @@ -224,40 +224,6 @@ GSP_VIEWOBJECT_FORMFORMAT_1006=Error saving view object corresponding to form GSP_VIEWOBJECT_ADDCOMP_1001=Error serializing the input JSON data when adding components based on form features. GSP_VIEWOBJECT_ADDCOMP_1002=Error in the input form property identifier when adding components based on form features. GSP_VIEWOBJECT_MSGTEMP_VIEWMODEL=View object -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_NAME=Name -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_NAME_DESCRIPTION=Field Name -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_LENGTH=Length -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_LENGTH_DESCRIPTION=Field Length -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_PRECISION=Precision -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_PRECISION_DESCRIPTION=Field Precision -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_DEFAULTVALUE=Default Value -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_DEFAULTVALUE_DESCRIPTION=Field Default Value -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_MULTILANGUAGE=Multilingual Support -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_MULTILANGUAGE_DESCRIPTION=Field Multilingual Settings -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_READONLY=Readonly Status -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_READONLY_DESCRIPTION=Field Readonly Settings -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_REQUIRED=Required Field -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NAME=Name -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NAME_DESCRIPTION=Entity Name -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_CUSTOM_ACTION=Add Custom Action -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_CUSTOM_ACTION_DESCRIPTION=Add Custom Action -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION=Modify Custom Action -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION_DESCRIPTION=Modify Custom Action -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_VARIABLE=Add Custom Variable -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_VARIABLE_DESCRIPTION=Add Custom Variable -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_MODIFY_VARIABLE=Modify Custom Variable -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_MODIFY_VARIABLE_DESCRIPTION=Modify Custom Variable -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_NAME=Name -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_NAME_DESCRIPTION=Node Name -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_CHILD_ENTITY=Add Child Node -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_CHILD_ENTITY_DESCRIPTION=Add Child Node -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_CHILD_ENTITY=Modify child node information -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_CHILD_ENTITY_DESCRIPTION=Modify child node information -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_FIELD=Add field -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_FIELD_DESCRIPTION=Add field -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_FIELD=Modify field information -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_FIELD_DESCRIPTION=Modify field information -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_REQUIRED_DESCRIPTION=Field required setting GSP_VIEWOBJECT_MSGTEMP_COL_PROCESSINSTANCEID_NAME=Process instance identifier GSP_VIEWOBJECT_MSGTEMP_COL_ROOTPROCESSINSTANCEID_NAME=Root process instance identifier GSP_VIEWOBJECT_MSGTEMP_COL_ACTIVITYINSTANCEID_NAME=Activity instance identifier @@ -368,4 +334,46 @@ GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_BASIC_DECIMAL_PRECISION_IS_ZERO=The [pre GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_BASIC_STRING_LENGTH_IS_ZERO=The [length] of {0} whose [data type] is [string] cannot be 0. GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_PREFIX=Field [{1}] of object [{0}] GSP_VIEWOBJECT_MSGTEMP_VALIDATE_VARIABLE_PREFIX=Field [{1}] of the variable collection in model [{0}] -GSP_VIEWOBJECT_MANAGER_0112=Remote call to [{1}] method in [{0}] interface reported error \ No newline at end of file +GSP_VIEWOBJECT_MANAGER_0112=Remote call to [{1}] method in [{0}] interface reported error + +# derived rule keys +RULE_MODEL_NAME=Name +RULE_MODEL_NAME_DESCRIPTION=Entity Name +RULE_OBJECT_NAME=Name +RULE_OBJECT_NAME_DESCRIPTION=Node Name +RULE_ELEMENT_NAME=Name +RULE_ELEMENT_NAME_DESCRIPTION=Field Name +RULE_ELEMENT_LENGTH=Length +RULE_ELEMENT_LENGTH_DESCRIPTION=Field Length +RULE_ELEMENT_PRECISION=Precision +RULE_ELEMENT_PRECISION_DESCRIPTION=Field Precision +RULE_ELEMENT_DEFAULT_VALUE=Default Value +RULE_ELEMENT_DEFAULT_VALUE_DESCRIPTION=Field Default Value +RULE_ELEMENT_REQUIRED=Required Field +RULE_ELEMENT_REQUIRED_DESCRIPTION=Field Required Setting +RULE_ELEMENT_CONTAIN_ENUM_VALUES=Contains Enum Values +RULE_ELEMENT_CONTAIN_ENUM_VALUES_DESCRIPTION=Field Enum Values Setting +RULE_ELEMENT_IS_PERSISTENT=Persistent +RULE_ELEMENT_IS_PERSISTENT_DESCRIPTION=Field Persistent Setting +RULE_ELEMENT_CUSTOMIZE_REF=Customize Reference +RULE_ELEMENT_CUSTOMIZE_REF_DESCRIPTION=Field Customize Reference Setting +RULE_ELEMENT_ENCRYPTION=Encryption +RULE_ELEMENT_ENCRYPTION_DESCRIPTION=Field Encryption Setting +RULE_ELEMENT_IS_DEFAULT_NULL=Default Null +RULE_ELEMENT_IS_DEFAULT_NULL_DESCRIPTION=Field Default Null Setting +RULE_OBJECT_ADD_CHILD_OBJECT=Add Child Node +RULE_OBJECT_ADD_CHILD_OBJECT_DESCRIPTION=Add Child Node +RULE_OBJECT_ADD_ELEMENT=Add Field +RULE_OBJECT_ADD_ELEMENT_DESCRIPTION=Add Field +RULE_OBJECT_DELETE_ELEMENT=Delete Field +RULE_OBJECT_DELETE_ELEMENT_DESCRIPTION=Delete Field +RULE_OBJECT_DELETE_CHILD_OBJECT=Delete Child Node +RULE_OBJECT_DELETE_CHILD_OBJECT_DESCRIPTION=Delete Child Node +RULE_MODEL_ADD_CUSTOM_ACTION=Add Custom Action +RULE_MODEL_ADD_CUSTOM_ACTION_DESCRIPTION=Add Custom Action +RULE_MODEL_MODIFY_CUSTOM_ACTION=Modify Custom Action +RULE_MODEL_MODIFY_CUSTOM_ACTION_DESCRIPTION=Modify Custom Action +RULE_MODEL_ADD_HELP_CONFIG=Add Help Config +RULE_MODEL_ADD_HELP_CONFIG_DESCRIPTION=Add Help Config +RULE_MODEL_MODIFY_HELP_CONFIG=Modify Help Config +RULE_MODEL_MODIFY_HELP_CONFIG_DESCRIPTION=Modify Help Config diff --git a/resources/viewobject_model_designtime.properties b/resources/viewobject_model_designtime.properties index 7174524..97be4cc 100644 --- a/resources/viewobject_model_designtime.properties +++ b/resources/viewobject_model_designtime.properties @@ -224,40 +224,6 @@ GSP_VIEWOBJECT_FORMFORMAT_1006=\u4FDD\u5B58\u8868\u5355\u5BF9\u5E94\u7684\u89C6\ GSP_VIEWOBJECT_ADDCOMP_1001=\u6839\u636E\u8868\u5355\u7279\u6027\u6DFB\u52A0\u6784\u4EF6\u65B9\u6CD5\u65F6\uFF0C\u5E8F\u5217\u5316\u4F20\u5165\u7684json\u6570\u636E\u51FA\u9519 GSP_VIEWOBJECT_ADDCOMP_1002=\u6839\u636E\u8868\u5355\u7279\u6027\u6DFB\u52A0\u6784\u4EF6\u65B9\u6CD5\u65F6\uFF0C\u4F20\u5165\u7684\u8868\u5355\u7279\u6027\u6807\u8BC6\u51FA\u9519 GSP_VIEWOBJECT_MSGTEMP_VIEWMODEL=\u89C6\u56FE\u5BF9\u8C61 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_NAME=\u540D\u79F0 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_NAME_DESCRIPTION=\u5B57\u6BB5\u540D\u79F0 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_LENGTH=\u957F\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_LENGTH_DESCRIPTION=\u5B57\u6BB5\u957F\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_PRECISION=\u7CBE\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_PRECISION_DESCRIPTION=\u5B57\u6BB5\u7CBE\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_DEFAULTVALUE=\u9ED8\u8BA4\u503C -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_DEFAULTVALUE_DESCRIPTION=\u5B57\u6BB5\u9ED8\u8BA4\u503C -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_MULTILANGUAGE=\u662F\u5426\u591A\u8BED -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_MULTILANGUAGE_DESCRIPTION=\u5B57\u6BB5\u591A\u8BED\u8BBE\u7F6E -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_READONLY=\u662F\u5426\u53EA\u8BFB -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_READONLY_DESCRIPTION=\u5B57\u6BB5\u53EA\u8BFB\u8BBE\u7F6E -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_REQUIRED=\u662F\u5426\u5FC5\u586B -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NAME=\u540D\u79F0 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NAME_DESCRIPTION=\u5B9E\u4F53\u540D\u79F0 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_CUSTOM_ACTION=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u52A8\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_CUSTOM_ACTION_DESCRIPTION=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u52A8\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION=\u4FEE\u6539\u81EA\u5B9A\u4E49\u52A8\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION_DESCRIPTION=\u4FEE\u6539\u81EA\u5B9A\u4E49\u52A8\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_VARIABLE=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u53D8\u91CF -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_VARIABLE_DESCRIPTION=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u53D8\u91CF -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_MODIFY_VARIABLE=\u4FEE\u6539\u81EA\u5B9A\u4E49\u53D8\u91CF -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_MODIFY_VARIABLE_DESCRIPTION=\u4FEE\u6539\u81EA\u5B9A\u4E49\u53D8\u91CF -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_NAME=\u540D\u79F0 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_NAME_DESCRIPTION=\u8282\u70B9\u540D\u79F0 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_CHILD_ENTITY=\u6DFB\u52A0\u5B50\u8282\u70B9 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_CHILD_ENTITY_DESCRIPTION=\u6DFB\u52A0\u5B50\u8282\u70B9 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_CHILD_ENTITY=\u4FEE\u6539\u5B50\u8282\u70B9\u4FE1\u606F -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_CHILD_ENTITY_DESCRIPTION=\u4FEE\u6539\u5B50\u8282\u70B9\u4FE1\u606F -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_FIELD=\u6DFB\u52A0\u5B57\u6BB5 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_FIELD_DESCRIPTION=\u6DFB\u52A0\u5B57\u6BB5 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_FIELD=\u4FEE\u6539\u5B57\u6BB5\u4FE1\u606F -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_FIELD_DESCRIPTION=\u4FEE\u6539\u5B57\u6BB5\u4FE1\u606F -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_REQUIRED_DESCRIPTION=\u5B57\u6BB5\u5FC5\u586B\u8BBE\u7F6E GSP_VIEWOBJECT_MSGTEMP_COL_PROCESSINSTANCEID_NAME=\u6D41\u7A0B\u5B9E\u4F8B\u6807\u8BC6\u7B26 GSP_VIEWOBJECT_MSGTEMP_COL_ROOTPROCESSINSTANCEID_NAME=\u7236\u6D41\u7A0B\u5B9E\u4F8B\u6807\u8BC6\u7B26 GSP_VIEWOBJECT_MSGTEMP_COL_ACTIVITYINSTANCEID_NAME=\u6D3B\u52A8\u5B9E\u4F8B\u6807\u8BC6\u7B26 @@ -368,4 +334,46 @@ GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_BASIC_DECIMAL_PRECISION_IS_ZERO={0}\u768 GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_BASIC_STRING_LENGTH_IS_ZERO={0}\u7684[\u6570\u636E\u7C7B\u578B] \u4E3A[\u6587\u672C]\uFF0C\u5176 [\u957F\u5EA6] \u4E0D\u53EF\u4E3A0. GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_PREFIX=\u5BF9\u8C61[{0}]\u7684\u5B57\u6BB5[{1}] GSP_VIEWOBJECT_MSGTEMP_VALIDATE_VARIABLE_PREFIX=\u6A21\u578B[{0}]\u53D8\u91CF\u96C6\u5408\u7684\u5B57\u6BB5[{1}] -GSP_VIEWOBJECT_MANAGER_0112=\u8FDC\u7A0B\u8C03\u7528[{0}]\u63A5\u53E3\u4E2D[{1}]\u65B9\u6CD5\u62A5\u9519 \ No newline at end of file +GSP_VIEWOBJECT_MANAGER_0112=\u8FDC\u7A0B\u8C03\u7528[{0}]\u63A5\u53E3\u4E2D[{1}]\u65B9\u6CD5\u62A5\u9519 + +# derived rule keys +RULE_MODEL_NAME=\u540D\u79F0 +RULE_MODEL_NAME_DESCRIPTION=\u5B9E\u4F53\u540D\u79F0 +RULE_OBJECT_NAME=\u540D\u79F0 +RULE_OBJECT_NAME_DESCRIPTION=\u8282\u70B9\u540D\u79F0 +RULE_ELEMENT_NAME=\u540D\u79F0 +RULE_ELEMENT_NAME_DESCRIPTION=\u5B57\u6BB5\u540D\u79F0 +RULE_ELEMENT_LENGTH=\u957F\u5EA6 +RULE_ELEMENT_LENGTH_DESCRIPTION=\u5B57\u6BB5\u957F\u5EA6 +RULE_ELEMENT_PRECISION=\u7CBE\u5EA6 +RULE_ELEMENT_PRECISION_DESCRIPTION=\u5B57\u6BB5\u7CBE\u5EA6 +RULE_ELEMENT_DEFAULT_VALUE=\u9ED8\u8BA4\u503C +RULE_ELEMENT_DEFAULT_VALUE_DESCRIPTION=\u5B57\u6BB5\u9ED8\u8BA4\u503C +RULE_ELEMENT_REQUIRED=\u662F\u5426\u5FC5\u586B +RULE_ELEMENT_REQUIRED_DESCRIPTION=\u5B57\u6BB5\u5FC5\u586B\u8BBE\u7F6E +RULE_ELEMENT_CONTAIN_ENUM_VALUES=\u662F\u5426\u5305\u542B\u679A\u4E3E\u503C +RULE_ELEMENT_CONTAIN_ENUM_VALUES_DESCRIPTION=\u5B57\u6BB5\u679A\u4E3E\u503C\u8BBE\u7F6E +RULE_ELEMENT_IS_PERSISTENT=\u662F\u5426\u6301\u4E45\u5316 +RULE_ELEMENT_IS_PERSISTENT_DESCRIPTION=\u5B57\u6BB5\u6301\u4E45\u5316\u8BBE\u7F6E +RULE_ELEMENT_CUSTOMIZE_REF=\u81EA\u5B9A\u4E49\u5F15\u7528 +RULE_ELEMENT_CUSTOMIZE_REF_DESCRIPTION=\u5B57\u6BB5\u81EA\u5B9A\u4E49\u5F15\u7528\u8BBE\u7F6E +RULE_ELEMENT_ENCRYPTION=\u662F\u5426\u52A0\u5BC6 +RULE_ELEMENT_ENCRYPTION_DESCRIPTION=\u5B57\u6BB5\u52A0\u5BC6\u8BBE\u7F6E +RULE_ELEMENT_IS_DEFAULT_NULL=\u662F\u5426\u9ED8\u8BA4\u7A7A +RULE_ELEMENT_IS_DEFAULT_NULL_DESCRIPTION=\u5B57\u6BB5\u9ED8\u8BA4\u7A7A\u8BBE\u7F6E +RULE_OBJECT_ADD_CHILD_OBJECT=\u6DFB\u52A0\u5B50\u8282\u70B9 +RULE_OBJECT_ADD_CHILD_OBJECT_DESCRIPTION=\u6DFB\u52A0\u5B50\u8282\u70B9 +RULE_OBJECT_ADD_ELEMENT=\u6DFB\u52A0\u5B57\u6BB5 +RULE_OBJECT_ADD_ELEMENT_DESCRIPTION=\u6DFB\u52A0\u5B57\u6BB5 +RULE_OBJECT_DELETE_ELEMENT=\u5220\u9664\u5B57\u6BB5 +RULE_OBJECT_DELETE_ELEMENT_DESCRIPTION=\u5220\u9664\u5B57\u6BB5 +RULE_OBJECT_DELETE_CHILD_OBJECT=\u5220\u9664\u5B50\u8282\u70B9 +RULE_OBJECT_DELETE_CHILD_OBJECT_DESCRIPTION=\u5220\u9664\u5B50\u8282\u70B9 +RULE_MODEL_ADD_CUSTOM_ACTION=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u52A8\u4F5C +RULE_MODEL_ADD_CUSTOM_ACTION_DESCRIPTION=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u52A8\u4F5C +RULE_MODEL_MODIFY_CUSTOM_ACTION=\u4FEE\u6539\u81EA\u5B9A\u4E49\u52A8\u4F5C +RULE_MODEL_MODIFY_CUSTOM_ACTION_DESCRIPTION=\u4FEE\u6539\u81EA\u5B9A\u4E49\u52A8\u4F5C +RULE_MODEL_ADD_HELP_CONFIG=\u6DFB\u52A0\u5E2E\u52A9\u914D\u7F6E +RULE_MODEL_ADD_HELP_CONFIG_DESCRIPTION=\u6DFB\u52A0\u5E2E\u52A9\u914D\u7F6E +RULE_MODEL_MODIFY_HELP_CONFIG=\u4FEE\u6539\u5E2E\u52A9\u914D\u7F6E +RULE_MODEL_MODIFY_HELP_CONFIG_DESCRIPTION=\u4FEE\u6539\u5E2E\u52A9\u914D\u7F6E diff --git a/resources/zh-CHT/viewobject_model_designtime.zh-CHT.properties b/resources/zh-CHT/viewobject_model_designtime.zh-CHT.properties index cbe62bb..2f42c10 100644 --- a/resources/zh-CHT/viewobject_model_designtime.zh-CHT.properties +++ b/resources/zh-CHT/viewobject_model_designtime.zh-CHT.properties @@ -224,40 +224,6 @@ GSP_VIEWOBJECT_FORMFORMAT_1006=\u4FDD\u5B58\u8868\u55AE\u5C0D\u61C9\u7684\u8996\ GSP_VIEWOBJECT_ADDCOMP_1001=\u6839\u64DA\u8868\u55AE\u7279\u6027\u6DFB\u52A0\u69CB\u4EF6\u65B9\u6CD5\u6642\uFF0C\u5E8F\u5217\u5316\u50B3\u5165\u7684json\u6578\u64DA\u51FA\u932F GSP_VIEWOBJECT_ADDCOMP_1002=\u6839\u64DA\u8868\u55AE\u7279\u6027\u6DFB\u52A0\u69CB\u4EF6\u65B9\u6CD5\u6642\uFF0C\u50B3\u5165\u7684\u8868\u55AE\u7279\u6027\u6A19\u8B58\u51FA\u932F GSP_VIEWOBJECT_MSGTEMP_VIEWMODEL=\u8996\u5716\u5C0D\u8C61 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_NAME=\u540D\u7A31 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_NAME_DESCRIPTION=\u6B04\u4F4D\u540D\u7A31 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_LENGTH=\u9577\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_LENGTH_DESCRIPTION=\u6B04\u4F4D\u9577\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_PRECISION=\u7CBE\u78BA\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_PRECISION_DESCRIPTION=\u6B04\u4F4D\u7CBE\u78BA\u5EA6 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_DEFAULTVALUE=\u9810\u8A2D\u503C -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_DEFAULTVALUE_DESCRIPTION=\u6B04\u4F4D\u9810\u8A2D\u503C -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_MULTILANGUAGE=\u662F\u5426\u591A\u8A9E -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_MULTILANGUAGE_DESCRIPTION=\u6B04\u4F4D\u591A\u8A9E\u8A2D\u5B9A -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_READONLY=\u662F\u5426\u552F\u8B80 -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_READONLY_DESCRIPTION=\u6B04\u4F4D\u552F\u8B80\u8A2D\u5B9A -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_REQUIRED=\u662F\u5426\u5FC5\u586B -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NAME=\u540D\u7A31 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NAME_DESCRIPTION=\u5BE6\u9AD4\u540D\u7A31 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_CUSTOM_ACTION=\u65B0\u589E\u81EA\u5B9A\u7FA9\u52D5\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_CUSTOM_ACTION_DESCRIPTION=\u65B0\u589E\u81EA\u5B9A\u7FA9\u52D5\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION=\u4FEE\u6539\u81EA\u5B9A\u7FA9\u52D5\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_NODIFY_CUSTOM_ACTION_DESCRIPTION=\u4FEE\u6539\u81EA\u5B9A\u7FA9\u52D5\u4F5C -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_VARIABLE=\u65B0\u589E\u81EA\u8A02\u8B8A\u6578 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_ADD_VARIABLE_DESCRIPTION=\u65B0\u589E\u81EA\u8A02\u8B8A\u6578 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_MODIFY_VARIABLE=\u4FEE\u6539\u81EA\u8A02\u8B8A\u6578 -GSP_VIEWOBJECT_MSGTEMP_RULE_VIEWMODEL_MODIFY_VARIABLE_DESCRIPTION=\u4FEE\u6539\u81EA\u8A02\u8B8A\u6578 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_NAME=\u540D\u7A31 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_NAME_DESCRIPTION=\u7BC0\u9EDE\u540D\u7A31 -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_CHILD_ENTITY=\u65B0\u589E\u5B50\u7BC0\u9EDE -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_CHILD_ENTITY_DESCRIPTION=\u65B0\u589E\u5B50\u7BC0\u9EDE -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_CHILD_ENTITY=\u4FEE\u6539\u5B50\u7BC0\u9EDE\u8CC7\u8A0A -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_CHILD_ENTITY_DESCRIPTION=\u4FEE\u6539\u5B50\u7BC0\u9EDE\u8CC7\u8A0A -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_FIELD=\u6DFB\u52A0\u6B04\u4F4D -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_ADD_FIELD_DESCRIPTION=\u6DFB\u52A0\u6B04\u4F4D -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_FIELD=\u4FEE\u6539\u6B04\u4F4D\u8CC7\u8A0A -GSP_VIEWOBJECT_MSGTEMP_RULE_OBJECT_MODIFY_FIELD_DESCRIPTION=\u4FEE\u6539\u6B04\u4F4D\u8CC7\u8A0A -GSP_VIEWOBJECT_MSGTEMP_RULE_FIELD_REQUIRED_DESCRIPTION=\u6B04\u4F4D\u5FC5\u586B\u8A2D\u5B9A GSP_VIEWOBJECT_MSGTEMP_COL_PROCESSINSTANCEID_NAME=\u6D41\u7A0B\u5BE6\u4F8B\u6A19\u8B58\u7B26 GSP_VIEWOBJECT_MSGTEMP_COL_ROOTPROCESSINSTANCEID_NAME=\u7236\u6D41\u7A0B\u5BE6\u4F8B\u6A19\u8B58\u7B26 GSP_VIEWOBJECT_MSGTEMP_COL_ACTIVITYINSTANCEID_NAME=\u6D3B\u52D5\u5BE6\u4F8B\u6A19\u8B58\u7B26 @@ -368,4 +334,46 @@ GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_BASIC_DECIMAL_PRECISION_IS_ZERO={0}\u768 GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_BASIC_STRING_LENGTH_IS_ZERO={0}\u7684[\u6578\u64DA\u985E\u578B] \u70BA[\u6587\u672C]\uFF0C\u5176 [\u9577\u5EA6] \u4E0D\u53EF\u70BA0. GSP_VIEWOBJECT_MSGTEMP_VALIDATE_ELEMENT_PREFIX=\u5C0D\u8C61[{0}]\u7684\u5B57\u6BB5[{1}] GSP_VIEWOBJECT_MSGTEMP_VALIDATE_VARIABLE_PREFIX=\u6A21\u578B[{0}]\u8B8A\u91CF\u96C6\u5408\u7684\u5B57\u6BB5[{1}] -GSP_VIEWOBJECT_MANAGER_0112=\u9060\u7A0B\u8ABF\u7528[{0}]\u63A5\u53E3\u4E2D[{1}]\u65B9\u6CD5\u5831\u932F \ No newline at end of file +GSP_VIEWOBJECT_MANAGER_0112=\u9060\u7A0B\u8ABF\u7528[{0}]\u63A5\u53E3\u4E2D[{1}]\u65B9\u6CD5\u5831\u932F + +# derived rule keys +RULE_MODEL_NAME=\u540D\u7A31 +RULE_MODEL_NAME_DESCRIPTION=\u5BE6\u9AD4\u540D\u7A31 +RULE_OBJECT_NAME=\u540D\u7A31 +RULE_OBJECT_NAME_DESCRIPTION=\u7BC0\u9EDE\u540D\u7A31 +RULE_ELEMENT_NAME=\u540D\u7A31 +RULE_ELEMENT_NAME_DESCRIPTION=\u6B04\u4F4D\u540D\u7A31 +RULE_ELEMENT_LENGTH=\u9577\u5EA6 +RULE_ELEMENT_LENGTH_DESCRIPTION=\u6B04\u4F4D\u9577\u5EA6 +RULE_ELEMENT_PRECISION=\u7CBE\u78BA\u5EA6 +RULE_ELEMENT_PRECISION_DESCRIPTION=\u6B04\u4F4D\u7CBE\u78BA\u5EA6 +RULE_ELEMENT_DEFAULT_VALUE=\u9810\u8A2D\u503C +RULE_ELEMENT_DEFAULT_VALUE_DESCRIPTION=\u6B04\u4F4D\u9810\u8A2D\u503C +RULE_ELEMENT_REQUIRED=\u662F\u5426\u5FC5\u586B +RULE_ELEMENT_REQUIRED_DESCRIPTION=\u6B04\u4F4D\u5FC5\u586B\u8A2D\u5B9A +RULE_ELEMENT_CONTAIN_ENUM_VALUES=\u662F\u5426\u5305\u542B\u5217\u8209\u503C +RULE_ELEMENT_CONTAIN_ENUM_VALUES_DESCRIPTION=\u6B04\u4F4D\u5217\u8209\u503C\u8A2D\u5B9A +RULE_ELEMENT_IS_PERSISTENT=\u662F\u5426\u6301\u4E45\u5316 +RULE_ELEMENT_IS_PERSISTENT_DESCRIPTION=\u6B04\u4F4D\u6301\u4E45\u5316\u8A2D\u5B9A +RULE_ELEMENT_CUSTOMIZE_REF=\u81EA\u8A02\u5F15\u7528 +RULE_ELEMENT_CUSTOMIZE_REF_DESCRIPTION=\u6B04\u4F4D\u81EA\u8A02\u5F15\u7528\u8A2D\u5B9A +RULE_ELEMENT_ENCRYPTION=\u662F\u5426\u52A0\u5BC6 +RULE_ELEMENT_ENCRYPTION_DESCRIPTION=\u6B04\u4F4D\u52A0\u5BC6\u8A2D\u5B9A +RULE_ELEMENT_IS_DEFAULT_NULL=\u662F\u5426\u9810\u8A2D\u7A7A +RULE_ELEMENT_IS_DEFAULT_NULL_DESCRIPTION=\u6B04\u4F4D\u9810\u8A2D\u7A7A\u8A2D\u5B9A +RULE_OBJECT_ADD_CHILD_OBJECT=\u65B0\u589E\u5B50\u7BC0\u9EDE +RULE_OBJECT_ADD_CHILD_OBJECT_DESCRIPTION=\u65B0\u589E\u5B50\u7BC0\u9EDE +RULE_OBJECT_ADD_ELEMENT=\u65B0\u589E\u6B04\u4F4D +RULE_OBJECT_ADD_ELEMENT_DESCRIPTION=\u65B0\u589E\u6B04\u4F4D +RULE_OBJECT_DELETE_ELEMENT=\u522A\u9664\u6B04\u4F4D +RULE_OBJECT_DELETE_ELEMENT_DESCRIPTION=\u522A\u9664\u6B04\u4F4D +RULE_OBJECT_DELETE_CHILD_OBJECT=\u522A\u9664\u5B50\u7BC0\u9EDE +RULE_OBJECT_DELETE_CHILD_OBJECT_DESCRIPTION=\u522A\u9664\u5B50\u7BC0\u9EDE +RULE_MODEL_ADD_CUSTOM_ACTION=\u65B0\u589E\u81EA\u5B9A\u7FA9\u52D5\u4F5C +RULE_MODEL_ADD_CUSTOM_ACTION_DESCRIPTION=\u65B0\u589E\u81EA\u5B9A\u7FA9\u52D5\u4F5C +RULE_MODEL_MODIFY_CUSTOM_ACTION=\u4FEE\u6539\u81EA\u5B9A\u7FA9\u52D5\u4F5C +RULE_MODEL_MODIFY_CUSTOM_ACTION_DESCRIPTION=\u4FEE\u6539\u81EA\u5B9A\u7FA9\u52D5\u4F5C +RULE_MODEL_ADD_HELP_CONFIG=\u65B0\u589E\u5E6B\u52A9\u914D\u7F6E +RULE_MODEL_ADD_HELP_CONFIG_DESCRIPTION=\u65B0\u589E\u5E6B\u52A9\u914D\u7F6E +RULE_MODEL_MODIFY_HELP_CONFIG=\u4FEE\u6539\u5E6B\u52A9\u914D\u7F6E +RULE_MODEL_MODIFY_HELP_CONFIG_DESCRIPTION=\u4FEE\u6539\u5E6B\u52A9\u914D\u7F6E 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 1f807f8..5b399e4 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,27 +1,9 @@ -/* - * 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; @@ -36,5 +18,60 @@ public class VoFormModel { private List buttonGroup; private ObjectData objectAuthInfo; private List methodGroup; + private List attachmentGroup; private String extendParameters; + + + 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; + } + } -- Gitee