diff --git a/designer-base/pom.xml b/designer-base/pom.xml index d97a420933..25e3c1ec51 100644 --- a/designer-base/pom.xml +++ b/designer-base/pom.xml @@ -6,8 +6,11 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 + com.fr.report + designer-base + ${branch}-SNAPSHOT io.socket @@ -15,7 +18,5 @@ 0.7.0 - com.fr.report - designer-base - 10.0-RELEASE-SNAPSHOT + \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java index ba2ee26f34..de96c10b9b 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java @@ -53,7 +53,6 @@ public class PluginWebBridge { private static final String PLUGIN_INFO = "pluginInfo"; private static final int COREPOOLSIZE = 3; private static final int MAXPOOLSIZE = 5; - private static final String I18N_PREFIX = "FR-"; private static PluginWebBridge helper; @@ -571,13 +570,6 @@ public class PluginWebBridge { //todo 初始化设计器其他部分 } - /** - * 国际化 - */ - public String parseI18(final String key) { - return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + key); - } - /** * 是否是在设计器中操作 */ diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java index 1d3f1ac2b7..3e2cafdfea 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java @@ -1,6 +1,7 @@ package com.fr.design.extra; import com.fr.base.TemplateUtils; +import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StableUtils; @@ -30,6 +31,7 @@ import java.util.Map; */ public class PluginWebPane extends JFXPanel { private static final String RESOURCE_URL = "resourceURL"; + private static final String LANGUAGE = "language"; private WebEngine webEngine; public PluginWebPane(final String installHome, final String mainJs) { @@ -75,6 +77,7 @@ public class PluginWebPane extends JFXPanel { Map map4Tpl = new HashMap(); map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8")); + map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString()); while ((line = read.readLine()) != null) { if (sb.length() > 0) { sb.append('\n'); diff --git a/designer-chart/pom.xml b/designer-chart/pom.xml index 472b1e62ba..6a6bc80c09 100644 --- a/designer-chart/pom.xml +++ b/designer-chart/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/designer-form/pom.xml b/designer-form/pom.xml index 19df80505a..31c439f0cb 100644 --- a/designer-form/pom.xml +++ b/designer-form/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/designer-realize/pom.xml b/designer-realize/pom.xml index 1e9d72c76e..a0b56b093a 100644 --- a/designer-realize/pom.xml +++ b/designer-realize/pom.xml @@ -6,21 +6,21 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-realize - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3398bbd08a..408bc7be85 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.fr.report fine-report-designer - 10.0-RELEASE-SNAPSHOT + 10.0 ../design-settings/fine-report-designer @@ -19,7 +19,7 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 pom