Merge pull request #1547 in BA/design from ~MOMEAK/design9.0:feature/9.0 to feature/9.0

* commit 'f22a27026f4ac4f00ae6810ec48cb25ebf4aeb22':
  优化打开模板速度时回退了 REPORT-5084的pr，重新修改提交

designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@@ -75,9 +75,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
             EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }
-        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
+        CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
-            CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
-        }
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();

designer/src/com/fr/design/widget/WidgetEventPane.java

@@ -91,7 +91,7 @@ public class WidgetEventPane extends ObjectUIControlPane {
 
 				@Override
 				protected DBManipulationPane createDBManipulationPane() {
-					if(epane == null) {
+					if(epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
 						return autoCreateDBManipulationInWidgetEventPane();
 					}