From c11488c92d1cf5aefe37a95b2f60714834854f69 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Fri, 13 Sep 2024 19:55:56 +0800 Subject: [PATCH 1/7] =?UTF-8?q?REPORT-134212=20fix:=20=E3=80=90FBP?= =?UTF-8?q?=E3=80=91=E5=AD=97=E5=8F=B7=E9=80=89=E6=8B=A9=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E7=9A=84=E7=BC=96=E8=BE=91=E6=A1=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8/=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../style/axis/VanChartAxisPaneHelper.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisPaneHelper.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisPaneHelper.java index 770043af9c..5f7b3779bc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisPaneHelper.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisPaneHelper.java @@ -1,30 +1,16 @@ package com.fr.van.chart.designer.style.axis; -import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle; import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.van.chart.designer.TableLayout4VanChartHelper; -import javax.swing.JPanel; - public class VanChartAxisPaneHelper { public static ChartTextAttrPane createAxisTextAttrPane() { return ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() { protected double getEdithAreaWidth() { return TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; } - } : new ChartTextAttrPane() { - @Override - protected JPanel getContentPane(JPanel buttonPane) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; - double[] columnSize = {f, e}; - double[] rowSize = {p, p, p}; - - return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), rowSize, columnSize); - } - }; + } : new ChartTextAttrPane(); } } From 91fde4f64f0d3a6e01b04c4f7daed6e2ac2fcabc Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 17 Sep 2024 23:36:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?REPORT-134415=20=E3=80=90fr-fbp=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E3=80=91hive=E5=B9=B3=E5=8F=B0=E5=92=8C=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=20=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/connect/JDBCDefPane.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 0cb12a8315..ad159489bc 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -173,14 +173,15 @@ public class JDBCDefPane extends JPanel { urlTextField.setText(dus[i].getURL()); } } - // 更改数据库类型后 数据库名称置空和之前逻辑保持一致 - if (needRefresh) { - jdbcDatabase.setDatabase(StringUtils.EMPTY); + // 更改数据库类型后更新数据库名称 + if (needRefresh || StringUtils.isEmpty(jdbcDatabase.getDatabase())) { + jdbcDatabase.setDatabase(dbTypeMap.getOrDefault(GeneralUtils.objectToString(dbtypeComboBox.getSelectedItem()), DefaultDatabaseType.OTHER.getType())); } - jdbcDatabase.setDatabase(dbTypeMap.getOrDefault(GeneralUtils.objectToString(dbtypeComboBox.getSelectedItem()), DefaultDatabaseType.OTHER.getType())); + changePane(dbtypeComboBox.getSelectedItem()); JDBCConnectionDef.getInstance().setConnection((String) dbtypeComboBox.getSelectedItem(), jdbcDatabase); DatabaseConnectionPane.JDBC.getAdvancedAttrPane().populate(jdbcDatabase); + needRefresh = true; } }; private HashBiMap nameAndRepresent; @@ -414,6 +415,7 @@ public class JDBCDefPane extends JPanel { DriverURLName[] dus = entry.getValue(); for (int i = 0, len = dus.length; i < len; i++) { if (ComparatorUtils.equals(dus[i].getDriver(), jdbcDatabase.getDriver())) { + needRefresh = false; this.dbtypeComboBox.setSelectedItem(entry.getKey()); out = true; break; @@ -454,7 +456,6 @@ public class JDBCDefPane extends JPanel { } else { this.charSetComboBox.setSelectedItem(jdbcDatabase.getOriginalCharsetName()); } - needRefresh = false; } public JDBCDatabaseConnection update() { From 7edb2bd7498307eeca7b8cd307e4349090b14984 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 18 Sep 2024 09:39:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?REPORT-134241=20=E3=80=90=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E3=80=91FBP=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=9D=87=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=81=9A=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=BB=BB?= =?UTF-8?q?=E6=84=8F=E7=94=A8=E6=88=B7=E5=9D=87=E5=8F=AF=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/PreferencePane.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 1779ef20c1..a12586e60a 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -231,6 +231,7 @@ public class PreferencePane extends BasicPane { private UICheckBox autoPushUpdateCheckBox; private UICheckBox imageCompressPanelCheckBox; private UICheckBox cloudAnalyticsDelayCheckBox; + private UICheckBox useRemoteAuthControlCheckBox; private UICheckBox vcsEnableCheckBox; private UICheckBox useVcsAutoSaveScheduleCheckBox; @@ -319,7 +320,9 @@ public class PreferencePane extends BasicPane { // 模板预览性能 cell(createTplPreviewPane()), // 设计器启动选项 - cell(createDesignerStartupPane()) + cell(createDesignerStartupPane()), + // 远程权限控制 + cell(createRemoteAuthControlPane()).with(it -> it.setVisible(WorkContext.getCurrent().isRoot())) ).weight(1).getComponent(); useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager")); JPanel adviceScrollPane = patchScroll(advancePane); @@ -354,6 +357,12 @@ public class PreferencePane extends BasicPane { i18nText("Fine-Design_Startup_Option")); } + private Component createRemoteAuthControlPane() { + useRemoteAuthControlCheckBox = new UICheckBox(i18nText("Fine-Design_Use_Remote_Auth_Control")); + return FineUIUtils.wrapComponentWithTitle(column(10, cell(useRemoteAuthControlCheckBox)).getComponent(), + i18nText("Fine-Design_Use_Remote_Auth")); + } + private Component createTplPreviewPane() { imageCompressPanelCheckBox = new UICheckBox(i18nText("Fine-Design_Image_Compress")); return FineUIUtils.wrapComponentWithTitle(column(10, @@ -966,6 +975,9 @@ public class PreferencePane extends BasicPane { if (useOptimizedUPMCheckbox != null) { useOptimizedUPMCheckbox.setSelected(true); } + if (useRemoteAuthControlCheckBox != null) { + useRemoteAuthControlCheckBox.setSelected(ServerPreferenceConfig.getInstance().getUseRemoteAuthControl()); + } useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM()); @@ -1001,6 +1013,7 @@ public class PreferencePane extends BasicPane { this.cloudAnalyticsDelayCheckBox.setSelected(designerEnvManager.isCloudAnalyticsDelay()); this.startupPageEnabledCheckBox.setSelected(designerEnvManager.isStartupPageEnabled()); + this.useRemoteAuthControlCheckBox.setSelected(ServerPreferenceConfig.getInstance().getUseRemoteAuthControl()); } private int chooseCase(int sign) { @@ -1136,6 +1149,9 @@ public class PreferencePane extends BasicPane { if (useOptimizedUPMCheckbox != null) { ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected()); } + if (useRemoteAuthControlCheckBox != null) { + ServerPreferenceConfig.getInstance().setUseRemoteAuthControl(useRemoteAuthControlCheckBox.isSelected()); + } ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected()); } From 1aa1bf3a51b0caf5ae34282b77d679bd7069f3ea Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 18 Sep 2024 10:19:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?REPORT-134241=20=E3=80=90=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E3=80=91FBP=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=9D=87=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=81=9A=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=BB=BB?= =?UTF-8?q?=E6=84=8F=E7=94=A8=E6=88=B7=E5=9D=87=E5=8F=AF=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/PreferencePane.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index a12586e60a..1779ef20c1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -231,7 +231,6 @@ public class PreferencePane extends BasicPane { private UICheckBox autoPushUpdateCheckBox; private UICheckBox imageCompressPanelCheckBox; private UICheckBox cloudAnalyticsDelayCheckBox; - private UICheckBox useRemoteAuthControlCheckBox; private UICheckBox vcsEnableCheckBox; private UICheckBox useVcsAutoSaveScheduleCheckBox; @@ -320,9 +319,7 @@ public class PreferencePane extends BasicPane { // 模板预览性能 cell(createTplPreviewPane()), // 设计器启动选项 - cell(createDesignerStartupPane()), - // 远程权限控制 - cell(createRemoteAuthControlPane()).with(it -> it.setVisible(WorkContext.getCurrent().isRoot())) + cell(createDesignerStartupPane()) ).weight(1).getComponent(); useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager")); JPanel adviceScrollPane = patchScroll(advancePane); @@ -357,12 +354,6 @@ public class PreferencePane extends BasicPane { i18nText("Fine-Design_Startup_Option")); } - private Component createRemoteAuthControlPane() { - useRemoteAuthControlCheckBox = new UICheckBox(i18nText("Fine-Design_Use_Remote_Auth_Control")); - return FineUIUtils.wrapComponentWithTitle(column(10, cell(useRemoteAuthControlCheckBox)).getComponent(), - i18nText("Fine-Design_Use_Remote_Auth")); - } - private Component createTplPreviewPane() { imageCompressPanelCheckBox = new UICheckBox(i18nText("Fine-Design_Image_Compress")); return FineUIUtils.wrapComponentWithTitle(column(10, @@ -975,9 +966,6 @@ public class PreferencePane extends BasicPane { if (useOptimizedUPMCheckbox != null) { useOptimizedUPMCheckbox.setSelected(true); } - if (useRemoteAuthControlCheckBox != null) { - useRemoteAuthControlCheckBox.setSelected(ServerPreferenceConfig.getInstance().getUseRemoteAuthControl()); - } useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM()); @@ -1013,7 +1001,6 @@ public class PreferencePane extends BasicPane { this.cloudAnalyticsDelayCheckBox.setSelected(designerEnvManager.isCloudAnalyticsDelay()); this.startupPageEnabledCheckBox.setSelected(designerEnvManager.isStartupPageEnabled()); - this.useRemoteAuthControlCheckBox.setSelected(ServerPreferenceConfig.getInstance().getUseRemoteAuthControl()); } private int chooseCase(int sign) { @@ -1149,9 +1136,6 @@ public class PreferencePane extends BasicPane { if (useOptimizedUPMCheckbox != null) { ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected()); } - if (useRemoteAuthControlCheckBox != null) { - ServerPreferenceConfig.getInstance().setUseRemoteAuthControl(useRemoteAuthControlCheckBox.isSelected()); - } ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected()); } From b37b7415c74c6e527c2f3ce0dc92b2f675f6673f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 18 Sep 2024 13:56:50 +0800 Subject: [PATCH 5/7] =?UTF-8?q?REPORT-134842=20&=20REPORT-134740=20fix:?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E5=91=BD=E5=90=8D=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E9=97=AE=E9=A2=98=20&=20=E6=97=A5=E6=9C=9F=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/TableDataTreePane.java | 10 ++-- .../com/fr/design/gui/date/UIDatePicker.java | 51 ++++++++++--------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 7c542e4c5d..0552f836e8 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -81,7 +81,6 @@ import javax.swing.JScrollBar; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import javax.swing.ToolTipManager; -import javax.swing.border.EmptyBorder; import javax.swing.tree.TreePath; import java.awt.BorderLayout; import java.awt.Color; @@ -509,11 +508,10 @@ public class TableDataTreePane extends BasicTableDataTreePane { } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) { nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName)); dg.setButtonEnabled(false); - } else if (oldName.length() >= PROCEDURE_NAME_INDEX && tableDataPane.updateBean() instanceof MultiResultTableData) { - if (isIncludeUnderline(tempName)) { - nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multi_Result_Table_Data_Name_Tips")); - dg.setButtonEnabled(false); - } + } else if (oldName.length() >= PROCEDURE_NAME_INDEX && tableDataPane.updateBean() instanceof MultiResultTableData + && isIncludeUnderline(tempName)) { + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multi_Result_Table_Data_Name_Tips")); + dg.setButtonEnabled(false); } else if (!BasicTableDataUtils.checkName(tempName)) { dg.setButtonEnabled(false); } else { diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java b/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java index cbbc8ceeea..c37f5e88cd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java @@ -1,10 +1,7 @@ package com.fr.design.gui.date; -import com.fine.theme.icon.LazyIcon; -import com.fine.theme.utils.FineUIStyle; -import com.fr.design.gui.ibutton.UIButton; +import com.fine.theme.light.ui.FineComboBoxUI; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.icombobox.UIComboBoxUI; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; @@ -13,6 +10,7 @@ import com.fr.stable.StringUtils; import com.fr.design.carton.FeedbackToolboxDialog; import javax.swing.BorderFactory; +import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; import javax.swing.JPanel; @@ -26,6 +24,7 @@ import javax.swing.plaf.basic.ComboPopup; import java.awt.BorderLayout; import java.awt.Cursor; import java.awt.LayoutManager; +import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.Serializable; import java.text.ParseException; @@ -292,40 +291,44 @@ public class UIDatePicker extends UIComboBox implements Serializable { @Override protected ComboBoxUI getUIComboBoxUI() { - return new UIComboBoxUI() { + return new FineComboBoxUI() { @Override - protected UIButton createArrowButton() { - arrowButton = new UIButton(new LazyIcon("down_arrow")) { - public boolean shouldResponseChangeListener() { - return false; - } - }; - arrowButton.addMouseListener(this); - comboBox.addMouseListener(this); - FineUIStyle.setStyle(arrowButton, FineUIStyle.PLAIN_BUTTON); - return (UIButton) arrowButton; + protected JButton createArrowButton() { + JButton button = super.createArrowButton(); + button.addMouseListener(getPopupMouseAdapter()); + return button; } @Override protected ComboPopup createPopup() { return new DatePopup(comboBox); } + @Override - public void mousePressed(MouseEvent e) { - if (UIDatePicker.this.isPopupVisible()) { - willHide = true; - UIDatePicker.this.hidePopup(); - } else { - willHide = false; - UIDatePicker.this.showPopup(); - } + protected void installListeners() { + super.installListeners(); + comboBox.addMouseListener(getPopupMouseAdapter()); + } + + MouseAdapter getPopupMouseAdapter() { + return new MouseAdapter() { + @Override + public void mousePressed(MouseEvent e) { + if (UIDatePicker.this.isPopupVisible()) { + willHide = true; + UIDatePicker.this.hidePopup(); + } else { + willHide = false; + UIDatePicker.this.showPopup(); + } + } + }; } }; } - //设置dataFormat public void setDateFormat(SimpleDateFormat format){ this.dateFormat = format; From 4a5c3d8e2727052201035b5bd3640d391dcb3656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 18 Sep 2024 13:57:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=97=A0jira=20=E6=BC=8F=E7=BF=BB=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chartx/component/MapAreaMatchPane.java | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java index aadda3e77f..0334044235 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java @@ -1,6 +1,9 @@ package com.fr.design.chartx.component; import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.chartx.TwoTuple; import com.fr.data.TableDataSource; import com.fr.data.TableDataSourceTailor; @@ -31,19 +34,24 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.table.DefaultTableModel; import javax.swing.tree.DefaultMutableTreeNode; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; +import static com.fine.theme.utils.FineUIScale.scale; + /** * @author Bjorn * @version 10.0 @@ -67,49 +75,39 @@ public class MapAreaMatchPane extends BasicBeanPane { initButtonGroup(); initRefreshLabel(); areaNameBox = new UIComboBox(); - this.setLayout(new BorderLayout(5, 5)); + this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10)); this.add(createContentPane(), BorderLayout.NORTH); initTable(treeNodeAndItems); JPanel tablePane = new JPanel(); - tablePane.setLayout(new BorderLayout(5, 10)); - tablePane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); + tablePane.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10)); JScrollPane matchAreaScroll = new JScrollPane(matchAreaTable) { @Override public Dimension getPreferredSize() { - return new Dimension(400, 290); + return scale(new Dimension(400, 290)); } }; tablePane.add(matchAreaScroll, BorderLayout.CENTER); - JScrollPane matchResultScroll = new JScrollPane(matchResultTable) { + JScrollPane matchResultScroll = new JScrollPane(matchResultTable){ @Override public Dimension getPreferredSize() { - return new Dimension(400, 200); + return scale(new Dimension(400, 200)); } }; - matchResultScroll.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Custom_Match_List"))); - tablePane.add(matchResultScroll, BorderLayout.SOUTH); + Component matchResult = FineUIUtils.wrapComponentWithTitle(matchResultScroll, Toolkit.i18nText("Fine-Design_Chart_Custom_Match_List")); + tablePane.add(matchResult, BorderLayout.SOUTH); - this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); + this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.add(tablePane, BorderLayout.CENTER); } private JPanel createContentPane() { - JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - - JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - panel.add(tableDataPane); - tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")); - tableNameCombox.setPreferredSize(new Dimension(96, 20)); - tableDataPane.add(tableNameCombox); - - JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - panel.add(areaNamePane); - areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":")); - areaNamePane.add(areaNameBox); - areaNameBox.setPreferredSize(new Dimension(96, 20)); - panel.add(refreshLabel); - return panel; + tableNameCombox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + areaNameBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + return FineLayoutBuilder.createHorizontalLayout(10, + new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":"), tableNameCombox, + new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"), areaNameBox, + refreshLabel); } private void initTable(TwoTuple> treeNodeAndItems) { From 7ea61957f9fcad332b67fae88a4a1903bc1a6a29 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 18 Sep 2024 14:04:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?REPORT-133840=20=E3=80=90fr-fbp=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E3=80=91=E5=85=B3=E9=97=AD=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E8=BF=9B=E4=BC=9A=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=EF=BC=8C=E5=86=8D=E8=BF=9B?= =?UTF-8?q?=E4=BC=9A=E6=88=90=E5=8A=9F=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E4=BC=9A=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/gui/ibutton/UILockButton.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java index 77b5516f51..5f34b8320b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java @@ -4,6 +4,7 @@ import com.fr.design.editlock.EditLockChangeEvent; import com.fr.design.editlock.EditLockChangeListener; import com.fr.design.editlock.EditLockUtils; import com.fr.report.LockItem; +import com.fr.start.common.DesignerStartupContext; import javax.swing.Icon; @@ -41,7 +42,8 @@ public class UILockButton extends UIButton implements EditLockChangeListener { } private void init() { - boolean locked = EditLockUtils.isLocked(LockItem.CONNECTION); + // 设计器如果还在启动中就不需要判断上锁情况，界面都还没出现呢，直接短路掉 + boolean locked = !DesignerStartupContext.getInstance().isOnStartup() && EditLockUtils.isLocked(LockItem.CONNECTION); this.setIcon(locked ? lockedIcon : normalIcon); this.setToolTipText(locked ? lockedTooltips : normalTooltips); }