Browse Source

Merge pull request #11058 in DESIGN/design from bugfix/11.0 to feature/x

* commit '8385f90c4c9df6f6a3636272e73d2e440595d791':
  REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
feature/x
superman 2 years ago
parent
commit
5f09255887
  1. 3
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

3
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@ -41,7 +41,6 @@ import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLPrintWriter;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -650,7 +649,6 @@ public abstract class DesignTableDataManager {
} }
private static void showParaWindow(final Map<String, Object> parameterMap, ParameterProvider[] inParameters) { private static void showParaWindow(final Map<String, Object> parameterMap, ParameterProvider[] inParameters) {
SwingUtilities.invokeLater(() -> {
final ParameterInputPane pPane = new ParameterInputPane(inParameters); final ParameterInputPane pPane = new ParameterInputPane(inParameters);
pPane.showSmallWindow(new JFrame(), new DialogActionAdapter() { pPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
@Override @Override
@ -658,7 +656,6 @@ public abstract class DesignTableDataManager {
parameterMap.putAll(pPane.update()); parameterMap.putAll(pPane.update());
} }
}).setVisible(true); }).setVisible(true);
});
} }
public static void setThreadLocal(String value) { public static void setThreadLocal(String value) {

Loading…
Cancel
Save