Merge pull request #12920 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '3b91072456cdd5dd5aa64a592a18b637018854e1': REPORT-105998 设计器缩放比例较小，在画布选中组件有偏差 feat: fvs支持图表导出 #REPORT-106468 REPORT-105775 【FR国际化】文字显示不全 REPORT-105705 【FR国际化】文字显示不全，不更改布局，添加tooltips REPORT-105456 【BI国际化】英文显示不全 REPORT-104339 设计器国际化问题,弹出提示框标题改为“提示”
8 months ago · 5289cd9e45
34 changed files with 63 additions and 47 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
@ -136,7 +136,7 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
            int returnVal = FineJOptionPane.showConfirmDialog(
                    DesignerContext.getDesignerFrame(),
                    Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + e.getEditingFILE() + "\" ?",
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.QUESTION_MESSAGE
            );
--- a/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
@ -39,7 +39,7 @@ public class FineJOptionPane extends JOptionPane {
    }

    private final static String MESSAGE_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message");
-    private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm");
+    private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt");
    private final static String INPUT_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips");

    /**
--- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
@ -304,7 +304,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
            if (designerEnvManager.isSupportStringToFormula()) {
                if (!designerEnvManager.isDefaultStringToFormula()) {
                    int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
-                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
                    if (returnValue == JOptionPane.OK_OPTION) {

                        setCurrentEditor(j);
--- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
@ -285,7 +285,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
            if (designerEnvManager.isSupportStringToFormula()) {
                if (!designerEnvManager.isDefaultStringToFormula()) {
                    int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
-                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
                    if (returnValue == JOptionPane.OK_OPTION) {

                        setCurrentEditor(j);
--- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
@ -1000,7 +1000,7 @@ public class MultiTemplateTabPane extends JComponent {
        if (!specifiedTemplate.isALLSaved() && !DesignerMode.isVcsMode()) {
            specifiedTemplate.stopEditing();
            int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
            if (returnVal == JOptionPane.YES_OPTION) {
                CallbackSaveWorker worker = specifiedTemplate.save();
                worker.addSuccessCallback(new Runnable() {
--- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
@ -353,7 +353,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {

            if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                    tipContent,
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    YES_NO_OPTION)
                    == JOptionPane.YES_OPTION) {
                // 删除所有选中的即可
@ -378,7 +378,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {

            if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                    tipContent,
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    YES_NO_OPTION)
                    == JOptionPane.YES_OPTION) {
                // 删除其他
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
@ -153,7 +153,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 				if (selected != null) {
 					int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this),
 															   Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?",
-															   Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+															   Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
 															   JOptionPane.OK_CANCEL_OPTION);
 					if (re == JOptionPane.OK_OPTION) {
 						JListUtils.removeSelectedListItems(jlist);
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
@ -394,6 +394,7 @@ public class RegPane extends BasicPane {
    private static class RegLengthPane extends DisplayPane {
        private UISpinner minLenSpinner;
        private UISpinner maxLenSpinner;
+        private final int DEFAULT_WIDTH = 60;

        public RegLengthPane(){
            this.setLayout(FRGUIPaneFactory.createBorderLayout());
@ -403,8 +404,11 @@ public class RegPane extends BasicPane {
            maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
            UILabel minLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Min_Length"));
            UILabel maxLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Max_Length"));
-            minLabel.setPreferredSize(new Dimension(60, 20));
-            maxLabel.setPreferredSize(new Dimension(60, 20));
+            int minLabelWidth = Math.max(minLabel.getPreferredSize().width, DEFAULT_WIDTH);
+            int maxLabelWidth = Math.max(maxLabel.getPreferredSize().width, DEFAULT_WIDTH);
+
+            minLabel.setPreferredSize(new Dimension(minLabelWidth, 20));
+            maxLabel.setPreferredSize(new Dimension(maxLabelWidth, 20));
            double f = TableLayout.FILL;
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@ -797,7 +797,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
            if (!editingTemplate.getEditingFILE().exists()) {
                int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                        Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
-                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
+                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION,
                        JOptionPane.QUESTION_MESSAGE);
                if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
                    editingTemplate.saveTemplate();
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java
@ -37,7 +37,7 @@ public class BubbleTip implements GuideTip {
                    int returnVal = FineJOptionPane.showConfirmDialog(
                            currentGuide.getGuideView(),
                            Toolkit.i18nText("Fine-Design_Guide_Option_Warning_Terminal"),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                            JOptionPane.YES_NO_OPTION,
                            JOptionPane.QUESTION_MESSAGE);
                    if (returnVal == JOptionPane.YES_OPTION) {
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java
@ -88,7 +88,7 @@ public class VcsCloseTemplateHelper {
            specifiedTemplate.stopEditing();
            int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                    String.format("%s\"%s\" ?",Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save"), specifiedTemplate.getEditingFILE()),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
            if (returnVal == JOptionPane.YES_OPTION) {
                CallbackSaveWorker worker = specifiedTemplate.save();
                worker.addSuccessCallback(() -> {
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/EditFileVersionDialog.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/EditFileVersionDialog.java
@ -5,6 +5,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextarea.UITextArea;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
@ -55,13 +56,17 @@ public class EditFileVersionDialog extends UIDialog {
    private void initComponents() {

        JPanel fontPane = new JPanel(new BorderLayout());
-        fontPane.add(new UILabel("   " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Version_Message") + "："), BorderLayout.NORTH);
+        UILabel fontLabel = new UILabel("   " + Toolkit.i18nText("Fine-Design_Vcs_Version_Message") + "：");
+        fontLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Vcs_Version_Message"));
+        fontPane.add(fontLabel, BorderLayout.NORTH);

        msgTestArea.setBorder(null);
        UIScrollPane scrollPane = new UIScrollPane(msgTestArea);

+        UILabel versionTip = new UILabel("   " + Toolkit.i18nText("Fine-Design_Vcs_Version_Number") + "：");
+        versionTip.setToolTipText(Toolkit.i18nText("Fine-Design_Vcs_Version_Number"));
        Component[][] components = new Component[][]{
-                new Component[]{new UILabel("   " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Version_Number") + "："), versionLabel},
+                new Component[]{versionTip, versionLabel},
                new Component[]{fontPane, scrollPane}
        };
        double[] rowSizes = new double[]{25, 100};
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
@ -222,7 +222,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
            int selVal = FineJOptionPane.showConfirmDialog(
                    RecyclePane.this,
                    isDelete ? getDeleteTip(selectList.size()) : getRestoreTip(selectList.size()),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    JOptionPane.OK_CANCEL_OPTION,
                    JOptionPane.QUESTION_MESSAGE);
            if (selVal == JOptionPane.YES_OPTION) {
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java
@ -120,7 +120,7 @@ public class VcsCenterPane extends VcsNewPane {
                    int selVal = FineJOptionPane.showConfirmDialog(
                            VcsCenterPane.this,
                            Toolkit.i18nText("Fine-Design_Vcs_Center_Delete", fileName),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                            JOptionPane.OK_CANCEL_OPTION,
                            JOptionPane.QUESTION_MESSAGE);
                    if (selVal == JOptionPane.YES_OPTION) {
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java
@ -168,7 +168,7 @@ public class VcsNewPane extends RecyclePane {
                    int selVal = FineJOptionPane.showConfirmDialog(
                            VcsNewPane.this,
                            Toolkit.i18nText("Fine-Design_Vcs_Restore_This_Version_Tips"),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                            JOptionPane.OK_CANCEL_OPTION,
                            JOptionPane.QUESTION_MESSAGE);
                    if (selVal == JOptionPane.YES_OPTION) {
@ -255,7 +255,7 @@ public class VcsNewPane extends RecyclePane {
                    int selVal = FineJOptionPane.showConfirmDialog(
                            VcsNewPane.this,
                            Toolkit.i18nText("Fine-Design_Vcs_Delete_This_Version_Tips"),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                            JOptionPane.OK_CANCEL_OPTION,
                            JOptionPane.QUESTION_MESSAGE);
                    if (selVal == JOptionPane.YES_OPTION) {
--- a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
@ -84,7 +84,7 @@ public class UpmFinder {
        if (!checkUPMResourcesExist()) {
            // upm下载
            int val = FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
            if (val == JOptionPane.OK_OPTION) {
                try {
                    UpmResourceLoader.INSTANCE.download();
--- a/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
+++ b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
@ -332,7 +332,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
        String[] option = {Toolkit.i18nText("Fine-Design_Report_Yes"), Toolkit.i18nText("Fine-Design_Report_No")};
        if (!jarConsistency) {
            int a = FineJOptionPane.showOptionDialog(getParent(), Toolkit.i18nText("Fine-Design_Basic_Sync_Info_Information"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, QUESTION_MESSAGE, IOUtils.readIcon("com/fr/design/icon/versioncheck/question.png"), option, 1);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION, QUESTION_MESSAGE, IOUtils.readIcon("com/fr/design/icon/versioncheck/question.png"), option, 1);
            if (0 == a) {
                progressBar.setVisible(true);
                progressBar.setString(Toolkit.i18nText("Fine-Design_Update_Info_Wait_Message"));
--- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
+++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
@ -950,7 +950,7 @@ public class FILEChooserPane extends BasicPane {
        if (access(selectedFile) && access(currentDirectory)) {
            if (selectedFile.exists()) {
                int selVal = FineJOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?",
-                        Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+                        Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
                if (selVal == JOptionPane.YES_OPTION) {
                    option = JOPTIONPANE_OK_OPTION;
                    saveDictionary();
--- a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
@ -104,7 +104,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
    public void installOnline() {

        int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Download_Online_Sources"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);

        if (choose == JOptionPane.OK_OPTION) {
            initDialog();
@ -237,7 +237,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {

        if (result) {
            int choose = FineJOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);

            if (choose == JOptionPane.OK_OPTION) {
                RestartHelper.restart();
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
@ -221,7 +221,7 @@ public class XCardSwitchButton extends XButton {
 	private void deleteCard(XCardSwitchButton button, int index){
 		String titleName = button.getContentLabel().getText();
 		int value = FineJOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”",
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 		if (value != JOptionPane.OK_OPTION) {
 			return;
 		}
@ -402,7 +402,7 @@ public class XCardSwitchButton extends XButton {
 	private void deleteTabLayout(SelectionModel selectionModel, FormDesigner designer){
 		String titleName = this.getContentLabel().getText();
 		int value = FineJOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”",
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 		if (value != JOptionPane.OK_OPTION) {
 			return;
 		}
--- a/designer-form/src/main/java/com/fr/design/fit/toolbar/SwitchAction.java
+++ b/designer-form/src/main/java/com/fr/design/fit/toolbar/SwitchAction.java
@ -233,7 +233,7 @@ public class SwitchAction extends UpdateAction {
        int returnVal = FineJOptionPane.showConfirmDialog(
                DesignerContext.getDesignerFrame(),
                message,
-                Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                YES_NO_OPTION);
        return returnVal == JOptionPane.YES_OPTION;
    }
@ -249,7 +249,7 @@ public class SwitchAction extends UpdateAction {
        int returnVal = FineJOptionPane.showConfirmDialog(
                DesignerContext.getDesignerFrame(),
                Toolkit.i18nText("Fine-Designer_Fit_Cover_File_Switch"),
-                Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                YES_NO_OPTION);
        return returnVal == JOptionPane.YES_OPTION;
    }
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
@ -8,11 +8,11 @@ import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
-import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@ -540,21 +540,26 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
        }
        //获取在容器的绝对位置
        Rectangle rec = ComponentUtils.getRelativeBounds(creator);
+        // 组件实际大小、位置要考虑缩放
        int dWidth = getDesignerWidth();
-        if (rec.width <= dWidth && rec.x < getHorizontalValue()) {
+        double recRealWidth = rec.width * designer.getScale();
+        double recRealX = rec.x * designer.getScale();
+        if (recRealWidth <= dWidth && recRealX < getHorizontalValue()) {
            //在边界内部且x位置小于水平滚动条的值
-            horScrollBar.setValue(rec.x);
-        } else if (rec.x + rec.width > dWidth + horizontalValue) {
+            horScrollBar.setValue((int) recRealX);
+        } else if (recRealX + recRealWidth > dWidth + horizontalValue) {
            //超出边界宽度
-            horScrollBar.setValue(rec.x + rec.width - dWidth);
+            horScrollBar.setValue((int) (recRealX + recRealWidth - dWidth));
        }
        int dHeight = getDesignerHeight();
-        if (rec.height < dHeight && rec.y < getVerticalValue()) {
+        double recRealHeight = rec.height * designer.getScale();
+        double recRealY = rec.y * designer.getScale();
+        if (recRealHeight < dHeight && recRealY < getVerticalValue()) {
            //在边界内部且y位置小于竖直滚动条的值
-            verScrollBar.setValue(rec.y);
-        } else if (rec.y + rec.height > dHeight + verticalValue) {
+            verScrollBar.setValue((int) recRealY);
+        } else if (recRealY + recRealHeight > dHeight + verticalValue) {
            //超出边界高度
-            verScrollBar.setValue(rec.y + rec.height - dHeight);
+            verScrollBar.setValue((int) (recRealY + recRealHeight - dHeight));
        }
    }

--- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
@ -289,7 +289,7 @@ public class FormEditToolBar extends BasicPane {
                return;
            }
            int val = FineJOptionPane.showConfirmDialog(FormEditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
            if (val != JOptionPane.YES_OPTION) {
                return;
            }
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/group/ui/GroupFileDialog.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/group/ui/GroupFileDialog.java
@ -123,6 +123,7 @@ abstract public class GroupFileDialog extends BaseGroupDialog {
    private UILabel creteNewNameLabel() {
        // 输入框前提示
        UILabel newNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Group_Enter_New_Folder_Name"));
+        newNameLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Share_Group_Enter_New_Folder_Name"));
        newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
        newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
        newNameLabel.setPreferredSize(new Dimension(84, 16));
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
@ -209,7 +209,7 @@ public class DownloadSuitableThemeAction extends SharedComponentPopupAction {
            int returnVal = FineJOptionPane.showConfirmDialog(
                    window,
                    Toolkit.i18nText("Fine-Design_Share_Apply_Suitable_Theme_Tip"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    FineJOptionPane.OK_CANCEL_OPTION);
            if (returnVal == JOptionPane.YES_OPTION) {
                applyTheme(currentTemplate, theme.getName(), window);
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/installation/TemplateThemeInstallation.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/installation/TemplateThemeInstallation.java
@ -199,7 +199,7 @@ public class TemplateThemeInstallation extends AsyncInstallation {
            int returnVal = FineJOptionPane.showConfirmDialog(
                    window,
                    Toolkit.i18nText("Fine-Design_Share_Apply_Suitable_Theme_Tip"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    FineJOptionPane.OK_CANCEL_OPTION);
            if (returnVal == JOptionPane.YES_OPTION) {
                applyTheme(currentFormTemplate, theme.getName(), window);
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java
@ -82,7 +82,7 @@ public class OnlineWidgetPackagesShowPane extends AbstractOnlineWidgetShowPane {
                        + Toolkit.i18nText("Fine-Design_Share_Total")
                        + onlineWidgetSelectPane.getSharableWidgetNum()
                        + Toolkit.i18nText("Fine-Design_Share_Piece");
-                int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), message, Toolkit.i18nText("Fine-Design_Basic_Confirm"), FineJOptionPane.YES_NO_OPTION);
+                int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), message, Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), FineJOptionPane.YES_NO_OPTION);
                if (returnValue == FineJOptionPane.OK_OPTION && onlineWidgetSelectPane.getSharableWidgetNum() != 0) {
                    downLoadPackage();
                }
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterConfigPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/widgetfilter/FilterConfigPane.java
@ -149,6 +149,7 @@ public abstract class FilterConfigPane extends JPanel {

    private FilterCheckBox createCheckBox(WidgetFilterInfo filterInfo) {
        final FilterCheckBox checkBox = new FilterCheckBox(filterInfo.getName(), filterInfo);
+        checkBox.setToolTipText(filterInfo.getName());
        checkBox.setBackground(Color.WHITE);
        checkBox.addItemListener(new ItemListener() {
            @Override
--- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
@ -906,7 +906,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
                return;
            }
            int returnValue = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Remove_Work_Sheet"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                    JOptionPane.OK_CANCEL_OPTION);
            if (returnValue == JOptionPane.OK_OPTION) {
                if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
@ -238,7 +238,7 @@ public class DownloadComponentPackageGuide {
                themeConfirmDialog = GuideCreateUtils.showConfirmDialog(
                        DesignerContext.getDesignerFrame(),
                        Toolkit.i18nText("Fine-Design_Share_Apply_Suitable_Theme_Tip"),
-                        Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                        Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                        FineJOptionPane.OK_CANCEL_OPTION);
                return true;
            }
--- a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
@ -152,7 +152,7 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
 		if (isLayerReportBox.isSelected()) {
 			if (!ReportUtils.isLayerReportUsable(worksheet)) {
 				int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?",
-						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 				if (value != JOptionPane.YES_OPTION) {
 					isLayerReportBox.setSelected(false);
 				}
--- a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
@ -298,7 +298,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
        if (clientPaging.isSelected()) {
            if (!ReportUtils.isLayerReportUsable(worksheet)) {
                int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?",
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
                if (value != JOptionPane.YES_OPTION) {
                    clientPaging.setSelected(false);
                }
--- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
@ -332,7 +332,7 @@ public class EditToolBar extends BasicPane {
                return;
            }
            int val = FineJOptionPane.showConfirmDialog(EditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
            if (val != JOptionPane.YES_OPTION) {
                return;
            }
--- a/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java
@ -173,7 +173,7 @@ public class EventPane extends BasicPane {
 			}

 			int val = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EventPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?",
-					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
 					JOptionPane.YES_NO_OPTION);
 			if (val != JOptionPane.YES_OPTION) {
 				return;