Browse Source

Merge pull request #188 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'af865be2dbb665dc768099a6215d443b56459784':
  REPORT-9297 设计器中按钮设置提交入库事件,选取的字段只要绑定单元格组该设置就无法保存
master
Mata.Li 6 years ago
parent
commit
023d7110b4
  1. 41
      designer-realize/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

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

@ -183,30 +183,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
* @param evt 事件s * @param evt 事件s
*/ */
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
showCellWindow(false);
// Grid.GridSelectionListener
if (ePane == null) {
return;
}
/*
* 布局
*/
BasicPane bPane = new SmartJTablePane4DB(keyColumnValuesTable.getTableModel4SmartAddCell(), ePane);
// ReportWriteAttrDialog.this.setVisible(false);
hideDialog4AddCellAction();
/*
* 当前的ReportPane不可编辑,不可切换Sheet,加GridSelectionChangeListener
*/
ePane.setEditable(false);
ePane.setSelection(NO_SELECTION);
ePane.getGrid().setNotShowingTableSelectPane(false);
BasicDialog dlg = bPane.showWindow(DesignerContext.getDesignerFrame());
dlg.setModal(false);
dlg.setVisible(true);
} }
} }
@ -220,19 +197,30 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
* @param e 事件s * @param e 事件s
*/ */
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
showCellWindow(true);
}
}
/**
* 切换到单元格窗口设置属性面板不可编辑
* @param isCellGroup 判断是否单元格组
*/
private void showCellWindow(boolean isCellGroup){
if (ePane == null) { if (ePane == null) {
return; return;
} }
BasicPane bPane = new SmartJTablePane4DB(keyColumnValuesTable.getTableModel4SmartAddCell(), ePane, true); BasicPane bPane = new SmartJTablePane4DB(keyColumnValuesTable.getTableModel4SmartAddCell(), ePane, isCellGroup);
// ReportWriteAttrDialog.this.setVisible(false); // ReportWriteAttrDialog.this.setVisible(false);
hideDialog4AddCellAction(); hideDialog4AddCellAction();
/* /*
* 当前的ReportPane不可编辑,不可切换Sheet,加GridSelectionChangeListener * 当前的ReportPane不可编辑,不可切换Sheet,加GridSelectionChangeListener
*/ */
ePane.setSelection(NO_SELECTION); //必须先设置面板不可编辑才能释放单元格选中
ePane.setEditable(false); ePane.setEditable(false);
ePane.setSelection(NO_SELECTION);
ePane.getGrid().setNotShowingTableSelectPane(false); ePane.getGrid().setNotShowingTableSelectPane(false);
BasicDialog dlg = bPane.showWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this)); BasicDialog dlg = bPane.showWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this));
@ -240,7 +228,6 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
dlg.setModal(false); dlg.setModal(false);
dlg.setVisible(true); dlg.setVisible(true);
} }
}
private void showDialogAfterAddCellAction() { private void showDialogAfterAddCellAction() {
Container dialog = this; Container dialog = this;

Loading…
Cancel
Save