From 5f5ee8e203d6044461764f19313824842025c230 Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Tue, 13 Aug 2024 17:30:54 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-127436=E3=80=90NewUI=E3=80=91fix:?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D:=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E=E6=80=A7/?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4/?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=9B=BE=E6=A0=87/=E5=8F=8D=E7=99=BD?= =?UTF-8?q?=E5=9B=BE=E6=A0=87/=E5=B7=A5=E5=85=B7=E6=A0=8F&=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E8=8F=9C=E5=8D=95=E7=AC=A6=E5=90=88=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/file/SaveTemplateAction.java | 2 +- .../data/datapane/TreeTableDataDictPane.java | 2 -- .../tabledatapane/ClassTableDataPane.java | 2 -- .../tabledatapane/EmbeddedTableDataPane.java | 1 - .../tabledatapane/FileTableDataPane.java | 29 ++++++++-------- .../tabledatapane/MultiTDTableDataPane.java | 12 ++++--- .../AbstractTemplateServerSettingPane.java | 5 ++- .../com/fr/design/editor/editor/Editor.java | 2 +- .../itableeditorpane/UITableEditorPane.java | 4 +-- .../com/fr/design/gui/itoolbar/UIToolbar.java | 5 ++- .../theme/ThemedCellStyleListPane.java | 9 ++--- .../com/fine/theme/icon/cell/selectedMark.svg | 11 +++++++ .../theme/icon/cell/selectedMark_disable.svg | 11 +++++++ .../com/fine/theme/icon/chart/chart_area.svg | 5 +++ .../theme/icon/chart/chart_area_disable.svg | 5 +++ .../com/fine/theme/icon/chart/chart_bar.svg | 6 ++++ .../theme/icon/chart/chart_bar_disable.svg | 6 ++++ .../com/fine/theme/icon/chart/chart_box.svg | 5 +++ .../theme/icon/chart/chart_box_disable.svg | 5 +++ .../fine/theme/icon/chart/chart_bubble.svg | 5 +++ .../theme/icon/chart/chart_bubble_disable.svg | 5 +++ .../fine/theme/icon/chart/chart_column.svg | 6 ++++ .../theme/icon/chart/chart_column_disable.svg | 6 ++++ .../fine/theme/icon/chart/chart_combine.svg | 7 ++++ .../icon/chart/chart_combine_disable.svg | 7 ++++ .../com/fine/theme/icon/chart/chart_donut.svg | 5 +++ .../theme/icon/chart/chart_donut_disable.svg | 5 +++ .../fine/theme/icon/chart/chart_drillMap.svg | 7 ++++ .../icon/chart/chart_drillMap_disable.svg | 7 ++++ .../com/fine/theme/icon/chart/chart_frame.svg | 6 ++++ .../theme/icon/chart/chart_frame_disable.svg | 6 ++++ .../fine/theme/icon/chart/chart_funnel.svg | 5 +++ .../theme/icon/chart/chart_funnel_disable.svg | 5 +++ .../com/fine/theme/icon/chart/chart_gantt.svg | 6 ++++ .../theme/icon/chart/chart_gantt_disable.svg | 6 ++++ .../fine/theme/icon/chart/chart_heatMap.svg | 11 +++++++ .../icon/chart/chart_heatMap_disable.svg | 11 +++++++ .../com/fine/theme/icon/chart/chart_line.svg | 5 +++ .../theme/icon/chart/chart_line_disable.svg | 5 +++ .../com/fine/theme/icon/chart/chart_map.svg | 4 +++ .../theme/icon/chart/chart_map_disable.svg | 4 +++ .../com/fine/theme/icon/chart/chart_meter.svg | 8 +++++ .../theme/icon/chart/chart_meter_disable.svg | 8 +++++ .../fine/theme/icon/chart/chart_multiPie.svg | 10 ++++++ .../icon/chart/chart_multiPie_disable.svg | 10 ++++++ .../com/fine/theme/icon/chart/chart_pie.svg | 5 +++ .../theme/icon/chart/chart_pie_disable.svg | 5 +++ .../com/fine/theme/icon/chart/chart_radar.svg | 5 +++ .../theme/icon/chart/chart_radar_disable.svg | 5 +++ .../theme/icon/chart/chart_rectangleTree.svg | 7 ++++ .../chart/chart_rectangleTree_disable.svg | 7 ++++ .../fine/theme/icon/chart/chart_scatter.svg | 9 +++++ .../icon/chart/chart_scatter_disable.svg | 9 +++++ .../fine/theme/icon/chart/chart_wordCloud.svg | 6 ++++ .../icon/chart/chart_wordCloud_disable.svg | 6 ++++ .../fine/theme/icon/chart/polyReportBlock.svg | 11 +++++++ .../icon/chart/polyReportBlock_disable.svg | 8 +++++ .../icon/filetree/filetype/csvFile_white.svg | 4 +++ .../filetree/filetype/excelFile_white.svg | 4 +++ .../filetree/filetype/excel_import_white.svg | 6 ++++ .../icon/filetree/filetype/pdfFile_white.svg | 4 +++ .../icon/filetree/filetype/svgFile_white.svg | 4 +++ .../icon/filetree/filetype/txtFile_white.svg | 4 +++ .../icon/filetree/filetype/wordFile_white.svg | 4 +++ .../com/fine/theme/icon/toolbar/createFrm.svg | 7 ++++ .../theme/icon/toolbar/createFrm_disable.svg | 7 ++++ .../com/fine/theme/icon/toolbar/createFvs.svg | 8 +++++ .../theme/icon/toolbar/createFvs_disable.svg | 8 +++++ .../fine/theme/icon/toolbar/localConnect.svg | 4 +++ .../icon/toolbar/localConnect_disable.svg | 4 +++ .../fine/theme/icon/toolbar/remoteConnect.svg | 3 ++ .../icon/toolbar/remoteConnect_disable.svg | 3 ++ .../icon/toolbar/remoteDesignAuthManager.svg | 3 ++ .../remoteDesignAuthManager_disable.svg | 3 ++ .../icon/toolbar/templateThemeManager.svg | 3 ++ .../toolbar/templateThemeManager_disable.svg | 3 ++ .../toolbar/templateThemeManager_white.svg | 3 ++ .../fine/theme/light/ui/fine_light.icon.json | 24 +++++++++++++- .../light/ui/laf/FineLightLaf.properties | 3 +- .../com/fr/design/EnvChangeEntranceTest.java | 4 +-- .../fr/design/ChartTypeInterfaceManager.java | 27 +++++++++++---- .../design/chart/fun/ChartTypeUIProvider.java | 8 +++++ .../fun/impl/AbstractIndependentChartsUI.java | 5 +++ .../fr/design/type/ui/AreaChartTypeUI.java | 8 +++++ .../com/fr/design/type/ui/BarChartTypeUI.java | 8 +++++ .../fr/design/type/ui/BubbleChartTypeUI.java | 8 +++++ .../fr/design/type/ui/ColumnChartTypeUI.java | 8 +++++ .../fr/design/type/ui/CustomChartTypeUI.java | 8 +++++ .../fr/design/type/ui/DonutChartTypeUI.java | 8 +++++ .../fr/design/type/ui/FunnelChartTypeUI.java | 8 +++++ .../fr/design/type/ui/GanttChartTypeUI.java | 8 +++++ .../fr/design/type/ui/LineChartTypeUI.java | 8 +++++ .../com/fr/design/type/ui/MapChartTypeUI.java | 8 +++++ .../fr/design/type/ui/MeterChartTypeUI.java | 8 +++++ .../com/fr/design/type/ui/PieChartTypeUI.java | 8 +++++ .../fr/design/type/ui/RadarChartTypeUI.java | 8 +++++ .../fr/design/type/ui/StockChartTypeUI.java | 8 +++++ .../design/type/ui/XYScatterChartTypeUI.java | 8 +++++ .../AreaIndependentVanChartInterface.java | 5 +++ .../bar/BarIndependentVanChartInterface.java | 5 +++ .../box/BoxIndependentVanChartInterface.java | 8 +++++ .../BubbleIndependentVanChartInterface.java | 5 +++ .../chart/column/VanColumnChartTypeUI.java | 5 +++ .../CustomIndependentVanChartInterface.java | 5 +++ .../drillmap/VanDrillMapChartTypeUI.java | 6 ++++ .../FunnelIndependentVanChartInterface.java | 5 +++ .../GanttIndependentVanChartInterface.java | 5 +++ .../GaugeIndependentVanChartInterface.java | 5 +++ .../designer/VanHeatMapChartTypeUI.java | 5 +++ .../LineIndependentVanChartInterface.java | 5 +++ .../fr/van/chart/map/VanMapChartTypeUI.java | 5 +++ .../MultiPieIndependentVanChartInterface.java | 5 +++ .../pie/PieIndependentVanChartInterface.java | 5 +++ .../RadarIndependentVanChartInterface.java | 5 +++ .../ScatterIndependentVanChartInterface.java | 5 +++ .../desinger/VanStructureChartTypeUI.java | 5 +++ .../TreeMapIndependentVanChartInterface.java | 5 +++ ...WordCloudIndependentVanChartInterface.java | 5 +++ .../design/designer/creator/XWFitLayout.java | 5 +++ .../designer/creator/XWParameterLayout.java | 5 +++ .../com/fr/design/mainframe/FormParaPane.java | 6 ++-- .../cell/settingpane/CellStylePane.java | 2 -- .../CellDesensitizationGroupsPane.java | 8 ++--- .../model/DesensitizationCellPane.java | 4 ++- .../cell/settingpane/style/StylePane.java | 3 +- .../java/com/fr/poly/PolyComponentsBar.java | 33 ++++++++++++++++--- 126 files changed, 766 insertions(+), 64 deletions(-) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java index 9883034746..52a57b3a92 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java @@ -21,7 +21,7 @@ public class SaveTemplateAction extends JTemplateAction> { this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(new LazyIcon("save")); + this.setSmallIcon(new LazyIcon("saveFile")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java index 040c0ce9fb..45d80279ae 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java @@ -1,6 +1,5 @@ package com.fr.design.data.datapane; -import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.impl.RecursionTableData; import com.fr.design.constants.LayoutConstants; import com.fr.design.data.DesignTableDataManager; @@ -61,7 +60,6 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { public TreeTableDataDictPane(String treeName) { this.setLayout(new BorderLayout()); - this.setBorder(new ScaledEmptyBorder(10,10,10,10)); //请选择一个数据集 selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") ); setTableDataNameComboBox(treeName); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 04bda940c0..96204b1745 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -30,7 +30,6 @@ import java.awt.event.ActionListener; import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.column; -import static com.fine.swing.ui.layout.Layouts.fix; import static com.fine.swing.ui.layout.Layouts.flex; import static com.fine.swing.ui.layout.Layouts.row; @@ -40,7 +39,6 @@ public class ClassTableDataPane extends AbstractTableDataPane { public ClassTableDataPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(10,10,10,10)); //类名 classNameTextField = new UITextField(); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java index 61b3bea3ab..27dfa07e2a 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java @@ -55,7 +55,6 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane { @@ -132,15 +135,14 @@ public class FileTableDataPane extends AbstractTableDataPane { public FileTableDataPane(double localWidthRatio, double urlWidthRatio) { this.setLayout(new BorderLayout()); - this.setBorder(new ScaledEmptyBorder(10,10,10,10)); //文件类型 JPanel fileType = new JPanel(new BorderLayout()); String[] item = {"TXT", "Excel", "XML"}; fileTypeComboBox = new UIComboBox(item); + fileTypeComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); fileType.add(row(LayoutConstants.HGAP_LARGE, cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type"))).weight(0.12), - cell(fileTypeComboBox).weight(0.18), - flex(0.7) + row(cell(fileTypeComboBox), flex()).weight(0.88) ).getComponent()); //参数面板 @@ -151,36 +153,32 @@ public class FileTableDataPane extends AbstractTableDataPane { } }; editorPane = new UITableEditorPane(model); - editorPane.setBorder(new ScaledEmptyBorder(0,0,0,10)); - editorPane.setPreferredSize(FineUIScale.scale(new Dimension(-1, 150))); //左侧文件地址pane JPanel leftPanel = new JPanel(new BorderLayout()); leftPanel.add(column( LayoutConstants.VERTICAL_GAP, cell(getCenterPanel(localWidthRatio, urlWidthRatio)), - cell(editorPane) + cell(editorPane).weight(1) ).getComponent()); //右侧设定pane JPanel rightPanel = new JPanel(new BorderLayout()); - rightPanel.setBorder(new ScaledEmptyBorder(0,0,0,10)); rightPanel.add(getTextSetPanel()); fileTypeComboBox.addActionListener(getFileTypeListener(rightPanel)); - rightPanel.setPreferredSize(FineUIScale.scale(new Dimension(-1, 400))); //文件数据集整体布局，服务器数据集/模板数据集下的文件数据集，创建文件数据集，三处面板通用布局 this.add(column(LayoutConstants.VERTICAL_GAP, cell(fileType), row(20, - cell(wrapComponentWithTitle(leftPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File_Address"))).weight(0.5), - cell(wrapComponentWithTitle(rightPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"))).weight(0.5) - ) + cell(wrapComponentWithTitle(leftPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File_Address"))).weight(0.55), + cell(wrapComponentWithTitle(rightPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"))).weight(0.45) + ).weight(1) ).getComponent()); } /** * 文件地址上方的面板-文件选择 - * @return + * @return JPanel */ private JPanel getCenterPanel(double localWidthRatio, double urlWidthRatio) { // 本地文件/URL @@ -220,7 +218,7 @@ public class FileTableDataPane extends AbstractTableDataPane { cell(testConnection).weight(0.75 - urlWidthRatio) ), cell(tips) - ).with(it -> it.setBorder(new ScaledEmptyBorder(0,0,0,10))).getComponent(); + ).getComponent(); } private ActionListener testConnectionListener = new ActionListener() { @@ -391,7 +389,7 @@ public class FileTableDataPane extends AbstractTableDataPane { cell(tableDismemberRadioButton), cell(spaceDismenberRadioButton), cell(commaDismenberRadioButton), - row(cell(otherDismenberRadioButton).weight(0.2), cell(otherDismenberTextField).weight(0.8)) + row(cell(otherDismenberRadioButton), fix(20), cell(otherDismenberTextField).weight(1)) ).getComponent(); //TXT设定主要面板 return column( @@ -832,8 +830,7 @@ public class FileTableDataPane extends AbstractTableDataPane { toolbarDef.addShortCut(refreshAction); UIToolbar toolBar = ToolBarDef.createJToolBar(); toolbarDef.updateToolBar(toolBar); - toolbarPanel.add(keyPointLaber, BorderLayout.WEST); - toolbarPanel.add(toolBar, BorderLayout.EAST); + toolbarPanel.add(row(cell(keyPointLaber), flex(), cell(toolBar)).getComponent()); this.add(toolbarPanel, BorderLayout.NORTH); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java index 33c1377496..25964be6d8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java @@ -28,11 +28,16 @@ import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; import javax.swing.Icon; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.awt.*; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.BorderLayout; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -64,7 +69,6 @@ public class MultiTDTableDataPane extends AbstractTableDataPane it.setBorder(new ScaledEmptyBorder(0,10,0,0))).getComponent(); this.setLayout(new BorderLayout()); diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java b/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java index 97b507ffca..2119d78b44 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java @@ -51,7 +51,7 @@ public abstract class Editor extends JComponent { } public String getIconId(){ - return null; + return StringUtils.EMPTY; } public String getName() { diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index 18979b677b..575101901b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -1,11 +1,11 @@ package com.fr.design.gui.itableeditorpane; import com.fine.swing.ui.layout.Layouts; -import com.fine.swing.ui.layout.Row; import com.fine.theme.light.ui.FineRoundBorder; import com.fine.theme.light.ui.FineTableHeaderUI; import com.fine.theme.light.ui.FineTableScrollBarPaneUI; import com.fine.theme.utils.FineUIScale; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; @@ -78,7 +78,7 @@ public class UITableEditorPane extends BasicPane { controlPane.add(content == null ? l : content, BorderLayout.WEST); scrollPane.getVerticalScrollBar().setUI(new FineTableScrollBarPaneUI(editTable)); - pane.add(Layouts.column(10, Layouts.cell(controlPane), Layouts.cell(scrollPane).weight(1)).getComponent()); + pane.add(Layouts.column(LayoutConstants.HGAP_LARGE, Layouts.cell(controlPane), Layouts.cell(scrollPane).weight(1)).getComponent()); this.editTable.getTableHeader().setUI(new FineTableHeaderUI()); this.editTable.setRowHeight(FineUIScale.scale(24)); } diff --git a/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java b/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java index 46d08e0bef..2328bd3c0c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java +++ b/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java @@ -4,13 +4,15 @@ import com.fine.theme.utils.FineUIScale; import javax.swing.JToolBar; import java.awt.Component; +import java.awt.Insets; import java.awt.FlowLayout; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; public class UIToolbar extends JToolBar { - int hgap = 4; + // 间距按规范设置为2px + int hgap = 2; public UIToolbar() { this(FlowLayout.LEFT); @@ -22,6 +24,7 @@ public class UIToolbar extends JToolBar { setRollover(true); setLayout(new FlowLayout(align, FineUIScale.scale(hgap), 0)); setBorderPainted(false); + setMargin(new Insets(0, 0, 0, 0)); } public UIToolbar(int align) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java index d57ab7f307..760e53f3bf 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java @@ -1,20 +1,18 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.icon.LazyIcon; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.settings.ThemedCellStyle; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.cell.CellRectangleStylePreviewPane; import com.fr.design.file.HistoryTemplateListCache; -import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerBean; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; -import javax.swing.BorderFactory; import javax.swing.DefaultListModel; import javax.swing.Icon; import javax.swing.JList; @@ -116,8 +114,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane, Serializable { - private static final Icon selectedMarkIcon = IOUtils.readIcon("/com/fr/design/form/images/marked.png"); - + private static final Icon SELECTEDMARK_ICON = new LazyIcon("selectedMark"); private final CellRectangleStylePreviewPane previewArea; private boolean selected = false; @@ -148,7 +145,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg new file mode 100644 index 0000000000..d55b453515 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg new file mode 100644 index 0000000000..8f81cbbc5a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg new file mode 100644 index 0000000000..4fc8136dc8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg new file mode 100644 index 0000000000..e46f246cdd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg new file mode 100644 index 0000000000..0e5c877e9c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg new file mode 100644 index 0000000000..0688631e45 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg new file mode 100644 index 0000000000..dc9edba5ff --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg new file mode 100644 index 0000000000..ca523c7c0f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg new file mode 100644 index 0000000000..d6e572f913 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg new file mode 100644 index 0000000000..c42f1aaec5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg new file mode 100644 index 0000000000..c42f1aaec5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg new file mode 100644 index 0000000000..192d2e0e6f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg new file mode 100644 index 0000000000..4b75b72996 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg new file mode 100644 index 0000000000..1b79ccf0c5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg new file mode 100644 index 0000000000..5432d8553a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg new file mode 100644 index 0000000000..7d3ad39bd0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg new file mode 100644 index 0000000000..c6ae8d45e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg new file mode 100644 index 0000000000..a5c0947864 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg new file mode 100644 index 0000000000..f8f5d1672e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg new file mode 100644 index 0000000000..38c6b9c525 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg new file mode 100644 index 0000000000..e5a8f9b037 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg new file mode 100644 index 0000000000..87afc1632e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg new file mode 100644 index 0000000000..bf5bd3310b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg new file mode 100644 index 0000000000..c1fba56268 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg new file mode 100644 index 0000000000..4a9bbdbe5a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg new file mode 100644 index 0000000000..1944a1a3e6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg new file mode 100644 index 0000000000..46a63ac5e1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg new file mode 100644 index 0000000000..640e559a65 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg new file mode 100644 index 0000000000..2981e56009 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg new file mode 100644 index 0000000000..628c8e9427 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg new file mode 100644 index 0000000000..34ba74c767 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg new file mode 100644 index 0000000000..a3e19df05e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg new file mode 100644 index 0000000000..b5a857ea1b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg new file mode 100644 index 0000000000..3f91786579 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg new file mode 100644 index 0000000000..eb2aa01fcb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg new file mode 100644 index 0000000000..9733be8db8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg new file mode 100644 index 0000000000..397861c466 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg new file mode 100644 index 0000000000..ccdc01b086 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg new file mode 100644 index 0000000000..a6859c28b8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg new file mode 100644 index 0000000000..a188a44a74 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg new file mode 100644 index 0000000000..e6da133c3d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg new file mode 100644 index 0000000000..0731d72aed --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg new file mode 100644 index 0000000000..d270456cf1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg new file mode 100644 index 0000000000..f73c622be4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg new file mode 100644 index 0000000000..71c4959764 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg new file mode 100644 index 0000000000..6d0edf235f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg new file mode 100644 index 0000000000..fc6f27f422 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg new file mode 100644 index 0000000000..25e01eb8d6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg new file mode 100644 index 0000000000..476b988442 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg new file mode 100644 index 0000000000..0880cafed4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg new file mode 100644 index 0000000000..c02d60b003 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg new file mode 100644 index 0000000000..471fb62d88 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg new file mode 100644 index 0000000000..4788ae82df --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg new file mode 100644 index 0000000000..2632e8f5be --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg new file mode 100644 index 0000000000..469b60e2cf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg new file mode 100644 index 0000000000..cad5f2e720 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg new file mode 100644 index 0000000000..a5f4c9fb1d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg new file mode 100644 index 0000000000..28c7f70f97 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg new file mode 100644 index 0000000000..fba1189606 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg new file mode 100644 index 0000000000..edca32a272 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg new file mode 100644 index 0000000000..7c55d8adef --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg new file mode 100644 index 0000000000..f5c4ab3675 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg new file mode 100644 index 0000000000..171d7da1e9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg new file mode 100644 index 0000000000..acb876ae38 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg new file mode 100644 index 0000000000..c22307dd6d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index f33c0d53d3..37e648ae86 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -309,6 +309,7 @@ "cellPresentAttr": "cell/cellPresentAttr.svg", "cellElementAttr": "cell/cellElementAttr.svg", "cellSelect": "cell/cellSelect.svg", + "selectedMark": "cell/selectedMark.svg", "move": "filetree/move.svg", "monochrome_copy": "filetree/monochrome_copy.svg", "monochrome_paste": "filetree/monochrome_paste.svg", @@ -360,6 +361,27 @@ "more_arrow": "startup/more.svg", "more_arrow_hover": "startup/more_hover.svg", "show_less": "startup/show_less.svg", - "show_more": "startup/show_more.svg" + "show_more": "startup/show_more.svg", + "polyReportBlock": "chart/polyReportBlock.svg", + "chart_column": "chart/chart_column.svg", + "chart_pie": "chart/chart_pie.svg", + "chart_bar": "chart/chart_bar.svg", + "chart_line": "chart/chart_line.svg", + "chart_area": "chart/chart_area.svg", + "chart_bubble": "chart/chart_bubble.svg", + "chart_scatter": "chart/chart_scatter.svg", + "chart_radar": "chart/chart_radar.svg", + "chart_meter": "chart/chart_meter.svg", + "chart_box": "chart/chart_box.svg", + "chart_map": "chart/chart_map.svg", + "chart_drillMap": "chart/chart_drillMap.svg", + "chart_multiPie": "chart/chart_multiPie.svg", + "chart_funnel": "chart/chart_funnel.svg", + "chart_combine": "chart/chart_combine.svg", + "chart_gantt": "chart/chart_gantt.svg", + "chart_heatMap": "chart/chart_heatMap.svg", + "chart_rectangleTree": "chart/chart_rectangleTree.svg", + "chart_wordCloud": "chart/chart_wordCloud.svg", + "chart_frame": "chart/chart_frame.svg" } } diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties index 6d10a75e7f..3cc91a9f13 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties @@ -133,6 +133,7 @@ background.normal=#FFFFFF text.white=#ffffff text.placeholder=fade(@foreground, 40%) text.highlight=#F9AE31 +menu.hover=#DADEE7 fill.hover=#E6E9EF fill.click=#DADEE7 fill.normal=#FFFFFF @@ -459,7 +460,7 @@ Menu.submenuPopupOffsetY = {scaledInteger}-4 Menu.opaque = false Menu.borderPainted = true Menu.background = @menuBackground -Menu.selectionBackground=$fill.hover +Menu.selectionBackground=$menu.hover #Menu.selectionForeground=$text.white #Menu.acceleratorForeground=@foreground #Menu.acceleratorSelectionForeground=$text.white diff --git a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java index dd7617d95c..07d6c9aab9 100644 --- a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java +++ b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java @@ -39,7 +39,7 @@ public class EnvChangeEntranceTest { @Test public void showServiceDialog() throws Exception { try { - EnvChangeEntrance entrance = EnvChangeEntrance.getInstance(); + /* EnvChangeEntrance entrance = EnvChangeEntrance.getInstance(); DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class); WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class); @@ -58,7 +58,7 @@ public class EnvChangeEntranceTest { PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog); EasyMock.replay(request, selectedEnv, connectionInfo); - PowerMock.replayAll(); + PowerMock.replayAll();*/ //entrance.showServiceDialog(selectedEnv); diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index b7c9c474e4..e10d9c6dcf 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -242,15 +242,28 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr return getName(plotID); } + /** + * 获取图标Path + * @param plotID + * @return iconPath + */ public String getIconPath(String plotID) { + ChartTypeUIProvider provider = getChartTypeProvider(plotID); + return provider != null ? provider.getIconPath() : StringUtils.EMPTY; + } - if (chartTypeUIs != null) { - ChartTypeUIProvider provider = getChartTypeInterface(plotID); - if (provider != null) { - return provider.getIconPath(); - } - } - return StringUtils.EMPTY; + /** + * 获取新图标id + * @param plotID + * @return iconId + */ + public String getIconId(String plotID) { + ChartTypeUIProvider provider = getChartTypeProvider(plotID); + return provider != null ? provider.getIconId() : StringUtils.EMPTY; + } + + private ChartTypeUIProvider getChartTypeProvider(String plotID) { + return chartTypeUIs != null ? getChartTypeInterface(plotID) : null; } public String[] getDemoImagePath(String chartID) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java index 10ee1bc8ae..3c22b0152a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.plugin.injectable.SpecialLevel; +import com.fr.stable.StringUtils; import com.fr.stable.fun.Level; /** @@ -87,6 +88,13 @@ public interface ChartTypeUIProvider extends Level { */ String getIconPath(); + /** + * 图标Id + * @return 图标Id + */ + default String getIconId() { + return StringUtils.EMPTY; + } //todo:把下面这些接口删除 @Deprecated diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java index 649210f389..79ce1f817c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java @@ -107,6 +107,11 @@ public abstract class AbstractIndependentChartsUI extends AbstractProvider imple return "com/fr/design/images/form/toolbar/ChartF-Column.png"; } + @Override + public String getIconId() { + return "chart_column"; + } + @Override public ChartEditPane getChartEditPane(String plotID) { return new ChartsEditPane(); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java index 60e52f2425..fe89815835 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java @@ -52,6 +52,14 @@ public class AreaChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Area.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_area"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Area"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java index 16300178b5..83a4518796 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java @@ -54,6 +54,14 @@ public class BarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Bar.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_bar"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java index eedb93c259..abb1a72533 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java @@ -33,6 +33,14 @@ public class BubbleChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/Chart_BubbleChart.png"; } + /** + * 新图标Id + * @return 气泡图Id + */ + public String getIconId() { + return "chart_bubble"; + } + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ return new BubblePlotTableDataContentPane(parent); } diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java index 4597ec5098..07f2be4f11 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java @@ -55,6 +55,14 @@ public class ColumnChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Column.png"; } + /** + * 新图标Id + * @return 柱形图Id + */ + public String getIconId() { + return "chart_column"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Column"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java index ce47e17760..38eb5cf656 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java @@ -51,6 +51,14 @@ public class CustomChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png"; } + /** + * 新图标Id + * @return 组合图Id + */ + public String getIconId() { + return "chart_combine"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Combine"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java index f75bbe3ba6..14d3620950 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java @@ -53,6 +53,14 @@ public class DonutChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Donut.png"; } + /** + * 新图标Id + * @return 圆环图Id + */ + public String getIconId() { + return "chart_donut"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java index d6c850381c..833a3ee7ff 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java @@ -50,6 +50,14 @@ public class FunnelChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Funnel.png"; } + /** + * 新图标Id + * @return 漏斗图Id + */ + public String getIconId() { + return "chart_funnel"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java index 9e0b8184ca..f7965c5c33 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java @@ -43,6 +43,14 @@ public class GanttChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Gantt.png"; } + /** + * 新图标Id + * @return 甘特图Id + */ + public String getIconId() { + return "chart_gantt"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java index 4967b864c4..f68f25837a 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java @@ -52,6 +52,14 @@ public class LineChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Line.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_line"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Line"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java index da09ed48e5..ecd388e3b0 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java @@ -48,6 +48,14 @@ public class MapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/Chart-Map.png"; } + /** + * 新图标Id + * @return 地图Id + */ + public String getIconId() { + return "chart_map"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java index cafef9ea24..e65c4c1c49 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java @@ -45,6 +45,14 @@ public class MeterChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Meter.png"; } + /** + * 新图标Id + * @return 仪表盘Id + */ + public String getIconId() { + return "chart_meter"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java index 3e82d26dc8..046172f691 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java @@ -53,6 +53,14 @@ public class PieChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Pie.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_pie"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java index e994bb5756..eed4aad766 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java @@ -51,6 +51,14 @@ public class RadarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Radar.png"; } + /** + * 新图标Id + * @return 雷达图Id + */ + public String getIconId() { + return "chart_radar"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Radar"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java index 14917575de..9f47a021fb 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java @@ -51,6 +51,14 @@ public class StockChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Stock.png"; } + /** + * 新图标Id + * @return 箱形图Id + */ + public String getIconId() { + return "chart_box"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Stock"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java index 9bf5b787d9..62b1ce4dde 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java @@ -53,6 +53,14 @@ public class XYScatterChartTypeUI extends AbstractIndependentChartUIWithAPILevel return "com/fr/design/images/form/toolbar/ChartF-XYScatter.png"; } + /** + * 新图标Id + * @return 散点图Id + */ + public String getIconId() { + return "chart_scatter"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java index 4fe84a35e3..fb2ffe670a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java @@ -19,6 +19,11 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh return "com/fr/design/images/form/toolbar/area.png"; } + @Override + public String getIconId() { + return "chart_area"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_Area"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java index 542be966c7..7c1e94d71c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java @@ -57,6 +57,11 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha return "com/fr/design/images/form/toolbar/bar.png"; } + @Override + public String getIconId() { + return "chart_bar"; + } + @Override public AbstractChartTypePane getPlotTypePane() { return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBarPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java index 6e1d3d9712..30ae21bf92 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java @@ -49,6 +49,14 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart return "com/fr/design/images/form/toolbar/box.png"; } + /** + * 新图标Id + * @return 箱形图Id + */ + public String getIconId() { + return "chart_box"; + } + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new BoxPlotTableDataContentPane(plot, parent); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java index cc344d4f43..790bf0a05f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java @@ -69,6 +69,11 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh return "com/fr/design/images/form/toolbar/bubble.png"; } + @Override + public String getIconId() { + return "chart_bubble"; + } + @Override public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new VanChartBubbleSeriesPane(parent, plot); diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java index a971a98a9a..5e1bc93a8b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java @@ -48,6 +48,11 @@ public class VanColumnChartTypeUI extends AbstractMultiCategoryVanChartUI { return "com/fr/design/images/form/toolbar/column.png"; } + @Override + public String getIconId() { + return "chart_column"; + } + @Override public AbstractChartTypePane getPlotTypePane() { return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartColumnPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java index e16151a849..7cc4230498 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java @@ -20,6 +20,11 @@ public class CustomIndependentVanChartInterface extends AbstractIndependentVanCh return Toolkit.i18nText("Fine-Design_Chart_New_Combine"); } + @Override + public String getIconId() { + return "chart_combine"; + } + @Override public String[] getSubName() { return new String[]{ diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/VanDrillMapChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/VanDrillMapChartTypeUI.java index 3fe95d109a..b961437c9c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/VanDrillMapChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/VanDrillMapChartTypeUI.java @@ -49,6 +49,12 @@ public class VanDrillMapChartTypeUI extends VanMapChartTypeUI { public String getIconPath() { return "com/fr/design/images/form/toolbar/drillmap.png"; } + + @Override + public String getIconId() { + return "chart_drillMap"; + } + /** * 图表的类型定义界面类型，就是属性表的第一个界面 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java index b76f9047df..55b5257d97 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java @@ -92,6 +92,11 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh return "com/fr/design/images/form/toolbar/funnel.png"; } + @Override + public String getIconId() { + return "chart_funnel"; + } + //图表数据结构 恢复用注释。取消注释。 // @Override // public ChartDataPane getChartDataPane(AttributeChangeListener listener) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java index 839e049dd1..a508aea559 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java @@ -74,6 +74,11 @@ public class GanttIndependentVanChartInterface extends AbstractIndependentVanCha return "com/fr/design/images/form/toolbar/gantt.png"; } + @Override + public String getIconId() { + return "chart_gantt"; + } + /** * 图表的属性界面数组 * @return 属性界面 diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java index 7c424aa55b..10c3cb678f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java @@ -34,6 +34,11 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha return "com/fr/design/images/form/toolbar/gauge.png"; } + @Override + public String getIconId() { + return "chart_meter"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/VanHeatMapChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/VanHeatMapChartTypeUI.java index 712d3a3b76..9d640d6f51 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/VanHeatMapChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/VanHeatMapChartTypeUI.java @@ -33,6 +33,11 @@ public class VanHeatMapChartTypeUI extends VanMapChartTypeUI { return "com/fr/design/images/form/toolbar/heatmap.png"; } + @Override + public String getIconId() { + return "chart_heatMap"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java index 58252a74b0..73889f2a48 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java @@ -19,6 +19,11 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh return "com/fr/design/images/form/toolbar/line.png"; } + @Override + public String getIconId() { + return "chart_line"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_Line"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/VanMapChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/map/VanMapChartTypeUI.java index 50636ad28f..11880a7cb1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/VanMapChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/VanMapChartTypeUI.java @@ -124,6 +124,11 @@ public class VanMapChartTypeUI extends AbstractIndependentVanChartUI { return "com/fr/design/images/form/toolbar/map.png"; } + @Override + public String getIconId() { + return "chart_map"; + } + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ return new VanChartMapSeriesPane(parent, plot); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java index a5da06312a..52987c7e70 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java @@ -31,6 +31,11 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan return "com/fr/design/images/form/toolbar/multiPie.png"; } + @Override + public String getIconId() { + return "chart_multiPie"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_MultiPie"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java index 7ede0ad462..223134b86d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java @@ -26,6 +26,11 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart return "com/fr/design/images/form/toolbar/pie.png"; } + @Override + public String getIconId() { + return "chart_pie"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_Pie"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java index 3f13cef0e8..9e16e256ab 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java @@ -19,6 +19,11 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha return "com/fr/design/images/form/toolbar/radar.png"; } + @Override + public String getIconId() { + return "chart_radar"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_Radar"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java index 444a36ae5a..e84cf7345a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java @@ -60,6 +60,11 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC return "com/fr/design/images/form/toolbar/scatter.png"; } + @Override + public String getIconId() { + return "chart_scatter"; + } + @Override public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new VanChartScatterSeriesPane(parent, plot); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java index 6733b8dbda..d09064ce64 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java @@ -64,6 +64,11 @@ public class VanStructureChartTypeUI extends AbstractIndependentVanChartUI { return "com/fr/design/images/form/toolbar/structure.png"; } + @Override + public String getIconId() { + return "chart_frame"; + } + @Override public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new StructurePlotTableDataContentPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java index 390a039197..75c81b31ec 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java @@ -42,6 +42,11 @@ public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanC return "com/fr/design/images/form/toolbar/treeMap.png"; } + @Override + public String getIconId() { + return "chart_rectangleTree"; + } + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ return new VanChartTreeMapSeriesPane(parent, plot); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java index 290c6a43f0..33e7fe8251 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java @@ -66,6 +66,11 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa return "com/fr/design/images/form/toolbar/wordcloud.png"; } + @Override + public String getIconId() { + return "chart_worldCloud"; + } + @Override public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new WordCloudPlotReportDataContentPane(); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java index 886089a0be..e442fd8af8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java @@ -78,6 +78,11 @@ public class XWFitLayout extends XLayoutContainer { return "layout_absolute.png"; } + @Override + public String getIconId() { + return "param"; + } + /** * 返回最右侧控件的微调宽度 * @return 微调宽度 diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java index d925df070f..a3d7e658e4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java @@ -240,6 +240,11 @@ public class XWParameterLayout extends XWAbsoluteLayout { return "layout_absolute.png"; } + @Override + public String getIconId() { + return "param"; + } + /** * data属性改变触发其他操作 * diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java index b2533664c6..b88bdaa7d9 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java @@ -1,8 +1,8 @@ package com.fr.design.mainframe; import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.ExtraDesignClassManager; -import com.fr.design.constants.UIConstants; import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.gui.core.UserDefinedWidgetOption; import com.fr.design.gui.core.WidgetOption; @@ -97,7 +97,9 @@ public class FormParaPane extends UIToolbar { for (WidgetOption o : componentsList4Para) { add(new ToolBarButton(o)); } - add(new UILabel("|")); + UILabel label = new UILabel("|"); + label.setForeground(FineUIUtils.getUIColor("Center.ZoneBorderColor", "defaultBorderColor")); + add(label); add(predefineButton); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java index 8e57415a7e..cb27f59e42 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java @@ -4,7 +4,6 @@ import com.fr.base.CellBorderStyle; import com.fr.base.NameStyle; import com.fr.base.Style; import com.fr.design.actions.utils.ReportActionUtils; -import com.fr.design.constants.UIConstants; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.cell.settingpane.style.StylePane; import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase; @@ -33,7 +32,6 @@ public class CellStylePane extends AbstractCellAttrPane { JPanel content = new JPanel(new BorderLayout()); stylePane = new StylePane(); content.add(stylePane, BorderLayout.CENTER); - stylePane.setBorder(UIConstants.CELL_ATTR_PRESENTBORDER); stylePane.addPredefinedChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { attributeChanged(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java index bd45ff1121..830cbd4ce9 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Objects; import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; /** * 数据脱敏规则设置面板 @@ -84,12 +85,7 @@ public class CellDesensitizationGroupsPane extends JPanel { initbuttonPane(action); JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); controlPane.add(getbuttonPane(), BorderLayout.WEST); - - JPanel pane = new JPanel(new BorderLayout(4, 4)); - pane.add(editTable, BorderLayout.CENTER); - pane.add(controlPane, BorderLayout.NORTH); - - this.add(pane, BorderLayout.CENTER); + this.add(column(cell(controlPane), cell(editTable)).getComponent(), BorderLayout.CENTER); } }; tableEditorPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java index 4395abd8de..86852ffd45 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java @@ -41,6 +41,8 @@ import java.util.Set; import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.fix; import static com.fine.theme.utils.FineUIStyle.PLAIN_BUTTON; import static com.fine.theme.utils.FineUIStyle.TRANSPARENT_TEXT_FIELD; import static com.fine.theme.utils.FineUIStyle.setStyle; @@ -106,7 +108,7 @@ public class DesensitizationCellPane extends BasicBeanPane { editPanel = FineLayoutBuilder.asBorderLayoutWrapped( column( - cell(label).with(it -> it.setBorder( + row(fix(6), cell(label)).with(it -> it.setBorder( BorderFactory.createMatteBorder(1, 0, 1, 0, borderColor))).weight(1), cell(initTableCellPanel()) .weight(2) ).getComponent() diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java index 9c9523e132..a287c2ef29 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.cell.settingpane.style; +import com.fine.theme.utils.FineUIScale; import com.fr.base.CellBorderStyle; import com.fr.base.NameStyle; import com.fr.base.Style; @@ -156,7 +157,7 @@ public class StylePane extends BasicPane implements UIObserver { private JPanel createThemedStylePane() { JPanel container = new JPanel(new BorderLayout(0, IntervalConstants.INTERVAL_L1)); UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Design_Style_Applying")); - uiLabel.setPreferredSize(new Dimension(uiLabel.getPreferredSize().width, 20)); + uiLabel.setPreferredSize(new Dimension(uiLabel.getPreferredSize().width, FineUIScale.scale(20))); container.add(uiLabel, BorderLayout.NORTH); nameStyleListPane.setBorder(BorderFactory.createEmptyBorder()); container.add(nameStyleListPane, BorderLayout.CENTER); diff --git a/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java b/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java index f459281ba7..f35723c318 100644 --- a/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java +++ b/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java @@ -1,5 +1,6 @@ package com.fr.poly; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartGetter; @@ -14,6 +15,8 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.dnd.SerializableTransferable; import com.fr.report.poly.PolyECBlock; +import com.fr.stable.StringUtils; +import javax.swing.Icon; import javax.swing.BorderFactory; import javax.swing.JToolBar; import javax.swing.JToolTip; @@ -47,22 +50,30 @@ public class PolyComponentsBar extends JToolBar { setBackground(UIConstants.TOOLBARUI_BACKGROUND); setLayout(FRGUIPaneFactory.create1ColumnGridLayout()); String[] iDs = ChartTypeManager.getInstance().getChartIDs4Create(); - int typeLen = iDs.length < MAX_BAR_NUM ? iDs.length : MAX_BAR_NUM; + int typeLen = Math.min(iDs.length, MAX_BAR_NUM); serIcons = new SerIcon[typeLen + 1]; serIcons[0] = new SerIcon( PolyECBlock.class, Toolkit.i18nText("Fine-Design_Report_Poly_Report_Block"), - "com/fr/design/images/poly/toolbar/Poly-Report_Block.png" + new LazyIcon("polyReportBlock") ); this.add(serIcons[0]); for (int i = 0; i < typeLen; i++) { String chartID = iDs[i]; - String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(chartID); BaseChartCollection chartCollection = BaseChartGetter.createChartCollection(chartID); - serIcons[i + 1] = new SerIcon(chartCollection, ChartTypeInterfaceManager.getInstance().getName(chartID), iconPath); + serIcons[i + 1] = createSerIcon(chartCollection, chartID); this.add(serIcons[i + 1]); } + } + private SerIcon createSerIcon(BaseChartCollection chartCollection, String chartID) { + String iconId = ChartTypeInterfaceManager.getInstance().getIconId(chartID); + String iconName = ChartTypeInterfaceManager.getInstance().getName(chartID); + // 如果iconId为空，使用iconPath逻辑 + if (StringUtils.isEmpty(iconId)) { + return new SerIcon(chartCollection, iconName, ChartTypeInterfaceManager.getInstance().getIconPath(chartID)); + } + return new SerIcon(chartCollection, iconName, new LazyIcon(iconId)); } /** @@ -85,6 +96,20 @@ public class PolyComponentsBar extends JToolBar { */ public SerIcon(Serializable serializable, String text, String iconPath) { super(BaseUtils.readIcon(iconPath)); + init(serializable, text); + } + + /** + * @param serializable s + * @param text 按钮名 + * @param icon 图标 + */ + public SerIcon(Serializable serializable, String text, Icon icon) { + super(icon); + init(serializable, text); + } + + private void init(Serializable serializable, String text) { this.serializable = serializable; this.setToolTipText(text); this.set4ToolbarButton();