diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 0d43f9a11..df26ad18e 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -23,8 +23,8 @@ 2.5 1.2.18 - 3.5.3.1 - 3.5.3.1 + 3.5.3.2 + 3.5.3.2 3.6.1 1.4.5 3.18.0 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm index 6f0c01d80..7f56964ed 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm @@ -15,7 +15,7 @@ export const columns: BasicColumn[] = [ width: 180, customRender: ({ text }) => { return useRender.renderDate(text) - } + }, }, #elseif("" != $column.dictType)## 数据字典 { @@ -24,13 +24,13 @@ export const columns: BasicColumn[] = [ width: 180, customRender: ({ text }) => { return useRender.renderDict(text, DICT_TYPE.$dictType.toUpperCase()) - } + }, }, #else { title: '${comment}', dataIndex: '${javaField}', - width: 160 + width: 160, }, #end #end @@ -53,15 +53,15 @@ export const searchFormSchema: FormSchema[] = [ component: 'Select', componentProps: { #if ("" != $dictType)## 设置了 dictType 数据字典的情况 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase()) + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase()), #else## 未设置 dictType 数据字典的情况 - options: [] + options: [], #end }, #elseif($column.htmlType == "datetime") component: 'RangePicker', #end - colProps: { span: 8 } + colProps: { span: 8 }, }, #end #end @@ -72,7 +72,7 @@ export const createFormSchema: FormSchema[] = [ label: '编号', field: 'id', show: false, - component: 'Input' + component: 'Input', }, #foreach($column in $columns) #if ($column.createOperation) @@ -88,52 +88,52 @@ export const createFormSchema: FormSchema[] = [ required: true, #end #if ($column.htmlType == "input") - component: 'Input' + component: 'Input', #elseif($column.htmlType == "imageUpload")## 图片上传 component: 'FileUpload', componentProps: { fileType: 'file', - maxCount: 1 - } + maxCount: 1, + }, #elseif($column.htmlType == "fileUpload")## 文件上传 component: 'FileUpload', componentProps: { fileType: 'image', - maxCount: 1 - } + maxCount: 1, + }, #elseif($column.htmlType == "editor")## 文本编辑器 - component: 'Editor' + component: 'Editor', #elseif($column.htmlType == "select")## 下拉框 component: 'Select', componentProps: { #if ("" != $dictType)## 有数据字典 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number') + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number'), #else##没数据字典 - options:[] + options:[], #end - } + }, #elseif($column.htmlType == "checkbox")## 多选框 component: 'Checkbox', componentProps: { #if ("" != $dictType)## 有数据字典 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number') + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number'), #else##没数据字典 - options:[] + options:[], #end - } + }, #elseif($column.htmlType == "radio")## 单选框 component: 'RadioButtonGroup', componentProps: { #if ("" != $dictType)## 有数据字典 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number') + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number'), #else##没数据字典 - options:[] + options:[], #end - } + }, #elseif($column.htmlType == "datetime")## 时间框 - component: 'DatePicker' + component: 'DatePicker', #elseif($column.htmlType == "textarea")## 文本域 - component: 'InputTextArea' + component: 'InputTextArea', #end }, #end @@ -146,7 +146,7 @@ export const updateFormSchema: FormSchema[] = [ label: '编号', field: 'id', show: false, - component: 'Input' + component: 'Input', }, #foreach($column in $columns) #if ($column.updateOperation) @@ -162,44 +162,44 @@ export const updateFormSchema: FormSchema[] = [ required: true, #end #if ($column.htmlType == "input") - component: 'Input' + component: 'Input', #elseif($column.htmlType == "imageUpload")## 图片上传 - component: 'Upload' + component: 'Upload', #elseif($column.htmlType == "fileUpload")## 文件上传 - component: 'Upload' + component: 'Upload', #elseif($column.htmlType == "editor")## 文本编辑器 - component: 'Editor' + component: 'Editor', #elseif($column.htmlType == "select")## 下拉框 component: 'Select', componentProps: { #if ("" != $dictType)## 有数据字典 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number') + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number'), #else##没数据字典 - options:[] + options:[], #end - } + }, #elseif($column.htmlType == "checkbox")## 多选框 component: 'Checkbox', componentProps: { #if ("" != $dictType)## 有数据字典 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number') + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number'), #else##没数据字典 - options:[] + options:[], #end - } + }, #elseif($column.htmlType == "radio")## 单选框 component: 'RadioButtonGroup', componentProps: { #if ("" != $dictType)## 有数据字典 - options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number') + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number'), #else##没数据字典 - options:[] + options:[], #end - } + }, #elseif($column.htmlType == "datetime")## 时间框 - component: 'DatePicker' + component: 'DatePicker', #elseif($column.htmlType == "textarea")## 文本域 - component: 'InputTextArea' + component: 'InputTextArea', #end }, #end diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm index f0157e2f4..65d9d3d00 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm @@ -1,15 +1,10 @@ - + \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm index e5faddd29..d9538a064 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm @@ -1,47 +1,12 @@ - + \ No newline at end of file