From 4f113d1862ee978e7d0756f31af79ad73b1dc6d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 12 九月 2024 16:33:39 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
index 00495b4..e04e49e 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
@@ -42,6 +42,7 @@
public String password;
public String table;
public String tableName;
+ public String rootPackagePath;
public String packagePath;
public boolean controller = true;
public boolean service = true;
@@ -201,6 +202,7 @@
.replaceAll("@\\{SIMPLEENTITYNAME}", simpleEntityName)
.replaceAll("@\\{UENTITYNAME}", simpleEntityName)
.replaceAll("@\\{COMPANYNAME}",packagePath)
+ .replaceAll("@\\{ROOTPACKAGEPATH}",rootPackagePath)
.replaceAll("@\\{ITEMNAME}",itemName)
// .replaceAll("@\\{XMLCONTENT}", xmlContent)
.replaceAll("@\\{HTMLCONTENT}", htmlContent)
@@ -781,15 +783,18 @@
sb.append(" {\n")
.append(" title: formatMessage('db.").append(table).append(".").append(column.getName()).append("', '").append(column.getComment()).append("'),").append("\n")
.append(" dataIndex: '");
+ StringBuilder rowKey = new StringBuilder();
if ("Date".equals(column.getType()) || !Cools.isEmpty(column.getEnums()) || !Cools.isEmpty(column.getForeignKeyMajor())){
// 鏃堕棿銆佹灇涓� 鏍煎紡鍖� 涓婚敭淇グ
- sb.append(column.getHumpName()).append("\\$");
+ rowKey.append(column.getHumpName()).append("\\$");
} else {
- sb.append(column.getHumpName());
+ rowKey.append(column.getHumpName());
}
+ sb.append(rowKey);
sb.append("',\n")
.append(" width: 140,\n")
- .append(" ellipsis: true,\n");
+ .append(" ellipsis: true,\n")
+ .append(" ...getColumnSearchProps('").append(rowKey).append("'),\n");
// if (!Cools.isEmpty(column.getEnums())) {
// sb.append(" customRender: (column) => {\n");
// sb.append(" let typeMap = {");
@@ -900,18 +905,18 @@
}
// 鍏宠仈琛�
- if (!Cools.isEmpty(column.getForeignKey())) {
- if (!foreignKeyContains.contains(column.getForeignKey())) {
- sb2.append("const ").append(column.getForeignKey()).append("QueryList = ref(null); \n");
- sb2.append(column.getForeignKey()).append("Query();\n");
- sb2.append("function ").append(column.getForeignKey()).append("Query() { \n");
- sb2.append(" postForm('/api/").append(column.getForeignKey().toLowerCase()).append("/query', {}).then(resp => { \n");
+ if (!Cools.isEmpty(column.getForeignKey$())) {
+ if (!foreignKeyContains.contains(column.getForeignKey$())) {
+ sb2.append("const ").append(column.getForeignKey$()).append("QueryList = ref(null); \n");
+ sb2.append(column.getForeignKey$()).append("Query();\n");
+ sb2.append("function ").append(column.getForeignKey$()).append("Query() { \n");
+ sb2.append(" postForm('/api/").append(column.getForeignKey$()).append("/query', {}).then(resp => { \n");
sb2.append(" let result = resp.data;\n");
- sb2.append(" ").append(column.getForeignKey()).append("QueryList.value = result.data;\n");
+ sb2.append(" ").append(column.getForeignKey$()).append("QueryList.value = result.data;\n");
sb2.append(" })\n");
sb2.append("}\n");
- foreignKeyContains.add(column.getForeignKey());
+ foreignKeyContains.add(column.getForeignKey$());
}
sb.append(" <a-select \n");
@@ -919,7 +924,7 @@
sb.append(" :placeholder=\"formatMessage('common.select', '璇烽�夋嫨')\" \n");
sb.append(" style=\"width: 100%\" \n");
sb.append(" show-search \n");
- sb.append(" :options=\"").append(column.getForeignKey()).append("QueryList\" \n");
+ sb.append(" :options=\"").append(column.getForeignKey$()).append("QueryList\" \n");
sb.append(" optionFilterProp=\"label\" \n");
sb.append(" optionLabelProp=\"label\" \n");
sb.append(" > \n");
--
Gitblit v1.9.1