From 9522eb08d6732304964ac4d98bb2dcf6830c0175 Mon Sep 17 00:00:00 2001 From: lorcan <13231947+lorcan-lv@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 15:40:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B5=84=E6=BA=90=E5=85=83=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18nresourcestrategy/VueDrawerI18nResourceStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f63070e2..e5284e55 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; } -- Gitee From 85142633bf079646278412159ae826ff95b40043 Mon Sep 17 00:00:00 2001 From: lorcan <13231947+lorcan-lv@user.noreply.gitee.com> Date: Thu, 8 Jan 2026 10:34:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=9B=E5=87=BA?= =?UTF-8?q?=E5=8E=9F=E7=94=9F=E5=BC=82=E5=B8=B8=E5=8E=86=E5=8F=B2=E9=81=97?= =?UTF-8?q?=E7=95=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/formmetadata/filter/LowCodeLanguagePackageFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d3f06141..abf0631c 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: 换成多语的抛异常方式。 } } -- Gitee From 08427b601edff9e3f000ca69567d34257687eada Mon Sep 17 00:00:00 2001 From: lorcan <13231947+lorcan-lv@user.noreply.gitee.com> Date: Thu, 8 Jan 2026 10:35:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=93=8D=E4=BD=9C=E5=88=97=E8=B5=84=E6=BA=90=E9=A1=B9?= =?UTF-8?q?=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataGridI18nResourceStrategy.java | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) 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 79cb8f6f..c0686795 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; } -- Gitee