From 6bccfd2132c8523b5ebeffa772a8fa0e784d8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 10:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java | 115 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 40 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java
index 3297df7..21e4575 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java
@@ -3,31 +3,40 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Frame;
import java.awt.Toolkit;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JPanel;
-import com.vci.base.ui.exception.VCIException;
+import javax.swing.event.TreeSelectionEvent;
+
+import com.alibaba.cloud.commons.lang.StringUtils;
+import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.VCISwingUtil;
-import com.vci.base.ui.swing.components.VCIJButton;
-import com.vci.base.ui.swing.components.VCIJDialog;
-import com.vci.base.ui.swing.components.VCIJPanel;
-import com.vci.base.ui.swing.components.VCIJTable;
+import com.vci.base.ui.swing.components.*;
import com.vci.base.ui.swing.components.table.VCIJTablePanel;
+import com.vci.base.ui.tree.VCIBaseTree;
+import com.vci.base.ui.tree.VCIBaseTreeModel;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.codeapply.enums.CodeReferConfigTypeEnum;
+import com.vci.ubcs.codeapply.object.UIFormRefer;
+import com.vci.ubcs.codeapply.object.UIFormRefers;
import org.apache.poi.ss.formula.functions.T;
public class RMDataReferTempDialog extends VCIJDialog {
- private VCIJDialog rmDataAddDialog;
- private String templateId = "";
+ private CodeApplyFor410MainPanel owner;
+ private CodeClassifyTemplateAttrVO codeClassifyTemplateAttr;
private RMDataReferTempDialogActionListener actionListener = new RMDataReferTempDialogActionListener(this);
private VCIJButton btnOk = VCISwingUtil.createVCIJButton("ok", "纭畾", "纭畾", "accept.png", actionListener);
private VCIJButton btnCancel = VCISwingUtil.createVCIJButton("cancel", "鍙栨秷", "鍙栨秷", "cancel.png", actionListener);
private static final long serialVersionUID = 1L;
- public RMDataReferTempDialog(VCIJDialog rmDataAddDialog,String templateId) {
+ private VCIJScrollPane scrollLeftTreePane = new VCIJScrollPane();
+ CodeReferTreePanel typeTreePanel;
+ private VCIBaseTree leftTree = null;
+ private VCIBaseTreeModel leftTreeModel = null;
+ public RMDataReferTempDialog(CodeApplyFor410MainPanel owner, CodeClassifyTemplateAttrVO codeClassifyTemplateAttr) {
//super(true);
- this.rmDataAddDialog = rmDataAddDialog;
- this.templateId = templateId;
+ this.owner = owner;
+ this.codeClassifyTemplateAttr = codeClassifyTemplateAttr;
init();
setTitle("寮曠敤妯℃澘-灞炴�ч�夋嫨");
//initDialogSize(rmDataAddDialog.getWidth(), rmDataAddDialog.getHeight());
@@ -38,10 +47,8 @@
JPanel panel = new JPanel(new FlowLayout());
panel.add(btnOk);
panel.add(btnCancel);
-
this.add(createRMDataMainPanel(), BorderLayout.CENTER);
this.add(panel,BorderLayout.SOUTH);
-
Dimension dime = Toolkit.getDefaultToolkit().getScreenSize().getSize();
int x = dime.width/6;
int y = dime.height/6 + 50;
@@ -56,37 +63,37 @@
public void setFromTableDoubleClick(boolean fromTableDoubleClick) {
this.fromTableDoubleClick = fromTableDoubleClick;
}
-
+ private UIFormRefer uiFormRefer;
private VCIJPanel createRMDataMainPanel(){
- VCIJPanel rmDataTablePanel = new VCIJPanel();
- if(!templateId.equals("")){
- //rmDataTablePanel = getRMDataMainPanel("", "", templateId);
+ VCIJPanel rmDataTablePanel = new VCIJPanel(new BorderLayout());
+ uiFormRefer=new UIFormRefer();
+ if(StringUtils.isNotBlank(codeClassifyTemplateAttr.getReferConfig())){
+ uiFormRefer = JSONObject.toJavaObject(JSONObject.parseObject(codeClassifyTemplateAttr.getReferConfig().toString()), UIFormRefer.class);
}
- rmDataTablePanel.setPreferredSize(new Dimension(880,300));
+ if(uiFormRefer !=null&&(uiFormRefer.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())
+ ||uiFormRefer.getType().equals(CodeReferConfigTypeEnum.ORGDEPARTMENTREFER.getValue()))){
+ rmDataTablePanel.add(createTreePanel(),BorderLayout.CENTER);
+ }else if(uiFormRefer !=null&&(uiFormRefer.getType().equals(CodeReferConfigTypeEnum.GRID.getValue()))){
+ //鏍戣〃
+ }else{
+ rmDataTablePanel.add(getRMDataMainPanel(),BorderLayout.CENTER);
+ }
+ //rmDataTablePanel.setPreferredSize(new Dimension(880,300));
return rmDataTablePanel;
}
- private VCIJTablePanel<T> tablePanel = null;
+
+ /**
+ * 鏍规嵁绫诲瀷鏄剧ずtable
+ */
+ private CodeDataMainPanel codeDataMainPanel = null;
private CodeDataMainPanelDataProvider dataProvider;
- public VCIJTablePanel getRMDataMainPanel(String libId, String classifyId, String templateId) {
- dataProvider = new CodeDataMainPanelDataProvider();
- tablePanel = new VCIJTablePanel<T>(dataProvider);
- //tablePanel.setCustomButtons(getCombinedButtons());
- tablePanel.setShowExport(true);
- tablePanel.setShowPaging(true);
- tablePanel.setPageButtonFlowAlign(FlowLayout.CENTER);
- tablePanel.setCustomButtonFlowAlign(FlowLayout.CENTER);
- tablePanel.buildTablePanel();
- int columnCount = tablePanel.getTable().getColumnCount();
- tablePanel.getTable().getColumnModel().getColumn(columnCount - 2).setPreferredWidth(150);
- tablePanel.getTable().getColumnModel().getColumn(columnCount - 4).setPreferredWidth(150);
- /**
- * 绂佹table琛ㄥご鎷栧姩锛岄槻姝㈢涓�鍒楃殑澶嶉�夋鍜岀浜屽垪鐨勫簭鍙锋嫋鍔ㄥ嚭闂:
- * 鐐瑰嚮鏌愯锛岃〃鏍间腑鐨勫閫夋鐪嬩笉鍒帮紝涓旈�変腑琛ㄥご涓婄殑澶嶉�夋绯荤粺浼氭姤閿欙紱鏁版嵁淇℃伅鏄剧ず涓嶆纭��
- * 2012-12-4 wangxl
- */
- tablePanel.getTable().getTableHeader().setReorderingAllowed(false);
- tablePanel.refreshTableData();
- VCIJTable table = tablePanel.getTable();
+ public CodeDataMainPanel getRMDataMainPanel() {
+ codeDataMainPanel=new CodeDataMainPanel(uiFormRefer);
+ CodeDataMainPanelDataProvider dataProvider=new CodeDataMainPanelDataProvider(codeDataMainPanel);
+ codeDataMainPanel.setDataProvider(dataProvider);
+ codeDataMainPanel.setCustomTopPanel(new attarSearchPanel(uiFormRefer));
+ codeDataMainPanel.buildPanel();
+ VCIJTable table = codeDataMainPanel.getTablePanel().getTable();
table.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (e.getButton() == 1 && e.getClickCount() == 2) {
@@ -95,9 +102,37 @@
}
}
});
- return tablePanel;
+ return codeDataMainPanel;
+ }
+ /***
+ * 鏍规嵁绫诲瀷灞曠ず鏍�
+ * @return
+ */
+ private VCIJScrollPane createTreePanel(){
+ final RMDataReferTempDialog self = this;
+
+ typeTreePanel = new CodeReferTreePanel(uiFormRefer) {
+ private static final long serialVersionUID = 8121108576137012228L;
+ @Override
+ public void tree_valueChanged(TreeSelectionEvent e) {
+ self.leftTree_valueChanged(e);
+ }
+ };
+ typeTreePanel.buildTreePanel();
+ leftTree = typeTreePanel.getTree();
+ leftTreeModel = typeTreePanel.getTreeModel();
+ scrollLeftTreePane.setViewportView(leftTree);
+
+ return scrollLeftTreePane;
}
+ /***
+ * 鏍戝垏鎹簨浠�
+ * @param e
+ */
+ private void leftTree_valueChanged(TreeSelectionEvent e) {
+
+ }
/***鑾峰彇璧勬簮鏁版嵁鐨勪富闈㈡澘**/
/*
public RMDataMainPanel getRMDataMainPanel() {
--
Gitblit v1.9.3