BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4ca0aadd4a5ba3efba8a71d79a4c8b7f0c37ed2a

Authored by haohao
1 parent f6886a78

fix(infra): 代码生成统一 LF 并优化尾逗号正则

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
  View file @4ca0aad
... ... @@ -459,7 +459,7 @@ public class CodegenEngine {
459 459 private String prettyCode(String content, String vmPath) {
460 460 // Vue 界面：去除字段后面多余的 , 逗号，解决前端的 Pretty 代码格式检查的报错（需要排除 vben5、vue3_admin_uniapp）
461 461 if (!StrUtil.containsAny(vmPath, "vben5", "vue3_admin_uniapp")) {
462   - content = content.replaceAll(",\\r?\\n}", "\n}").replaceAll(",\\r?\\n }", "\n }");
  462 + content = content.replaceAll(",\\r?\\n(\\s*)}", "\n$1}");
463 463 }
464 464 // Vue 界面：去除多的 dateFormatter，只有一个的情况下，说明没使用到
465 465 if (StrUtil.count(content, "dateFormatter") == 1) {
... ... @@ -482,7 +482,8 @@ public class CodegenEngine {
482 482 if (StrUtil.count(content, "DICT_TYPE.") == 0) {
483 483 content = StrUtils.removeLineContains(content, "DICT_TYPE");
484 484 }
485   - return content;
  485 + // 统一换行符为 LF，避免 Windows 下模板引擎输出 CRLF 导致前端 ESLint/Prettier 报错
  486 + return content.replace("\r\n", "\n");
486 487 }
487 488  
488 489 private Map<String, Object> initBindingMap(DbType dbType, CodegenTableDO table, List<CodegenColumnDO> columns,
... ...