Browse Source

Merge pull request #1164 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '38f6d2806a8ce7917eee2712acefa2154f2574dd':
  REPORT-3837 [9.0一轮回归]新建单元格条件属性自动显示之前公式状态
master
superman 7 years ago
parent
commit
562479fcaf
  1. 5
      designer_base/src/com/fr/design/condition/LiteConditionPane.java

5
designer_base/src/com/fr/design/condition/LiteConditionPane.java

@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
import com.fr.base.Formula; import com.fr.base.Formula;
import com.fr.data.DataConstants; import com.fr.data.DataConstants;
import com.fr.data.condition.*; import com.fr.data.condition.*;
import com.fr.data.core.Compare;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory; import com.fr.design.formula.FormulaFactory;
@ -21,6 +22,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger; import com.fr.general.FRLogger;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.data.Condition; import com.fr.general.data.Condition;
import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.TreeExpansionEvent; import javax.swing.event.TreeExpansionEvent;
@ -165,6 +167,9 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
TreePath selectedTreePath = conditionsTree.getSelectionPath(); TreePath selectedTreePath = conditionsTree.getSelectionPath();
if (selectedTreePath == null) { if (selectedTreePath == null) {
// 清空编辑框
defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
formulaTextArea.setText(StringUtils.EMPTY);
return; return;
} }

Loading…
Cancel
Save