Merge branch 'release/11.0' of https://code.fineres.com/scm/~vito/c-design into release/11.0

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -91,6 +91,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private static final String VERSION100 = "100";
     private static final int CACHINGTEMPLATE_LIMIT = 5;
     private static final String WEB_NAME = "webapps";
+    public static final int LAYOUT_TEMPLATE_SIMPLE_STYLE = 0;
+    public static final int LAYOUT_TEMPLATE_REAL_STYLE = 1;
     /**
      * 指定默认工作空间
      */
@@ -205,6 +207,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private boolean showTemplateMissingPlugin = true;
 
+    private int layoutTemplateStyle = LAYOUT_TEMPLATE_SIMPLE_STYLE;
+
     /**
      * DesignerEnvManager.
      */
@@ -1691,6 +1695,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.openDebug = openDebug;
     }
 
+    public int getLayoutTemplateStyle() {
+        return layoutTemplateStyle;
+    }
+
+    public void setLayoutTemplateStyle(int layoutTemplateStyle) {
+        this.layoutTemplateStyle = layoutTemplateStyle;
+    }
+
     /**
      * Read XML.<br>
      * The method will be invoked when read data from XML file.<br>
@@ -1861,6 +1873,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
         this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
         this.setShowServerDatasetAuthTip(reader.getAttrAsBoolean("showServerDatasetAuthTip", true));
+        this.setLayoutTemplateStyle(reader.getAttrAsInt("layoutTemplateStyle", LAYOUT_TEMPLATE_SIMPLE_STYLE));
     }
 
     private void readReportPaneAttributions(XMLableReader reader) {
@@ -2134,6 +2147,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (!this.isShowTemplateMissingPlugin()) {
             writer.attr("showTemplateMissingPlugin", this.isShowTemplateMissingPlugin());
         }
+        writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle());
         writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip());
         writer.end();
     }

designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@@ -88,7 +88,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
             }
 
             protected void renameConnection(final String oldName, final String newName) {
-                tableDataConfig.renameTableData(oldName, newName);
                 StrategyEventsNotifier.modifyDataSet(DSMapping.ofServerDS(new DsNameTarget(oldName)));
             }
         };

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

@@ -251,7 +251,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
         try {
             WorkContext.getCurrent().get(TableDataOperator.class).saveTableData(tableDataBeans);
             if (!WorkContext.getCurrent().isLocal()) {
-                EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.class.getSimpleName());
+                EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.getInstance().getNameSpace());
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);

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

@@ -182,7 +182,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         try {
             WorkContext.getCurrent().get(ConnectionOperator.class).saveConnection(connectionBeans);
             if (!WorkContext.getCurrent().isLocal()) {
-                EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.class.getSimpleName());
+                EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.getInstance().getNameSpace());
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -197,11 +197,6 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                 ConnectionConfig cloned = connectionConfig.mirror();
                 populate(cloned);
             }
-
-            @Override
-            protected void renameConnection(String oldName, String newName) {
-                connectionConfig.renameConnection(oldName, newName);
-            }
         };
         final BasicDialog connectionListDialog = connectionManagerPane.showLargeWindow(parent, null);
         connectionListDialog.addDialogActionListener(new ConnectionListDialogActionAdapter(connectionManagerPane, connectionListDialog, connectionConfig));

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECReportPreviewPane.java

@@ -49,7 +49,7 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
 
         public PreviewPane() {
             this.setPreferredSize(new Dimension(517, 270));
-            this.setBorder(BorderFactory.createEmptyBorder(7, 10, 5, 10));
+            this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
 
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             JPanel northPane = createNorthPane();

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java

@@ -68,7 +68,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
     public FRFitLayoutAdapter(XLayoutContainer container) {
         super(container);
         initMinSize();
-        this.frLayoutState = new FRNoFixLayoutAdapter(this, container, minHeight);
+        this.frLayoutState = new FRNoFixLayoutAdapter(this, container, minWidth, minHeight, actualVal);
         painter = this.frLayoutState.getPainter();
     }
 
@@ -151,13 +151,6 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
         //如果当前处于边缘地带, 那么就把他贴到父容器上
         boolean isMatchEdge = matchEdge(x, y);
 
-        int componentHeight = comp.getHeight();
-        int componentWidth = comp.getWidth();
-        //上半部分高度
-        int upHeight = (int) (componentHeight * TOP_HALF) + comp.getY();
-        //下半部分高度
-        int downHeight = (int) (componentHeight * BOTTOM_HALF) + comp.getY();
-
         //布局控件要先判断是不是可编辑
         XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator) comp).getTopLayout();
         boolean access = topLayout != null && !isMatchEdge && !topLayout.acceptType(XWAbsoluteLayout.class) && !isExtraContainer(comp) && !topLayout.isDragInAble();
@@ -167,17 +160,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
             return false;
         }
 
-        if (isCrossPointArea(comp, x, y)) {
+        return this.frLayoutState.accept(creator, x, y);
-            return canAcceptWhileCrossPoint(comp, x, y);
-        }
-
-        if (isTrisectionArea(comp, x, y)) {
-            return canAcceptWhileTrisection(comp, x, y);
-        }
-
-        boolean horizonValid = componentWidth >= minWidth * 2 + actualVal;
-        boolean verticalValid = componentHeight >= minHeight * 2 + actualVal;
-        return y > upHeight && y < downHeight ? horizonValid : verticalValid;
     }
 
     private boolean isExtraContainer(Component comp) {

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRNoFixLayoutAdapter.java

@@ -12,13 +12,20 @@ import java.awt.Component;
 import java.util.ArrayList;
 
 public class FRNoFixLayoutAdapter extends AbstractLayoutAdapter {
-    private int minHeight;
+    private static final double TOP_HALF = 0.25;
-    private FRBodyLayoutAdapter parentLayoutAdapter;
+    private static final double BOTTOM_HALF = 0.75;
+    private final int minWidth;
+    private final int minHeight;
+    private final int actualVal;
+    private final FRBodyLayoutAdapter parentLayoutAdapter;
 
-    public FRNoFixLayoutAdapter(FRBodyLayoutAdapter parentLayoutAdapter, XLayoutContainer container, int minHeight) {
+
+    public FRNoFixLayoutAdapter(FRBodyLayoutAdapter parentLayoutAdapter, XLayoutContainer container, int minWidth, int minHeight, int actualVal) {
         super(container);
         this.parentLayoutAdapter = parentLayoutAdapter;
+        this.minWidth = minWidth;
         this.minHeight = minHeight;
+        this.actualVal = actualVal;
     }
 
     @Override
@@ -79,7 +86,7 @@ public class FRNoFixLayoutAdapter extends AbstractLayoutAdapter {
     public void delete(XCreator creator, int creatorWidth, int creatorHeight) {
         int x = creator.getX();
         int y = creator.getY();
-        ((FRFitLayoutAdapter)parentLayoutAdapter).recalculateChildrenSize(x, y, creatorWidth, creatorHeight, true);
+        ((FRFitLayoutAdapter) parentLayoutAdapter).recalculateChildrenSize(x, y, creatorWidth, creatorHeight, true);
     }
 
 
@@ -100,7 +107,33 @@ public class FRNoFixLayoutAdapter extends AbstractLayoutAdapter {
 
     @Override
     public boolean accept(XCreator creator, int x, int y) {
-        return true;
+        Component comp = container.getComponentAt(x, y);
+        if (comp == null || checkInterval(comp)) {
+            return false;
+        }
+        int componentHeight = comp.getHeight();
+        int componentWidth = comp.getWidth();
+        //上半部分高度
+        int upHeight = (int) (componentHeight * TOP_HALF) + comp.getY();
+        //下半部分高度
+        int downHeight = (int) (componentHeight * BOTTOM_HALF) + comp.getY();
+
+        if (parentLayoutAdapter.isCrossPointArea(comp, x, y)) {
+            return parentLayoutAdapter.canAcceptWhileCrossPoint(comp, x, y);
+        }
+
+        if (parentLayoutAdapter.isTrisectionArea(comp, x, y)) {
+            return parentLayoutAdapter.canAcceptWhileTrisection(comp, x, y);
+        }
+
+        boolean horizonValid = componentWidth >= minWidth * 2 + actualVal;
+        boolean verticalValid = componentHeight >= minHeight * 2 + actualVal;
+        return y > upHeight && y < downHeight ? horizonValid : verticalValid;
+    }
+
+    // 间隔区域
+    private boolean checkInterval(Component comp) {
+        return container.getComponentCount() > 0 && comp == container;
     }
 
     @Override

designer-form/src/main/java/com/fr/design/designer/beans/painters/FRFixLayoutPainter.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer.beans.painters;
 
-import com.fr.design.designer.beans.painters.AbstractPainter;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XOccupiedLayout;
@@ -36,8 +35,8 @@ public class FRFixLayoutPainter extends AbstractPainter {
     @Override
     public void paint(Graphics g, int startX, int startY) {
         super.paint(g, startX, startY);
-        int x = hotspot.x - hotspot_bounds.x;
+        int x = hotspot.x - hotspot_bounds.x ;
-        int y = hotspot.y - hotspot_bounds.y;
+        int y = hotspot.y - hotspot_bounds.y ;
         Component currentComp = container.getComponentAt(x, y);
         if (currentComp == null) {
             return;
@@ -50,7 +49,8 @@ public class FRFixLayoutPainter extends AbstractPainter {
             } else if (!((XCreator) currentComp).acceptType(XOccupiedLayout.class)) {
                 state = OperateState.COMPONENT_REPLACE;
             }
-            state.paint(g, creator.getBackupRectangle(), currentComp.getBounds(), new Rectangle(x, y, creator.initEditorSize().width, ((XCreator) currentComp).initEditorSize().height));
+            Rectangle currentCompRec = new Rectangle(currentComp.getX() - startX, currentComp.getY() - startY, currentComp.getWidth(), currentComp.getHeight());
+            state.paint(g, creator.getBackupRectangle(), currentCompRec, new Rectangle(x, y, creator.initEditorSize().width, ((XCreator) currentComp).initEditorSize().height));
         } else {
             Color bColor = XCreatorConstants.LAYOUT_FORBIDDEN_COLOR;
             int[] hot_rec = new int[]{x, y, 0, 0};

designer-form/src/main/java/com/fr/design/designer/beans/painters/FROccupiedLayoutPainter.java

@@ -40,11 +40,11 @@ public class FROccupiedLayoutPainter extends AbstractPainter {
             Composite backupComposite = g2d.getComposite();
             g2d.setColor(XCreatorConstants.DRAG_IN_OCCUPIED_LAYOUT_COLOR);
             g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.05f));
-            g2d.fillRect(container.getX(), container.getY(), container.getWidth(), container.getHeight());
+            g2d.fillRect(container.getX() - startX, container.getY() - startY, container.getWidth(), container.getHeight());
 
             g2d.setStroke(XCreatorConstants.DASH_STROKE);
             g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.2f));
-            g2d.drawRect(container.getX() + 1, container.getY() + 1, container.getWidth() - 2, container.getHeight() - 2);
+            g2d.drawRect(container.getX() - startX + 1, container.getY() - startY + 1, container.getWidth() - 2, container.getHeight() - 2);
             g2d.setStroke(backupStroke);
             g2d.setComposite(backupComposite);
             g2d.setColor(backupColor);

designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

@@ -886,6 +886,7 @@ public class XWFitLayout extends XLayoutContainer {
 		isRefreshing = true;
 		this.remove(oldCreator);
 		this.add(newCreator);
+		dealDirections(newCreator, false);
 		//对于新增的绝对布局的组件，需要更新下内部组件的大小
 		if (newCreator.acceptType(XWAbsoluteLayout.class)){
 			((XWAbsoluteLayout) newCreator).updateBoundsWidget();

designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

@@ -25,7 +25,6 @@ import com.fr.stable.Constants;
 
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
 import javax.swing.plaf.ComponentUI;
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -114,14 +113,8 @@ public class FormDesignerUI extends ComponentUI {
         if (designer.getPainter() != null) {
             // ComponentAdapter和LayoutAdapter提供的额外的Painter，该Painter一般用于提示作用，
             // 相当于一个浮动层, 要考虑参数面板的高度
-            new SwingWorker<Void, Void>() {
+            designer.getPainter().paint(g, designer.getArea().getHorizontalValue(),
-                @Override
+                    designer.getArea().getVerticalValue() + designer.getParaHeight());
-                protected Void doInBackground() throws Exception {
-                    designer.getPainter().paint(g, designer.getArea().getHorizontalValue(),
-                                                designer.getArea().getVerticalValue() + designer.getParaHeight());
-                    return null;
-                }
-            }.execute();
         }
         AddingModel addingModel = designer.getAddingModel();
 

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

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.base.iofile.attr.TemplateLayoutIdAttrMark;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.border.UITitledMatteBorder;
 import com.fr.design.designer.beans.PredefinedLayout;
 import com.fr.design.designer.beans.models.NewFormModel;
@@ -187,17 +188,14 @@ public class NewFormPane extends BasicPane {
                 Toolkit.i18nText("Fine-Design_Real_Style_Template")
         });
         buttonGroup.setPreferredSize(new Dimension(140, 20));
-        buttonGroup.setSelectedIndex(1);
+        buttonGroup.setSelectedIndex(DesignerEnvManager.getEnvManager().getLayoutTemplateStyle());
         buttonGroup.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
                 int selectedIndex = buttonGroup.getSelectedIndex();
                 for (PredefinedLayoutPane layoutCard : layoutCards) {
-                    if (selectedIndex == 1) {
+                    DesignerEnvManager.getEnvManager().setLayoutTemplateStyle(selectedIndex);
-                        layoutCard.showRealStyle();
+                    layoutCard.showCard();
-                    } else {
-                        layoutCard.showSimpleStyle();
-                    }
                 }
             }
         });

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

@@ -2,6 +2,7 @@ package com.fr.design.widget.ui.designer;
 
 import com.fr.base.GraphHelper;
 import com.fr.base.svg.IconUtils;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.designer.beans.PredefinedLayout;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.share.ui.base.MouseClickListener;
@@ -40,6 +41,7 @@ public class PredefinedLayoutPane extends JPanel {
         this.add(simpleStyle, 1);
         this.setPreferredSize(new Dimension(235, 134));
         this.initListener();
+        this.showCard();
     }
 
     protected void initListener() {
@@ -84,6 +86,14 @@ public class PredefinedLayoutPane extends JPanel {
         this.clickListener = clickListener;
     }
 
+    public void showCard() {
+        if (DesignerEnvManager.getEnvManager().getLayoutTemplateStyle() == DesignerEnvManager.LAYOUT_TEMPLATE_SIMPLE_STYLE) {
+            showSimpleStyle();
+        } else if (DesignerEnvManager.getEnvManager().getLayoutTemplateStyle() == DesignerEnvManager.LAYOUT_TEMPLATE_REAL_STYLE) {
+            showRealStyle();
+        }
+    }
+
     public void showSimpleStyle() {
         cardLayout.last(this);
     }