DeXun/erp-next
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TypeScript前端代码生成模板同步到最新

Browse Source
This commit is contained in:
RuoYi
2026-03-12 12:24:35 +08:00
parent a6f142db96
commit 7816597b86
14 changed files with 1226 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
View File

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.SQLUtils;
@@ -112,12 +113,12 @@ public class GenController extends BaseController
@PreAuthorize("@ss.hasPermi('tool:gen:import')")
@Log(title = "代码生成", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
public AjaxResult importTableSave(String tables)
public AjaxResult importTableSave(@RequestParam("tables") String tables, @RequestParam("tplWebType") String tplWebType)
{
String[] tableNames = Convert.toStrArray(tables);
// 查询表信息
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
genTableService.importGenTable(tableList, SecurityUtils.getUsername());
genTableService.importGenTable(tableList, tplWebType, SecurityUtils.getUsername());
return success();
}
@@ -127,7 +128,7 @@ public class GenController extends BaseController
@PreAuthorize("@ss.hasRole('admin')")
@Log(title = "创建表", businessType = BusinessType.OTHER)
@PostMapping("/createTable")
public AjaxResult createTableSave(String sql)
public AjaxResult createTableSave(@RequestParam("sql") String sql, @RequestParam("tplWebType") String tplWebType)
{
try
{
@@ -148,7 +149,7 @@ public class GenController extends BaseController
}
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));
String operName = SecurityUtils.getUsername();
genTableService.importGenTable(tableList, operName);
genTableService.importGenTable(tableList, tplWebType, operName);
return AjaxResult.success();
}
catch (Exception e)

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

@@ -41,7 +41,7 @@ public class GenTable extends BaseEntity
/** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
private String tplCategory;
/** 前端类型（element-ui模版 element-plus模版） */
/** 前端类型（element-ui模版 element-plus模版 element-plus-typescript模版） */
private String tplWebType;
/** 生成包路径 */

3
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
View File

@@ -168,13 +168,14 @@ public class GenTableServiceImpl implements IGenTableService
*/
@Override
@Transactional
public void importGenTable(List<GenTable> tableList, String operName)
public void importGenTable(List<GenTable> tableList, String tplWebType, String operName)
{
try
{
for (GenTable table : tableList)
{
String tableName = table.getTableName();
table.setTplWebType(tplWebType);
GenUtils.initTable(table, operName);
int row = genTableMapper.insertGenTable(table);
if (row > 0)

3
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
View File

@@ -78,9 +78,10 @@ public interface IGenTableService
* 导入表结构
*
* @param tableList 导入表列表
* @param tplWebType 前端类型
* @param operName 操作人员
*/
public void importGenTable(List<GenTable> tableList, String operName);
public void importGenTable(List<GenTable> tableList, String tplWebType, String operName);
/**
* 预览代码

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

@@ -29,6 +29,12 @@ public class VelocityUtils
/** 默认上级菜单，系统工具 */
private static final String DEFAULT_PARENT_MENU_ID = "3";
/** Vue3 Element Plus 模版 */
private static final String ELEMENT_PLUS = "element-plus";
/** Vue3 Element Plus TypeScript 模版 */
private static final String ELEMENT_PLUS_TYPESSRIPT = "element-plus-typescript";
/**
* 设置模板变量信息
*
@@ -130,10 +136,16 @@ public class VelocityUtils
public static List<String> getTemplateList(String tplCategory, String tplWebType)
{
String useWebType = "vm/vue";
if ("element-plus".equals(tplWebType))
String apiTemplate = "vm/js/api.js.vm";
if (StringUtils.equals(ELEMENT_PLUS, tplWebType))
{
useWebType = "vm/vue/v3";
}
else if (StringUtils.equals(ELEMENT_PLUS_TYPESSRIPT, tplWebType))
{
useWebType = "vm/vue/v3ts";
apiTemplate = "vm/ts/api.ts.vm";
}
List<String> templates = new ArrayList<String>();
templates.add("vm/java/domain.java.vm");
templates.add("vm/java/mapper.java.vm");
@@ -142,7 +154,12 @@ public class VelocityUtils
templates.add("vm/java/controller.java.vm");
templates.add("vm/xml/mapper.xml.vm");
templates.add("vm/sql/sql.vm");
templates.add("vm/js/api.js.vm");
templates.add(apiTemplate);
if (StringUtils.equals(ELEMENT_PLUS_TYPESSRIPT, tplWebType))
{
templates.add("vm/ts/type.ts.vm");
templates.add("vm/ts/index.ts.vm");
}
if (GenConstants.TPL_CRUD.equals(tplCategory))
{
templates.add(useWebType + "/index.vue.vm");
@@ -215,6 +232,18 @@ public class VelocityUtils
{
fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
}
else if (template.contains("api.ts.vm"))
{
fileName = StringUtils.format("{}/api/{}/{}.ts", vuePath, moduleName, businessName);
}
else if (template.contains("type.ts.vm"))
{
fileName = StringUtils.format("{}/types/api/{}/{}.ts", vuePath, moduleName, businessName);
}
else if (template.contains("index.ts.vm"))
{
fileName = StringUtils.format("{}/types/api/index-bak.ts", vuePath);
}
else if (template.contains("index.vue.vm"))
{
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);