diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm index 186225415d..fe0a81c12d 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm @@ -55,7 +55,7 @@ ${comment} - + 全部 @@ -171,6 +171,24 @@ const emit = defineEmits<{ }>() const visible = ref(false) +const formData = reactive({ +#foreach($column in $columns) + #if ($column.listOperation) + #if ($column.dictType && "" != $column.dictType) + #set ($javaType = $column.javaType.toLowerCase()) + #if(${javaType} == "string") + ${column.javaField}: -1 as number | string, + #elseif(${javaType} == "boolean") + ${column.javaField}: -1 as number | boolean, + #else + ${column.javaField}: -1 as number, + #end + #else + ${column.javaField}: undefined, + #end + #end +#end +}) /** 搜索条件 placeholder 拼接 */ const searchPlaceholder = computed(() => { @@ -201,25 +219,6 @@ const searchPlaceholder = computed(() => { return conditions.length > 0 ? conditions.join(' | ') : '搜索${table.classComment}' }) -const formData = reactive({ -#foreach($column in $columns) - #if ($column.listOperation) - #if ($column.dictType && "" != $column.dictType) - #set ($javaType = $column.javaType.toLowerCase()) - #if(${javaType} == "string") - ${column.javaField}: -1 as number | string, - #elseif(${javaType} == "boolean") - ${column.javaField}: -1 as number | boolean, - #else - ${column.javaField}: -1 as number, - #end - #else - ${column.javaField}: undefined, - #end - #end -#end -}) - /** 监听弹窗打开,同步外部参数 */ watch(visible, (val) => { if (val && props.searchParams) { diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm index 2ce196f0c9..e5603f8f04 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm @@ -28,7 +28,7 @@ ## 优先判断是否有字典,有字典则使用 radio-group #if (($column.htmlType == "select" || $column.htmlType == "radio") && $dictType && "" != $dictType) - +