Browse Source

REPORT-45095 表单控件设置提交事件,添加字段后编辑字段,事件弹框消失

feature/big-screen
vito 4 years ago
parent
commit
10056986e7
  1. 1747
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  2. 6
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

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

File diff suppressed because it is too large Load Diff

6
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -356,7 +356,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (isCellGroup) { if (isCellGroup) {
column2.setCellRenderer(new ColumnRowGroupCellRenderer2()); column2.setCellRenderer(new ColumnRowGroupCellRenderer2());
column2.setCellEditor(new ColumnValueEditor(ValueEditorPaneFactory.cellGroupEditor())); column2.setCellEditor(new ColumnValueEditor(ValueEditorPaneFactory.cellGroupEditor(), this));
} else { } else {
column2.setCellRenderer(new SelectedColumnValueTableCellRenderer()); column2.setCellRenderer(new SelectedColumnValueTableCellRenderer());
} }
@ -456,7 +456,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
newAdd.clear(); newAdd.clear();
for (int i = 0; i < cs; i++) { for (int i = 0; i < cs; i++) {
for (int j = 0; j < rs; j++) { for (int j = 0; j < rs; j++) {
TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j ); TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) { if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
String value = cellElement.toString(); String value = cellElement.toString();
if (!newAdd.contains(value) && !allColumnRow.contains(value)) { if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
@ -512,7 +512,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private SmartJTablePaneAction a = new AbstractSmartJTablePaneAction(this, SmartInsertDBManipulationPane.this) { private SmartJTablePaneAction a = new AbstractSmartJTablePaneAction(this, SmartInsertDBManipulationPane.this) {
@Override @Override
public void doOk() { public void doOk() {
((KeyColumnTableModel)keyColumnValuesTable.getModel()).refreshNameValueList((KeyColumnTableModel)model); ((KeyColumnTableModel) keyColumnValuesTable.getModel()).refreshNameValueList((KeyColumnTableModel) model);
} }
@Override @Override

Loading…
Cancel
Save