From 555bf7789453df73e32ea1c4be6034cf305a5dfc Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 15 Oct 2020 10:42:04 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-38872=20=E8=AE=BE=E8=AE=A1=E5=99=A8h?= =?UTF-8?q?ttps=E8=AF=81=E4=B9=A6=E5=AF=86=E7=A0=81=E6=98=8E=E6=96=87?= =?UTF-8?q?=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/DesignerEnvManager.java | 17 ++++------------- .../src/main/java/com/fr/env/RemoteEnvPane.java | 16 +++++++++++----- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 6f1c94eee3..c6488d3300 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -418,21 +418,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { this.isHttps = isHttps; } - - public String getCertificatePath() { - return certificatePath; - } - - public void setCertificatePath(String certificatePath) { this.certificatePath = certificatePath; } - - public String getCertificatePass() { - return certificatePass; - } - public void setCertificatePass(String certificatePass) { this.certificatePass = certificatePass; } @@ -2015,11 +2004,13 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { private void writeHttpsParas(XMLPrintWriter writer) { writer.startTAG(CAS_PARAS); + // 这边的密钥path和password没有用处了 当前已经全部储存在对应的WorkspaceConnectionInfo中 + // 把历史遗留保存的全部置为空 防止显示明文密钥 后面删除 todo if (StringUtils.isNotBlank(certificatePath)) { - writer.attr(CAS_CERTIFICATE_PATH, certificatePath); + writer.attr(CAS_CERTIFICATE_PATH, StringUtils.EMPTY); } if (StringUtils.isNotBlank(certificatePass)) { - writer.attr(CAS_CERTIFICATE_PASSWORD, certificatePass); + writer.attr(CAS_CERTIFICATE_PASSWORD, StringUtils.EMPTY); } if (isHttps) { writer.attr("enable", true); diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index 4fe69e6a9a..b76e06912c 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -143,6 +143,12 @@ public class RemoteEnvPane extends BasicBeanPane { * https 证书路径输入框 */ private JPanel httpsCertFileInputPanel; + + /** + * 当前远程工作目录是否为新创建的 + */ + private boolean newCreate; + /** * 主机名，web应用，Servlet，端口监听器 */ @@ -327,7 +333,7 @@ public class RemoteEnvPane extends BasicBeanPane { this.certPathInput.setText(certPath); this.certSecretKeyInput.setText(certSecretKey); this.rememberPwdCheckbox.setSelected(rememberPwd); - + this.newCreate = ob.isNewCreated(); } else { this.remoteWorkspaceURL = RemoteWorkspaceURL.createDefaultURL(); this.usernameInput.setText(StringUtils.EMPTY); @@ -335,6 +341,7 @@ public class RemoteEnvPane extends BasicBeanPane { this.certPathInput.setText(StringUtils.EMPTY); this.certSecretKeyInput.setText(StringUtils.EMPTY); this.rememberPwdCheckbox.setSelected(true); + this.newCreate = true; } fillRemoteEnvURLField(); @@ -366,7 +373,9 @@ public class RemoteEnvPane extends BasicBeanPane { new String(this.certSecretKeyInput.getPassword()), rememberPwd); - return RemoteDesignerWorkspaceInfo.create(connection); + RemoteDesignerWorkspaceInfo info = RemoteDesignerWorkspaceInfo.create(connection); + info.setNewCreated(newCreate); + return info; } @Override @@ -567,9 +576,6 @@ public class RemoteEnvPane extends BasicBeanPane { @Override protected TestConnectionResult doInBackground() throws Exception { - - DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath()); - DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey()); try { return TestConnectionResult.parse(WorkContext.getConnector().testConnection(connection), connection); } catch (WorkspaceAuthException ignored) { From 24d865d69176d673d4f48f88565f1f05b24f25a8 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 15 Oct 2020 10:47:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-38872=20=E4=BF=AE=E6=94=B9=E4=B8=8B?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/env/RemoteEnvPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index b76e06912c..5257e74f42 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -147,7 +147,7 @@ public class RemoteEnvPane extends BasicBeanPane { /** * 当前远程工作目录是否为新创建的 */ - private boolean newCreate; + private boolean newCreated; /** * 主机名，web应用，Servlet，端口监听器 @@ -333,7 +333,7 @@ public class RemoteEnvPane extends BasicBeanPane { this.certPathInput.setText(certPath); this.certSecretKeyInput.setText(certSecretKey); this.rememberPwdCheckbox.setSelected(rememberPwd); - this.newCreate = ob.isNewCreated(); + this.newCreated = ob.isNewCreated(); } else { this.remoteWorkspaceURL = RemoteWorkspaceURL.createDefaultURL(); this.usernameInput.setText(StringUtils.EMPTY); @@ -341,7 +341,7 @@ public class RemoteEnvPane extends BasicBeanPane { this.certPathInput.setText(StringUtils.EMPTY); this.certSecretKeyInput.setText(StringUtils.EMPTY); this.rememberPwdCheckbox.setSelected(true); - this.newCreate = true; + this.newCreated = true; } fillRemoteEnvURLField(); @@ -374,7 +374,7 @@ public class RemoteEnvPane extends BasicBeanPane { rememberPwd); RemoteDesignerWorkspaceInfo info = RemoteDesignerWorkspaceInfo.create(connection); - info.setNewCreated(newCreate); + info.setNewCreated(newCreated); return info; } From fd630a18010a8001dda1c63e074a8b76c90672e3 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 15 Oct 2020 19:01:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?REPORT-38688=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=9C=A8=E5=8F=8C=E5=B1=8F=E4=B8=8B=E6=8B=96=E5=8A=A8=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E5=8D=A1=E5=B1=8F=E7=9A=84=E7=8E=B0=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/DesignerFrame.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index 2f65fca0a8..b734110612 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java @@ -548,9 +548,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta contentHeight = layeredPane.getHeight(); contentWidth = layeredPane.getWidth(); - layeredPane.remove(basePane); + // 这个地方remove和add都是一个对象 完全没有必要remove再add 改变了窗口大小重新设置下 然后有repaint即可 basePane.setBounds(0, 0, contentWidth, contentHeight); - layeredPane.add(basePane); layeredPane.repaint(); } From a79aea8254337b68314c42ad2f2c211a31197553 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Thu, 15 Oct 2020 21:20:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?CHART-16226=20=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=BB=98=E8=AE=A4=E5=B1=85=E5=B7=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../box/VanChartBoxTooltipContentPane.java | 10 ++++++++- .../component/VanChartLabelContentPane.java | 6 ++++++ .../component/VanChartRichEditorPane.java | 21 +++++++++++++++++-- .../style/VanChartFunnelLabelContentPane.java | 3 ++- .../label/VanChartMapLabelContentPane.java | 3 ++- .../VanChartMultiPieLabelContentPane.java | 3 ++- .../VanChartStructureLabelContentPane.java | 3 ++- .../VanChartWordCloudTooltipContentPane.java | 9 ++++++++ .../com/fr/design/editor/rich_editor.html | 10 +++++---- 9 files changed, 57 insertions(+), 11 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java index abba5f7539..d6a30bf50c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java @@ -254,7 +254,15 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane { } protected AttrTooltipContent createAttrTooltip() { - return new AttrBoxTooltipContent(detailed); + AttrTooltipContent boxTooltipContent = new AttrBoxTooltipContent(detailed); + + boxTooltipContent.getCategoryFormat().setEnable(true); + boxTooltipContent.getSeriesFormat().setEnable(true); + + boxTooltipContent.getRichTextCategoryFormat().setEnable(true); + boxTooltipContent.getRichTextSeriesFormat().setEnable(true); + + return boxTooltipContent; } protected void populateFormatPane(AttrTooltipContent attrTooltipContent) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java index 7fe05a3600..957fcdaf72 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java @@ -1,5 +1,7 @@ package com.fr.van.chart.designer.component; +import com.fr.plugin.chart.base.AttrTooltipContent; +import com.fr.plugin.chart.type.TextAlign; import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -15,4 +17,8 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane { protected VanChartHtmlLabelPane createHtmlLabelPane() { return new VanChartHtmlLabelPaneWithBackGroundLabel(); } + + protected AttrTooltipContent createAttrTooltip() { + return new AttrTooltipContent(TextAlign.CENTER); + } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java index 615979f306..408b730b28 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java @@ -2,6 +2,7 @@ package com.fr.van.chart.designer.component; import com.fr.design.ui.ModernUIPane; import com.fr.plugin.chart.base.AttrTooltipRichText; +import com.fr.plugin.chart.type.TextAlign; import com.fr.stable.StringUtils; import com.teamdev.jxbrowser.chromium.Browser; import com.teamdev.jxbrowser.chromium.JSValue; @@ -71,12 +72,18 @@ public class VanChartRichEditorPane { String content = richText.getContent(); String initParams = StringUtils.EMPTY; + String align = StringUtils.EMPTY; if (content.contains("data-id") && !content.contains("class")) { initParams = richText.getInitParamsContent(); + + String left = TextAlign.LEFT.getAlign(); + String center = TextAlign.CENTER.getAlign(); + + align = content.contains(left) ? left : center; } - return new RichEditorModel(content, richText.isAuto(), paramsStr.toString(), initParams); + return new RichEditorModel(content, richText.isAuto(), paramsStr.toString(), initParams, align); } public static class RichEditorModel { @@ -84,12 +91,14 @@ public class VanChartRichEditorPane { private boolean auto; private String params; private String initParams; + private String align; - public RichEditorModel(String content, boolean auto, String params, String initParams) { + public RichEditorModel(String content, boolean auto, String params, String initParams, String align) { this.content = content; this.auto = auto; this.params = params; this.initParams = initParams; + this.align = align; } public String getContent() { @@ -123,5 +132,13 @@ public class VanChartRichEditorPane { public void setInitParams(String initParams) { this.initParams = initParams; } + + public String getAlign() { + return align; + } + + public void setAlign(String align) { + this.align = align; + } } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java index c12f40058e..d7b9f9da47 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java @@ -4,6 +4,7 @@ import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.base.AttrTooltipRichText; import com.fr.plugin.chart.base.format.AttrTooltipFormat; import com.fr.plugin.chart.base.format.AttrTooltipNameFormat; +import com.fr.plugin.chart.type.TextAlign; import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox; @@ -82,7 +83,7 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane { } protected AttrTooltipContent createAttrTooltip() { - AttrTooltipContent attrTooltipContent = new AttrTooltipContent(); + AttrTooltipContent attrTooltipContent = new AttrTooltipContent(TextAlign.CENTER); attrTooltipContent.getCategoryFormat().setEnable(false); attrTooltipContent.getRichTextCategoryFormat().setEnable(false); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java index f73c32a48b..95e2864584 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java @@ -3,6 +3,7 @@ package com.fr.van.chart.map.designer.style.label; import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat; import com.fr.plugin.chart.base.format.AttrTooltipMapValueFormat; +import com.fr.plugin.chart.type.TextAlign; import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithoutCheckBox; @@ -42,7 +43,7 @@ public class VanChartMapLabelContentPane extends VanChartLabelContentPane { @Override protected AttrTooltipContent createAttrTooltip() { - AttrTooltipContent content = new AttrTooltipContent(); + AttrTooltipContent content = new AttrTooltipContent(TextAlign.CENTER); content.setCategoryFormat(new AttrTooltipAreaNameFormat()); content.setValueFormat(new AttrTooltipMapValueFormat()); content.setRichTextCategoryFormat(new AttrTooltipAreaNameFormat()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java index a3d8f3c576..09093b0993 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java @@ -2,6 +2,7 @@ package com.fr.van.chart.multilayer.style; import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; +import com.fr.plugin.chart.type.TextAlign; import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox; @@ -36,7 +37,7 @@ public class VanChartMultiPieLabelContentPane extends VanChartLabelContentPane { } protected AttrTooltipContent createAttrTooltip() { - AttrTooltipContent content = new AttrTooltipContent(); + AttrTooltipContent content = new AttrTooltipContent(TextAlign.CENTER); content.setCategoryFormat(new AttrTooltipMultiLevelNameFormat()); content.setRichTextCategoryFormat(new AttrTooltipMultiLevelNameFormat()); return content; diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java index bfe147ba60..4e20364653 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java @@ -4,6 +4,7 @@ package com.fr.van.chart.structure.desinger.style; import com.fr.design.i18n.Toolkit; import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; +import com.fr.plugin.chart.type.TextAlign; import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox; @@ -60,7 +61,7 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane @Override protected AttrTooltipContent createAttrTooltip() { - AttrTooltipContent attrTooltipContent = new AttrTooltipContent(); + AttrTooltipContent attrTooltipContent = new AttrTooltipContent(TextAlign.CENTER); attrTooltipContent.setCategoryFormat(new AttrTooltipMultiLevelNameFormat()); return attrTooltipContent; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java index c0e9ac6c37..273d85ae81 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java @@ -82,6 +82,15 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP AttrTooltipContent attrTooltipContent = new AttrTooltipContent(); attrTooltipContent.setSeriesFormat(new AttrTooltipNameFormat()); attrTooltipContent.setRichTextSeriesFormat(new AttrTooltipNameFormat()); + + attrTooltipContent.getCategoryFormat().setEnable(true); + attrTooltipContent.getSeriesFormat().setEnable(true); + attrTooltipContent.getValueFormat().setEnable(true); + + attrTooltipContent.getRichTextCategoryFormat().setEnable(true); + attrTooltipContent.getRichTextSeriesFormat().setEnable(true); + attrTooltipContent.getRichTextValueFormat().setEnable(true); + return attrTooltipContent; } } diff --git a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html index e19ec4b4b5..a0cd5781d9 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html +++ b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html @@ -41,6 +41,7 @@ var isAuto = Pool.data.isAuto(); var params = Pool.data.getParams(); var initParams = Pool.data.getInitParams(); + var align = Pool.data.getAlign(); var getDimensionIds = function (params) { var result = []; @@ -58,7 +59,7 @@ return result; } - var getInitContent = function (params, initParams) { + var getInitContent = function (params, initParams, align) { var editorService = BI.Services.getService("bi.service.design.chart.common.editor"); var paramGroup = params.split("-"); @@ -68,7 +69,7 @@ var [key, value] = paramGroup[i].split(":"); if (initParams.indexOf(value) > -1) { - content += '

' + editorService.getEditorParamImage(key) + '

'; + content += '

' + editorService.getEditorParamImage(key) + '

'; } } @@ -78,7 +79,7 @@ var dimensionIds = getDimensionIds(params); if (initParams) { - content = getInitContent(params, initParams); + content = getInitContent(params, initParams, align); } var rich_editor = BI.createWidget({ @@ -118,9 +119,10 @@ var isAuto = Pool.data.isAuto(); var params = Pool.data.getParams(); var initParams = Pool.data.getInitParams(); + var align = Pool.data.getAlign(); if (initParams) { - content = getInitContent(params, initParams); + content = getInitContent(params, initParams, align); } rich_editor.setValue({ From 9532ffe6585cf2205932451738c2d356a1de1abb Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Fri, 16 Oct 2020 10:29:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/box/VanChartBoxTooltipContentPane.java | 10 +--------- .../style/VanChartWordCloudTooltipContentPane.java | 9 --------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java index d6a30bf50c..abba5f7539 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java @@ -254,15 +254,7 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane { } protected AttrTooltipContent createAttrTooltip() { - AttrTooltipContent boxTooltipContent = new AttrBoxTooltipContent(detailed); - - boxTooltipContent.getCategoryFormat().setEnable(true); - boxTooltipContent.getSeriesFormat().setEnable(true); - - boxTooltipContent.getRichTextCategoryFormat().setEnable(true); - boxTooltipContent.getRichTextSeriesFormat().setEnable(true); - - return boxTooltipContent; + return new AttrBoxTooltipContent(detailed); } protected void populateFormatPane(AttrTooltipContent attrTooltipContent) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java index 273d85ae81..c0e9ac6c37 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java @@ -82,15 +82,6 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP AttrTooltipContent attrTooltipContent = new AttrTooltipContent(); attrTooltipContent.setSeriesFormat(new AttrTooltipNameFormat()); attrTooltipContent.setRichTextSeriesFormat(new AttrTooltipNameFormat()); - - attrTooltipContent.getCategoryFormat().setEnable(true); - attrTooltipContent.getSeriesFormat().setEnable(true); - attrTooltipContent.getValueFormat().setEnable(true); - - attrTooltipContent.getRichTextCategoryFormat().setEnable(true); - attrTooltipContent.getRichTextSeriesFormat().setEnable(true); - attrTooltipContent.getRichTextValueFormat().setEnable(true); - return attrTooltipContent; } } From 407072ba40eb44ac59578ceb6cad81e885df774c Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Fri, 16 Oct 2020 15:01:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?CHART-15955=20&=20CHART-16115=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=AF=8C=E6=96=87=E6=9C=AC=E7=95=8C=E9=9D=A2=E5=AE=BD?= =?UTF-8?q?=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/designer/component/VanChartRichEditorDialog.java | 2 +- .../src/main/resources/com/fr/design/editor/script/editor.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorDialog.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorDialog.java index e584ea5444..a13208df56 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorDialog.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorDialog.java @@ -10,7 +10,7 @@ import java.awt.Frame; public class VanChartRichEditorDialog extends BasicDialog { - public static final Dimension DEFAULT = new Dimension(660, 600); + public static final Dimension DEFAULT = new Dimension(960, 600); public VanChartRichEditorDialog(Frame parent, BasicPane pane) { super(parent, pane); diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js index 2d8bc97a82..e8d9e9a56e 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js +++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js @@ -27,7 +27,6 @@ this.editor = BI.createWidget({ type: "bi.nic_editor", $value: "chart-common-editor", - height: 365, cls: "editor bi-border bi-focus-shadow " + (o.textAlign === "center" ? "editor-center-text" : ""), listeners: [{ eventName: BI.NicEditor.EVENT_FOCUS,