From ad1933016ceae0426b2ec008a9989c9db50f809b Mon Sep 17 00:00:00 2001 From: xiongcz Date: Thu, 15 May 2025 10:21:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(create-temp-drawings):=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=E5=92=8C=20LOV=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 改进属性配置加载逻辑，支持动态 LOV 和静态 LOV 的处理 - 优化版本号下拉框的显示和处理 - 调整 JTreeComboBox 的弹出框大小 - 重构部分代码以提高可维护性和可扩展性 --- .../dialogs/CreateTempDrawingDialog.class | Bin 36114 -> 36641 bytes .../dialogs/CreateTempDrawingDialog.java | 103 ++++++++++-------- .../createTempDrawings/pojo/LovProperty.java | 16 ++- .../utils/JTreeComboBox.java | 3 +- 4 files changed, 73 insertions(+), 49 deletions(-) diff --git a/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class b/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class index c87d6e4f0e5e4901fb3c4a96dbfa92dd60b846c3..05f4f8cb1e97167022717972c054588b707db358 100644 GIT binary patch delta 12244 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 delta 11485 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 he3`Gv_g4A-S-zi<@2m2?RK9 entry : this.propComponentMap.entrySet()) { String key = entry.getKey(); if (key.equals("ID*")){ - item_id = getComponentValue(entry.getValue()); + item_id = getComponentValue(key,entry.getValue()); } else if (key.equals("汾")) { - item_revision_id = getComponentValue(entry.getValue());//item_revision_id + item_revision_id = getComponentValue(key,entry.getValue());//item_revision_id } } @@ -473,15 +473,22 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ } String trueNameString = null; //ͨlovԼϱȡlovʵֵ + //1.ȸͨһ㣩lovͶ̬lovֱȡlovʵֵ for (LovProperty lovProperty : lovPropertyList2) { String propName = lovProperty.getPropTrueName(); + String lovType = lovProperty.getLovType(); if (configName.equals(propName)) {//ʵlovԼƥ - Map lovMap = lovProperty.getLovMap(); - trueNameString = lovMap.get(lovShowName); + if (lovType.equals("LOV")){//ͨlovȡֵ + Map lovMap = lovProperty.getLovMap(); + trueNameString = lovMap.get(lovShowName); + }else if (lovType.equals("DLOV")){//̬lovȡֵȡlovʾֵɣkey-valueṹ + trueNameString = lovShowName; + } + break; } } - //ͨlovϱȡlovʵֵ + //2.δȡɹͨlov㣩ϱȡlovʵֵ if (trueNameString == null && rMap != null && rMap.size()>0){ for (Map.Entry> entry : rMap.entrySet()){ Map childLovMaps = entry.getValue();//ȡlovʾֵ-ʵֵ @@ -491,6 +498,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ String realValueString = entry1.getValue(); if (lovShowName.equals(showValueString)) { trueNameString = realValueString; + break; } } @@ -726,7 +734,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ if (propComponentMap.size()>0) { for (Map.Entry entry : propComponentMap.entrySet()) { String key = entry.getKey(); - Object value = getComponentValue(entry.getValue()); + Object value = getComponentValue(key,entry.getValue()); // System.out.println("ʼУԣ"+key); if (key.contains("*")) { // System.out.println("ԡ"+key+"ѡ"); @@ -760,7 +768,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ String lovType = null; for (LovProperty lovProperty : this.lovPropertyList) { if (lovProperty.getPropName().equals(propShowName)) { - lovType = lovProperty.getlovType(); + lovType = lovProperty.getLovType(); break; } @@ -828,13 +836,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ if (idValue != null){ this.idTextField = new JTextField(idValue); } - this.revLabel = new JLabel("汾"); - String[] revs = {"DX01"};//汾 -// //todo οȡµİ汾 -// String newRev = tccomponentitemtype.getNewRev(null); -// String[] revs = {newRev}; - this.revComboBox = new JComboBox(revs); -// this.revComboBox.setEditable(true); + // // ID Label @@ -858,31 +860,8 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ centerPanel1.add(this.idTextField, gbcIdField); propComponentMap.put("ID*", idTextField); - - // 汾 Label - GridBagConstraints gbcRevLabel = new GridBagConstraints(); - gbcRevLabel.gridx = 0; - gbcRevLabel.gridy = 1; - gbcRevLabel.anchor = GridBagConstraints.WEST; - gbcRevLabel.insets = new Insets(5, 5, 5, 5); - centerPanel1.add(this.revLabel, gbcRevLabel); - - // 汾 ComboBox - GridBagConstraints gbcRevCombo = new GridBagConstraints(); - gbcRevCombo.gridx = 1; - gbcRevCombo.gridy = 1; - gbcRevCombo.anchor = GridBagConstraints.WEST; - - // Զ - Dimension comboBoxSize = new Dimension(200, revComboBox.getPreferredSize().height); // 200ΪĿ - revComboBox.setPreferredSize(comboBoxSize); - - centerPanel1.add(this.revComboBox, gbcRevCombo); - propComponentMap.put("汾", revComboBox); - - String preferenceName = getSelectTypePreferenceName(); - int propIndex = 2; + int propIndex = 1; if (preferenceName != null){ List preferenceInfoList = getPreferenceInfos(preferenceName); if (preferenceInfoList != null && preferenceInfoList.size()>0) { @@ -894,7 +873,40 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ } System.out.println("õ = "+this.preferencePropList.size()); - for(String propInfo : this.preferencePropList){//propInfoʽΪ*=Item.object_name=string +// for(String propInfo : this.preferencePropList){//propInfoʽΪ*=Item.object_name=string + String[] revIDs = this.preferencePropList.get(0).split(";");//汾 + + if (revIDs != null && revIDs.length > 0) { + this.revLabel = new JLabel("汾"); + this.revComboBox = new JComboBox(revIDs); + // 汾 Label + GridBagConstraints gbcRevLabel = new GridBagConstraints(); + gbcRevLabel.gridx = 0; + gbcRevLabel.gridy = 1; + gbcRevLabel.anchor = GridBagConstraints.WEST; + gbcRevLabel.insets = new Insets(5, 5, 5, 5); + centerPanel1.add(this.revLabel, gbcRevLabel); + + // 汾 ComboBox + GridBagConstraints gbcRevCombo = new GridBagConstraints(); + gbcRevCombo.gridx = 1; + gbcRevCombo.gridy = 1; + gbcRevCombo.anchor = GridBagConstraints.WEST; + + // Զ + Dimension comboBoxSize = new Dimension(200, revComboBox.getPreferredSize().height); // 200ΪĿ + revComboBox.setPreferredSize(comboBoxSize); + + centerPanel1.add(this.revComboBox, gbcRevCombo); + propComponentMap.put("汾", revComboBox); + + propIndex ++; + } + + +// ѡõpreferencePropListУһǰ汾飬ԴӵڶϢʼȾ + for (int i = 1; i < this.preferencePropList.size(); i++) { + String propInfo = this.preferencePropList.get(i);//propInfoʽΪ*=Item.object_name=string System.out.println("ʼѡõϢ"+propInfo); String[] propConfigInfoArray= propInfo.split("="); String validPropName = null;//Ŀȥ*󣩵Чֵ @@ -969,18 +981,22 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ if(unitLov != null){ lovType = unitLov.getType(); if (lovType != null && lovType.equals("ListOfValuesString")) {//ͳlovkey-value + System.out.println("ȡ["+name+"]LOVΪtraditional LOV"); rMap.clear(); Map lovMap = getLOVDisplay_value(tcSession, lovName); lovProperty.setLovMap(lovMap); lovProperty.setLovType("LOV"); } else if (lovType != null && lovType.equals("Fnd0ListOfValuesDynamic")) {//̬lov + System.out.println("ȡ["+name+"]LOVΪdynamic LOV"); String[] dynamicLOV = getDynamicLOV(unitLov); lovProperty.setLovType("DLOV"); List dlovList = new ArrayList<>(); - for (int i = 0; i < dynamicLOV.length; i++) { - dlovList.add(dynamicLOV[i]); + for (int i1 = 0; i1 < dynamicLOV.length; i1++) { + dlovList.add(dynamicLOV[i1]); } lovProperty.setDlovList(dlovList); + }else { + System.out.println("ȡ["+name+"]LOVΪδ֪"); } }else { continue; @@ -1014,7 +1030,8 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ continue; } }else { - String[] dlov = (String[]) lovProperty.getDlovList().toArray(); + String[] dlov = lovProperty.getDlovList().toArray(new String[0]); + JComboBox jComboBox = new JComboBox(dlov); GridBagConstraints gbcPropCombo = new GridBagConstraints(); @@ -1031,10 +1048,10 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ } } + propIndex ++; }else { System.out.println("ѡõ["+name+"]ϢУδȷͣ"); } - propIndex ++; }else { System.out.println("ѡ["+preferenceName+"]øʽȷ飡"); } diff --git a/src/cn/net/connor/createTempDrawings/pojo/LovProperty.java b/src/cn/net/connor/createTempDrawings/pojo/LovProperty.java index 2a80b5c..a7358f4 100644 --- a/src/cn/net/connor/createTempDrawings/pojo/LovProperty.java +++ b/src/cn/net/connor/createTempDrawings/pojo/LovProperty.java @@ -27,6 +27,15 @@ public class LovProperty { public String getLovType() { return lovType; } + /** + * lovԵġʾֵ-ʵֵlov + */ + private Map lovMap; + + //רڴŶ̬lovlist + private List dlovList; + + /** * @param lovType Ҫõ lovType @@ -35,10 +44,7 @@ public class LovProperty { this.lovType = lovType; } - /** - * lovԵġʾֵ-ʵֵ - */ - private Map lovMap; + /** * @return dlovList @@ -54,7 +60,7 @@ public class LovProperty { this.dlovList = dlovList; } - private List dlovList; + public String getPropName() { return propName; diff --git a/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java b/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java index a425cbf..3a6e51c 100644 --- a/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java +++ b/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java @@ -195,7 +195,8 @@ public class JTreeComboBox extends JComboBox { // õС Dimension preferredSize = tree.getPreferredSize(); preferredSize.width = Math.max(preferredSize.width, 200); - preferredSize.height = Math.min(preferredSize.height, 800); + preferredSize.height = Math.min(preferredSize.height, 200); + preferredSize.height = 150; setPreferredSize(preferredSize); }