Merge branch 'dev-zhaoDN/insurance' into 'dev'
fixbug:生产代码,新增lowerFirst 的驼峰字段,配置对应格式使用的地方 See merge request itc-framework/ma/2024/front!45
This commit is contained in:
@ -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
|
||||
? ` <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() {
|
||||
openImportModal(true, {
|
||||
title: '快速导入',
|
||||
downLoadUrl:'/${model.outputConfig.outputValue}/${lowerClassName}/export',
|
||||
downLoadUrl:'/${model.outputConfig.outputValue}/${lowerFirstPascalClassName}/export',
|
||||
});
|
||||
}
|
||||
function handleImportSuccess(){
|
||||
@ -2131,6 +2133,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) {
|
||||
@ -2159,10 +2162,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}'
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2237,6 +2240,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') {
|
||||
@ -2346,9 +2350,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')
|
||||
|
||||
Reference in New Issue
Block a user