fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/release/10.0' into release/10.0

feature/big-screen
Yvan 4 years ago
parent
329b58d8b8 9e07fa24ff
commit
861ada28d4
2 changed files with 898 additions and 857 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

File diff suppressed because it is too large Load Diff

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

@ -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

Write Preview
Loading…
Cancel
Save