Browse Source

Merge remote-tracking branch 'origin/newui' into newui

newui
lemon 4 months ago
parent
commit
cf3efdca4d
  1. 4
      designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java
  2. 11
      designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java
  3. 1
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  4. 1
      designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
  5. 7
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  6. 51
      designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java
  7. 30
      designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java
  8. 13
      designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java
  9. 2
      designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java
  10. 7
      designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
  11. 7
      designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java
  12. 10
      designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java
  13. 2
      designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java
  14. 7
      designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java
  15. 35
      designer-base/src/main/java/com/fr/design/utils/ColorUtils.java
  16. 14
      designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg
  17. 10
      designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg
  18. 5
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg
  19. 11
      designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg
  20. 18
      designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg
  21. 21
      designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg
  22. 11
      designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg
  23. 7
      designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg
  24. 5
      designer-base/src/main/resources/com/fine/theme/icon/run.svg
  25. 5
      designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg
  26. 5
      designer-base/src/main/resources/com/fine/theme/icon/run_white.svg
  27. 42
      designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg
  28. 36
      designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg
  29. 35
      designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg
  30. 39
      designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg
  31. 2
      designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
  32. 7
      designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties
  33. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
  34. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  35. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java
  36. 3
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
  37. 3
      designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
  38. 2
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  39. 2
      designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
  40. 1
      designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
  41. 2
      designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java
  42. 1
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  43. 1
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  44. 1
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  45. 1
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java
  46. 4
      designer-realize/src/main/java/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java
  47. 2
      designer-realize/src/main/java/com/fr/start/MainDesigner.java

4
designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java

@ -24,8 +24,8 @@ import static com.fine.theme.utils.FineUIScale.scale;
*/
public class FineColorButtonUI extends FineButtonUI {
public static final float HEIGHT = 1.5f;
public static final float WIDTH = 13;
public static final float HEIGHT = 2.5f;
public static final float WIDTH = 14;
public static final float Y = 13.5f;
/**

11
designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java

@ -5,9 +5,10 @@ import com.formdev.flatlaf.ui.FlatPanelUI;
import org.jetbrains.annotations.Nullable;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.plaf.ComponentUI;
import java.awt.Graphics;
import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE;
import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL;
@ -36,15 +37,15 @@ public class FinePanelUI extends FlatPanelUI {
}
@Override
protected void installDefaults(JPanel p) {
super.installDefaults(p);
if (ROUNDED_PANEL.equals(getPanelTypeStr(p))) {
public void update(Graphics g, JComponent c) {
if (ROUNDED_PANEL.equals(getPanelTypeStr(c))) {
this.arc = FineUIUtils.getUIInt("Panel.arc", "Component.arc");
}
super.update(g, c);
}
@Nullable
static String getPanelTypeStr(JPanel p) {
static String getPanelTypeStr(JComponent p) {
Object value = p.getClientProperty(PANEL_TYPE);
if (value instanceof String) {
return (String) value;

1
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -432,7 +432,6 @@ public class PreferencePane extends BasicPane {
@NotNull
private JPanel patchScroll(JPanel generalPane) {
UIScrollPane uiScrollPane = new UIScrollPane(generalPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
uiScrollPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
return FineLayoutBuilder.asBorderLayoutWrapped(uiScrollPane);
}

1
designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@ -54,7 +54,6 @@ public class AboutPane extends JPanel {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK"));
//center panel
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
this.add(centerPane, BorderLayout.CENTER);
JPanel contentPane = column().getComponent();

7
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@ -1,6 +1,7 @@
package com.fr.design.data.datapane;
import com.fine.theme.icon.LazyIcon;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.TableData;
import com.fr.data.MultiResultTableData;
import com.fr.data.TableDataSource;
@ -96,6 +97,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import static com.fine.theme.utils.FineUIScale.scale;
public class TableDataTreePane extends BasicTableDataTreePane {
private static final TableDataTreePane singleton = new TableDataTreePane();
@ -257,7 +260,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
* @return
*/
private JPanel initTreePane() {
JPanel treePane = new JPanel(new BorderLayout(0, 6));
JPanel treePane = new JPanel(new BorderLayout(0, scale(6)));
// north
JPanel northPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
initServerDatasetAuthTipJPanel();
@ -269,7 +272,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
treePane.add(northPane, BorderLayout.NORTH);
treePane.add(remindPane, BorderLayout.CENTER);
treePane.setBorder(new EmptyBorder(10, 10, 10, 10));
treePane.setBorder(new ScaledEmptyBorder(4, 10, 10, 10));
return treePane;
}

51
designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java

@ -1,21 +1,25 @@
package com.fr.design.gui.frpane;
import com.fine.swing.ui.layout.Column;
import com.fine.theme.utils.FineUIStyle;
import com.fine.swing.ui.layout.Box;
import com.fine.theme.utils.FineUIUtils;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.utils.ColorUtils;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.event.ChangeListener;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Color;
import java.awt.Component;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
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;
@ -29,17 +33,19 @@ import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL;
* @since 11.0
* Created on 2024/05/14
*/
public class FineTabbedPane extends Column {
public class FineTabbedPane extends Box {
private CardLayout cards;
private JPanel centerPane;
private final float headRatio;
private final UIButtonGroup<String> tabGroup;
private final Map<String, JComponent> tabComponents;
private final int[] tabLayout;
private FineTabbedPane(Map<String, JComponent> tabComponents, float headRatio, int[] tabLayout) {
this.headRatio = headRatio;
this.tabComponents = tabComponents;
this.tabLayout = tabLayout;
String[] titleArray = tabComponents.keySet().toArray(new String[0]);
this.tabGroup = new UIButtonGroup<>(titleArray, titleArray, tabLayout);
@ -110,7 +116,9 @@ public class FineTabbedPane extends Column {
if (headRatio > 1) {
throw new IllegalArgumentException("illegal headRatio argument!");
}
if (tabLayout != null && Arrays.stream(tabLayout).sum() != tabComponents.size()) {
if (tabLayout == null) {
tabLayout = new int[]{tabComponents.size()};
} else if (Arrays.stream(tabLayout).sum() != tabComponents.size()) {
throw new IllegalArgumentException("illegal tab layout argument!");
}
return new FineTabbedPane(tabComponents, headRatio, tabLayout);
@ -118,6 +126,26 @@ public class FineTabbedPane extends Column {
}
private void initLayout() {
initCoreComponents();
setMatchParentSize(true);
float flexRatio = (1 - headRatio) / 2;
int headHeight = FlatUIUtils.getUIInt("Component.defaultHeight",24) * tabLayout.length / 2;
add(
column(
row(
flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio)
),
flex()
),
column(
fix(headHeight),
cell(centerPane).with(it -> it.setBorder(new ScaledEmptyBorder(headHeight + 10, 10, 10, 10))).weight(1)
)
);
fillBackgroundColor();
}
private void initCoreComponents() {
cards = new CardLayout();
centerPane = new JPanel(cards);
centerPane.putClientProperty(PANEL_TYPE, ROUNDED_PANEL);
@ -125,15 +153,12 @@ public class FineTabbedPane extends Column {
value.setOpaque(false);
centerPane.add(value, key);
});
float flexRatio = (1 - headRatio) / 2;
add(
row(
flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio)
),
fix(5),
cell(centerPane).weight(1).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LIGHT_GREY))
);
setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
}
private void fillBackgroundColor() {
Color fillColor = FineUIUtils.getUIColor("FineTabbedPane.background", "fill.gray");
Color defaultColor = FineUIUtils.getUIColor("default.background", "Component.background");
ColorUtils.syncBackgroundIfAbsent(centerPane, fillColor, defaultColor);
}
private void initListeners() {

30
designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java

@ -2,11 +2,13 @@ package com.fr.design.gui.icontainer;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIUtils;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.utils.gui.GUICoreUtils;
@ -31,9 +33,13 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE;
import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL;
import static com.fine.theme.utils.FineUIScale.scale;
public class UIModeControlContainer extends JLayeredPane {
private static final int ICON_WIDTH = 18;
private static int DIM_HEIGHT = 30;
private static int DIM_HEIGHT = 36;
private static final int NUM32 = 32;
private static final int NUM5 = 5;
private JComponent upPane;
@ -284,16 +290,14 @@ public class UIModeControlContainer extends JLayeredPane {
private class HidePane extends JPanel {
public HidePane() {
setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3));
setBackground(UIConstants.NORMAL_BACKGROUND);
add(new UILabel("<html><font size='5' face='Microsoft YaHei' color='#999999999'><B>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel") + "</B></font></html>"));
LazyIcon paramViewIcon = new LazyIcon("param_view", ICON_WIDTH);
UIButton viewButton = new LargeButton(paramViewIcon, paramViewIcon, paramViewIcon) {
@Override
public Dimension getPreferredSize() {
return new Dimension(32, 32);
}
};
setLayout(new FlowLayout(FlowLayout.CENTER, 10, 0));
setBackground(FlatUIUtils.getUIColor("North.hidePane.background", UIConstants.NORMAL_BACKGROUND));
UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Parameter_Panel"));
FineUIUtils.setFontSize(label, 14);
add(label);
LazyIcon paramViewIcon = new LazyIcon("param_view", 24);
LazyIcon paramViewPressedIcon = new LazyIcon("param_view_pressed", 24);
UIButton viewButton = new LargeButton(paramViewIcon, paramViewPressedIcon, paramViewPressedIcon);
viewButton.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
@ -302,17 +306,17 @@ public class UIModeControlContainer extends JLayeredPane {
}
});
add(viewButton);
putClientProperty(PANEL_TYPE, ROUNDED_PANEL);
}
@Override
public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize();
dim.height = DIM_HEIGHT;
dim.height = scale(DIM_HEIGHT);
return dim;
}
}
private class AuthoritySheetInvisibleCoverPane extends JPanel {
public AuthoritySheetInvisibleCoverPane() {
setLayout(invisibleCoverLayout);

13
designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@ -1,7 +1,6 @@
package com.fr.design.gui.iprogressbar;
import com.fine.theme.utils.FineUIScale;
import com.fr.design.constants.UIConstants;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.dialog.UIDialog;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.os.impl.SupportOSImpl;
@ -19,6 +18,8 @@ import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Frame;
import static com.fine.theme.utils.FineUIScale.scale;
/**
* 加载进度弹窗
* <em>使用注意点:</em>
@ -29,7 +30,7 @@ import java.awt.Frame;
public class ProgressDialog extends UIDialog {
protected static final FRFont font = DesignUtils
.getDefaultGUIFont()
.applySize(14)
.applySize(scale(14))
.applyForeground(new ColorUIResource(333334));
protected JProgressBar progressBar;
@ -59,7 +60,7 @@ public class ProgressDialog extends UIDialog {
protected void initCenterDialog(Frame parent) {
centerDialog = new JDialog(this);
centerDialog.setSize(FineUIScale.scale(new Dimension(482, 124)));
centerDialog.setSize(scale(new Dimension(482, 124)));
centerDialog.setUndecorated(true);
centerDialog.setLocationRelativeTo(parent);
centerDialog.getContentPane().add(progressPanel);
@ -75,8 +76,8 @@ public class ProgressDialog extends UIDialog {
protected void initProgressPanel() {
progressPanel = new JPanel();
progressPanel.setBorder(new UIProgressBorder(3, UIConstants.DEFAULT_BG_RULER, 14, 46, 47, 37, 47));
progressPanel.setLayout(new BorderLayout(4, 15));
progressPanel.setBorder(new ScaledEmptyBorder(46, 47, 37, 47));
progressPanel.setLayout(new BorderLayout(scale(4), scale(15)));
progressPanel.add(progressBar, BorderLayout.CENTER);
text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Project"), JLabel.CENTER);
text.setFont(font);

2
designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java

@ -10,7 +10,7 @@ import java.util.HashMap;
import java.util.Map;
public class UIToolbar extends JToolBar {
int hgap = 2;
int hgap = 4;
public UIToolbar() {
this(FlowLayout.LEFT);

7
designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@ -37,8 +37,9 @@ import java.util.HashSet;
import java.util.Set;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.row;
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;
/**
* @author zhou
@ -107,14 +108,14 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
cell(outerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/out.png"),
IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)).weight(3)),
row(
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2),
flex(1.2),
cell(externalPane).weight(3)),
row(
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2),
cell(innerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/in.png"),
IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)).weight(3)),
row(
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2),
flex(1.2),
cell(insidePane).weight(3))
).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, LayoutConstants.VERTICAL_GAP, 0))).getComponent();
}

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

@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import static com.fine.theme.utils.FineUIScale.scale;
import static com.fine.theme.utils.FineUIStyle.NORMAL_COLOR;
import static com.fine.theme.utils.FineUIStyle.TOP_TOOLS;
import static com.fine.theme.utils.FineUIStyle.setStyle;
@ -106,8 +107,8 @@ public class CenterRegionContainerPane extends JPanel {
private void combineUpTooBar() {
combineUp = new UIToolbar(FlowLayout.LEFT);
setStyle(combineUp, TOP_TOOLS);
combineUp.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2));
combineUp.setBorder(new ScaledEmptyBorder(10, 5, 10, 10));
combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, scale(5), 0));
setUpUpToolBar(null);
}
@ -237,7 +238,7 @@ public class CenterRegionContainerPane extends JPanel {
toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER);
setStyle(toolbarComponent, TOP_TOOLS);
toolbarComponent.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
toolbarComponent.setBorder(new ScaledEmptyBorder(0, 10, 0, 10));
toolbarComponent.setBorder(new ScaledEmptyBorder(0, 5, 0, 10));
JPanel customNorthPane = strategy.customNorthPane(toolbarPane, plus);
if (!isExist(customNorthPane)) {
this.removeNorth();

10
designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java

@ -1,11 +1,12 @@
package com.fr.design.mainframe;
import com.fine.swing.ui.layout.Row;
import com.fine.swing.ui.layout.Spacer;
import com.fine.theme.utils.FineUIStyle;
import com.fr.design.DesignState;
import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.TitlePlaceProcessor;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.loghandler.LogMessageBar;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
@ -28,7 +29,6 @@ import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FlowLayout;
/**
* @author shine
@ -80,7 +80,8 @@ public class NorthRegionContainerPane extends JPanel {
protected JPanel initNorthEastPane(final ToolBarMenuDock ad) {
//hugh: private修改为protected方便oem的时候修改右上的组件构成
//顶部日志+登陆按钮
final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
final Row northEastPane = new Row();
northEastPane.setSpacing(5);
northEastPane.setOpaque(false);
initPluginListener(northEastPane, ad);
refreshNorthEastPane(northEastPane, ad);
@ -144,7 +145,6 @@ public class NorthRegionContainerPane extends JPanel {
private void refreshNorthEastPane(final JPanel northEastPane, final ToolBarMenuDock ad) {
northEastPane.removeAll();
northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);
if (processor != null) {
final Component[] bbsLoginPane = {null};
@ -164,7 +164,7 @@ public class NorthRegionContainerPane extends JPanel {
// northEastPane.add(ad.createGuideEntryPane());
northEastPane.add(ad.createNotificationCenterPane());
northEastPane.add(LogMessageBar.getInstance());
northEastPane.add(new Spacer(5));
OSSupportCenter.buildAction(new OSBasedAction() {
@Override
public void execute(Object... objects) {

2
designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java

@ -83,7 +83,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
contentPane.add(searchPane, SEARCH_PANE);
contentPane.add(toolbarPane, TOOLBAR_PANE);
cardLayout.show(contentPane, TOOLBAR_PANE);
contentPane.setBorder(new ScaledEmptyBorder(6, 8, 6, 8));
contentPane.setBorder(new ScaledEmptyBorder(4, 8, 4, 8));
}
private void initSearchPane() {

7
designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java

@ -1,10 +1,13 @@
package com.fr.design.search.view;
import com.formdev.flatlaf.ui.FlatUIUtils;
import com.fr.design.gui.itree.refreshabletree.RefreshableJTree;
import com.fr.stable.StableUtils;
import javax.swing.JTree;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeCellRenderer;
import java.awt.Color;
import java.awt.Component;
import java.util.regex.Pattern;
@ -67,7 +70,9 @@ public class TreeSearchRendererHelper {
}
private String getHighlightText(String text, String textToHighlight) {
String highLightTemplate = "<strong>$1</strong>";
Color color = FlatUIUtils.getUIColor("text.highlight", Color.YELLOW);
String cssColor = StableUtils.javaColorToCSSColor(color);
String highLightTemplate = "<span style='color: " + cssColor + "'>$1</span>";
if (textToHighlight.length() == 0) {
return text;
}

35
designer-base/src/main/java/com/fr/design/utils/ColorUtils.java

@ -1,5 +1,9 @@
package com.fr.design.utils;
import com.fr.general.ComparatorUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.JScrollPane;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@ -16,7 +20,7 @@ public class ColorUtils {
* @param color 颜色
*/
public static void syncBackground(Component component, Color color) {
component.setBackground(color);
if (component instanceof Container) {
@ -29,15 +33,17 @@ public class ColorUtils {
}
/**
* 递归的同步颜色组件的背景颜色等于默认颜色的话变更为 replaceColor
* 递归的同步颜色组件的背景颜色等于默认颜色的话变更为 replaceColor
*
* @param component 组件
* @param replaceColor 替换颜色
* @param defaultColor 默认颜色
*/
public static void syncBackgroundIfAbsent(Component component, Color replaceColor, Color defaultColor) {
if (component.getBackground() != defaultColor) {
public static void syncBackgroundIfAbsent(Component component, Color replaceColor, @NotNull Color defaultColor) {
dealWithScrollPane(component, replaceColor, defaultColor);
// 仅默认颜色时,递归替换
if (!ComparatorUtils.equals(defaultColor, component.getBackground())) {
return;
}
component.setBackground(replaceColor);
@ -49,7 +55,24 @@ public class ColorUtils {
}
}
}
/**
* 滚动面板需处理view和scrollBar
*/
private static void dealWithScrollPane(Component component, Color replaceColor, Color defaultColor) {
if (component instanceof JScrollPane) {
JScrollPane scrollPane = (JScrollPane) component;
scrollPane.getViewport().setOpaque(false);
if (scrollPane.getVerticalScrollBar() != null) {
scrollPane.getVerticalScrollBar().setOpaque(false);
}
if (scrollPane.getHorizontalScrollBar() != null) {
scrollPane.getHorizontalScrollBar().setOpaque(false);
}
syncBackgroundIfAbsent(scrollPane.getViewport().getView(), replaceColor, defaultColor);
}
}
/**
* 使背景透明
*

14
designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg

@ -1,10 +1,10 @@
<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 7883">
<path id="Rectangle 34624907" d="M0 2C0 0.895431 0.895431 0 2 0H14H19.5867C20.1668 0 20.7182 0.251814 21.0981 0.690139L26.5114 6.9362C26.8265 7.29983 27 7.76488 27 8.24607V26C27 27.1046 26.1046 28 25 28H2C0.89543 28 0 27.1046 0 26V2Z" fill="#5493F2"/>
<path id="Rectangle 34624907 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M2 26.5H25C25.2761 26.5 25.5 26.2761 25.5 26V8.24607C25.5 8.12577 25.4566 8.00951 25.3778 7.9186L19.9646 1.67253C19.8696 1.56295 19.7318 1.5 19.5867 1.5H2C1.72386 1.5 1.5 1.72386 1.5 2V26C1.5 26.2761 1.72386 26.5 2 26.5ZM2 0C0.895431 0 0 0.895431 0 2V26C0 27.1046 0.89543 28 2 28H25C26.1046 28 27 27.1046 27 26V8.24607C27 7.76488 26.8265 7.29983 26.5114 6.9362L21.0981 0.690139C20.7182 0.251814 20.1668 0 19.5867 0H2Z" fill="#105DD1"/>
<g id="Group 7887">
<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M10.15 13.1833H15.2133C15.2704 13.1833 15.3167 13.2296 15.3167 13.2867V18.2467C15.3167 18.3037 15.2704 18.35 15.2133 18.35H10.15V22.8967C10.15 22.9537 10.1037 23 10.0467 23H5.60333C5.54626 23 5.5 22.9537 5.5 22.8967V11.1167C5.5 9.11924 7.11924 7.5 9.11667 7.5H10.0467C10.1037 7.5 10.15 7.54626 10.15 7.60333V13.1833Z" fill="white"/>
<path id="Combined Shape_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.0003 7.60333V19.3833C21.0003 21.3808 19.381 23 17.3836 23H16.3503V12.15H11.2869C11.2299 12.15 11.1836 12.1037 11.1836 12.0467V7.60333C11.1836 7.54626 11.2299 7.5 11.2869 7.5H20.8969C20.954 7.5 21.0003 7.54626 21.0003 7.60333Z" fill="white" fill-opacity="0.8"/>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=cpt, &#231;&#166;&#129;&#231;&#148;&#168;=off, &#233;&#148;&#129;&#229;&#174;&#154;=off, Property=&#226;&#128;&#148;">
<path id="Rectangle 34626627" d="M3.3999 4.48336C3.3999 3.88505 3.88493 3.40002 4.48324 3.40002H28.3166C28.9149 3.40002 29.3999 3.88505 29.3999 4.48336V28.3167C29.3999 28.915 28.9149 29.4 28.3166 29.4H4.48324C3.88493 29.4 3.3999 28.915 3.3999 28.3167V4.48336Z" fill="#5493F2"/>
<path id="Rectangle 34626627 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M4.50746 2H27.4925C28.8774 2 30 3.12263 30 4.50746V27.4925C30 28.8774 28.8774 30 27.4925 30H4.50746C3.12263 30 2 28.8774 2 27.4925V4.50746C2 3.12263 3.12263 2 4.50746 2ZM4.50746 3.46269C3.93045 3.46269 3.46269 3.93045 3.46269 4.50746V27.4925C3.46269 28.0696 3.93045 28.5373 4.50746 28.5373H27.4925C28.0696 28.5373 28.5373 28.0696 28.5373 27.4925V4.50746C28.5373 3.93045 28.0696 3.46269 27.4925 3.46269H4.50746Z" fill="#105DD1"/>
<g id="Vector">
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8575 13.8667H18.1467C18.2063 13.8667 18.2546 13.9144 18.2546 13.9733V19.0933C18.2546 19.1522 18.2063 19.2 18.1467 19.2H12.8575V23.8933C12.8575 23.9522 12.8091 24 12.7495 24H8.10794C8.04833 24 8 23.9522 8 23.8933V11.7333C8 9.67147 9.69148 8 11.778 8H12.7495C12.8091 8 12.8575 8.04776 12.8575 8.10667V13.8667Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.9998 8.10667V20.2667C23.9998 22.3285 22.3083 24 20.2218 24H19.1424V12.8H13.8531C13.7935 12.8 13.7452 12.7522 13.7452 12.6933V8.10667C13.7452 8.04776 13.7935 8 13.8531 8H23.8919C23.9515 8 23.9998 8.04776 23.9998 8.10667Z" fill="white" fill-opacity="0.8"/>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

10
designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg

@ -1,7 +1,5 @@
<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 7885">
<path id="Rectangle 34624909" d="M0 2C0 0.895431 0.895431 0 2 0H14H19.5867C20.1668 0 20.7182 0.251814 21.0981 0.690139L26.5114 6.9362C26.8265 7.29983 27 7.76488 27 8.24607V26C27 27.1046 26.1046 28 25 28H2C0.895431 28 0 27.1046 0 26V2Z" fill="#46B15D"/>
<path id="Rectangle 34624909 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M2 26.5H25C25.2761 26.5 25.5 26.2761 25.5 26V8.24607C25.5 8.12577 25.4566 8.00951 25.3778 7.9186L19.9646 1.67253C19.8696 1.56295 19.7318 1.5 19.5867 1.5H2C1.72386 1.5 1.5 1.72386 1.5 2V26C1.5 26.2761 1.72386 26.5 2 26.5ZM2 0C0.895431 0 0 0.895431 0 2V26C0 27.1046 0.895431 28 2 28H25C26.1046 28 27 27.1046 27 26V8.24607C27 7.76488 26.8265 7.29983 26.5114 6.9362L21.0981 0.690139C20.7182 0.251814 20.1668 0 19.5867 0H2Z" fill="#2D9848"/>
<path id="Union" d="M17.044 8H21L15.4482 14.9874L21 22H17.044L13.5 17.5075L9.95603 22H6L11.522 15L6 8H9.95604L13.4737 12.4754L17.044 8Z" fill="white"/>
</g>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.3999 4.48336C3.3999 3.88505 3.88794 3.40002 4.48996 3.40002H28.3098C28.9119 3.40002 29.3999 3.88505 29.3999 4.48336V28.3167C29.3999 28.915 28.9119 29.4 28.3098 29.4H4.48996C3.88794 29.4 3.3999 28.915 3.3999 28.3167V4.48336Z" fill="#60C172"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.5214 2H27.4786C28.8711 2 30 3.12263 30 4.50746V27.4925C30 28.8774 28.8711 30 27.4786 30H4.5214C3.12887 30 2 28.8774 2 27.4925V4.50746C2 3.12263 3.12887 2 4.5214 2ZM4.5214 3.46269C3.94118 3.46269 3.47082 3.93045 3.47082 4.50746V27.4925C3.47082 28.0696 3.94118 28.5373 4.5214 28.5373H27.4786C28.0588 28.5373 28.5292 28.0696 28.5292 27.4925V4.50746C28.5292 3.93045 28.0588 3.46269 27.4786 3.46269H4.5214Z" fill="#2D9848"/>
<path d="M19.7802 8H24L18.0781 15.9856L24 24H19.7802L16 18.8657L12.2198 24H8L13.8901 16L8 8H12.2198L15.972 13.1147L19.7802 8Z" fill="white"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 971 B

5
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.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="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.9"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13 14.3167H17.9C17.9552 14.3167 18 14.3599 18 14.4133V19.0533C18 19.1067 17.9552 19.15 17.9 19.15H13V23.4033C13 23.4567 12.9552 23.5 12.9 23.5H8.6C8.54477 23.5 8.5 23.4567 8.5 23.4033V12.3833C8.5 10.5148 10.067 9 12 9H12.9C12.9552 9 13 9.04328 13 9.09667V14.3167Z" fill="#2576EF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5 9.09667V20.1167C23.5 21.9852 21.933 23.5 20 23.5H19V13.35H14.1C14.0448 13.35 14 13.3067 14 13.2533V9.09667C14 9.04328 14.0448 9 14.1 9H23.4C23.4552 9 23.5 9.04328 23.5 9.09667Z" fill="#34B3FA"/>
</svg>

After

Width:  |  Height:  |  Size: 907 B

11
designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg

@ -0,0 +1,11 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7 28V4H23L29 10.5V28H7Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M29 28V10.7515L23.0925 4H7L7 28H29ZM7 2C5.89543 2 5 2.89543 5 4V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M1 11.5C1 10.3954 1.89543 9.5 3 9.5H24C25.1046 9.5 26 10.3954 26 11.5V20.5C26 21.6046 25.1046 22.5 24 22.5H3C1.89543 22.5 1 21.6046 1 20.5V11.5Z" fill="#5493F2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24 11.1H3C2.77909 11.1 2.6 11.2791 2.6 11.5V20.5C2.6 20.7209 2.77909 20.9 3 20.9H24C24.2209 20.9 24.4 20.7209 24.4 20.5V11.5C24.4 11.2791 24.2209 11.1 24 11.1ZM3 9.5C1.89543 9.5 1 10.3954 1 11.5V20.5C1 21.6046 1.89543 22.5 3 22.5H24C25.1046 22.5 26 21.6046 26 20.5V11.5C26 10.3954 25.1046 9.5 24 9.5H3Z" fill="#105DD1"/>
<path d="M4 13.6C4 13.2686 4.26863 13 4.6 13H9.4C9.73137 13 10 13.2686 10 13.6C10 13.9314 9.73137 14.2 9.4 14.2H4.6C4.26863 14.2 4 13.9314 4 13.6Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.1897 13.1865C16.4054 12.9492 16.7726 12.9317 17.0099 13.1474C17.2472 13.3631 17.2647 13.7303 17.049 13.9676L14.9849 16.2381L17.0492 18.5088C17.2649 18.7461 17.2474 19.1133 17.0102 19.329C16.7729 19.5447 16.4057 19.5273 16.19 19.29L14.2002 17.1012L12.2104 19.29C11.9947 19.5272 11.6275 19.5447 11.3903 19.329C11.153 19.1133 11.1355 18.7461 11.3512 18.5088L13.4155 16.2381L11.3514 13.9676C11.1357 13.7303 11.1532 13.3631 11.3905 13.1474C11.6278 12.9317 11.995 12.9492 12.2107 13.1865L14.2002 15.3749L16.1897 13.1865Z" fill="white"/>
<path d="M18 13.6C18 13.2686 18.2686 13 18.6 13H23.4C23.7314 13 24 13.2686 24 13.6C24 13.9314 23.7314 14.2 23.4 14.2H18.6C18.2686 14.2 18 13.9314 18 13.6Z" fill="white"/>
<path d="M6.4 19C6.4 19.3314 6.66863 19.6 7 19.6C7.33137 19.6 7.6 19.3314 7.6 19H6.4ZM6.4 13.5V19H7.6V13.5L6.4 13.5Z" fill="white"/>
<path d="M20.4 19C20.4 19.3314 20.6686 19.6 21 19.6C21.3314 19.6 21.6 19.3314 21.6 19H20.4ZM20.4 13.5V19H21.6V13.5L20.4 13.5Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

18
designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg

@ -1,12 +1,10 @@
<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 7884">
<path id="Rectangle 34624908" d="M0 2C0 0.895431 0.895431 0 2 0H14H19.5867C20.1668 0 20.7182 0.251814 21.0981 0.690139L26.5114 6.9362C26.8265 7.29983 27 7.76488 27 8.24607V26C27 27.1046 26.1046 28 25 28H2C0.895431 28 0 27.1046 0 26V2Z" fill="#34B3FA"/>
<path id="Rectangle 34624908 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M2 26.5H25C25.2761 26.5 25.5 26.2761 25.5 26V8.24607C25.5 8.12577 25.4566 8.00951 25.3778 7.9186L19.9646 1.67253C19.8696 1.56295 19.7318 1.5 19.5867 1.5H2C1.72386 1.5 1.5 1.72386 1.5 2V26C1.5 26.2761 1.72386 26.5 2 26.5ZM2 0C0.895431 0 0 0.895431 0 2V26C0 27.1046 0.895431 28 2 28H25C26.1046 28 27 27.1046 27 26V8.24607C27 7.76488 26.8265 7.29983 26.5114 6.9362L21.0981 0.690139C20.7182 0.251814 20.1668 0 19.5867 0H2Z" fill="#2089CF"/>
<g id="Group 626084">
<path id="Rectangle 34624684" d="M5 8H11V15H5V8Z" fill="white" fill-opacity="0.7"/>
<path id="Rectangle 34624686" d="M5 16H15V23H5V16Z" fill="white"/>
<path id="Rectangle 34624685" d="M12 8H21V15H12V8Z" fill="white"/>
<path id="Rectangle 34624687" d="M16 16H21V23H16V16Z" fill="white" fill-opacity="0.7"/>
</g>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=frm, &#231;&#166;&#129;&#231;&#148;&#168;=off, &#233;&#148;&#129;&#229;&#174;&#154;=off, Property=&#226;&#128;&#148;">
<path id="Rectangle 34626627" d="M3.3999 4.48336C3.3999 3.88505 3.88794 3.40002 4.48996 3.40002H28.3098C28.9119 3.40002 29.3999 3.88505 29.3999 4.48336V28.3167C29.3999 28.915 28.9119 29.4 28.3098 29.4H4.48996C3.88794 29.4 3.3999 28.915 3.3999 28.3167V4.48336Z" fill="#34B3FA"/>
<path id="Rectangle 34626627 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M4.5214 2H27.4786C28.8711 2 30 3.12263 30 4.50746V27.4925C30 28.8774 28.8711 30 27.4786 30H4.5214C3.12887 30 2 28.8774 2 27.4925V4.50746C2 3.12263 3.12887 2 4.5214 2ZM4.5214 3.46269C3.94118 3.46269 3.47082 3.93045 3.47082 4.50746V27.4925C3.47082 28.0696 3.94118 28.5373 4.5214 28.5373H27.4786C28.0588 28.5373 28.5292 28.0696 28.5292 27.4925V4.50746C28.5292 3.93045 28.0588 3.46269 27.4786 3.46269H4.5214Z" fill="#2089CF"/>
<path id="Rectangle 34624684" d="M7.18506 8.0625H13.7962V15.5H7.18506V8.0625Z" fill="white" fill-opacity="0.8"/>
<path id="Rectangle 34624686" d="M7.18506 16.5625H18.2036V24H7.18506V16.5625Z" fill="white"/>
<path id="Rectangle 34624685" d="M14.8979 8.0625H24.8146V15.5H14.8979V8.0625Z" fill="white"/>
<path id="Rectangle 34624687" d="M19.3057 16.5625H24.8149V24H19.3057V16.5625Z" fill="white" fill-opacity="0.8"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

21
designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg

@ -1,13 +1,10 @@
<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 7886">
<path id="Rectangle 34624906" d="M0 2C0 0.895431 0.895431 0 2 0H14H19.5867C20.1668 0 20.7182 0.251814 21.0981 0.690139L26.5114 6.9362C26.8265 7.29983 27 7.76488 27 8.24607V26C27 27.1046 26.1046 28 25 28H2C0.895431 28 0 27.1046 0 26V2Z" fill="#856CD8"/>
<path id="Rectangle 34624906 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M2 26.5H25C25.2761 26.5 25.5 26.2761 25.5 26V8.24607C25.5 8.12577 25.4566 8.00951 25.3778 7.9186L19.9646 1.67253C19.8696 1.56295 19.7318 1.5 19.5867 1.5H2C1.72386 1.5 1.5 1.72386 1.5 2V26C1.5 26.2761 1.72386 26.5 2 26.5ZM2 0C0.895431 0 0 0.895431 0 2V26C0 27.1046 0.895431 28 2 28H25C26.1046 28 27 27.1046 27 26V8.24607C27 7.76488 26.8265 7.29983 26.5114 6.9362L21.0981 0.690139C20.7182 0.251814 20.1668 0 19.5867 0H2Z" fill="#6A52CE"/>
<g id="Group 626083">
<path id="Rectangle 34624679" d="M4.5249 18.48H7.9149V23H4.5249V18.48Z" fill="white"/>
<path id="Rectangle 34624680" opacity="0.8" d="M9.04492 15.09H12.4349V23H9.04492V15.09Z" fill="white"/>
<path id="Rectangle 34624682" opacity="0.8" d="M18.085 10.5699H21.475V23H18.085V10.5699Z" fill="white"/>
<path id="Rectangle 34624681" d="M13.5649 16.22H16.9549V23H13.5649V16.22Z" fill="white"/>
<path id="Subtract" d="M21.2875 5.61548L14.8953 12.0077C14.1009 12.8021 12.8131 12.8021 12.0188 12.0077L10.8202 10.8092C10.732 10.7209 10.5889 10.7209 10.5006 10.8092L4.5249 16.7849V14.228L9.22215 9.53073C10.0165 8.73641 11.3043 8.73641 12.0987 9.53073L13.2972 10.7293C13.3855 10.8175 13.5286 10.8175 13.6168 10.7293L16.8129 7.53315L15.6943 6.41451L21.2875 5.61548Z" fill="white"/>
</g>
</g>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.07422 4H27.9261V28H4.07422V4Z" fill="#4834AE"/>
<path d="M3.3999 4.48336C3.3999 3.88505 3.88794 3.40002 4.48996 3.40002H28.3098C28.9119 3.40002 29.3999 3.88505 29.3999 4.48336V28.3167C29.3999 28.915 28.9119 29.4 28.3098 29.4H4.48996C3.88794 29.4 3.3999 28.915 3.3999 28.3167V4.48336Z" fill="#856CD8"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.5214 2H27.4786C28.8711 2 30 3.12263 30 4.50746V27.4925C30 28.8774 28.8711 30 27.4786 30H4.5214C3.12887 30 2 28.8774 2 27.4925V4.50746C2 3.12263 3.12887 2 4.5214 2ZM4.5214 3.46269C3.94118 3.46269 3.47082 3.93045 3.47082 4.50746V27.4925C3.47082 28.0696 3.94118 28.5373 4.5214 28.5373H27.4786C28.0588 28.5373 28.5292 28.0696 28.5292 27.4925V4.50746C28.5292 3.93045 28.0588 3.46269 27.4786 3.46269H4.5214Z" fill="#4834AE"/>
<path d="M7.18555 19.8645H10.7011V24.3845H7.18555V19.8645Z" fill="white"/>
<path opacity="0.8" d="M11.8726 16.4746H15.3881V24.3846H11.8726V16.4746Z" fill="white"/>
<path opacity="0.8" d="M21.2471 11.9546H24.7626V24.3846H21.2471V11.9546Z" fill="white"/>
<path d="M16.5601 17.6045H20.0756V24.3845H16.5601V17.6045Z" fill="white"/>
<path d="M24.569 7L17.94 13.3923C17.1163 14.1866 15.7807 14.1866 14.957 13.3923L13.714 12.1937C13.6225 12.1054 13.4741 12.1054 13.3826 12.1937L7.18555 18.1694V15.6125L12.0568 10.9153C12.8805 10.1209 14.2161 10.1209 15.0398 10.9153L16.2828 12.1138C16.3743 12.2021 16.5227 12.2021 16.6142 12.1138L19.9287 8.91768L18.7686 7.79903L24.569 7Z" fill="white"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

11
designer-base/src/main/resources/com/fine/theme/icon/param/view_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_6947_211859)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8987 6C8.63412 6 2.43382 10.1546 0 16C2.43382 21.8454 8.63412 26 15.8987 26C23.1632 26 29.3635 21.8454 31.7974 16C29.3635 10.1546 23.1632 6 15.8987 6ZM15.8989 23.0001C19.7649 23.0001 22.8989 19.7628 22.8989 15.7693C22.8989 11.7758 19.7649 9.00009 15.8989 9.00009C12.0329 9.00009 8.89893 11.7758 8.89893 15.7693C8.89893 19.7628 12.0329 23.0001 15.8989 23.0001Z" fill="#0A1C38" fill-opacity="0.29"/>
<path d="M20.8984 16C20.8984 18.7614 18.6599 21 15.8984 21C13.137 21 10.8984 18.7614 10.8984 16C10.8984 13.2386 13.137 11 15.8984 11C18.6599 11 20.8984 13.2386 20.8984 16Z" fill="#0A1C38" fill-opacity="0.29"/>
</g>
<defs>
<clipPath id="clip0_6947_211859">
<rect width="32" height="32" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 914 B

7
designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 626472">
<path id="Rectangle 98" d="M0 4C0 1.79086 1.79086 0 4 0H28C30.2091 0 32 1.79086 32 4V28C32 30.2091 30.2091 32 28 32H4C1.79086 32 0 30.2091 0 28V4Z" fill="#0A1C38" fill-opacity="0.37"/>
<path id="Subtract" opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M15.8987 6C8.63412 6 2.43382 10.1546 0 16C2.43382 21.8454 8.63412 26 15.8987 26C23.1632 26 29.3635 21.8454 31.7974 16C29.3635 10.1546 23.1632 6 15.8987 6ZM15.8989 23.0001C19.7649 23.0001 22.8989 19.7628 22.8989 15.7693C22.8989 11.7758 19.7649 9.00009 15.8989 9.00009C12.0329 9.00009 8.89893 11.7758 8.89893 15.7693C8.89893 19.7628 12.0329 23.0001 15.8989 23.0001Z" fill="white"/>
<path id="Ellipse 541" opacity="0.4" d="M20.8984 16C20.8984 18.7614 18.6599 21 15.8984 21C13.137 21 10.8984 18.7614 10.8984 16C10.8984 13.2386 13.137 11 15.8984 11C18.6599 11 20.8984 13.2386 20.8984 16Z" fill="white"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 991 B

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

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#229;&#144;&#141;&#231;&#167;&#176;=&#233;&#162;&#132;&#232;&#167;&#136;_&#233;&#157;&#162;, &#231;&#166;&#129;&#231;&#148;&#168;=off">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 5.5C2.5 4.39543 3.39543 3.5 4.5 3.5H27.5C28.6046 3.5 29.5 4.39543 29.5 5.5V22.5C29.5 23.6046 28.6046 24.5 27.5 24.5H4.5C3.39543 24.5 2.5 23.6046 2.5 22.5V5.5ZM9.49996 26.5C8.94768 26.5 8.49996 26.9477 8.49996 27.5C8.49996 28.0523 8.94768 28.5 9.49996 28.5H22.5C23.0522 28.5 23.5 28.0523 23.5 27.5C23.5 26.9477 23.0522 26.5 22.5 26.5H9.49996ZM12.5 9.50178V18.1775C12.5 18.9762 13.3901 19.4526 14.0547 19.0096L20.3012 14.8452C20.8817 14.4583 20.8975 13.6109 20.332 13.2025L14.0855 8.6911C13.4242 8.21347 12.5 8.68601 12.5 9.50178Z" fill="#0A1C38" fill-opacity="0.9"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 886 B

5
designer-base/src/main/resources/com/fine/theme/icon/run_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">
<g id="&#229;&#144;&#141;&#231;&#167;&#176;=&#233;&#162;&#132;&#232;&#167;&#136;_&#233;&#157;&#162;, &#231;&#166;&#129;&#231;&#148;&#168;=on">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 5.5C2.5 4.39543 3.39543 3.5 4.5 3.5H27.5C28.6046 3.5 29.5 4.39543 29.5 5.5V22.5C29.5 23.6046 28.6046 24.5 27.5 24.5H4.5C3.39543 24.5 2.5 23.6046 2.5 22.5V5.5ZM9.49996 26.5C8.94768 26.5 8.49996 26.9477 8.49996 27.5C8.49996 28.0523 8.94768 28.5 9.49996 28.5H22.5C23.0522 28.5 23.5 28.0523 23.5 27.5C23.5 26.9477 23.0522 26.5 22.5 26.5H9.49996ZM12.5 9.50178V18.1775C12.5 18.9762 13.3901 19.4526 14.0547 19.0096L20.3012 14.8452C20.8817 14.4583 20.8975 13.6109 20.332 13.2025L14.0855 8.6911C13.4242 8.21347 12.5 8.68601 12.5 9.50178Z" fill="#0A1C38" fill-opacity="0.29"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 886 B

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

@ -0,0 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#229;&#176;&#186;&#229;&#175;&#184;16">
<path id="&#233;&#162;&#156;&#232;&#137;&#178;" fill-rule="evenodd" clip-rule="evenodd" d="M1.25 2.75C1.25 2.19772 1.69772 1.75 2.25 1.75H13.75C14.3023 1.75 14.75 2.19772 14.75 2.75V11.25C14.75 11.8023 14.3023 12.25 13.75 12.25H2.25C1.69772 12.25 1.25 11.8023 1.25 11.25V2.75ZM4.74998 13.25C4.47384 13.25 4.24998 13.4739 4.24998 13.75C4.24998 14.0261 4.47384 14.25 4.74998 14.25H11.25C11.5261 14.25 11.75 14.0261 11.75 13.75C11.75 13.4739 11.5261 13.25 11.25 13.25H4.74998ZM6.25 4.75089V9.08875C6.25 9.4881 6.69507 9.72629 7.02735 9.50478L10.1506 7.4226C10.4408 7.22913 10.4488 6.80545 10.166 6.60124L7.04275 4.34555C6.71208 4.10674 6.25 4.343 6.25 4.75089Z" fill="white"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 830 B

42
designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg

@ -1,20 +1,24 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16 11.5C16 13.7091 14.2091 15.5 12 15.5C9.79086 15.5 8 13.7091 8 11.5C8 9.29086 9.79086 7.5 12 7.5C14.2091 7.5 16 9.29086 16 11.5Z" fill="#5AB0F8"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 1C1.44772 1 1 1.44772 1 2V14C1 14.5523 1.44772 15 2 15H8.42928C7.54516 14.0981 7 12.8627 7 11.5C7 8.73858 9.23858 6.5 12 6.5C12.9107 6.5 13.7646 6.74349 14.5 7.16891V5.12303C14.5 4.88244 14.4133 4.64991 14.2557 4.4681L11.5491 1.34507C11.3591 1.12591 11.0834 1 10.7934 1H8H2Z" fill="#34B3FA"/>
<path opacity="0.7" fill-rule="evenodd" clip-rule="evenodd" d="M7.82351 14.25H2C1.86193 14.25 1.75 14.1381 1.75 14V2C1.75 1.86193 1.86193 1.75 2 1.75H10.7934C10.8659 1.75 10.9348 1.78148 10.9823 1.83627L13.6889 4.9593C13.7283 5.00475 13.75 5.06289 13.75 5.12303V6.8148C14.011 6.91235 14.2617 7.03108 14.5 7.16891V5.12303C14.5 4.88244 14.4133 4.64991 14.2557 4.4681L11.5491 1.34507C11.3591 1.12591 11.0834 1 10.7934 1H2C1.44772 1 1 1.44772 1 2V14C1 14.5523 1.44772 15 2 15H8.42928C8.20427 14.7705 8.00121 14.5193 7.82351 14.25Z" fill="#1164A3"/>
<path d="M4 5.50012H6.5V8.50012H4V5.50012Z" fill="white" fill-opacity="0.7"/>
<path d="M9 9.00012H11.5V12.0001H9V9.00012Z" fill="white" fill-opacity="0.7"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 5.50012H11.5V6.52469C10.0702 6.66664 8.81764 7.41089 7.99954 8.50012H7V5.50012ZM7.66884 9.00012H4V12.0001H7.0247C7.00836 11.8356 7 11.6688 7 11.5C7 10.5893 7.24346 9.73553 7.66884 9.00012Z" fill="white"/>
<path d="M16 11.5C16 13.7091 14.2091 15.5 12 15.5C9.79086 15.5 8 13.7091 8 11.5C8 9.29086 9.79086 7.5 12 7.5C14.2091 7.5 16 9.29086 16 11.5Z" fill="#34B3FA"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 15C13.933 15 15.5 13.433 15.5 11.5C15.5 9.567 13.933 8 12 8C10.067 8 8.5 9.567 8.5 11.5C8.5 13.433 10.067 15 12 15ZM12 15.5C14.2091 15.5 16 13.7091 16 11.5C16 9.29086 14.2091 7.5 12 7.5C9.79086 7.5 8 9.29086 8 11.5C8 13.7091 9.79086 15.5 12 15.5Z" fill="#34B3FA"/>
<rect x="9.5" y="11" width="5" height="1" rx="0.5" fill="white"/>
<rect x="9.5" y="11" width="5" height="1" rx="0.5" fill="white"/>
<rect x="9.5" y="11" width="5" height="1" rx="0.5" fill="white"/>
<rect x="9.5" y="11" width="5" height="1" rx="0.5" fill="white"/>
<rect x="9.5" y="11" width="5" height="1" rx="0.5" fill="white"/>
<rect x="12.5" y="9" width="5" height="1" rx="0.5" transform="rotate(90 12.5 9)" fill="white"/>
<rect x="12.5" y="9" width="5" height="1" rx="0.5" transform="rotate(90 12.5 9)" fill="white"/>
<rect x="12.5" y="9" width="5" height="1" rx="0.5" transform="rotate(90 12.5 9)" fill="white"/>
<rect x="12.5" y="9" width="5" height="1" rx="0.5" transform="rotate(90 12.5 9)" fill="white"/>
<rect x="12.5" y="9" width="5" height="1" rx="0.5" transform="rotate(90 12.5 9)" fill="white"/>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=&#230;&#150;&#176;&#229;&#187;&#186;frm, &#231;&#166;&#129;&#231;&#148;&#168;=off, &#233;&#148;&#129;&#229;&#174;&#154;=off, Property=&#226;&#128;&#148;">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.48996 3.40002C3.88794 3.40002 3.3999 3.88505 3.3999 4.48336V28.3167C3.3999 28.915 3.88794 29.4 4.48996 29.4H15.5819C14.5807 27.8425 14 25.9891 14 24C14 18.4772 18.4772 14 24 14C25.989 14 27.8424 14.5807 29.3999 15.5818V4.48336C29.3999 3.88505 28.9119 3.40002 28.3098 3.40002H4.48996Z" fill="#34B3FA"/>
<path id="Rectangle 34624684" d="M7.18506 8.0625H13.7962V15.5H7.18506V8.0625Z" fill="white" fill-opacity="0.8"/>
<path id="Ellipse 241" d="M32 24C32 28.4183 28.4183 32 24 32C19.5817 32 16 28.4183 16 24C16 19.5817 19.5817 16 24 16C28.4183 16 32 19.5817 32 24Z" fill="#34B3FA"/>
<g id="Rectangle 34624604">
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
</g>
<g id="Rectangle 34624605">
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
</g>
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M24.8146 8.0625H14.8979V15.5H18.7296C20.2599 14.5491 22.0658 14 24 14C24.2743 14 24.5459 14.011 24.8146 14.0327V8.0625Z" fill="white"/>
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M17.3153 16.5625H7.18506V24H14C14 21.0471 15.2799 18.393 17.3153 16.5625Z" fill="white"/>
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M27.4786 2H4.5214C3.12887 2 2 3.12263 2 4.50746V27.4925C2 28.8774 3.12887 30 4.5214 30H15.9993C15.6548 29.5414 15.3489 29.0523 15.0862 28.5373H4.5214C3.94118 28.5373 3.47082 28.0696 3.47082 27.4925V4.50746C3.47082 3.93045 3.94118 3.46269 4.5214 3.46269H27.4786C28.0588 3.46269 28.5292 3.93045 28.5292 4.50746V15.0821C29.0471 15.3456 29.539 15.653 30 15.9993V4.50746C30 3.12263 28.8711 2 27.4786 2Z" fill="#2089CF"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

36
designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg

@ -1,24 +1,24 @@
<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 7883">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895431 0 0 0.895431 0 2V26C0 27.1046 0.89543 28 2 28H13.9993C12.7439 26.3287 12 24.2512 12 22C12 16.4772 16.4772 12 22 12C23.8214 12 25.5291 12.487 27 13.3378V8.24607C27 7.76488 26.8265 7.29983 26.5114 6.9362L21.0981 0.690139C20.7182 0.251814 20.1668 0 19.5867 0H14H2Z" fill="#B8BFCB"/>
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M13.0673 26.5H2C1.72386 26.5 1.5 26.2761 1.5 26V2C1.5 1.72386 1.72386 1.5 2 1.5H19.5867C19.7318 1.5 19.8696 1.56295 19.9646 1.67253L25.3778 7.9186C25.4566 8.00951 25.5 8.12577 25.5 8.24607V12.6296C26.0221 12.8247 26.5235 13.0622 27 13.3378V8.24607C27 7.76488 26.8265 7.29983 26.5114 6.9362L21.0981 0.690139C20.7182 0.251814 20.1668 0 19.5867 0H2C0.895431 0 0 0.895431 0 2V26C0 27.1046 0.89543 28 2 28H13.9993C13.6465 27.5304 13.3341 27.0286 13.0673 26.5Z" fill="#A3ADBD"/>
<path id="Ellipse 241" d="M30 22C30 26.4183 26.4183 30 22 30C17.5817 30 14 26.4183 14 22C14 17.5817 17.5817 14 22 14C26.4183 14 30 17.5817 30 22Z" fill="#A3ADBD"/>
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M14.9 13.5H10V8.1C10 8.04477 9.95523 8 9.9 8H9C7.067 8 5.5 9.567 5.5 11.5V22.9C5.5 22.9552 5.54477 23 5.6 23H9.9C9.95523 23 10 22.9552 10 22.9V18.5H12.6296C13.1473 17.1145 13.9635 15.8746 15 14.8586V13.6C15 13.5448 14.9552 13.5 14.9 13.5Z" fill="white"/>
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M20.5 12.1118V8.1C20.5 8.04477 20.4552 8 20.4 8H11.1C11.0448 8 11 8.04477 11 8.1V12.4C11 12.4552 11.0448 12.5 11.1 12.5H16V13.9993C17.2928 13.0282 18.8287 12.3632 20.5 12.1118Z" fill="white" fill-opacity="0.8"/>
<path id="Ellipse 241 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M22 29C25.866 29 29 25.866 29 22C29 18.134 25.866 15 22 15C18.134 15 15 18.134 15 22C15 25.866 18.134 29 22 29ZM22 30C26.4183 30 30 26.4183 30 22C30 17.5817 26.4183 14 22 14C17.5817 14 14 17.5817 14 22C14 26.4183 17.5817 30 22 30Z" fill="#A3ADBD"/>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=&#230;&#150;&#176;&#229;&#187;&#186;frm, &#231;&#166;&#129;&#231;&#148;&#168;=on, &#233;&#148;&#129;&#229;&#174;&#154;=off, Property=&#226;&#128;&#148;">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.48996 3.40002C3.88794 3.40002 3.3999 3.88505 3.3999 4.48336V28.3167C3.3999 28.915 3.88794 29.4 4.48996 29.4H15.5819C14.5807 27.8425 14 25.9891 14 24C14 18.4772 18.4772 14 24 14C25.989 14 27.8424 14.5807 29.3999 15.5818V4.48336C29.3999 3.88505 28.9119 3.40002 28.3098 3.40002H4.48996Z" fill="#B8BFCB"/>
<path id="Rectangle 34624684" d="M7.18506 8.0625H13.7962V15.5H7.18506V8.0625Z" fill="white" fill-opacity="0.8"/>
<path id="Ellipse 241" d="M32 24C32 28.4183 28.4183 32 24 32C19.5817 32 16 28.4183 16 24C16 19.5817 19.5817 16 24 16C28.4183 16 32 19.5817 32 24Z" fill="#A3ADBD"/>
<g id="Rectangle 34624604">
<rect x="17" y="21" width="10" height="2" rx="1" fill="white"/>
<rect x="17" y="21" width="10" height="2" rx="1" fill="white"/>
<rect x="17" y="21" width="10" height="2" rx="1" fill="white"/>
<rect x="17" y="21" width="10" height="2" rx="1" fill="white"/>
<rect x="17" y="21" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
</g>
<g id="Rectangle 34624605">
<rect x="23" y="17" width="10" height="2" rx="1" transform="rotate(90 23 17)" fill="white"/>
<rect x="23" y="17" width="10" height="2" rx="1" transform="rotate(90 23 17)" fill="white"/>
<rect x="23" y="17" width="10" height="2" rx="1" transform="rotate(90 23 17)" fill="white"/>
<rect x="23" y="17" width="10" height="2" rx="1" transform="rotate(90 23 17)" fill="white"/>
<rect x="23" y="17" width="10" height="2" rx="1" transform="rotate(90 23 17)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
</g>
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M24.8146 8.0625H14.8979V15.5H18.7296C20.2599 14.5491 22.0658 14 24 14C24.2743 14 24.5459 14.011 24.8146 14.0327V8.0625Z" fill="white"/>
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M17.3153 16.5625H7.18506V24H14C14 21.0471 15.2799 18.393 17.3153 16.5625Z" fill="white"/>
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M27.4786 2H4.5214C3.12887 2 2 3.12263 2 4.50746V27.4925C2 28.8774 3.12887 30 4.5214 30H15.9993C15.6548 29.5414 15.3489 29.0523 15.0862 28.5373H4.5214C3.94118 28.5373 3.47082 28.0696 3.47082 27.4925V4.50746C3.47082 3.93045 3.94118 3.46269 4.5214 3.46269H27.4786C28.0588 3.46269 28.5292 3.93045 28.5292 4.50746V15.0821C29.0471 15.3456 29.539 15.653 30 15.9993V4.50746C30 3.12263 28.8711 2 27.4786 2Z" fill="#A3ADBD"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

35
designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg

@ -1,24 +1,23 @@
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 7883">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447716 0 1V13C0 13.5523 0.447715 14 1 14H6.99963C6.37194 13.1643 6 12.1256 6 11C6 8.23858 8.23858 6 11 6C11.9107 6 12.7646 6.24349 13.5 6.66891V4.12303C13.5 3.88244 13.4133 3.64991 13.2557 3.4681L10.5491 0.345069C10.3591 0.125907 10.0834 0 9.79337 0H7H1Z" fill="#4489F1"/>
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M6.53365 13.25H1C0.861929 13.25 0.75 13.1381 0.75 13V1C0.75 0.861929 0.861929 0.75 1 0.75H9.79337C9.86588 0.75 9.93481 0.781476 9.98229 0.836267L12.6889 3.9593C12.7283 4.00475 12.75 4.06289 12.75 4.12303V6.3148C13.011 6.41235 13.2617 6.53108 13.5 6.66891V4.12303C13.5 3.88244 13.4133 3.64991 13.2557 3.4681L10.5491 0.345069C10.3591 0.125907 10.0834 0 9.79337 0H1C0.447715 0 0 0.447716 0 1V13C0 13.5523 0.447715 14 1 14H6.99963C6.82325 13.7652 6.66706 13.5143 6.53365 13.25Z" fill="#105DD1"/>
<path id="Ellipse 241" d="M15 11C15 13.2091 13.2091 15 11 15C8.79086 15 7 13.2091 7 11C7 8.79086 8.79086 7 11 7C13.2091 7 15 8.79086 15 11Z" fill="#2576EF"/>
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M7.45 6.75H5V4.05C5 4.02239 4.97761 4 4.95 4H4.5C3.5335 4 2.75 4.7835 2.75 5.75V11.45C2.75 11.4776 2.77239 11.5 2.8 11.5H4.95C4.97761 11.5 5 11.4776 5 11.45V9.25H6.3148C6.57367 8.55726 6.98177 7.93731 7.5 7.42928V6.8C7.5 6.77239 7.47761 6.75 7.45 6.75Z" fill="white"/>
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M10.25 6.05588V4.05C10.25 4.02239 10.2276 4 10.2 4H5.55C5.52239 4 5.5 4.02239 5.5 4.05V6.2C5.5 6.22761 5.52239 6.25 5.55 6.25H8V6.99963C8.64642 6.51409 9.41434 6.18158 10.25 6.05588Z" fill="white" fill-opacity="0.8"/>
<path id="Ellipse 241 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M11 14.5C12.933 14.5 14.5 12.933 14.5 11C14.5 9.067 12.933 7.5 11 7.5C9.067 7.5 7.5 9.067 7.5 11C7.5 12.933 9.067 14.5 11 14.5ZM11 15C13.2091 15 15 13.2091 15 11C15 8.79086 13.2091 7 11 7C8.79086 7 7 8.79086 7 11C7 13.2091 8.79086 15 11 15Z" fill="#2576EF"/>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=&#230;&#150;&#176;&#229;&#187;&#186;cpt, &#231;&#166;&#129;&#231;&#148;&#168;=off, &#233;&#148;&#129;&#229;&#174;&#154;=off, Property=&#226;&#128;&#148;">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.48324 3.40002C3.88493 3.40002 3.3999 3.88505 3.3999 4.48336V28.3167C3.3999 28.915 3.88493 29.4 4.48324 29.4H15.5819C14.5807 27.8425 14 25.9891 14 24C14 18.4772 18.4772 14 24 14C25.989 14 27.8424 14.5807 29.3999 15.5818V4.48336C29.3999 3.88505 28.9149 3.40002 28.3166 3.40002H4.48324Z" fill="#5493F2"/>
<path id="Ellipse 241" d="M32 24C32 28.4183 28.4183 32 24 32C19.5817 32 16 28.4183 16 24C16 19.5817 19.5817 16 24 16C28.4183 16 32 19.5817 32 24Z" fill="#2576EF"/>
<g id="Rectangle 34624604">
<rect x="8.5" y="10.5" width="5" height="1" rx="0.5" fill="white"/>
<rect x="8.5" y="10.5" width="5" height="1" rx="0.5" fill="white"/>
<rect x="8.5" y="10.5" width="5" height="1" rx="0.5" fill="white"/>
<rect x="8.5" y="10.5" width="5" height="1" rx="0.5" fill="white"/>
<rect x="8.5" y="10.5" width="5" height="1" rx="0.5" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
</g>
<g id="Rectangle 34624605">
<rect x="11.5" y="8.5" width="5" height="1" rx="0.5" transform="rotate(90 11.5 8.5)" fill="white"/>
<rect x="11.5" y="8.5" width="5" height="1" rx="0.5" transform="rotate(90 11.5 8.5)" fill="white"/>
<rect x="11.5" y="8.5" width="5" height="1" rx="0.5" transform="rotate(90 11.5 8.5)" fill="white"/>
<rect x="11.5" y="8.5" width="5" height="1" rx="0.5" transform="rotate(90 11.5 8.5)" fill="white"/>
<rect x="11.5" y="8.5" width="5" height="1" rx="0.5" transform="rotate(90 11.5 8.5)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
</g>
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M12.8556 13.8667H18.1427C18.2023 13.8667 18.2506 13.9144 18.2506 13.9733V15.817C17.0017 16.6961 15.9631 17.8539 15.2252 19.2H12.8556V23.8933C12.8556 23.9522 12.8073 24 12.7477 24H8.1079C8.04831 24 8 23.9522 8 23.8933V11.7333C8 9.67147 9.69082 8 11.7766 8H12.7477C12.8073 8 12.8556 8.04776 12.8556 8.10667V13.8667Z" fill="white"/>
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M24.0001 14V8.1C24.0001 8.04477 23.9548 8 23.899 8H14.4913C14.4354 8 14.3901 8.04477 14.3901 8.1V12.4C14.3901 12.4552 14.4354 12.5 14.4913 12.5H19.448V15.0937C20.8134 14.3945 22.3606 14 24 14C24 14 24.0001 14 24.0001 14Z" fill="white" fill-opacity="0.8"/>
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M27.4925 2H4.50746C3.12263 2 2 3.12263 2 4.50746V27.4925C2 28.8774 3.12263 30 4.50746 30H15.9993C15.6548 29.5414 15.3489 29.0523 15.0862 28.5373H4.50746C3.93045 28.5373 3.46269 28.0696 3.46269 27.4925V4.50746C3.46269 3.93045 3.93045 3.46269 4.50746 3.46269H27.4925C28.0696 3.46269 28.5373 3.93045 28.5373 4.50746V15.0862C29.0523 15.3489 29.5414 15.6548 30 15.9993V4.50746C30 3.12263 28.8774 2 27.4925 2Z" fill="#105DD1"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

39
designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg

@ -1,20 +1,23 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M32 23C32 27.4183 28.4183 31 24 31C19.5817 31 16 27.4183 16 23C16 18.5817 19.5817 15 24 15C28.4183 15 32 18.5817 32 23Z" fill="#5AB0F8"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H16.8586C15.0903 28.1962 14 25.7255 14 23C14 17.4772 18.4772 13 24 13C25.8214 13 27.5291 13.487 29 14.3378V10.2461C29 9.76488 28.8265 9.29983 28.5114 8.9362L23.0981 2.69014C22.7182 2.25181 22.1668 2 21.5867 2H16H4Z" fill="#B8BFCB"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.647 28.5H4C3.72386 28.5 3.5 28.2761 3.5 28V4C3.5 3.72386 3.72386 3.5 4 3.5H21.5867C21.7318 3.5 21.8696 3.56295 21.9646 3.67253L27.3778 9.9186C27.4566 10.0095 27.5 10.1258 27.5 10.2461V13.6296C28.0221 13.8247 28.5235 14.0622 29 14.3378V10.2461C29 9.76488 28.8265 9.29983 28.5114 8.9362L23.0981 2.69014C22.7182 2.25181 22.1668 2 21.5867 2H4C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H16.8586C16.4085 29.5409 16.0024 29.0387 15.647 28.5Z" fill="#A3ADBD"/>
<path d="M8 11.0002H13V17.0002H8V11.0002Z" fill="white" fill-opacity="0.7"/>
<path d="M18 18.0002H23V24.0002H18V18.0002Z" fill="white" fill-opacity="0.7"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 11.0002H23V13.0494C20.1405 13.3333 17.6353 14.8218 15.9991 17.0002H14V11.0002ZM15.3377 18.0002H8V24.0002H14.0494C14.0167 23.6713 14 23.3376 14 23C14 21.1787 14.4869 19.4711 15.3377 18.0002Z" fill="white"/>
<path d="M32 23C32 27.4183 28.4183 31 24 31C19.5817 31 16 27.4183 16 23C16 18.5817 19.5817 15 24 15C28.4183 15 32 18.5817 32 23Z" fill="#A3ADBD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24 30C27.866 30 31 26.866 31 23C31 19.134 27.866 16 24 16C20.134 16 17 19.134 17 23C17 26.866 20.134 30 24 30ZM24 31C28.4183 31 32 27.4183 32 23C32 18.5817 28.4183 15 24 15C19.5817 15 16 18.5817 16 23C16 27.4183 19.5817 31 24 31Z" fill="#A3ADBD"/>
<rect x="19" y="22" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="22" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="22" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="22" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="22" width="10" height="2" rx="1" fill="white"/>
<rect x="25" y="18" width="10" height="2" rx="1" transform="rotate(90 25 18)" fill="white"/>
<rect x="25" y="18" width="10" height="2" rx="1" transform="rotate(90 25 18)" fill="white"/>
<rect x="25" y="18" width="10" height="2" rx="1" transform="rotate(90 25 18)" fill="white"/>
<rect x="25" y="18" width="10" height="2" rx="1" transform="rotate(90 25 18)" fill="white"/>
<rect x="25" y="18" width="10" height="2" rx="1" transform="rotate(90 25 18)" fill="white"/>
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=&#230;&#150;&#176;&#229;&#187;&#186;cpt, &#231;&#166;&#129;&#231;&#148;&#168;=on, &#233;&#148;&#129;&#229;&#174;&#154;=off, Property=&#226;&#128;&#148;">
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.48324 3.40002C3.88493 3.40002 3.3999 3.88505 3.3999 4.48336V28.3167C3.3999 28.915 3.88493 29.4 4.48324 29.4H15.5819C14.5807 27.8425 14 25.9891 14 24C14 18.4772 18.4772 14 24 14C25.989 14 27.8424 14.5807 29.3999 15.5818V4.48336C29.3999 3.88505 28.9149 3.40002 28.3166 3.40002H4.48324Z" fill="#B8BFCB"/>
<path id="Ellipse 241" d="M32 24C32 28.4183 28.4183 32 24 32C19.5817 32 16 28.4183 16 24C16 19.5817 19.5817 16 24 16C28.4183 16 32 19.5817 32 24Z" fill="#A3ADBD"/>
<g id="Rectangle 34624604">
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
<rect x="19" y="23" width="10" height="2" rx="1" fill="white"/>
</g>
<g id="Rectangle 34624605">
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
<rect x="25" y="19" width="10" height="2" rx="1" transform="rotate(90 25 19)" fill="white"/>
</g>
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M12.8556 13.8667H18.1427C18.2023 13.8667 18.2506 13.9144 18.2506 13.9733V15.817C17.0017 16.6961 15.9631 17.8539 15.2252 19.2H12.8556V23.8933C12.8556 23.9522 12.8073 24 12.7477 24H8.1079C8.04831 24 8 23.9522 8 23.8933V11.7333C8 9.67147 9.69082 8 11.7766 8H12.7477C12.8073 8 12.8556 8.04776 12.8556 8.10667V13.8667Z" fill="white"/>
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M24.0001 14V8.1C24.0001 8.04477 23.9548 8 23.899 8H14.4913C14.4354 8 14.3901 8.04477 14.3901 8.1V12.4C14.3901 12.4552 14.4354 12.5 14.4913 12.5H19.448V15.0937C20.8134 14.3945 22.3606 14 24 14C24 14 24.0001 14 24.0001 14Z" fill="white" fill-opacity="0.8"/>
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M27.4925 2H4.50746C3.12263 2 2 3.12263 2 4.50746V27.4925C2 28.8774 3.12263 30 4.50746 30H15.9993C15.6548 29.5414 15.3489 29.0523 15.0862 28.5373H4.50746C3.93045 28.5373 3.46269 28.0696 3.46269 27.4925V4.50746C3.46269 3.93045 3.93045 3.46269 4.50746 3.46269H27.4925C28.0696 3.46269 28.5373 3.93045 28.5373 4.50746V15.0862C29.0523 15.3489 29.5414 15.6548 30 15.9993V4.50746C30 3.12263 28.8774 2 27.4925 2Z" fill="#A3ADBD"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -12,6 +12,7 @@
"paste": "paste.svg",
"undo": "undo.svg",
"redo": "redo.svg",
"run": "run.svg",
"version_save": "version_save.svg",
"font_miss_check": "font_miss_check.svg",
"template_theme": "template_theme.svg",
@ -187,6 +188,7 @@
"param_hide": "param/hide.svg",
"param_hide_pressed": "param/hide_pressed.svg",
"param_view": "param/view.svg",
"param_view_pressed": "param/view_pressed.svg",
"param": "param/param.svg",
"locked": "lock/locked.svg",
"unlocked": "lock/unlocked.svg",

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

@ -672,7 +672,7 @@ ScrollBar.largeBar.thumbInsets = 0,4,0,4
ScrollBar.largeBar.buttonBackground = $ScrollBar.track
#---- Panel ----
Panel.arc = 20
Panel.arc = 10
#---- ScrollPane ----
@ -882,6 +882,10 @@ TemplateTabPane.borderWidth = 1
TemplateTabPane.tabArc = 5
TemplateTabPane.separatorHeight = 14
TemplateTabPane.icon.hoverBackground = #B8BFCB
# ---- FineTabbedPane ----
FineTabbedPane.background = #F2F4F8
#---- Table ----
Table.rowHeight = 20
@ -1179,6 +1183,7 @@ North.border = $defaultBorderColor
North.messageLabel.foreground=$text.placeholder
North.coverPane.background = #0a1c38
North.coverPane.radius = 8
North.hidePane.background = #cdd1d7
# ---- Center ----

4
designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

@ -58,6 +58,8 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import static com.fine.theme.utils.FineUIScale.scale;
/**
* 参数面板控件工具栏
*
@ -139,7 +141,7 @@ public class FormParaWidgetPane extends UIToolbar {
}
public FormParaWidgetPane() {
setLayout(new FlowLayout(FlowLayout.LEFT));
setLayout(new FlowLayout(FlowLayout.LEFT, scale(5), 0));
initFormParaComponent();
}

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -1,6 +1,5 @@
package com.fr.design.dscolumn;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.BaseFormula;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.BasicPane;
@ -112,7 +111,6 @@ public class DSColumnAdvancedPane extends BasicPane {
cell(wrapComponentWithTitle(valuePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Custom_Data_Appearance")))
).getComponent());
}
contentPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
}
@Override

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java

@ -1,6 +1,5 @@
package com.fr.design.dscolumn;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.data.TableDataSource;
import com.fr.design.dialog.BasicPane;
import com.fr.design.expand.ConditionParentPane;
@ -55,7 +54,6 @@ public class DSColumnBasicPane extends BasicPane {
public DSColumnBasicPane(int setting) {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
if (setting > DSColumnPane.SETTING_DSRELATED) {
selectDataColumnPane = new SelectedDataColumnPane();

3
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java

@ -2,7 +2,6 @@ package com.fr.design.dscolumn;
import com.fine.swing.ui.layout.Column;
import com.fine.theme.utils.FineUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.data.TableDataSource;
import com.fr.design.condition.DSColumnLiteConditionPane;
import com.fr.design.condition.DSColumnSimpleLiteConditionPane;
@ -53,9 +52,7 @@ public class DSColumnConditionsPane extends BasicPane {
liteConditionPane = new DSColumnSimpleLiteConditionPane();
}
column.add(liteConditionPane);
column.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
this.add(column);
}
@Override

3
designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@ -1,5 +1,6 @@
package com.fr.design.javascript;
import com.fine.theme.utils.FineClientProperties;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane;
@ -73,11 +74,11 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
nameText.setEditable(false);
final List<String> style = new ArrayList<>(Arrays.asList(JS, DBCOMMIT, CUSTOMACTION, EMAIL, MOBILEPOPUP));
styleBox = new UIComboBox(style.toArray());
styleBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX);
boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook();
if (workbook) {
style.add(EXPORT);
}
styleBox = new UIComboBox(style.toArray());
//事件名
JPanel eventName = row(LayoutConstants.HGAP_LARGE,
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Name"))),

2
designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java

@ -301,7 +301,6 @@ public class PageSetupPane extends BasicPane {
JPanel workPanel = new JPanel(new BorderLayout());
workPanel.add(defaultPane);
workPanel.setBorder(new ScaledEmptyBorder(10,10,10,10));
this.add(workPanel);
}
@ -906,7 +905,6 @@ public class PageSetupPane extends BasicPane {
JPanel workPanel = new JPanel(new BorderLayout());
workPanel.add(defaultPane);
workPanel.setBorder(new ScaledEmptyBorder(10,10,10,10));
this.add(workPanel);
}

2
designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java

@ -1,6 +1,5 @@
package com.fr.design.webattr;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.gui.ilable.UILabel;
@ -38,7 +37,6 @@ public class ErrorTemplatePane extends BasicBeanPane<String> {
cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace")))
)
).getComponent();
northPane.setBorder(new ScaledEmptyBorder(10,10,10,10));
this.add(northPane);
}

1
designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java

@ -73,7 +73,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
public PageToolBarPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
ButtonGroup buttonGroup = new ButtonGroup();
leftRadioButton.setSelected(true);

2
designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java

@ -1,6 +1,5 @@
package com.fr.design.webattr;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.ConfigManager;
import com.fr.config.Configuration;
import com.fr.design.constants.LayoutConstants;
@ -45,7 +44,6 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
public ViewToolBarPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
editToolBarButton.addActionListener(editBtnListener);
isUseToolBarCheckBox.setSelected(true);
isUseToolBarCheckBox.addActionListener(new ActionListener() {

1
designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java

@ -37,7 +37,6 @@ public class WebCssPane extends BasicPane {
public WebCssPane() {
this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
//磁盘文件
localText = new UITextField();

1
designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@ -57,7 +57,6 @@ public class WebJsPane extends BasicPane {
public WebJsPane() {
this.setLayout(new BorderLayout());
this.setBorder(new ScaledEmptyBorder(10,10,10,10));
localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), true);
urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location"), false);

1
designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java

@ -62,7 +62,6 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
public WriteToolBarPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
//sheet标签页显示位置
ButtonGroup sheetButtonGroup = new ButtonGroup();

1
designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java

@ -60,7 +60,6 @@ public class PrintSettingPane extends BasicPane {
printPane.add(nativePrintRadioButton.getText(), scrollPane);
JPanel allPanel = column(LayoutConstants.VERTICAL_GAP, cell(north), cell(printPane)).getComponent();
allPanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.add(allPanel, BorderLayout.CENTER);
}

4
designer-realize/src/main/java/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java

@ -1,5 +1,6 @@
package com.fr.quickeditor.chartquick;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.chart.BaseChartCollection;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.chart.BaseChartPropertyPane;
@ -8,7 +9,7 @@ import com.fr.design.selection.QuickEditor;
import com.fr.poly.PolyDesigner;
import com.fr.poly.creator.ChartBlockEditor;
import java.awt.*;
import java.awt.BorderLayout;
public class PolyChartQuickEditor extends QuickEditor<TargetComponent> {
@ -26,6 +27,7 @@ public class PolyChartQuickEditor extends QuickEditor<TargetComponent> {
add(editingPropertyPane = DesignModuleFactory.getChartPropertyPane(), BorderLayout.CENTER);
editingPropertyPane.setSupportCellData(false);
editingPropertyPane.populateChartPropertyPane(collection, tc);
setBorder(new ScaledEmptyBorder(0, 10, 0, 10));
}
}

2
designer-realize/src/main/java/com/fr/start/MainDesigner.java

@ -353,7 +353,7 @@ public class MainDesigner extends BaseDesigner {
}
private UICombinationButton createRunButton() {
run = new UICombinationButton(new UISaveForbiddenButton(Toolkit.i18nText("Fine-Design_Basic_Preview"), new LazyIcon("add").white()),
run = new UICombinationButton(new UISaveForbiddenButton(Toolkit.i18nText("Fine-Design_Basic_Preview"), new LazyIcon("run").white()),
new UISaveForbiddenButton(new LazyIcon("triangle_down").white()));
run.addLeftClickLister(mouseEvent -> {
JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();

Loading…
Cancel
Save