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

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

@@ -18,6 +18,7 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 
 /**
@@ -100,6 +101,8 @@ public class FineHeaderPaneUI extends PanelUI implements AnimatedPainter {
                 + FineUIScale.scale(UIManager.getInt("ExpandablePane.HeaderPane.hGap"));
         float titleY = (headerPane.getHeight() - (ascent + descent)) / 2.0f + ascent;
         FlatUIUtils.setRenderingHints(g2d);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+
         g2d.drawString(headerPane.getTitle(), titleX, titleY);
         g2d.dispose();
     }

designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java

@@ -101,6 +101,7 @@ public class UIHeadGroup extends Row {
                             b.setEnabled(h.isEnable());
                             b.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TAB);
                             b.addActionListener(e -> setSelectedIndex((int) index));
+                            b.setFocusPainted(false);
                         })
 
         ).toArray(Layouts.Cell[]::new);

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

@@ -20,7 +20,7 @@ public class DesignerUIModeConfig {
     }
 
     private void init() {
-        uiDevMode = Boolean.parseBoolean(System.getProperty("uiDevMode", "false"));
+        uiDevMode = Boolean.parseBoolean(System.getProperty("devMode", "false"));
     }
 
     public static DesignerUIModeConfig getInstance() {

designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect opacity="0.4" x="3" y="27" width="26" height="4" rx="2" fill="#2576EF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9011 3.42119L12.8134 2.33351C12.3838 1.90393 12.3838 1.20745 12.8134 0.777871C13.243 0.348295 13.9394 0.348294 14.369 0.777871L27.404 13.8129C27.7617 14.1706 27.7439 14.7558 27.3651 15.0911L15.6913 25.4233C15.137 25.9138 14.2968 25.8882 13.7734 25.3648L3.85536 15.4468C3.30863 14.9 3.30863 14.0136 3.85536 13.4669L13.9011 3.42119ZM15.4567 4.97682L5.97668 14.4568L8.51991 17.0001H21.8767L24.842 14.3622L15.4567 4.97682ZM26.5004 19.0001L24.7324 20.7575C24.3827 21.105 24.1445 21.5478 24.048 22.0299C23.9515 22.512 24.0009 23.0117 24.1901 23.4658C24.3793 23.9199 24.6997 24.3081 25.1109 24.5812C25.522 24.8543 26.0054 25.0001 26.4999 25.0001C26.9944 25.0001 27.4778 24.8543 27.8889 24.5812C28.3 24.3081 28.6205 23.9199 28.8097 23.4658C28.9989 23.0117 29.0483 22.512 28.9518 22.0299C28.8553 21.5478 28.6171 21.105 28.2674 20.7575L26.5004 19.0001Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.7018 24.8844C5.84704 24.9522 6.00435 24.991 6.16474 24.9986C6.32512 25.0062 6.48545 24.9824 6.63654 24.9286C6.78764 24.8748 6.92655 24.792 7.04533 24.685C7.16411 24.578 7.26044 24.4488 7.32881 24.3049L9.87397 18.9472H22.1262L24.6713 24.3049C24.7397 24.4488 24.8361 24.5779 24.9549 24.6849C25.0737 24.7918 25.2126 24.8746 25.3637 24.9284C25.5147 24.9822 25.675 25.006 25.8354 24.9985C25.9958 24.9909 26.1531 24.9522 26.2983 24.8844C26.4436 24.8167 26.5739 24.7213 26.682 24.6036C26.79 24.486 26.8735 24.3484 26.9279 24.1988C26.9822 24.0491 27.0062 23.8904 26.9986 23.7315C26.991 23.5727 26.9519 23.4169 26.8835 23.273L17.1061 2.69551C17.0074 2.48756 16.851 2.31173 16.6551 2.18856C16.4593 2.0654 16.2321 2 16.0001 2C15.7681 2 15.5409 2.0654 15.345 2.18856C15.1491 2.31173 14.9927 2.48756 14.894 2.69551L5.11669 23.273C5.04822 23.4169 5.00904 23.5727 5.00139 23.7315C4.99374 23.8904 5.01777 24.0492 5.07211 24.1988C5.12645 24.3485 5.21003 24.486 5.31807 24.6037C5.42612 24.7213 5.55651 24.8167 5.7018 24.8844ZM16.0001 6.05448L20.9758 16.5263H11.0243L16.0001 6.05448Z" fill="#0A1C38" fill-opacity="0.29"/>
+<rect opacity="0.4" x="4" y="27" width="24" height="4" rx="2" fill="#2576EF"/>
+</svg>

designer-chart/src/main/java/com/fr/design/chartx/data/DataLayoutHelper.java

@@ -1,15 +1,13 @@
 package com.fr.design.chartx.data;
 
+import com.fine.theme.utils.FineLayoutBuilder;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
-import java.util.Arrays;
 
 /**
  * @author shine
@@ -46,13 +44,7 @@ public class DataLayoutHelper {
     }
 
     public static JPanel createDataLayoutPane(Component[][] components) {
-        int len = components.length;
+        return FineLayoutBuilder.compatibleTableLayout(10, components, new double[] {1.2, 3});
-        double p = TableLayout.PREFERRED;
-        double[] columnSize = {DataLayoutHelper.LABEL_WIDTH, DataLayoutHelper.WIDTH};
-        double[] rowSize = new double[len];
-        Arrays.fill(rowSize, p);
-
-        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
     public static JPanel createDataLayoutPane(String label, Component component) {

designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java

@@ -2,7 +2,6 @@ package com.fr.design.chartx.single;
 
 import com.fr.chartx.data.CellDataDefinition;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 import com.fr.design.i18n.Toolkit;
 
@@ -24,7 +23,6 @@ public class CellDataPane extends FurtherBasicBeanPane<CellDataDefinition> {
 
         this.setLayout(new BorderLayout());
         this.add(cellDataFieldsPane, BorderLayout.CENTER);
-        DataLayoutHelper.addNormalBorder(this);
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java

@@ -48,7 +48,6 @@ public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
         this.setLayout(new BorderLayout(0, 6));
         this.add(northPane, BorderLayout.NORTH);
         this.add(dataSetFieldsPane, BorderLayout.CENTER);
-        DataLayoutHelper.addNormalBorder(this);
         checkBoxUse();
     }
 

designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java

@@ -46,7 +46,6 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
             protected void initLayout() {
                 this.setLayout(new BorderLayout(0, 6));
                 JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb);
-                DataLayoutHelper.addNormalBorder(northPane);
 
                 this.add(northPane, BorderLayout.NORTH);
                 this.add(cardPane, BorderLayout.CENTER);

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -79,7 +79,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
 
         isFixedWidth.addActionListener(e -> checkColumnWidth());
         isFillWithImage.addActionListener(e -> checkImagePane());
-        return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image"), borderPane, true);
+        return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane, true);
     }
 
     private void checkAll() {

designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java

@@ -5,6 +5,7 @@ import com.fanruan.fs.FileServer;
 import com.fanruan.fs.RepositoryFactory;
 import com.fanruan.fs.repository.local.LocalFileRepository;
 import com.fanruan.product.ProductConstants;
+import com.fr.decision.inject.node.impl.DecisionSystemInjectNode;
 import com.fr.design.ConfigHelper;
 import com.fanruan.boot.key.StartupArgsShell;
 import com.fanruan.carina.Carina;
@@ -223,7 +224,8 @@ public class DesignPreStartComponent {
         ConfigProviderFactory.getInstance().registerProvider(ConfigRealm.SHARE, new ShareConfigProviderImpl());
         ConfigProviderFactory.getInstance().registerProvider(ConfigRealm.PUBLIC, new PublicConfigProviderImpl());
         ConfigRepositoryFactory.getInstance().registerConfigRepositoryBuilder(new LocalConfigRepositoryBuilder(ConfigHelper.getBaseProperties(), ConfigHelper.BASE_PATH));
-
+        // 标识默认使用内置库
+        DecisionSystemInjectNode.KEY.registerSystemInjectInfo("startFromDesign", decisionInjectExtraInfoBuilder -> () -> true);
     }