From d4f427bf7c0ff1cf0ed1ac420bba8a063f9ef840 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 七月 2024 17:25:39 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 d92e88d..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,7 +787,8 @@
}
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");
}
@@ -859,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")
@@ -868,6 +870,7 @@
}
if (times%2 == 0) {
sb.append(" <ProForm.Group>\n");
+ has = true;init=true;
}
String itemType = "ProFormText";
@@ -916,16 +919,10 @@
if (!Cools.isEmpty(precision) && Cools.isEmpty(column.getEnums())) {
sb.append(" fieldProps={{ precision: ").append(precision).append(" }}\n");
}
- if ("Date".equals(column.getType()) || !Cools.isEmpty(column.getEnums()) || !Cools.isEmpty(column.getForeignKeyMajor())){
- // 鏃堕棿銆佹灇涓� 鏍煎紡鍖� 涓婚敭淇グ
- sb.append(" placeholder=\"璇烽�夋嫨\"\n");
- } else {
- sb.append(" placeholder=\"璇疯緭鍏"\n");
- }
// 闈炵┖
if (column.isNotNull()) {
- sb.append(" rules={[{ required: true, message: \"").append(column.getComment()).append("涓嶈兘涓虹┖锛乗" }]}\n");
+ sb.append(" rules={[{ required: true }]}\n");
}
// 鏋氫妇
@@ -946,20 +943,25 @@
// 鍏宠仈琛�
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(" }}\n");
+ 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");
+ sb.append(" />\n");
- if (times%2 == 0) {
+ 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