diff --git a/pom.xml b/pom.xml index d9f87fe994c6d7bcc9a45b526b2e325fbbcc539c..b671fbe6ed9548ca43c6f1faf579a2b7141f45ad 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ 0.2.0-rc.7 0.2.0-rc.1 0.2.1 + 1.0.2-SNAPSHOT diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/filter/LowCodeLanguagePackageFilter.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/filter/LowCodeLanguagePackageFilter.java index d3f06141555df949af25b04d102d8923a3a15312..abf0631c601cebf0a94e9affe0611c7fc30f4882 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/filter/LowCodeLanguagePackageFilter.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/filter/LowCodeLanguagePackageFilter.java @@ -30,6 +30,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.inspur.edp.web.common.customexception.WebCustomException; import io.iec.edp.caf.boot.context.CAFContext; import io.iec.edp.caf.commons.exception.CAFRuntimeException; import io.iec.edp.caf.commons.utils.SpringBeanUtils; @@ -299,7 +300,7 @@ public class LowCodeLanguagePackageFilter extends OncePerRequestFilter { JsonNode mergedJsonNodes = mergeJsonNodes(originalJson, uiLanguagePackageJson); return objectMapper.writeValueAsString(mergedJsonNodes); } catch (JsonProcessingException e) { - throw new CAFRuntimeException("pfcommon", "", "", e); // todo: 换成多语的抛异常方式。 + throw new WebCustomException(e); // todo: 换成多语的抛异常方式。 } } diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/DataGridI18nResourceStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/DataGridI18nResourceStrategy.java index 79cb8f6fdd2eec55ba702ed28bfc14d83d85ae9c..c0686795c2f1f3703b81bdb165af07dc608bdc64 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/DataGridI18nResourceStrategy.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/DataGridI18nResourceStrategy.java @@ -23,6 +23,7 @@ import com.inspur.edp.web.formmetadata.i18n.I18nResourceItemManager; import com.inspur.edp.web.formmetadata.i18n.component.ComponentUtility; import com.inspur.edp.web.formmetadata.i18n.component.strategy.i18nresourcestrategy.CommonStrategy.GridCommonStrategy; import com.inspur.edp.web.formmetadata.i18n.constant.I18nResourceConstant; +import jodd.util.ObjectUtil; import java.util.ArrayList; import java.util.HashMap; @@ -72,22 +73,40 @@ public class DataGridI18nResourceStrategy extends GridCommonStrategy { } //提取columns里的行内容 - if(currentComponent.containsKey("columns")){ - I18nResourceItemCollection columnsI18nResourceItemCollection=extractedColumns( i18nResourceItemBaseId, currentComponent); + if (currentComponent.containsKey("columns")) { + I18nResourceItemCollection columnsI18nResourceItemCollection = extractedColumns(i18nResourceItemBaseId, currentComponent); if (columnsI18nResourceItemCollection != null && columnsI18nResourceItemCollection.size() > 0) { i18nResourceItemCollection.addRange(columnsI18nResourceItemCollection); } } //提取handing内的行号值 - if(currentComponent.containsKey("rowNumber")){ + if (currentComponent.containsKey("rowNumber")) { String currentComponentType = ComponentUtility.getInstance().getType(currentComponent); String currentComponentId = ComponentUtility.getInstance().getId(currentComponent); - HashMaprowNumber= (HashMap) currentComponent.get("rowNumber"); - String heading= (String) rowNumber.get("heading"); - String generatedComponentId = currentComponentId + "/rowNumber/heading"; + HashMap rowNumber = (HashMap) currentComponent.get("rowNumber"); + String heading = (String) rowNumber.get("heading"); + String generatedComponentId = currentComponentId + "/rowNumber/heading"; I18nResourceItem footerButtonI18nResourceItem = I18nResourceItemManager.createI18nResourceItem(i18nResourceItemBaseId, generatedComponentId, heading, heading); this.addInCollection(i18nResourceItemCollection, footerButtonI18nResourceItem); } + //提取command + if (currentComponent.containsKey("command")) { + String currentComponentId = ComponentUtility.getInstance().getId(currentComponent); + HashMap command = (HashMap) currentComponent.get("command"); + if (command.containsKey("commands")) { + List> commands = (List>) command.get("commands"); + if(command.containsKey("enableType") && "custom".equals((String) command.get("enableType"))){ + commands.forEach(cmd -> { + if (cmd.get("value") == null || StringUtility.isNullOrEmpty((String) cmd.get("value"))) { + return; + } + String generatedComponentId = currentComponentId + "/command/commands/" + (String) cmd.get("value"); + I18nResourceItem footerButtonI18nResourceItem = I18nResourceItemManager.createI18nResourceItem(i18nResourceItemBaseId, generatedComponentId, (String) cmd.get("text"), (String) cmd.get("text")); + this.addInCollection(i18nResourceItemCollection, footerButtonI18nResourceItem); + }); + } + } + } return i18nResourceItemCollection; } diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/VueDrawerI18nResourceStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/VueDrawerI18nResourceStrategy.java index f63070e252539b01206fc69e53230981e73017bc..e5284e55086bc317c10938fd553ac2d1492f3bd9 100644 --- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/VueDrawerI18nResourceStrategy.java +++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/VueDrawerI18nResourceStrategy.java @@ -13,7 +13,7 @@ import java.util.List; public class VueDrawerI18nResourceStrategy extends AbstractI18nResourceStrategy { @Override protected String getComponentName(HashMap component) { - IComponentNameStrategy componentNameStrategy = ComponentNameFactory.getInstance().creatComponentNameStrategy(ComponentNameType.TEXT); + IComponentNameStrategy componentNameStrategy = ComponentNameFactory.getInstance().creatComponentNameStrategy(ComponentNameType.TITLE); if (componentNameStrategy == null) { return null; }