huangge1199/ruoyi-flex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善代码生成器ts前端类型文件

Browse Source
This commit is contained in:
数据小王子 2024-03-22 21:08:15 +08:00
parent bcd06f3d2b
commit f3b3bec8b0
2 changed files with 45 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -39,21 +39,6 @@ mybatis-flex:
username: postgres username: postgres
password: postgres@369 password: postgres@369
# # 数据源-2
# ds2:
# # 指定为HikariDataSource
# type: ${spring.datasource.type}
# # mysql数据库
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
# username: root
# password: Root@369
# #postgresql数据库
## driver-class-name: org.postgresql.Driver
## url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
## username: postgres
## password: postgres@369
# redis 单机配置(单机与集群只能开启一个另一个需要注释掉) # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring.data: spring.data:
redis: redis:

107
ruoyi-modules/ruoyi-generator/src/main/resources/vm/api/element.ts.types.vm
View File

@ -1,75 +1,58 @@
export interface ${BusinessName}VO extends BaseEntity { export interface ${BusinessName}VO extends BaseEntity {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.list) #if($column.list)
/** /**
* $column.columnComment * $column.columnComment
*/ */
$column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
#elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
#elseif($column.javaType == 'Boolean') boolean; #elseif($column.javaType == 'Boolean') boolean;
#else string; #else string;
#end #end
#end #end
#end #end
#if ($table.tree) #if ($table.tree)
/** /**
* 子树对象 * 子树对象
*/ */
children: ${BusinessName}VO[]; children: ${BusinessName}VO[];
#end #end
#if($table.sub) #if($table.sub)
/** $table.subTable.functionName信息 */ /** $table.subTable.functionName信息 */
${subclassName}List: Array<${subClassName}VO>; ${subclassName}List: Array<${subClassName}VO>;
#end #end
} }
export interface ${subClassName}VO extends BaseEntity { export interface ${BusinessName}Form {
/** 列表序号 */
index:number;
#foreach ($column in $subTable.columns)
#if($column.list)
/**
* $column.columnComment
*/
$column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
#elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
#elseif($column.javaType == 'Boolean') boolean;
#else string;
#end
#end
#end
}
export interface ${BusinessName}Form {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.insert || $column.edit) #if($column.insert || $column.edit)
/** /**
* $column.columnComment * $column.columnComment
*/ */
$column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
#elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
#elseif($column.javaType == 'Boolean') boolean; #elseif($column.javaType == 'Boolean') boolean;
#else string; #else string;
#end #end
#end
#end #end
#end }
}
export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{ export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.query) #if($column.query)
/** /**
* $column.columnComment * $column.columnComment
*/ */
$column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
#elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
#elseif($column.javaType == 'Boolean') boolean; #elseif($column.javaType == 'Boolean') boolean;
#else string; #else string;
#end #end
#end
#end #end
#end /**
/** * 日期范围参数
* 日期范围参数 */
*/ params?: any;
params?: any; }
}