From 0151eac5a5b3884f555533ed522a3d5f04b405c5 Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Mon, 17 Mar 2025 11:39:46 +0800
Subject: [PATCH] =?UTF-8?q?fixbug:=E7=94=9F=E4=BA=A7=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9ElowerFirst=20=E7=9A=84=E9=A9=BC?=
=?UTF-8?q?=E5=B3=B0=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=85=8D=E7=BD=AE=E5=AF=B9?=
=?UTF-8?q?=E5=BA=94=E6=A0=BC=E5=BC=8F=E4=BD=BF=E7=94=A8=E7=9A=84=E5=9C=B0?=
=?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/helper/generatorHelper.ts | 34 ++++++++++++++++-------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index 01d54eb..920cd34 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -1,6 +1,6 @@
import { formatCode } from './../codeformat';
import { GeneratorConfig } from '../../model/generator/generatorConfig';
-import { camelCase, cloneDeep, upperFirst } from 'lodash-es';
+import { camelCase, cloneDeep, upperFirst, lowerFirst } from 'lodash-es';
import { ColumnType } from '/@/model/generator/tableInfo';
import {
ComponentConfigModel,
@@ -76,6 +76,7 @@ export function buildApiCode(model: GeneratorConfig, _tableInfo: TableInfo[]): s
// const lowerClassName = lowerCase(className);
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
const pascalClassName = upperFirst(camelCase(className));
+ const lowerFirstPascalClassName = lowerFirst(camelCase(className));
let mainTable;
if (model.tableConfigs && model.tableConfigs.length) {
@@ -105,20 +106,20 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
- Page = '/${model.outputConfig.outputValue}/${lowerClassName}/page',
- List = '/${model.outputConfig.outputValue}/${lowerClassName}/list',
- Info = '/${model.outputConfig.outputValue}/${lowerClassName}/info',
- ${pascalMainTableName} = '/${model.outputConfig.outputValue}/${lowerClassName}',
+ Page = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/page',
+ List = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/list',
+ Info = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/info',
+ ${pascalMainTableName} = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}',
${
hasSetUserIdButton
? `
- DataAuth = '/${model.outputConfig.outputValue}/${lowerClassName}/data-auth',`
+ DataAuth = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/data-auth',`
: ''
}
${
hasExportButton
? `
- Export = '/${model.outputConfig.outputValue}/${lowerClassName}/export',`
+ Export = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/export',`
: ''
}
}
@@ -402,6 +403,7 @@ export function buildListCode(model: GeneratorConfig): string {
// const lowerClassName = lowerCase(className);
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
const pascalClassName = upperFirst(camelCase(className));
+ const lowerFirstPascalClassName = lowerFirst(camelCase(className));
// //是否有左侧菜单
// const isMenu = model.listConfig.isLeftMenu;
@@ -600,7 +602,7 @@ export function buildListCode(model: GeneratorConfig): string {
}
${
hasImportButton
- ? ` `
+ ? ` `
: ''
}
${
@@ -1360,7 +1362,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
function handleImport() {
openImportModal(true, {
title: '快速导入',
- downLoadUrl:'/${model.outputConfig.outputValue}/${lowerClassName}/export',
+ downLoadUrl:'/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/export',
});
}
function handleImportSuccess(){
@@ -2127,6 +2129,7 @@ export function buildWorkflowPermissionConfigJsonCode(formProps: FormProps | App
export function buildAppApiCode(model: GeneratorConfig): string {
const className = model.outputConfig.className;
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
+ const lowerFirstPascalClassName = lowerFirst(camelCase(className));
let mainTable;
if (model.tableConfigs && model.tableConfigs.length) {
@@ -2155,10 +2158,10 @@ import {
} from '@/common/request/index.js'; // 局部引入
const api = {
- Page : '/${model.outputConfig.outputValue}/${lowerClassName}/page',
- List : '/${model.outputConfig.outputValue}/${lowerClassName}/list',
- Info : '/${model.outputConfig.outputValue}/${lowerClassName}/info',
- ${pascalMainTableName} : '/${model.outputConfig.outputValue}/${lowerClassName}'
+ Page : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/page',
+ List : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/list',
+ Info : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/info',
+ ${pascalMainTableName} : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}'
}
/**
@@ -2233,6 +2236,7 @@ export function buildAppConfigJsonCode(
// const lowerClassName = lowerCase(className);
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
// const pascalClassName = upperFirst(camelCase(className));
+ const lowerFirstPascalClassName = lowerFirst(camelCase(className));
let mainTable;
if (designType == 'data') {
@@ -2342,9 +2346,9 @@ export const listProps = {
})
.join('\n')}],
//表单页面地址
- formUrl: '/pages/${model.outputConfig.outputValue}/${lowerClassName}/container',
+ formUrl: '/pages/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/container',
//列表页面地址
- listUrl: '/pages/${model.outputConfig.outputValue}/${lowerClassName}/list',
+ listUrl: '/pages/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/list',
//按钮配置
otherButtons:[${model.listConfig.buttonConfigs
.filter((item) => item.code !== 'edit' && item.code !== 'delete')