Merge remote-tracking branch 'origin/dev' into dev

designer_base/src/com/fr/design/data/DesignTableDataManager.java

@@ -36,7 +36,6 @@ import java.io.ByteArrayOutputStream;
 import java.text.Collator;
 import java.util.*;
 import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 设计器管理操作数据集的类:
@@ -319,7 +318,6 @@ public abstract class DesignTableDataManager {
     }
 
 
-
     private static void addStoreProcedureData(java.util.Map<String, TableDataWrapper> resMap) {
         DatasourceManagerProvider mgr = DatasourceManager.getProviderInstance();
         String[] namearray = new String[0];
@@ -381,42 +379,34 @@ public abstract class DesignTableDataManager {
     private static EmbeddedTableData previewTableData(TableData tabledata, int rowCount, boolean isMustInputParameters, boolean needLoadingBar) throws Exception {
         final AutoProgressBar loadingBar = PreviewTablePane.getInstance().getProgressBar();
         Env currentEnv = FRContext.getCurrentEnv();
-        EmbeddedTableData embeddedTableData = null;
         ParameterProvider[] parameters = currentEnv.getTableDataParameters(tabledata);
-        boolean isNullParameter = parameters == null || parameters.length == 0;
-        ParameterProvider[] tableDataParameter = tabledata.getParameters(Calculator.createCalculator());
-        boolean isOriginalNUllParameter = tableDataParameter == null || tableDataParameter.length == 0;
-        if (isNullParameter && !isOriginalNUllParameter) {
-            parameters = tableDataParameter;
-        }
-        boolean hasValue = true;
-        for (ParameterProvider parameter : parameters) {
-            if (parameter.getValue() == null || ComparatorUtils.equals(StringUtils.EMPTY, parameter.getValue())) {
-                hasValue = false;
-                break;
+        if (ArrayUtils.isEmpty(parameters)) {
+            parameters = tabledata.getParameters(Calculator.createCalculator());
         }
-        }
-        final Map<String, Object> parameterMap = new HashMap<String, Object>();
-        if (!hasValue || isMustInputParameters) {
-            if (parameters != null && parameters.length > 0) {
+        final Map<String, Object> parameterMap = new HashMap<>();
+        if (needInputParams(isMustInputParameters, parameters)) {
             final ParameterInputPane pPane = new ParameterInputPane(parameters);
             pPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
-
+                @Override
                 public void doOk() {
                     parameterMap.putAll(pPane.update());
                 }
             }).setVisible(true);
-            }
         } else {
-            for (int i = 0; i < parameters.length; i++) {
-                parameterMap.put(parameters[i].getName(), parameters[i].getValue());
+            for (ParameterProvider parameter : parameters) {
+                parameterMap.put(parameter.getName(), parameter.getValue());
             }
         }
         if (loadingBar != null && needLoadingBar) {
             loadingBar.start();
         }
         try {
-            embeddedTableData = currentEnv.previewTableData(tabledata, parameterMap, rowCount);
+            for (ParameterProvider parameter : currentEnv.getTableDataParameters(tabledata)) {
+                if (parameterMap.containsKey(parameter.getName())) {
+                    parameter.setValue(parameterMap.get(parameter.getName()));
+                }
+            }
+            return currentEnv.previewTableData(tabledata, parameterMap, rowCount);
         } catch (TableDataException e) {
             throw new TableDataException(e.getMessage(), e);
         } finally {
@@ -426,7 +416,18 @@ public abstract class DesignTableDataManager {
                 }
             }, 100);
         }
-        return embeddedTableData;
+    }
+
+    private static boolean needInputParams(boolean mustInputParameters, ParameterProvider[] parameters) {
+        if (mustInputParameters && ArrayUtils.isNotEmpty(parameters)) {
+            return true;
+        }
+        for (ParameterProvider parameter : parameters) {
+            if (parameter.getValue() == null || StringUtils.EMPTY.equals(parameter.getValue())) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -495,6 +496,4 @@ public abstract class DesignTableDataManager {
     public static void setThreadLocal(String value) {
         threadLocal.set(value);
     }
-
-
 }