From 77fa4e0aa8822c74fdc5808f6a108aee36850fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 5 Apr 2023 20:10:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=8C=85=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20update=20=E4=BC=98=E5=8C=96=20=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/java/controller.java.vm | 2 +- .../src/main/resources/vm/java/domain.java.vm | 2 +- .../src/main/resources/vm/java/vo.java.vm | 4 +- .../src/main/resources/vm/ts/api.ts.vm | 5 ++- .../src/main/resources/vm/ts/types.ts.vm | 2 +- .../main/resources/vm/vue/index-tree.vue.vm | 35 ++++----------- .../src/main/resources/vm/vue/index.vue.vm | 43 +++---------------- 7 files changed, 22 insertions(+), 71 deletions(-) diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index 8275df47..38cd1477 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -16,7 +16,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; -import utils.excel.common.org.dromara.ExcelUtil; +import org.dromara.common.excel.utils.ExcelUtil; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index ba3a7bd2..94dca518 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -6,7 +6,7 @@ package ${packageName}.domain; #end #end #if($IsTenant==1) -import core.tenant.common.org.dromara.TenantEntity; +import org.dromara.common.tenant.core.TenantEntity; #else #end import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index cd1aeb8d..11a10929 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -6,8 +6,8 @@ import ${import}; import ${packageName}.domain.${ClassName}; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import annotation.excel.common.org.dromara.ExcelDictFormat; -import convert.excel.common.org.dromara.ExcelDictConvert; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.convert.excelExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm index e02b6d18..3aa4a5f6 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm @@ -1,13 +1,14 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from './types'; +import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/api/${moduleName}/${businessName}/types'; /** * 查询${functionName}列表 * @param query * @returns {*} */ -export const list${BusinessName} = (#if(${treeCode})query?: ${BusinessName}Query#else query: ${BusinessName}Query#end): AxiosPromise<${BusinessName}VO[]> => { + +export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => { return request({ url: '/${moduleName}/${businessName}/list', method: 'get', diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm index 479298db..99359e02 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm @@ -13,7 +13,7 @@ export interface ${BusinessName}VO { #end } -export interface ${BusinessName}Form extends BaseEntity{ +export interface ${BusinessName}Form extends BaseEntity { #foreach ($column in $columns) #if($column.insert || $column.edit) /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 32f7c577..dda1b467 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -15,12 +15,7 @@ #end #if($column.htmlType == "input" || $column.htmlType == "textarea") - + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) @@ -71,26 +66,14 @@ -