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

# Conflicts:
#	designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

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

@@ -10,9 +10,11 @@ import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
+import com.fr.design.utils.LoadingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
 
@@ -31,7 +33,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     private static final long serialVersionUID = 1L;
     private JTemplate<?, ?> component;
     private TransparentPane transparentPane = new TransparentPane();
-    private OpenLoadingPane loadingPane = new OpenLoadingPane();
+    private JPanel loadingPane = LoadingUtils.createLoadingPane();
     private OpenFailedPane failedPane = new OpenFailedPane();
     private JLayeredPane layeredPane = new JLayeredPane() {
         @Override

designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java

@@ -1,35 +1,29 @@
-package com.fr.design.mainframe;
+package com.fr.design.utils;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.IOUtils;
+
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.LayoutManager;
-import javax.swing.ImageIcon;
-import javax.swing.JPanel;
-
-/**
- * @author hades
- * @version 10.0
- * Created by hades on 2021/4/9
- */
-public class OpenLoadingPane extends JPanel {
 
-    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/openloading.png"));
+public class LoadingUtils {
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.png"));
     private static final Color TIP_COLOR = new Color(108, 174, 235);
     private static final int Y_GAP = 50;
     private static final int X_GAP = 10;
 
-    private UILabel loadingLabel;
-    private UILabel tipLabel;
-
-    public OpenLoadingPane() {
-
-        setLayout(new LayoutManager() {
-
+    public static JPanel createLoadingPane() {
+        JPanel jPanel = new JPanel();
+        UILabel loadingLabel = new UILabel(LOADING_ICON);
+        UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Loading"));
+        tipLabel.setForeground(TIP_COLOR);
+        jPanel.setLayout(new LayoutManager() {
             @Override
             public void removeLayoutComponent(Component comp) {
             }
@@ -64,12 +58,10 @@ public class OpenLoadingPane extends JPanel {
             public void addLayoutComponent(String name, Component comp) {
             }
         });
-        setBackground(Color.WHITE);
-        loadingLabel = new UILabel(LOADING_ICON);
-        tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading"));
-        tipLabel.setForeground(TIP_COLOR);
-        add(loadingLabel);
-        add(tipLabel);
 
+        jPanel.setBackground(Color.WHITE);
+        jPanel.add(loadingLabel);
+        jPanel.add(tipLabel);
+        return jPanel;
     }
-}
+}

designer-form/src/main/java/com/fr/design/mainframe/share/util/ShareComponentUtils.java

@@ -8,14 +8,11 @@ import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.FormSelection;
-import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.bean.ShareLayoutWidget;
 import com.fr.form.share.constants.ComponentPath;
 import com.fr.form.ui.Widget;
-import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
@@ -38,9 +35,7 @@ public class ShareComponentUtils {
     public static XCreator createXCreator(Widget creatorSource, String shareId, SharableWidgetProvider provider) {
 
         XCreator xCreator;
-        if (creatorSource instanceof WCardMainBorderLayout) {
-            xCreator = XCreatorUtils.createXCreator(creatorSource, new Dimension(500, 300));
-        } else if (creatorSource instanceof ShareLayoutWidget) {
+        if (creatorSource instanceof ShareLayoutWidget) {
             xCreator = XCreatorUtils.createXCreator(((ShareLayoutWidget) creatorSource).getWidget(), new Dimension(provider.getWidth(), provider.getHeight()));
         } else {
             xCreator = XCreatorUtils.createXCreator(creatorSource, new Dimension(provider.getWidth(), provider.getHeight()));

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

@@ -13,11 +13,9 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.xpane.LayoutStylePane;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.accessibles.AccessibleBodyWatermarkEditor;
-import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.form.ui.LayoutBorderStyle;
@@ -25,7 +23,6 @@ import com.fr.form.ui.container.WAbsoluteBodyLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
-import com.fr.general.act.BorderPacker;
 import com.fr.report.core.ReportUtils;
 
 import javax.swing.BorderFactory;
@@ -134,7 +131,8 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
         layoutCombox.setSelectedIndex(1);
         stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
         boundPane.populate();
-        watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplate(getCurrentIOFile()));
+        //从全局读取水印
+        watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplateAndGlobal(getCurrentIOFile()));
     }
 
     public WAbsoluteBodyLayout updateSubPane() {

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

@@ -162,6 +162,7 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
         adaptComboBox.setSelectedIndex(ob.getCompState());
         componentIntervel.setValue(ob.getCompInterval());
         stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
+        //从全局读取水印
         watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplateAndGlobal(getCurrentIOFile()));
     }
 

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -834,7 +834,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                         //显示set和tip
                         setCardPane.setPreferredSize(new Dimension(156, 20));
                         TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP);
-                        tipCardPane.setPreferredSize(new Dimension(224, 40));
+                        tipCardPane.setPreferredSize(new Dimension(224, 50));
                         TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER);
                     } else {
                         //未定义
@@ -958,7 +958,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                                     //显示set和tip
                                     setCardPane.setPreferredSize(new Dimension(156, 20));
                                     TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP);
-                                    tipCardPane.setPreferredSize(new Dimension(224, 40));
+                                    tipCardPane.setPreferredSize(new Dimension(224, 50));
                                     TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER);
                                     break;
                                 case EVEN: