diff --git a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index bd702a29ce..9c45dd3bcc 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -995,7 +995,7 @@ public class CellDSColumnEditor extends CellQuickEditor { if (valueFormula.getContent().length() <= 1) { formulaTextField.setText(defaultValue); } else { - formulaTextField.setText(valueFormula.getContent().substring(1)); + formulaTextField.setText(valueFormula.getContent()); } } }).setVisible(true); diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java index cef4c2d964..c394e75197 100644 --- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java @@ -6,6 +6,7 @@ import com.fr.design.dialog.UIDialog; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; +import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.general.SiteCenter; @@ -13,6 +14,7 @@ import com.fr.general.http.HttpClient; import com.fr.json.JSONObject; import com.fr.plugin.PluginStoreConstants; import com.fr.plugin.PluginVerifyException; +import com.fr.stable.EnvChangedListener; import com.fr.stable.StableUtils; import javax.swing.*; @@ -35,6 +37,15 @@ public class WebViewDlgHelper { private static String installHome = FRContext.getCurrentEnv().getWebReportPath(); private static final int BYTES_NUM = 1024; + static { + GeneralContext.addEnvChangedListener(new EnvChangedListener() { + @Override + public void envChanged() { + installHome = FRContext.getCurrentEnv().getWebReportPath(); + } + }); + } + public static void createPluginDialog() { if (StableUtils.getMajorJavaVersion() >= VERSION_8) { String relativePath = "/scripts/plugin.html"; @@ -74,9 +85,8 @@ public class WebViewDlgHelper { /** * 检查script文件夹中的plugin.html文件 - * */ - public static void checkAndCopyMainFile(String indexPath, String mainJsPath){ + public static void checkAndCopyMainFile(String indexPath, String mainJsPath) { File file = new File(indexPath); if (!file.exists()) { copyMainFile(indexPath, mainJsPath); @@ -85,9 +95,8 @@ public class WebViewDlgHelper { /** * 將script文件夹中的plugin.html文件复制到webreport下 - * */ - public static void copyMainFile(String indexPath, String mainJsPath){ + public static void copyMainFile(String indexPath, String mainJsPath) { try { File mainJsFile = new File(mainJsPath); int byteread = 0; @@ -193,7 +202,7 @@ public class WebViewDlgHelper { if (get()) { String relativePath = "/scripts/plugin.html"; IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome); - copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"), StableUtils.pathJoin(installHome, relativePath)); + copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"), StableUtils.pathJoin(installHome, relativePath)); // TODO: 2017/4/17 删除之前存放在安装目录下的script PluginStoreConstants.refreshProps(); // 下载完刷新一下版本号等 JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java index dfe6ed91d9..a42ad2469a 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java @@ -158,7 +158,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane