From 70698083067808869a4c7f03c32ce61f65654d4f Mon Sep 17 00:00:00 2001 From: zouxk Date: Mon, 6 Jan 2020 17:17:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jd/plm/form/ExperimentalPowerOfAttorneyForm.java | 12 +++++++----- .../connor/jd/plm/form/SampleConfirmationForm.java | 12 ++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/form/ExperimentalPowerOfAttorneyForm.java b/com.connor.jd.plm/src/com/connor/jd/plm/form/ExperimentalPowerOfAttorneyForm.java index d065178..1c7bba7 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/form/ExperimentalPowerOfAttorneyForm.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/form/ExperimentalPowerOfAttorneyForm.java @@ -254,13 +254,15 @@ public class ExperimentalPowerOfAttorneyForm extends AbstractRendering implement model.setValueAt(rows[i][ii], top + i + 1, ii > 2 ? ii > 3 ? ii + 4 : ii + 2 : ii); } } - + JPanel inner = new JPanel(new BorderLayout()); + inner.add(table, BorderLayout.CENTER); + inner.add(table2, BorderLayout.SOUTH); ScrollPane pane = new ScrollPane(); - pane.add(table); - ScrollPane pane2 = new ScrollPane(); - pane2.add(table2); + pane.add(inner); +// ScrollPane pane2 = new ScrollPane(); +// pane2.add(table2); root.add(pane, BorderLayout.CENTER); - root.add(pane2, BorderLayout.SOUTH); +// root.add(pane2, BorderLayout.SOUTH); this.add(menu); this.add(root); } diff --git a/com.connor.jd.plm/src/com/connor/jd/plm/form/SampleConfirmationForm.java b/com.connor.jd.plm/src/com/connor/jd/plm/form/SampleConfirmationForm.java index 387f476..7d8d4b5 100644 --- a/com.connor.jd.plm/src/com/connor/jd/plm/form/SampleConfirmationForm.java +++ b/com.connor.jd.plm/src/com/connor/jd/plm/form/SampleConfirmationForm.java @@ -364,12 +364,16 @@ public class SampleConfirmationForm extends AbstractRendering { System.out.println("ÊôÐÔ¡®jd2_ypqrdtable¡¯Î´ÕÒµ½"); } + JPanel inner = new JPanel(new BorderLayout()); + inner.add(table, BorderLayout.CENTER); + inner.add(table3, BorderLayout.SOUTH); + ScrollPane confirmScrollPanel1 = new ScrollPane(); - confirmScrollPanel1.add(table); - ScrollPane confirmScrollPanel3 = new ScrollPane(); - confirmScrollPanel3.add(table3); + confirmScrollPanel1.add(inner); +// ScrollPane confirmScrollPanel3 = new ScrollPane(); +// confirmScrollPanel3.add(table3); confirmPanel.add(confirmScrollPanel1, BorderLayout.CENTER); - confirmPanel.add(confirmScrollPanel3, BorderLayout.SOUTH); +// confirmPanel.add(confirmScrollPanel3, BorderLayout.SOUTH); // ¼ì²é±í examinePanel.setBorder(BorderFactory.createLineBorder(Color.black, 1)); examinePanel.setLayout(new BorderLayout());