From 5e6fd0d1e148554c94d30ba7ed4ffe2eddc07c78 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 12 Feb 2022 11:56:02 +0800
Subject: [PATCH] !429 修复自定义组件`file-upload`无法显示第一个文件，列表显示的文件比实际文件少一个的问题 Merge pull request !429 from hjk2008/master
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 612ae30..c3ccdae 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -112,10 +112,15 @@
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
- // 文件字段设置上传控件
+ // 图片字段设置图片上传控件
else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
{
- column.setHtmlType(GenConstants.HTML_UPLOAD_IMAGE);
+ column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+ }
+ // 文件字段设置文件上传控件
+ else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+ {
+ column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 内容字段设置富文本控件
else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
@@ -146,8 +151,7 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
@@ -160,8 +164,7 @@
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
- return businessName;
+ return StringUtils.substring(tableName, lastIndex + 1, nameLength);
}
/**
--
Gitblit v1.9.2