Browse Source

Merge pull request #11057 in DESIGN/design from release/11.0 to bugfix/11.0

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

17
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 javax.swing.JFrame;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.io.ByteArrayOutputStream;
@ -650,15 +649,13 @@ public abstract class DesignTableDataManager {
}
private static void showParaWindow(final Map<String, Object> parameterMap, ParameterProvider[] inParameters) {
SwingUtilities.invokeLater(() -> {
final ParameterInputPane pPane = new ParameterInputPane(inParameters);
pPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
parameterMap.putAll(pPane.update());
}
}).setVisible(true);
});
final ParameterInputPane pPane = new ParameterInputPane(inParameters);
pPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
parameterMap.putAll(pPane.update());
}
}).setVisible(true);
}
public static void setThreadLocal(String value) {

Loading…
Cancel
Save