Pull request #2726: 解决冲突

Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit 'e409a634aff5404f573393575df59569f65be827':
  整理轴标签界面create方法
  CHART-15902 完善轴标签属性
  REPORT-41855 【设计器】保留布局下图表修改选中全屏设置效果，设计器的保存按钮依然置灰 【问题原因】在不勾选body移动端属性-手机重布局时，如果修改body内的图表块的移动端属性，会造成这边的npe，体现在设计器中就是保存按钮不被触发 【改动思路】增加npe判断
  CHART-16112 富文本标记器browser在初次打开时清理缓存
  CHART-15902 分类轴标签显示方式界面
  REPORT-41299 新建错误数据集无法删除-转meiao 【问题原因】如果建立了错误的数据集，并将数据集展开查看列名时，删除其中一个会造成cTreeNode.getFirstChild()产生异常，从而不能更新界面，看起来就是删除不掉 【改动思路】增加判断cTreeNode是否是错误数据集并处于展开状态，如果是的，将展开状态置为不展开，并break跳过后面检查子节点的逻辑，避免异常

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

@@ -113,6 +113,11 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                         break;
                     }
                     new_nodes[ci].setExpanded(cTreeNode.isExpanded());
+                    // REPORT-41299 如果建立的是错误的数据集(没有Child的情况)且这个错误数据集处于isExpanded状态，会在后面的if语句中调用getFirstChild()产生异常，因此这里判断一下
+                    if (cTreeNode.isExpanded() && cTreeNode.getChildCount() == 0) {
+                        new_nodes[ci].setExpanded(false);
+                        break;
+                    }
                     if (cTreeNode.getFirstChild() instanceof ExpandMutableTreeNode && cTreeNode.isExpanded()) {
                         checkChildNodes(cTreeNode, new_nodes[ci]);
                     }
@@ -242,4 +247,4 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
 
         treeModel.reload(root);
     }
-}
+}

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

@@ -38,6 +38,7 @@ public class VanChartRichEditorPane {
                 .prepare(new ScriptContextAdapter() {
                     public void onScriptContextCreated(ScriptContextEvent event) {
                         browser = event.getBrowser();
+                        browser.getCacheStorage().clearCache();
 
                         JSValue ns = browser.executeJavaScriptAndReturnValue("window." + namespace);
                         ns.asObject().setProperty(variable, model);

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -35,6 +35,7 @@ import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartHtmlLabelPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.axis.component.AxisLabelDisplayComboBox;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -67,6 +68,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected ChartTextAttrPane labelTextAttrPane;
     protected UINumberDragPane labelTextRotation;
 
+    private AxisLabelDisplayComboBox labelDisplayComboBox;
+
     //轴标签缩略间隔显示 恢复用注释。下面6行删除。
     protected UITextField labelGapValue;
 
@@ -76,8 +79,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     //protected UISpinner labelGapValue;
 
     protected JPanel labelPanel;
+    private JPanel labelGapPane;
     private JPanel labelGapStylePane;
     private JPanel labelGapValuePane;
+    private JPanel labelDisplayPane;
 
     protected LineComboBox axisLineStyle;
     protected ColorSelectBoxWithPreStyle axisLineColor;
@@ -117,6 +122,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         this.add(createContentPane(isXAxis), BorderLayout.CENTER);
     }
 
+    protected boolean showLabelDisplay() {
+        return true;
+    }
+
     protected JPanel createContentPane(boolean isXAxis) {
 
         double p = TableLayout.PREFERRED;
@@ -128,7 +137,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         double[] rowSize = {p, p, p, p, p, p, p, p};
         Component[][] components = new Component[][]{
                 new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null},
-                new Component[]{createLabelPane(new double[]{p, p}, column), null},
+                new Component[]{createLabelPane(new double[]{p, p, p}, column), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
                 new Component[]{createDisplayStrategy(), null},
@@ -143,7 +152,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane();
         titleAlignPane.setSelectedItem(Constants.CENTER);
         titleContent = new TinyFormulaPane();
-        titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
+        titleUseHtml = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Html"));
         UIComponentUtils.setLineWrap(titleUseHtml);
         titleTextAttrPane = getChartTextAttrPane();
         titleTextRotation = new UINumberDragPane(-ROTATION_MAX, ROTATION_MAX);
@@ -154,12 +163,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         }
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), titleContent},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content")), titleContent},
                 new Component[]{null, titleUseHtml},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), titleAlignPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), titleAlignPane},
                 new Component[]{titleTextAttrPane, null},
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
                         UIComponentUtils.wrapWithBorderLayoutPane(titleTextRotation)
                 },
         };
@@ -200,54 +209,95 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected JPanel createLabelPane(double[] row, double[] col) {
-        showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")});
-        labelTextAttrPane = getChartTextAttrPane();
+        initLabelComponents();
+
+        labelGapPane = createLabelGapPane(row, col);
+        labelPanel = createLabelDetailPanel();
+
+        addComponentsListener();
+
+        JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label"), showLabel);
+
+        JPanel labelPane = new JPanel(new BorderLayout());
+        labelPane.add(showLabelPane, BorderLayout.NORTH);
+        labelPane.add(labelPanel, BorderLayout.CENTER);
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_LABEL_TITLE, labelPane);
+    }
+
+    private void initLabelComponents() {
+        showLabel = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")});
 
+        labelDisplayComboBox = new AxisLabelDisplayComboBox();
+        labelDisplayPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show"), labelDisplayComboBox);
+        labelDisplayPane.setVisible(showLabelDisplay());
+
+        labelTextAttrPane = getChartTextAttrPane();
         labelTextRotation = new UINumberDragPane(-ROTATION_MAX, ROTATION_MAX);
-        labelGapStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")});
+        labelGapStyle = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Automatic"), Toolkit.i18nText("Fine-Design_Chart_Fixed")});
         labelGapValue = new UITextField();
+    }
+
+    private JPanel createLabelGapPane(double[] row, double[] col) {
         Component[][] gapComponents = new Component[][]{
+                new Component[]{null, null},
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
                         UIComponentUtils.wrapWithBorderLayoutPane(labelTextRotation)
                 },
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelGapStyle},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelGapStyle}
         };
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(gapComponents, row, col);
-        labelGapValuePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText(""), labelGapValue, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-        JPanel gapPanel = new JPanel(new BorderLayout());
-        gapPanel.add(panel, BorderLayout.CENTER);
-        gapPanel.add(labelGapValuePane, BorderLayout.SOUTH);
 
-        Component[][] components = new Component[][]{
-                new Component[]{labelTextAttrPane, null},
-                new Component[]{gapPanel, null},
-        };
+        JPanel gapDetailPane = TableLayout4VanChartHelper.createGapTableLayoutPane(gapComponents, row, col);
+        labelGapValuePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText(""), labelGapValue, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(gapDetailPane, BorderLayout.CENTER);
+        panel.add(labelGapValuePane, BorderLayout.SOUTH);
+
+        return panel;
+    }
+
+    private JPanel createLabelDetailPanel() {
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+
+        panel.add(labelDisplayPane, BorderLayout.NORTH);
+        panel.add(labelTextAttrPane, BorderLayout.CENTER);
+        panel.add(labelGapPane, BorderLayout.SOUTH);
 
-        JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"), showLabel);
-        labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        labelPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+        return panel;
+    }
+
+    private void addComponentsListener() {
+        // 显示/隐藏
         showLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 checkLabelPane();
             }
         });
+
+        // 间隔/缩略/换行
+        labelDisplayComboBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkLabelGapPane();
+            }
+        });
+
+        // 自动/固定
         labelGapStyle.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 checkLabelGapValuePane();
             }
         });
-        JPanel jPanel = new JPanel(new BorderLayout());
-        jPanel.add(showLabelPane, BorderLayout.NORTH);
-        jPanel.add(labelPanel, BorderLayout.CENTER);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_LABEL_TITLE, jPanel);
     }
 
 //    protected JPanel createLabelPane(double[] row, double[] col){
 //        double p = TableLayout.PREFERRED;
-//        showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")});
+//        showLabel = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")});
 //        labelTextAttrPane = getChartTextAttrPane();
 //
 //        JPanel rotationPane = createLabelRotationPane(col);
@@ -260,7 +310,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 //                new Component[]{overlapPane, null},
 //        };
 //
-//        JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"),showLabel);
+//        JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label"),showLabel);
 //        labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, new double[]{p, p, p}, col);
 //        labelPanel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0));
 //        showLabel.addActionListener(new ActionListener() {
@@ -280,7 +330,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
         Component[][] gapComponents = new Component[][]{
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_TextRotation")),
                         UIComponentUtils.wrapWithBorderLayoutPane(labelTextRotation)
                 }
         };
@@ -338,13 +388,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected JPanel createLineStylePane(double[] row, double[] col) {
         axisLineStyle = createLineComboBox();
         axisLineColor = new ColorSelectBoxWithPreStyle(100);
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")};
+        String[] strings = new String[]{Toolkit.i18nText("Fine-Design_Chart_Open"), Toolkit.i18nText("Fine-Design_Chart_Close")};
         AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE};
         mainTick = new UIButtonGroup<AxisTickLineType>(strings, values);
         secondTick = new UIButtonGroup<AxisTickLineType>(strings, values);
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLineStylePaneComponents(), row, col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Line_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Axis_Line_Style"), panel);
     }
 
     protected LineComboBox createLineComboBox() {
@@ -354,34 +404,34 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected Component[][] getLineStylePaneComponents() {
         return new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
                 new Component[]{axisLineColor, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")), mainTick},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")), secondTick},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")), mainTick},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")), secondTick},
         };
     }
 
     protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis) {
         position = new UIButtonGroup<Integer>(getAxisPositionNameArray(isXAxis), getAxisPositionValueArray(isXAxis));
-        reversed = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
+        reversed = new UIButtonGroup<Boolean>(new String[]{Toolkit.i18nText("Fine-Design_Chart_On"), Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),
                         UIComponentUtils.wrapWithBorderLayoutPane(position)
                 },
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")), reversed},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_AxisReversed")), reversed},
         };
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel);
     }
 
     private String[] getAxisPositionNameArray(boolean isXAxis) {
         if (isXAxis) {
-            return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")};
+            return new String[]{Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")};
         } else {
-            return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")};
+            return new String[]{Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")};
         }
     }
 
@@ -396,10 +446,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected JPanel createDisplayStrategy() {
         //区域显示策略 恢复用注释。删除到return，即除了注释的代码都删除。
         maxProportion = new UISpinner(0, 100, 1, 30);
-        axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});
+        axisLimitSize = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Limit"), Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});
 
-        JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Size"), axisLimitSize);
-        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"), maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Area_Size"), axisLimitSize);
+        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"), maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
         maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         JPanel panel = new JPanel(new BorderLayout());
         panel.add(limitSizePane, BorderLayout.NORTH);
@@ -412,7 +462,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             }
         });
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel);
 
         //区域显示策略 恢复用注释。取消注释。
 //        limitPane = new LimitPane();
@@ -420,8 +470,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected JPanel createValueStylePane() {
-        valueFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        valueFormatStyle = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Common"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")});
 
         valueFormat = createFormatPane();
         checkFormatType();
@@ -429,8 +479,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         htmlLabelPane = new VanChartHtmlLabelPane();
 
         centerPane = new JPanel(new CardLayout());
-        centerPane.add(valueFormat, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
-        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
+        centerPane.add(valueFormat, Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPane.add(htmlLabelPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -438,7 +488,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         double[] rowSize = {p, p, p};
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format"), SwingConstants.LEFT), valueFormatStyle},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format"), SwingConstants.LEFT), valueFormatStyle},
                 new Component[]{null, centerPane},
         };
         JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
@@ -451,7 +501,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             }
         });
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane);
     }
 
     protected FormatPane createFormatPane() {
@@ -473,6 +523,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected void checkAllUse() {
         checkCardPane();
         checkLabelPane();
+        checkLabelGapPane();
         checkTitlePane();
         //区域显示策略 恢复用注释。删除下面一行。
         checkMaxProPortionUse();
@@ -495,9 +546,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         if (centerPane != null && valueFormatStyle != null) {
             CardLayout cardLayout = (CardLayout) centerPane.getLayout();
             if (valueFormatStyle.getSelectedIndex() == 1) {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
+                cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
             } else {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+                cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Common"));
             }
         }
     }
@@ -532,6 +583,16 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         checkLabelGapValuePane();
     }
 
+    protected void checkLabelGapPane() {
+        boolean visible = true;
+
+        if (showLabelDisplay() && labelDisplayPane != null && labelDisplayComboBox != null) {
+            visible = labelDisplayComboBox.getSelectedIndex() == 0;
+        }
+
+        labelGapPane.setVisible(visible);
+    }
+
     protected void checkLabelGapValuePane() {
         if (labelGapValuePane != null && labelGapStyle != null) {
             boolean visible = labelGapStyle.getSelectedIndex() == 1;
@@ -561,7 +622,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Axis");
+        return Toolkit.i18nText("Fine-Design_Chart_Category_Axis");
     }
 
     /**
@@ -632,6 +693,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 //        if (overlapHandleTypeGroup != null) {
 //            overlapHandleTypeGroup.setSelectedItem(axis.getOverlapHandleType());
 //        }
+        if (labelDisplayComboBox != null) {
+            labelDisplayComboBox.populateBean(axis.getLabelDisplay());
+        }
         if (labelGapStyle != null) {
             labelGapStyle.setSelectedIndex(axis.isAutoLabelGap() ? 0 : 1);
         }
@@ -768,6 +832,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 //        if (overlapHandleTypeGroup != null) {
 //            axis.setOverlapHandleType(overlapHandleTypeGroup.getSelectedItem());
 //        }
+        if (labelDisplayComboBox != null) {
+            axis.setLabelDisplay(labelDisplayComboBox.updateBean());
+        }
         if (labelGapStyle != null) {
             axis.setAutoLabelGap(labelGapStyle.getSelectedIndex() == 0);
         }

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java

@@ -12,6 +12,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.style.FormatPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -69,7 +70,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
         double[] rowSize = {p,p,p,p,p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{createTitlePane(new double[]{p, p, p, p, p,p}, column, isXAxis),null},
-                new Component[]{createLabelPane(new double[]{p, p}, column),null},
+                new Component[]{createLabelPane(new double[]{p, p, p}, column),null},
                 new Component[]{createValueDefinition(),null},
                 new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis),null},
@@ -80,6 +81,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
+    protected boolean showLabelDisplay() {
+        return false;
+    }
+
     @Override
     protected void addOverlapGroupButton(JPanel panel) {
         //do nothing
@@ -87,7 +92,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
     private JPanel createValueDefinition(){
         timeMinMaxValuePane = new TimeMinMaxValuePane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), timeMinMaxValuePane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), timeMinMaxValuePane);
     }
 
     @Override
@@ -127,7 +132,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TimeAxis");
+        return Toolkit.i18nText("Fine-Design_Chart_TimeAxis");
     }
 
     private class TimeMinMaxValuePane extends JPanel{
@@ -174,10 +179,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
             secTickPane.add(secondUnitField);
             secTickPane.add(secondType);
 
-            minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-            maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-            mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-            secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+            minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+            maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+            mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+            secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
 
             minPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
             maxPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
@@ -208,10 +213,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initMin() {
             // 最小值.
-            minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value"));
+            minCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value"));
             Date tmp = null;
-            DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
-            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
+            DateEditor dateEditor = new DateEditor(tmp, true, Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
+            Editor formulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Chart_Formula"));
             Editor[] editor = new Editor[]{dateEditor, formulaEditor};
             minValueField = new ValueEditorPane(editor);
             minCheckBox.addActionListener(new ActionListener() {
@@ -223,10 +228,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initMax() {
             // 最大值
-            maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
+            maxCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
             Date tmp = null;
-            DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
-            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
+            DateEditor dateEditor = new DateEditor(tmp, true, Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
+            Editor formulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Chart_Formula"));
             Editor[] editor = new Editor[]{dateEditor, formulaEditor};
             maxValueField = new ValueEditorPane(editor);
             maxCheckBox.addActionListener(new ActionListener() {
@@ -238,7 +243,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initMain() {
             // 主要刻度单位
-            mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Type"));
+            mainTickBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Type"));
             mainUnitField = new UITextField();
             mainUnitField.setPreferredSize(new Dimension(20, 20));
             mainType = new UIComboBox(TYPES);
@@ -254,7 +259,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initSecond() {
             // 次要刻度单位
-            secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Type"));
+            secondTickBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Type"));
             secondUnitField = new UITextField();
             secondUnitField.setPreferredSize(new Dimension(20, 20));
             secondType = new UIComboBox(TYPES);

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java

@@ -5,6 +5,7 @@ import com.fr.chart.base.ChartBaseUtils;
 import com.fr.design.chart.ChartSwingUtils;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
@@ -50,7 +51,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
         double[] rowSize = {p,p,p,p,p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null},
-                new Component[]{createLabelPane(new double[]{p, p}, column), null},
+                new Component[]{createLabelPane(new double[]{p, p, p}, column), null},
                 new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
@@ -61,6 +62,10 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
+    protected boolean showLabelDisplay() {
+        return false;
+    }
+
     @Override
     protected void addOverlapGroupButton(JPanel panel) {
         //do nothing
@@ -68,12 +73,12 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
 
     protected JPanel createMinMaxValuePane(double[] row, double[] col){
         JPanel panel = createCommenValuePane(row,col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), panel);
     }
     protected JPanel createCommenValuePane(double[] row, double[] col){
         initMinMaxValuePane();
 
-        logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_LogBase_Value"));
+        logBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Custom_LogBase_Value"));
         logBaseField = new UITextField();
         logBox.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -87,7 +92,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
 //        logPane.add(logBaseField);
 
 
-        logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Log_Base_Value"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Log_Base_Value"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
 
         logPane.setBorder(BorderFactory.createEmptyBorder(0, TableLayout4VanChartHelper.COMPONENT_INTERVAL, 0, 0));
 
@@ -125,7 +130,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Axis");
+        return Toolkit.i18nText("Fine-Design_Chart_Value_Axis");
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/AxisLabelDisplayComboBox.java

@@ -0,0 +1,48 @@
+package com.fr.van.chart.designer.style.axis.component;
+
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.type.AxisLabelDisplay;
+
+public class AxisLabelDisplayComboBox extends UIComboBox {
+
+    public static final String[] DISPLAY_ITEM_GROUP = {
+            Toolkit.i18nText("Fine-Design_Chart_Label_OverlapInterval"),
+            Toolkit.i18nText("Fine-Design_Chart_Label_OverlapAbbreviate"),
+            Toolkit.i18nText("Fine-Design_Chart_Label_OverlapMulti_Line")
+    };
+
+    public static final AxisLabelDisplay[] DISPLAY_TYPE_GROUP = {
+            AxisLabelDisplay.INTERVAL,
+            AxisLabelDisplay.ELLIPSIS,
+            AxisLabelDisplay.MULTI_LINE
+    };
+
+    public AxisLabelDisplayComboBox() {
+        super(DISPLAY_ITEM_GROUP);
+        setSelectedIndex(0);
+    }
+
+    public void reset() {
+        this.setSelectedItem(DISPLAY_ITEM_GROUP[0]);
+    }
+
+    public void populateBean(AxisLabelDisplay type) {
+        for (int i = 0; i < DISPLAY_TYPE_GROUP.length; i++) {
+            if (type != null && type == DISPLAY_TYPE_GROUP[i]) {
+                setSelectedIndex(i);
+                break;
+            }
+        }
+    }
+
+    public AxisLabelDisplay updateBean() {
+        int selectIndex = getSelectedIndex();
+
+        if (selectIndex >= 0 && selectIndex < DISPLAY_TYPE_GROUP.length) {
+            return DISPLAY_TYPE_GROUP[selectIndex];
+        }
+
+        return null;
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.designer.style.axis.radar;
 
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 
@@ -29,7 +30,7 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane {
         double[] column = {f, s};
         double[] rowSize = {p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{createLabelPane(new double[]{p, p}, column),null},
+                new Component[]{createLabelPane(new double[]{p, p, p}, column),null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p}, columnSize),null},
                 new Component[]{createValueStylePane(),null},
         };
@@ -37,10 +38,14 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane {
         return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
     }
 
+    protected boolean showLabelDisplay() {
+        return false;
+    }
+
     protected Component[][] getLineStylePaneComponents() {
         return new Component[][]{
                 new Component[]{null,null} ,
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")),axisLineStyle} ,
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
                 new Component[]{axisLineColor, null},
         };
     }

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java

@@ -3,9 +3,9 @@ package com.fr.van.chart.designer.style.axis.radar;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.axis.VanChartValueAxis;
 import com.fr.stable.CoreConstants;
@@ -41,7 +41,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
         double[] column = {f, s};
         double[] rowSize = {p, p, p, p, p, p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{createLabelPane(new double[]{p, p}, column), null},
+                new Component[]{createLabelPane(new double[]{p, p, p}, column), null},
                 new Component[]{createMinMaxValuePane(new double[]{p, p, p}, columnSize), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p}, columnSize), null},
                 new Component[]{createValueStylePane(), null},
@@ -61,15 +61,15 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
 
-        valueStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")});
+        valueStyle = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"),
+                Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")});
 
         JPanel commenPane = createCommenValuePane(new double[]{p, p, p}, columnSize);
         tableDataPane = new RadarTableDataPane();
 
         centerPane = new JPanel(new CardLayout());
-        centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"));
-        centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified"));
+        centerPane.add(commenPane, Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"));
+        centerPane.add(tableDataPane, Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified"));
 
         JPanel contentPane = new JPanel(new BorderLayout());
         contentPane.add(valueStyle, BorderLayout.NORTH);
@@ -81,15 +81,15 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
             }
         });
 
-        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), contentPane);
-        contentPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
+        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), contentPane);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
         return panel;
     }
 
     protected Component[][] getLineStylePaneComponents() {
         return new Component[][]{
-                new Component[]{null,null} ,
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
                 new Component[]{axisLineColor, null},
         };
     }
@@ -102,9 +102,9 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
         if (centerPane != null && valueStyle != null) {
             CardLayout cardLayout = (CardLayout) centerPane.getLayout();
             if (valueStyle.getSelectedIndex() == 0) {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"));
+                cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"));
             } else {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified"));
+                cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified"));
             }
         }
     }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -228,10 +228,13 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
             mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected());
             mobileAttr.setFunctionalWhenUnactivated(!functionalWhenUnactivatedCheckBox.isSelected());
         }
-        MobileCollapsedStyle style = this.mobileCollapsedStyleEditor.getStyle();
-        if (style != null) {
-            ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style);
-            style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
+        // 在不勾选body移动端属性-手机重布局时，如果修改body内的图表块的移动端属性，会造成这边的npe，因此加个判断
+        if (this.mobileCollapsedStyleEditor != null) {
+            MobileCollapsedStyle style = this.mobileCollapsedStyleEditor.getStyle();
+            if (style != null) {
+                ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style);
+                style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
+            }
         }
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }