Merge remote-tracking branch 'origin/fbp/release' into fbp/release

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

@@ -22,6 +22,7 @@ import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -69,8 +70,9 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 
 		// 显示double,date类;渲染date类
 		dataJTable.setDefaultRenderer(Double.class, new DoubleRenderer());
-		dataJTable.setDefaultRenderer(Date.class, new FineTableHeaderUI.TableRenderer());
+		dataJTable.setDefaultRenderer(Date.class, new DateRenderer());
-		dataJTable.setDefaultRenderer(Integer.class, new DateRenderer());
+		dataJTable.setDefaultRenderer(Integer.class, new DoubleRenderer());
+		dataJTable.setDefaultRenderer(Number.class, new DoubleRenderer());
 		dataJTable.setDefaultEditor(Date.class, new DateEditor(new UIDatePicker(UIDatePicker.STYLE_CN_DATE1)));
 		tableStructureChanged();
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -190,7 +190,8 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
         radiusPane = initRadiusPane();
         UILabel label = FRWidgetFactory.createLineWrapLabel(title);
         Component[][] components = new Component[][]{
-                new Component[]{label, radiusPane},
+                new Component[]{label, radiusPane.getRadiusType()},
+                new Component[]{null, radiusPane.getCardPane()},
         };
         radiusPaneWithTitle = FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3});
         return ((VanChartPlot) plot).isInCustom() ? null : radiusPaneWithTitle;

designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java

@@ -83,6 +83,14 @@ public class RadiusCardLayoutPane extends BasicBeanPane<Plot> {
 
     }
 
+    public UIButtonGroup getRadiusType() {
+        return radiusType;
+    }
+
+    public VanChartCardLayoutPane getCardPane() {
+        return cardPane;
+    }
+
     @Override
     protected String title4PopupWindow() {
         return null;
@@ -97,6 +105,7 @@ public class RadiusCardLayoutPane extends BasicBeanPane<Plot> {
             radius.setValue(vanChartRadius.getRadius());
             //设置card显示界面
             cardPane.updatePane(radiusType.getSelectedIndex() == 0 ? "auto" : "fixed");
+            cardPane.setVisible(radiusType.getSelectedIndex() != 0);
         }
     }
 
@@ -108,6 +117,7 @@ public class RadiusCardLayoutPane extends BasicBeanPane<Plot> {
             vanChartRadius.setRadiusType(radiusType.getSelectedIndex() == 0 ? RadiusType.AUTO : RadiusType.FIXED);
             vanChartRadius.setRadius((int) radius.getValue());
             cardPane.updatePane(radiusType.getSelectedIndex() == 0 ? "auto" : "fixed");
+            cardPane.setVisible(radiusType.getSelectedIndex() != 0);
         }
     }