Browse Source

Merge pull request #265 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit '4d2296b607ec889b5e9bbaf05612a16519c906fc':
  添加注释
  无
  REPORT-9958 参考附件截图,点填报属性的时候,添加内置sql右边是空白的
research/10.0
kerry 7 years ago
parent
commit
48be35d2c6
  1. 13
      designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
  2. 14
      designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java

13
designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java

@ -8,9 +8,13 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.LayoutUtils;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.SwingConstants;
import javax.swing.SwingWorker;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import javax.swing.*;
import java.awt.*;
/**
* @author richer
@ -23,6 +27,10 @@ public abstract class LoadingBasicPane extends BasicPane {
private JProgressBar progressBar;
public LoadingBasicPane() {
initCards();
initPane();
}
protected void initPane(){
new SwingWorker<Integer, Void>() {
@Override
@ -42,6 +50,7 @@ public abstract class LoadingBasicPane extends BasicPane {
}
private void initCards() {
card = new CardLayout();
setLayout(card);

14
designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java

@ -11,8 +11,11 @@ import com.fr.design.write.submit.SubmitVisitorListPane;
import com.fr.report.worksheet.WorkSheet;
import com.fr.report.write.ReportWriteAttr;
import javax.swing.*;
import java.awt.*;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
import java.awt.BorderLayout;
public class ReportWriteAttrPane extends LoadingBasicPane {
private SubmitVisitorListPane submiterListPane;
@ -25,6 +28,13 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
}
public ReportWriteAttrPane(ElementCasePane ePane){
this.ePane = ePane;
//REPORT-9958 这边需要赋值后再初始化面板
super.initPane();
}
@Override
protected void initPane(){
}
@Override

Loading…
Cancel
Save