Pull request #2501: REPORT-40001 【预定义样式】应该是我们修改某个样式，就显示在样式最前

Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0 * commit 'acbea7be36a984d23fcfa6cfdb1bc26f12330c0f': 代码修改代码修改 REPORT-40001 【预定义样式】应该是我们修改某个样式，就显示在样式最前 REPORT-35149 预定义样式优化及与图表统一
4 years ago · 20fca7f2b4
8 changed files with 110 additions and 33 deletions
--- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleEditPane.java
@ -28,6 +28,9 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;

 /**
 * Created by kerry on 2020-08-26
@ -245,7 +248,8 @@ public class PredefinedStyleEditPane extends AbstractAttrNoScrollPane {
            return false;
        }
        config.add(previewObject);
-        ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(config);
+        PredefinedStyleConfig sortedConfig = resortConfigStyles(previewObject, config);
+        ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(sortedConfig);
        selectPane.refreshPane();
        return true;
    }
@ -275,4 +279,28 @@ public class PredefinedStyleEditPane extends AbstractAttrNoScrollPane {
        return true;
    }

+    private PredefinedStyleConfig resortConfigStyles(PredefinedStyle priorityStyle, PredefinedStyleConfig config){
+        PredefinedStyleConfig sortedConfig = new PredefinedStyleConfig();
+        PredefinedStyle defaultStyle = config.getDefaultPredefinedStyle();
+        if (defaultStyle != null) {
+            sortedConfig.add(defaultStyle);
+            config.removeStyle(defaultStyle.getStyleName());
+            sortedConfig.setDefaultPredefinedStyle(defaultStyle.getStyleName());
+        }
+        if (priorityStyle != null && !priorityStyle.isDefaultStyle()) {
+            sortedConfig.add(priorityStyle);
+            config.removeStyle(priorityStyle.getStyleName());
+        }
+        Iterator<PredefinedStyle> iterator = config.getPredefinedStyleIterator();
+        while (iterator.hasNext()) {
+            PredefinedStyle entry = iterator.next();
+            sortedConfig.add(entry);
+        }
+        sortedConfig.setCompatibleStyleName(config.getCompatibleStyleName());
+        return sortedConfig;
+    }
+
+
+
+
 }
--- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/CellStyleListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/CellStyleListControlPane.java
@ -6,6 +6,7 @@ import com.fr.config.predefined.PredefinedCellStyle;
 import com.fr.config.predefined.PredefinedCellStyleConfig;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.NameInspector;
 import com.fr.design.gui.controlpane.JListControlPane;
@ -15,6 +16,8 @@ import com.fr.design.gui.controlpane.ShortCut4JControlPane;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.gui.style.AlignmentPane;
+import com.fr.design.gui.style.FormatPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.predefined.ui.detail.cell.CustomPredefinedStylePane;
@ -83,8 +86,16 @@ public class CellStyleListControlPane extends JListControlPane {

    @Override
    public NameableCreator[] createNameableCreators() {
-        return new NameableCreator[]{new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
-                PredefinedCellStyle.class, CustomPredefinedStylePane.class)};
+        return new NameableCreator[]{
+                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
+                        PredefinedCellStyle.class, CustomPredefinedStylePaneNoBorder.class) {
+                    @Override
+                    public boolean acceptDefaultNameObject(Object ob) {
+                        return ((PredefinedCellStyle) ob).isDefaultStyle();
+                    }
+                },
+                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
+                        PredefinedCellStyle.class, CustomPredefinedStylePane.class)};
    }

    @Override
@ -113,13 +124,45 @@ public class CellStyleListControlPane extends JListControlPane {

    protected ShortCut4JControlPane[] createShortcuts() {
        return new ShortCut4JControlPane[]{
-                shortCutFactory.addItemShortCut(),
+                createAddItemShortCut4JControlPane(),
                new RemoveItemShortCut4JControlPane(new RemoveItemAction())
        };
    }


-    public class RemoveItemShortCut4JControlPane extends ShortCut4JControlPane {
+    private static class CustomPredefinedStylePaneNoBorder extends CustomPredefinedStylePane {
+        @Override
+        protected List<BasicPane> initPaneList() {
+            paneList = new ArrayList<BasicPane>();
+            paneList.add(new FormatPane());
+            paneList.add(new AlignmentPane());
+            return paneList;
+        }
+
+    }
+
+
+    private ShortCut4JControlPane createAddItemShortCut4JControlPane (){
+        ShortCut shortCut =  shortCutFactory.createAddItemUpdateAction(new NameableCreator[]{
+                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
+                        PredefinedCellStyle.class, CustomPredefinedStylePane.class)});
+        return new AddItemShortCut4JControlPane(shortCut);
+    }
+
+    private class AddItemShortCut4JControlPane extends ShortCut4JControlPane{
+        AddItemShortCut4JControlPane(ShortCut shortCut) {
+            this.shortCut = shortCut;
+        }
+
+
+        @Override
+        public void checkEnable() {
+            this.shortCut.setEnabled(true);
+        }
+    }
+
+
+    private class RemoveItemShortCut4JControlPane extends ShortCut4JControlPane {
        RemoveItemShortCut4JControlPane(ShortCut shortCut) {
            this.shortCut = shortCut;
        }
@ -180,6 +223,25 @@ public class CellStyleListControlPane extends JListControlPane {
            }
            return null;
        }
+        /**
+         *
+         * @param ob
+         * @return
+         */
+        public Object acceptObject2Populate(Object ob) {
+            if (ob instanceof NameObject) {
+                ob = ((NameObject) ob).getObject();
+            }
+            if (clazzOfObject != null && clazzOfObject.isInstance(ob) && acceptDefaultNameObject(ob)) {
+                doSthChanged4Icon(ob);
+                return ob;
+            }
+            return null;
+        }
+
+        public boolean acceptDefaultNameObject(Object ob) {
+            return !((PredefinedCellStyle) ob).isDefaultStyle();
+        }
    }


--- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/cell/CustomPredefinedStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/cell/CustomPredefinedStylePane.java
@ -49,14 +49,6 @@ public class CustomPredefinedStylePane extends MultiTabPane<PredefinedCellStyle>
        tabPane.setLayout(new GridLayout(1, 3, 0, 0));
    }

-    public static CustomPredefinedStylePane createPredefinedStylePane() {
-        return new CustomPredefinedStylePane();
-    }
-
-    public static CustomPredefinedStylePane createDefaultPredefinedStylePane() {
-        return new CustomPredefinedStylePaneNoBorder();
-    }
-
    /**
     * @return
     */
@ -172,16 +164,7 @@ public class CustomPredefinedStylePane extends MultiTabPane<PredefinedCellStyle>
    }


-    private static class CustomPredefinedStylePaneNoBorder extends CustomPredefinedStylePane {
-        @Override
-        protected List<BasicPane> initPaneList() {
-            paneList = new ArrayList<BasicPane>();
-            paneList.add(new FormatPane());
-            paneList.add(new AlignmentPane());
-            return paneList;
-        }

-    }

    /**
     * 预览Style的面板
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@ -12,6 +12,7 @@ import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.designer.properties.items.FRFitConstraintsItems;
 import com.fr.design.designer.properties.items.FRLayoutTypeItems;
 import com.fr.design.designer.properties.items.Item;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
@ -194,11 +195,14 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
        try {
            if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
                WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
+                String predefinedName = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplatePredefinedStyle();
                wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
                Component[] components = xWFitLayout.getComponents();
                xWFitLayout.removeAll();
                layout.resetStyle();
+                layout.setNameBackground(NameFormBackground.createPredefinedStyle(predefinedName));
                XWAbsoluteBodyLayout xwAbsoluteBodyLayout = xWFitLayout.getBackupParent() == null ? new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0)) : (XWAbsoluteBodyLayout) xWFitLayout.getBackupParent();
+                xwAbsoluteBodyLayout.initWidgetPredefinedInfo(predefinedName);
                xWFitLayout.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
                for (Component component : components) {
                    XCreator xCreator = (XCreator) component;
--- a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
@ -11,7 +11,7 @@ import com.fr.grid.selection.Selection;
 import com.fr.log.FineLoggerFactory;
 import com.fr.privilege.finegrain.WidgetPrivilegeControl;
 import com.fr.report.cell.CellElement;
-import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.DefaultPredefinedTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.elementcase.TemplateElementCase;

@ -59,7 +59,7 @@ public class CellWidgetPropertyPane extends BasicPane {

    public void populate(TemplateCellElement cellElement) {
        if (cellElement == null) {// 利用默认的CellElement.
-            cellElement = new DefaultTemplateCellElement(0, 0, null);
+            cellElement = new DefaultPredefinedTemplateCellElement(0, 0, null);
        }

        Widget cellWidget = cellElement.getWidget();
@ -88,7 +88,7 @@ public class CellWidgetPropertyPane extends BasicPane {
        final TemplateElementCase tplEC = ePane.getEditingElementCase();
        TemplateCellElement editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
        if (editCellElement == null) {
-            editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+            editCellElement = new DefaultPredefinedTemplateCellElement(cs.getColumn(), cs.getRow());
        }
        this.cellElement = editCellElement;
        this.populate(editCellElement);
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/CellElementEditPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/CellElementEditPane.java
@ -14,7 +14,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.report.cell.CellElement;
-import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.DefaultPredefinedTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.elementcase.TemplateElementCase;

@ -112,7 +112,7 @@ public class CellElementEditPane extends BasicPane {

            CellElement cellElement = elementCase.getCellElement(cs.getColumn(), cs.getRow());
            if (cellElement == null) {
-                cellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+                cellElement = new DefaultPredefinedTemplateCellElement(cs.getColumn(), cs.getRow());
                //默认选中的是A1单元格，所以若是A1单元格没有加到列表时要加上，否则在聚合报表时会出错
                if (cs.isSelectedOneCell(elementCasePane) && (cs.getColumn() + cs.getRow() == 0)) {
                    elementCase.addCellElement((TemplateCellElement) cellElement);
--- a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java
+++ b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java
@ -12,7 +12,7 @@ import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.CellElement;
-import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.DefaultPredefinedTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.highlight.DefaultHighlight;
 import com.fr.report.cell.cellattr.highlight.Highlight;
@ -82,7 +82,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 		final TemplateElementCase tplEC = ePane.getEditingElementCase();
 		editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
 		if (editCellElement == null) {
-			editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+			editCellElement = new DefaultPredefinedTemplateCellElement(cs.getColumn(), cs.getRow());
 		}

 		SheetUtils.calculateDefaultParent(tplEC);  // 不知道这行代码的作用，怕去掉之后会出问题，先放在这里
--- a/designer-realize/src/main/java/com/fr/grid/Grid.java
+++ b/designer-realize/src/main/java/com/fr/grid/Grid.java
@ -28,7 +28,7 @@ import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.report.ReportHelper;
 import com.fr.report.cell.CellElement;
-import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.DefaultPredefinedTemplateCellElement;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellGUIAttr;
@ -865,7 +865,7 @@ public class Grid extends BaseGridComponent {
        }
        // 必须保证editingCellElement不是null。
        if (editingCellElement == null) {
-            editingCellElement = new DefaultTemplateCellElement(column, row);
+            editingCellElement = new DefaultPredefinedTemplateCellElement(column, row);
        }
        editorComponent = getCellEditingComp();
        if (editorComponent == null) {
@ -1029,7 +1029,7 @@ public class Grid extends BaseGridComponent {
        }
        // 必须保证editingCellElement不是null。
        if (editingCellElement == null) {
-            editingCellElement = new DefaultTemplateCellElement(editingColumn, editingRow);
+            editingCellElement = new DefaultPredefinedTemplateCellElement(editingColumn, editingRow);
            tplEC.addCellElement(editingCellElement);
        }
        if (setValue4EditingElement(newValue)) {
@ -1455,4 +1455,4 @@ public class Grid extends BaseGridComponent {
        this.paginateLineShowType = paginateLineShowType;
        this.getElementCasePane().repaint();
    }
-}
+}