Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x

designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@@ -12,6 +12,7 @@ import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 
 /**
@@ -44,10 +45,14 @@ public class CellStylePreviewPane extends JPanel {
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         g.clearRect(0, 0, getWidth(), getHeight());
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
         paintTransparentBackground(g2d, style);
-
         paintCellStyle(g2d, style);
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
     }
 
     private void paintTransparentBackground(Graphics2D g2d, Style style) {

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

@@ -119,12 +119,7 @@ public class JDBCDefPane extends JPanel {
             driverManageLabel.setVisible(selectSelfDefine);
             driverLoaderBox.setVisible(selectSelfDefine);
             driverComboBox.setVisible(!selectSelfDefine);
-            // 选中自定义的话，将odbc的屏蔽，选中默认的话，重新触发一次driverComboBox的事件
+            odbcTipsLink.setVisible(driverComboBox.isVisible() && ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem()));
-            if (selectSelfDefine) {
-                odbcTipsLink.setVisible(false);
-            } else {
-                driverComboBox.setSelectedItem(driverComboBox.getSelectedItem());
-            }
         }
     };
     ActionListener dbtypeActionListener = new ActionListener() {

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

@@ -399,7 +399,10 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver, UIOb
      * @param l
      */
     public void removeChangeListener(ChangeListener l) {
-        this.listenerList.remove(ChangeListener.class, l);
+        for (int i = 0; i < labelButtonList.size(); i++) {
+            labelButtonList.get(i).removeChangeListener(l);
+            listenerList.remove(ChangeListener.class, l);
+        }
     }
 
 

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -12,8 +12,10 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.ChartHyperEditPane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.vanchart.VanChart;
 
 import java.util.HashMap;
 import java.awt.BorderLayout;
@@ -70,7 +72,14 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
         ChartProvider chart = ChartTypeManager.getInstanceWithCheck().getFirstChart();
         if (chart != null) {
             try {
-                cc.addChart((ChartProvider) chart.clone());
+                ChartProvider clone = (ChartProvider) chart.clone();
+                if (!ChartEditContext.supportTheme() && clone instanceof VanChart) {
+                    //主题中有的属性 界面上屏蔽不跟随主题 属性全部设置成自定义
+                    ((VanChart) clone).setThemeCustom();
+//            //主题中没有的 根据主题深浅色自动 的属性 默认自动
+//            ((VanChart) chart4Update).setAutoThemeCustom();
+                }
+                cc.addChart(clone);
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -29,8 +29,6 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.util.ArrayList;
-import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -42,6 +40,8 @@ import java.awt.LayoutManager;
 import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 public class UIColorPickerPane extends BasicPane implements UIObserver {
 	private static final int MARGIN_TOP = 7;
@@ -696,14 +696,18 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 		fillStyleCombox.setSelectObject(mainColor);
 		designTypeButtonGroup.setSelectedIndex(hotAreaColor.getUseType());
 
-		double value = (double) hotAreaColor.getAreaNumber();
+        int value = hotAreaColor.getAreaNumber();
 		UIColorPickerPane.this.add(textGroup);
 		UIColorPickerPane.this.add(colorGroup);
 		Color[] colors = hotAreaColor.initColor();
 		BaseFormula[] values = hotAreaColor.initValues();
+        if (value != colors.length && hotAreaColor.getUseType() == MapHotAreaColor.CUSTOM) {
+            colors = getColorArray(mainColor, value);
+            values = getValueArray(value);
+        }
 		refreshGroupPane(colors, values);
 		this.initContainerLister();
-		regionNumPane.populateBean(value);
+        regionNumPane.populateBean((double) value);
 		refreshPane();
 	}
 

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java

@@ -1,9 +1,11 @@
 package com.fr.van.chart.custom.component;
 
+import com.fr.chart.base.ChartThemeStyleProvider;
 import com.fr.chart.chartattr.Chart;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -265,6 +267,13 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
                 //设置公共属性
                 setCommonAttr(vanChartPlot, customPlot);
 
+                if (!ChartEditContext.supportTheme()) {
+                    //主题中有的属性 界面上屏蔽不跟随主题 属性全部设置成自定义
+                    setThemeCustom(vanChartPlot);
+//            //主题中没有的 根据主题深浅色自动 的属性 默认自动
+//            ((VanChart) chart4Update).setAutoThemeCustom();
+                }
+
                 newCustomPlotList.add(vanChartPlot);
             }
         }
@@ -272,6 +281,14 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
         customPlot.setCustomPlotList(newCustomPlotList);
     }
 
+    private void setThemeCustom(VanChartPlot customPlot) {
+        List<ChartThemeStyleProvider> chartThemeStyleProviders = new ArrayList<>();
+        customPlot.getChartPreStyleProvider(chartThemeStyleProviders);
+        for (ChartThemeStyleProvider chartThemeStyleProvider : chartThemeStyleProviders) {
+            chartThemeStyleProvider.setThemeCustom();
+        }
+    }
+
     private void setCommonAttr(VanChartPlot vanChartPlot, VanChartCustomPlot customPlot) {
         //坐标轴公共属性
         dealAxisAttr(vanChartPlot, customPlot);

designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java

@@ -145,6 +145,12 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
             chart.setPlot(cloneOldPlot2New(oldPlot, newPlot));
             resetChartAttr4SamePlot(chart);
             ChartInfoCollector.getInstance().updateChartMiniType(chart);
+            if (!ChartEditContext.supportTheme()) {
+                //主题中有的属性 界面上屏蔽不跟随主题 属性全部设置成自定义
+                chart.setThemeCustom();
+//            //主题中没有的 根据主题深浅色自动 的属性 默认自动
+//            ((VanChart) chart4Update).setAutoThemeCustom();
+            }
         } else if (!samePlot) {
             //不同的图表类型切換
             resetChartAttr(chart, newPlot);

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/AbstractOnlineWidgetShowPane.java

@@ -130,11 +130,11 @@ public abstract class AbstractOnlineWidgetShowPane extends JPanel {
             this.mainCardLayout.show(mainCenterPane, MAIN_FILTER_TAB_PANE);
             return;
         }
-        List<OnlineShareWidget> widgets = new ArrayList<>();
+        List<OnlineShareWidget> searchedWidgetList = new ArrayList<>();
         if (StringUtils.isNotEmpty(text)) {
             for (OnlineShareWidget provider : sharableWidgetProviders) {
                 if (provider.getName().toLowerCase().contains(text)) {
-                    widgets.add(provider);
+                    searchedWidgetList.add(provider);
                 }
             }
         }
@@ -142,7 +142,7 @@ public abstract class AbstractOnlineWidgetShowPane extends JPanel {
         if (searchResultShowPane != null) {
             mainCenterPane.remove(searchResultShowPane);
         }
-        searchResultShowPane = manualCreateOnlineWidgetSelectPane(sharableWidgetProviders);
+        searchResultShowPane = manualCreateOnlineWidgetSelectPane(searchedWidgetList.toArray(new OnlineShareWidget[]{}));
         this.mainCenterPane.add(searchResultShowPane, SEARCH_RESULT_PANE);
         this.mainCardLayout.show(mainCenterPane, SEARCH_RESULT_PANE);
         this.validate();