diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
index 712dcbd33b..2354007e18 100644
--- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
+++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
@@ -572,7 +572,7 @@ public abstract class DesignTableDataManager {
                     parameter.setValue(parameterMap.get(parameter.getName()));
                 }
             }
-            parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+            addTemplateInfoIfNeed(parameterMap);
             return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount);
         } catch (Exception e) {
             throw new TableDataException(e.getMessage(), e);
@@ -592,6 +592,12 @@ public abstract class DesignTableDataManager {
         }
     }
 
+    private static void addTemplateInfoIfNeed(Map<String, Object> parameterMap) {
+        if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) {
+            parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+        }
+    }
+
     private static boolean needInputParams(boolean mustInputParameters, ParameterProvider[] parameters) {
         if (mustInputParameters && ArrayUtils.isNotEmpty(parameters)) {
             return true;
@@ -669,7 +675,7 @@ public abstract class DesignTableDataManager {
         if (needLoadingBar) {
             MultiResultTableDataWrapper.loadingBar.start();
         }
-        parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
+        addTemplateInfoIfNeed(parameterMap);
         return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0);
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 0a00f37041..3c5c2b82a8 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -589,7 +589,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                         } else {
                             path = driverPath;
                         }
-                        if(JarFileParseUtil.hasDuplicateDriver(con.getDriver(), path)) {
+                        if(hasDuplicateDriver(con.getDriver(), path)) {
                             testResult.setForeground(Color.RED);
                             testResult.setText(Toolkit.i18nText("Fine_Designer_Driver_Conflict"));
                         } else {
@@ -605,7 +605,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             return xBorderPanel;
         }
 
-
+        private boolean hasDuplicateDriver(String driver, String folder) {
+            return JarFileParseUtil.hasDuplicateDriver(driver, folder);
+        }
     }
 
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
index b32ea4b67c..ba8d24929d 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
@@ -58,6 +58,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
     //将数据列名保存下来，在update时会删除层级名列表，需要用保存的list重新初始化新的层级名列表
     private List columnNameList;
 
+    //汇总方式求和的索引
+    public static final int SUM_INDEX = 2;
+
     public MultiPiePlotTableDataContentPane() {
     }
 
@@ -241,7 +244,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         for (UIComboBox uiComboBox : levelNameList) {
             clearBoxItems(uiComboBox);
         }
-        clearBoxItems(calculateCombox);
+        //默认选求和
+        calculateCombox.setSelectedIndex(SUM_INDEX);
         refreshCenterPane();
     }
 
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java
index bdd5b7d351..b9c84e5be7 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java
@@ -22,7 +22,6 @@ import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.mobile.ui.MobileCollapsedStyleExpandPane;
 import com.fr.design.mainframe.mobile.ui.MobileComboBoxDialogEditor;
 import com.fr.form.ui.ElementCaseEditor;
-
 import com.fr.form.ui.mobile.MobileCollapsedStyle;
 import com.fr.stable.StringUtils;
 
@@ -30,7 +29,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
 
 /**
  * 报表块-移动端属性面板
@@ -123,7 +124,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
         panelWrapper.add(panel, BorderLayout.NORTH);
         UIExpandablePane folderPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit"), 280, 20, panelWrapper);
         this.add(folderPane, BorderLayout.NORTH);
-        this.bingListeners2Widgets();
         this.setGlobalNames();
         this.repaint();
     }
@@ -165,7 +165,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
     @Override
     public void populate(FormDesigner designer) {
         this.designer = designer;
-        this.addAttributeChangeListener(changeListener);
         ElementCaseEditor elementCaseEditor = (ElementCaseEditor) xCreator.toData();
         this.hComboBox.setSelectedItem(new Item(elementCaseEditor.getHorziontalAttr().description(), elementCaseEditor.getHorziontalAttr()));
         this.vComboBox.setSelectedItem(new Item(elementCaseEditor.getVerticalAttr().description(), elementCaseEditor.getVerticalAttr()));
@@ -178,6 +177,8 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
         this.mobileCollapsedStyleEditor.setStyle(elementCaseEditor.getMobileCollapsedStyle());
         fix(elementCaseEditor.getMobileCollapsedStyle());
         this.mobileCollapsedStyleEditor.setSelected(elementCaseEditor.getMobileCollapsedStyle().isCollapsedWork());
+        this.bingListeners2Widgets();
+        this.addAttributeChangeListener(changeListener);
     }
 
     /**
@@ -191,7 +192,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
 
     @Override
     public void update() {
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
         String globalName = this.getGlobalName();
         switch (globalName) {
             case "hComboBox":
@@ -220,6 +220,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
             style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
             ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style);
         }
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }
 
     private void setGlobalNames() {
diff --git a/designer-realize/src/main/java/com/fr/grid/GridKeyAction.java b/designer-realize/src/main/java/com/fr/grid/GridKeyAction.java
index 12e8ac597a..8432cc819b 100644
--- a/designer-realize/src/main/java/com/fr/grid/GridKeyAction.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridKeyAction.java
@@ -69,28 +69,26 @@ public class GridKeyAction extends AbstractAction {
 		} else if ("right".equals(actionKey)) {
 			selectionMove(ReportConstants.MOVE_DIRECTION_RIGHT);
 		} else if ("up".equals(actionKey)) {
-			selectionMove(ReportConstants.MOVE_DIRECTION_UP);
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_UP);
 		} else if ("down".equals(actionKey)) {
-			selectionMove(ReportConstants.MOVE_DIRECTION_DOWN);
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_DOWN);
 		} else if ("enter".equals(actionKey)) {
-			enterKeyPressed();
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_DOWN);
 		} else if ("tab".equals(actionKey)) {
-			tabKeyPressed();
+			directKeyPressed(ReportConstants.MOVE_DIRECTION_RIGHT);
 		}
 	}
 
-	private void enterKeyPressed() {
-		if (grid.isCellEditing()) {
-			grid.stopEditing();
-		}
-		selectionMove(ReportConstants.MOVE_DIRECTION_DOWN);
-	}
-
-	private void tabKeyPressed() {
+	/**
+	 * 传入方向进行单元格的方向移动
+	 *
+	 * @param direction 方向
+	 */
+	private void directKeyPressed(int direction) {
 		if (grid.isCellEditing()) {
 			grid.stopEditing();
 		}
-		selectionMove(ReportConstants.MOVE_DIRECTION_RIGHT);
+		selectionMove(direction);
 	}
 
 	/**