From 59232b69c65869f5e0fa2c03bdad10e127a5033a Mon Sep 17 00:00:00 2001
From: xiongcz <xiongcz@connor.net.cn>
Date: Mon, 5 May 2025 02:37:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dialog):=20=E4=BC=98=E5=8C=96=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E5=9B=BE=E7=BA=B8=E5=88=9B=E5=BB=BA=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加了对 preferenceInfos 返回值的空检查
- 添加了校验通过的打印信息
- 优化了组件值获取逻辑，增加了对 null 值的处理
- 增加了调试信息打印，便于问题排查
---
 .../dialogs/CreateTempDrawingDialog.java      | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java b/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java
index 30af5c3..1e76f1a 100644
--- a/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java
+++ b/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java
@@ -95,10 +95,9 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{
 	 */
 	public List<String> getPreferenceInfos(String preferenceName) {
 		List<String> drawingObjPropInfosList = new ArrayList<>();
-
 		TCPreferenceService preferenceService = tcSession.getPreferenceService();
 		String[] values = preferenceService.getStringValues(preferenceName);
-		if (values.length > 0) {
+		if (values != null && values.length > 0) {
 			for (int i = 0; i < values.length; i++) {
 				drawingObjPropInfosList.add(values[i]);
 			}
@@ -245,6 +244,8 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{
 				if(!checkRequiredProp()){
 					System.out.println("У��δͨ����");
 					return ;
+				}else {
+					System.out.println("У����ͨ����");
 				}
 
 
@@ -268,7 +269,9 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{
 	 * @return
 	 */
 	private boolean checkRequiredProp() {
+		 System.out.println("propComponentMap.size="+propComponentMap.size());
 		if (propComponentMap.size()>0) {
+			System.out.println("1");
 			for (Map.Entry<String, JComponent> entry : propComponentMap.entrySet()) {
 				String key = entry.getKey();
 				Object value = getComponentValue(entry.getValue());
@@ -289,21 +292,31 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{
 	}
 
 	/**
-	 * ��ȡ�����ֵ
+	 * @���ݲ�ͬ���͵������ȡ�����ֵ
 	 * @param component
 	 * @return
 	 */
 	public String getComponentValue(JComponent component) {
+		System.out.println("��ʼ���ݲ�ͬ���͵����ȡֵ");
 		if (component instanceof JTextField) {
+			System.out.println("JTextField");
 			return ((JTextField) component).getText();
 		} else if (component instanceof JComboBox) {
+			System.out.println("JComboBox");
 			JComboBox<String> comboBox = (JComboBox<String>) component;
 			return (String)comboBox.getSelectedItem();
 		} else if (component instanceof DateButton) {
+			System.out.println("DateButton");
 			DateButton dateButton = (DateButton) component;
 			Date date = dateButton.getDate();
+			if (date == null){
+				return null;
+			}
 			String dateInput = dateFormat.format(date).replaceAll("(\\d{4})-0(\\d)-", "$1-$2-") + " 00:00";
+			System.out.println("dateInput="+dateInput);
 			return dateInput;
+		}else {
+			System.out.println("����֮��������");
 		}
 		return null;
 	}
@@ -339,7 +352,6 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{
 		this.revComboBox = new JComboBox<String>(revs);
 //		this.revComboBox.setEditable(true);
 
-
 //����
 		// ID Label
 		GridBagConstraints gbcIdLabel = new GridBagConstraints();
@@ -385,11 +397,12 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{
 		propComponentMap.put("�汾", revComboBox);
 
 
-
 		String preferenceName = getSelectTypePreferenceName();
+		System.out.println("preferenceName = " + preferenceName);
 		int propIndex  = 2;
 		if (preferenceName != null){
 			List<String> propList = getPreferenceInfos(preferenceName);
+			System.out.println("propList.size = "+propList.size());
 			for(String propInfo : propList){//propInfo��ʽΪ��*��Ч��=Form.sb6_validuntil=date=Form.sb6_validuntil
 				String[] propConfigInfoArray= propInfo.split("=");
 				String validPropName = null;