Merge pull request #5928 in DESIGN/design from final/10.0 to persist/10.0

* commit 'fe51aad700c5ce34caa0717146ada2f90c1aed75': (43 commits) REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题 REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白 REPORT-55377 更新Tomcat版本到8.5.69 CHART-20642 图表预定义配色避免重名和空字符串名 REPORT-59189 导出-导出事件-导出模板选cptx会出问题 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-58301 【决策报表】布局切换以后，body背景样式不保留 REPORT-58252 报表块单元格行列标识去掉后的弥补方案 REPORT-58626 新自适应-报表块-旧模板设为横向自适应，切换成新模板后图片背景不见了 REPORT-58252 报表块单元格行列标识去掉后的弥补方案 CHART-20568 [产品验收]设计器预览页面图表组件鬼畜 & CHART-20627 图表块组件，鼠标双击，会出现图形重影 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-58991 设计器内-模板画布可滚动-点击组件编辑-不在视线内的组件，编辑锁定位置有问题 REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况 ...
3 years ago · ec941e397b
51 changed files with 510 additions and 188 deletions
--- a/build.gradle
+++ b/build.gradle
@ -68,7 +68,7 @@ allprojects {
        implementation 'org.swingexplorer:swexpl:2.0.1'
        implementation 'org.swingexplorer:swag:1.0'
        implementation 'net.java.dev.jna:jna:5.4.0'
-        implementation 'org.apache.tomcat:tomcat-catalina:8.5.57'
+        implementation 'org.apache.tomcat:tomcat-catalina:8.5.69'
        implementation 'io.socket:socket.io-client:0.7.0'
        implementation 'com.fr.third:fine-third:' + frVersion
        implementation 'com.fr.core:fine-core:' + frDevVersion
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@ -390,9 +390,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
        }

        File envHome = new File(userHome + File.separator + "." + ProductConstants.APP_NAME + version);
-        if (!envHome.exists()) {
-            StableUtils.mkdirs(envHome);
-        }

        return envHome.getAbsolutePath();
    }
--- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
@ -1,5 +1,6 @@
 package com.fr.design.actions.help;

+import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
@ -27,7 +28,11 @@ public class TutorialAction extends AbstractDesignerSSO {

    @Override
    public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind(createDocKey());
+        return CloudCenter.getInstance().acquireUrlByKind(createDocKey(), "http://help.finereport.com");
+    }
+
+    public String getOffLineWarnMessage() {
+        return Toolkit.i18nText("Fine-Design_Offline_Helptutorial_Msg");
    }

    // 生成帮助文档 sitecenter key, help.zh_CN.10
--- a/designer-base/src/main/java/com/fr/design/base/mode/DesignModeContext.java
+++ b/designer-base/src/main/java/com/fr/design/base/mode/DesignModeContext.java
@ -10,7 +10,15 @@ public class DesignModeContext {
    private static DesignerMode mode = DesignerMode.NORMAL;

    public static void switchTo(DesignerMode mode) {
-        DesignModeContext.mode = mode;
+        changeMode(DesignModeContext.mode, mode);
+    }
+
+    private static void changeMode(DesignerMode oldMode, DesignerMode newMode) {
+        if (oldMode != newMode) {
+            DesignModeContext.mode = newMode;
+            oldMode.closeMode();
+            newMode.openMode();
+        }
    }

    public static DesignerMode getMode() {
--- a/designer-base/src/main/java/com/fr/design/base/mode/DesignerMode.java
+++ b/designer-base/src/main/java/com/fr/design/base/mode/DesignerMode.java
@ -1,9 +1,25 @@
 package com.fr.design.base.mode;

+
+import com.fr.design.mainframe.DesignerContext;
+
 public enum DesignerMode {
    NORMAL,
    BAN_COPY_AND_CUT,
    VCS,
-    AUTHORITY,
-    DUCHAMP
+    AUTHORITY {
+        @Override
+        public void closeMode() {
+            DesignerContext.getDesignerFrame().closeAuthorityMode();
+        }
+    },
+    DUCHAMP;
+
+    public void openMode() {
+
+    }
+
+    public void closeMode() {
+    }
+
 }
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
@ -25,6 +25,7 @@ import com.fr.design.gui.icombobox.UIComboBoxEditor;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@ -39,7 +40,16 @@ import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;

-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.util.Collections;
+import java.util.concurrent.CancellationException;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.PopupMenuEvent;
@ -50,7 +60,6 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.*;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
@ -70,6 +79,9 @@ import java.util.concurrent.FutureTask;
 * @since 2012-7-11下午4:49:39
 */
 public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refreshable, Previewable, Prepare4DataSourceChange {
+
+    private static final List<String> PENDING_CONTENT = new ArrayList<>(Collections.singletonList(Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."));
+
    private static final double COLUMN_SIZE = 24;

    /**
@ -91,6 +103,8 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha

    private SwingWorker populateWorker;

+    private SwingWorker<List<String>, Void> initWorker;
+
    private PopupMenuListener popupMenuListener = new PopupMenuListener() {

        @Override
@ -213,10 +227,34 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha

    @SuppressWarnings("unchecked")
    protected void initDsNameComboBox() {
+        if (initWorker != null && !initWorker.isDone()) {
+            initWorker.cancel(true);
+        }
        dsNameComboBox.setRefreshingModel(true);
-        FilterableComboBoxModel dsNameComboBoxModel = new FilterableComboBoxModel(getHasAuthConnections());
-        dsNameComboBox.setModel(dsNameComboBoxModel);
-        dsNameComboBox.setRefreshingModel(false);
+        dsNameComboBox.setModel(new FilterableComboBoxModel(PENDING_CONTENT));
+        initWorker = new SwingWorker<List<String>, Void>() {
+
+            @Override
+            protected List<String> doInBackground() throws Exception {
+                return getHasAuthConnections();
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    FilterableComboBoxModel dsNameComboBoxModel = new FilterableComboBoxModel(get());
+                    String selected = dsNameComboBox.getSelectedItem();
+                    dsNameComboBox.setModel(dsNameComboBoxModel);
+                    dsNameComboBox.setSelectedItem(selected);
+                    dsNameComboBox.setRefreshingModel(false);
+                } catch (Exception e) {
+                    if (!(e instanceof CancellationException)) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                }
+            }
+        };
+        initWorker.execute();
    }

    protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) {
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@ -87,12 +87,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     * 刷新ComboBox.items
     */
    protected Iterator<String> items() {
-        nameList = new ArrayList<String>();
-
        ConnectionConfig mgr = ConnectionConfig.getInstance();
        Iterator<String> nameIt = mgr.getConnections().keySet().iterator();

        Collection<String> noAuthConnections = WorkContext.getCurrent().get(DBConnectAuth.class).getNoAuthConnections();
+
+        nameList = new ArrayList<>();
+
        if (noAuthConnections == null) {
            return nameList.iterator();
        }
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
@ -3,12 +3,19 @@ package com.fr.design.data.datapane.connect;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;

-import javax.swing.*;
-import java.awt.*;
+import com.fr.log.FineLoggerFactory;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.util.Iterator;
+import java.util.concurrent.CancellationException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JPanel;
+import javax.swing.SwingWorker;

 public abstract class ItemEditableComboBoxPanel extends JPanel {
 	/**
@ -16,6 +23,8 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	 */
 	private static final long serialVersionUID = 1L;

+	private static final String PENDING = Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
+
 	protected static final Object EMPTY = new Object() {
 		public String toString() {
 			return "";
@ -26,6 +35,8 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	protected UIButton editButton;
    protected UIButton refreshButton;

+    private SwingWorker<Iterator<String>, Void> refreshWorker;
+
 	public ItemEditableComboBoxPanel() {
 		super();

@ -75,6 +86,11 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	 * 刷新itemComboBox的内容
 	 */
 	protected void refreshItems() {
+
+		if (refreshWorker != null && !refreshWorker.isDone()) {
+			refreshWorker.cancel(true);
+		}
+
 		// 记录原来选中的Item,重新加载后需要再次选中
 		Object lastSelectedItem = itemComboBox.getSelectedItem();

@ -83,18 +99,43 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {

 		// 先加EMPTY,再加items
 		model.addElement(EMPTY);
+		model.addElement(PENDING);

-		java.util.Iterator<String> itemIt = items();
-		while(itemIt.hasNext()) {
-			model.addElement(itemIt.next());
+		// 存在两种场景之前只考虑了填充场景 有populate会填充下 把这边的填充逻辑删了 所以没有问题
+		// 如果是纯通过刷新按钮 没有populate 需要手动设置下上次选中的内容
+		if (lastSelectedItem != null) {
+			model.setSelectedItem(lastSelectedItem);
 		}

-		// 再次选中之前选中的Item
-		int idx = model.getIndexOf(lastSelectedItem);
-		if(idx < 0) {
-			idx = 0;
-		}
-		itemComboBox.setSelectedIndex(idx);
+		refreshWorker = new SwingWorker<Iterator<String>, Void>() {
+			@Override
+			protected Iterator<String> doInBackground() throws Exception {
+				return items();
+			}
+
+			@Override
+			protected void done() {
+				try {
+					Iterator<String> itemIt = get();
+					model.removeElement(PENDING);
+					while(itemIt.hasNext()) {
+						model.addElement(itemIt.next());
+					}
+					// 如果加载成功 但是下拉框是可见的 下拉框高度是会固定为原始高度 不会因为填充了更多下拉项而变化
+					// 需要重新设置下拉框高度 但值一样时相关事件不会生效 所以先加再减下
+					if (itemComboBox.isPopupVisible()) {
+						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() + 1);
+						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() - 1);
+					}
+				} catch (Exception e) {
+					if (!(e instanceof CancellationException)) {
+						FineLoggerFactory.getLogger().error(e.getMessage(), e);
+					}
+				}
+
+			}
+		};
+		refreshWorker.execute();
 	}

 	/*
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
@ -4,6 +4,7 @@ import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.io.BaseBook;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.file.filter.ClassFilter;
 import com.fr.design.i18n.Toolkit;
@ -69,7 +70,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
        DesignTableDataManager.closeTemplate(selected);
        //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑
        if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) {
-            DesignerContext.getDesignerFrame().closeAuthorityEditing();
+            DesignModeContext.switchTo(DesignerMode.NORMAL);
        }
        if (contains(selected) == -1) {
            return;
@ -430,13 +431,13 @@ public class HistoryTemplateListCache implements CallbackEvent {
     */
    @Deprecated
    public void reloadCurrentTemplate() {
-       reloadAllEditingTemplate();
+        reloadAllEditingTemplate();
    }

    /**
     * 重绘当前模板
     */
-    public void repaintCurrentEditingTemplate(){
+    public void repaintCurrentEditingTemplate() {
        UIUtil.invokeLaterIfNeeded(new Runnable() {
            @Override
            public void run() {
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
@ -23,12 +23,12 @@ import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import java.util.Collection;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.Collection;

 public abstract class JListControlPane extends JControlPane implements ListControlPaneProvider {
    private static final String LIST_NAME = "JControl_List";
@ -335,7 +335,7 @@ public abstract class JListControlPane extends JControlPane implements ListContr
        getHelper().checkButtonEnabled();
    }

-    private class NameableListCellRenderer extends
+    protected class NameableListCellRenderer extends
            DefaultListCellRenderer {
        @Override
        public Component getListCellRendererComponent(JList list, Object value,
--- a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
@ -67,6 +67,9 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
                    fileChooserParent = DesignerContext.getDesignerFrame();
                }
                Stage stage = showCoverStage(fileChooserParent);
+                if (stage != null) {
+                    stage.setAlwaysOnTop(true);
+                }
                try {
                    if (fileSelectionMode == FileSelectionMode.FILE || fileSelectionMode == FileSelectionMode.MULTIPLE_FILE) {
                        FileChooser fileChooser = new FileChooser();
--- a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java
@ -1,25 +1,22 @@
 package com.fr.design.gui.ilist;

 import com.fr.design.gui.NameInspector;
+import com.fr.design.gui.itextfield.UITextField;
 import com.fr.general.GeneralUtils;
 import com.fr.general.NameObject;
-import com.fr.base.Utils;
-import com.fr.design.gui.itextfield.UITextField;
-
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;

-import javax.swing.*;
+import javax.swing.ListModel;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
-import java.awt.*;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Vector;
+import java.awt.Component;
+import java.awt.Rectangle;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;

 public class JNameEdList extends UIList implements CellEditorListener {
    private static final int ICON_WIDTH = 20;
@ -38,6 +35,8 @@ public class JNameEdList extends UIList implements CellEditorListener {
     */
    private String oldName;

+    private boolean replaceEmptyName = true;
+
    public JNameEdList(ListModel dataModel) {
        super(dataModel);
    }
@ -70,6 +69,10 @@ public class JNameEdList extends UIList implements CellEditorListener {
        return this.editable;
    }

+    public void setReplaceEmptyName(boolean replaceEmptyName) {
+        this.replaceEmptyName = replaceEmptyName;
+    }
+
    public void setNameShouldNumber(boolean isNameShouldNumber) {
        this.isNameShouldNumber = isNameShouldNumber;
    }
@ -301,7 +304,7 @@ public class JNameEdList extends UIList implements CellEditorListener {
        ListCellEditor editor = getCellEditor();
        if (editor != null && editorComp != null) {
            Object value = editor.getCellEditorValue();
-            String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString();
+            String name = StringUtils.isBlank(value.toString()) && replaceEmptyName ? oldName : value.toString();
            setNameAt(name, editingIndex);
            removeComp();
            doAfterStopEditing();
--- a/designer-base/src/main/java/com/fr/design/gui/itextfield/EditTextField.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itextfield/EditTextField.java
@ -13,6 +13,9 @@ import javax.swing.text.PlainDocument;
 * Number Field.
 */
 public class EditTextField extends UIGridTextField {
+
+	private static final String I18NProperty = "i18n";
+
 	private int maxLength = 24;

 	public EditTextField() {
@ -39,7 +42,11 @@ public class EditTextField extends UIGridTextField {
 	}

 	class TextDocument extends PlainDocument {
+
+		private Object defaultI18NProperty;
+
 		public TextDocument() {
+			defaultI18NProperty = getProperty(I18NProperty);
 		}

 		@Override
@ -49,6 +56,7 @@ public class EditTextField extends UIGridTextField {
 				Toolkit.getDefaultToolkit().beep();
 				return;
 			}
+			putProperty(I18NProperty, defaultI18NProperty);
 			super.insertString(offset, s, a);
 		}
 	}
--- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
@ -2,6 +2,7 @@ package com.fr.design.javascript;

 import com.fr.base.BaseFormula;
 import com.fr.base.Parameter;
+import com.fr.base.extension.FileExtension;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
@ -417,6 +418,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
            if (path == null) {
                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Selected_File_Cannot_Be_Null"));
            }
+            if (path.endsWith(FileExtension.CPTX.getExtension())) {
+                throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Function_Cptx_Unsupported"));
+            }
        }

        /**
--- a/designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java
+++ b/designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java
@ -6,6 +6,9 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.utils.BrowseUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Map;
@ -21,6 +24,10 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
    public void actionPerformed(ActionEvent event) {
        String url = getJumpUrl();
        if (!DesignerLoginUtils.isOnline()) {
+            String message = getOffLineWarnMessage();
+            if (StringUtils.isNotEmpty(message)) {
+                FineLoggerFactory.getLogger().warn(message);
+            }
            BrowseUtils.browser(url);
            return;
        }
@ -47,4 +54,8 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
    }

    public abstract String getJumpUrl();
+
+    public String getOffLineWarnMessage() {
+        return StringUtils.EMPTY;
+    }
 }
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@ -9,6 +9,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
@ -219,7 +220,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        @Override
        public void mouseReleased(MouseEvent e) {
            if (DesignModeContext.isAuthorityEditing()) {
-                closeAuthorityEditing();
+                DesignModeContext.switchTo(DesignerMode.NORMAL);
            }
        }

@ -299,8 +300,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().doResize();
    }

+    @Deprecated
    public void closeAuthorityEditing() {
-        DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
+        DesignModeContext.switchTo(DesignerMode.NORMAL);
+    }
+
+    public void closeAuthorityMode() {
        WestRegionContainerPane.getInstance().replaceDownPane(
                TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
@ -312,6 +317,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        EventDispatcher.fire(DesignAuthorityEventType.StopEdit, DesignerFrame.this);
    }

+
    /**
     * 注册app.
     *
@ -796,6 +802,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     * @param jt 添加的模板.
     */
    public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        DesignModeContext.switchTo(DesignerMode.NORMAL);
        JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
        if (currentEditingTemplate != null) {
            currentEditingTemplate.stopEditing();
@ -1038,7 +1045,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
        }

        JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (jt != null)  {
+        if (jt != null) {
            DesignerEnvManager.getEnvManager().setLastOpenFile(jt.getEditingFILE().getPath());
        }

--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@ -47,6 +47,7 @@ import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.ui.util.UIUtil;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
@ -1071,7 +1072,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
    public boolean isOldDesigner() {
        String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
        if (isHigherThanCurrent(xmlDesignerVersion)) {
-            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
+            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
            String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
            new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
            return true;
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java
@ -48,6 +48,7 @@ public class LogMessageBar extends JPanel {
 			public void mouseClicked(MouseEvent e) {
 				if (dlg != null && dlg.isVisible()) {
 					dlg.setExtendedState(JFrame.NORMAL);
+					dlg.requestFocus();
 					return;
 				}
 				dlg = new LogDetailPane().showDialog();
--- a/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java
+++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java
@ -18,21 +18,22 @@ import java.util.Map;
 */
 public class RolesEditedSourceOP extends RoleSourceOP {

-	protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map<String, RoleDataWrapper> map) {
-		List<ExpandMutableTreeNode> roleList = new ArrayList<ExpandMutableTreeNode>();
-		Iterator<Map.Entry<String, RoleDataWrapper>> entryIt = map.entrySet().iterator();
-		while (entryIt.hasNext()) {
-			Map.Entry<String, RoleDataWrapper> entry = entryIt.next();
-			RoleDataWrapper t = entry.getValue();
+    protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map<String, RoleDataWrapper> map) {
+        List<ExpandMutableTreeNode> roleList = new ArrayList<ExpandMutableTreeNode>();
+        Iterator<Map.Entry<String, RoleDataWrapper>> entryIt = map.entrySet().iterator();
+        while (entryIt.hasNext()) {
+            Map.Entry<String, RoleDataWrapper> entry = entryIt.next();
+            RoleDataWrapper t = entry.getValue();

-			JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-			PrivilegeEditedRoleProvider pe = (PrivilegeEditedRoleProvider) jt.getTarget();
-			
-			ExpandMutableTreeNode[] expand = t.load(Arrays.asList(pe.getAllEditedRoleSet()));
-			for (ExpandMutableTreeNode expandMutableTreeNode : expand) {
-				roleList.add(expandMutableTreeNode);
-			}
-		}
-		return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]);
-	}
+            JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            if (jt.getTarget() instanceof PrivilegeEditedRoleProvider) {
+                PrivilegeEditedRoleProvider pe = (PrivilegeEditedRoleProvider) jt.getTarget();
+                ExpandMutableTreeNode[] expand = t.load(Arrays.asList(pe.getAllEditedRoleSet()));
+                for (ExpandMutableTreeNode expandMutableTreeNode : expand) {
+                    roleList.add(expandMutableTreeNode);
+                }
+            }
+        }
+        return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]);
+    }
 }
--- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
@ -425,4 +425,17 @@ public class DesignUtils {
        return true;
    }

+    /**
+     * FR25.0版本出来需要进行适配下
+     *
+     * @param xmlDesignerVersion
+     * @return
+     */
+    public static String parseVersion(String xmlDesignerVersion) {
+        if (StringUtils.isNotEmpty(xmlDesignerVersion)) {
+            return String.valueOf(xmlDesignerVersion.charAt(0) - 'A');
+        }
+        return xmlDesignerVersion;
+    }
+
 }
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
@ -7,3 +7,4 @@ com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=490*95
 com.fr.design.version.detail.label=750*30
 com.fr.design.version.detail.dialog=900*500
+com.fr.design.web.pane.text.field=450*20
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
@ -6,3 +6,4 @@ com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=430*95
 com.fr.design.version.detail.label=650*30
 com.fr.design.version.detail.dialog=800*500
+com.fr.design.web.pane.text.field=400*20
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
@ -6,3 +6,4 @@ com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30
 com.fr.design.version.detail.dialog=850*500
+com.fr.design.web.pane.text.field=450*20
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
@ -7,3 +7,4 @@ com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
 com.fr.design.version.detail.dialog=600*500
+com.fr.design.web.pane.text.field=450*20
--- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
+++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
@ -6,3 +6,4 @@ com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
 com.fr.design.version.detail.dialog=600*500
+com.fr.design.web.pane.text.field=450*20
--- a/designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java
+++ b/designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java
@ -3,6 +3,7 @@ package com.fr.design.utils;

 import com.fr.general.ComparatorUtils;
 import junit.framework.TestCase;
+import org.junit.Assert;
 import org.junit.Test;

 import java.net.ServerSocket;
@ -29,4 +30,10 @@ public class DesignUtilsTest extends TestCase {
        assertTrue(DesignUtils.isPortOccupied());
    }

+    @Test
+    public void testParseVersion() {
+        Assert.assertEquals("10", DesignUtils.parseVersion("KAA"));
+        Assert.assertEquals("11", DesignUtils.parseVersion("LAA"));
+    }
+
 }
--- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java
@ -4,19 +4,28 @@ 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.dialog.FineJOptionPane;
 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.JNameEdList;
 import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.menu.ShortCut;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
+import com.fr.stable.StringUtils;

+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;

 /**
 * @author Bjorn
@ -31,6 +40,38 @@ public class ChartPreStyleListPane extends JListControlPane {
        super();
        this.chartPreStyleManagerPane = chartPreStyleManagerPane;
        initListener();
+        addModNameActionListener((int index, String oldName, String newName) -> {
+            if (ComparatorUtils.equals(oldName, newName)) {
+                return;
+            }
+            String[] allNames = nameableList.getAllNames();
+            allNames[index] = StringUtils.EMPTY;
+            if (StringUtils.isEmpty(newName)) {
+                showTipDialog(Toolkit.i18nText("Fine-Design_Chart_Fill_Style_Empty_Name_Tip"));
+                nameableList.setNameAt(oldName, index);
+                return;
+            }
+            if (isNameRepeated(new List[]{Arrays.asList(allNames)}, newName)) {
+                showTipDialog(Toolkit.i18nText("Fine-Design_Chart_Fill_Style_Exist_Name_Tip", newName));
+                nameableList.setNameAt(oldName, index);
+                return;
+            }
+            populateSelectedValue();
+        });
+    }
+
+    private void showTipDialog(String content) {
+        FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ChartPreStyleListPane.this),
+                content,
+                Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                JOptionPane.WARNING_MESSAGE);
+    }
+
+    @Override
+    protected JNameEdList createJNameList() {
+        JNameEdList jNameList = super.createJNameList();
+        jNameList.setReplaceEmptyName(false);
+        return jNameList;
    }

    /**
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
@ -21,6 +21,8 @@ import com.fr.stable.StringUtils;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
+import javax.swing.plaf.PanelUI;
+import javax.swing.plaf.basic.BasicPanelUI;
 import java.awt.*;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
@ -42,12 +44,23 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
    public XBorderStyleWidgetCreator(Widget widget, Dimension initSize) {
        super(widget, initSize);

+		setUI(new NoBackgroundPaneUI());
+        setOpaque(false);
+        setBackupBound(null);
+
 		ExtendSharableAttrMark sharableAttrMark = this.toData().getWidgetAttrMark(ExtendSharableAttrMark.XML_TAG);
 		if (sharableAttrMark != null) {
 			this.setShareId(sharableAttrMark.getShareId());
 		}
    }

+	@Override
+	public void setUI(PanelUI ui) {
+		if (ui instanceof NoBackgroundPaneUI) {
+			super.setUI(ui);
+		}
+	}
+
 	public Background getBackground4Painting() {
 		return this.background4Painting;
 	}
@ -88,12 +101,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		super.addToWrapper(parentPanel, width, minHeight);
 		// REPORT-53175: 新创建的图表组件默认显示标题 since 10.0.18
 		// 将当前对象添加到父容器后，初始化默认样式的效果
-		initStyle();
+		refreshStylePreviewEffect();
 	}

-	protected void initStyle() {
+	public void refreshStylePreviewEffect() {
    	BorderPacker style = toData().getBorderStyle();
-     	initBorderAndBackgroundStyle();
+     	refreshBorderAndBackgroundStylePreviewEffect();
        if (ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE)) {
          	initTitleStyle(style);
        } else {
@ -104,7 +117,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		reshuffleBorderAndBackgroundPaintingEffectIfTitleExists();
     }

-    protected void initBorderAndBackgroundStyle() {
+    public void refreshBorderAndBackgroundStylePreviewEffect() {
    	BorderPacker style = toData().getBorderStyle();
 		LineBorder DEFAULT_LINE_BORDER = (LineBorder) DEFALUTBORDER;

@ -263,6 +276,11 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 	}


+	@Override
+	public void setBackground(Color bg) {
+		super.setBackground(bg);
+	}
+
 	// 根据当前组件边框裁剪内容，如果当前组件存在圆角，则应当按圆角裁剪内容
 	private void clipByRoundedBorder(Graphics2D g2d) {
 		Border currentBorder = getBorder();
@ -280,6 +298,11 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{

 	// 设计器预览界面中绘制组件背景效果
 	public void paintBackground(Graphics2D g2d) {
+		if (isOpaque()) {
+			g2d.setColor(getBackground());
+			g2d.fillRect(0, 0,  getWidth(), getHeight());
+		}
+
    	Background background4Painting = getBackground4Painting();
 		if (background4Painting != null) {
 			Composite oldComposite = g2d.getComposite();
@ -303,12 +326,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 	}

 	public void paintForeground(Graphics2D g2d) {
-		super.paint(g2d);
+		super.paintComponent(g2d);
 		super.paintBorder(g2d);
 	}

 	@Override
-	public void paint(Graphics g) {
+	public void paintComponent(Graphics g) {
    	this.clipByRoundedBorder((Graphics2D) g);
 		this.paintBackground((Graphics2D) g);
 		this.paintBorderImage((Graphics2D) g);
@ -370,4 +393,11 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 		}
 	}
+
+	public static class NoBackgroundPaneUI extends BasicPanelUI {
+		@Override
+		public void update(Graphics g, JComponent c) {
+			paint(g, c);
+		}
+	}
 }
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
@ -122,7 +122,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {

                    @Override
                    public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                    }
                }),
        };
@ -165,7 +165,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
    @Override
    protected void initXCreatorProperties() {
        super.initXCreatorProperties();
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
        BaseChartCollection collection = ((BaseChartEditor) data).getChartCollection();
        isRefreshing = true;
        ((MiddleChartComponent) designerEditor.getEditorTarget()).populate(collection);
@ -232,7 +232,14 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
        Dimension size = getSize();
        PaddingMargin margin = toData().getMargin();

-        designerEditor.paintEditor(g, size, margin);
+        if (!isEditing) {
+            // CHART-20568 & CHART-20627
+            // EditingMouseListener#startEditing会将图表的ChartComponent放入FormDesigner, 作为编辑中的ChartComponent来显示,
+            // 同时这里又在下层绘制了一遍ChartComponent，导致图表进入编辑状态，会出现两个重叠的ChartComponent。
+            // 考虑到编辑中，FormDesigner中的ChartComponent位于上层，下层的ChartComponent实际上没什么用，所以可以不用绘制
+            // 下层的ChartComponent
+            designerEditor.paintEditor(g, size, margin);
+        }

        if (coverPanel != null) {
            int horizonMargin = margin != null ? margin.getLeft() + margin.getRight() : 0;
@ -334,7 +341,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     * data属性改变触发其他操作
     */
    public void firePropertyChange() {
-        initStyle();
+        refreshStylePreviewEffect();
    }

    @Override
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
@ -787,7 +787,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		int formDesignerWidth = designer.getWidth();
 		int formDesignerHeight = designer.getHeight();
 		// 不超过可绘制区域
-		int extraX = Math.min(creatorRightX, formDesignerWidth);
+		int extraX = creatorRightX < 0 ? 0 : Math.min(creatorRightX, formDesignerWidth);
 		int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);

 		if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {
@ -799,10 +799,20 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override
 			public void run() {
-				popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX()  + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY);
-				popup.updatePane(designer);
-				popup.setVisible(selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog());
-				popup.setRelativeBounds(bounds);
+				try {
+					popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX()  + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY);
+					popup.updatePane(designer);
+					boolean needShowing = selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog();
+					// 当不可见时，且可以设置为可见状态，才去设置为可见
+					// 避免已经是可见状态时，重复设置可见，造成闪屏
+					if (!popup.isVisible() && needShowing) {
+						popup.setVisible(true);
+					} else if (!needShowing) {
+						popup.setVisible(false);
+					}
+					popup.setRelativeBounds(bounds);
+				} catch (Exception ignored) {
+				}
 			}
 		});
 	}
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
@ -33,7 +33,7 @@ import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.util.Set;

-public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider , Releasable {
+public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider, Releasable {
    private UILabel imageLable;
    private FormDesigner designer;
    private static BufferedImage DEFAULT_BACKGROUND;
@ -58,7 +58,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
        super.initXCreatorProperties();

        // 报表块初始化时要加载对应的borderStyle
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
    }

    /**
@ -94,7 +94,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme

                    @Override
                    public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                    }
                }),
                new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
@ -269,6 +269,12 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
        return toData().getElementCase();
    }

+    @Override
+    public void doLayout() {
+        super.doLayout();
+        this.updateECImage();
+    }
+
    public String getElementCaseContainerName() {
        return toData().getWidgetName();
    }
@ -321,9 +327,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
        FormDesigner designer = editingMouseListener.getDesigner();
        if (e.getButton() == MouseEvent.BUTTON1 &&
                (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR)) {
-            FormElementCaseContainerProvider component = (FormElementCaseContainerProvider) designer.getComponentAt(e);
            //切换设计器
-            designer.switchTab(component);
+            designer.switchTab(this);
        }
    }

@ -337,7 +342,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     *
     */
    public void firePropertyChange() {
-        initStyle();
+        refreshStylePreviewEffect();
    }

    /**
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java
@ -75,7 +75,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme

                    @Override
                    public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                    }
                }),
                new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
@ -118,7 +118,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
    @Override
    protected void initXCreatorProperties() {
        super.initXCreatorProperties();
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
        this.initLayoutManager();
        this.convert();
    }
@ -547,7 +547,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
     *
     */
    public void firePropertyChange(){
-        initStyle();
+        refreshStylePreviewEffect();
    }

    /**
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
@ -78,7 +78,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {

                            @Override
                            public void propertyChange() {
-                                initStyle();
+                                XWAbsoluteBodyLayout.this.refreshStylePreviewEffect();
                            }
                        })
        };
@ -105,8 +105,8 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
    }

    @Override
-    protected void initStyle() {
-        initBorderAndBackgroundStyle();
+    public void refreshStylePreviewEffect() {
+        refreshBorderAndBackgroundStylePreviewEffect();
    }

    /**
@ -114,7 +114,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     *
     */
    public void firePropertyChange(){
-        initStyle();
+        this.refreshStylePreviewEffect();
    }

    @Override
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
@ -305,7 +305,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
    }

    @Override
-    protected void initStyle() {
+    public void refreshStylePreviewEffect() {
        // do nothing
    }

--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWTitleLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWTitleLayout.java
@ -63,7 +63,7 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 	}

 	@Override
-	protected void initBorderAndBackgroundStyle() {
+	public void refreshBorderAndBackgroundStylePreviewEffect() {
 		setBorder(null);
 		setBorderImage4Painting(null, 0.0);
 		setBackground4Painting(null, 0.0);
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
@ -160,7 +160,7 @@ public class XWCardLayout extends XLayoutContainer {
     */
    @Override
    protected XLayoutContainer getCreatorWrapper(String widgetName) {
-        initStyle();
+        refreshStylePreviewEffect();
        Dimension dimension = new Dimension();
        //主结构是一个borderlayout, 标签部分是north, card部分为center
        WCardMainBorderLayout border = new WCardMainBorderLayout();
@ -389,7 +389,7 @@ public class XWCardLayout extends XLayoutContainer {

                    @Override
                    public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                    }
                })
        };
@ -397,10 +397,10 @@ public class XWCardLayout extends XLayoutContainer {

    //初始化样式
    @Override
-    protected void initStyle() {
+    public void refreshStylePreviewEffect() {
        BorderPacker style = toData().getBorderStyle();
        initBorderTitleStyle(style);
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
        clearOrShowTitleLayout(ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE));
    }

@ -484,7 +484,7 @@ public class XWCardLayout extends XLayoutContainer {
     */
    @Override
    public void firePropertyChange() {
-        initStyle();
+        refreshStylePreviewEffect();
    }

    public void resetTabBackground(TemplateStyle templateStyle) {
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java
@ -417,7 +417,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 	public void firePropertyChange(){
 		XWCardLayout cardLayout = this.getCardPart();
 		if (cardLayout != null && cardLayout.toData() != null) {
-			cardLayout.initStyle();
+			cardLayout.refreshStylePreviewEffect();
 		}
 	}

--- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
@ -177,14 +177,12 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
        double[] rowSize = {f};
        double[] columnSize = {p, f, p, p, p, p, p, f, p};
        UILabel tipsPane = new UILabel("form");
-        tipsPane.setPreferredSize(new Dimension(265, 0));
        widthPane = new UINumberField();
        widthPane.setPreferredSize(new Dimension(60, 0));
        heightPane = new UINumberField();
        heightPane.setPreferredSize(new Dimension(60, 0));

        slidePane = JFormSliderPane.getInstance();
-        slidePane.setPreferredSize(new Dimension(326, 20));

        JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(
                new JComponent[][]{{tipsPane, new UILabel(), widthPane,
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
@ -109,6 +109,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
            Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")})
    );

+    protected static final ArrayList<String> PARAMETER_TOOLAR_BAN_LIST = new ArrayList<String>(
+            Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy")})
+    );
+

    private double scale = 1.0D;
    //底层容器的默认大小
@ -1304,6 +1308,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
    protected void setToolbarButtons() {
        //自适应布局和底层都不能删除
        DesignerContext.getDesignerFrame().checkCombineUp(!isRootSelected(), NAME_ARRAY_LIST);
+
+        if (isParameterSelected()) {
+            DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST);
+        }
    }

    private void invalidateLayout() {
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
@ -294,7 +294,6 @@ public class FormSelection {
                    creator.setBackupBound(backupBounds);
                }
                layoutAdapter.fix(creator);
-                resetElementCaseImage(creator);
            }
            i++;
        }
@ -322,26 +321,6 @@ public class FormSelection {
        return false;
    }

-    /**
-     * @Description 重置报表块缩略图
-     * @param: creator
-     * @return void
-     * @Author Henry.Wang
-     * @Date 2021/5/21 14:59
-     **/
-    public void resetElementCaseImage(XCreator creator) {
-        if (creator instanceof XWTitleLayout) {
-            XWTitleLayout xwTitleLayout = (XWTitleLayout) creator;
-            for (int i = 0; i < xwTitleLayout.getComponentCount(); i++) {
-                Component component = xwTitleLayout.getComponent(i);
-                if (component instanceof XElementCase) {
-                    XElementCase xElementCase = (XElementCase) component;
-                    xElementCase.updateECImage();
-                }
-            }
-        }
-    }
-
    /**
     * 检查下有没有参数面板，如果存在，处理下参数面板造成的偏移量
     * @param rectangle
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
@ -24,6 +24,8 @@ import com.fr.form.ui.LayoutBorderStyle;
 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;
@ -150,7 +152,13 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
            if (state == WBodyLayoutType.FIT.getTypeValue()) {
                XWFitLayout xwFitLayout = ((XWFitLayout)creator.getBackupParent());
                xwFitLayout.switch2FitBodyLayout(creator);
+                WFitLayout wFitLayout = xwFitLayout.toData();
+                // 切换布局类型时，保留body背景样式
+                if (wFitLayout != null) {
+                    wFitLayout.setBorderStyle(layout.getBorderStyle());
+                }
                copyLayoutAttr(layout, xwFitLayout.toData());
+                xwFitLayout.refreshStylePreviewEffect();
            }
        }
        layout.setBorderStyle(stylePane.updateBean());
--- 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
@ -34,10 +34,12 @@ 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.ComparatorUtils;
+import com.fr.general.act.BorderPacker;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;

 import javax.swing.*;
+import javax.swing.border.Border;
 import java.awt.*;

 /**
@ -191,9 +193,12 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
        layout.setLayoutType(WBodyLayoutType.parse(state));
        layout.setCompState(adaptComboBox.getSelectedIndex());
        try {
+            // 自适应布局切换到绝对布局
            if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
                WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
                wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
+                // 切换布局类型时，保留body背景样式
+                wAbsoluteBodyLayout.setBorderStyle((BorderPacker) (layout.getBorderStyle().clone()));
                Component[] components = xWFitLayout.getComponents();
                xWFitLayout.removeAll();
                layout.resetStyle();
@ -215,6 +220,15 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
                FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
                formDesigner.getSelectionModel().setSelectedCreators(
                        FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{wAbsoluteBodyLayout}));
+
+                if (xwAbsoluteBodyLayout.toData() != null) {
+                    xwAbsoluteBodyLayout.toData().setBorderStyle(wAbsoluteBodyLayout.getBorderStyle());
+                }
+                xwAbsoluteBodyLayout.refreshStylePreviewEffect();
+                if (xWFitLayout.toData() != null) {
+                    xWFitLayout.toData().resetStyle();
+                }
+                xWFitLayout.refreshStylePreviewEffect();
            }
        } catch (Exception e) {
            FineLoggerFactory.getLogger().error(e.getMessage(), e);
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@ -57,8 +57,6 @@ import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.Timer;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import java.awt.AWTEvent;
 import java.awt.BorderLayout;
 import java.awt.Color;
@ -242,21 +240,28 @@ public class AlphaFineDialog extends UIDialog {
            if (hotData == null) {
                hotData = HotIssuesManager.getInstance().getHotIssues();
            }
-            for (int i = 0; i < hotData.length; i++) {
-                panel.add(new HotIssueJpanel(hotData[i], i + 1));
-            }
        } else {
            hotData = null;
-            for (int i = 0; i < AlphaFineConstants.HOT_ITEMS; i++) {
-                panel.add(new HotIssueJpanel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed")}, i + 1));
-            }
        }
+        initHotPane(panel, hotData);
        hotPane.add(uiLabel, BorderLayout.NORTH);
        hotPane.add(panel, BorderLayout.CENTER);
        add(hotPane, BorderLayout.SOUTH);
        setSize(AlphaFineConstants.FULL_SIZE);
    }

+    private void initHotPane(JPanel panel, String[][] hotData) {
+        if (hotData == null) {
+            for (int i = 0; i < AlphaFineConstants.HOT_ITEMS; i++) {
+                panel.add(new HotIssueJpanel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed")}, i + 1));
+            }
+        } else {
+            for (int i = 0; i < hotData.length; i++) {
+                panel.add(new HotIssueJpanel(hotData[i], i + 1));
+            }
+        }
+    }
+
    /**
     * 初始化输入框
     */
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/HotIssuesManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/HotIssuesManager.java
@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.jetbrains.annotations.Nullable;


 /**
@ -71,6 +72,7 @@ public class HotIssuesManager {
     * 从热门问题接口获取热门问题
     * @return
     */
+    @Nullable
    public String[][] getHotIssues() {

        try {
@ -84,7 +86,7 @@ public class HotIssuesManager {
                }
            }
        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error("hotissues search error: " + e.getMessage());
+            FineLoggerFactory.getLogger().error("hotissues search error: " + e.getMessage(), e);
            return null;
        }
        return data;
--- a/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
@ -21,6 +21,8 @@ import com.fr.form.main.Form;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.report.util.ReadXmlType;
+import com.fr.report.util.ReadXmlTypeLocalManager;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 import org.jetbrains.annotations.Nullable;
@ -90,13 +92,16 @@ class FormApp extends AbstractAppProvider {

    @Nullable
    private Form getForm(FILE tplFile) {
+        ReadXmlTypeLocalManager.setReadXmlType(ReadXmlType.DESIGN);
        Form form = asIOFile(tplFile);
+        ReadXmlTypeLocalManager.remove();
        if (form != null) {
            DesignerAppUtils.dealWithTemplateIOError(tplFile.getPath());
        }
        return form;
    }

+
    @Override
    public Form asIOFile(FILE file) {

--- a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
@ -152,10 +152,13 @@ public class FormElementCaseDesigner
            Grid grid = this.elementCasePane != null ? this.elementCasePane.getGrid() : null;
            if (grid != null) {
                boolean oldTranslucent = grid.isTranslucent();
+                boolean oldShowExtraGridLine = grid.isShowExtraGridLine();
                // 截缩图图时grid需支持半透明，不能用默认白色填充画布，否则会遮挡组件样式背景
                grid.setTranslucent(true);
+                grid.setShowExtraGridLine(false);
                grid.paint(g2d);
                grid.setTranslucent(oldTranslucent);
+                grid.setShowExtraGridLine(oldShowExtraGridLine);
            }

        } catch (Exception e) {
--- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
@ -5,6 +5,7 @@ import com.fr.design.gui.frpane.EditingStringListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.file.FILE;
@ -38,7 +39,7 @@ public class WebCssPane extends BasicPane {
 		JPanel outnorth = new JPanel(new BorderLayout(0, 5));
 		JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,8,0));
 		localText = new UITextField();
-		localText.setPreferredSize(new Dimension(450, 20));
+		localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field"));
 		localText.setEditable(false);
 		chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));
 		chooseFile.setPreferredSize(new Dimension(75, 23));
--- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
@ -7,6 +7,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.file.FILE;
@ -66,8 +67,8 @@ public class WebJsPane extends BasicPane {
 		localText = new UITextField();
 		localText.setEditable(false);
 		urlText = new UITextField();
-		localText.setPreferredSize(new Dimension(450, 20));
-		urlText.setPreferredSize(new Dimension(450, 20));
+		localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field"));
+		urlText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field"));
 		urlText.addKeyListener(urlTextListener);
        urlText.setEnabled(false);
 		chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));
--- a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
+++ b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
@ -152,13 +152,11 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
    private ScrollAction PRESS_ACTION = new ScrollAction() {
        @Override
        public boolean run(MouseEvent evt, int index, double tmpSize1, double tmpSize2, int tmpIncreaseSize, int oldEndValueSize, ElementCase report, DynamicUnitList sizeList) {
-//            int resolution = ScreenResolution.getScreenResolution();
-
            if (isOnSeparatorLineIncludeZero(evt, tmpSize2, tmpIncreaseSize) || isOnNormalSeparatorLine(evt, tmpSize2)) {
                dragType = GridUtils.DRAG_CELL_SIZE;
                isDragPermited = true;
                dragIndex = index;
-                showToolTip(evt, createToolTipString(sizeList.get(dragIndex).toPixD(resolution), sizeList.getRangeValue(0, dragIndex + 1).toPixD(resolution)));
+                showToolTip(evt, createToolTipString(sizeList.get(dragIndex), sizeList.getRangeValue(0, dragIndex + 1)));
                return true;
            }
            if (between(evt, tmpSize1, tmpSize2)) {
@ -302,21 +300,18 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {

    protected abstract void resetGridSelectionBySelect(int index, ElementCasePane ePane);

-    private String createToolTipString(double doubleValue, double totalDoubleValue) {
+    private String createToolTipString(UNIT unitValue, UNIT totalUnitValue) {
        int unitType = DesignerEnvManager.getEnvManager().getReportLengthUnit();
-//        int resolution = ScreenResolution.getScreenResolution();
-        FU ulen = FU.valueOfPix((int) doubleValue, resolution);
-        FU tulen = FU.valueOfPix((int) totalDoubleValue, resolution);
        ReportLengthUNITProvider lengthUNIT = UnitConvertUtil.parseLengthUNIT(unitType);
        String unit = lengthUNIT.unitText();
-        double len = lengthUNIT.unit2Value4Scale(ulen);
-        double tlen = lengthUNIT.unit2Value4Scale(tulen);
+        double len = lengthUNIT.unit2Value4Scale(unitValue);
+        double tlen = lengthUNIT.unit2Value4Scale(totalUnitValue);
        StringBuilder sb = new StringBuilder();
        sb.append(String.format("%.2f", new Double(len)))
                .append('/').append(String.format("%.2f", new Double(tlen)))
                .append(unit).append('(')
-                .append((int)(doubleValue)).append('/')
-                .append((int)(totalDoubleValue))
+                .append((int)(unitValue.toPixD(resolution))).append('/')
+                .append((int)(totalUnitValue.toPixD(resolution)))
                .append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
                .append(')');
        return sb.toString();
@ -416,8 +411,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
            iterateScrollBar(ePane, evt, DRAG_ACTION);

            DynamicUnitList sizeList = getSizeList(report);
-//            int resolution = ScreenResolution.getScreenResolution();
-            this.setToolTipText2(this.createToolTipString(sizeList.get(dragIndex).toPixD(resolution), sizeList.getRangeValue(0, dragIndex + 1).toPixD(resolution)));
+            this.setToolTipText2(this.createToolTipString(sizeList.get(dragIndex), sizeList.getRangeValue(0, dragIndex + 1)));
        }

        ePane.repaint();
--- a/designer-realize/src/main/java/com/fr/grid/Grid.java
+++ b/designer-realize/src/main/java/com/fr/grid/Grid.java
@ -136,6 +136,8 @@ public class Grid extends BaseGridComponent {

    // 截取缩略图时需透明（不能用默认白色填充），否则会遮挡组件样式的背景，其余情况的绘制可以用白色等默认颜色填充
    private boolean isTranslucent = false;
+    // 是否绘制单元格内容区之外的网格线
+    private boolean showExtraGridLine = true;

    public Grid(int resolution) {
        this.resolution = resolution;
@ -1469,4 +1471,12 @@ public class Grid extends BaseGridComponent {
    public void setTranslucent(boolean translucent) {
        isTranslucent = translucent;
    }
+
+    public boolean isShowExtraGridLine() {
+        return showExtraGridLine;
+    }
+
+    public void setShowExtraGridLine(boolean showExtraGridLine) {
+        this.showExtraGridLine = showExtraGridLine;
+    }
 }
--- a/designer-realize/src/main/java/com/fr/grid/GridUI.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridUI.java
@ -10,12 +10,15 @@ import com.fr.base.background.ColorBackground;
 import com.fr.base.background.ImageFileBackground;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.fun.ReportLengthUNITProvider;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
+import com.fr.design.unit.UnitConvertUtil;
 import com.fr.general.Background;
 import com.fr.general.ComparatorUtils;
 import com.fr.grid.selection.CellSelection;
@ -48,6 +51,7 @@ import com.fr.stable.Constants;
 import com.fr.stable.script.CalculatorUtils;
 import com.fr.stable.unit.FU;
 import com.fr.stable.AssistUtils;
+import com.fr.stable.unit.UNIT;
 import com.fr.third.antlr.ANTLRException;
 import com.fr.third.guava.collect.HashMultimap;

@ -288,15 +292,25 @@ public class GridUI extends ComponentUI {
                }
            }
        }
-        GridRange gridRange = GridRange.range(grid.getHorizontalBeginValue(), horizontalEndValue, grid.getVerticalBeginValue(), verticalEndValue)
+        int xBeginIndex = grid.getHorizontalBeginValue();
+        int xEndIndex = horizontalEndValue;
+        int yBeginIndex = grid.getVerticalBeginValue();
+        int yEndIndex = verticalEndValue;
+        if (!grid.isShowExtraGridLine()) {
+            xBeginIndex = 0;
+            xEndIndex = Math.max(0, report.getColumnCount() - 1);
+            yBeginIndex = 0;
+            yEndIndex = Math.max(0, report.getRowCount() - 1);
+        }
+        GridRange gridRange = GridRange.range(xBeginIndex, xEndIndex, yBeginIndex, yEndIndex)
                .rangeList(rowHeightList, columnWidthList)
                .realSize(realWidth, realHeight);

-        new DrawVerticalLineHelper(gridRange, grid.isShowGridLine(),
+        new DrawVerticalLineHelper(gridRange, grid.isShowGridLine(), grid.isShowExtraGridLine(),
                isShowVerticalPaginateLine, paperPaintHeight,
                paginateLineList, resolution).iterateStart2End(g2d);

-        new DrawHorizontalLineHelper(gridRange, grid.isShowGridLine(),
+        new DrawHorizontalLineHelper(gridRange, grid.isShowGridLine(), grid.isShowExtraGridLine(),
                isShowHorizontalPaginateLine, paperPaintWidth,
                paginateLineList, resolution).iterateStart2End(g2d);
    }
@ -320,6 +334,7 @@ public class GridUI extends ComponentUI {
        protected GridRange gridRange;

        protected boolean showGridLine;
+        protected boolean showExtraGridLine;
        protected boolean showPaginateLine;

        protected double paperPaintSize;
@ -332,11 +347,12 @@ public class GridUI extends ComponentUI {

        protected static final double THRESHOLD = 1.0E-4D;

-        DrawLineHelper(GridRange gridRange, boolean showGridLine,
+        DrawLineHelper(GridRange gridRange, boolean showGridLine, boolean showExtraGridLine,
                       boolean showPaginateLine, double paperPaintSize,
                       List paginateLineList, int resolution) {
            this.gridRange = gridRange;
            this.showGridLine = showGridLine;
+            this.showExtraGridLine = showExtraGridLine;
            this.showPaginateLine = showPaginateLine;
            this.paperPaintSize = paperPaintSize;

@ -353,10 +369,10 @@ public class GridUI extends ComponentUI {

    private class DrawVerticalLineHelper extends DrawLineHelper {

-        DrawVerticalLineHelper(GridRange gridRange, boolean showGridLine,
+        DrawVerticalLineHelper(GridRange gridRange, boolean showGridLine, boolean showExtraGridLine,
                               boolean showPaginateLine, double paperPaintSize,
                               List paginateLineList, int resolution) {
-            super(gridRange, showGridLine, showPaginateLine,
+            super(gridRange, showGridLine, showExtraGridLine, showPaginateLine,
                    paperPaintSize, paginateLineList, resolution);
        }

@ -372,51 +388,58 @@ public class GridUI extends ComponentUI {

        @Override
        protected void iterateStart2End(Graphics2D g2d) {
-            float rowHeight, paperYAxisSumSize = 0, yAxisSumSize = 0;
+            UNIT rowHeight, paperYAxisSumSize = FU.getInstance(0), maxXAxisSumSize = FU.getInstance(0), yAxisSumSize = FU.getInstance(0);
            for (int i = 0; i <= gridRange.yEndIndex; i++) {
                if (i == 0) {
                    i = gridRange.yBeginIndex;
                    for (int k = 0; k < gridRange.yBeginIndex; k++) {
-                        rowHeight = gridRange.rowHeightList.get(k).toPixF(resolution);
-
-                        paperYAxisSumSize += rowHeight;
-                        if (paperYAxisSumSize >= paperPaintSize) {
+                        rowHeight = gridRange.rowHeightList.get(k);
+                        paperYAxisSumSize = paperYAxisSumSize.add(rowHeight);
+                        if (paperYAxisSumSize.toPixF(resolution) >= paperPaintSize) {
                            paperYAxisSumSize = rowHeight;
                        }
                    }
                }
-                rowHeight = gridRange.rowHeightList.get(i).toPixF(resolution);
-                paperYAxisSumSize += rowHeight;
+
+                rowHeight = gridRange.rowHeightList.get(i);
+                paperYAxisSumSize = paperYAxisSumSize.add(rowHeight);
                if (showGridLine) {
-                    float columnWidth, xAxisSumSize = 0;
+                    UNIT columnWidth, xAxisSumSize =  FU.getInstance(0);
                    for (int j = gridRange.xBeginIndex; j <= gridRange.xEndIndex; j++) {
-                        columnWidth = gridRange.columnWidthList.get(j).toPixF(resolution);
+                        columnWidth = gridRange.columnWidthList.get(j);
                        if (!mergeCellElementTable.get(CellPosition.value(i - 1, j)).contains(CellPosition.BOTTOM)) {
-                            tmpLine2D.setLine(xAxisSumSize, yAxisSumSize, xAxisSumSize + columnWidth, yAxisSumSize);
+                            tmpLine2D.setLine(xAxisSumSize.toPixF(resolution), yAxisSumSize.toPixF(resolution), xAxisSumSize.add(columnWidth).toPixF(resolution), yAxisSumSize.toPixF(resolution));
                            g2d.draw(tmpLine2D);
                        }
-                        xAxisSumSize += columnWidth;
+                        xAxisSumSize = xAxisSumSize.add(columnWidth);
+                    }
+                    if (xAxisSumSize.toPixF(resolution) > maxXAxisSumSize.toPixF(resolution)) {
+                        maxXAxisSumSize = xAxisSumSize;
                    }
                }
-                if (showPaginateLine && paperYAxisSumSize - paperPaintSize > THRESHOLD) {
-                    paginateLineList.add(getPaginateLine2D((int) yAxisSumSize));
+                if (showPaginateLine && paperYAxisSumSize.toPixF(resolution) - paperPaintSize > THRESHOLD) {
+                    paginateLineList.add(getPaginateLine2D((int) yAxisSumSize.toPixF(resolution)));
                    paperYAxisSumSize = rowHeight;
                }
-                yAxisSumSize += rowHeight;
+                yAxisSumSize = yAxisSumSize.add(rowHeight);
            }
            // paint 最后一个横线..
            if (showGridLine) {
-                drawLastLine(g2d, (int) yAxisSumSize);
+                if (showExtraGridLine) {
+                    drawLastLine(g2d, (int) yAxisSumSize.toPixF(resolution));
+                } else {
+                    GraphHelper.drawLine(g2d, 0, yAxisSumSize.toPixF(resolution), maxXAxisSumSize.toPixF(resolution), yAxisSumSize.toPixF(resolution));
+                }
            }
        }
    }

    private class DrawHorizontalLineHelper extends DrawLineHelper {

-        DrawHorizontalLineHelper(GridRange gridRange, boolean showGridLine,
+        DrawHorizontalLineHelper(GridRange gridRange, boolean showGridLine, boolean showExtraGridLine,
                                 boolean showPaginateLine, double paperPaintSize,
                                 List paginateLineList, int resolution) {
-            super(gridRange, showGridLine, showPaginateLine,
+            super(gridRange, showGridLine, showExtraGridLine, showPaginateLine,
                    paperPaintSize, paginateLineList, resolution);
        }

@ -432,40 +455,47 @@ public class GridUI extends ComponentUI {

        @Override
        protected void iterateStart2End(Graphics2D g2d) {
-            float columnWidth, paperXAxisSumSize = 0, xAxisSumSize = 0;
+            UNIT columnWidth, paperXAxisSumSize = FU.getInstance(0), maxYAxisSumSize = FU.getInstance(0), xAxisSumSize = FU.getInstance(0);
            for (int i = 0; i <= gridRange.xEndIndex; i++) {
                if (i == 0) {
                    i = gridRange.xBeginIndex;
                    for (int k = 0; k < gridRange.xBeginIndex; k++) {
-                        columnWidth = gridRange.columnWidthList.get(k).toPixF(resolution);
-                        paperXAxisSumSize += columnWidth;
-                        if (paperXAxisSumSize >= paperPaintSize) {
+                        columnWidth = gridRange.columnWidthList.get(k);
+                        paperXAxisSumSize = paperXAxisSumSize.add(columnWidth);
+                        if (paperXAxisSumSize.toPixF(resolution) >= paperPaintSize) {
                            paperXAxisSumSize = columnWidth;
                        }
                    }
                }
-                columnWidth = gridRange.columnWidthList.get(i).toPixF(resolution);
-                paperXAxisSumSize += columnWidth;
+                columnWidth = gridRange.columnWidthList.get(i);
+                paperXAxisSumSize = paperXAxisSumSize.add(columnWidth);
                if (showGridLine) {
-                    float rowHeight, yAxisSumSize = 0;
+                    UNIT rowHeight, yAxisSumSize = FU.getInstance(0);
                    for (int j = gridRange.yBeginIndex; j <= gridRange.yEndIndex; j++) {
-                        rowHeight = gridRange.rowHeightList.get(j).toPixF(resolution);
+                        rowHeight = gridRange.rowHeightList.get(j);
                        if (!mergeCellElementTable.get(CellPosition.value(j, i - 1)).contains(CellPosition.RIGHT)) {
-                            tmpLine2D.setLine(xAxisSumSize, yAxisSumSize, xAxisSumSize, yAxisSumSize + rowHeight);
+                            tmpLine2D.setLine(xAxisSumSize.toPixF(resolution), yAxisSumSize.toPixF(resolution), xAxisSumSize.toPixF(resolution), yAxisSumSize.add(rowHeight).toPixF(resolution));
                            g2d.draw(tmpLine2D);
                        }
-                        yAxisSumSize += rowHeight;
+                        yAxisSumSize = yAxisSumSize.add(rowHeight);
+                    }
+                    if (yAxisSumSize.toPixF(resolution) > maxYAxisSumSize.toPixF(resolution)) {
+                        maxYAxisSumSize = yAxisSumSize;
                    }
                }
-                if (showPaginateLine && paperXAxisSumSize - paperPaintSize > THRESHOLD) {
-                    paginateLineList.add(getPaginateLine2D((int) xAxisSumSize));
+                if (showPaginateLine && paperXAxisSumSize.toPixF(resolution) - paperPaintSize > THRESHOLD) {
+                    paginateLineList.add(getPaginateLine2D((int) xAxisSumSize.toPixF(resolution)));
                    paperXAxisSumSize = columnWidth;
                }
-                xAxisSumSize += columnWidth;
+                xAxisSumSize = xAxisSumSize.add(columnWidth);
            }
            // paint 最后一个横线..
            if (showGridLine) {
-                drawLastLine(g2d, (int) xAxisSumSize);
+                if (showExtraGridLine) {
+                    drawLastLine(g2d, (int) xAxisSumSize.toPixD(resolution));
+                } else {
+                    GraphHelper.drawLine(g2d, xAxisSumSize.toPixF(resolution), 0, xAxisSumSize.toPixF(resolution), maxYAxisSumSize.toPixF(resolution));
+                }
            }
        }
    }