From 8d1d3dabfb7ffa2efbd9cfe09239df675cbda80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Tue, 23 Feb 2021 11:32:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-18309=20=E6=A1=86=E6=9E=B6=E5=9B=BE?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/structure/desinger/style/StructureNodeStylePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index 333646c3c..be2f5ff3e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -52,7 +52,7 @@ public class StructureNodeStylePane extends BasicBeanPane { protected Component[][] getPaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Radius")), typeComboBox}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), typeComboBox}, new Component[]{null, centerPane}, }; } From 07c48910f14f3f27906ddc548550b56c5048d1c7 Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 23 Feb 2021 15:14:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-47782=20=E6=95=B0=E6=8D=AE=E9=9B=86-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5-=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=95=8C=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=8C=89=E9=92=AE=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=8A=B6=E6=80=81=E4=B8=8B=E6=B2=A1=E6=9C=89?= =?UTF-8?q?tooltips=EF=BC=8C=E4=BD=86=E6=98=AFUILockButton=E5=9C=A8?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E4=B8=80=E4=B8=AA=E7=A9=BA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=BC=9A=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=B0=8F=E6=96=B9=E6=A0=BC=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF?= =?UTF-8?q?=E3=80=91=E6=8A=8A=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAnull=EF=BC=8CsetTooltipsText=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=B8=AD=E4=BC=9A=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?null,=E5=A6=82=E6=9E=9C=E6=98=AFnull=E5=B0=B1=E4=BC=9A=E6=8A=8A?= =?UTF-8?q?tooltips=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/datapane/connect/ConnectionComboBoxPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java index db72768cb..1ce37b4c5 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java @@ -71,7 +71,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel { EditLockUtils.CONNECTION_LOCKED_ICON, IconUtils.readIcon("/com/fr/design/images/m_web/connection"), EditLockUtils.CONNECTION_LOCKED_TOOLTIPS, - StringUtils.EMPTY + null ); editButton.setPreferredSize(buttonSize); editButton.addActionListener(new ActionListener() {