Merge pull request #3738 in DESIGN/design from bugfix/10.0 to release/10.0

* commit '4d62bbf253d9ab3076d39a74702e105baa199e01':
  REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
  REPORT-48324 聚合报表，超链在设计器中切换模板后显示不对

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"));
+					}
+				});
 			}
 		};
 		

designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java

@@ -176,6 +176,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
         // 超级链接
         HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
                 .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+        EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
         hyperlinkGroupPane.populate(editComponent);
     }