Merge pull request #1835 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '82ee6ddab09276b771a98fa301f92267f07b90c7':
  CHART-14664 宽度定长
  CHART-12123 图表预定义配色
  REPORT-34994 移动端表格折叠树接口(单元格属性设置接口)-设计器部分  ,表单报表块也需要这个配置
  REPORT-34994 移动端表格折叠树接口(单元格属性设置接口)-设计器部分

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

@@ -0,0 +1,23 @@
+package com.fr.design.cell;
+
+import com.fr.design.designer.TargetComponent;
+import com.fr.design.dialog.BasicPane;
+
+import javax.swing.JPanel;
+
+/**
+ * @author zack
+ * @version 10.0
+ * Created by zack on 2020/7/14
+ */
+public abstract class AbstractCellElementPropertyPane extends BasicPane implements CellElementPropertyComponent {
+    @Override
+    public JPanel toPanel() {
+        return this;
+    }
+
+    @Override
+    public boolean accept(TargetComponent tc) {
+        return true;
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.fr.design.cell;
+
+import com.fr.design.designer.TargetComponent;
+
+import javax.swing.JPanel;
+
+/**
+ * 单元格属性配置面板接口
+ * @author zack
+ * @version 10.0
+ * Created by zack on 2020/7/14
+ */
+public interface CellElementPropertyComponent {
+
+    /**
+     * 判断当前编辑的对象是否显示当前实现
+     * @param tc
+     * @return
+     */
+    boolean accept(TargetComponent tc);
+
+    /**
+     * 加载数据
+     * @param tc
+     */
+    void populate(TargetComponent tc);
+
+    /**
+     * 返回当前属性面板,默认返回this
+     * @return
+     */
+    JPanel toPanel();
+
+}

designer-base/src/main/java/com/fr/design/fun/CellAttributeProvider.java

@@ -4,8 +4,10 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.stable.fun.mark.Immutable;
 
 /**
+ * 单元格属性面板扩展接口,接口基本逻辑不通且不符合接口设计规范,单元格属性扩展可以使用CellPropertyPaneProvider
  * Created by zhouping on 2015/11/11.
  */
+@Deprecated
 public interface CellAttributeProvider extends Immutable{
     String MARK_STRING = "CellAttributeProvider";
 

designer-base/src/main/java/com/fr/design/fun/CellPropertyPaneProvider.java

@@ -0,0 +1,18 @@
+package com.fr.design.fun;
+
+import com.fr.design.cell.CellElementPropertyComponent;
+
+/**
+ * 单元格设置(属性)扩展接口
+ * @author zack
+ * @version 10.0
+ * Created by zack on 2020/7/14
+ */
+public interface CellPropertyPaneProvider extends PropertyItemPaneProvider {
+
+    /**
+     * 构造单元格属性面板,面板实现需要使用单例模式实现
+     * @return 面板类
+     */
+    CellElementPropertyComponent getSingletonCelPropertyPane();
+}

designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellPropertyPaneProvider.java

@@ -0,0 +1,15 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.CellPropertyPaneProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by zhouping on 2015/11/11.
+ */
+@API(level = CellPropertyPaneProvider.CURRENT_LEVEL)
+public abstract class AbstractCellPropertyPaneProvider extends AbstractPropertyItemPaneProvider implements CellPropertyPaneProvider {
+
+    public int currentAPILevel() {
+        return CellPropertyPaneProvider.CURRENT_LEVEL;
+    }
+}

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

@@ -227,8 +227,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     itemBean.getEnableModes());
         UIButton button = propertyItem.getButton();
         List<ActionListener> buttonListeners = itemBean.getButtonListeners();
-        for (ActionListener buttonListener : buttonListeners) {
+        if (buttonListeners != null) {
-            button.addActionListener(buttonListener);
+            for (ActionListener buttonListener : buttonListeners) {
+                button.addActionListener(buttonListener);
+            }
         }
         propertyItemMap.put(key, propertyItem);
 

designer-chart/src/main/java/com/fr/design/chartx/component/combobox/ColorSchemeComboBox.java

@@ -52,7 +52,7 @@ public class ColorSchemeComboBox extends UIComboBox {
         this.setRenderer(new ColorSchemeCellRenderer());
     }
 
-    private Map<String, ColorInfo> getColorSchemesFromConfig() {
+    protected Map<String, ColorInfo> getColorSchemesFromConfig() {
         Map<String, ColorInfo> colorSchemes = new LinkedHashMap<>();
         ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
 
@@ -92,7 +92,14 @@ public class ColorSchemeComboBox extends UIComboBox {
     }
 
     public void refresh() {
-        this.colorSchemes = getColorSchemesFromConfig();
+        refresh(null);
+    }
+
+    public void refresh(Map<String, ColorInfo> colorSchemes) {
+        if (colorSchemes == null) {
+            colorSchemes = getColorSchemesFromConfig();
+        }
+        this.colorSchemes = colorSchemes;
         this.setModel(new DefaultComboBoxModel(colorSchemes.keySet().toArray()));
     }
 
@@ -149,7 +156,7 @@ public class ColorSchemeComboBox extends UIComboBox {
         return colorSchemes.keySet();
     }
 
-    public class ColorInfo {
+    public static class ColorInfo {
 
         private List<Color> colors;
 

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java

@@ -0,0 +1,142 @@
+package com.fr.design.module;
+
+import com.fr.base.ChartColorMatching;
+import com.fr.base.ChartPreStyleConfig;
+import com.fr.base.Utils;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.controlpane.JListControlPane;
+import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.controlpane.ShortCut4JControlPane;
+import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.menu.ShortCut;
+import com.fr.general.NameObject;
+import com.fr.stable.Nameable;
+
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-07-08
+ */
+public class ChartPreStyleListPane extends JListControlPane {
+
+    ChartPreStyleManagerPane chartPreStyleManagerPane;
+
+    public ChartPreStyleListPane(ChartPreStyleManagerPane chartPreStyleManagerPane) {
+        super();
+        this.chartPreStyleManagerPane = chartPreStyleManagerPane;
+        initListener();
+    }
+
+    /**
+     * 创建有名字的creator
+     *
+     * @return 有名字的creator数组
+     */
+    @Override
+    public NameableCreator[] createNameableCreators() {
+        return new NameableCreator[]{
+                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle_Duplicate"),
+                        ChartColorMatching.class, ChartPreStylePane.class)
+        };
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle");
+    }
+
+    @Override
+    public BasicBeanPane createPaneByCreators(NameableCreator creator) {
+        return new ChartPreStylePane() {
+            @Override
+            protected void refreshWhenStyleChange(ChartColorMatching preStyle) {
+                super.refreshWhenStyleChange(preStyle);
+                chartPreStyleManagerPane.refreshDefaultColorBox();
+            }
+        };
+    }
+
+
+    protected ShortCut4JControlPane[] createShortcuts() {
+        return new ShortCut4JControlPane[]{
+                shortCutFactory.addItemShortCut(),
+                createRemoveItemShortCut(),
+                shortCutFactory.copyItemShortCut(),
+                shortCutFactory.moveUpItemShortCut(),
+                shortCutFactory.moveDownItemShortCut(),
+                shortCutFactory.sortItemShortCut()
+        };
+    }
+
+    private ShortCut4JControlPane createRemoveItemShortCut() {
+        ShortCut4JControlPane shortCut4JControlPane = shortCutFactory.removeItemShortCut();
+        //替换删除按钮的check事件。
+        ShortCut shortCut = shortCut4JControlPane.getShortCut();
+        shortCut4JControlPane = new MoreThanOneShortCut(shortCut);
+        return shortCut4JControlPane;
+    }
+
+    public void initListener() {
+        nameableList.addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                chartPreStyleManagerPane.refreshDefaultColorBox();
+            }
+        });
+        nameableList.addModNameActionListener(new ModNameActionListener() {
+            @Override
+            public void nameModed(int index, String oldName, String newName) {
+                chartPreStyleManagerPane.refreshDefaultColorBox(oldName, newName);
+            }
+        });
+    }
+
+    public void populateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance().mirror();
+        ArrayList list = new ArrayList();
+
+        Iterator keys = config.names();
+        while (keys.hasNext()) {
+            Object key = keys.next();
+            ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key);
+
+            list.add(new NameObject(Utils.objectToString(key), value));
+        }
+
+        Nameable[] values = (Nameable[]) list.toArray(new Nameable[list.size()]);
+        populate(values);
+
+        if (config.containsName(config.getCurrentStyle())) {
+            this.setSelectedName(config.getCurrentStyle());
+        }
+    }
+
+    public void updateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+
+        Nameable[] values = update();
+        config.clearAllPreStyle();
+
+        for (Nameable value : values) {
+            config.putPreStyle(value.getName(), ((NameObject) value).getObject());
+        }
+    }
+
+    private class MoreThanOneShortCut extends ShortCut4JControlPane {
+        public MoreThanOneShortCut(ShortCut shortCut) {
+            this.shortCut = shortCut;
+        }
+
+
+        @Override
+        public void checkEnable() {
+            this.shortCut.setEnabled(nameableList.getModel().getSize() > 1);
+        }
+    }
+}

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java

@@ -2,72 +2,114 @@ package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.Utils;
+import com.fr.design.chartx.component.combobox.ColorSchemeComboBox;
-import com.fr.design.gui.controlpane.JListControlPane;
+import com.fr.design.dialog.BasicPane;
-import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
 import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
-import java.util.ArrayList;
+import javax.swing.JPanel;
 import java.util.Iterator;
-
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 /**
  * 图表预定义管理 界面, 在工具栏-服务器管理中.
+ *
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2013-8-21 下午02:33:48
  */
-public class ChartPreStyleManagerPane extends JListControlPane {
+public class ChartPreStyleManagerPane extends BasicPane {
-
+
-	@Override
+    private ColorSchemeComboBox defaultColorBox;
-    /**
+
-     * 创建有名字的creator
+    private ChartPreStyleListPane chartPreStyleListPane;
-     * @return 有名字的creator数组
+
-     */
+    public ChartPreStyleManagerPane() {
-	public NameableCreator[] createNameableCreators() {
+        initComponent();
-		return new NameableCreator[]{
+    }
-				new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle_Duplicate"),
+
-						ChartColorMatching.class, ChartPreStylePane.class)
+    private void initComponent() {
-		};
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-	}
+        JPanel colorBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-
+
-	@Override
+        chartPreStyleListPane = new ChartPreStyleListPane(this);
-	protected String title4PopupWindow() {
+
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle");
+        initDefaultColorBox();
-	}
+        colorBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Match_Default_Color_Scheme") + "："));
-	
+        colorBoxPane.add(defaultColorBox);
-	public void populateBean() {
+
-		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance().mirror();
+        this.add(colorBoxPane, BorderLayout.NORTH);
-		ArrayList list = new ArrayList();
+        this.add(chartPreStyleListPane, BorderLayout.CENTER);
-		
+    }
-		Iterator keys = config.names();
+
-		while(keys.hasNext()) {
+    private void initDefaultColorBox() {
-			Object key = keys.next();
+        Map<String, ColorSchemeComboBox.ColorInfo> colorSchemes = new LinkedHashMap<>();
-			ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key);
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
-
+        Iterator names = config.names();
-			list.add(new NameObject(Utils.objectToString(key), value));
+        while (names.hasNext()) {
-		}
+            Object key = names.next();
-		
+            ColorSchemeComboBox.ColorInfo colorInfo = new ColorSchemeComboBox.ColorInfo();
-		Nameable[] values = (Nameable[])list.toArray(new Nameable[list.size()]);
+            ChartColorMatching colorMatching = (ChartColorMatching) config.getPreStyle(key);
-		populate(values);
+            colorInfo.setGradient(colorMatching.getGradient());
-		
+            colorInfo.setColors(colorMatching.getColorList());
-		if(config.containsName(config.getCurrentStyle())) {
+            colorSchemes.put(colorMatching.getId(), colorInfo);
-			this.setSelectedName(config.getCurrentStyle());
+        }
-		}
+        defaultColorBox = new ColorSchemeComboBox(colorSchemes);
-	}
+        defaultColorBox.setPreferredSize(new Dimension(TableLayout4VanChartHelper.EDIT_AREA_WIDTH, 20));
-	
+    }
-	public void updateBean() {
+
-		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+    private void refreshColorSchemes() {
-
+        Nameable[] nameables = chartPreStyleListPane.update();
-		config.setCurrentStyle(getSelectedName());
+        Map<String, ColorSchemeComboBox.ColorInfo> colorSchemes = new LinkedHashMap<>();
-
+        for (Nameable value : nameables) {
-		Nameable[] values = update();
+            String name = value.getName();
-		config.clearAllPreStyle();
+            ChartColorMatching colorMatching = (ChartColorMatching) ((NameObject) value).getObject();
-
+            ColorSchemeComboBox.ColorInfo colorInfo = new ColorSchemeComboBox.ColorInfo();
-		for (Nameable value : values) {
+            colorInfo.setGradient(colorMatching.getGradient());
-			config.putPreStyle(value.getName(), ((NameObject) value).getObject());
+            colorInfo.setColors(colorMatching.getColorList());
-		}
+            colorSchemes.put(name, colorInfo);
-	}
+        }
+        defaultColorBox.refresh(colorSchemes);
+    }
+
+    public void refreshDefaultColorBox() {
+        Object selectedItem = defaultColorBox.getSelectedItem();
+        refreshColorSchemes();
+        defaultColorBox.setSelectedItem(selectedItem);
+    }
+
+    public void refreshDefaultColorBox(String oldName, String newName) {
+        Object selectedItem = defaultColorBox.getSelectedItem();
+        if (ComparatorUtils.equals(selectedItem, oldName)) {
+            selectedItem = newName;
+        }
+        refreshColorSchemes();
+        defaultColorBox.setSelectedItem(selectedItem);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Report_ServerM_Predefined_Styles");
+    }
+
+    public void populateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+        String currentStyle = config.getCurrentStyle();
+        defaultColorBox.setSelectedItem(currentStyle);
+        chartPreStyleListPane.populateBean();
+    }
 
+    public void updateBean() {
+        ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+        config.setCurrentStyle(GeneralUtils.objectToString(defaultColorBox.getSelectedItem()));
+        chartPreStyleListPane.updateBean();
+    }
 }

designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java

@@ -80,7 +80,7 @@ public class ChartPreStylePane extends BasicBeanPane<ChartColorMatching> {
 		}
 	}
 
-	private void refreshWhenStyleChange(ChartColorMatching preStyle) {
+	protected void refreshWhenStyleChange(ChartColorMatching preStyle) {
 		if(chartComponent != null) {
 			demoPlot.setPlotFillStyle(ChartUtils.chartColorMatching2AttrFillStyle(preStyle));
 			chartComponent.reset();

designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java

@@ -4,9 +4,13 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.cell.CellElementPropertyComponent;
 import com.fr.design.fun.BackgroundQuickUIProvider;
 import com.fr.design.fun.CellAttributeProvider;
+import com.fr.design.fun.CellPropertyPaneProvider;
 import com.fr.design.fun.PresentKindProvider;
+import com.fr.design.fun.PropertyItemPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itabpane.TitleChangeListener;
@@ -31,6 +35,7 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.util.Set;
 
 
 /**
@@ -156,6 +161,7 @@ public class CellElementPropertyPane extends DockingView {
              return;
          }
          ePane.getSelection().populatePropertyPane(ePane);
+         populateExtraCellProperties(ePane);
     }
 
     @Override
@@ -188,5 +194,29 @@ public class CellElementPropertyPane extends DockingView {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
+    private void populateExtraCellProperties(ElementCasePane ePane) {
+        if (ePane == null) {
+            return;
+        }
+        Selection selection = ePane.getSelection();
+        if (selection instanceof CellSelection) {
+            //单元格属性,限定下是选中单个单元格
+            TemplateElementCase elementCase = ePane.getEditingElementCase();
+            if (elementCase != null) {
+                Set<PropertyItemPaneProvider> itemPaneProviders = ExtraDesignClassManager.getInstance().getArray(PropertyItemPaneProvider.XML_TAG);
+                if (itemPaneProviders != null) {
+                    for (PropertyItemPaneProvider itemPaneProvider : itemPaneProviders) {
+                        if(itemPaneProvider instanceof CellPropertyPaneProvider){
+                            CellPropertyPaneProvider cellPropertyPaneProvider = (CellPropertyPaneProvider) itemPaneProvider;
+                            CellElementPropertyComponent cellElementPropertyPane = cellPropertyPaneProvider.getSingletonCelPropertyPane();
+                            if (cellElementPropertyPane != null && cellElementPropertyPane.accept(ePane)) {
+                                cellElementPropertyPane.populate(ePane);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 
 }

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java

@@ -28,7 +28,6 @@ import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.selection.SelectionEvent;
 import com.fr.design.selection.SelectionListener;
-
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.page.ReportSettingsProvider;
@@ -82,6 +81,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         }
         CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         // 模板初始化完成后，才能初始化超级链接面板