From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
index b4da4c3..9585c59 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
@@ -6,6 +6,7 @@
import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
import com.vci.base.ui.swing.components.table.VCIJTablePanel;
import com.vci.ubcs.codeapply.object.BaseModel;
+import com.vci.ubcs.codeapply.object.TokenUserObject;
import com.vci.ubcs.codeapply.object.UIFormRefer;
import java.awt.*;
@@ -22,8 +23,10 @@
private CodeDataMainPanelActionListener actionListener = new CodeDataMainPanelActionListener(this);
private VCIJButton btnSearch = VCISwingUtil.createVCIJButton("search", "鏌ヨ", "鏌ヨ", "search.png", actionListener);
private VCIJButton btnClear = VCISwingUtil.createVCIJButton("clear_search", "娓呯┖鏌ヨ鏉′欢", "娓呯┖鏌ヨ鏉′欢", "clear.gif", actionListener);
- public CodeDataMainPanel(UIFormRefer uiFormRefer) {
+ private TokenUserObject tokenUserObject=null;
+ public CodeDataMainPanel(UIFormRefer uiFormRefer, TokenUserObject tokenUserObject) {
this.uiFormRefer=uiFormRefer;
+ this.tokenUserObject=tokenUserObject;
}
private Map<String,String> customCondtionMap=new HashMap<>();
public void buildPanel(){
@@ -46,9 +49,9 @@
private VCIJPanel createCenterDataTablePanel() {
tablePanel = new VCIJTablePanel<BaseModel>(dataProvider);
//tablePanel.setCustomButtons(getCombinedButtons());
- tablePanel.setShowExport(true);
+ //tablePanel.setShowExport(true);
tablePanel.setShowPaging(true);
- tablePanel.setShowProgressBar(false);
+ tablePanel.setShowProgressBar(true);
tablePanel.setPageButtonFlowAlign(FlowLayout.CENTER);
tablePanel.setCustomButtonFlowAlign(FlowLayout.CENTER);
tablePanel.buildTablePanel();
@@ -120,6 +123,14 @@
this.uiFormRefer = uiFormRefer;
}
+ public TokenUserObject getTokenUserObject() {
+ return tokenUserObject;
+ }
+
+ public void setTokenUserObject(TokenUserObject tokenUserObject) {
+ this.tokenUserObject = tokenUserObject;
+ }
+
public AbstractVCIJTableDataProvider<BaseModel> getDataProvider() {
return dataProvider;
}
--
Gitblit v1.9.3