Browse Source

Pull request #14533: REPORT-127436【NewUI】fix:单元格属性&部分弹窗调整&图表图标/反白图标&图标工具栏/导航菜单符合规范调整

Merge in DESIGN/design from ~RICHARD.FANG/design:newui to newui

* commit '5f5ee8e203d6044461764f19313824842025c230':
  REPORT-127436【NewUI】fix:视觉验收问题修复:单元格属性/部分弹窗调整/图表图标/反白图标/工具栏&导航菜单符合规范
newui
Richard.Fang-方超 3 months ago
parent
commit
6fc423c7d8
  1. 2
      designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  4. 1
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
  5. 29
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  6. 12
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  7. 5
      designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java
  8. 2
      designer-base/src/main/java/com/fr/design/editor/editor/Editor.java
  9. 4
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
  10. 5
      designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java
  11. 9
      designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
  12. 11
      designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg
  13. 11
      designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg
  14. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg
  15. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg
  16. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg
  17. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg
  18. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg
  19. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg
  20. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg
  21. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg
  22. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg
  23. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg
  24. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg
  25. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg
  26. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg
  27. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg
  28. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg
  29. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg
  30. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg
  31. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg
  32. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg
  33. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg
  34. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg
  35. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg
  36. 11
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg
  37. 11
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg
  38. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg
  39. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg
  40. 4
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg
  41. 4
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg
  42. 8
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg
  43. 8
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg
  44. 10
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg
  45. 10
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg
  46. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg
  47. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg
  48. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg
  49. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg
  50. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg
  51. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg
  52. 9
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg
  53. 9
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg
  54. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg
  55. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg
  56. 11
      designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg
  57. 8
      designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg
  58. 4
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg
  59. 4
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg
  60. 6
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg
  61. 4
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg
  62. 4
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg
  63. 4
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg
  64. 4
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg
  65. 7
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg
  66. 7
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg
  67. 8
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg
  68. 8
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg
  69. 4
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg
  70. 4
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg
  71. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg
  72. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg
  73. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg
  74. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg
  75. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg
  76. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg
  77. 3
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg
  78. 24
      designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
  79. 3
      designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties
  80. 4
      designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java
  81. 27
      designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
  82. 8
      designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java
  83. 5
      designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java
  84. 8
      designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java
  85. 8
      designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java
  86. 8
      designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java
  87. 8
      designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java
  88. 8
      designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java
  89. 8
      designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java
  90. 8
      designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java
  91. 8
      designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java
  92. 8
      designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java
  93. 8
      designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java
  94. 8
      designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java
  95. 8
      designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java
  96. 8
      designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java
  97. 8
      designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java
  98. 8
      designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java
  99. 5
      designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java
  100. 5
      designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java

@ -21,7 +21,7 @@ public class SaveTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE); this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE);
this.setName(getMenuKeySet().getMenuKeySetName()); this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(new LazyIcon("save")); this.setSmallIcon(new LazyIcon("saveFile"));
this.setAccelerator(getMenuKeySet().getKeyStroke()); this.setAccelerator(getMenuKeySet().getKeyStroke());
} }

2
designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java

@ -1,6 +1,5 @@
package com.fr.design.data.datapane; package com.fr.design.data.datapane;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.data.impl.RecursionTableData; import com.fr.data.impl.RecursionTableData;
import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.LayoutConstants;
import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.DesignTableDataManager;
@ -61,7 +60,6 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
public TreeTableDataDictPane(String treeName) { public TreeTableDataDictPane(String treeName) {
this.setLayout(new BorderLayout()); 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") ); selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") );
setTableDataNameComboBox(treeName); setTableDataNameComboBox(treeName);

2
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.cell;
import static com.fine.swing.ui.layout.Layouts.column; 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.flex;
import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.row;
@ -40,7 +39,6 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
public ClassTableDataPane() { public ClassTableDataPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
//类名 //类名
classNameTextField = new UITextField(); classNameTextField = new UITextField();

1
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java

@ -55,7 +55,6 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
// additional methods // additional methods
protected void initComponents() { protected void initComponents() {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
// prepare the data in this way as default if no arguments is passed in // prepare the data in this way as default if no arguments is passed in
EmbeddedTableModel tableModel = new EmbeddedTableModel(new EmbeddedTableData()); EmbeddedTableModel tableModel = new EmbeddedTableModel(new EmbeddedTableData());

29
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@ -82,6 +82,9 @@ 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.column;
import static com.fine.swing.ui.layout.Layouts.flex; import static com.fine.swing.ui.layout.Layouts.flex;
import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.row;
import static com.fine.swing.ui.layout.Layouts.fix;
import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle; import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
public class FileTableDataPane extends AbstractTableDataPane<FileTableData> { public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
@ -132,15 +135,14 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
public FileTableDataPane(double localWidthRatio, double urlWidthRatio) { public FileTableDataPane(double localWidthRatio, double urlWidthRatio) {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
//文件类型 //文件类型
JPanel fileType = new JPanel(new BorderLayout()); JPanel fileType = new JPanel(new BorderLayout());
String[] item = {"TXT", "Excel", "XML"}; String[] item = {"TXT", "Excel", "XML"};
fileTypeComboBox = new UIComboBox(item); fileTypeComboBox = new UIComboBox(item);
fileTypeComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
fileType.add(row(LayoutConstants.HGAP_LARGE, 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(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type"))).weight(0.12),
cell(fileTypeComboBox).weight(0.18), row(cell(fileTypeComboBox), flex()).weight(0.88)
flex(0.7)
).getComponent()); ).getComponent());
//参数面板 //参数面板
@ -151,36 +153,32 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
} }
}; };
editorPane = new UITableEditorPane<ParameterProvider>(model); editorPane = new UITableEditorPane<ParameterProvider>(model);
editorPane.setBorder(new ScaledEmptyBorder(0,0,0,10));
editorPane.setPreferredSize(FineUIScale.scale(new Dimension(-1, 150)));
//左侧文件地址pane //左侧文件地址pane
JPanel leftPanel = new JPanel(new BorderLayout()); JPanel leftPanel = new JPanel(new BorderLayout());
leftPanel.add(column( leftPanel.add(column(
LayoutConstants.VERTICAL_GAP, LayoutConstants.VERTICAL_GAP,
cell(getCenterPanel(localWidthRatio, urlWidthRatio)), cell(getCenterPanel(localWidthRatio, urlWidthRatio)),
cell(editorPane) cell(editorPane).weight(1)
).getComponent()); ).getComponent());
//右侧设定pane //右侧设定pane
JPanel rightPanel = new JPanel(new BorderLayout()); JPanel rightPanel = new JPanel(new BorderLayout());
rightPanel.setBorder(new ScaledEmptyBorder(0,0,0,10));
rightPanel.add(getTextSetPanel()); rightPanel.add(getTextSetPanel());
fileTypeComboBox.addActionListener(getFileTypeListener(rightPanel)); fileTypeComboBox.addActionListener(getFileTypeListener(rightPanel));
rightPanel.setPreferredSize(FineUIScale.scale(new Dimension(-1, 400)));
//文件数据集整体布局,服务器数据集/模板数据集下的文件数据集,创建文件数据集,三处面板通用布局 //文件数据集整体布局,服务器数据集/模板数据集下的文件数据集,创建文件数据集,三处面板通用布局
this.add(column(LayoutConstants.VERTICAL_GAP, this.add(column(LayoutConstants.VERTICAL_GAP,
cell(fileType), cell(fileType),
row(20, row(20,
cell(wrapComponentWithTitle(leftPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File_Address"))).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.5) cell(wrapComponentWithTitle(rightPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"))).weight(0.45)
) ).weight(1)
).getComponent()); ).getComponent());
} }
/** /**
* 文件地址上方的面板-文件选择 * 文件地址上方的面板-文件选择
* @return * @return JPanel
*/ */
private JPanel getCenterPanel(double localWidthRatio, double urlWidthRatio) { private JPanel getCenterPanel(double localWidthRatio, double urlWidthRatio) {
// 本地文件/URL // 本地文件/URL
@ -220,7 +218,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
cell(testConnection).weight(0.75 - urlWidthRatio) cell(testConnection).weight(0.75 - urlWidthRatio)
), ),
cell(tips) cell(tips)
).with(it -> it.setBorder(new ScaledEmptyBorder(0,0,0,10))).getComponent(); ).getComponent();
} }
private ActionListener testConnectionListener = new ActionListener() { private ActionListener testConnectionListener = new ActionListener() {
@ -391,7 +389,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
cell(tableDismemberRadioButton), cell(tableDismemberRadioButton),
cell(spaceDismenberRadioButton), cell(spaceDismenberRadioButton),
cell(commaDismenberRadioButton), cell(commaDismenberRadioButton),
row(cell(otherDismenberRadioButton).weight(0.2), cell(otherDismenberTextField).weight(0.8)) row(cell(otherDismenberRadioButton), fix(20), cell(otherDismenberTextField).weight(1))
).getComponent(); ).getComponent();
//TXT设定主要面板 //TXT设定主要面板
return column( return column(
@ -832,8 +830,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
toolbarDef.addShortCut(refreshAction); toolbarDef.addShortCut(refreshAction);
UIToolbar toolBar = ToolBarDef.createJToolBar(); UIToolbar toolBar = ToolBarDef.createJToolBar();
toolbarDef.updateToolBar(toolBar); toolbarDef.updateToolBar(toolBar);
toolbarPanel.add(keyPointLaber, BorderLayout.WEST); toolbarPanel.add(row(cell(keyPointLaber), flex(), cell(toolBar)).getComponent());
toolbarPanel.add(toolBar, BorderLayout.EAST);
this.add(toolbarPanel, BorderLayout.NORTH); this.add(toolbarPanel, BorderLayout.NORTH);
} }

12
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.ParameterProvider;
import com.fr.stable.StringUtils; 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.Icon;
import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; 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.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
@ -64,7 +69,6 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
public MultiTDTableDataPane(String multiName) { public MultiTDTableDataPane(String multiName) {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
this.add(initNorthPane(multiName), BorderLayout.CENTER); this.add(initNorthPane(multiName), BorderLayout.CENTER);
this.add(initSouthPanel(), BorderLayout.SOUTH); this.add(initSouthPanel(), BorderLayout.SOUTH);
} }
@ -78,7 +82,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
UILabel chooseTableData = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Select_To_Merge")); UILabel chooseTableData = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Select_To_Merge"));
UIButton previewButton = new UIButton(new LazyIcon("preview")); UIButton previewButton = new UIButton(new LazyIcon("preview"));
previewButton.addActionListener(getPreviewActionListener()); previewButton.addActionListener(getPreviewActionListener());
northPanel.add(row(cell(chooseTableData), cell(previewButton)).getComponent()); northPanel.add(row(LayoutConstants.HGAP_LARGE, cell(chooseTableData), cell(previewButton)).getComponent());
centerPanel = new JPanel(); centerPanel = new JPanel();
JScrollPane js = new JScrollPane(centerPanel); JScrollPane js = new JScrollPane(centerPanel);

5
designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java

@ -14,6 +14,8 @@ 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.column;
import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.row;
import static com.fine.swing.ui.layout.Layouts.flex; import static com.fine.swing.ui.layout.Layouts.flex;
import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
/** /**
* 封装了"为该模版单独设置、采用服务器设置"选项功能的设置面板 * 封装了"为该模版单独设置、采用服务器设置"选项功能的设置面板
@ -39,11 +41,12 @@ public abstract class AbstractTemplateServerSettingPane extends BasicPane {
private void initComponents() { private void initComponents() {
chooseComboBox = new UIComboBox(CHOOSEITEM); chooseComboBox = new UIComboBox(CHOOSEITEM);
chooseComboBox.addItemListener(itemListener); chooseComboBox.addItemListener(itemListener);
chooseComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
//以下设置,部分面板通用 //以下设置,部分面板通用
UILabel belowSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set")); UILabel belowSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set"));
buttonPane = row(32, buttonPane = row(32,
cell(belowSetLabel), cell(belowSetLabel),
cell(chooseComboBox).weight(1), cell(chooseComboBox),
flex() flex()
).with(it -> it.setBorder(new ScaledEmptyBorder(0,10,0,0))).getComponent(); ).with(it -> it.setBorder(new ScaledEmptyBorder(0,10,0,0))).getComponent();
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());

2
designer-base/src/main/java/com/fr/design/editor/editor/Editor.java

@ -51,7 +51,7 @@ public abstract class Editor<T> extends JComponent {
} }
public String getIconId(){ public String getIconId(){
return null; return StringUtils.EMPTY;
} }
public String getName() { public String getName() {

4
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java

@ -1,11 +1,11 @@
package com.fr.design.gui.itableeditorpane; package com.fr.design.gui.itableeditorpane;
import com.fine.swing.ui.layout.Layouts; 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.FineRoundBorder;
import com.fine.theme.light.ui.FineTableHeaderUI; import com.fine.theme.light.ui.FineTableHeaderUI;
import com.fine.theme.light.ui.FineTableScrollBarPaneUI; import com.fine.theme.light.ui.FineTableScrollBarPaneUI;
import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIScale;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
@ -78,7 +78,7 @@ public class UITableEditorPane<T> extends BasicPane {
controlPane.add(content == null ? l : content, BorderLayout.WEST); controlPane.add(content == null ? l : content, BorderLayout.WEST);
scrollPane.getVerticalScrollBar().setUI(new FineTableScrollBarPaneUI(editTable)); 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.getTableHeader().setUI(new FineTableHeaderUI());
this.editTable.setRowHeight(FineUIScale.scale(24)); this.editTable.setRowHeight(FineUIScale.scale(24));
} }

5
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 javax.swing.JToolBar;
import java.awt.Component; import java.awt.Component;
import java.awt.Insets;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class UIToolbar extends JToolBar { public class UIToolbar extends JToolBar {
int hgap = 4; // 间距按规范设置为2px
int hgap = 2;
public UIToolbar() { public UIToolbar() {
this(FlowLayout.LEFT); this(FlowLayout.LEFT);
@ -22,6 +24,7 @@ public class UIToolbar extends JToolBar {
setRollover(true); setRollover(true);
setLayout(new FlowLayout(align, FineUIScale.scale(hgap), 0)); setLayout(new FlowLayout(align, FineUIScale.scale(hgap), 0));
setBorderPainted(false); setBorderPainted(false);
setMargin(new Insets(0, 0, 0, 0));
} }
public UIToolbar(int align) { public UIToolbar(int align) {

9
designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java

@ -1,20 +1,18 @@
package com.fr.design.mainframe.theme; package com.fr.design.mainframe.theme;
import com.fine.theme.icon.LazyIcon;
import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.TemplateTheme;
import com.fr.base.theme.settings.ThemedCellStyle; import com.fr.base.theme.settings.ThemedCellStyle;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.cell.CellRectangleStylePreviewPane; import com.fr.design.cell.CellRectangleStylePreviewPane;
import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerBean; import com.fr.design.mainframe.DesignerBean;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.IOUtils;
import javax.swing.BorderFactory;
import javax.swing.DefaultListModel; import javax.swing.DefaultListModel;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.JList; import javax.swing.JList;
@ -116,8 +114,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<ThemedCellStyl
private static class RadioButtonListCellRangeRenderer extends JPanel implements ListCellRenderer<ThemedCellStyle>, Serializable { private static class RadioButtonListCellRangeRenderer extends JPanel implements ListCellRenderer<ThemedCellStyle>, 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 final CellRectangleStylePreviewPane previewArea;
private boolean selected = false; private boolean selected = false;
@ -148,7 +145,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<ThemedCellStyl
super.paint(g); super.paint(g);
if (selected) { if (selected) {
selectedMarkIcon.paintIcon(this, g, getWidth() - selectedMarkIcon.getIconWidth(), 5); SELECTEDMARK_ICON.paintIcon(this, g, getWidth() - SELECTEDMARK_ICON.getIconWidth(), 5);
} }
} }
} }

11
designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg

@ -0,0 +1,11 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_5442_94879)">
<path d="M0 0H29C30.6569 0 32 1.34315 32 3V32L0 0Z" fill="#2576EF"/>
<path d="M29.0903 6.10509C29.188 6.00746 29.188 5.84917 29.0903 5.75154L27.6761 4.33732C27.5785 4.23969 27.4202 4.23969 27.3226 4.33732L20.4283 11.2316L17.0695 7.87286C16.9719 7.77523 16.8136 7.77523 16.716 7.87286L15.3017 9.28707C15.2041 9.3847 15.2041 9.54299 15.3017 9.64062L20.0747 14.4136C20.27 14.6089 20.5866 14.6089 20.7818 14.4136L29.0903 6.10509Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_5442_94879">
<rect width="32" height="32" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 693 B

11
designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg

@ -0,0 +1,11 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_6807_120909)">
<path d="M0 0H29C30.6569 0 32 1.34315 32 3V32L0 0Z" fill="#B8BDC5"/>
<path d="M29.0903 6.10507C29.188 6.00744 29.188 5.84915 29.0903 5.75152L27.6761 4.33731C27.5785 4.23968 27.4202 4.23968 27.3226 4.33731L20.4283 11.2316L17.0695 7.87284C16.9719 7.77521 16.8136 7.77521 16.716 7.87284L15.3017 9.28705C15.2041 9.38469 15.2041 9.54298 15.3017 9.64061L20.0747 14.4136C20.27 14.6088 20.5866 14.6088 20.7818 14.4136L29.0903 6.10507Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_6807_120909">
<rect width="32" height="32" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 696 B

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.1385 21.6349C22.9565 21.811 22.6715 21.8231 22.4752 21.6632L16.2887 16.6235C16.1174 16.4839 15.8748 16.4734 15.692 16.5975L8.05669 21.7824C7.90971 21.8822 7.72082 21.8965 7.56048 21.82L2.71532 19.5082C2.38349 19.3499 2 19.5918 2 19.9595V25.5C2 25.7761 2.22386 26 2.5 26H29.5C29.7761 26 30 25.7761 30 25.5V16.179C30 15.7376 29.4698 15.5127 29.1524 15.8196L23.1385 21.6349Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 1.88511C30 1.49603 29.5752 1.25603 29.2419 1.45687L22.7244 5.38482C22.6028 5.45812 22.4558 5.47624 22.32 5.43468L16.2309 3.57067C16.085 3.52602 15.9267 3.5504 15.8011 3.63689L8.42665 8.71224C8.38561 8.74048 8.34059 8.76243 8.29307 8.77737L2.35011 10.6448C2.14175 10.7103 2 10.9034 2 11.1218V16.7424C2 16.9374 2.11339 17.1146 2.29046 17.1964L8.09001 19.8732C8.25891 19.9511 8.45712 19.9289 8.60453 19.8154L15.6846 14.3654C15.8692 14.2233 16.1275 14.2275 16.3073 14.3755L22.1979 19.2239C22.3903 19.3822 22.6699 19.3748 22.8536 19.2064L29.8379 12.8023C29.9412 12.7076 30 12.5739 30 12.4338V1.88511Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 1.88511C30 1.49603 29.5752 1.25603 29.2419 1.45687L22.7244 5.38482C22.6028 5.45812 22.4558 5.47624 22.32 5.43468L16.2309 3.57067C16.085 3.52602 15.9267 3.5504 15.8011 3.63689L8.42665 8.71224C8.38561 8.74048 8.34059 8.76243 8.29307 8.77737L2.35011 10.6448C2.14175 10.7103 2 10.9034 2 11.1218V16.7424C2 16.9374 2.11339 17.1146 2.29046 17.1964L8.09001 19.8732C8.25891 19.9511 8.45712 19.9289 8.60453 19.8154L15.6846 14.3654C15.8692 14.2233 16.1275 14.2275 16.3073 14.3755L22.1979 19.2239C22.3903 19.3822 22.6699 19.3748 22.8536 19.2064L29.8379 12.8023C29.9412 12.7076 30 12.5739 30 12.4338V1.88511Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.1385 21.6349C22.9565 21.811 22.6715 21.8231 22.4752 21.6631L16.2887 16.6234C16.1174 16.4839 15.8748 16.4733 15.692 16.5974L8.05669 21.7824C7.90971 21.8822 7.72082 21.8965 7.56048 21.82L2.71532 19.5082C2.38349 19.3498 2 19.5918 2 19.9594V25.4999C2 25.7761 2.22386 25.9999 2.5 25.9999H29.5C29.7761 25.9999 30 25.7761 30 25.4999V16.179C30 15.7376 29.4698 15.5127 29.1524 15.8195L23.1385 21.6349Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2C6.44772 2 6 2.44771 6 3L6 8C6 8.55228 6.44772 9 7 9L17 9C17.5523 9 18 8.55228 18 8L18 3C18 2.44772 17.5523 2 17 2L7 2Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 23C6.44772 23 6 23.4477 6 24L6 29C6 29.5523 6.44772 30 7 30L23 30C23.5523 30 24 29.5523 24 29L24 24C24 23.4477 23.5523 23 23 23L7 23Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 12.5C6.44772 12.5 6 12.9477 6 13.5L6 18.5C6 19.0523 6.44772 19.5 7 19.5L29 19.5C29.5523 19.5 30 19.0523 30 18.5L30 13.5C30 12.9477 29.5523 12.5 29 12.5L7 12.5Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 2C3.55228 2 4 2.44772 4 3L4 29C4 29.5523 3.55228 30 3 30C2.44771 30 2 29.5523 2 29L2 3C2 2.44772 2.44772 2 3 2Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 910 B

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 23C6.44772 23 6 23.4477 6 24L6 29C6 29.5523 6.44772 30 7 30L23 30C23.5523 30 24 29.5523 24 29L24 24C24 23.4477 23.5523 23 23 23L7 23Z" fill="#B8BFCB"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 12.5C6.44772 12.5 6 12.9477 6 13.5L6 18.5C6 19.0523 6.44772 19.5 7 19.5L29 19.5C29.5523 19.5 30 19.0523 30 18.5L30 13.5C30 12.9477 29.5523 12.5 29 12.5L7 12.5Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2C6.44772 2 6 2.44771 6 3L6 8C6 8.55228 6.44772 9 7 9L17 9C17.5523 9 18 8.55228 18 8L18 3C18 2.44772 17.5523 2 17 2L7 2Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 2C3.55228 2 4 2.44772 4 3L4 29C4 29.5523 3.55228 30 3 30C2.44771 30 2 29.5523 2 29L2 3C2 2.44772 2.44772 2 3 2Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 910 B

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10 12.5C10 12.2239 9.77614 12 9.5 12H7V9C7 8.44772 6.55228 8 6 8C5.44772 8 5 8.44772 5 9V12H2.5C2.22386 12 2 12.2239 2 12.5V25.5C2 25.7761 2.22386 26 2.5 26H5V30C5 30.5523 5.44772 31 6 31C6.55228 31 7 30.5523 7 30V26H9.5C9.77614 26 10 25.7761 10 25.5V12.5Z" fill="#2576EF"/>
<path d="M27.5 9H29.5C29.7761 9 30 9.22386 30 9.5V22.5C30 22.7761 29.7761 23 29.5 23H27.5V27.25C27.5 27.8023 27.0523 28.25 26.5 28.25C25.9477 28.25 25.5 27.8023 25.5 27.25V23H23.5C23.2239 23 23 22.7761 23 22.5V9.5C23 9.22386 23.2239 9 23.5 9H25.5V6C25.5 5.44772 25.9477 5 26.5 5C27.0523 5 27.5 5.44772 27.5 6V9Z" fill="#F9AE31"/>
<path d="M21 5.5C21 5.22386 20.7761 5 20.5 5H17.5V3C17.5 2.44772 17.0523 2 16.5 2C15.9477 2 15.5 2.44772 15.5 3V5H12.5C12.2239 5 12 5.22386 12 5.5V20.5C12 20.7761 12.2239 21 12.5 21H15.5V26.5C15.5 27.0523 15.9477 27.5 16.5 27.5C17.0523 27.5 17.5 27.0523 17.5 26.5V21H20.5C20.7761 21 21 20.7761 21 20.5V5.5ZM19 19H14V7H19V19Z" fill="#34B3FA"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21 5.5C21 5.22386 20.7761 5 20.5 5H17.5V3C17.5 2.44772 17.0523 2 16.5 2C15.9477 2 15.5 2.44772 15.5 3V5H12.5C12.2239 5 12 5.22386 12 5.5V20.5C12 20.7761 12.2239 21 12.5 21H15.5V26.5C15.5 27.0523 15.9477 27.5 16.5 27.5C17.0523 27.5 17.5 27.0523 17.5 26.5V21H20.5C20.7761 21 21 20.7761 21 20.5V5.5ZM19 19H14V7H19V19Z" fill="#A3ADBD"/>
<path d="M27.5 9H29.5C29.7761 9 30 9.22386 30 9.5V22.5C30 22.7761 29.7761 23 29.5 23H27.5V27.25C27.5 27.8023 27.0523 28.25 26.5 28.25C25.9477 28.25 25.5 27.8023 25.5 27.25V23H23.5C23.2239 23 23 22.7761 23 22.5V9.5C23 9.22386 23.2239 9 23.5 9H25.5V6C25.5 5.44772 25.9477 5 26.5 5C27.0523 5 27.5 5.44772 27.5 6V9Z" fill="#CFD4DC"/>
<path d="M10 12.5C10 12.2239 9.77614 12 9.5 12H7V9C7 8.44772 6.55228 8 6 8C5.44772 8 5 8.44772 5 9V12H2.5C2.22386 12 2 12.2239 2 12.5V25.5C2 25.7761 2.22386 26 2.5 26H5V30C5 30.5523 5.44772 31 6 31C6.55228 31 7 30.5523 7 30V26H9.5C9.77614 26 10 25.7761 10 25.5V12.5Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M20.48 11.2397C20.48 16.3428 16.3433 20.48 11.2402 20.48C6.13662 20.48 1.99998 16.3428 1.99998 11.2397C1.99998 6.13664 6.13662 2 11.2402 2C16.3428 2 20.48 6.13664 20.48 11.2397Z" fill="#2576EF"/>
<path d="M30 19.92C30 22.9353 27.5866 25.38 24.61 25.38C21.6334 25.38 19.22 22.9353 19.22 19.92C19.22 16.9047 21.6334 14.46 24.61 14.46C27.5866 14.46 30 16.9047 30 19.92Z" fill="#34B3FA"/>
<path d="M18.6602 26.15C18.6602 27.1711 18.2545 28.1503 17.5325 28.8723C16.8105 29.5944 15.8312 30 14.8102 30C13.7891 30 12.8098 29.5944 12.0878 28.8723C11.3658 28.1503 10.9602 27.1711 10.9602 26.15C10.9602 25.1289 11.3658 24.1496 12.0878 23.4276C12.8098 22.7056 13.7891 22.3 14.8102 22.3C15.8312 22.3 16.8105 22.7056 17.5325 23.4276C18.2545 24.1496 18.6602 25.1289 18.6602 26.15Z" fill="#F9AE31"/>
</svg>

After

Width:  |  Height:  |  Size: 896 B

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M20.48 11.2397C20.48 16.3428 16.3433 20.48 11.2402 20.48C6.13662 20.48 1.99998 16.3428 1.99998 11.2397C1.99998 6.13664 6.13662 2 11.2402 2C16.3428 2 20.48 6.13664 20.48 11.2397Z" fill="#CFD4DC"/>
<path d="M30 19.92C30 22.9353 27.5866 25.38 24.61 25.38C21.6334 25.38 19.22 22.9353 19.22 19.92C19.22 16.9047 21.6334 14.46 24.61 14.46C27.5866 14.46 30 16.9047 30 19.92Z" fill="#A3ADBD"/>
<path d="M18.6602 26.15C18.6602 27.1711 18.2545 28.1503 17.5325 28.8723C16.8105 29.5944 15.8312 30 14.8102 30C13.7891 30 12.8098 29.5944 12.0878 28.8723C11.3658 28.1503 10.9602 27.1711 10.9602 26.15C10.9602 25.1289 11.3658 24.1496 12.0878 23.4276C12.8098 22.7056 13.7891 22.3 14.8102 22.3C15.8312 22.3 16.8105 22.7056 17.5325 23.4276C18.2545 24.1496 18.6602 25.1289 18.6602 26.15Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 896 B

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 25C2 25.5523 2.44772 26 3 26H8C8.55228 26 9 25.5523 9 25V15C9 14.4477 8.55228 14 8 14H3C2.44772 14 2 14.4477 2 15V25Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 25C23 25.5523 23.4477 26 24 26H29C29.5523 26 30 25.5523 30 25V9C30 8.44772 29.5523 8 29 8H24C23.4477 8 23 8.44772 23 9V25Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 25C12.5 25.5523 12.9477 26 13.5 26H18.5C19.0523 26 19.5 25.5523 19.5 25V3C19.5 2.44771 19.0523 2 18.5 2H13.5C12.9477 2 12.5 2.44772 12.5 3V25Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 894 B

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 25C2 25.5523 2.44772 26 3 26H8C8.55228 26 9 25.5523 9 25V15C9 14.4477 8.55228 14 8 14H3C2.44772 14 2 14.4477 2 15V25Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 25C23 25.5523 23.4477 26 24 26H29C29.5523 26 30 25.5523 30 25V9C30 8.44772 29.5523 8 29 8H24C23.4477 8 23 8.44772 23 9V25Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 25C12.5 25.5523 12.9477 26 13.5 26H18.5C19.0523 26 19.5 25.5523 19.5 25V3C19.5 2.44771 19.0523 2 18.5 2H13.5C12.9477 2 12.5 2.44772 12.5 3V25Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 894 B

7
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 25C2 25.5523 2.44772 26 3 26H8C8.55228 26 9 25.5523 9 25V13C9 12.4477 8.55228 12 8 12H3C2.44772 12 2 12.4477 2 13V25Z" fill="#84B1F6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 25C12.5 25.5523 12.9477 26 13.5 26H18.5C19.0523 26 19.5 25.5523 19.5 25V3C19.5 2.44771 19.0523 2 18.5 2H13.5C12.9477 2 12.5 2.44772 12.5 3V25Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 25C23 25.5523 23.4477 26 24 26H29C29.5523 26 30 25.5523 30 25V18C30 17.4477 29.5523 17 29 17H24C23.4477 17 23 17.4477 23 18V25Z" fill="#84B1F6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.55519 3.80658L23.8558 13.6857L29.0868 8.05233C29.4626 7.64762 30.0953 7.62419 30.5 7.99999C30.9048 8.37579 30.9282 9.00853 30.5524 9.41324L24.1443 16.3142L8.49301 6.1932L3.39985 9.32745C2.9295 9.6169 2.31355 9.47025 2.0241 8.99989C1.73465 8.52953 1.8813 7.91359 2.35166 7.62414L8.55519 3.80658Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

7
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 25C12.5 25.5523 12.9477 26 13.5 26H18.5C19.0523 26 19.5 25.5523 19.5 25V3C19.5 2.44771 19.0523 2 18.5 2H13.5C12.9477 2 12.5 2.44772 12.5 3V25Z" fill="#B8BFCB"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 25C2 25.5523 2.44772 26 3 26H8C8.55228 26 9 25.5523 9 25V13C9 12.4477 8.55228 12 8 12H3C2.44772 12 2 12.4477 2 13V25Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 25C23 25.5523 23.4477 26 24 26H29C29.5523 26 30 25.5523 30 25V18C30 17.4477 29.5523 17 29 17H24C23.4477 17 23 17.4477 23 18V25Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.55519 3.80658L23.8558 13.6857L29.0868 8.05233C29.4626 7.64762 30.0953 7.62419 30.5 7.99999C30.9048 8.37579 30.9282 9.00853 30.5524 9.41324L24.1443 16.3142L8.49301 6.1932L3.39985 9.32745C2.9295 9.6169 2.31355 9.47025 2.0241 8.99989C1.73465 8.52953 1.8813 7.91359 2.35166 7.62414L8.55519 3.80658Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.4271 17.0001C29.7173 17.0001 29.9473 17.2465 29.9155 17.535C29.67 19.761 28.893 21.9036 27.6405 23.7781C26.1021 26.0804 23.9156 27.8748 21.3575 28.9344C18.7993 29.994 15.9844 30.2713 13.2686 29.7311C11.0575 29.2913 8.99303 28.3256 7.2454 26.9252C7.01893 26.7438 7.00737 26.4068 7.21258 26.2016L9.35159 24.0626C9.53316 23.8811 9.82196 23.8677 10.0279 24.021C11.2142 24.9042 12.5867 25.5171 14.049 25.8079C15.9888 26.1938 17.9995 25.9958 19.8267 25.2389C21.654 24.482 23.2158 23.2003 24.3146 21.5558C25.1429 20.3161 25.6801 18.9122 25.8944 17.4489C25.9316 17.1949 26.1453 17.0001 26.4021 17.0001H29.4271Z" fill="#34B3FA"/>
<path d="M6.19215 17.9509C6.48303 19.4132 7.09586 20.7857 7.97906 21.972C8.13241 22.1779 8.11904 22.4667 7.93747 22.6483L5.79846 24.7873C5.59325 24.9925 5.25633 24.981 5.07486 24.7545C3.67445 23.0069 2.70883 20.9424 2.26901 18.7312C1.72882 16.0155 2.00607 13.2006 3.06569 10.6424C4.12532 8.08425 5.91973 5.89775 8.22202 4.35941C10.0965 3.10691 12.2391 2.32989 14.4651 2.08437C14.7536 2.05255 15 2.28261 15 2.57282V5.59784C15 5.85462 14.8052 6.06829 14.5512 6.10549C13.0879 6.31977 11.684 6.85696 10.4443 7.68529C8.79981 8.7841 7.51809 10.3459 6.76121 12.1732C6.00433 14.0004 5.8063 16.0111 6.19215 17.9509Z" fill="#2576EF"/>
<path d="M17 2.57283C17 2.28262 17.2464 2.05256 17.5349 2.08437C18.8465 2.22904 20.1337 2.55872 21.3576 3.06567C23.0561 3.76924 24.5995 4.80047 25.8995 6.10049C27.1995 7.40051 28.2307 8.94386 28.9343 10.6424C29.4413 11.8663 29.7709 13.1535 29.9156 14.4651C29.9474 14.7536 29.7174 15 29.4272 15L26.4021 15C26.1454 15 25.9317 14.8052 25.8945 14.5512C25.7752 13.7363 25.5554 12.9374 25.2388 12.1732C24.7362 10.9599 23.9997 9.85751 23.0711 8.92892C22.1425 8.00033 21.0401 7.26374 19.8268 6.76119C19.0625 6.44461 18.2637 6.22482 17.4488 6.1055C17.1948 6.06829 17 5.85462 17 5.59784V2.57283Z" fill="#F9AE31"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17 2.57288C17 2.28268 17.2464 2.05261 17.5349 2.08443C18.8465 2.2291 20.1337 2.55878 21.3576 3.06573C23.0561 3.76929 24.5995 4.80053 25.8995 6.10055C27.1995 7.40057 28.2308 8.94392 28.9343 10.6425C29.4413 11.8664 29.7709 13.1536 29.9156 14.4652C29.9474 14.7536 29.7174 15 29.4272 15L26.4021 15C26.1454 15 25.9317 14.8053 25.8945 14.5512C25.7752 13.7364 25.5554 12.9375 25.2388 12.1732C24.7362 10.96 23.9997 9.85756 23.0711 8.92897C22.1425 8.00039 21.0401 7.26379 19.8268 6.76124C19.0625 6.44466 18.2637 6.22487 17.4488 6.10555C17.1948 6.06835 17 5.85468 17 5.5979V2.57288Z" fill="#CFD4DC"/>
<path d="M6.19215 17.9509C6.48303 19.4132 7.09586 20.7857 7.97906 21.972C8.13241 22.1779 8.11904 22.4667 7.93747 22.6483L5.79846 24.7873C5.59325 24.9925 5.25633 24.981 5.07486 24.7545C3.67445 23.0069 2.70883 20.9424 2.26901 18.7312C1.72882 16.0155 2.00607 13.2006 3.06569 10.6424C4.12532 8.08425 5.91973 5.89775 8.22202 4.35941C10.0965 3.10691 12.2391 2.32989 14.4651 2.08437C14.7536 2.05255 15 2.28261 15 2.57282V5.59784C15 5.85462 14.8052 6.06829 14.5512 6.10549C13.0879 6.31977 11.684 6.85696 10.4443 7.68529C8.79981 8.7841 7.51809 10.3459 6.76121 12.1732C6.00433 14.0004 5.8063 16.0111 6.19215 17.9509Z" fill="#A3ADBD"/>
<path d="M29.4268 17.0001C29.717 17.0001 29.9471 17.2465 29.9153 17.535C29.6697 19.761 28.8927 21.9036 27.6402 23.7781C26.1019 26.0804 23.9154 27.8748 21.3572 28.9344C18.799 29.9941 15.9841 30.2713 13.2684 29.7311C11.0573 29.2913 8.99275 28.3257 7.24512 26.9253C7.01865 26.7438 7.0071 26.4069 7.2123 26.2017L9.35131 24.0627C9.53288 23.8811 9.82169 23.8677 10.0276 24.0211C11.2139 24.9043 12.5864 25.5171 14.0487 25.808C15.9885 26.1938 17.9992 25.9958 19.8265 25.2389C21.6537 24.482 23.2155 23.2003 24.3143 21.5558C25.1427 20.3161 25.6799 18.9123 25.8941 17.449C25.9313 17.1949 26.145 17.0001 26.4018 17.0001H29.4268Z" fill="#B8BFCB"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

7
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.9 KiB

7
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.9 KiB

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 25.4996C8 26.0518 8.44769 26.4995 8.99995 26.4996L18 26.5V24.5L10 24.4995L10 7.94006L18 7.94054V6.00049L9.00005 6.00005C8.44774 6.00002 8 6.44774 8 7.00005L8 25.4996Z" fill="#3F506A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M19 11C18.4477 11 18 10.5523 18 10V3C18 2.44772 18.4477 2 19 2L29 2C29.5523 2 30 2.44772 30 3V10C30 10.5523 29.5523 11 29 11H19Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M19 30C18.4477 30 18 29.5523 18 29V22C18 21.4477 18.4477 21 19 21H29C29.5523 21 30 21.4477 30 22V29C30 29.5523 29.5523 30 29 30L19 30Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 20.5C2.44772 20.5 2 20.0523 2 19.5L2 12.5C2 11.9477 2.44772 11.5 3 11.5H15C15.5523 11.5 16 11.9477 16 12.5V19.5C16 20.0523 15.5523 20.5 15 20.5H3Z" fill="#2576EF"/>
</svg>

After

Width:  |  Height:  |  Size: 915 B

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 25.4996C8 26.0518 8.44769 26.4995 8.99995 26.4996L18 26.5V24.5L10 24.4995L10 7.94006L18 7.94054V6.00049L9.00005 6.00005C8.44774 6.00002 8 6.44774 8 7.00005L8 25.4996Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M19 11C18.4477 11 18 10.5523 18 10V3C18 2.44772 18.4477 2 19 2L29 2C29.5523 2 30 2.44772 30 3V10C30 10.5523 29.5523 11 29 11H19Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M19 30C18.4477 30 18 29.5523 18 29V22C18 21.4477 18.4477 21 19 21H29C29.5523 21 30 21.4477 30 22V29C30 29.5523 29.5523 30 29 30L19 30Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 20.5C2.44772 20.5 2 20.0523 2 19.5L2 12.5C2 11.9477 2.44772 11.5 3 11.5H15C15.5523 11.5 16 11.9477 16 12.5V19.5C16 20.0523 15.5523 20.5 15 20.5H3Z" fill="#A3ADBD"/>
</svg>

After

Width:  |  Height:  |  Size: 915 B

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.99524 3.77038C1.78133 3.43762 2.02025 3 2.41583 3H29.5842C29.9797 3 30.2187 3.43762 30.0048 3.77038L26.1476 9.77038C26.0556 9.91349 25.8972 10 25.727 10H6.27298C6.10284 10 5.94439 9.91349 5.85239 9.77038L1.99524 3.77038Z" fill="#2576EF"/>
<path d="M6.1603 12.6243C6.07908 12.308 6.318 12 6.6446 12H25.3554C25.682 12 25.9209 12.308 25.8397 12.6243L24.0424 19.6243C23.9856 19.8454 23.7864 20 23.5581 20H8.44189C8.21364 20 8.01437 19.8454 7.9576 19.6243L6.1603 12.6243Z" fill="#34B3FA"/>
<path d="M8.42747 22.7481C8.23699 22.4147 8.47768 22 8.86159 22H23.1384C23.5223 22 23.763 22.4147 23.5725 22.7481L20.144 28.7481C20.0549 28.9039 19.8893 29 19.7098 29H12.2902C12.1107 29 11.9451 28.9039 11.856 28.7481L8.42747 22.7481Z" fill="#F9AE31"/>
</svg>

After

Width:  |  Height:  |  Size: 852 B

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.99524 3.77038C1.78133 3.43762 2.02025 3 2.41583 3H29.5842C29.9797 3 30.2187 3.43762 30.0048 3.77038L26.1476 9.77038C26.0556 9.91349 25.8972 10 25.727 10H6.27298C6.10284 10 5.94439 9.91349 5.85239 9.77038L1.99524 3.77038Z" fill="#A3ADBD"/>
<path d="M6.1603 12.6243C6.07908 12.308 6.318 12 6.6446 12H25.3554C25.682 12 25.9209 12.308 25.8397 12.6243L24.0424 19.6243C23.9856 19.8454 23.7864 20 23.5581 20H8.44189C8.21364 20 8.01437 19.8454 7.9576 19.6243L6.1603 12.6243Z" fill="#B8BFCB"/>
<path d="M8.42747 22.7481C8.23699 22.4147 8.47768 22 8.86159 22H23.1384C23.5223 22 23.763 22.4147 23.5725 22.7481L20.144 28.7481C20.0549 28.9039 19.8893 29 19.7098 29H12.2902C12.1107 29 11.9451 28.9039 11.856 28.7481L8.42747 22.7481Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 852 B

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 6C13.4477 6 13 6.44771 13 7L13 11C13 11.5523 13.4477 12 14 12L29 12C29.5523 12 30 11.5523 30 11L30 7C30 6.44772 29.5523 6 29 6L14 6Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 15.0001C6.44772 15.0001 6 15.4478 6 16.0001L6 20.0001C6 20.5523 6.44772 21.0001 7 21.0001L25 21.0001C25.5523 21.0001 26 20.5523 26 20.0001L26 16.0001C26 15.4478 25.5523 15.0001 25 15.0001L7 15.0001Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 24.0001C11.4477 24.0001 11 24.4478 11 25.0001L11 29.0001C11 29.5523 11.4477 30.0001 12 30.0001L28 30.0001C28.5523 30.0001 29 29.5523 29 29.0001L29 25.0001C29 24.4478 28.5523 24.0001 28 24.0001L12 24.0001Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4C2 2.89543 2.89543 2 4 2L30 2C30.5523 2 31 2.44772 31 3C31 3.55229 30.5523 4 30 4L4 4L4 29.5C4 30.0523 3.55228 30.5 3 30.5C2.44771 30.5 2 30.0523 2 29.5L2 4Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 6C13.4477 6 13 6.44771 13 7L13 11C13 11.5523 13.4477 12 14 12L29 12C29.5523 12 30 11.5523 30 11L30 7C30 6.44772 29.5523 6 29 6L14 6Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 15.0001C6.44772 15.0001 6 15.4478 6 16.0001L6 20.0001C6 20.5523 6.44772 21.0001 7 21.0001L25 21.0001C25.5523 21.0001 26 20.5523 26 20.0001L26 16.0001C26 15.4478 25.5523 15.0001 25 15.0001L7 15.0001Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 24.0001C11.4477 24.0001 11 24.4478 11 25.0001L11 29.0001C11 29.5523 11.4477 30.0001 12 30.0001L28 30.0001C28.5523 30.0001 29 29.5523 29 29.0001L29 25.0001C29 24.4478 28.5523 24.0001 28 24.0001L12 24.0001Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4C2 2.89543 2.89543 2 4 2L30 2C30.5523 2 31 2.44772 31 3C31 3.55229 30.5523 4 30 4L4 4L4 29.5C4 30.0523 3.55228 30.5 3 30.5C2.44771 30.5 2 30.0523 2 29.5L2 4Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

11
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB

11
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.17517 1.71069C2.61111 1.37162 3.23939 1.45016 3.57846 1.88611L19.8848 23.2233L28.1379 7.493C28.4179 7.01697 29.0308 6.85807 29.5068 7.13808C29.9829 7.4181 30.1418 8.03101 29.8617 8.50704L20.8617 25.507C20.6937 25.7927 20.3951 25.9765 20.0644 25.9979C19.7337 26.0193 19.4139 25.8755 19.2104 25.614L1.99976 3.11399C1.66069 2.67804 1.73922 2.04976 2.17517 1.71069Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 25.4158C2.22962 25.918 2.82295 26.1391 3.32523 25.9095L11.6657 21.9095C11.8802 21.8114 12.0531 21.6407 12.1539 21.4276L20.0961 4.63566L28.138 20.007C28.418 20.483 29.0309 20.6419 29.507 20.3619C29.983 20.0819 30.1419 19.469 29.8619 18.993L20.8619 1.99297C20.6741 1.67366 20.3251 1.48435 19.955 1.501C19.5849 1.51765 19.2544 1.73754 19.096 2.07243L10.5021 20.2423L2.49371 24.0905C1.99143 24.3201 1.77038 24.9135 2 25.4158Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.17517 1.71069C2.61111 1.37162 3.23939 1.45016 3.57846 1.88611L19.8848 23.2233L28.1379 7.493C28.4179 7.01697 29.0308 6.85807 29.5068 7.13808C29.9829 7.4181 30.1418 8.03101 29.8617 8.50704L20.8617 25.507C20.6937 25.7927 20.3951 25.9765 20.0644 25.9979C19.7337 26.0193 19.4139 25.8755 19.2104 25.614L1.99976 3.11399C1.66069 2.67804 1.73922 2.04976 2.17517 1.71069Z" fill="#B8BFCB"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 25.4158C2.22962 25.918 2.82295 26.1391 3.32523 25.9095L11.6657 21.9095C11.8802 21.8114 12.0531 21.6407 12.1539 21.4276L20.0961 4.63566L28.138 20.007C28.418 20.483 29.0309 20.6419 29.507 20.3619C29.983 20.0819 30.1419 19.469 29.8619 18.993L20.8619 1.99297C20.6741 1.67366 20.3251 1.48435 19.955 1.501C19.5849 1.51765 19.2544 1.73754 19.096 2.07243L10.5021 20.2423L2.49371 24.0905C1.99143 24.3201 1.77038 24.9135 2 25.4158Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.3 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.3 KiB

8
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg

@ -0,0 +1,8 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M30 16C30 23.732 23.732 30 16 30C8.26801 30 2 23.732 2 16C2 8.26801 8.26801 2 16 2C23.732 2 30 8.26801 30 16Z" fill="#0A1C38" fill-opacity="0.05"/>
<path d="M26.8239 14.8149C26.8518 15.0773 27.069 15.2828 27.3329 15.2828H29.4577C29.7435 15.2828 29.9719 15.043 29.9473 14.7582C29.3619 8.00324 23.9796 2.62099 17.2247 2.03564C16.9399 2.01097 16.7001 2.23945 16.7001 2.52525V4.6192C16.7001 4.88249 16.9047 5.09943 17.1664 5.12805C22.249 5.68396 26.2831 9.72778 26.8239 14.8149Z" fill="#F9AE31"/>
<path d="M14.815 5.15899C15.0774 5.13109 15.2829 4.91387 15.2829 4.64998V2.52525C15.2829 2.23945 15.043 2.01097 14.7583 2.03564C8.00332 2.621 2.62106 8.00327 2.03572 14.7583C2.01104 15.043 2.23952 15.2828 2.52532 15.2828H4.61928C4.88256 15.2828 5.0995 15.0783 5.12813 14.8165C5.68403 9.7339 9.72785 5.69985 14.815 5.15899Z" fill="#2576EF"/>
<path d="M23.84 23.5965C25.4883 21.8968 26.5888 19.6518 26.8566 17.1669C26.8848 16.9049 27.1019 16.7 27.3655 16.7H29.4591C29.7446 16.7 29.973 16.9389 29.9488 17.2235C29.7896 19.0882 29.265 20.8487 28.4468 22.4328C28.4436 22.4389 28.4438 22.4461 28.4472 22.452C28.4506 22.4579 28.4508 22.4652 28.4476 22.4713C27.4233 24.4329 25.9478 26.1215 24.1588 27.3995C23.4692 27.8921 22.5281 27.6286 22.1044 26.8947C21.6729 26.1473 21.9444 25.1992 22.6295 24.6745C23.0593 24.3453 23.464 23.9848 23.84 23.5965Z" fill="#F9AE31"/>
<path d="M8.148 23.601C8.14525 23.5981 8.1437 23.5943 8.1437 23.5904C8.1437 23.5864 8.14216 23.5826 8.1394 23.5797C6.4935 21.8806 5.39474 19.6483 5.12717 17.1669C5.09891 16.9049 4.88183 16.7 4.61825 16.7H2.52468C2.23912 16.7 2.01069 16.9389 2.03498 17.2235C2.1941 19.0882 2.71875 20.8487 3.53697 22.4328C3.5401 22.4389 3.53993 22.4461 3.53652 22.452C3.53311 22.4579 3.53295 22.4652 3.53611 22.4713C4.56046 24.4329 6.03598 26.1215 7.82497 27.3995C8.51449 27.8921 9.45561 27.6286 9.87929 26.8947C10.3108 26.1473 10.0394 25.1992 9.35425 24.6745C8.92606 24.3465 8.52286 23.9876 8.148 23.601Z" fill="#2576EF"/>
<path d="M18.565 13.2747L25.4144 11.0002L19.9572 15.7566C19.9854 15.9484 20 16.1446 20 16.3442C20 18.5533 18.2091 20.3442 16 20.3442C13.7909 20.3442 12 18.5533 12 16.3442C12 14.135 13.7909 12.3442 16 12.3442C16.9761 12.3442 17.8706 12.6938 18.565 13.2747Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

8
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg

@ -0,0 +1,8 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M30 16C30 23.732 23.732 30 16 30C8.26801 30 2 23.732 2 16C2 8.26801 8.26801 2 16 2C23.732 2 30 8.26801 30 16Z" fill="#F8F9FC"/>
<path d="M26.824 14.8149C26.8519 15.0773 27.0692 15.2828 27.333 15.2828H29.4578C29.7436 15.2828 29.9721 15.043 29.9474 14.7582C29.362 8.00324 23.9797 2.62099 17.2248 2.03564C16.94 2.01097 16.7002 2.23945 16.7002 2.52525V4.6192C16.7002 4.88249 16.9048 5.09943 17.1665 5.12805C22.2491 5.68396 26.2832 9.72778 26.824 14.8149Z" fill="#CFD4DC"/>
<path d="M23.8401 23.5965C25.4884 21.8968 26.5889 19.6518 26.8567 17.1669C26.8849 16.9049 27.102 16.7 27.3656 16.7H29.4592C29.7447 16.7 29.9731 16.9389 29.9489 17.2235C29.7897 19.0882 29.2651 20.8487 28.4469 22.4328C28.4437 22.4389 28.4439 22.4461 28.4473 22.452C28.4507 22.4579 28.4509 22.4652 28.4477 22.4713C27.4234 24.4329 25.9479 26.1215 24.1589 27.3995C23.4693 27.8921 22.5282 27.6286 22.1045 26.8947C21.673 26.1473 21.9445 25.1992 22.6296 24.6745C23.0594 24.3453 23.4641 23.9848 23.8401 23.5965Z" fill="#CFD4DC"/>
<path d="M14.815 5.15899C15.0774 5.13109 15.2829 4.91387 15.2829 4.64998V2.52525C15.2829 2.23945 15.043 2.01097 14.7583 2.03564C8.00332 2.621 2.62106 8.00327 2.03572 14.7582C2.01104 15.043 2.23952 15.2828 2.52532 15.2828H4.61928C4.88256 15.2828 5.0995 15.0783 5.12813 14.8165C5.68403 9.7339 9.72785 5.69985 14.815 5.15899Z" fill="#B8BFCB"/>
<path d="M8.148 23.601C8.14525 23.5981 8.1437 23.5943 8.1437 23.5904C8.1437 23.5864 8.14216 23.5826 8.1394 23.5797C6.4935 21.8806 5.39474 19.6483 5.12717 17.1669C5.09891 16.9049 4.88183 16.7 4.61825 16.7H2.52468C2.23912 16.7 2.01069 16.9389 2.03498 17.2235C2.1941 19.0882 2.71875 20.8487 3.53697 22.4328C3.5401 22.4389 3.53993 22.4461 3.53652 22.452C3.53311 22.4579 3.53295 22.4652 3.53611 22.4713C4.56046 24.4329 6.03598 26.1215 7.82497 27.3995C8.51449 27.8921 9.45561 27.6286 9.87929 26.8947C10.3108 26.1473 10.0394 25.1992 9.35425 24.6745C8.92606 24.3465 8.52286 23.9876 8.148 23.601Z" fill="#B8BFCB"/>
<path d="M18.565 13.2747L25.4144 11.0002L19.9572 15.7566C19.9854 15.9484 20 16.1446 20 16.3442C20 18.5533 18.2091 20.3442 16 20.3442C13.7909 20.3442 12 18.5533 12 16.3442C12 14.135 13.7909 12.3442 16 12.3442C16.9761 12.3442 17.8706 12.6938 18.565 13.2747Z" fill="#A3ADBD"/>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

10
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg

@ -0,0 +1,10 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25.3295 16.7527C25.6419 16.7527 25.8896 17.019 25.8483 17.3286C25.257 21.7534 21.7537 25.2567 17.3291 25.848C17.0195 25.8894 16.7532 25.6416 16.7532 25.3293L16.7532 17.2897C16.7532 16.9931 16.9936 16.7527 17.2902 16.7527H25.3295Z" fill="#F9AE31"/>
<path d="M17.2557 27.6763C16.9739 27.7063 16.7532 27.9396 16.7532 28.223L16.7532 30.4721C16.7532 30.779 17.0108 31.0244 17.3166 30.9979C24.5808 30.3688 30.3689 24.5805 30.998 17.3161C31.0245 17.0103 30.7791 16.7527 30.4722 16.7527H28.2232C27.9398 16.7527 27.7065 16.9734 27.6765 17.2552C27.0939 22.7379 22.7382 27.0937 17.2557 27.6763Z" fill="#FFE398"/>
<path d="M6.67046 16.7528C6.35809 16.7528 6.11035 17.0191 6.15172 17.3287C6.74301 21.7534 10.2463 25.2568 14.6709 25.8481C14.9805 25.8895 15.2468 25.6417 15.2468 25.3293V17.2898C15.2468 16.9932 15.0064 16.7528 14.7098 16.7528H6.67046Z" fill="#5D6B81"/>
<path d="M14.7443 27.6764C15.0261 27.7064 15.2468 27.9397 15.2468 28.2231V30.4722C15.2468 30.7791 14.9892 31.0245 14.6834 30.998C7.41917 30.3688 1.6311 24.5806 1.00196 17.3162C0.975475 17.0104 1.22086 16.7528 1.5278 16.7528H3.77679C4.06019 16.7528 4.29349 16.9734 4.32344 17.2553C4.90605 22.738 9.26177 27.0938 14.7443 27.6764Z" fill="#C0C7D0"/>
<path d="M25.3295 15.2472C25.6419 15.2472 25.8897 14.9809 25.8483 14.6712C25.257 10.2465 21.7537 6.74317 17.3291 6.15187C17.0195 6.11049 16.7532 6.35824 16.7532 6.67062L16.7532 14.7102C16.7532 15.0068 16.9936 15.2472 17.2902 15.2472L25.3295 15.2472Z" fill="#34B3FA"/>
<path d="M6.67053 15.2472C6.35815 15.2472 6.11041 14.9809 6.15179 14.6712C6.74307 10.2465 10.2463 6.74317 14.6709 6.15187C14.9806 6.11049 15.2469 6.35824 15.2469 6.67062V14.7102C15.2469 15.0068 15.0064 15.2472 14.7099 15.2472L6.67053 15.2472Z" fill="#2576EF"/>
<path d="M17.2554 4.32356C16.9736 4.29361 16.7529 4.0603 16.7529 3.77689L16.7529 1.52782C16.7529 1.22086 17.0105 0.975474 17.3163 1.00196C24.5806 1.63113 30.3686 7.41937 30.9978 14.6838C31.0242 14.9896 30.7789 15.2472 30.4719 15.2472H28.2229C27.9395 15.2472 27.7062 15.0265 27.6763 14.7447C27.0937 9.26202 22.7379 4.90618 17.2554 4.32356Z" fill="#9FE4FD"/>
<path d="M14.5062 4.26589C14.7832 4.23646 15 4.00721 15 3.72871V1.51866C15 1.21703 14.7469 0.9759 14.4464 1.00193C7.30797 1.62018 1.62017 7.30798 1.00193 14.4464C0.9759 14.7469 1.21703 15 1.51866 15H3.72868C4.00718 15 4.23644 14.7832 4.26587 14.5062C4.83839 9.11867 9.11866 4.83841 14.5062 4.26589Z" fill="#B3CFF9"/>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

10
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg

@ -0,0 +1,10 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17.2557 27.6764C16.9739 27.7063 16.7532 27.9396 16.7532 28.2231L16.7532 30.4721C16.7532 30.7791 17.0108 31.0245 17.3166 30.998C24.5808 30.3688 30.3689 24.5806 30.998 17.3161C31.0245 17.0103 30.7791 16.7527 30.4722 16.7527H28.2232C27.9398 16.7527 27.7065 16.9734 27.6765 17.2552C27.0939 22.7379 22.7382 27.0938 17.2557 27.6764Z" fill="#CFD4DC"/>
<path d="M14.7443 27.6765C15.0261 27.7064 15.2468 27.9397 15.2468 28.2231V30.4722C15.2468 30.7792 14.9892 31.0245 14.6834 30.9981C7.41917 30.3689 1.6311 24.5807 1.00196 17.3162C0.975475 17.0104 1.22086 16.7528 1.5278 16.7528H3.77679C4.06019 16.7528 4.29349 16.9735 4.32344 17.2553C4.90605 22.738 9.26177 27.0938 14.7443 27.6765Z" fill="#CFD4DC"/>
<path d="M25.3298 16.7527C25.6422 16.7527 25.8899 17.019 25.8485 17.3286C25.2572 21.7534 21.754 25.2567 17.3294 25.848C17.0198 25.8894 16.7535 25.6416 16.7535 25.3293L16.7535 17.2897C16.7535 16.9931 16.9939 16.7527 17.2904 16.7527H25.3298Z" fill="#A3ADBD"/>
<path d="M6.67073 16.7528C6.35835 16.7528 6.11061 17.0191 6.15199 17.3287C6.74327 21.7534 10.2465 25.2568 14.6711 25.8481C14.9808 25.8895 15.2471 25.6417 15.2471 25.3293V17.2898C15.2471 16.9932 15.0066 16.7528 14.7101 16.7528H6.67073Z" fill="#A3ADBD"/>
<path d="M25.3298 15.2472C25.6422 15.2472 25.8899 14.9809 25.8485 14.6712C25.2573 10.2465 21.754 6.74317 17.3294 6.15187C17.0198 6.11049 16.7535 6.35824 16.7535 6.67062L16.7535 14.7102C16.7535 15.0068 16.9939 15.2472 17.2905 15.2472L25.3298 15.2472Z" fill="#A3ADBD"/>
<path d="M6.67079 15.2472C6.35842 15.2472 6.11067 14.9809 6.15205 14.6712C6.74333 10.2465 10.2466 6.74317 14.6712 6.15187C14.9808 6.11049 15.2471 6.35824 15.2471 6.67062V14.7102C15.2471 15.0068 15.0067 15.2472 14.7101 15.2472L6.67079 15.2472Z" fill="#A3ADBD"/>
<path d="M17.2554 4.32356C16.9736 4.29361 16.7529 4.0603 16.7529 3.77689L16.7529 1.52782C16.7529 1.22086 17.0105 0.975474 17.3163 1.00196C24.5806 1.63113 30.3686 7.41937 30.9978 14.6838C31.0242 14.9896 30.7789 15.2472 30.4719 15.2472H28.2229C27.9395 15.2472 27.7062 15.0265 27.6763 14.7447C27.0937 9.26202 22.7379 4.90618 17.2554 4.32356Z" fill="#CFD4DC"/>
<path d="M14.5062 4.26589C14.7832 4.23646 15 4.00721 15 3.72871V1.51866C15 1.21703 14.7469 0.9759 14.4464 1.00193C7.30797 1.62018 1.62017 7.30798 1.00193 14.4464C0.9759 14.7469 1.21703 15 1.51866 15H3.72868C4.00718 15 4.23644 14.7832 4.26587 14.5062C4.83839 9.11867 9.11866 4.83841 14.5062 4.26589Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2362 7.47725C28.6964 9.37056 29.6389 11.5941 29.9898 13.9322C30.076 14.5063 29.6142 14.9999 29.0336 14.9999H18.6871C18.029 14.9999 17.5504 14.3753 17.7215 13.7399L20.3973 3.8045C20.548 3.24516 21.1426 2.92753 21.6744 3.15715C23.8567 4.09939 25.7743 5.58176 27.2362 7.47725Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6868 3.0657C12.904 2.15201 15.3079 1.82198 17.6698 2.09053C18.2474 2.1562 18.605 2.73098 18.4539 3.29228L15.2406 15.223C15.1949 15.3929 15.1051 15.5478 14.9803 15.6719L6.19386 24.4135C5.78383 24.8214 5.1113 24.7991 4.76581 24.3353C3.34953 22.4337 2.43385 20.1961 2.12041 17.8274C1.71607 14.7719 2.33644 11.669 3.8853 9.00003C5.43415 6.33103 7.82493 4.24508 10.6868 3.0657Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.327 29.731C11.2831 29.3265 9.36377 28.4773 7.70221 27.2542C7.23317 26.9089 7.21063 26.2307 7.62353 25.8199L16.1961 17.2911C16.3835 17.1047 16.6371 17 16.9014 17H29.0338C29.6143 17 30.0761 17.4936 29.9899 18.0678C29.6845 20.1022 28.9309 22.0536 27.7727 23.778C26.2265 26.0803 24.0287 27.8747 21.4574 28.9344C18.8861 29.994 16.0567 30.2712 13.327 29.731Z" fill="#34B3FA"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2362 7.47725C28.6964 9.37056 29.6389 11.5941 29.9898 13.9322C30.076 14.5063 29.6142 14.9999 29.0336 14.9999H18.6871C18.029 14.9999 17.5504 14.3753 17.7215 13.7399L20.3973 3.8045C20.548 3.24516 21.1426 2.92753 21.6744 3.15715C23.8567 4.09939 25.7743 5.58176 27.2362 7.47725Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6868 3.0657C12.904 2.15201 15.3079 1.82198 17.6698 2.09053C18.2474 2.1562 18.605 2.73098 18.4539 3.29228L15.2406 15.223C15.1949 15.3929 15.1051 15.5478 14.9803 15.6719L6.19386 24.4135C5.78383 24.8214 5.1113 24.7991 4.76581 24.3353C3.34953 22.4337 2.43385 20.1961 2.12041 17.8274C1.71607 14.7719 2.33644 11.669 3.8853 9.00003C5.43415 6.33103 7.82493 4.24508 10.6868 3.0657Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.327 29.731C11.2831 29.3265 9.36377 28.4773 7.70221 27.2542C7.23317 26.9089 7.21063 26.2307 7.62353 25.8199L16.1961 17.2911C16.3835 17.1047 16.6371 17 16.9014 17H29.0338C29.6143 17 30.0761 17.4936 29.9899 18.0678C29.6845 20.1022 28.9309 22.0536 27.7727 23.778C26.2265 26.0803 24.0287 27.8747 21.4574 28.9344C18.8861 29.994 16.0567 30.2712 13.327 29.731Z" fill="#B8BFCB"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.18553 21.3857C6.07568 21.8179 6.26526 22.2706 6.6503 22.4955L15.5886 27.717C15.8895 27.8928 16.2603 27.8992 16.5671 27.734L26.0517 22.6263C26.5636 22.3506 26.7333 21.6979 26.4204 21.2078L16.7146 6.00482C16.38 5.48067 15.6532 5.3858 15.1952 5.80649L8.82647 11.6569C8.68337 11.7884 8.58166 11.9587 8.53379 12.147L6.18553 21.3857Z" fill="#F9AE31"/>
<path d="M6.97973 10.0026C6.23271 9.94937 5.7421 10.7373 6.1441 11.3445L15.5775 25.5946C15.886 26.0606 16.5611 26.1388 16.976 25.7566L23.027 20.1825C23.1576 20.0622 23.2479 19.9073 23.2865 19.7375L24.9788 12.285C25.0968 11.7653 24.7087 11.2654 24.1565 11.2261L6.97973 10.0026Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16 2.30349L4 9.16063V22.8393L16 29.6965L28 22.8393V9.16063L16 2.30349ZM16.4961 0.283491L29.4961 7.71206C29.8077 7.8901 30 8.22145 30 8.58031V23.4197C30 23.7785 29.8077 24.1099 29.4961 24.2879L16.4961 31.7165C16.1887 31.8922 15.8113 31.8922 15.5039 31.7165L2.50386 24.2879C2.19229 24.1099 2 23.7785 2 23.4197V8.58031C2 8.22145 2.19229 7.89011 2.50386 7.71206L15.5039 0.28349C15.8113 0.107814 16.1887 0.107815 16.4961 0.283491Z" fill="#3F506A"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.18569 21.3857C6.07583 21.8179 6.26542 22.2706 6.65046 22.4955L15.5888 27.717C15.8897 27.8928 16.2604 27.8992 16.5673 27.734L26.0518 22.6263C26.5638 22.3506 26.7335 21.6979 26.4206 21.2078L16.7147 6.00482C16.3801 5.48067 15.6533 5.3858 15.1954 5.80649L8.82663 11.6569C8.68352 11.7884 8.58182 11.9587 8.53395 12.147L6.18569 21.3857Z" fill="#CFD4DC"/>
<path d="M6.97973 10.0026C6.23271 9.94935 5.7421 10.7372 6.1441 11.3445L15.5775 25.5946C15.886 26.0606 16.5611 26.1388 16.976 25.7566L23.027 20.1825C23.1576 20.0622 23.2479 19.9073 23.2865 19.7375L24.9788 12.285C25.0968 11.7652 24.7087 11.2654 24.1565 11.2261L6.97973 10.0026Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16 2.30349L4 9.16063V22.8393L16 29.6965L28 22.8393V9.16063L16 2.30349ZM16.4961 0.283491L29.4961 7.71206C29.8077 7.8901 30 8.22145 30 8.58031V23.4197C30 23.7785 29.8077 24.1099 29.4961 24.2879L16.4961 31.7165C16.1887 31.8922 15.8113 31.8922 15.5039 31.7165L2.50386 24.2879C2.19229 24.1099 2 23.7785 2 23.4197V8.58031C2 8.22145 2.19229 7.89011 2.50386 7.71206L15.5039 0.28349C15.8113 0.107814 16.1887 0.107815 16.4961 0.283491Z" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

7
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2" y="2" width="16" height="16" rx="0.5" fill="#2576EF"/>
<rect width="10" height="10" rx="0.5" transform="matrix(-1 0 0 1 30 2)" fill="#34B3FA"/>
<rect x="30" y="30" width="10" height="16" rx="0.5" transform="rotate(180 30 30)" fill="#34B3FA"/>
<rect width="9" height="10" rx="0.5" transform="matrix(1 0 0 -1 9 30)" fill="#F9AE31"/>
<rect x="7" y="30" width="5" height="10" rx="0.5" transform="rotate(180 7 30)" fill="#F9AE31"/>
</svg>

After

Width:  |  Height:  |  Size: 542 B

7
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2" y="2" width="16" height="16" rx="0.5" fill="#A3ADBD"/>
<rect width="10" height="10" rx="0.5" transform="matrix(-1 0 0 1 30 2)" fill="#B8BFCB"/>
<rect x="30" y="30" width="10" height="16" rx="0.5" transform="rotate(180 30 30)" fill="#B8BFCB"/>
<rect width="9" height="10" rx="0.5" transform="matrix(1 0 0 -1 9 30)" fill="#CFD4DC"/>
<rect x="7" y="30" width="5" height="10" rx="0.5" transform="rotate(180 7 30)" fill="#CFD4DC"/>
</svg>

After

Width:  |  Height:  |  Size: 542 B

9
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg

@ -0,0 +1,9 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9 26.5C9 28.4316 7.43348 30 5.4988 30C3.56652 30 2 28.4316 2 26.5C2 24.566 3.56652 23 5.4988 23C7.43348 23 9 24.566 9 26.5Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10 5.5C10 7.43402 8.43348 9 6.4988 9C4.56652 9 3 7.43402 3 5.5C3 3.56838 4.56652 2 6.4988 2C8.43348 2 10 3.56838 10 5.5Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21 22.5C21 24.4316 19.4335 26 17.4988 26C15.5665 26 14 24.4316 14 22.5C14 20.5684 15.5665 19 17.4988 19C19.4335 19 21 20.5684 21 22.5Z" fill="#F9AE31"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13 15.5C13 17.4316 11.4335 19 9.4988 19C7.56652 19 6 17.4316 6 15.5C6 13.5684 7.56652 12 9.4988 12C11.4335 12 13 13.5684 13 15.5Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 6.5C30 8.43161 28.4335 10 26.4988 10C24.5665 10 23 8.43161 23 6.5C23 4.56838 24.5665 3 26.4988 3C28.4335 3 30 4.56838 30 6.5Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 25.5C30 27.4316 28.4335 29 26.4988 29C24.5665 29 23 27.4316 23 25.5C23 23.5684 24.5665 22 26.4988 22C28.4335 22 30 23.5684 30 25.5Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 12.5C23 14.4316 21.4335 16 19.4988 16C17.5665 16 16 14.4316 16 12.5C16 10.5684 17.5665 9 19.4988 9C21.4335 9 23 10.5684 23 12.5Z" fill="#34B3FA"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

9
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg

@ -0,0 +1,9 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9 26.5C9 28.4316 7.43348 30 5.4988 30C3.56652 30 2 28.4316 2 26.5C2 24.566 3.56652 23 5.4988 23C7.43348 23 9 24.566 9 26.5Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10 5.5C10 7.43402 8.43348 9 6.4988 9C4.56652 9 3 7.43402 3 5.5C3 3.56838 4.56652 2 6.4988 2C8.43348 2 10 3.56838 10 5.5Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21 22.5C21 24.4316 19.4335 26 17.4988 26C15.5665 26 14 24.4316 14 22.5C14 20.5684 15.5665 19 17.4988 19C19.4335 19 21 20.5684 21 22.5Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13 15.5C13 17.4316 11.4335 19 9.4988 19C7.56652 19 6 17.4316 6 15.5C6 13.5684 7.56652 12 9.4988 12C11.4335 12 13 13.5684 13 15.5Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 6.5C30 8.43161 28.4335 10 26.4988 10C24.5665 10 23 8.43161 23 6.5C23 4.56838 24.5665 3 26.4988 3C28.4335 3 30 4.56838 30 6.5Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 25.5C30 27.4316 28.4335 29 26.4988 29C24.5665 29 23 27.4316 23 25.5C23 23.5684 24.5665 22 26.4988 22C28.4335 22 30 23.5684 30 25.5Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 12.5C23 14.4316 21.4335 16 19.4988 16C17.5665 16 16 14.4316 16 12.5C16 10.5684 17.5665 9 19.4988 9C21.4335 9 23 10.5684 23 12.5Z" fill="#A3ADBD"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M18 24H9L6.60916 29.7966C6.56249 29.9192 6.44715 30 6.31864 30H4.31213C4.09134 30 3.94049 29.7714 4.02277 29.5616L12.0061 9.20036C12.0536 9.07932 12.1681 9 12.2955 9H14.7044C14.8317 9 14.9463 9.07932 14.9937 9.20036L22.9772 29.5616C23.0595 29.7714 22.9087 30 22.6879 30H20.6814C20.5529 30 20.4375 29.9192 20.3908 29.7966L18 24ZM17.227 21.1902L13.5107 11.7069L9.79452 21.1902H17.227Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M26.0196 17H23.5C23.2239 17 23 17.2239 23 17.5V24.5C23 24.7761 23.2239 25 23.5 25H26.0196C28.2179 25 30 23.2091 30 21C30 18.7909 28.2179 17 26.0196 17ZM26.0196 18.6551H24.647V23.3448H26.0196C27.3082 23.3448 28.3529 22.295 28.3529 21C28.3529 19.705 27.3082 18.6551 26.0196 18.6551Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 2.5C20 2.22386 20.2239 2 20.5 2H24.7368C26.6335 2 28.1711 3.49814 28.1711 5.34618C28.1711 6.26344 27.7923 7.0945 27.1788 7.69896C28.2624 8.26172 29 9.37384 29 10.6538C29 12.5019 27.4625 14 25.5658 14H20.5C20.2239 14 20 13.7761 20 13.5V2.5ZM24.7592 7.30764H21.4209V3.38466H24.7367C25.8486 3.38466 26.7499 4.26287 26.7499 5.34621C26.7499 6.42224 25.8607 7.29591 24.7592 7.30764ZM21.4209 8.69236V12.6154H25.5657C26.6775 12.6154 27.5788 11.7372 27.5788 10.6539C27.5788 9.57052 26.6775 8.6923 25.5657 8.6923H24.7566C24.75 8.69234 24.7434 8.69236 24.7368 8.69236H21.4209Z" fill="#3F506A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8.58696C2 6.60594 3.65303 5 5.69215 5C6.94272 5 8.04806 5.60402 8.71595 6.52815C8.86014 6.72765 8.80209 7.00025 8.60797 7.15159L8.24146 7.43729C7.98454 7.63759 7.60573 7.53782 7.39005 7.29367C6.99608 6.8477 6.41162 6.56518 5.75925 6.56518C4.57285 6.56518 3.61109 7.49955 3.61109 8.65214V10.2174C3.61109 11.37 4.57285 12.3043 5.75925 12.3043C6.41469 12.3043 7.00156 12.0191 7.39559 11.5695C7.61113 11.3236 7.99171 11.2222 8.24963 11.4233L8.67394 11.7541C8.86316 11.9016 8.92396 12.1651 8.7906 12.3645C8.13235 13.3489 6.99051 14 5.69215 14C3.65303 14 2 12.3941 2 10.413V8.58696Z" fill="#F9AE31"/>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

6
designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M18 24H9L6.60916 29.7966C6.56249 29.9192 6.44715 30 6.31864 30H4.31213C4.09134 30 3.94049 29.7714 4.02277 29.5616L12.0061 9.20036C12.0536 9.07932 12.1681 9 12.2955 9H14.7044C14.8317 9 14.9463 9.07932 14.9937 9.20036L22.9772 29.5616C23.0595 29.7714 22.9087 30 22.6879 30H20.6814C20.5529 30 20.4375 29.9192 20.3908 29.7966L18 24ZM17.227 21.1902L13.5107 11.7069L9.79452 21.1902H17.227Z" fill="#CFD4DC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M26.0196 17H23.5C23.2239 17 23 17.2239 23 17.5V24.5C23 24.7761 23.2239 25 23.5 25H26.0196C28.2179 25 30 23.2091 30 21C30 18.7909 28.2179 17 26.0196 17ZM26.0196 18.6551H24.647V23.3448H26.0196C27.3082 23.3448 28.3529 22.295 28.3529 21C28.3529 19.705 27.3082 18.6551 26.0196 18.6551Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 2.5C20 2.22386 20.2239 2 20.5 2H24.7368C26.6335 2 28.1711 3.49814 28.1711 5.34618C28.1711 6.26344 27.7923 7.0945 27.1788 7.69896C28.2624 8.26172 29 9.37384 29 10.6538C29 12.5019 27.4625 14 25.5658 14H20.5C20.2239 14 20 13.7761 20 13.5V2.5ZM24.7592 7.30764H21.4209V3.38466H24.7367C25.8486 3.38466 26.7499 4.26287 26.7499 5.34621C26.7499 6.42224 25.8607 7.29591 24.7592 7.30764ZM21.4209 8.69236V12.6154H25.5657C26.6775 12.6154 27.5788 11.7372 27.5788 10.6539C27.5788 9.57052 26.6775 8.6923 25.5657 8.6923H24.7566C24.75 8.69234 24.7434 8.69236 24.7368 8.69236H21.4209Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8.58696C2 6.60594 3.65303 5 5.69215 5C6.94272 5 8.04806 5.60402 8.71595 6.52815C8.86014 6.72765 8.80209 7.00025 8.60797 7.15159L8.24146 7.43729C7.98454 7.63759 7.60573 7.53782 7.39005 7.29367C6.99608 6.8477 6.41162 6.56518 5.75925 6.56518C4.57285 6.56518 3.61109 7.49955 3.61109 8.65214V10.2174C3.61109 11.37 4.57285 12.3043 5.75925 12.3043C6.41469 12.3043 7.00156 12.0191 7.39559 11.5695C7.61113 11.3236 7.99171 11.2222 8.24963 11.4233L8.67394 11.7541C8.86316 11.9016 8.92396 12.1651 8.7906 12.3645C8.13235 13.3489 6.99051 14 5.69215 14C3.65303 14 2 12.3941 2 10.413V8.58696Z" fill="#A3ADBD"/>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

11
designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg

@ -0,0 +1,11 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<mask id="path-1-inside-1_12085_17017" fill="white">
<rect x="2" y="7" width="28" height="23" rx="0.5"/>
</mask>
<rect x="2" y="7" width="28" height="23" rx="0.5" stroke="#84B1F6" stroke-width="4" mask="url(#path-1-inside-1_12085_17017)"/>
<rect x="11" y="9" width="2" height="20" fill="#84B1F6"/>
<rect x="19" y="9" width="2" height="20" fill="#84B1F6"/>
<rect x="4" y="23" width="2" height="25" transform="rotate(-90 4 23)" fill="#84B1F6"/>
<rect x="4" y="16" width="2" height="25" transform="rotate(-90 4 16)" fill="#84B1F6"/>
<path d="M2 2.5C2 2.22386 2.22386 2 2.5 2H29.5C29.7761 2 30 2.22386 30 2.5V9H2V2.5Z" fill="#2576EF"/>
</svg>

After

Width:  |  Height:  |  Size: 735 B

8
designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg

@ -0,0 +1,8 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 9V28H28V9H4ZM2.5 7C2.22386 7 2 7.22386 2 7.5V29.5C2 29.7761 2.22386 30 2.5 30H29.5C29.7761 30 30 29.7761 30 29.5V7.5C30 7.22386 29.7761 7 29.5 7H2.5Z" fill="#CFD4DC"/>
<rect x="11" y="9" width="2" height="20" fill="#CFD4DC"/>
<rect x="19" y="9" width="2" height="20" fill="#CFD4DC"/>
<rect x="4" y="23" width="2" height="25" transform="rotate(-90 4 23)" fill="#CFD4DC"/>
<rect x="4" y="16" width="2" height="25" transform="rotate(-90 4 16)" fill="#CFD4DC"/>
<path d="M2 2.5C2 2.22386 2.22386 2 2.5 2H29.5C29.7761 2 30 2.22386 30 2.5V9H2V2.5Z" fill="#A3ADBD"/>
</svg>

After

Width:  |  Height:  |  Size: 715 B

4
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M29 10.7515V28H7V22H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V9H7V4H23.0925L29 10.7515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 11C1 9.89543 1.89543 9 3 9H24C25.1046 9 26 9.89543 26 11V20C26 21.1046 25.1046 22 24 22H3C1.89543 22 1 21.1046 1 20V11ZM18.5389 12.4471C18.4507 12.1802 18.2013 12 17.9202 12C17.4709 12 17.1564 12.4441 17.3056 12.868L19.2044 18.2615C19.3601 18.704 19.7782 19 20.2472 19C20.7162 19 21.1341 18.7042 21.29 18.262L23.1909 12.87C23.3406 12.4452 23.0255 12 22.5751 12C22.2933 12 22.0434 12.1807 21.9551 12.4483L20.2847 17.5098H20.2129L18.5389 12.4471ZM15.4998 13.9635C15.1835 13.9635 14.9404 13.6984 14.7377 13.4555C14.6853 13.3927 14.6232 13.3361 14.5515 13.2857C14.3234 13.124 14.0266 13.0432 13.6611 13.0432C13.4042 13.0432 13.1838 13.0819 13 13.1595C12.8162 13.237 12.6755 13.3422 12.5781 13.4751C12.4806 13.608 12.4308 13.7597 12.4286 13.9302C12.4286 14.072 12.4607 14.1949 12.5249 14.299C12.5914 14.4031 12.6811 14.4917 12.794 14.5648C12.907 14.6357 13.0321 14.6955 13.1694 14.7442C13.3068 14.7929 13.4452 14.8339 13.5847 14.8671L14.2226 15.0266C14.4795 15.0864 14.7265 15.1672 14.9635 15.2691C15.2027 15.371 15.4164 15.4994 15.6047 15.6545C15.7951 15.8095 15.9457 15.9967 16.0565 16.2159C16.1672 16.4352 16.2226 16.6921 16.2226 16.9867C16.2226 17.3854 16.1207 17.7364 15.9169 18.0399C15.7132 18.3411 15.4186 18.577 15.0332 18.7475C14.6501 18.9158 14.186 19 13.6412 19C13.1118 19 12.6523 18.9181 12.2625 18.7542C11.8749 18.5903 11.5714 18.3511 11.3522 18.0365C11.2445 17.8805 11.1613 17.7076 11.1027 17.5177C10.9995 17.1836 11.291 16.887 11.6408 16.887C11.9633 16.887 12.2059 17.1587 12.3903 17.4233C12.4034 17.4422 12.4173 17.4606 12.4319 17.4784C12.5604 17.6357 12.7276 17.753 12.9336 17.8306C13.1417 17.9081 13.3743 17.9468 13.6312 17.9468C13.8992 17.9468 14.134 17.907 14.3355 17.8272C14.5393 17.7453 14.6988 17.6323 14.814 17.4884C14.9291 17.3422 14.9878 17.1716 14.99 16.9767C14.9878 16.7996 14.9358 16.6534 14.8339 16.5382C14.732 16.4208 14.5891 16.3234 14.4053 16.2458C14.2237 16.1661 14.0111 16.0952 13.7674 16.0332L12.9934 15.8339C12.433 15.6899 11.99 15.4718 11.6645 15.1794C11.3411 14.8848 11.1794 14.4939 11.1794 14.0066C11.1794 13.6058 11.2879 13.2547 11.505 12.9535C11.7243 12.6523 12.0221 12.4186 12.3987 12.2525C12.7752 12.0842 13.2016 12 13.6777 12C14.1606 12 14.5836 12.0842 14.9468 12.2525C15.3123 12.4186 15.5991 12.6501 15.8073 12.9468C15.8958 13.0721 15.9661 13.2054 16.0182 13.3466C16.1379 13.6713 15.8458 13.9635 15.4998 13.9635ZM9.28828 14.3921C9.66776 14.3921 9.96822 14.0521 9.82984 13.6987C9.78639 13.5878 9.73617 13.4818 9.67918 13.3807C9.51505 13.0835 9.30545 12.8329 9.05038 12.6288C8.79531 12.4225 8.50475 12.2662 8.17871 12.1597C7.85266 12.0532 7.5 12 7.12072 12C6.5263 12 5.99398 12.1386 5.52376 12.4159C5.05355 12.6931 4.68203 13.0935 4.40922 13.6169C4.13641 14.1381 4 14.7658 4 15.5C4 16.2319 4.1353 16.8596 4.40589 17.3831C4.67649 17.9065 5.0469 18.3069 5.51711 18.5841C5.98733 18.8614 6.52186 19 7.12072 19C7.52662 19 7.89591 18.9401 8.22861 18.8203C8.56131 18.6984 8.85187 18.5298 9.10028 18.3146C9.3487 18.0973 9.54943 17.8466 9.70247 17.5627C9.74184 17.4908 9.77771 17.4175 9.81009 17.3429C9.9619 16.9934 9.66538 16.6493 9.28429 16.6473C8.98112 16.6457 8.73561 16.8722 8.58146 17.1333C8.57279 17.148 8.56386 17.1625 8.55466 17.1768C8.45707 17.3321 8.33618 17.4629 8.19202 17.5694C8.05006 17.6759 7.88926 17.7568 7.7096 17.8123C7.53216 17.8655 7.34141 17.8921 7.13736 17.8921C6.76917 17.8921 6.44202 17.8023 6.15589 17.6226C5.87199 17.4407 5.64797 17.1724 5.48384 16.8175C5.32193 16.4604 5.24097 16.0212 5.24097 15.5C5.24097 14.9876 5.32193 14.554 5.48384 14.1991C5.64575 13.842 5.86977 13.5715 6.15589 13.3874C6.44202 13.201 6.77028 13.1079 7.14068 13.1079C7.34918 13.1079 7.54325 13.1367 7.72291 13.1944C7.90478 13.2498 8.0667 13.333 8.20865 13.4439C8.3506 13.5548 8.46926 13.6901 8.56464 13.8498C8.57373 13.8648 8.58254 13.88 8.59108 13.8955C8.73876 14.1621 8.98346 14.3921 9.28828 14.3921Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29 10.7515V28H7V24H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V8H7V4H23.0925L29 10.7515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 10C1 8.89543 1.89543 8 3 8H15C16.1046 8 17 8.89543 17 10V22C17 23.1046 16.1046 24 15 24H3C1.89543 24 1 23.1046 1 22V10ZM5.22347 19.7765C4.92551 19.4785 4.92551 18.9954 5.22347 18.6975L7.92093 16L5.22347 13.3025C4.92551 13.0046 4.92551 12.5215 5.22347 12.2235C5.52143 11.9256 6.00451 11.9256 6.30247 12.2235L8.99993 14.921L11.6975 12.2235C11.9954 11.9255 12.4785 11.9255 12.7765 12.2235C13.0744 12.5214 13.0744 13.0045 12.7765 13.3025L10.0789 16L12.7765 18.6975C13.0744 18.9955 13.0744 19.4786 12.7765 19.7765C12.4785 20.0745 11.9954 20.0745 11.6975 19.7765L8.99993 17.079L6.30247 19.7765C6.00451 20.0744 5.52143 20.0744 5.22347 19.7765Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

6
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M19.3117 21.9497C18.8961 21.5592 18.8961 20.9261 19.3117 20.5355L23.8272 16.2929C24.2428 15.9024 24.9167 15.9024 25.3324 16.2929C25.748 16.6834 25.748 17.3166 25.3324 17.7071L22.892 20H30.7074C31.2952 20 31.7717 20.4477 31.7717 21C31.7717 21.5523 31.2952 22 30.7074 22H22.3759L25.3328 24.7782C25.7484 25.1687 25.7484 25.8019 25.3328 26.1924C24.9171 26.5829 24.2432 26.5829 23.8276 26.1924L19.3292 21.9658L19.3117 21.9497Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 10C1 8.89543 1.89543 8 3 8H15C16.1046 8 17 8.89543 17 10V22C17 23.1046 16.1046 24 15 24H3C1.89543 24 1 23.1046 1 22V10ZM5.22347 19.7765C4.92551 19.4785 4.92551 18.9954 5.22347 18.6975L7.92093 16L5.22347 13.3025C4.92551 13.0046 4.92551 12.5215 5.22347 12.2235C5.52143 11.9256 6.00451 11.9256 6.30247 12.2235L8.99993 14.921L11.6975 12.2235C11.9954 11.9255 12.4785 11.9255 12.7765 12.2235C13.0744 12.5214 13.0744 13.0045 12.7765 13.3025L10.0789 16L12.7765 18.6975C13.0744 18.9955 13.0744 19.4786 12.7765 19.7765C12.4785 20.0745 11.9954 20.0745 11.6975 19.7765L8.99993 17.079L6.30247 19.7765C6.00451 20.0744 5.52143 20.0744 5.22347 19.7765Z" fill="white"/>
<path d="M29 28V24H31V28C31 29.1046 30.1046 30 29 30H7C5.89543 30 5 29.1046 5 28V24H7V28H29Z" fill="white"/>
<path d="M7 8V4H23.0925L29 10.7515V18H31V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V8H7Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29 10.7515V28H7V22.5H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V9.5H7V4H23.0925L29 10.7515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 11.5C1 10.3954 1.89543 9.5 3 9.5H24C25.1046 9.5 26 10.3954 26 11.5V20.5C26 20.5 25.1046 22.5 24 22.5H3C1.89543 22.5 1 21.6046 1 20.5V11.5ZM18.2852 19.114C18.2852 19.4778 18.5801 19.7727 18.9439 19.7727C19.3077 19.7727 19.6026 19.4778 19.6026 19.114V16.6832H22.4478C22.7528 16.6832 23 16.436 23 16.131C23 15.8261 22.7528 15.5788 22.4478 15.5788H19.6026V13.6044H22.4478C22.7528 13.6044 23 13.3572 23 13.0522C23 12.7472 22.7528 12.5 22.4478 12.5H19.2852C18.7329 12.5 18.2852 12.9477 18.2852 13.5V19.114ZM13.2555 19.7727H11.791C11.2387 19.7727 10.791 19.325 10.791 18.7727V13.5C10.791 12.9477 11.2387 12.5 11.791 12.5H13.3052C14.0273 12.5 14.6476 12.6456 15.166 12.9368C15.6868 13.2256 16.0869 13.6411 16.3663 14.1832C16.6457 14.7254 16.7853 15.3741 16.7853 16.1293C16.7853 16.8868 16.6445 17.5379 16.3627 18.0824C16.0834 18.6269 15.6797 19.0447 15.1518 19.3359C14.6262 19.6271 13.9941 19.7727 13.2555 19.7727ZM12.1085 18.6328H13.1916C13.6982 18.6328 14.1208 18.5405 14.4593 18.3558C14.7979 18.1688 15.0524 17.8906 15.2228 17.5213C15.3933 17.1496 15.4785 16.6856 15.4785 16.1293C15.4785 15.5729 15.3933 15.1113 15.2228 14.7443C15.0524 14.375 14.8002 14.0992 14.4664 13.9169C14.135 13.7322 13.7231 13.6399 13.2306 13.6399H12.1085V18.6328ZM4 19.114C4 19.4778 4.29493 19.7727 4.65874 19.7727C5.02255 19.7727 5.31747 19.4778 5.31747 19.114V17.3153H6.70952C7.2706 17.3153 7.7429 17.2124 8.12642 17.0064C8.50994 16.7981 8.79995 16.5128 8.99645 16.1506C9.19295 15.7884 9.29119 15.3741 9.29119 14.9077C9.29119 14.446 9.19295 14.0341 8.99645 13.6719C8.80232 13.3073 8.51468 13.0208 8.13352 12.8125C7.75473 12.6042 7.28598 12.5 6.72727 12.5H5C4.44772 12.5 4 12.9477 4 13.5V19.114ZM5.31747 16.2322H6.53196C6.85866 16.2322 7.12618 16.1754 7.33452 16.0618C7.54285 15.9482 7.69673 15.7919 7.79616 15.593C7.89796 15.3942 7.94886 15.1657 7.94886 14.9077C7.94886 14.6496 7.89796 14.4223 7.79616 14.2259C7.69673 14.0294 7.54167 13.8767 7.33097 13.7678C7.12263 13.6565 6.85393 13.6009 6.52486 13.6009H5.31747V16.2322Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M29 10.7515V28H7V22H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V9H7V4H23.0925L29 10.7515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 11C1 9.89543 1.89543 9 3 9H24C25.1046 9 26 9.89543 26 11V20C26 21.1046 25.1046 22 24 22H3C1.89543 22 1 21.1046 1 20V11ZM21.9528 13.8268C22.1099 14.0708 22.3535 14.269 22.6436 14.269C23.0485 14.269 23.3652 13.9004 23.1895 13.5356C23.1592 13.4726 23.1262 13.411 23.0905 13.3508C22.9264 13.0735 22.7168 12.834 22.4617 12.6321C22.2088 12.4303 21.9194 12.275 21.5933 12.1663C21.2673 12.0554 20.9158 12 20.5387 12C20.0929 12 19.6803 12.0798 19.301 12.2395C18.9218 12.397 18.5913 12.6277 18.3096 12.9316C18.0279 13.2332 17.8083 13.6003 17.6509 14.0328C17.4956 14.4653 17.418 14.9566 17.418 15.5067C17.418 16.2253 17.5499 16.8463 17.8139 17.3698C18.08 17.891 18.4493 18.2936 18.9218 18.5775C19.3964 18.8592 19.9476 19 20.5753 19C21.1387 19 21.6377 18.8858 22.0724 18.6573C22.5072 18.4266 22.8487 18.0984 23.0972 17.6725C23.3456 17.2467 23.4698 16.7421 23.4698 16.1587C23.4698 15.7067 23.1033 15.3403 22.6513 15.3403H21.1875C20.921 15.3403 20.705 15.5563 20.705 15.8227C20.705 16.0891 20.921 16.3051 21.1875 16.3051H22.275C22.2692 16.6176 22.2006 16.8915 22.0691 17.1269C21.9316 17.3709 21.7353 17.5594 21.4802 17.6925C21.2274 17.8256 20.9279 17.8921 20.5819 17.8921C20.2004 17.8921 19.8655 17.8001 19.5772 17.616C19.2889 17.4297 19.0637 17.158 18.9018 16.8009C18.7399 16.4438 18.6589 16.0079 18.6589 15.4933C18.6589 14.9832 18.7399 14.5507 18.9018 14.1958C19.0659 13.8387 19.2911 13.5681 19.5772 13.384C19.8633 13.1999 20.1894 13.1079 20.5553 13.1079C20.7594 13.1079 20.9479 13.1345 21.1209 13.1877C21.2939 13.2388 21.447 13.3153 21.58 13.4173C21.7153 13.5193 21.8307 13.6424 21.9261 13.7866C21.9352 13.7998 21.9441 13.8133 21.9528 13.8268ZM11.2054 12C11.4865 12 11.7359 12.1802 11.8241 12.4471L13.498 17.5098H13.5698L15.2402 12.4483C15.3285 12.1807 15.5785 12 15.8603 12C16.3106 12 16.6258 12.4452 16.476 12.87L14.5751 18.262C14.4192 18.7042 14.0013 19 13.5324 19C13.0633 19 12.6453 18.704 12.4895 18.2615L10.5907 12.868C10.4415 12.4441 10.756 12 11.2054 12ZM7.73773 13.4555C7.94038 13.6984 8.18346 13.9635 8.49982 13.9635C8.84584 13.9635 9.13792 13.6713 9.01823 13.3466C8.96614 13.2054 8.89584 13.0721 8.80731 12.9468C8.59911 12.6501 8.31229 12.4186 7.94684 12.2525C7.58361 12.0842 7.16058 12 6.67774 12C6.20155 12 5.77519 12.0842 5.39867 12.2525C5.02215 12.4186 4.72425 12.6523 4.50498 12.9535C4.28793 13.2547 4.1794 13.6058 4.1794 14.0066C4.1794 14.4939 4.34109 14.8848 4.66445 15.1794C4.99003 15.4718 5.433 15.6899 5.99336 15.8339L6.76744 16.0332C7.01107 16.0952 7.2237 16.1661 7.40532 16.2458C7.58915 16.3234 7.732 16.4208 7.83389 16.5382C7.93577 16.6534 7.98782 16.7996 7.99003 16.9767C7.98782 17.1716 7.92912 17.3422 7.81395 17.4884C7.69878 17.6323 7.53931 17.7453 7.33555 17.8272C7.134 17.907 6.89922 17.9468 6.63123 17.9468C6.37431 17.9468 6.14175 17.9081 5.93355 17.8306C5.72757 17.753 5.56035 17.6357 5.43189 17.4784C5.41731 17.4606 5.40344 17.4422 5.39028 17.4233C5.20592 17.1587 4.96328 16.887 4.64081 16.887C4.29103 16.887 3.9995 17.1836 4.1027 17.5177C4.16132 17.7076 4.24448 17.8805 4.35216 18.0365C4.57143 18.3511 4.87486 18.5903 5.26246 18.7542C5.65227 18.9181 6.11185 19 6.6412 19C7.18605 19 7.65005 18.9158 8.03322 18.7475C8.4186 18.577 8.71318 18.3411 8.91694 18.0399C9.12071 17.7364 9.22259 17.3854 9.22259 16.9867C9.22259 16.6921 9.16722 16.4352 9.05648 16.2159C8.94574 15.9967 8.79513 15.8095 8.60465 15.6545C8.41639 15.4994 8.20266 15.371 7.96346 15.2691C7.72647 15.1672 7.47951 15.0864 7.22259 15.0266L6.58472 14.8671C6.44518 14.8339 6.30676 14.7929 6.16944 14.7442C6.03211 14.6955 5.90698 14.6357 5.79402 14.5648C5.68106 14.4917 5.59136 14.4031 5.52492 14.299C5.46069 14.1949 5.42857 14.072 5.42857 13.9302C5.43079 13.7597 5.48062 13.608 5.57807 13.4751C5.67553 13.3422 5.81617 13.237 6 13.1595C6.18383 13.0819 6.40421 13.0432 6.66113 13.0432C7.02658 13.0432 7.32337 13.124 7.55149 13.2857C7.62324 13.3361 7.68532 13.3927 7.73773 13.4555Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M29 10.7515V28H7V22.5H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V9.5H7V4H23.0925L29 10.7515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 11.5C1 10.3954 1.89543 9.5 3 9.5H24C25.1046 9.5 26 10.3954 26 11.5V20.5C26 21.6046 25.1046 22.5 24 22.5H3C1.89543 22.5 1 21.6046 1 20.5V11.5ZM17.0099 13.1474C16.7726 12.9317 16.4054 12.9492 16.1897 13.1865L14.2002 15.3749L12.2107 13.1865C11.995 12.9492 11.6278 12.9317 11.3905 13.1474C11.1532 13.3631 11.1357 13.7303 11.3514 13.9676L13.4155 16.2381L11.3512 18.5088C11.1355 18.7461 11.153 19.1133 11.3903 19.329C11.6275 19.5447 11.9947 19.5272 12.2104 19.29L14.2002 17.1012L16.1899 19.29C16.4057 19.5272 16.7729 19.5447 17.0101 19.329C17.2474 19.1133 17.2649 18.7461 17.0492 18.5088L14.9849 16.2381L17.0489 13.9676C17.2647 13.7303 17.2472 13.3631 17.0099 13.1474ZM4.6 13C4.26863 13 4 13.2686 4 13.6C4 13.9314 4.26863 14.2 4.6 14.2H6.40039V19C6.40039 19.3314 6.66902 19.6 7.00039 19.6C7.33176 19.6 7.60039 19.3314 7.60039 19V14.2H9.4C9.73137 14.2 10 13.9314 10 13.6C10 13.2686 9.73137 13 9.4 13H4.6ZM18 13.6C18 13.2686 18.2686 13 18.6 13H23.4C23.7314 13 24 13.2686 24 13.6C24 13.9314 23.7314 14.2 23.4 14.2H21.6004V19C21.6004 19.3314 21.3318 19.6 21.0004 19.6C20.669 19.6 20.4004 19.3314 20.4004 19V14.2H18.6C18.2686 14.2 18 13.9314 18 13.6Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M29 10.7515V28H7V24H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V8H7V4H23.0925L29 10.7515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 10C1 8.89543 1.89543 8 3 8H15C16.1046 8 17 8.89543 17 10V22C17 23.1046 16.1046 24 15 24H3C1.89543 24 1 23.1046 1 22V10ZM13.1004 12.6C13.1004 12.2686 12.8318 12 12.5004 12C12.169 12 11.9004 12.2686 11.9004 12.6V18.3806L9.86417 14.89C9.47829 14.2285 8.52249 14.2285 8.13661 14.89L6.10039 18.3806V12.6C6.10039 12.2686 5.83176 12 5.50039 12C5.16902 12 4.90039 12.2686 4.90039 12.6V19.1204C4.90039 20.1412 6.24985 20.506 6.76417 19.6243L9.00039 15.7908L11.2366 19.6243C11.7509 20.506 13.1004 20.1412 13.1004 19.1204V12.6Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 989 B

7
designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.9"/>
<path opacity="0.8" d="M7.18506 8.0625H13.7962V15.5H7.18506V8.0625Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M7.18506 16.5625H18.2036V24H7.18506V16.5625Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M14.8979 8.0625H24.8146V15.5H14.8979V8.0625Z" fill="#0A1C38" fill-opacity="0.9"/>
<path opacity="0.8" d="M19.3057 16.5625H24.8149V24H19.3057V16.5625Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 717 B

7
designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.29"/>
<path opacity="0.8" d="M7.18506 8.0625H13.7962V15.5H7.18506V8.0625Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M7.18506 16.5625H18.2036V24H7.18506V16.5625Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M14.8979 8.0625H24.8146V15.5H14.8979V8.0625Z" fill="#0A1C38" fill-opacity="0.29"/>
<path opacity="0.8" d="M19.3057 16.5625H24.8149V24H19.3057V16.5625Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 722 B

8
designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg

@ -0,0 +1,8 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M7.18555 19.8645H10.7011V24.3845H7.18555V19.8645Z" fill="#0A1C38" fill-opacity="0.9"/>
<path opacity="0.8" d="M11.8726 16.4746H15.3881V24.3846H11.8726V16.4746Z" fill="#0A1C38" fill-opacity="0.9"/>
<path opacity="0.8" d="M21.2471 11.9546H24.7626V24.3846H21.2471V11.9546Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M16.5601 17.6045H20.0756V24.3845H16.5601V17.6045Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M24.569 7L17.94 13.3923C17.1163 14.1866 15.7807 14.1866 14.957 13.3923L13.714 12.1937C13.6225 12.1054 13.4741 12.1054 13.3826 12.1937L7.18555 18.1694V15.6125L12.0568 10.9153C12.8805 10.1209 14.2161 10.1209 15.0398 10.9153L16.2828 12.1138C16.3743 12.2021 16.5227 12.2021 16.6142 12.1138L19.9287 8.91768L18.7686 7.79903L24.569 7Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

8
designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg

@ -0,0 +1,8 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M7.18555 19.8645H10.7011V24.3845H7.18555V19.8645Z" fill="#0A1C38" fill-opacity="0.29"/>
<path opacity="0.8" d="M11.8726 16.4746H15.3881V24.3846H11.8726V16.4746Z" fill="#0A1C38" fill-opacity="0.29"/>
<path opacity="0.8" d="M21.2471 11.9546H24.7626V24.3846H21.2471V11.9546Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M16.5601 17.6045H20.0756V24.3845H16.5601V17.6045Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M24.569 7L17.94 13.3923C17.1163 14.1866 15.7807 14.1866 14.957 13.3923L13.714 12.1937C13.6225 12.1054 13.4741 12.1054 13.3826 12.1937L7.18555 18.1694V15.6125L12.0568 10.9153C12.8805 10.1209 14.2161 10.1209 15.0398 10.9153L16.2828 12.1138C16.3743 12.2021 16.5227 12.2021 16.6142 12.1138L19.9287 8.91768L18.7686 7.79903L24.569 7Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

4
designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.586 2.49997C15.367 1.71892 16.6333 1.71892 17.4144 2.49997L29.8416 14.9272C30.9755 16.0611 30.1724 18 28.5688 18H26.0002V27.4C26.0002 28.2836 25.2838 29 24.4002 29H21V29H10V29H7.60017C6.71651 29 6.00017 28.2836 6.00017 27.4V18H3.43154C1.82791 18 1.02481 16.0611 2.15875 14.9272L14.586 2.49997ZM18.0002 27H21V27H24.0002V16H28.086L16.0002 3.91418L3.91438 16H8.00017V27H10V27H14.0002H18.0002Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M13 20C13 18.8954 13.8954 18 15 18H17C18.1046 18 19 18.8954 19 20V25H13V20Z" fill="#23334C"/>
</svg>

After

Width:  |  Height:  |  Size: 686 B

4
designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.586 2.49997C15.367 1.71892 16.6333 1.71892 17.4144 2.49997L29.8416 14.9272C30.9755 16.0611 30.1724 18 28.5688 18H26.0002V27.4C26.0002 28.2836 25.2838 29 24.4002 29H21V29H10V29H7.60017C6.71651 29 6.00017 28.2836 6.00017 27.4V18H3.43154C1.82791 18 1.02481 16.0611 2.15875 14.9272L14.586 2.49997ZM18.0002 27H21V27H24.0002V16H28.086L16.0002 3.91418L3.91438 16H8.00017V27H10V27H14.0002H18.0002Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M13 20C13 18.8954 13.8954 18 15 18H17C18.1046 18 19 18.8954 19 20V25H13V20Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 707 B

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2241 27.8875C20.9926 27.3685 24.2251 25.1701 26.1422 22.0718H20.5822C19.8338 24.1483 18.7144 26.1211 17.2241 27.8875ZM13.9438 27.9089C12.4445 26.137 11.3192 24.1566 10.5677 22.0718H4.86291C6.80751 25.2146 10.1057 27.4316 13.9438 27.9089ZM12.7107 22.0718C13.3923 23.736 14.3471 25.3146 15.575 26.739C16.8029 25.3146 17.7576 23.736 18.4392 22.0718H12.7107ZM19.1362 20H12.0137C11.2287 17.0542 11.2425 13.9398 12.0551 11H19.0949C19.9074 13.9398 19.9212 17.0542 19.1362 20ZM21.1986 20H27.1718C27.71 18.6044 28.0051 17.0879 28.0051 15.5025C28.0051 13.9152 27.7093 12.397 27.1698 11H21.1619C21.8866 13.9521 21.8989 17.0432 21.1986 20ZM20.553 9H26.1832C24.2477 5.82771 20.9386 3.58515 17.0826 3.09888C18.6241 4.88466 19.7809 6.88788 20.553 9ZM18.406 9C17.7267 7.36537 16.783 5.81468 15.575 4.41327C14.3669 5.81468 13.4232 7.36537 12.7439 9H18.406ZM10.5969 9C11.3717 6.88027 12.5341 4.87022 14.084 3.07958C10.1589 3.52284 6.78437 5.7835 4.82192 9H10.5969ZM9.988 11C9.26326 13.9521 9.25102 17.0432 9.95127 20H3.83332C3.29508 18.6044 3 17.0879 3 15.5025C3 13.9152 3.2958 12.397 3.83529 11H9.988ZM15.5025 30.0051C23.5121 30.0051 30.0051 23.5121 30.0051 15.5025C30.0051 7.49301 23.5121 1 15.5025 1C7.49301 1 1 7.49301 1 15.5025C1 23.5121 7.49301 30.0051 15.5025 30.0051Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2241 27.8875C20.9926 27.3685 24.2251 25.1701 26.1422 22.0718H20.5822C19.8338 24.1483 18.7144 26.1211 17.2241 27.8875ZM13.9438 27.9089C12.4445 26.137 11.3192 24.1566 10.5677 22.0718H4.86291C6.80751 25.2146 10.1057 27.4316 13.9438 27.9089ZM12.7107 22.0718C13.3923 23.736 14.3471 25.3146 15.575 26.739C16.8029 25.3146 17.7576 23.736 18.4392 22.0718H12.7107ZM19.1362 20H12.0137C11.2287 17.0542 11.2425 13.9398 12.0551 11H19.0949C19.9074 13.9398 19.9212 17.0542 19.1362 20ZM21.1986 20H27.1718C27.71 18.6044 28.0051 17.0879 28.0051 15.5025C28.0051 13.9152 27.7093 12.397 27.1698 11H21.1619C21.8866 13.9521 21.8989 17.0432 21.1986 20ZM20.553 9H26.1832C24.2477 5.82771 20.9386 3.58515 17.0826 3.09888C18.6241 4.88466 19.7809 6.88788 20.553 9ZM18.406 9C17.7267 7.36537 16.783 5.81468 15.575 4.41327C14.3669 5.81468 13.4232 7.36537 12.7439 9H18.406ZM10.5969 9C11.3717 6.88027 12.5341 4.87022 14.084 3.07958C10.1589 3.52284 6.78437 5.7835 4.82192 9H10.5969ZM9.988 11C9.26326 13.9521 9.25102 17.0432 9.95127 20H3.83332C3.29508 18.6044 3 17.0879 3 15.5025C3 13.9152 3.2958 12.397 3.83529 11H9.988ZM15.5025 30.0051C23.5121 30.0051 30.0051 23.5121 30.0051 15.5025C30.0051 7.49301 23.5121 1 15.5025 1C7.49301 1 1 7.49301 1 15.5025C1 23.5121 7.49301 30.0051 15.5025 30.0051Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 4H15V11H9H3V4ZM10 13H15C16.1046 13 17 12.1046 17 11V4C17 2.89543 16.1046 2 15 2H3C1.89543 2 1 2.89543 1 4V11C1 12.1046 1.89543 13 3 13H8V15H6C5.44772 15 5 15.4477 5 16C5 16.5523 5.44772 17 6 17H12C12.5523 17 13 16.5523 13 16C13 15.4477 12.5523 15 12 15H10V13ZM27 5H19V3H27C28.1046 3 29 3.89543 29 5V12.6491C28.396 12.2116 27.7224 11.8705 27 11.6472V5ZM21.7692 27H4V15H2V27C2 28.1046 2.89543 29 4 29H21.7692V27ZM28 18C28 19.6569 26.6569 21 25 21C23.3431 21 22 19.6569 22 18C22 16.3431 23.3431 15 25 15C26.6569 15 28 16.3431 28 18ZM26 22.9C28.2822 22.4367 30 20.419 30 18C30 15.2386 27.7614 13 25 13C22.2386 13 20 15.2386 20 18C20 20.419 21.7178 22.4367 24 22.9V25V28V30C24 30.5523 24.4477 31 25 31C25.5523 31 26 30.5523 26 30V29H29C29.5523 29 30 28.5523 30 28C30 27.4477 29.5523 27 29 27H26V26H29C29.5523 26 30 25.5523 30 25C30 24.4477 29.5523 24 29 24H26V22.9Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 4H15V11H9H3V4ZM10 13H15C16.1046 13 17 12.1046 17 11V4C17 2.89543 16.1046 2 15 2H3C1.89543 2 1 2.89543 1 4V11C1 12.1046 1.89543 13 3 13H8V15H6C5.44772 15 5 15.4477 5 16C5 16.5523 5.44772 17 6 17H12C12.5523 17 13 16.5523 13 16C13 15.4477 12.5523 15 12 15H10V13ZM27 5H19V3H27C28.1046 3 29 3.89543 29 5V12.6491C28.396 12.2116 27.7224 11.8705 27 11.6472V5ZM21.7692 27H4V15H2V27C2 28.1046 2.89543 29 4 29H21.7692V27ZM28 18C28 19.6569 26.6569 21 25 21C23.3431 21 22 19.6569 22 18C22 16.3431 23.3431 15 25 15C26.6569 15 28 16.3431 28 18ZM26 22.9C28.2822 22.4367 30 20.419 30 18C30 15.2386 27.7614 13 25 13C22.2386 13 20 15.2386 20 18C20 20.419 21.7178 22.4367 24 22.9V25V28V30C24 30.5523 24.4477 31 25 31C25.5523 31 26 30.5523 26 30V29H29C29.5523 29 30 28.5523 30 28C30 27.4477 29.5523 27 29 27H26V26H29C29.5523 26 30 25.5523 30 25C30 24.4477 29.5523 24 29 24H26V22.9Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0723 3.00033C21.0721 5.76159 18.8336 7.99997 16.0723 7.99997C13.311 7.99997 11.0725 5.76159 11.0723 3.00033H3.42045C2.63454 2.98885 1.99319 3.62645 2.00005 4.41241V11.2896C2.00677 12.058 2.63157 12.6773 3.4 12.6773H5.5V27.0843C5.5 28.1889 6.39543 29.0843 7.5 29.0843H24.5C25.6046 29.0843 26.5 28.1889 26.5 27.0843V12.6876L28.6003 12.687C29.3734 12.6868 30 12.0601 30 11.287V4.4C30 3.6188 29.3607 2.98874 28.5795 3.00015L21.0723 3.00033ZM4.00005 10.6773H7.5V27.0843H24.5L24.5 10.6882L28 10.6872V5.00017L22.7823 5.00033C21.9216 7.89164 19.2432 9.99997 16.0723 9.99997C12.9014 9.99997 10.2229 7.89164 9.36225 5.00033H4.00005V10.6773Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 824 B

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0723 3.00033C21.0721 5.76159 18.8336 7.99997 16.0723 7.99997C13.311 7.99997 11.0725 5.76159 11.0723 3.00033H3.42045C2.63454 2.98885 1.99319 3.62645 2.00005 4.41241V11.2896C2.00677 12.058 2.63157 12.6773 3.4 12.6773H5.5V27.0843C5.5 28.1889 6.39543 29.0843 7.5 29.0843H24.5C25.6046 29.0843 26.5 28.1889 26.5 27.0843V12.6876L28.6003 12.687C29.3734 12.6868 30 12.0601 30 11.287V4.4C30 3.6188 29.3607 2.98874 28.5795 3.00015L21.0723 3.00033ZM4.00005 10.6773H7.5V27.0843H24.5L24.5 10.6882L28 10.6872V5.00017L22.7823 5.00033C21.9216 7.89164 19.2432 9.99997 16.0723 9.99997C12.9014 9.99997 10.2229 7.89164 9.36225 5.00033H4.00005V10.6773Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 825 B

3
designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0723 3.00033C21.0721 5.76159 18.8336 7.99997 16.0723 7.99997C13.311 7.99997 11.0725 5.76159 11.0723 3.00033H3.42045C2.63454 2.98885 1.99319 3.62645 2.00005 4.41241V11.2896C2.00677 12.058 2.63157 12.6773 3.4 12.6773H5.5V27.0843C5.5 28.1889 6.39543 29.0843 7.5 29.0843H24.5C25.6046 29.0843 26.5 28.1889 26.5 27.0843V12.6876L28.6003 12.687C29.3734 12.6868 30 12.0601 30 11.287V4.4C30 3.6188 29.3607 2.98874 28.5795 3.00015L21.0723 3.00033ZM4.00005 10.6773H7.5V27.0843H24.5L24.5 10.6882L28 10.6872V5.00017L22.7823 5.00033C21.9216 7.89164 19.2432 9.99997 16.0723 9.99997C12.9014 9.99997 10.2229 7.89164 9.36225 5.00033H4.00005V10.6773Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 803 B

24
designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@ -309,6 +309,7 @@
"cellPresentAttr": "cell/cellPresentAttr.svg", "cellPresentAttr": "cell/cellPresentAttr.svg",
"cellElementAttr": "cell/cellElementAttr.svg", "cellElementAttr": "cell/cellElementAttr.svg",
"cellSelect": "cell/cellSelect.svg", "cellSelect": "cell/cellSelect.svg",
"selectedMark": "cell/selectedMark.svg",
"move": "filetree/move.svg", "move": "filetree/move.svg",
"monochrome_copy": "filetree/monochrome_copy.svg", "monochrome_copy": "filetree/monochrome_copy.svg",
"monochrome_paste": "filetree/monochrome_paste.svg", "monochrome_paste": "filetree/monochrome_paste.svg",
@ -360,6 +361,27 @@
"more_arrow": "startup/more.svg", "more_arrow": "startup/more.svg",
"more_arrow_hover": "startup/more_hover.svg", "more_arrow_hover": "startup/more_hover.svg",
"show_less": "startup/show_less.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"
} }
} }

3
designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@ -133,6 +133,7 @@ background.normal=#FFFFFF
text.white=#ffffff text.white=#ffffff
text.placeholder=fade(@foreground, 40%) text.placeholder=fade(@foreground, 40%)
text.highlight=#F9AE31 text.highlight=#F9AE31
menu.hover=#DADEE7
fill.hover=#E6E9EF fill.hover=#E6E9EF
fill.click=#DADEE7 fill.click=#DADEE7
fill.normal=#FFFFFF fill.normal=#FFFFFF
@ -459,7 +460,7 @@ Menu.submenuPopupOffsetY = {scaledInteger}-4
Menu.opaque = false Menu.opaque = false
Menu.borderPainted = true Menu.borderPainted = true
Menu.background = @menuBackground Menu.background = @menuBackground
Menu.selectionBackground=$fill.hover Menu.selectionBackground=$menu.hover
#Menu.selectionForeground=$text.white #Menu.selectionForeground=$text.white
#Menu.acceleratorForeground=@foreground #Menu.acceleratorForeground=@foreground
#Menu.acceleratorSelectionForeground=$text.white #Menu.acceleratorSelectionForeground=$text.white

4
designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java

@ -39,7 +39,7 @@ public class EnvChangeEntranceTest {
@Test @Test
public void showServiceDialog() throws Exception { public void showServiceDialog() throws Exception {
try { try {
EnvChangeEntrance entrance = EnvChangeEntrance.getInstance(); /* EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class); DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.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); PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog);
EasyMock.replay(request, selectedEnv, connectionInfo); EasyMock.replay(request, selectedEnv, connectionInfo);
PowerMock.replayAll(); PowerMock.replayAll();*/
//entrance.showServiceDialog(selectedEnv); //entrance.showServiceDialog(selectedEnv);

27
designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@ -242,15 +242,28 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return getName(plotID); return getName(plotID);
} }
/**
* 获取图标Path
* @param plotID
* @return iconPath
*/
public String getIconPath(String plotID) { public String getIconPath(String plotID) {
ChartTypeUIProvider provider = getChartTypeProvider(plotID);
return provider != null ? provider.getIconPath() : StringUtils.EMPTY;
}
if (chartTypeUIs != null) { /**
ChartTypeUIProvider provider = getChartTypeInterface(plotID); * 获取新图标id
if (provider != null) { * @param plotID
return provider.getIconPath(); * @return iconId
} */
} public String getIconId(String plotID) {
return StringUtils.EMPTY; 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) { public String[] getDemoImagePath(String chartID) {

8
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.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.injectable.SpecialLevel; import com.fr.plugin.injectable.SpecialLevel;
import com.fr.stable.StringUtils;
import com.fr.stable.fun.Level; import com.fr.stable.fun.Level;
/** /**
@ -87,6 +88,13 @@ public interface ChartTypeUIProvider extends Level {
*/ */
String getIconPath(); String getIconPath();
/**
* 图标Id
* @return 图标Id
*/
default String getIconId() {
return StringUtils.EMPTY;
}
//todo:把下面这些接口删除 //todo:把下面这些接口删除
@Deprecated @Deprecated

5
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"; return "com/fr/design/images/form/toolbar/ChartF-Column.png";
} }
@Override
public String getIconId() {
return "chart_column";
}
@Override @Override
public ChartEditPane getChartEditPane(String plotID) { public ChartEditPane getChartEditPane(String plotID) {
return new ChartsEditPane(); return new ChartsEditPane();

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Area.png";
} }
/**
* 新图标Id
* @return iconId
*/
public String getIconId() {
return "chart_area";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Area"); return Toolkit.i18nText("Fine-Design_Chart_Type_Area");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Bar.png";
} }
/**
* 新图标Id
* @return iconId
*/
public String getIconId() {
return "chart_bar";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); return Toolkit.i18nText("Fine-Design_Chart_Type_Bar");

8
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"; 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){ public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
return new BubblePlotTableDataContentPane(parent); return new BubblePlotTableDataContentPane(parent);
} }

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Column.png";
} }
/**
* 新图标Id
* @return 柱形图Id
*/
public String getIconId() {
return "chart_column";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Column"); return Toolkit.i18nText("Fine-Design_Chart_Type_Column");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png";
} }
/**
* 新图标Id
* @return 组合图Id
*/
public String getIconId() {
return "chart_combine";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Combine"); return Toolkit.i18nText("Fine-Design_Chart_Type_Combine");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Donut.png";
} }
/**
* 新图标Id
* @return 圆环图Id
*/
public String getIconId() {
return "chart_donut";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); return Toolkit.i18nText("Fine-Design_Chart_Type_Donut");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Funnel.png";
} }
/**
* 新图标Id
* @return 漏斗图Id
*/
public String getIconId() {
return "chart_funnel";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel"); return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Gantt.png";
} }
/**
* 新图标Id
* @return 甘特图Id
*/
public String getIconId() {
return "chart_gantt";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt"); return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Line.png";
} }
/**
* 新图标Id
* @return iconId
*/
public String getIconId() {
return "chart_line";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Line"); return Toolkit.i18nText("Fine-Design_Chart_Type_Line");

8
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"; return "com/fr/design/images/form/toolbar/Chart-Map.png";
} }
/**
* 新图标Id
* @return 地图Id
*/
public String getIconId() {
return "chart_map";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP"); return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Meter.png";
} }
/**
* 新图标Id
* @return 仪表盘Id
*/
public String getIconId() {
return "chart_meter";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); return Toolkit.i18nText("Fine-Design_Chart_Type_Meter");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Pie.png";
} }
/**
* 新图标Id
* @return iconId
*/
public String getIconId() {
return "chart_pie";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); return Toolkit.i18nText("Fine-Design_Chart_Type_Pie");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Radar.png";
} }
/**
* 新图标Id
* @return 雷达图Id
*/
public String getIconId() {
return "chart_radar";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Radar"); return Toolkit.i18nText("Fine-Design_Chart_Type_Radar");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-Stock.png";
} }
/**
* 新图标Id
* @return 箱形图Id
*/
public String getIconId() {
return "chart_box";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_Stock"); return Toolkit.i18nText("Fine-Design_Chart_Type_Stock");

8
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"; return "com/fr/design/images/form/toolbar/ChartF-XYScatter.png";
} }
/**
* 新图标Id
* @return 散点图Id
*/
public String getIconId() {
return "chart_scatter";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter"); return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter");

5
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"; return "com/fr/design/images/form/toolbar/area.png";
} }
@Override
public String getIconId() {
return "chart_area";
}
@Override @Override
public String getName() { public String getName() {
return Toolkit.i18nText("Fine-Design_Chart_New_Area"); return Toolkit.i18nText("Fine-Design_Chart_New_Area");

5
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"; return "com/fr/design/images/form/toolbar/bar.png";
} }
@Override
public String getIconId() {
return "chart_bar";
}
@Override @Override
public AbstractChartTypePane getPlotTypePane() { public AbstractChartTypePane getPlotTypePane() {
return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBarPlotPane(); return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBarPlotPane();

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save