Browse Source

Merge pull request #967 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'cb3f74bc8aabbb304ef8b5d6b5b204838fc59e9c':
  REPORT-18955 填报属性配置,提交条件的删除按钮没有灰色化
bugfix/10.0
Hades 5 years ago
parent
commit
5a6a24a7f6
  1. 7
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

7
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -279,7 +279,12 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
addSubmitConditionButton.addActionListener(new ActionListener() { addSubmitConditionButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
final DSColumnLiteConditionPane conditionPane = new DSColumnLiteConditionPane(); final DSColumnLiteConditionPane conditionPane = new DSColumnLiteConditionPane() {
@Override
protected boolean isNeedDoWithCondition(Condition liteCondition) {
return liteCondition != null;
}
};
String[] columns = chooseTable.currentColumnNames(); String[] columns = chooseTable.currentColumnNames();
if (columns != null && columns.length > 0) { if (columns != null && columns.length > 0) {
conditionPane.populateColumns(chooseTable.currentColumnNames()); conditionPane.populateColumns(chooseTable.currentColumnNames());

Loading…
Cancel
Save