geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-zhaoDN/insurance' into 'dev'

Browse Source 
fixbug:生产代码，新增lowerFirst 的驼峰字段，配置对应格式使用的地方

See merge request itc-framework/ma/2024/front!45
This commit is contained in:
890147
2025-03-19 01:08:30 +00:00
parent f73f1c9ade 3f185ccaaa
commit 9f9b40c284
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/utils/helper/generatorHelper.ts
View File

@ -1,6 +1,6 @@
import { formatCode } from './../codeformat'; import { formatCode } from './../codeformat';
import { GeneratorConfig } from '../../model/generator/generatorConfig'; 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 { ColumnType } from '/@/model/generator/tableInfo';
import { import {
ComponentConfigModel, ComponentConfigModel,
@ -76,6 +76,7 @@ export function buildApiCode(model: GeneratorConfig, _tableInfo: TableInfo[]): s
// const lowerClassName = lowerCase(className); // const lowerClassName = lowerCase(className);
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className; const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
const pascalClassName = upperFirst(camelCase(className)); const pascalClassName = upperFirst(camelCase(className));
const lowerFirstPascalClassName = lowerFirst(camelCase(className));
let mainTable; let mainTable;
if (model.tableConfigs && model.tableConfigs.length) { if (model.tableConfigs && model.tableConfigs.length) {
@ -105,20 +106,20 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios'; import { ErrorMessageMode } from '/#/axios';
enum Api { enum Api {
Page = '/${model.outputConfig.outputValue}/${lowerClassName}/page', Page = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/page',
List = '/${model.outputConfig.outputValue}/${lowerClassName}/list', List = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/list',
Info = '/${model.outputConfig.outputValue}/${lowerClassName}/info', Info = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/info',
${pascalMainTableName} = '/${model.outputConfig.outputValue}/${lowerClassName}', ${pascalMainTableName} = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}',
${ ${
hasSetUserIdButton hasSetUserIdButton
? ` ? `
DataAuth = '/${model.outputConfig.outputValue}/${lowerClassName}/data-auth',` DataAuth = '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/data-auth',`
: '' : ''
} }
${ ${
hasExportButton 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 = lowerCase(className);
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className; const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
const pascalClassName = upperFirst(camelCase(className)); const pascalClassName = upperFirst(camelCase(className));
const lowerFirstPascalClassName = lowerFirst(camelCase(className));
// //是否有左侧菜单 // //是否有左侧菜单
// const isMenu = model.listConfig.isLeftMenu; // const isMenu = model.listConfig.isLeftMenu;
@ -600,7 +602,7 @@ export function buildListCode(model: GeneratorConfig): string {
} }
${ ${
hasImportButton hasImportButton
? ` <ImportModal @register="registerImportModal" importUrl="/${model.outputConfig.outputValue}/${lowerClassName}/import" @success="handleImportSuccess"/>` ? ` <ImportModal @register="registerImportModal" importUrl="/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/import" @success="handleImportSuccess"/>`
: '' : ''
} }
${ ${
@ -1360,7 +1362,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
function handleImport() { function handleImport() {
openImportModal(true, { openImportModal(true, {
title: '快速导入', title: '快速导入',
downLoadUrl:'/${model.outputConfig.outputValue}/${lowerClassName}/export', downLoadUrl:'/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/export',
}); });
} }
function handleImportSuccess(){ function handleImportSuccess(){
@ -2131,6 +2133,7 @@ export function buildWorkflowPermissionConfigJsonCode(formProps: FormProps | App
export function buildAppApiCode(model: GeneratorConfig): string { export function buildAppApiCode(model: GeneratorConfig): string {
const className = model.outputConfig.className; const className = model.outputConfig.className;
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className; const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
const lowerFirstPascalClassName = lowerFirst(camelCase(className));
let mainTable; let mainTable;
if (model.tableConfigs && model.tableConfigs.length) { if (model.tableConfigs && model.tableConfigs.length) {
@ -2159,10 +2162,10 @@ import {
} from '@/common/request/index.js'; // 局部引入 } from '@/common/request/index.js'; // 局部引入
const api = { const api = {
Page : '/${model.outputConfig.outputValue}/${lowerClassName}/page', Page : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/page',
List : '/${model.outputConfig.outputValue}/${lowerClassName}/list', List : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/list',
Info : '/${model.outputConfig.outputValue}/${lowerClassName}/info', Info : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/info',
${pascalMainTableName} : '/${model.outputConfig.outputValue}/${lowerClassName}' ${pascalMainTableName} : '/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}'
} }
/** /**
@ -2237,6 +2240,7 @@ export function buildAppConfigJsonCode(
// const lowerClassName = lowerCase(className); // const lowerClassName = lowerCase(className);
const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className; const lowerClassName = isOutputDirLowerName?(className?.toLowerCase()):className;
// const pascalClassName = upperFirst(camelCase(className)); // const pascalClassName = upperFirst(camelCase(className));
const lowerFirstPascalClassName = lowerFirst(camelCase(className));
let mainTable; let mainTable;
if (designType == 'data') { if (designType == 'data') {
@ -2346,9 +2350,9 @@ export const listProps = {
}) })
.join('\n')}], .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 otherButtons:[${model.listConfig.buttonConfigs
.filter((item) => item.code !== 'edit' && item.code !== 'delete') .filter((item) => item.code !== 'edit' && item.code !== 'delete')