diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java index 04daa8da..f39e7833 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java @@ -13,6 +13,7 @@ import com.orion.lang.utils.ansi.AnsiAppender; import com.orion.lang.utils.ansi.style.AnsiFont; import com.orion.lang.utils.ansi.style.color.AnsiForeground; import com.orion.lang.utils.ext.yml.YmlExt; +import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.mybatis.core.domain.BaseDO; import com.orion.ops.framework.mybatis.core.mapper.IMapper; import com.orion.ops.launch.generator.engine.VelocityTemplateEngine; @@ -78,6 +79,8 @@ public class CodeGenerator { String password, Table[] tables, String module) { + Valid.notEmpty(tables, "请先配置需要生成的表"); + // 创建引擎 VelocityTemplateEngine engine = getEngine(tables); diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm index 5e05ca18..a385001a 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm @@ -91,7 +91,7 @@ export function get${vue.featureEntity}(id: number) { /** * $apiComment.getByIdList */ -export function get${vue.featureEntity}List(idList: Array) { +export function batchGet${vue.featureEntity}List(idList: Array) { return axios.get<${vue.featureEntity}QueryResponse[]>('/${package.ModuleName}/${typeHyphen}/batch-get', { params: { idList }, paramsSerializer: params => { diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm index 3dc6d7b8..ffa0ffec 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm @@ -57,10 +57,14 @@ import useLoading from '@/hooks/loading'; import useVisible from '@/hooks/visible'; import formRules from '../types/form.rules'; - import { create${vue.featureEntity}, update${vue.featureEntity} } from '@/api/${vue.module}/${vue.feature}'; + import { create${vue.featureEntity}, update${vue.featureEntity}, ${vue.featureEntity}UpdateRequest } from '@/api/${vue.module}/${vue.feature}'; import { Message } from '@arco-design/web-vue'; - import {} from '../types/enum.types'; import {} from '../types/const'; + #if($vue.enums.isEmpty()) + import {} from '../types/enum.types'; + #else + import { #foreach($entry in ${vue.enums.entrySet()})${entry.value.className}#if($foreach.hasNext), #end#end } from '../types/enum.types'; + #end import { toOptions } from '@/utils/enum'; const { visible, setVisible } = useVisible(); diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm index 5f29285a..9ccd0fde 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm @@ -1,5 +1,5 @@