Merge pull request #3761 in DESIGN/design from feature/10.0 to research/10.0

* commit '20813c2ed9c5a6ec7804a0e63e513e531dc3c4aa': REPORT-49782 补充因代码冲突删去的SVG图标【问题原因】补充因代码冲突删去的SVG图标【改动思路】补充因代码冲突删去的SVG图标无JIRA任务上传下因代码冲突被删除的svg图标 REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效 REPORT-48965 使用批量添加减少容器复制次数 REPORT-48965 出现concurrentModification异常 REPORT-48324 聚合报表，超链在设计器中切换模板后显示不对 REPORT-46723 填报智能添加单元格组遗漏一个判断条件的同步修改 REPORT-46723 填报智能添加单元格组 CHART-18429 点类地图散点条件属性默认值 REPORT-45944 ui调整 REPORT-48324 聚合报表，超链在设计器中切换模板后显示不对 REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效 REPORT-47438 判断跟随自主界面的条件再优化补充下 REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置 REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置 REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕
3 years ago · d859327e80
17 changed files with 109 additions and 23 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
+++ b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
@ -13,12 +13,14 @@ import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArraySet;

 /**
 * 插入单元格元素和插入悬浮元素的一些集合方法
@ -27,8 +29,8 @@ import java.util.concurrent.ConcurrentMap;
 * @version 2017年11月17日14点39分
 */
 public class ActionFactory {
-    private static LinkedHashSet<Class<?>> actionClasses = new LinkedHashSet<>();
-    private static LinkedHashSet<Class<?>> floatActionClasses = new LinkedHashSet<>();
+    private static Set<Class<?>> actionClasses = new CopyOnWriteArraySet<>();
+    private static Set<Class<?>> floatActionClasses = new CopyOnWriteArraySet<>();
    private static Class chartCollectionClass = null;
    /**
     * 无需每次实例化的悬浮元素编辑器
@ -256,14 +258,14 @@ public class ActionFactory {
     */
    public static void registerCellInsertActionClass(Class<?>[] cls) {
        if (cls != null) {
-            Collections.addAll(actionClasses, cls);
+            actionClasses.addAll(Arrays.asList(cls));
        }
    }

    public static void referCellInsertActionClass(Class<?>[] cls) {
        if (cls != null) {
            actionClasses.clear();
-            Collections.addAll(actionClasses, cls);
+            actionClasses.addAll(Arrays.asList(cls));
        }
    }

@ -321,14 +323,14 @@ public class ActionFactory {
     */
    public static void registerFloatInsertActionClass(Class<?>[] cls) {
        if (cls != null) {
-            Collections.addAll(floatActionClasses, cls);
+            floatActionClasses.addAll(Arrays.asList(cls));
        }
    }

    public static void referFloatInsertActionClass(Class<?>[] cls) {
        if (cls != null) {
            floatActionClasses.clear();
-            Collections.addAll(floatActionClasses, cls);
+            floatActionClasses.addAll(Arrays.asList(cls));
        }
    }

--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
@ -169,7 +169,6 @@ public class PreviewTablePane extends BasicPane {
        this.add(new JScrollPane(preveiwTable), BorderLayout.CENTER);
        if (this.dialog == null) {
            this.dialog = this.showWindow(new JFrame());
-            GUICoreUtils.centerWindow(DesignerContext.getDesignerFrame(), this.dialog);
        }
        progressBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
            public void doMonitorCanceled() {
--- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
@ -16,6 +16,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.locale.impl.BbsRegisterMark;
 import com.fr.design.locale.impl.BbsResetMark;
 import com.fr.design.locale.impl.BbsSpaceMark;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.general.CloudCenter;
 import com.fr.general.locale.LocaleCenter;
@ -401,6 +402,7 @@ public class PluginWebBridge {
        if (uiDialog != null) {
            uiDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
            uiDialog.setVisible(false);
+            DesignerPluginContext.setPluginDialog(null);
        }
    }

--- a/designer-base/src/main/java/com/fr/design/extra/ShopDialog.java
+++ b/designer-base/src/main/java/com/fr/design/extra/ShopDialog.java
@ -3,6 +3,7 @@ package com.fr.design.extra;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.jdk.JdkVersion;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StableUtils;

@ -25,6 +26,7 @@ public class ShopDialog extends UIDialog {
        setSize(createDefaultDimension());
        GUICoreUtils.centerWindow(this);
        setResizable(false);
+        DesignerPluginContext.setPluginDialog(this);
    }

    private Dimension createDefaultDimension() {
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
@ -5,6 +5,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.i18n.Toolkit;

+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
@ -31,9 +32,9 @@ public class ModifyStatusCallback implements PluginTaskCallback{
                    pluginInfo + Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") :
                    pluginInfo + Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate");
            FineLoggerFactory.getLogger().info(modifyMessage);
-            FineJOptionPane.showMessageDialog(null, modifyMessage);
+            FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), modifyMessage);
        } else {
-            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }
    }

--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@ -977,6 +977,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     * @param jt 添加的模板.
     */
    public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (currentEditingTemplate != null) {
+            currentEditingTemplate.stopEditing();
+        }
        //切换文件后清空FixedPopupPane面板
        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
        //释放模板对象
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@ -598,7 +598,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
            });
            // 重名提示
            warnLabel = new UILabel();
-            warnLabel.setPreferredSize(new Dimension(300, 30));
+            warnLabel.setPreferredSize(new Dimension(300, 50));
            warnLabel.setHorizontalAlignment(SwingConstants.LEFT);
            warnLabel.setVerticalAlignment(SwingConstants.TOP);
            warnLabel.setForeground(Color.RED);
@ -641,7 +641,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                                    new Component[]{midPanel},
                                    new Component[]{buttonsPane}
                            },
-                            new double[]{TableLayout.FILL, TableLayout.FILL, TableLayout.PREFERRED},
+                            new double[]{TableLayout.FILL, TableLayout.PREFERRED, TableLayout.PREFERRED},
                            new double[]{TableLayout.FILL}
                    ),
                    BorderLayout.CENTER);
@ -803,7 +803,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
            });
            // 重名提示
            warnLabel = new UILabel();
-            warnLabel.setPreferredSize(new Dimension(300, 30));
+            warnLabel.setPreferredSize(new Dimension(300, 50));
            warnLabel.setHorizontalAlignment(SwingConstants.LEFT);
            warnLabel.setVerticalAlignment(SwingConstants.TOP);
            warnLabel.setForeground(Color.RED);
@ -848,7 +848,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                                    new Component[]{midPanel},
                                    new Component[]{bottomPanel}
                            },
-                            new double[]{TableLayout.FILL, TableLayout.FILL, TableLayout.PREFERRED},
+                            new double[]{TableLayout.FILL, TableLayout.PREFERRED, TableLayout.PREFERRED},
                            new double[]{TableLayout.FILL}
                    ),
                    BorderLayout.CENTER);
--- a/designer-base/src/main/java/com/fr/design/plugin/DesignerPluginContext.java
+++ b/designer-base/src/main/java/com/fr/design/plugin/DesignerPluginContext.java
@ -0,0 +1,21 @@
+package com.fr.design.plugin;
+
+import com.fr.design.dialog.UIDialog;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/3/8
+ */
+public class DesignerPluginContext {
+
+    private static UIDialog DIALOG;
+
+    public static UIDialog getPluginDialog() {
+        return DIALOG;
+    }
+
+    public static void setPluginDialog(UIDialog pluginDialog) {
+        DesignerPluginContext.DIALOG = pluginDialog;
+    }
+}
--- a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
@ -6,6 +6,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
@ -114,6 +115,7 @@ public class UpmFinder {
            dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
            dialog.setVisible(false);
            dialog = null;
+            DesignerPluginContext.setPluginDialog(null);
        }
    }
 }
--- a/designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java
@ -2,6 +2,7 @@ package com.fr.design.upm;

 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.GUICoreUtils;

 import javax.swing.*;
@ -25,6 +26,7 @@ public class UpmShowDialog extends UIDialog {
        setSize(DEFAULT_SHOP);
        GUICoreUtils.centerWindow(this);
        setResizable(false);
+        DesignerPluginContext.setPluginDialog(this);
    }

    @Override
--- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
@ -38,6 +38,7 @@ import com.fr.stable.Constants;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;

+import java.awt.Container;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.BorderFactory;
@ -318,7 +319,14 @@ public final class GUICoreUtils {
 	public static void centerWindow(Window win) {
 		// Toolkit.getDefaultToolkit().getScreenSize()在有多个显示器也只能获取到主屏的大小
 		// getGraphicsConfiguration().getBounds()能获取多个屏时 设计器主体界面所在屏的大小和对应的坐标
-		Rectangle rectangle = win.getGraphicsConfiguration().getBounds();
+		Rectangle rectangle;
+		Container parent = win.getParent();
+		boolean displayByDesignerFrame = (DesignerContext.getDesignerFrame() != null && parent == null) || (parent != null && !parent.isVisible() && DesignerContext.getDesignerFrame() != null);
+		if (displayByDesignerFrame) {
+			rectangle = DesignerContext.getDesignerFrame().getGraphicsConfiguration().getBounds();
+		} else {
+			rectangle = win.getGraphicsConfiguration().getBounds();
+		}
 		centerWindow(win, rectangle);
 	}

--- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh_normal.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh_normal.svg
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_刷新_normal</title>
+    <g id="icon_刷新_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.0593807,1 C13.4802225,1 13.8213822,1.34115968 13.8213822,1.76200147 L13.8213822,1.76200147 L13.8213822,5.2534957 C13.8213822,5.67433749 13.4802225,6.01549717 13.0593807,6.01549717 L13.0593807,6.01549717 L9.56788646,6.01549717 C9.14704467,6.01549717 8.80588499,5.67433749 8.80588499,5.2534957 C8.80588499,4.83265391 9.14704467,4.49149423 9.56788646,4.49149423 L9.56788646,4.49149423 L11.169634,4.48959417 C10.8434607,4.27112237 10.4895308,4.09123525 10.1125367,3.95402064 C7.56533579,3.02691531 4.74885407,4.34026231 3.82174874,6.88746326 C2.89464341,9.43466421 4.20799041,12.2511459 6.75519136,13.1782513 C9.30239231,14.1053566 12.118874,12.7920096 13.0459794,10.2448086 C13.1899157,9.84934672 13.6271844,9.64544497 14.0226464,9.78938133 C14.4181083,9.9333177 14.62201,10.3705864 14.4780737,10.7660483 C13.2630956,14.1041731 9.57207646,15.8253236 6.23395166,14.6103456 C2.89582685,13.3953675 1.17467636,9.70434836 2.38965442,6.36622356 C3.60463249,3.02809876 7.29565164,1.30694826 10.6337764,2.52192632 C11.3047108,2.76612647 11.9217951,3.11486447 12.467588,3.55405023 L12.297,3.423 L12.2973792,1.76200147 C12.2973792,1.37622983 12.5840481,1.05741329 12.9559816,1.00695618 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>
--- a/designer-base/src/main/resources/com/fr/design/images/control/edit_disable.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/control/edit_disable.svg
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_编辑_disable</title>
+    <g id="icon_编辑_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.299107143">
+        <path d="M9.95422984,2.34704298 L13.4897637,5.88257688 L6.18790578,13.1844348 L0.884604926,14.9522018 L2.65237188,9.64890094 L9.95422984,2.34704298 Z M13.4897637,1.6399362 L14.1968705,2.34704298 C14.9368113,3.08698374 14.9757555,4.2624679 14.3137033,5.04825533 L14.1968705,5.1754701 L10.6613366,1.6399362 C11.4423852,0.858887612 12.7087152,0.858887612 13.4897637,1.6399362 Z" id="形状结合" fill="#333334"></path>
+        <rect id="矩形" fill="#333334" x="7" y="14" width="7" height="1"></rect>
+    </g>
+</svg>
--- a/designer-base/src/main/resources/com/fr/design/images/control/remove_disable.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/control/remove_disable.svg
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_删除_normal</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <g id="工具栏/导入数据集" transform="translate(-78.000000, -7.000000)" fill="#333334">
+            <g id="icon_删除_normal" transform="translate(77.000000, 6.000000)">
+                <path d="M11,1 L11,3 L15,3 L15,4 L13,4 L13,15 L3,15 L3,4 L1,4 L1,3 L5,3 L5,1 L11,1 Z M12,4 L4,4 L4,14 L12,14 L12,4 Z M7,6 L7,12 L6,12 L6,6 L7,6 Z M10,6 L10,12 L9,12 L9,6 L10,6 Z M10,2 L6,2 L6,3 L10,3 L10,2 Z" id="Combined-Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disable.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_disable.svg
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="14px" viewBox="0 0 12 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_报表web属性_打印预览_normal</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <g id="工具栏/导入数据集" transform="translate(-116.000000, -7.000000)" fill="#333334">
+            <g id="icon_报表web属性_打印预览_normal" transform="translate(114.000000, 6.000000)">
+                <path d="M9.5,7 C11.432875,7 13,8.567125 13,10.5 C13,11.1075915 12.845147,11.679042 12.5727578,12.1770349 C12.6203353,12.2075319 12.6650188,12.2450114 12.7069,12.287 L13.7129,13.293 C14.1039,13.684 14.1039,14.316 13.7129,14.707 C13.5179,14.902 13.2619,15 13.0059,15 C12.7499,15 12.4939,14.902 12.2989,14.707 L11.2929,13.701 C11.251507,13.6597129 11.2144961,13.6157024 11.1818672,13.5695439 C10.6844106,13.8436886 10.110446,14 9.5,14 C7.567125,14 6,12.432875 6,10.5 C6,8.567125 7.567125,7 9.5,7 Z M10,1 L14,5 L14,8 L13,8 L13,6 L9,6 L9,2 L3,2 L3,14 L7,14 L7,15 L2,15 L2,1 L10,1 Z M9.5,8 C10.8783333,8 12,9.12166667 12,10.5 C12,11.8783333 10.8783333,13 9.5,13 C8.12166667,13 7,11.8783333 7,10.5 C7,9.12166667 8.12166667,8 9.5,8 Z M12.587,5 L10,2.414 L10,5 L12.587,5 Z" id="Combined-Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/designer-base/src/main/resources/com/fr/design/images/m_file/preview_normal.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/m_file/preview_normal.svg
@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="14px" viewBox="0 0 12 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_报表web属性_打印预览_normal备份</title>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Combined-Shape" transform="translate(-2.000000, -1.000000)" fill="#333334">
-            <path d="M9.5,7 C11.432875,7 13,8.567125 13,10.5 C13,11.1075915 12.845147,11.679042 12.5727578,12.1770349 C12.6203353,12.2075319 12.6650188,12.2450114 12.7069,12.287 L13.7129,13.293 C14.1039,13.684 14.1039,14.316 13.7129,14.707 C13.5179,14.902 13.2619,15 13.0059,15 C12.7499,15 12.4939,14.902 12.2989,14.707 L11.2929,13.701 C11.251507,13.6597129 11.2144961,13.6157024 11.1818672,13.5695439 C10.6844106,13.8436886 10.110446,14 9.5,14 C7.567125,14 6,12.432875 6,10.5 C6,8.567125 7.567125,7 9.5,7 Z M10,1 L14,5 L14,8 L13,8 L13,6 L9,6 L9,2 L3,2 L3,14 L7,14 L7,15 L2,15 L2,1 L10,1 Z M9.5,8 C10.8783333,8 12,9.12166667 12,10.5 C12,11.8783333 10.8783333,13 9.5,13 C8.12166667,13 7,11.8783333 7,10.5 C7,9.12166667 8.12166667,8 9.5,8 Z M12.587,5 L10,2.414 L10,5 L12.587,5 Z"></path>
-        </g>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_预览_normal</title>
+    <g id="icon_预览_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9.5,7 C11.432875,7 13,8.567125 13,10.5 C13,11.1075915 12.845147,11.679042 12.5727578,12.1770349 C12.6203353,12.2075319 12.6650188,12.2450114 12.7069,12.287 L13.7129,13.293 C14.1039,13.684 14.1039,14.316 13.7129,14.707 C13.5179,14.902 13.2619,15 13.0059,15 C12.7499,15 12.4939,14.902 12.2989,14.707 L11.2929,13.701 C11.251507,13.6597129 11.2144961,13.6157024 11.1818672,13.5695439 C10.6844106,13.8436886 10.110446,14 9.5,14 C7.567125,14 6,12.432875 6,10.5 C6,8.567125 7.567125,7 9.5,7 Z M10,1 L14,5 L14,8 L13,8 L13,6 L9,6 L9,2 L3,2 L3,14 L7,14 L7,15 L2,15 L2,1 L10,1 Z M9.5,8 C10.8783333,8 12,9.12166667 12,10.5 C12,11.8783333 10.8783333,13 9.5,13 C8.12166667,13 7,11.8783333 7,10.5 C7,9.12166667 8.12166667,8 9.5,8 Z M12.587,5 L10,2.414 L10,5 L12.587,5 Z" id="Combined-Shape" fill="#333334"></path>
    </g>
-</svg>
+</svg>
--- a/designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java
@ -8,6 +8,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.WorkerAdaptor;

 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@ -140,7 +142,13 @@ public class WriteShortCutsPane extends JPanel{
 				nextRowString = temp;
 				switchColRow();

-				ServerPreferenceConfig.getInstance().setWriteShortCuts(ComparatorUtils.equals(nextColString, "Tab"));
+				Configurations.update(new WorkerAdaptor(ServerPreferenceConfig.class) {
+
+					@Override
+					public void run() {
+						ServerPreferenceConfig.getInstance().setWriteShortCuts(ComparatorUtils.equals(nextColString, "Tab"));
+					}
+				});
 			}
 		};