From a4093814b51bba7eae9530cfa076f6242df3f5f8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 17 二月 2025 14:59:43 +0800
Subject: [PATCH] #移库任务

---
 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java |  106 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index ede2c73..5895730 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
@@ -787,13 +787,19 @@
             }
             sb.append("',\n")
                     .append("            valueType: 'text',\n")
-                    .append("            hidden: false,\n");
+                    .append("            hidden: false,\n")
+                    .append("            width: 140,\n");
             if (column.isMajor()) {
                 sb.append("            copyable: true,\n");
             }
             sb.append("            filterDropdown: (props) => <").append(getAntProFilterType(column)).append("\n")
-                    .append("                name='").append(column.getHumpName()).append("'\n")
-                    .append("                {...props}\n")
+                    .append("                name='").append(column.getHumpName()).append("'\n");
+
+            if (!Cools.isEmpty(column.getForeignKey())) {
+                sb.append("                major='").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("'\n");
+            }
+
+            sb.append("                {...props}\n")
                     .append("                actionRef={actionRef}\n")
                     .append("                setSearchParam={setSearchParam}\n");
             if (!Cools.isEmpty(column.getEnums())) {
@@ -854,6 +860,7 @@
     private String createFormEditColumns() {
         StringBuilder sb = new StringBuilder();
         int times = 0;
+        boolean has = false;boolean init = false;
         for (Column column : columns) {
             if (column.isPrimaryKey()
                     || column.getHumpName().equals("deleted")
@@ -861,16 +868,101 @@
             ) {
                 continue;
             }
-
             if (times%2 == 0) {
-
+                sb.append("                    <ProForm.Group>\n");
+                has = true;init=true;
             }
 
+            String itemType = "ProFormText";
+            String precision = "";
+            switch (column.getType()) {
+                case "Boolean":
+                    itemType = "ProFormText";
+                    break;
+                case "Short":
+                    itemType = "ProFormDigit";
+                    precision = "0";
+                    break;
+                case "Integer":
+                    itemType = "ProFormDigit";
+                    precision = "0";
+                    break;
+                case "Long":
+                    itemType = "ProFormDigit";
+                    precision = "0";
+                    break;
+                case "Double":
+                    itemType = "ProFormDigit";
+                    precision = "2";
+                    break;
+                case "String":
+                    itemType = "ProFormText";
+                    break;
+                case "Date":
+                    itemType = "ProFormDateTimePicker";
+                    break;
+                default:
+                    break;
+            }
+            if (!Cools.isEmpty(column.getEnums())) {
+                itemType = "ProFormSelect";
+            }
+            if (!Cools.isEmpty(column.getForeignKey())) {
+                itemType = "ProFormSelect";
+            }
+
+            sb.append("                        <").append(itemType).append("\n")
+                    .append("                            name=\"").append(column.getHumpName()).append("\"\n")
+                    .append("                            label=\"").append(column.getComment()).append("\"\n")
+                    .append("                            colProps={{ md: 12, xl: 12 }}\n");
+            // 鏁板瓧灏忔暟鐐�
+            if (!Cools.isEmpty(precision) && Cools.isEmpty(column.getEnums())) {
+                sb.append("                            fieldProps={{ precision: ").append(precision).append(" }}\n");
+            }
+
+            // 闈炵┖
+            if (column.isNotNull()) {
+                sb.append("                            rules={[{ required: true }]}\n");
+            }
+
+            // 鏋氫妇
+            if (!Cools.isEmpty(column.getEnums())) {
+                sb.append("                            options={[\n");
+                for (Map<String, Object> map : column.getEnums()) {
+                    for (Map.Entry<String, Object> entry : map.entrySet()){
+                        sb.append("                                { label: '").append(entry.getValue()).append("', value: ").append(entry.getKey()).append(" },\n");
+                    }
+                }
+                sb.append("                            ]}\n");
+            }
+
+            // 鏃堕棿
+            if ("Date".equals(column.getType())) {
+                sb.append("                            transform={(value) => moment(value).toISOString()}\n");
+            }
+
+            // 鍏宠仈琛�
+            if (!Cools.isEmpty(column.getForeignKey())) {
+                sb.append("                            showSearch\n")
+                        .append("                            debounceTime={300}\n")
+                        .append("                            request={async ({ keyWords }) => {\n")
+                        .append("                                const resp = await Http.doPostForm('api/").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("/query', { condition: keyWords });\n")
+                        .append("                                return resp.data;\n")
+                        .append("                            }}\n");
+            }
+
+            sb.append("                        />\n");
+
+            if (times%2 != 0) {
+                sb.append("                    </ProForm.Group>\n");
+                has = false;
+            }
             times++;
+        }
+        if (init && has) {
+            sb.append("                    </ProForm.Group>\n");
         }
         return sb.toString();
     }
-
-
 
 }

--
Gitblit v1.9.1