From 1d6639fae0576fe999351e96a31f6f9eaaa32362 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 22 八月 2023 17:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 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 21e4575..87e90fd 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
@@ -20,11 +20,13 @@
import com.vci.ubcs.codeapply.enums.CodeReferConfigTypeEnum;
import com.vci.ubcs.codeapply.object.UIFormRefer;
import com.vci.ubcs.codeapply.object.UIFormRefers;
+import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import org.apache.poi.ss.formula.functions.T;
public class RMDataReferTempDialog extends VCIJDialog {
private CodeApplyFor410MainPanel owner;
- private CodeClassifyTemplateAttrVO codeClassifyTemplateAttr;
+ //private CodeClassifyTemplateAttrVO codeClassifyTemplateAttr;
+ private String referConfig="";
private RMDataReferTempDialogActionListener actionListener = new RMDataReferTempDialogActionListener(this);
private VCIJButton btnOk = VCISwingUtil.createVCIJButton("ok", "纭畾", "纭畾", "accept.png", actionListener);
private VCIJButton btnCancel = VCISwingUtil.createVCIJButton("cancel", "鍙栨秷", "鍙栨秷", "cancel.png", actionListener);
@@ -33,10 +35,11 @@
CodeReferTreePanel typeTreePanel;
private VCIBaseTree leftTree = null;
private VCIBaseTreeModel leftTreeModel = null;
- public RMDataReferTempDialog(CodeApplyFor410MainPanel owner, CodeClassifyTemplateAttrVO codeClassifyTemplateAttr) {
+ private KeyValue keyValue;
+ public RMDataReferTempDialog(CodeApplyFor410MainPanel owner, String referConfig) {
//super(true);
this.owner = owner;
- this.codeClassifyTemplateAttr = codeClassifyTemplateAttr;
+ this.referConfig = referConfig;
init();
setTitle("寮曠敤妯℃澘-灞炴�ч�夋嫨");
//initDialogSize(rmDataAddDialog.getWidth(), rmDataAddDialog.getHeight());
@@ -67,8 +70,8 @@
private VCIJPanel createRMDataMainPanel(){
VCIJPanel rmDataTablePanel = new VCIJPanel(new BorderLayout());
uiFormRefer=new UIFormRefer();
- if(StringUtils.isNotBlank(codeClassifyTemplateAttr.getReferConfig())){
- uiFormRefer = JSONObject.toJavaObject(JSONObject.parseObject(codeClassifyTemplateAttr.getReferConfig().toString()), UIFormRefer.class);
+ if(StringUtils.isNotBlank(referConfig)){
+ uiFormRefer = JSONObject.toJavaObject(JSONObject.parseObject(referConfig.toString()), UIFormRefer.class);
}
if(uiFormRefer !=null&&(uiFormRefer.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())
||uiFormRefer.getType().equals(CodeReferConfigTypeEnum.ORGDEPARTMENTREFER.getValue()))){
@@ -86,14 +89,13 @@
* 鏍规嵁绫诲瀷鏄剧ずtable
*/
private CodeDataMainPanel codeDataMainPanel = null;
- private CodeDataMainPanelDataProvider dataProvider;
public CodeDataMainPanel getRMDataMainPanel() {
- codeDataMainPanel=new CodeDataMainPanel(uiFormRefer);
+ codeDataMainPanel=new CodeDataMainPanel(uiFormRefer,this.owner.getTokenUserObject());
CodeDataMainPanelDataProvider dataProvider=new CodeDataMainPanelDataProvider(codeDataMainPanel);
codeDataMainPanel.setDataProvider(dataProvider);
- codeDataMainPanel.setCustomTopPanel(new attarSearchPanel(uiFormRefer));
+ codeDataMainPanel.setCustomTopPanel(new AttarSearchPanel(uiFormRefer));
codeDataMainPanel.buildPanel();
- VCIJTable table = codeDataMainPanel.getTablePanel().getTable();
+ VCIJTable table = codeDataMainPanel.getTablePanel().getTable();
table.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (e.getButton() == 1 && e.getClickCount() == 2) {
@@ -111,10 +113,11 @@
private VCIJScrollPane createTreePanel(){
final RMDataReferTempDialog self = this;
- typeTreePanel = new CodeReferTreePanel(uiFormRefer) {
+ typeTreePanel = new CodeReferTreePanel(uiFormRefer,this.owner.getTokenUserObject()) {
private static final long serialVersionUID = 8121108576137012228L;
@Override
public void tree_valueChanged(TreeSelectionEvent e) {
+
self.leftTree_valueChanged(e);
}
};
@@ -131,7 +134,7 @@
* @param e
*/
private void leftTree_valueChanged(TreeSelectionEvent e) {
-
+ btnOk.doClick();
}
/***鑾峰彇璧勬簮鏁版嵁鐨勪富闈㈡澘**/
/*
@@ -191,4 +194,36 @@
return transmit;
}*/
+ public KeyValue getKeyValue() {
+ return keyValue;
+ }
+
+ public void setKeyValue(KeyValue keyValue) {
+ this.keyValue = keyValue;
+ }
+
+ public UIFormRefer getUiFormRefer() {
+ return uiFormRefer;
+ }
+
+ public void setUiFormRefer(UIFormRefer uiFormRefer) {
+ this.uiFormRefer = uiFormRefer;
+ }
+
+ public CodeReferTreePanel getTypeTreePanel() {
+ return typeTreePanel;
+ }
+
+ public void setTypeTreePanel(CodeReferTreePanel typeTreePanel) {
+ this.typeTreePanel = typeTreePanel;
+ }
+
+ public CodeDataMainPanel getCodeDataMainPanel() {
+ return codeDataMainPanel;
+ }
+
+ public void setCodeDataMainPanel(CodeDataMainPanel codeDataMainPanel) {
+ this.codeDataMainPanel = codeDataMainPanel;
+ }
+
}
--
Gitblit v1.9.3