From 8b34692ac1b7cf58a1e1ead92b930d9acb9f86f6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 02 八月 2023 00:18:29 +0800
Subject: [PATCH] PDM集成swing界面相关功能开发
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
index a28ca65..fbcbe95 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
@@ -11,12 +11,12 @@
import com.vci.ubcs.codeapply.swing.RealTextField;
import com.vci.ubcs.codeapply.swing.VCIJComboxBox;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
+import com.vci.ubcs.codeapply.utils.HttpUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.user.entity.User;
-import net.bytebuddy.implementation.bytecode.Throw;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -147,7 +147,7 @@
/**绯荤粺鍙姞杞戒唬鐮侀」 濡傛灉libName涓嶄负绌猴紝鐩存帴鑾峰彇瀵瑰簲鐨勪唬鐮侀」**/
Map<String,String> condtionMap=new HashMap<>();
condtionMap.put("codeClassId", rmType.getOid());
- R r=HttpUtil.sendGet(url+"/getCodeRuleByClassifyFullInfo",condtionMap,new HashMap<>());
+ R r= HttpUtil.sendGet(url+"/getCodeRuleByClassifyFullInfo",condtionMap,new HashMap<>());
CodeRuleVO codeRuleVO=new CodeRuleVO();
if(r.isSuccess()){
Object object= r.getData();
@@ -1012,6 +1012,16 @@
cbx.setModel(model);
compt = cbx;
}
+ } else if(StringUtils.isNotBlank(attrObj.getReferConfig())){//鍙傜収鐨勯渶瑕佽缃垚涓嬫媺妗嗭紝骞朵笖鍙
+ VCIJComboBox cbx = new VCIJComboBox();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ KeyValue keyValue = new KeyValue();
+ keyValue.setValue("");
+ keyValue.setKey("");
+ AttrRangObjectWarper wrapper = new AttrRangObjectWarper(keyValue);
+ model.addElement(wrapper);
+ cbx.setModel(model);
+ compt = cbx;
} else { // 涓嶅瓨鍦ㄥ彇鍊艰寖鍥村垯鎸夌被鍨嬬敓鎴愪笉鍚岀殑鎺т欢
if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean)) { // Boolean绫诲瀷
VCIJComboBox cbx = new VCIJComboBox();
@@ -1212,37 +1222,39 @@
ownerDialog = new VCIJDialog();
ownerDialog.setSize(880, 500);
}*/
- final String referTempId = tempPropObj.getReferBtmId();
+ //final String referTempId = tempPropObj.getReferBtmId();
final RMDataReferTempDialog dialog = new RMDataReferTempDialog(this,tempPropObj);
dialog.setDialogCallback(new Runnable() {
@Override
public void run() {
- /*LinkedList<RMDataObject> list = dialog.getRMDataMainPanel().getTablePanel().getSelectedRowObjects();
- if(dialog.isFromTableDoubleClick()){
+ KeyValue keyValue=new KeyValue();
+ /*if(dialog.isFromTableDoubleClick()){
int index = dialog.getRMDataMainPanel().getTablePanel().getTable().getSelectedRow();
list.clear();
list.add(dialog.getRMDataMainPanel().getTablePanel().getTableModel().getList().get(index).getObject());
- }
-
- RMDataObject rmDataObj = list.get(0);//閫夋嫨鐨勫紩鐢ㄦā鏉挎暟鎹�
- LinkedHashMap<String, Integer> innnerNamesMaps = rmDataObj.getInnerNameIndexMap();
- String[] datas = rmDataObj.getDatas();
- for(CodeClassifyTemplateAttrVO obj : tempPropList) {
- if(obj.getReferTempId().equals(referTempId)) {
- AttributeObject attrObj = getAttrObjById(obj.getReferAttrId());
- JComponent comp = attrIdToCtrlMaps.get(obj.getId());
- if(comp instanceof VCIJTextField) {
- int index = innnerNamesMaps.get(attrObj.getInternalname());
+ }*/
+ keyValue= dialog.getKeyValue();
+ //for(CodeClassifyTemplateAttrVO obj : tempPropList) {
+ if(attrIdToCtrlMaps.containsKey(tempPropObj.getId())) {
+ JComponent comp = attrIdToCtrlMaps.get(tempPropObj.getId());
+ /*if(comp instanceof VCIJTextField) {
+ int index = innnerNamesMaps.get(tempPropObj.getInternalname());
((VCIJTextField) comp).setText(datas[index]);
}else if (comp instanceof VCIJCalendarPanel) {
- int index = innnerNamesMaps.get(attrObj.getInternalname());
+ int index = innnerNamesMaps.get(tempPropObj.getInternalname());
((VCIJCalendarPanel) comp).setDateString(datas[index]);
- } else if (comp instanceof VCIJComboBox) {
- int index = innnerNamesMaps.get(attrObj.getId());
- ((VCIJComboBox) comp).setSelectedIndex(index);
+ } else */
+ if (comp instanceof VCIJComboBox) {
+ //DefaultComboBoxModel model = new DefaultComboBoxModel();
+ if(keyValue!=null) {
+ AttrRangObjectWarper wrapper = new AttrRangObjectWarper(keyValue);
+ ((VCIJComboBox) comp).getModel().setSelectedItem(wrapper);
+ }
+ //model.addElement(wrapper);
+ //((VCIJComboBox) comp).setModel(model);
}
}
- }*/
+ //}
}
});
--
Gitblit v1.9.3