Browse Source

Merge branch 'newui' of ssh://code.fineres.com:7999/~renekton/design into newui

newui
renekton 7 months ago
parent
commit
612ebc7ffa
  1. 98
      designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java
  2. 40
      designer-base/src/main/java/com/fine/theme/light/ui/FineTableScrollBarPaneUI.java
  3. 4
      designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java
  4. 4
      designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java
  5. 2
      designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java
  6. 4
      designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
  7. 4
      designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java
  8. 4
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java
  9. 48
      designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
  10. 21
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
  11. 3
      designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java
  12. 28
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
  13. 12
      designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/PreviewTableDesensitizationPane.java
  14. 50
      designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java
  15. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  16. 23
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
  17. 1
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
  18. 31
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  19. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java
  20. 12
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  21. 9
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
  22. 12
      designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java
  23. 15
      designer-base/src/main/java/com/fr/design/dialog/BasicPane.java
  24. 19
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
  25. 2
      designer-base/src/main/java/com/fr/design/editor/editor/Editor.java
  26. 9
      designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
  27. 25
      designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxRenderer.java
  28. 35
      designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java
  29. 7
      designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
  30. 3
      designer-base/src/main/java/com/fr/design/gui/itable/SortableJTable.java
  31. 4
      designer-base/src/main/java/com/fr/design/gui/itable/TableSorter.java
  32. 14
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java
  33. 113
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
  34. 5
      designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java
  35. 22
      designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
  36. 2
      designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java
  37. 2
      designer-base/src/main/java/com/fr/design/mainframe/DottedLine.java
  38. 8
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java
  39. 17
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java
  40. 9
      designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
  41. 34
      designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
  42. 7
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java
  43. 3
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
  44. 4
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java
  45. 1
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java
  46. 2
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java
  47. 4
      designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java
  48. 5
      designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
  49. 1
      designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java
  50. 19
      designer-base/src/main/java/com/fr/design/style/FormatPane.java
  51. 3
      designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java
  52. 3
      designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java
  53. 44
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  54. 5
      designer-base/src/main/java/com/fr/env/EnvListPane.java
  55. 16
      designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect.svg
  56. 16
      designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect_disable.svg
  57. 11
      designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg
  58. 11
      designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg
  59. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg
  60. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg
  61. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg
  62. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg
  63. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg
  64. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg
  65. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg
  66. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg
  67. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg
  68. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg
  69. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg
  70. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg
  71. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg
  72. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg
  73. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg
  74. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg
  75. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg
  76. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg
  77. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg
  78. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg
  79. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg
  80. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg
  81. 11
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg
  82. 11
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg
  83. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg
  84. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg
  85. 4
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg
  86. 4
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg
  87. 8
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg
  88. 8
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg
  89. 10
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg
  90. 10
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg
  91. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg
  92. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg
  93. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg
  94. 5
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg
  95. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg
  96. 7
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg
  97. 9
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg
  98. 9
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg
  99. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg
  100. 6
      designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg
  101. Some files were not shown because too many files have changed in this diff Show More

98
designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java

@ -0,0 +1,98 @@
package com.fine.theme.light.ui;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.ui.FlatTableHeaderUI;
import com.fr.stable.StringUtils;
import sun.swing.DefaultLookup;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.border.Border;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.JTableHeader;
import java.awt.Component;
import java.awt.Graphics;
/**
* 应用于 JTable 的UI
*
* @author lemon
* @since
* Created on
*/
public class FineTableHeaderUI extends FlatTableHeaderUI {
@Override
public void installUI(JComponent c) {
super.installUI(c);
JTableHeader header = (JTableHeader) c;
header.setDefaultRenderer(new TableHeaderRenderer());
JTable table = header.getTable();
FineUIStyle.setStyle(table, FineUIStyle.DEFAULT_TABLE);
table.getTableHeader().getTable().setDefaultRenderer(Object.class, new TableRenderer());
}
@Override
public void paint(Graphics g, JComponent c) {
super.paint(g, c);
}
/**
* 表头 render
*/
public static class TableHeaderRenderer extends DefaultTableCellRenderer implements UIResource {
public TableHeaderRenderer() {
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
Border border = DefaultLookup.getBorder(this, this.ui, "TableHeader.cellBorder");
this.setText(value == null ? "" : value.toString());
this.setHorizontalAlignment(SwingConstants.LEFT);
this.setBorder(border);
return this;
}
}
/**
* UI
* @param c
* @return
*/
public static ComponentUI createUI(JComponent c) {
return new FineTableHeaderUI();
}
/**
* 表身 render
*/
public static class TableRenderer extends DefaultTableCellRenderer {
public TableRenderer() {
setHorizontalAlignment(SwingConstants.LEFT);
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
Border border;
if (column == table.getColumnCount() - 1) {
border = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")),
UIManager.getBorder("Table.cellNoFocusBorder"));
} else {
border = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")),
UIManager.getBorder("Table.cellNoFocusBorder"));
}
setBackground(UIManager.getColor("Table.background"));
setText(value == null ? StringUtils.BLANK : String.valueOf(value));
setBorder(border);
return this;
}
}
}

40
designer-base/src/main/java/com/fine/theme/light/ui/FineTableScrollBarPaneUI.java

@ -0,0 +1,40 @@
package com.fine.theme.light.ui;
import com.formdev.flatlaf.ui.FlatScrollBarUI;
import javax.swing.JComponent;
import javax.swing.JTable;
import java.awt.Graphics;
import java.awt.Rectangle;
/**
* 应用于 JTable 的垂直滚动条UI
*
* @author lemon
* @since
* Created on 2024/08/11
*/
public class FineTableScrollBarPaneUI extends FlatScrollBarUI {
private final JTable table;
public FineTableScrollBarPaneUI(JTable table) {
this.table = table;
}
@Override
protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds) {
super.paintTrack(g, c, trackBounds);
}
@Override
protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
// 确保滚动条滑块不会超过表头区域
Rectangle headerRect = table.getTableHeader().getBounds();
int headerHeight = headerRect.height;
thumbBounds.y = Math.max(thumbBounds.y, headerHeight);
super.paintThumb(g, c, thumbBounds);
}
}

4
designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java

@ -44,6 +44,10 @@ public interface FineUIStyle {
String PASTEL_BUTTON = "pastelButton";
String BREADCRUMB_BUTTON = "breadcrumbButton";
String DEFAULT_TABLE = "defaultTable";
String WHITE_BUTTON = "whiteButton";
String ORIGINAL_BUTTON = "originalButton";
/**
* 添加组件的样式类类似css该方法会接在原样式后方

4
designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java

@ -1,10 +1,10 @@
package com.fr.design.actions.file;
import com.fine.theme.icon.LazyIcon;
import java.awt.event.ActionEvent;
import java.io.File;
import java.util.List;
import com.fr.base.BaseUtils;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.design.gui.imenu.UIMenu;
@ -62,7 +62,7 @@ public class OpenRecentReportMenuDef extends MenuDef {
public OpenRecentReportAction(String cptName) {
this.setName(cptName);
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"));
this.setSmallIcon(new LazyIcon("logo"));
}
/**

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.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(new LazyIcon("save"));
this.setSmallIcon(new LazyIcon("saveFile"));
this.setAccelerator(getMenuKeySet().getKeyStroke());
}

4
designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@ -46,11 +46,11 @@ public class SwitchExistEnv extends MenuDef {
DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
switch (env.getType()) {
case Local: {
this.setSmallIcon("com/fr/design/images/data/bind/localconnect");
this.setSmallIcon(new LazyIcon("localConnect"));
break;
}
case Remote: {
this.setSmallIcon("com/fr/design/images/data/bind/distanceconnect");
this.setSmallIcon(new LazyIcon("remoteConnect"));
break;
}
}

4
designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java

@ -17,6 +17,10 @@ public class LayoutConstants {
* 水平间隙
*/
public static final int HGAP_SMALL = 1;
/**
* 水平间隙
*/
public static final int HGAP_MEDIUM = 2;
/**
* 水平间隙
*/

4
designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java

@ -84,6 +84,10 @@ public class TableDataCreatorProducer {
return merge(creators, ExtraDesignClassManager.getInstance().getReportTableDataCreators());
}
/**
* 服务器数据集
* @return TableDataNameObjectCreator[]
*/
public TableDataNameObjectCreator[] createServerTableDataCreator() {
TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
new LazyIcon("server_database"), DBTableData.class,

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

@ -1,6 +1,5 @@
package com.fr.design.data.datapane;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.data.impl.RecursionTableData;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.data.DesignTableDataManager;
@ -34,6 +33,7 @@ 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.flex;
import static com.fine.swing.ui.layout.Layouts.row;
import static com.fine.swing.ui.layout.Layouts.fix;
public class TreeTableDataDictPane extends BasicPane implements Previewable {
@ -52,6 +52,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
private ValueEditorPane originFieldDependsOnParentPane;
private ValueEditorPane parentFieldPane;
private ValueEditorPane originFieldDependsOnLengthPane;
private static final double TITLE_RATIO = 0.2;
public TreeTableDataDictPane() {
this(StringUtils.EMPTY);
@ -59,7 +60,6 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
public TreeTableDataDictPane(String treeName) {
this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
//请选择一个数据集
selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") );
setTableDataNameComboBox(treeName);
@ -69,13 +69,13 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
}
});
JPanel tableFlowPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
tableFlowPane.add(row(LayoutConstants.HGAP_LARGE,
cell(selectTableDataLabel).weight(0.12),
tableFlowPane.add(row(
cell(selectTableDataLabel).weight(TITLE_RATIO),
row(LayoutConstants.HGAP_LARGE,
cell(tableDataNameComboBox).weight(0.9),
cell(new PreviewLabel(this)).weight(0.1)
).weight(0.3),
flex(0.58)
cell(tableDataNameComboBox).weight(1),
cell(new PreviewLabel(this))
).weight(0.4),
flex(0.6 - TITLE_RATIO)
).getComponent());
//中心面板
@ -118,23 +118,27 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
makeParentEnable();
//树数据集面板
centerPane.add(column(10,
centerPane.add(column(
cell(parentMarkRadio),
row(LayoutConstants.HGAP_LARGE,
cell(originFieldDependsOnParentLabel).weight(0.12),
cell(originFieldDependsOnParentPane).weight(0.3),
flex(0.58)
fix(10),
row(
cell(originFieldDependsOnParentLabel).weight(TITLE_RATIO),
cell(originFieldDependsOnParentPane).weight(0.4),
flex(0.6 - TITLE_RATIO)
),
row(LayoutConstants.HGAP_LARGE,
cell(parentFieldLabel).weight(0.12),
cell(parentFieldPane).weight(0.3),
flex(0.58)
fix(6),
row(
cell(parentFieldLabel).weight(TITLE_RATIO),
cell(parentFieldPane).weight(0.4),
flex(0.6 - TITLE_RATIO)
),
fix(20),
cell(lengthMarkRadio),
row(LayoutConstants.HGAP_LARGE,
cell(originFieldDependsOnLengthLabel).weight(0.12),
cell(originFieldDependsOnLengthPane).weight(0.3),
flex(0.58)
fix(10),
row(
cell(originFieldDependsOnLengthLabel).weight(TITLE_RATIO),
cell(originFieldDependsOnLengthPane).weight(0.4),
flex(0.6 - TITLE_RATIO)
)
).getComponent());
@ -172,7 +176,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
}
});
this.add(column(LayoutConstants.VERTICAL_GAP, cell(tableFlowPane),cell(centerPane), cell(previewPanel)).getComponent());
this.add(column(LayoutConstants.VGAP_HUGER, cell(tableFlowPane),cell(centerPane), cell(previewPanel)).getComponent());
}
protected void setTableDataNameComboBox(String treeName) {

21
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java

@ -5,8 +5,6 @@ import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.BaseUtils;
import com.fr.base.svg.IconUtils;
import com.fr.data.core.db.TableProcedure;
import com.fr.data.impl.AbstractDatabaseConnection;
import com.fr.data.impl.Connection;
@ -72,7 +70,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
}
private void init(SwitchableTableDataPane parent) {
this.setLayout(new BorderLayout(4, 10));
this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(4, 10));
// 初始化数据连接下拉框
initConnectionComboBox(parent);
// 初始化中间的面板
@ -84,8 +82,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
}
private JPanel initCenterPane() {
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.setLayout(new BorderLayout(0, 5));
JPanel centerPane = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(0, 6);
// 搜索面板
centerPane.add(createSearchPane(), BorderLayout.NORTH);
// 数据库表视图面板
@ -156,8 +153,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
});
UIScrollPane tableViewListPane = new UIScrollPane(tableViewList);
tableViewListPane.setBorder(new UIRoundedBorder(UIManager.getColor("defaultBorderColor"), 1, UIConstants.ARC));
JPanel tableViewBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
tableViewBorderPane.setLayout(new BorderLayout(0, 5));
JPanel tableViewBorderPane = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(0, 10);
tableViewBorderPane.add(tableViewListPane, BorderLayout.CENTER);
JPanel checkBoxgroupPane = createCheckBoxgroupPane();
if (checkBoxgroupPane != null) {
@ -193,19 +189,18 @@ public class ConnectionTableProcedurePane extends BasicPane {
}
protected JPanel createCheckBoxgroupPane() {
JPanel checkBoxgroupPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
checkBoxgroupPane.setLayout(new BorderLayout(20, 0));
JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
JPanel checkBoxgroupPane = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(30, 2);
JPanel first = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(2, 0);
tableCheckBox = new UICheckBox();
tableCheckBox.setSelected(true);
tableCheckBox.addActionListener(filter);
first.add(tableCheckBox);
first.add(tableCheckBox, BorderLayout.WEST);
JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
JPanel second = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(4, 0);
viewCheckBox = new UICheckBox();
viewCheckBox.setSelected(true);
viewCheckBox.addActionListener(filter);
second.add(viewCheckBox);
second.add(viewCheckBox, BorderLayout.WEST);
// 根据环境是否为中文设置不同的显示
if (GeneralContext.isChineseEnv()) {

3
designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java

@ -7,7 +7,6 @@ import com.fr.log.FineLoggerFactory;
import com.fr.stable.os.OperatingSystem;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumnModel;
@ -211,8 +210,6 @@ public class CopyableJTable extends SortableJTable {
Component comp = super.prepareRenderer(renderer, row, column);
if (isChoose(row, column)) {
comp.setBackground(selectBackGround);
} else {
comp.setBackground(this.getBackground());
}
return comp;
}

28
designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@ -4,7 +4,10 @@
package com.fr.design.data.datapane.preview;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.light.ui.FineTableHeaderUI;
import com.fine.theme.light.ui.FineTableScrollBarPaneUI;
import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIStyle;
import com.fine.theme.utils.FineUIUtils;
import com.fr.base.TableData;
import com.fr.data.TableDataSource;
@ -25,6 +28,7 @@ import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.iprogressbar.AutoProgressBar;
import com.fr.design.gui.itable.SortableJTable;
@ -88,7 +92,7 @@ public class PreviewTablePane extends BasicPane {
private BasicDialog dialog;
private SwingWorker worker;
private UILabel refreshLabel;
private UIButton refreshLabel;
private static PreviewTablePane THIS;
private EmbeddedTableData previewTableData;
@ -104,31 +108,22 @@ public class PreviewTablePane extends BasicPane {
@Override
public void mouseEntered(MouseEvent e) { // 当鼠标进入时候调用.
mouseEntered = true;
if (!buttonPressed) {
refreshLabel.setBackground(java.awt.Color.WHITE);
refreshLabel.setOpaque(true);
refreshLabel.setBorder(BorderFactory.createLineBorder(java.awt.Color.GRAY));
}
}
@Override
public void mouseExited(MouseEvent e) {
mouseEntered = false;
refreshLabel.setOpaque(false);
refreshLabel.setBorder(BorderFactory.createEmptyBorder());
}
@Override
public void mousePressed(MouseEvent e) {
buttonPressed = true;
refreshLabel.setBackground(java.awt.Color.lightGray);
}
@Override
public void mouseReleased(MouseEvent e) {
buttonPressed = false;
if (mouseEntered) {
refreshLabel.setBackground(java.awt.Color.WHITE);
try {
populate(tableData);
if (dataModel != null) {
@ -208,7 +203,8 @@ public class PreviewTablePane extends BasicPane {
private void initRefreshLabel() {
Icon refreshImage = new LazyIcon("refresh");
refreshLabel = new UILabel(refreshImage);
refreshLabel = new UIButton(refreshImage);
FineUIStyle.setStyle(refreshLabel, FineUIStyle.ORIGINAL_BUTTON);
refreshLabel.addMouseListener(refreshLabelMouseAdapter);
}
@ -308,8 +304,10 @@ public class PreviewTablePane extends BasicPane {
private JComponent initCenterPane() {
preveiwTable = new CopyableJTable(new TableSorter());
preveiwTable.setRowSelectionAllowed(false);
preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
return new JScrollPane(preveiwTable);
preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
JScrollPane scrollPane = new JScrollPane(preveiwTable);
scrollPane.getVerticalScrollBar().setUI(new FineTableScrollBarPaneUI(preveiwTable));
return scrollPane;
}
private void initDialog() {
@ -403,7 +401,7 @@ public class PreviewTablePane extends BasicPane {
public static void resetPreviewTable() {
getInstance().preveiwTable = new SortableJTable(new TableSorter());
getInstance().preveiwTable.setRowSelectionAllowed(false);
getInstance().preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
getInstance().preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
PreviewTablePane.progressBar.close();
getInstance().repaint();
}
@ -511,7 +509,7 @@ public class PreviewTablePane extends BasicPane {
* @return
*/
private DefaultTableCellRenderer getDefaultTableCellRenderer() {
return new DefaultTableCellRenderer() {
return new FineTableHeaderUI.TableRenderer() {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
JComponent comp = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);

12
designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/PreviewTableDesensitizationPane.java

@ -1,16 +1,16 @@
package com.fr.design.data.datapane.preview.desensitization.view;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIStyle;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itoolbar.UIToolbar;
import com.fr.design.i18n.Toolkit;
import com.fr.design.menu.SeparatorDef;
import com.fr.design.menu.ToolBarDef;
import javax.swing.Icon;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Component;
@ -47,7 +47,7 @@ public class PreviewTableDesensitizationPane extends JPanel {
/**
* 脱敏效果预览按钮
*/
private UIToggleButton previewToggle;
private UIButton previewToggle;
public PreviewTableDesensitizationPane(PreviewTablePane previewTablePane) {
@ -100,10 +100,12 @@ public class PreviewTableDesensitizationPane extends JPanel {
*
* @return
*/
private UIToggleButton initPreviewButton() {
previewToggle = new UIToggleButton(new Icon[]{new LazyIcon("preview"), new LazyIcon("preview")}, true);
private UIButton initPreviewButton() {
previewToggle = new UIButton();
previewToggle.setIcon(new LazyIcon("preview"));
previewToggle.setToolTipText(Toolkit.i18nText("Fine-Design_Report_Desensitization_Preview"));
previewToggle.setSelected(false);
FineUIStyle.setStyle(previewToggle, FineUIStyle.ORIGINAL_BUTTON);
previewToggle.addActionListener(e -> {
// 切换TableModel的脱敏状态
previewTablePane.togglePreviewTableModelDesensitizeStatus();

50
designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java

@ -1,6 +1,8 @@
package com.fr.design.data.datapane.preview.desensitization.view.setting;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.fr.data.desensitize.base.DesensitizationTableData;
import com.fr.data.desensitize.base.TableDataDesensitizationItem;
@ -346,26 +348,10 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
*/
private class EffectedRolesChooser extends AbstractCellEditor implements TableCellEditor {
private UIComboCheckBox rolesCheckBox;
private EffectedRolesComboBox rolesCheckBox;
EffectedRolesChooser() {
this.rolesCheckBox = new UIComboCheckBox(roleMap.values().toArray(), true) {
@Override
protected void setLayoutAndAddComponents() {
// 使用BorderLayout,否则默认使用的FlowLayout会让整个下拉选框使用最小Size,然后TableCell这边会出现空白
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.add(getEditor(), BorderLayout.CENTER);
this.add(getArrowButton(), BorderLayout.EAST);
}
@Override
protected void setEditorToolTipText(JComponent editor, String text) {
// 选项过多时,已选中的值会做省略显示处理,此处添加一个Tooltips,显示完整值
if (text != null) {
editor.setToolTipText(text);
}
}
};
rolesCheckBox = new EffectedRolesComboBox();
this.addCellEditorListener(new CellEditorListener() {
@Override
public void editingStopped(ChangeEvent e) {
@ -385,10 +371,8 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
}
private void setBoxStyle() {
this.rolesCheckBox.getEditor().setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
this.rolesCheckBox.getEditor().setOpaque(true);
this.rolesCheckBox.getArrowButton().setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
this.rolesCheckBox.getArrowButton().setOpaque(true);
this.rolesCheckBox.setBorder(new FineRoundBorder());
FineUIStyle.setStyle(this.rolesCheckBox.getEditor(), FineUIStyle.TRANSPARENT_TEXT_FIELD);
}
@Override
@ -439,6 +423,28 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
public Object getCellEditorValue() {
return rolesCheckBox.getSelectedValues();
}
private class EffectedRolesComboBox extends UIComboCheckBox {
public EffectedRolesComboBox() {
super(roleMap.values().toArray(), true);
}
@Override
protected void setLayoutAndAddComponents() {
// 使用BorderLayout,否则默认使用的FlowLayout会让整个下拉选框使用最小Size,然后TableCell这边会出现空白
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.add(getEditor(), BorderLayout.CENTER);
this.add(getLabel(), BorderLayout.EAST);
}
@Override
protected void setEditorToolTipText(JComponent editor, String text) {
// 选项过多时,已选中的值会做省略显示处理,此处添加一个Tooltips,显示完整值
if (text != null) {
editor.setToolTipText(text);
}
}
}
}
/**

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

23
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@ -2,6 +2,7 @@ package com.fr.design.data.tabledata.tabledatapane;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.Parameter;
import com.fr.base.ParameterHelper;
@ -100,7 +101,7 @@ import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
*/
public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implements SwitchableTableDataPane {
private static final int BOTTOM = 9;
private static final int BOTTOM = 10;
private static final String PREVIEW_BUTTON = Toolkit.i18nText("Fine-Design_Basic_Preview");
private static final String REFRESH_BUTTON = Toolkit.i18nText("Fine-Design_Basic_Refresh");
private ConnectionTableProcedurePane connectionTableProcedurePane;
@ -156,7 +157,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
}
private void init() {
contentPane.setLayout(new BorderLayout(4, 4));
contentPane.setLayout(FRGUIPaneFactory.createScaledBorderLayout(4, 4));
this.sqlTextPane = new SQLEditPane();
this.sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL);
@ -243,11 +244,11 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
private void initMainSplitPane() {
Box box = new Box(BoxLayout.Y_AXIS);
JPanel northPane = new JPanel(new BorderLayout(4, 4));
JPanel northPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(4, 4));
JToolBar editToolBar = createToolBar();
editToolBar.setBorder(null);
northPane.add(editToolBar, BorderLayout.CENTER);
northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM, 0));
northPane.setBorder(new ScaledEmptyBorder(0, 0, BOTTOM, 0));
RTextScrollPane sqlTextScrollPane = new RTextScrollPane(this.sqlTextPane);
sqlTextScrollPane.setLineNumbersEnabled(true);
@ -255,8 +256,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
sqlTextScrollPane.setPreferredSize(FineUIScale.scale(new Dimension(680, 600)));
JPanel paraMeanPane = new JPanel(new BorderLayout());
paraMeanPane.setPreferredSize(FineUIScale.scale(new Dimension(680, 90)));
paraMeanPane.setBorder(new ScaledEmptyBorder(10, 0, BOTTOM, 0));
UILabel paraMean = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Param_DES"));
FineUIStyle.setStyle(paraMean, FineUIStyle.LABEL_TIP);
paraMeanPane.add(paraMean, BorderLayout.CENTER);
@ -265,7 +267,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
box.add(paraMeanPane);
box.add(this.editorPane);
JPanel sqlSplitPane = new JPanel(new BorderLayout(4, 4));
JPanel sqlSplitPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(4, 4));
sqlSplitPane.add(box, BorderLayout.CENTER);
@ -275,7 +277,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
this.connectionTableProcedurePane.setMaximumSize(FineUIScale.scale(new Dimension(500, 400)));
JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, this.connectionTableProcedurePane, sqlSplitPane);
mainSplitPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
mainSplitPane.setOneTouchExpandable(true);
contentPane.add(mainSplitPane, BorderLayout.CENTER);
}
@ -339,15 +340,19 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
private void createToolbarEsdComponents(final UIToolbar editToolBar) {
this.esdSettingsLabel = new UILabel(Toolkit.i18nText("Fine-Design_ESD_Cache_Settings"));
esdSettingsLabel.setBorder(new ScaledEmptyBorder(0, 6, 0,6));
this.esdConfigOption = new UIComboBox(StrategyConfigFrom.values());
this.esdConfigOption.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
this.esdEnabled = new UICheckBox(Toolkit.i18nText("Fine-Design_ESD_Enable_Cache"));
esdEnabled.setBorder(new ScaledEmptyBorder(0, 6, 0,6));
this.barErrorTips = new UILabel();
this.barErrorTips.setForeground(Color.RED);
barErrorTips.setBorder(new ScaledEmptyBorder(0, 6, 0,6));
FineUIStyle.setStyle(barErrorTips, FineUIStyle.LABEL_WARNING_TIP);
this.barErrorTips.setVisible(false);
esdSettingsBtn = new UIButton(Toolkit.i18nText("Fine-Design_ESD_Strategy_Config"));
esdSettingsBtn.setPreferredSize(FineUIScale.scale(new Dimension(72, 24)));
esdSettingsBtn.setPreferredSize(new Dimension((int) esdSettingsBtn.getPreferredSize().getWidth(), FineUIScale.scale(24)));
FineUIStyle.setStyle(esdSettingsBtn, FineUIStyle.WHITE_BUTTON);
esdSettingsBtn.addActionListener(new ActionListener() {
@Override

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
protected void initComponents() {
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
EmbeddedTableModel tableModel = new EmbeddedTableModel(new EmbeddedTableData());

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

4
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@ -15,6 +15,9 @@ import com.fr.design.gui.itoolbar.UIToolbar;
import com.fr.design.i18n.Toolkit;
import com.fr.stable.StringUtils;
import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
public class MaxMemRowCountPanel extends UIToolbar {
private static final int ALL_IN_MEMORY = 0;
@ -71,6 +74,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
this.setRollover(true);
this.setBackground(UIConstants.NORMAL_BACKGROUND);
switchCache = new UIComboBox(CACHE_LIST);
switchCache.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
switchCache.addActionListener(switchStateL);
numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
numberSpinner.setNumberFieldColumns(3);

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.StringUtils;
import javax.swing.*;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.Icon;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
@ -64,7 +69,6 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
public MultiTDTableDataPane(String multiName) {
this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
this.add(initNorthPane(multiName), BorderLayout.CENTER);
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"));
UIButton previewButton = new UIButton(new LazyIcon("preview"));
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();
JScrollPane js = new JScrollPane(centerPanel);

9
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@ -92,11 +92,11 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
super();
queryText = new UILabel(StringUtils.EMPTY);
Box box = new Box(BoxLayout.Y_AXIS);
JPanel northpane = new JPanel(new BorderLayout(4, 4));
JPanel northpane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(4, 0));
JToolBar editToolBar = creatToolBar();
editToolBar.setBorder(null);
northpane.add(editToolBar, BorderLayout.NORTH);
northpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 6, 0));
northpane.setBorder(new ScaledEmptyBorder(0, 0, 10, 0));
storeProcedureContext = new SQLEditPane(SQLEditPane.UNREQUEST_DROPTARGET);
storeProcedureContext.setEditable(false);
@ -107,6 +107,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + ":"));
namePane.add(queryText);
namePane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0));
inAutoeditorPane = new UITableEditorPane<StoreProcedureParameter>(new StoreProcedureTableModel());
autoEditorPane = new UITableEditorPane<StoreProcedureParameter>(new AutoStoreProcedureTableModel());
autoEditorPane.getbuttonPane().setVisible(false);
@ -127,13 +128,12 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
// 左边的Panel,上面是选择DatabaseConnection的ComboBox,下面DatabaseConnection对应的Table
initconnectionTableProcedurePane();
this.setLayout(new BorderLayout(4, 4));
this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(4, 4));
this.connectionTableProcedurePane.setMinimumSize(FineUIScale.scale(new Dimension(230, 400)));
this.connectionTableProcedurePane.setMaximumSize(FineUIScale.scale(new Dimension(500, 400)));
box.setMinimumSize(FineUIScale.scale(new Dimension(300, 400)));
// 使用SplitPane
JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane);
mainSplitPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
mainSplitPane.setOneTouchExpandable(true);
this.add(mainSplitPane, BorderLayout.CENTER);
}
@ -172,6 +172,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
toolBarDef.addShortCut(new RefreshAction());
toolBarDef.addShortCut(SeparatorDef.DEFAULT);
isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Is_Share_DBTableData"));
isShareCheckBox.setBorder(new ScaledEmptyBorder(0, 6, 0,6));
maxPanel = new MaxMemRowCountPanel();
maxPanel.setBorder(null);
maxPanel.setBackground(null);

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

@ -1,8 +1,6 @@
package com.fr.design.dialog;
import com.fine.theme.utils.FineUIScale;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.utils.gui.GUICoreUtils;
@ -15,6 +13,9 @@ import java.awt.event.ItemListener;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.column;
import static com.fine.swing.ui.layout.Layouts.row;
import static com.fine.swing.ui.layout.Layouts.flex;
import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
/**
* 封装了"为该模版单独设置、采用服务器设置"选项功能的设置面板
@ -40,12 +41,13 @@ public abstract class AbstractTemplateServerSettingPane extends BasicPane {
private void initComponents() {
chooseComboBox = new UIComboBox(CHOOSEITEM);
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"));
buttonPane = row(
FineUIScale.scale(32),
buttonPane = row(32,
cell(belowSetLabel),
cell(chooseComboBox)
cell(chooseComboBox),
flex()
).with(it -> it.setBorder(new ScaledEmptyBorder(0,10,0,0))).getComponent();
this.setLayout(new BorderLayout());
this.contentPane = getContentPane();

15
designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@ -1,9 +1,11 @@
package com.fr.design.dialog;
import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.common.annotations.Open;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.i18n.DesignSizeI18nManager;
@ -305,18 +307,23 @@ public abstract class BasicPane extends JPanel {
private PropertyChangeAdapter changeListener;
public NamePane(BasicPane bPane) {
double titleRatio = 0.12;
// 树数据集标题较长,权重设置为0.2保证列对齐
if(bPane instanceof TreeTableDataPane){
titleRatio = 0.2;
}
this.setLayout(new BorderLayout());
nameTextField = new UITextField();
Name = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Name"));
JPanel northPane = new JPanel(new BorderLayout());
northPane.setBorder(new ScaledEmptyBorder(0,10,0,10));
northPane.setBorder(new ScaledEmptyBorder(0,0,10,0));
northPane.add(row(
LayoutConstants.HGAP_LARGE,
cell(Name).weight(0.12),
cell(nameTextField).weight(0.58),
cell(Name).weight(titleRatio),
cell(nameTextField).weight(0.7 - titleRatio),
cell(showfield = new UILabel(" ")).weight(0.3)
).getComponent());
showfield.setForeground(new Color(204, 0, 1));
FineUIStyle.setStyle(showfield, FineUIStyle.LABEL_WARNING_TIP);
showfield.setPreferredSize(new Dimension(FineUIScale.scale(220), showfield.getPreferredSize().height));
this.add(northPane, BorderLayout.NORTH);
this.centerPane = bPane;

19
designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@ -1,5 +1,6 @@
package com.fr.design.editor;
import com.fine.theme.utils.FineUIScale;
import com.fr.base.BaseFormula;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
@ -22,8 +23,16 @@ import com.fr.general.ComparatorUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Color;
import java.awt.Rectangle;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
@ -61,13 +70,13 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
this.cards = cards;
// Frank:布局
this.setLayout(new BorderLayout(2, 0));
this.setLayout(new BorderLayout());
centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
arrowButton = new UIButton();
arrowButton.set4ToolbarButton();
setCurrentEditor(0);
centerPane.setPreferredSize(new Dimension(centerPaneWidth, centerPane.getPreferredSize().height));
arrowButton.setPreferredSize(new Dimension(20, centerPane.getPreferredSize().height));
centerPane.setPreferredSize(new Dimension(FineUIScale.scale(centerPaneWidth), centerPane.getPreferredSize().height));
arrowButton.setPreferredSize(new Dimension(FineUIScale.scale(24), centerPane.getPreferredSize().height));
final Color beforeColor = arrowButton.getBackground();
menu = createPopMenu();

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(){
return null;
return StringUtils.EMPTY;
}
public String getName() {

9
designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java

@ -98,13 +98,8 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down"), new LazyIcon("move_down"));
moveDownButton.setDisabledIcon(new LazyIcon("move_down").disabled());
return row(LayoutConstants.HORIZONTAL_GAP,
flex(),
cell(addButton),
cell(modifyButton),
cell(removeButton),
cell(moveUpButton),
cell(moveDownButton)
return row(flex(),
row(6, cell(addButton), cell(modifyButton), cell(removeButton), cell(moveUpButton), cell(moveDownButton))
).getComponent();
}

25
designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxRenderer.java

@ -1,14 +1,10 @@
package com.fr.design.gui.icombobox;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import javax.swing.DefaultListCellRenderer;
import com.fr.design.constants.UIConstants;
import javax.swing.JList;
import javax.swing.JLabel;
import com.fine.theme.utils.FineUIScale;
/**
*
@ -23,19 +19,8 @@ public class UIComboBoxRenderer extends DefaultListCellRenderer {
super();
}
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
cellHasFocus = cellHasFocus && !this.isEnabled();
JLabel renderer =(JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
renderer.setOpaque(true);
list.setSelectionBackground(UIConstants.NORMAL_BLUE);
list.setSelectionForeground(Color.WHITE);
if (isSelected) {
renderer.setForeground(list.getSelectionForeground());
renderer.setBackground(list.getSelectionBackground());
} else {
renderer.setForeground(list.getForeground());
renderer.setBackground(list.getBackground());
}
return renderer;
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, FineUIScale.scale(24));
}
}

35
designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java

@ -1,24 +1,23 @@
package com.fr.design.gui.icombocheckbox;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale;
import com.fr.base.BaseUtils;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
import com.fr.design.event.HoverAware;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.icon.IconPathConstants;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import java.awt.BorderLayout;
@ -42,8 +41,12 @@ import java.util.Map;
* 支持全选半选
* 可以设置悬停颜色一页最多显示单选框个数
* 可以省略显示
*
* @author
* @since
* Created on
*/
public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNameObserver {
public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNameObserver, HoverAware {
//下拉框的值
private Object[] values;
//已经选中的值
@ -53,6 +56,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
private UICheckListPopup popup;
private UITextField editor;
private UIButton arrowButton;
private UILabel label;
//选中的值之间显示的分隔符
private String valueSperator;
private static final String DEFAULT_VALUE_SPERATOR = ",";
@ -121,8 +125,13 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
this.popup.addActionListener(new PopupAction());
this.editor = createEditor();
this.arrowButton = createArrowButton();
this.label = new UILabel(getIcon());
label.setPreferredSize(FineUIScale.scale(new Dimension(24, 24)));
setLayoutAndAddComponents();
setText();
addPopupListener(this);
}
/**
@ -155,12 +164,14 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
return arrowButton;
}
public UILabel getLabel() {
return label;
}
private UIButton createArrowButton() {
final UIButton arrowBtn = new UIButton();
arrowBtn.setNormalPainted(false);
arrowBtn.setPreferredSize(FineUIScale.scale(new Dimension(20, 5)));
arrowBtn.setBorder(BorderFactory.createMatteBorder(1, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
arrowBtn.setOpaque(true);
arrowBtn.setIcon(getIcon());
arrowBtn.setExtraPainted(false);
addPopupListener(arrowBtn);
@ -171,8 +182,6 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
private UITextField createEditor() {
UITextField editor = new TextField();
editor.setEditable(false);
editor.setPreferredSize(FineUIScale.scale(new Dimension(110, 20)));
editor.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 0, UIManager.getColor("defaultBorderColor")));
addPopupListener(editor);
return editor;
@ -213,6 +222,11 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
return popup.getSelectedValues();
}
@Override
public boolean isHovered() {
return true;
}
private class PopupAction implements ActionListener {
@Override
@ -229,7 +243,6 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
private void togglePopup() {
if (this.arrowButton.isEnabled()) {
popup.setBorder(new FineRoundBorder());
popup.setPreferredSize(new Dimension(FineUIScale.scale(this.getWidth()), (int) popup.getPreferredSize().getHeight()));
popup.show(this, 0, getHeight());
}
}
@ -352,7 +365,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
}
private Icon getIcon() {
return BaseUtils.readIcon(IconPathConstants.ARROW_ICON_PATH);
return new LazyIcon("down_arrow");
}
/**

7
designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java

@ -1,6 +1,7 @@
package com.fr.design.gui.ilist;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIScale;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.fr.base.BaseUtils;
import com.fr.data.core.DataCoreUtils;
@ -26,6 +27,7 @@ import javax.swing.ListSelectionModel;
import javax.swing.SwingWorker;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.dnd.DnDConstants;
import java.awt.dnd.DragGestureEvent;
import java.awt.dnd.DragGestureListener;
@ -261,6 +263,11 @@ public class TableViewList extends UIList {
return this;
}
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, FineUIScale.scale(24));
}
}
/**

3
designer-base/src/main/java/com/fr/design/gui/itable/SortableJTable.java

@ -1,5 +1,7 @@
package com.fr.design.gui.itable;
import com.fine.theme.light.ui.FineTableHeaderUI;
import javax.swing.JTable;
public class SortableJTable extends JTable{
@ -7,5 +9,6 @@ public class SortableJTable extends JTable{
super(tableModel);
tableModel.setTableHeader(getTableHeader());
setShowGrid(true);
getTableHeader().setUI(new FineTableHeaderUI());
}
}

4
designer-base/src/main/java/com/fr/design/gui/itable/TableSorter.java

@ -14,10 +14,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.swing.Icon;
import com.fr.common.inputevent.InputEventBaseOnOS;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.Icon;
import javax.swing.JTable;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;

14
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java

@ -1,7 +1,7 @@
package com.fr.design.gui.itableeditorpane;
import com.fine.theme.light.ui.FineTableHeaderUI;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.fr.base.Parameter;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
@ -14,7 +14,6 @@ import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import java.awt.*;
import java.awt.event.ActionEvent;
@ -231,11 +230,10 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
}
private class ParameterValueRenderer extends DefaultTableCellRenderer {
private class ParameterValueRenderer extends FineTableHeaderUI.TableRenderer {
private static final long serialVersionUID = 1L;
private ValueEditorPane editor;
private UILabel disableLable;
public ParameterValueRenderer(int paraUseType) {
this(ValueEditorPaneFactory.createVallueEditorPaneWithUseType(paraUseType));
}
@ -243,15 +241,13 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
public ParameterValueRenderer(ValueEditorPane valueEditorPane) {
disableLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Paramete_Name"));
FineUIStyle.setStyle(disableLable, FineUIStyle.LABEL_WARNING_TIP);
disableLable.setHorizontalAlignment(SwingConstants.LEFT);
disableLable.setOpaque(true);
disableLable.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
disableLable.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")));
disableLable.setHorizontalAlignment(SwingConstants.LEFT);
editor = valueEditorPane;
}
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
JComponent component = ((JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column));
if (table.isCellEditable(row, column)) {
if (value == null) {
editor.populate("");
@ -260,6 +256,8 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
}
return editor;
} else {
disableLable.setBorder(component.getBorder());
disableLable.setBackground(component.getBackground());
return disableLable;
}
}

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

@ -1,41 +1,27 @@
package com.fr.design.gui.itableeditorpane;
import com.fine.swing.ui.layout.Layouts;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.light.ui.FineTableHeaderUI;
import com.fine.theme.light.ui.FineTableScrollBarPaneUI;
import com.fine.theme.utils.FineUIScale;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.GeneralUtils;
import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableCellRenderer;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import java.util.List;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.column;
import static com.fine.swing.ui.layout.Layouts.row;
/**
* 表格编辑面板,一般是两列.- 用泛型实现用的时候请定义T.model里面的T要一样
*
@ -47,7 +33,7 @@ public class UITableEditorPane<T> extends BasicPane {
*
*/
private static final long serialVersionUID = 6855793816972735815L;
protected static JTable editTable;
protected JTable editTable;
// 放置action 的按钮.
protected UITableModelAdapter<T> tableModel;
private String leftLabelName;
@ -91,39 +77,12 @@ public class UITableEditorPane<T> extends BasicPane {
controlPane.add(buttonPane, BorderLayout.EAST);
controlPane.add(content == null ? l : content, BorderLayout.WEST);
pane.add(column(cell(controlPane), cell(buildScrollTablePane(scrollPane)).weight(1)).getComponent());
this.editTable.getTableHeader().setDefaultRenderer(new TableHeaderRenderer());
this.editTable.setDefaultRenderer(Object.class, new TableRenderer());
scrollPane.getVerticalScrollBar().setUI(new FineTableScrollBarPaneUI(editTable));
pane.add(Layouts.column(LayoutConstants.HGAP_LARGE, Layouts.cell(controlPane), Layouts.cell(scrollPane).weight(1)).getComponent());
this.editTable.getTableHeader().setUI(new FineTableHeaderUI());
this.editTable.setRowHeight(FineUIScale.scale(24));
}
/**
* 组合 jtable 和垂直滚动条
* @param scrollPane
* @return
*/
protected JPanel buildScrollTablePane(JScrollPane scrollPane) {
verticalScrollBar = column(
cell(new UILabel()).with(it -> {
it.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 1, UIManager.getColor("defaultBorderColor")));
it.setPreferredSize(new Dimension(scrollPane.getVerticalScrollBar().getWidth(), (int) editTable.getTableHeader().getPreferredSize().getHeight()));
}),
cell(scrollPane.getVerticalScrollBar()).weight(1).with(it -> {
it.setBorder(BorderFactory.createMatteBorder(1, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
})
).getComponent();
scrollPane.getVerticalScrollBar().addAdjustmentListener(new AdjustmentListener() {
@Override
public void adjustmentValueChanged(AdjustmentEvent e) {
verticalScrollBar.setVisible(editTable.getHeight() > scrollPane.getViewport().getHeight());
verticalScrollBar.repaint();
}
});
return row(cell(scrollPane).weight(1), cell(verticalScrollBar)).getComponent();
}
public UITableModelAdapter<T> getTableModel() {
return tableModel;
}
@ -132,7 +91,7 @@ public class UITableEditorPane<T> extends BasicPane {
buttonPane = new JPanel();
if (action != null) {
buttonPane.setLayout(new GridLayout(1, action.length, 3, 3));
buttonPane.setLayout(new GridLayout(1, action.length, FineUIScale.scale(2), 0));
for (int i = 0; i < action.length; i++) {
final UIButton newButton = new UIButton(action[i]);
newButton.set4ToolbarButton();
@ -140,9 +99,9 @@ public class UITableEditorPane<T> extends BasicPane {
newButton.setText("");
newButton.setName(action[i].getName());
newButton.setToolTipText(action[i].getName());
newButton.setBorder(null);
newButton.setMargin(null);
newButton.setOpaque(false);
newButton.setPreferredSize(FineUIScale.scale(new Dimension(24, 24)));
buttonPane.add(newButton);
}
}
@ -211,7 +170,7 @@ public class UITableEditorPane<T> extends BasicPane {
/**
* @return jTable
*/
public static JTable getEditTable() {
public JTable getEditTable() {
return editTable;
}
@ -234,54 +193,4 @@ public class UITableEditorPane<T> extends BasicPane {
editTable.getTableHeader().setResizingAllowed(resizingAllowed);
}
/**
* 设置 TableHeader 文字左对齐
*/
public static class TableHeaderRenderer extends DefaultTableCellRenderer {
public TableHeaderRenderer() {
setHorizontalAlignment(SwingConstants.LEFT);
setPreferredSize(new Dimension(this.getWidth(), FineUIScale.scale(24)));
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if (column == table.getColumnCount() - 1) {
((JComponent) component).setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")));
} else {
((JComponent) component).setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
}
return component;
}
}
/**
* 设置 Table 表身格式
*/
public static class TableRenderer extends DefaultTableCellRenderer {
public TableRenderer() {
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if(component instanceof JLabel) {
String toolTipText = GeneralUtils.objectToString(value);
if (StringUtils.isNotEmpty(toolTipText)) {
((JLabel) component).setToolTipText(toolTipText);
}
}
if (column == table.getColumnCount() - 1) {
((JComponent) component).setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")),
new ScaledEmptyBorder(0,4,0,0)));
} else {
((JComponent) component).setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")),
new ScaledEmptyBorder(0,4,0,0)));
}
component.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
return component;
}
}
}

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

22
designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@ -1,5 +1,6 @@
package com.fr.design.layout;
import com.fine.theme.utils.FineUIScale;
import com.fr.design.border.UITitledBorder;
import com.fr.design.gui.ilable.UILabel;
import com.fr.stable.AssistUtils;
@ -114,6 +115,16 @@ public class FRGUIPaneFactory {
return new BorderLayout();
}
/**
* 创建一个适应 DPI 缩放的边框布局
* @param hgap 水平间距
* @param vgap 竖直间距
* @return JPanel对象
*/
public static LayoutManager createScaledBorderLayout(int hgap, int vgap) {
return new BorderLayout(FineUIScale.scale(hgap), FineUIScale.scale(vgap));
}
/**
* 创建一个边框布局间距4,4
*
@ -660,6 +671,17 @@ public class FRGUIPaneFactory {
return jp;
}
/**
* 创建包含水平垂直间距的边框面板S
*
* @return JPanel对象
*/
public static JPanel createScaledBorderLayout_S_Pane(int hgap, int vgap) {
JPanel jp = new JPanel();
jp.setLayout(FRGUIPaneFactory.createScaledBorderLayout(hgap, vgap));
return jp;
}
public static JPanel createBorderLayout_NO_Opaque_Pane() {
JPanel jp = new JPanel();
jp.setOpaque(false);

2
designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java

@ -72,7 +72,7 @@ public class CenterRegionContainerPane extends JPanel {
public CenterRegionContainerPane() {
toolbarPane = new JPanel();
toolbarPane.setBorder(new ScaledEmptyBorder(6, 0, 0, 0));
toolbarPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0));
toolbarPane.setLayout(FRGUIPaneFactory.createBorderLayout());
eastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
largeToolbar = getToolBarMenuDock().createLargeToolbar();

2
designer-base/src/main/java/com/fr/design/mainframe/DottedLine.java

@ -1 +1 @@
package com.fr.design.mainframe; import com.fr.design.constants.UIConstants; import com.fr.design.gui.iscrollbar.UIScrollBar; import javax.swing.*; import java.awt.*; import java.awt.geom.GeneralPath; import java.awt.geom.Path2D; /** * Author : daisy * Date: 13-9-11 * Time: 上午10:14 */ public class DottedLine extends JPanel { public static final int HEIGHT = 3; private static final int BLUE_WIDTH = 12;//蓝色线长度,白色线长度是其半 private int direction = UIScrollBar.HORIZONTAL; public DottedLine(int direction, int width) { //水平方向的虚线框 if (direction == UIScrollBar.HORIZONTAL) { this.setPreferredSize(new Dimension(width, HEIGHT)); } else { this.setPreferredSize(new Dimension(HEIGHT, width)); } this.direction = direction; this.setBackground(new Color(255, 255, 255));//设置白色背景 } public void paint(Graphics g) { Graphics2D g2d = (Graphics2D) g; //如果是水平方向的 if (direction == UIScrollBar.HORIZONTAL) { paintHorizontal(g2d); } else { paintVertical(g2d); } } private void paintHorizontal(Graphics2D g2d) { int totalWidth = getWidth(); int paintX = 0; while (paintX < totalWidth) { int endX = paintX + BLUE_WIDTH; if (endX > totalWidth) { endX = totalWidth; } int[] x = new int[]{paintX, endX, endX, paintX, paintX}; int[] y = new int[]{0, 0, HEIGHT, HEIGHT, 0}; paintBlueArea(g2d, x, y); paintX += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintVertical(Graphics2D g2d) { int totalHeight = getHeight(); int paintY = 0; while (paintY < totalHeight) { int endY = paintY + BLUE_WIDTH; if (endY > totalHeight) { endY = totalHeight; } int[] x = new int[]{0, HEIGHT, HEIGHT, 0, 0}; int[] y = new int[]{paintY, paintY, endY, endY, paintY}; paintBlueArea(g2d, x, y); paintY += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintBlueArea(Graphics2D g2d, int[] x, int[] y) { g2d.setPaint(UIConstants.DOTTED_LINE_COLOR); GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); generalPath.moveTo(x[0], y[0]); for (int index = 1; index < x.length; index++) { generalPath.lineTo(x[index], y[index]); } generalPath.closePath(); g2d.fill(generalPath); } }
package com.fr.design.mainframe; import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.constants.UIConstants; import com.fr.design.gui.iscrollbar.UIScrollBar; import javax.swing.*; import java.awt.*; import java.awt.geom.GeneralPath; import java.awt.geom.Path2D; /** * Author : daisy * Date: 13-9-11 * Time: 上午10:14 */ public class DottedLine extends JPanel { public static final int HEIGHT = 3; private static final int BLUE_WIDTH = 12;//蓝色线长度,白色线长度是其半 private int direction = UIScrollBar.HORIZONTAL; public DottedLine(int direction, int width) { //水平方向的虚线框 if (direction == UIScrollBar.HORIZONTAL) { this.setPreferredSize(new Dimension(width, HEIGHT)); } else { this.setPreferredSize(new Dimension(HEIGHT, width)); } this.direction = direction; this.setBackground(new Color(255, 255, 255));//设置白色背景 } public void paint(Graphics g) { Graphics2D g2d = (Graphics2D) g; //如果是水平方向的 if (direction == UIScrollBar.HORIZONTAL) { paintHorizontal(g2d); } else { paintVertical(g2d); } } private void paintHorizontal(Graphics2D g2d) { int totalWidth = getWidth(); int paintX = 0; while (paintX < totalWidth) { int endX = paintX + BLUE_WIDTH; if (endX > totalWidth) { endX = totalWidth; } int[] x = new int[]{paintX, endX, endX, paintX, paintX}; int[] y = new int[]{0, 0, HEIGHT, HEIGHT, 0}; paintBlueArea(g2d, x, y); paintX += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintVertical(Graphics2D g2d) { int totalHeight = getHeight(); int paintY = 0; while (paintY < totalHeight) { int endY = paintY + BLUE_WIDTH; if (endY > totalHeight) { endY = totalHeight; } int[] x = new int[]{0, HEIGHT, HEIGHT, 0, 0}; int[] y = new int[]{paintY, paintY, endY, endY, paintY}; paintBlueArea(g2d, x, y); paintY += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintBlueArea(Graphics2D g2d, int[] x, int[] y) { g2d.setPaint(FlatUIUtils.getUIColor("DottedLine.defaultColor", new Color(37,118,239,1))); GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); generalPath.moveTo(x[0], y[0]); for (int index = 1; index < x.length; index++) { generalPath.lineTo(x[index], y[index]); } generalPath.closePath(); g2d.fill(generalPath); } }

8
designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java

@ -1,10 +1,10 @@
package com.fr.design.mainframe.backgroundpane;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale;
import com.fr.base.Style;
import com.fr.base.background.ImageFileBackground;
import com.fr.base.frpx.pack.PictureCollection;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.frpane.ImgChooseWrapper;
import com.fr.design.gui.ibutton.UIButton;
@ -52,8 +52,8 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
previewPane = new ImagePreviewPane();
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
borderPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
borderPane.setPreferredSize(new Dimension(0, 145));
borderPane.setBorder(new FineRoundBorder());
borderPane.setPreferredSize(FineUIScale.scale(new Dimension(0, 145)));
borderPane.add(previewPane, BorderLayout.CENTER);
this.add(borderPane, BorderLayout.NORTH);
previewPane.addChangeListener(imageSizeChangeListener);

17
designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java

@ -1,19 +1,28 @@
package com.fr.design.mainframe.backgroundpane;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fr.base.GraphHelper;
import com.fr.base.background.TextureBackground;
import com.fr.design.constants.UIConstants;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.event.UIObserverListener;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Background;
import com.fr.general.ComparatorUtils;
import javax.swing.*;
import javax.swing.JPanel;
import javax.swing.ButtonGroup;
import javax.swing.JToggleButton;
import javax.swing.BorderFactory;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.TexturePaint;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.Dimension;
import java.awt.Cursor;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.geom.Rectangle2D;
@ -27,7 +36,7 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
borderPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
borderPane.setBorder(new FineRoundBorder());
JPanel contentPane = new JPanel();
borderPane.add(contentPane, BorderLayout.NORTH);
this.add(borderPane, BorderLayout.NORTH);

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

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

34
designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@ -406,8 +406,8 @@ public abstract class ToolBarMenuDock {
insertMenu(menuDef, MenuHandler.FILE);
return menuDef;
}
// 文件
MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F');
ShortCut[] scs = new ShortCut[0];
if (!DesignerMode.isAuthorityEditing()) {
scs = createNewFileShortCuts();
@ -415,12 +415,13 @@ public abstract class ToolBarMenuDock {
if (!ArrayUtils.isEmpty(scs)) {
menuDef.addShortCut(scs);
}
// 打开
menuDef.addShortCut(openTemplateAction());
// 最近打开的
menuDef.addShortCut(new OpenRecentReportMenuDef());
if (!DesignModeContext.isDuchampMode()) {
// 关闭
addCloseCurrentTemplateAction(menuDef);
}
@ -491,31 +492,24 @@ public abstract class ToolBarMenuDock {
protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic__M_Server"), 'S');
if (!DesignerMode.isAuthorityEditing()) {
menuDef.addShortCut(
new ConnectionListAction(),
createGlobalTDAction()
);
// 定义数据连接、服务器数据集
menuDef.addShortCut(new ConnectionListAction(), createGlobalTDAction());
}
menuDef.addShortCut(
new PlatformManagerAction()
);
// 报表平台管理
menuDef.addShortCut(new PlatformManagerAction());
if (shouldShowRemoteAuth()) {
// 远程设计权限管理
menuDef.addShortCut(new RemoteDesignAuthManagerAction());
}
if (!DesignerMode.isAuthorityEditing()) {
// 插件管理
addPluginManagerAction(menuDef);
// 函数管理器
menuDef.addShortCut(new FunctionManagerAction());
// 全局参数
menuDef.addShortCut(new GlobalParameterAction());
}
return menuDef;
}
@ -530,9 +524,7 @@ public abstract class ToolBarMenuDock {
}
}
if (shouldShowPlugin()) {
menuDef.addShortCut(
new PluginManagerAction()
);
menuDef.addShortCut(new PluginManagerAction());
}
}

7
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java

@ -334,7 +334,11 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
component.setForeground(tableHeader.getForeground());
component.setBackground(tableHeader.getBackground());
component.setFont(tableHeader.getFont());
component.setBorder(UIManager.getBorder("TableHeader.cellBorder"));
if (column != 0) {
component.setBorder(UIManager.getBorder("TableHeader.cellBorder"));
} else {
component.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
}
return component;
}
@ -366,6 +370,7 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
setColumnClass(classes);
this.setDefaultEditor(Boolean.class, new BooleanEditor());
this.setDefaultRenderer(Boolean.class, new BooleanRenderer());
this.setDefaultRenderer(UILabel.class, new ToolTipTableCellRenderer());
this.createTable().getColumnModel().getColumn(0).setCellRenderer(new BooleanRenderer());
}

3
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java

@ -123,7 +123,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
searchTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Vcs_Start_Search"));
searchTextField.setColumns(COLUMNS_COUNT);
UILabel searchLabel = new UILabel(ICON_SEARCH);
searchLabel.setBorder(new ScaledEmptyBorder(0, 3, 0, 3));
searchLabel.setBorder(new ScaledEmptyBorder(0, 4, 0, 4));
searchTextField.setBorder(null);
leftPane = row(cell(searchLabel), cell(searchTextField).weight(1)).with(it -> {
it.setBorder(new FineRoundBorder());
@ -148,7 +148,6 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
}
tableTopPane.add(leftPane, BorderLayout.EAST);
tableTopPane.add(rightPane, BorderLayout.WEST);
tableTopPane.setBorder(new ScaledEmptyBorder(0, 0, 10, 0));
}

4
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java

@ -1,11 +1,11 @@
package com.fr.design.mainframe.vcs.ui;
import com.fine.theme.light.ui.FineTableHeaderUI;
import com.fr.general.GeneralUtils;
import com.fr.stable.StringUtils;
import javax.swing.JTable;
import javax.swing.JLabel;
import javax.swing.table.DefaultTableCellRenderer;
import java.awt.*;
@ -16,7 +16,7 @@ import java.awt.*;
* @since 11.0
* Created on 2023/7/21
*/
public class ToolTipTableCellRenderer extends DefaultTableCellRenderer {
public class ToolTipTableCellRenderer extends FineTableHeaderUI.TableRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {

1
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java

@ -127,6 +127,7 @@ public class VcsNewPane extends RecyclePane {
this.operatorPane = createOperatorPane();
this.model.setDefaultEditor(VcsOperatorPane.class, new VcsCellEditor(createOperatorPane()));
this.model.setDefaultRenderer(VcsOperatorPane.class, new VcsCellRender(createOperatorPane()));
this.model.setDefaultRenderer(UILabel.class, new ToolTipTableCellRenderer());
}

2
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java

@ -46,7 +46,7 @@ public class VcsOperatorPane extends JPanel {
panel.add(value);
}
panel.setOpaque(false);
add(column(flex(), row(fix(4), cell(panel)), flex())
add(column(flex(), row(fix(6), cell(panel)), flex())
.with(it -> {
it.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));

4
designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java

@ -1,6 +1,6 @@
package com.fr.design.remote.action;
import com.fr.base.svg.IconUtils;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
@ -27,7 +27,7 @@ public class RemoteDesignAuthManagerAction extends UpdateAction {
public RemoteDesignAuthManagerAction() {
this.setName(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"));
// 远程设计权限管理
this.setSmallIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x");
this.setSmallIcon(new LazyIcon("remoteDesignAuthManager"));
}

5
designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@ -1,7 +1,6 @@
package com.fr.design.report;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.BaseFormula;
@ -52,7 +51,6 @@ import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
* Created by plough on 2018/5/15.
*/
public class WatermarkPane extends BasicPane {
private static final int MAX_WIDTH = 216;
// 水印预览面板
private WatermarkPreviewPane watermarkPreviewPane;
@ -88,7 +86,6 @@ public class WatermarkPane extends BasicPane {
JPanel previewPaneWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
//预览外边框,宽度跟随全局权重
previewPaneWrapper.setBorder(new FineRoundBorder());
previewPaneWrapper.setPreferredSize(FineUIScale.scale(new Dimension(-1,415)));
previewPaneWrapper.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
watermarkPreviewPane = new WatermarkPreviewPane();
watermarkPreviewPane.setOpaque(false);
@ -96,7 +93,7 @@ public class WatermarkPane extends BasicPane {
leftPane = column(
LayoutConstants.VGAP_SMALL,
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"))),
cell(previewPaneWrapper)
cell(previewPaneWrapper).weight(1)
).getComponent();
// 分割线下方,左侧预览,右侧配置

1
designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java

@ -45,6 +45,7 @@ public abstract class AbstractSelectBox<T> extends AbstractPopBox implements Mou
// 初始化组件布局
JPanel displayPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
displayPane.setBorder(null);
displayPane.setOpaque(false);
displayPane.add(displayComponent, BorderLayout.CENTER);
displayComponent.setSize(new Dimension(preWidth, displayPane.getPreferredSize().height));
// 添加事件监听

19
designer-base/src/main/java/com/fr/design/style/FormatPane.java

@ -22,10 +22,10 @@ import com.fr.general.ComparatorUtils;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.DefaultListCellRenderer;
import javax.swing.DefaultListModel;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@ -139,21 +139,24 @@ public class FormatPane extends BasicPane {
patternList.setCellRenderer(new DefaultListCellRenderer(){
public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
setOpaque(false);
return this;
JLabel renderer = (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
list.setSelectionBackground(UIManager.getColor("List.selectBackgroundColor"));
setOpaque(true);
if (isSelected) {
renderer.setBackground(list.getSelectionBackground());
} else {
renderer.setBackground(list.getBackground());
}
return renderer;
}
});
patternList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
patternList.addListSelectionListener(patternListSelectionListener);
}
private JScrollPane initPatternScrollPanel() {
JScrollPane scrollPane = new JScrollPane(patternList);
patternList.setOpaque(false);
scrollPane.getViewport().setOpaque(false);
scrollPane.getVerticalScrollBar().setOpaque(false);
scrollPane.setBorder(new FineRoundBorder());
scrollPane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
return scrollPane;
}

3
designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java

@ -1,6 +1,7 @@
package com.fr.design.style.background.impl;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.fr.base.Style;
import com.fr.base.background.ImageBackground;
@ -66,7 +67,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
this.add(column(
5,
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))),
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LABEL_TIP)),
row(
10,
cell(new JScrollPane(previewPane)).with(it -> {

3
designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java

@ -12,6 +12,7 @@ import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIStyle;
import com.fine.theme.utils.FineUIUtils;
import com.fr.design.gui.ilable.UILabel;
@ -79,7 +80,7 @@ public class DetailColorSelectPane extends BasicPane {
row(
20,
cell(colorSelectPane.transparentButton).weight(0.3),
cell(new UILabel("<html><font color=gray>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview") + "</font></html>")).weight(0.53)
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))).weight(0.53).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LABEL_TIP))
),
row(
20,

44
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -3,6 +3,7 @@ package com.fr.design.write.submit;
import com.fine.swing.ui.layout.Layouts;
import com.fine.theme.icon.LazyIcon;
import com.fine.swing.ui.layout.Spacer;
import com.fine.theme.light.ui.FineTableHeaderUI;
import com.fine.theme.utils.FineClientProperties;
import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIUtils;
@ -55,12 +56,15 @@ import com.fr.write.config.InsertConfig;
import com.fr.write.config.IntelliDMLConfig;
import com.fr.write.config.UpdateConfig;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.AbstractCellEditor;
import javax.swing.BorderFactory;
import javax.swing.DefaultCellEditor;
import javax.swing.DefaultComboBoxModel;
import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@ -70,17 +74,14 @@ import javax.swing.JTree;
import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.UIResource;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
@ -172,9 +173,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
keyColumnValuesTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
keyColumnValuesTable.setPreferredScrollableViewportSize(FineUIScale.scale(new Dimension(280, 150)));
keyColumnValuesTable.setShowHorizontalLines(true);
DefaultTableCellRenderer headerRenderer = new DefaultTableCellRenderer();
headerRenderer.setHorizontalAlignment(SwingConstants.LEFT);
keyColumnValuesTable.getTableHeader().setDefaultRenderer(headerRenderer);
keyColumnValuesTable.getTableHeader().setUI(new FineTableHeaderUI());
northPane.add(column(10,
cell(FineUIUtils.wrapComponentWithTitle(typePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))),
@ -700,7 +699,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
private void initJTableColumn() {
TableColumn column0 = this.keyColumnValuesTable.getColumnModel().getColumn(0);
column0.setMaxWidth(50);
column0.setCellRenderer(new ColumnNameTableCellRenderer());
column0.setCellRenderer(new BooleanRenderer());
TableColumn column1 = this.keyColumnValuesTable.getColumnModel().getColumn(1);
column1.setCellRenderer(new ColumnNameTableCellRenderer());
@ -1187,7 +1186,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
/*
* ColumnNameTableCellRenderer
*/
public static class ColumnNameTableCellRenderer extends DefaultTableCellRenderer {
public static class ColumnNameTableCellRenderer extends FineTableHeaderUI.TableRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
@ -1203,7 +1202,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
/*
* ColumnValueTableCellRenderer
*/
private static class ColumnValueTableCellRenderer extends DefaultTableCellRenderer {
private static class ColumnValueTableCellRenderer extends FineTableHeaderUI.TableRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
@ -1224,4 +1223,25 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
return this;
}
}
/**
* checkBox cellRender
*/
public static class BooleanRenderer extends UICheckBox implements TableCellRenderer, UIResource {
public BooleanRenderer() {
super();
setHorizontalAlignment(JLabel.CENTER);
setBorderPainted(true);
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int column) {
setSelected((value != null && ((Boolean) value).booleanValue()));
setUI(getUICheckBoxUI());
setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
setBackground(Color.WHITE);
return this;
}
}
}

5
designer-base/src/main/java/com/fr/env/EnvListPane.java vendored

@ -1,5 +1,6 @@
package com.fr.env;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.env.DesignerWorkspaceInfo;
@ -57,9 +58,9 @@ public class EnvListPane extends JListControlPane {
*/
@Override
public NameableCreator[] createNameableCreators() {
NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png",
NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_Workspace"), new LazyIcon("localConnect"),
LocalDesignerWorkspaceInfo.class, LocalEnvPane.class);
NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png",
NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), new LazyIcon("remoteConnect"),
RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class);
return new NameableCreator[]{local, remote};
}

16
designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect.svg

@ -0,0 +1,16 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 28V26H4L4 28H6V30H4C2.89543 30 2 29.1046 2 28Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M4 2H6V4L4 4V6H2V4C2 2.89543 2.89543 2 4 2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M2 24V20H4V24H2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M2 18V14H4V18H2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M2 12V8H4V12H2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M8 2H12V4H8V2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M14 2H18V4H14V2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M20 2H24V4H20V2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M26 2H28C29.1046 2 30 2.89543 30 4V6H28V4H26V2Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M30 8V12H28V8H30Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M30 14V17H28V14H30Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M17 28H14V30H17V28Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M12 30H8V28H12V30Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M15.2941 15.8491C15.1365 15.3925 15.5865 14.9581 16.0595 15.1103L31.091 19.9468C31.6493 20.1265 31.6402 20.8919 31.0778 21.0591L24.0287 23.1549C23.8374 23.2118 23.6875 23.3564 23.6286 23.5412L21.4569 30.346C21.2837 30.889 20.4908 30.8977 20.3047 30.3588L15.2941 15.8491Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

16
designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect_disable.svg

@ -0,0 +1,16 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 28V26H4L4 28H6V30H4C2.89543 30 2 29.1046 2 28Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M4 2H6V4L4 4V6H2V4C2 2.89543 2.89543 2 4 2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M2 24V20H4V24H2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M2 18V14H4V18H2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M2 12V8H4V12H2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M8 2H12V4H8V2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M14 2H18V4H14V2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M20 2H24V4H20V2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M26 2H28C29.1046 2 30 2.89543 30 4V6H28V4H26V2Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M30 8V12H28V8H30Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M30 14V17H28V14H30Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M17 28H14V30H17V28Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M12 30H8V28H12V30Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M15.2941 15.8491C15.1365 15.3925 15.5865 14.9581 16.0595 15.1103L31.091 19.9468C31.6493 20.1265 31.6402 20.8919 31.0778 21.0591L24.0287 23.1549C23.8374 23.2118 23.6875 23.3564 23.6286 23.5412L21.4569 30.346C21.2837 30.889 20.4908 30.8977 20.3047 30.3588L15.2941 15.8491Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

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

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

Loading…
Cancel
Save