Pull request #2914: REPORT-41512 存储过程返回多个数据集在fr中调用只能返回一个

Merge in DESIGN/design from ~ZACK/design:bugfix/10.0 to bugfix/10.0

* commit 'bcf447776f983c9f613473b9c8137a80a3d2bea8':
  REPORT-41512 存储过程返回多个数据集在fr中调用只能返回一个

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@@ -5,6 +5,7 @@ import com.fr.base.StoreProcedureParameter;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
+import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.actions.UpdateAction;
@@ -29,13 +30,19 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.ConnectionConfig;
-
-import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.JToolBar;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -273,7 +280,8 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
                 protected Void doInBackground() throws Exception {
                     DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
                     sp.setCalculating(true);
-                    sp.creatDataModel(Calculator.createCalculator());
+                    ProcedureDataModel[] dataModels = DesignTableDataManager.createLazyDataModel(sp, false);
+                    sp.refreshDataModelListAndResultNames(dataModels);
                     return null;
                 }