From 9064435dc6d297e643279be4adf4874ae656d030 Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Tue, 9 Jul 2019 10:26:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/template/info/TemplateInfoCollector.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java index 330b9304a..9a13ed9d7 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java @@ -36,6 +36,7 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter { private static final String XML_TEMPLATE_INFO_LIST = "TemplateInfoList"; private static final String XML_FILE_NAME = "tpl.info"; private static TemplateInfoCollector instance; + private static final int MAX_SIZE = 512 * 1024 * 1024; private Map templateInfoMap; private DesignerOpenHistory designerOpenHistory; @@ -167,7 +168,7 @@ public class TemplateInfoCollector implements XMLReadable, XMLWriter { } private boolean shouldCollectInfo() { - return DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv(); + return FileUtils.sizeOf(getInfoFile()) <= MAX_SIZE && DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv(); } /** From 1e8db410ea592cb9151103349e562808f9cdc202 Mon Sep 17 00:00:00 2001 From: Hades Date: Tue, 9 Jul 2019 10:34:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-18570=20fr=E8=BF=9E=E6=8E=A5bi=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E9=A2=84=E8=A7=88=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/webattr/ViewToolBarPane.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java index 8f7e4b847..c396538dd 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java @@ -52,9 +52,10 @@ public class ViewToolBarPane extends AbstractEditToolBarPane { editToolBarButton.setEnabled(isUseToolBarCheckBox.isSelected()); } }); - sortCheckBox.setSelected(true); - conditonFilterBox.setSelected(true); - listFilterBox.setSelected(true); + // 切换BI工程目录 webView未设置 默认false + sortCheckBox.setSelected(false); + conditonFilterBox.setSelected(false); + listFilterBox.setSelected(false); northPane.add(GUICoreUtils.createFlowPane(new Component[]{sortCheckBox, conditonFilterBox, listFilterBox}, FlowLayout.LEFT, 6)); northPane.add(GUICoreUtils.createFlowPane(new Component[] {isUseToolBarCheckBox, editToolBarButton}, FlowLayout.LEFT)); northPane.add(GUICoreUtils.createFlowPane(showListenersLabel, FlowLayout.LEFT)); From 11f12434b4e7ffee7c85c631957434ffd6141ccf Mon Sep 17 00:00:00 2001 From: zheng Date: Tue, 9 Jul 2019 19:02:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CHART-9783=20=E5=9C=B0=E5=9B=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=93=8D=E4=BD=9C=E6=85=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/drillmap/designer/data/comp/MapDataTree.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java index 1bbb60e5d..825634547 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java @@ -97,7 +97,8 @@ public class MapDataTree extends JTree { } String dirPath = el.getUserObject().toString(); String url = CompatibleGEOJSONHelper.getJsonUrlByPathIncludeParam(dirPath); - if (GEOJSONTreeHelper.isValidDirPath(dirPath) && ComparatorUtils.equals(jsonUrl, url)) { + //先equals再valid原因：valid 远程下实时去服务器看有没有json文件 + if (ComparatorUtils.equals(jsonUrl, url) && GEOJSONTreeHelper.isValidDirPath(dirPath)) { selectTreeNode(el, m_model); return el; } @@ -150,7 +151,7 @@ public class MapDataTree extends JTree { DefaultMutableTreeNode el = els.nextElement(); String path = el.getUserObject().toString(); String fileName = ChartGEOJSONHelper.getPresentNameWithPath(path); - if (GEOJSONTreeHelper.isValidDirPath(path) && StringUtils.contains(fileName, text)) { + if (StringUtils.contains(fileName, text) && GEOJSONTreeHelper.isValidDirPath(path)) { selectTreeNode(el, m_model); return; }