Browse Source

Pull request #8308: REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定

Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0

* commit '155264458b41737dadeba6d405e82b5c2193fe4b':
  REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
new-design
Henry.Wang 3 years ago
parent
commit
5dd59393ed
  1. 31
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

31
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -282,7 +282,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
private void initComponents(){ private void initComponents(){
dataPane = new SelectedDataColumnPane(true, true); dataPane = new SelectedDataColumnPane(true, true);
groupPane = new ResultSetGroupDockingPane(); groupPane = new ResultSetGroupDockingPane();
initListener();
double[] rowSize = {P}, columnSize = {60, F}; double[] rowSize = {P}, columnSize = {60, F};
UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Report_Filter_Conditions")); UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Report_Filter_Conditions"));
condition = new DSColumnConditionAction(); condition = new DSColumnConditionAction();
@ -299,6 +299,35 @@ public class CellDSColumnEditor extends CellQuickEditor {
conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
} }
private void initListener() {
dataPane.setListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
dataPane.update(cellElement);
fireTargetModified();
}
}
});
groupPane.setListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
if (e == null) {
//分组-高级-自定义点确定的时候传进来null的e,但是这时候应该触发保存
groupPane.update();
fireTargetModified();
return;
}
if (e.getStateChange() == ItemEvent.DESELECTED) {
groupPane.update();
fireTargetModified();
}
}
});
}
@Override @Override
protected AttributeChangeListener getAttributeChangeListener() { protected AttributeChangeListener getAttributeChangeListener() {
return new AttributeChangeListener() { return new AttributeChangeListener() {

Loading…
Cancel
Save