Merge pull request #662 in BA/design from ~XIAOXIA/design:dev to dev

* commit '5a16de43fa8ede11ce2e05662b0781cf96b992c2':
  rt
  rt
  rt
  rt
  rt

designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -7,6 +7,7 @@ import com.fr.base.ParameterHelper;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.NameDatabaseConnection;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
@@ -17,6 +18,7 @@ import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.fun.DBTableDataMenuHandler;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
@@ -34,7 +36,6 @@ import com.fr.general.Inter;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -53,11 +54,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	private ConnectionTableProcedurePane connectionTableProcedurePane;
 	private UITableEditorPane<ParameterProvider> editorPane;
 
+	private DBTableDataMenuHandler dbTableDataMenuHandler;
 	private SQLEditPane sqlTextPane;
 	private UICheckBox isShareCheckBox;
 	private MaxMemRowCountPanel maxPanel;
 	private String pageQuery = null;
-	private String customCountQuery = null;
+	private DBTableData dbTableData;
+
 
 
 	public DBTableDataPane() {
@@ -149,11 +152,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	}
 
 	private void refresh() {
-		String[] paramTexts = new String[3];
+		String[] paramTexts = new String[2];
 		paramTexts[0] = sqlTextPane.getText();
 		paramTexts[1] = pageQuery;
-		paramTexts[2] = customCountQuery;
-
 		List<ParameterProvider> existParameterList = editorPane.update();
 		Parameter[] ps = existParameterList == null ? new Parameter[0] : existParameterList.toArray(new Parameter[existParameterList.size()]);
 
@@ -166,8 +167,11 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		toolBarDef.addShortCut(new PreviewAction());
 		toolBarDef.addShortCut(SeparatorDef.DEFAULT);
 		toolBarDef.addShortCut(new EditPageQueryAction());
-		toolBarDef.addShortCut(SeparatorDef.DEFAULT);
-		toolBarDef.addShortCut(new EditCustomCountQueryAction());
+		dbTableDataMenuHandler = ExtraDesignClassManager.getInstance().getSingle(DBTableDataMenuHandler.MARK_STRING);
+		if (dbTableDataMenuHandler != null) {
+			toolBarDef.addShortCut(SeparatorDef.DEFAULT);
+			toolBarDef.addShortCut(dbTableDataMenuHandler.createQueryAction());
+		}
 		isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData"));
 		maxPanel = new MaxMemRowCountPanel();
 		maxPanel.setBorder(null);
@@ -179,11 +183,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	}
 
 	private void checkParameter() {
-		String[] paramTexts = new String[3];
+		String[] paramTexts = new String[2];
 		paramTexts[0] = sqlTextPane.getText();
 		paramTexts[1] = pageQuery;
-		paramTexts[2] = customCountQuery;
-
 		Parameter[] parameters = ParameterHelper.analyze4Parameters(paramTexts, false);
 
 		if (parameters.length < 1 && editorPane.update().size() < 1) {
@@ -210,6 +212,10 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 	@Override
 	public void populateBean(DBTableData dbtabledata) {
+		this.dbTableData = dbtabledata;
+		if (dbTableDataMenuHandler != null) {
+			dbTableDataMenuHandler.populate(dbtabledata);
+		}
 		ParameterProvider[] parameters = null;
 
 		Calculator c = Calculator.createCalculator();
@@ -227,8 +233,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		isShare = dbtabledata.isShare();
 		maxMemeryRow = dbtabledata.getMaxMemRowCount();
 		this.pageQuery = dbtabledata.getPageQuerySql();
-		this.customCountQuery = dbtabledata.getCustomCountQuery();
-
 		this.connectionTableProcedurePane.setSelectedDatabaseConnection(db);
 		this.sqlTextPane.setText(query);
 		this.sqlTextPane.requestFocus();
@@ -253,7 +257,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		List<ParameterProvider> parameterList = editorPane.update();
 		Parameter[] parameters = parameterList.toArray(new Parameter[parameterList.size()]);
 
-		DBTableData dbTableData = new DBTableData();
 		dbTableData.setDatabase(new NameDatabaseConnection(dbName));
 
 		// p:必须先设置Parameters数组，因为setQuery里面会自动设置的
@@ -264,8 +267,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		dbTableData.setShare(isShareCheckBox.isSelected());
 		dbTableData.setMaxMemRowCount(maxPanel.getValue());
 		dbTableData.setPageQuerySql(this.pageQuery);
-		dbTableData.setCustomCountQuery(this.customCountQuery);
-
+		if (dbTableDataMenuHandler != null) {
+			dbTableDataMenuHandler.update();
+		}
 		return dbTableData;
 	}
 
@@ -318,28 +322,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		}
 	}
 
-	private class EditCustomCountQueryAction extends UpdateAction {
-		public EditCustomCountQueryAction() {
-			this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery"));
-			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery"));
-			editPane.populate(customCountQuery);
-			BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame());
-			dialog.addDialogActionListener(new DialogActionAdapter() {
-				public void doOk() {
-					customCountQuery = editPane.update();
-					checkParameter();
-				}
-			});
-			dialog.setVisible(true);
-
-		}
-	}
-
 	private class QueryPane extends BasicPane {
 		private SQLEditPane pageQueryPane;
 		private String title;

designer_base/src/com/fr/design/fun/DBTableDataMenuHandler.java

@@ -0,0 +1,22 @@
+package com.fr.design.fun;
+
+import com.fr.data.impl.DBTableData;
+import com.fr.design.actions.UpdateAction;
+import com.fr.stable.fun.mark.Immutable;
+
+/**
+ * Created by xiaxiang on 2017/1/15.
+ */
+public interface DBTableDataMenuHandler extends Immutable {
+    String MARK_STRING = "DBTableDataMenuHandler";
+
+    int CURRENT_LEVEL = 1;
+
+    UpdateAction createQueryAction();
+
+    void populate(DBTableData dbTableData);
+
+    DBTableData update();
+
+
+}

designer_base/src/com/fr/design/fun/impl/AbstractDBTableDataMenuHandler.java

@@ -0,0 +1,34 @@
+package com.fr.design.fun.impl;
+
+import com.fr.data.impl.DBTableData;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.fun.DBTableDataMenuHandler;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by xiaxiang on 2017/1/15.
+ */
+@API(level = DBTableDataMenuHandler.CURRENT_LEVEL)
+public abstract class AbstractDBTableDataMenuHandler implements DBTableDataMenuHandler {
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+
+    public UpdateAction createQueryAction() {
+        return null;
+    }
+
+    @Override
+    public DBTableData update() {
+        return null;
+    }
+
+    @Override
+    public void populate(DBTableData dbTableData) {
+
+    }
+}