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/RMDataReferTempDialog.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 594a386..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
@@ -25,7 +25,8 @@
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);
@@ -35,10 +36,10 @@
private VCIBaseTree leftTree = null;
private VCIBaseTreeModel leftTreeModel = null;
private KeyValue keyValue;
- public RMDataReferTempDialog(CodeApplyFor410MainPanel owner, CodeClassifyTemplateAttrVO codeClassifyTemplateAttr) {
+ public RMDataReferTempDialog(CodeApplyFor410MainPanel owner, String referConfig) {
//super(true);
this.owner = owner;
- this.codeClassifyTemplateAttr = codeClassifyTemplateAttr;
+ this.referConfig = referConfig;
init();
setTitle("寮曠敤妯℃澘-灞炴�ч�夋嫨");
//initDialogSize(rmDataAddDialog.getWidth(), rmDataAddDialog.getHeight());
@@ -69,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()))){
@@ -89,7 +90,7 @@
*/
private CodeDataMainPanel codeDataMainPanel = null;
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));
@@ -112,7 +113,7 @@
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) {
@@ -224,4 +225,5 @@
public void setCodeDataMainPanel(CodeDataMainPanel codeDataMainPanel) {
this.codeDataMainPanel = codeDataMainPanel;
}
+
}
--
Gitblit v1.9.3