zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 升级版本

Browse Source 
2. 修复因合并版本错误导致的代码生成器 bug
This commit is contained in:
chenbowen
2025-10-28 14:53:41 +08:00
parent ba85f45a05
commit 02d1896ebf
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -32,7 +32,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url> <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties> <properties>
<revision>3.0.42</revision> <revision>3.0.43</revision>
<!-- Maven 相关 --> <!-- Maven 相关 -->
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>

2
zt-dependencies/pom.xml
View File

@@ -26,7 +26,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url> <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties> <properties>
<revision>3.0.42</revision> <revision>3.0.43</revision>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version> <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<!-- 统一依赖管理 --> <!-- 统一依赖管理 -->
<spring.boot.version>3.4.5</spring.boot.version> <spring.boot.version>3.4.5</spring.boot.version>

13
zt-module-infra/zt-module-infra-server/src/main/resources/codegen/vue3/views/form.vue.vm
View File

@@ -149,18 +149,17 @@
</FormDialog> </FormDialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
${simpleClassName}Api import { ${simpleClassName}Api, ${simpleClassName}VO } from '@/api/${table.moduleName}/${table.businessName}'
} import FormDialog from '@/components/FormDialog/index.vue'
from ## 特殊：树表专属逻辑
'@/api/'
import {handleTree} from '@/utils/tree'
## 特殊：树表专属逻辑
#if ( $table.templateType == 2 ) #if ( $table.templateType == 2 )
import { defaultProps, handleTree } from '@/utils/tree'
#end #end
## 特殊：主子表专属逻辑 ## 特殊：主子表专属逻辑
#if ( $table.templateType == 10 || $table.templateType == 12 ) #if ( $table.templateType == 10 || $table.templateType == 12 )
#foreach ($subSimpleClassName in $subSimpleClassNames) #foreach ($subSimpleClassName in $subSimpleClassNames)
import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
#end #end
#end #end

31
zt-module-infra/zt-module-infra-server/src/main/resources/codegen/vue3/views/index.vue.vm
View File

@@ -285,32 +285,31 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {DICT_TYPE, getStrDictOptions} from '@/utils/dict' import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter} from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import {handleTree} from '@/utils/tree' ## 特殊：树表专属逻辑
import {useVxeGrid} from '@/hooks/web/useVxeGrid'
import download from '@/utils/download'
import {
${simpleClassName}Api, ${simpleClassName}VO
}
from
'@/api/'
import {useDialogStore} from '@/store/modules/dialog'
import {FileUploadInfoVO} from '@/api/infra/file'
## 特殊：树表专属逻辑
#if ( $table.templateType == 2 ) #if ( $table.templateType == 2 )
import { handleTree } from '@/utils/tree'
#end #end
#if ( $table.templateType != 12 && $table.templateType != 11 && $table.templateType != 2 ) #if ( $table.templateType != 12 && $table.templateType != 11 && $table.templateType != 2 )
import { useVxeGrid } from '@/hooks/web/useVxeGrid'
#end
import download from '@/utils/download'
import { ${simpleClassName}Api, ${simpleClassName}VO } from '@/api/${table.moduleName}/${table.businessName}'
import ${simpleClassName}Form from './${simpleClassName}Form.vue'
import SearchForm from '@/components/SearchForm/index.vue'
#if ( $table.templateType != 12 && $table.templateType != 11 && $table.templateType != 2 )
import DataTable from '@/components/DataTable/index.vue'
#end #end
#if ( $table.templateType != 12 && $table.templateType != 11 && $table.templateType != 2 )
#end
## 特殊：主子表专属逻辑 ## 特殊：主子表专属逻辑
#if ( $table.templateType != 10 ) #if ( $table.templateType != 10 )
#foreach ($subSimpleClassName in $subSimpleClassNames) #foreach ($subSimpleClassName in $subSimpleClassNames)
import ${subSimpleClassName}List from './components/${subSimpleClassName}List.vue'
#end #end
#end #end
#if($isFileUpload && $isFileUpload == true) #if($isFileUpload && $isFileUpload == true)
import {useDialogStore} from '@/store/modules/dialog'
import {FileUploadInfoVO} from '@/api/infra/file'
const dialogStore = useDialogStore() const dialogStore = useDialogStore()
const openBusinessFile = async (id: string) => { const openBusinessFile = async (id: string) => {
let fileUploadInfoVO : FileUploadInfoVO = await ${simpleClassName}Api.getFileUploadInfo(); let fileUploadInfoVO : FileUploadInfoVO = await ${simpleClassName}Api.getFileUploadInfo();