DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: 同步 RuoYi-Vue-Plus（v4.6.0） 更新

Browse Source
This commit is contained in:
konbai
2023-03-19 22:08:25 +08:00
parent 4958bbccbd
commit 1293ad683f
143 changed files with 2415 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View File

@@ -212,7 +212,7 @@ public class GenTableColumn extends BaseEntity {
if (StringUtils.isNotEmpty(value)) {
Object startStr = value.subSequence(0, 1);
String endStr = value.substring(1);
sb.append("").append(startStr).append("=").append(endStr).append(",");
sb.append(StringUtils.EMPTY).append(startStr).append("=").append(endStr).append(StringUtils.SEPARATOR);
}
}
return sb.deleteCharAt(sb.length() - 1).toString();

6
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
View File

@@ -58,7 +58,7 @@ public class GenUtils {
column.setHtmlType(GenConstants.HTML_INPUT);
// 如果是浮点型 统一用BigDecimal
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), StringUtils.SEPARATOR);
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
@@ -167,7 +167,7 @@ public class GenUtils {
boolean autoRemovePre = GenConfig.getAutoRemovePre();
String tablePrefix = GenConfig.getTablePrefix();
if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
String[] searchList = StringUtils.split(tablePrefix, ",");
String[] searchList = StringUtils.split(tablePrefix, StringUtils.SEPARATOR);
tableName = replaceFirst(tableName, searchList);
}
return StringUtils.convertToCamelCase(tableName);
@@ -184,7 +184,7 @@ public class GenUtils {
String text = replacementm;
for (String searchString : searchList) {
if (replacementm.startsWith(searchString)) {
text = replacementm.replaceFirst(searchString, "");
text = replacementm.replaceFirst(searchString, StringUtils.EMPTY);
break;
}
}

2
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View File

@@ -232,7 +232,7 @@ public class VelocityUtils {
public static HashSet<String> getImportList(GenTable genTable) {
List<GenTableColumn> columns = genTable.getColumns();
GenTable subGenTable = genTable.getSubTable();
HashSet<String> importList = new HashSet<String>();
HashSet<String> importList = new HashSet<>();
if (ObjectUtil.isNotNull(subGenTable)) {
importList.add("java.util.List");
}

1
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
View File

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY c.relname, a.attnum
) temp
WHERE table_name = (#{tableName})
AND column_type <![CDATA[ <> ]]> '-'
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isSqlServer()">
SELECT

10
ruoyi-generator/src/main/resources/vm/java/bo.java.vm
View File

@@ -34,18 +34,18 @@ import com.ruoyi.common.core.domain.TreeEntity;
public class ${ClassName}Bo extends ${Entity} {
#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.isInsert || $column.isEdit))
#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
/**
* $column.columnComment
*/
#if($column.isInsert && $column.isEdit)
#if($column.insert && $column.edit)
#set($Group="AddGroup.class, EditGroup.class")
#elseif($column.isInsert)
#elseif($column.insert)
#set($Group="AddGroup.class")
#elseif($column.isEdit)
#elseif($column.edit)
#set($Group="EditGroup.class")
#end
#if($column.isRequired == 1)
#if($column.required)
#if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
#else

2
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@@ -45,7 +45,7 @@ public class ${ClassName} extends ${Entity} {
#if($column.javaField=='version')
@Version
#end
#if($column.isPk==1)
#if($column.pk)
@TableId(value = "$column.columnName")
#end
private $column.javaType $column.javaField;

2
ruoyi-generator/src/main/resources/vm/java/vo.java.vm
View File

@@ -25,7 +25,7 @@ public class ${ClassName}Vo {
private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
#if($column.isList)
#if($column.list)
/**
* $column.columnComment
*/

3
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@@ -51,11 +51,12 @@
<el-date-picker
v-model="daterange${AttrName}"
style="width: 240px"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
#end

3
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@@ -51,11 +51,12 @@
<el-date-picker
v-model="daterange${AttrName}"
style="width: 240px"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
#end

3
ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
View File

@@ -50,11 +50,12 @@
<el-form-item label="${comment}" style="width: 308px">
<el-date-picker
v-model="daterange${AttrName}"
value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
></el-date-picker>
</el-form-item>
#end

6
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
View File

@@ -50,11 +50,11 @@
<el-form-item label="${comment}" style="width: 308px">
<el-date-picker
v-model="daterange${AttrName}"
value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
></el-date-picker>
</el-form-item>
#end
@@ -540,7 +540,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').then(function() {
loading.value = true;
return del${BusinessName}(_${pkColumn.javaField}s);
}).then(() => {