Commit b64516314a4bbbdfaca78ceabce270075afee069
1 parent
2a5ebb5a
feat：【infra】移动端 admin uniapp 的代码生成的优化（优化 formData 放在 searchPlaceholder 前面，移除 wd-…
…radio-group 错误的 size="medium" 属性）
Showing
2 changed files
with
20 additions
and
21 deletions
yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | <view class="mb-12rpx text-28rpx text-[#666]"> |
| 56 | 56 | ${comment} |
| 57 | 57 | </view> |
| 58 | - <wd-radio-group v-model="formData.${javaField}" shape="button" size="medium"> | |
| 58 | + <wd-radio-group v-model="formData.${javaField}" shape="button"> | |
| 59 | 59 | <wd-radio :value="-1"> |
| 60 | 60 | 全部 |
| 61 | 61 | </wd-radio> |
| ... | ... | @@ -171,6 +171,24 @@ const emit = defineEmits<{ |
| 171 | 171 | }>() |
| 172 | 172 | |
| 173 | 173 | const visible = ref(false) |
| 174 | +const formData = reactive<SearchFormData>({ | |
| 175 | +#foreach($column in $columns) | |
| 176 | + #if ($column.listOperation) | |
| 177 | + #if ($column.dictType && "" != $column.dictType) | |
| 178 | + #set ($javaType = $column.javaType.toLowerCase()) | |
| 179 | + #if(${javaType} == "string") | |
| 180 | + ${column.javaField}: -1 as number | string, | |
| 181 | + #elseif(${javaType} == "boolean") | |
| 182 | + ${column.javaField}: -1 as number | boolean, | |
| 183 | + #else | |
| 184 | + ${column.javaField}: -1 as number, | |
| 185 | + #end | |
| 186 | + #else | |
| 187 | + ${column.javaField}: undefined, | |
| 188 | + #end | |
| 189 | + #end | |
| 190 | +#end | |
| 191 | +}) | |
| 174 | 192 | |
| 175 | 193 | /** 搜索条件 placeholder 拼接 */ |
| 176 | 194 | const searchPlaceholder = computed(() => { |
| ... | ... | @@ -201,25 +219,6 @@ const searchPlaceholder = computed(() => { |
| 201 | 219 | return conditions.length > 0 ? conditions.join(' | ') : '搜索${table.classComment}' |
| 202 | 220 | }) |
| 203 | 221 | |
| 204 | -const formData = reactive<SearchFormData>({ | |
| 205 | -#foreach($column in $columns) | |
| 206 | - #if ($column.listOperation) | |
| 207 | - #if ($column.dictType && "" != $column.dictType) | |
| 208 | - #set ($javaType = $column.javaType.toLowerCase()) | |
| 209 | - #if(${javaType} == "string") | |
| 210 | - ${column.javaField}: -1 as number | string, | |
| 211 | - #elseif(${javaType} == "boolean") | |
| 212 | - ${column.javaField}: -1 as number | boolean, | |
| 213 | - #else | |
| 214 | - ${column.javaField}: -1 as number, | |
| 215 | - #end | |
| 216 | - #else | |
| 217 | - ${column.javaField}: undefined, | |
| 218 | - #end | |
| 219 | - #end | |
| 220 | -#end | |
| 221 | -}) | |
| 222 | - | |
| 223 | 222 | /** 监听弹窗打开，同步外部参数 */ |
| 224 | 223 | watch(visible, (val) => { |
| 225 | 224 | if (val && props.searchParams) { | ... | ... |
yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | ## 优先判断是否有字典，有字典则使用 radio-group |
| 29 | 29 | #if (($column.htmlType == "select" || $column.htmlType == "radio") && $dictType && "" != $dictType) |
| 30 | 30 | <wd-cell title="${comment}" title-width="180rpx" prop="${javaField}" center> |
| 31 | - <wd-radio-group v-model="formData.${javaField}" shape="button" size="medium"> | |
| 31 | + <wd-radio-group v-model="formData.${javaField}" shape="button"> | |
| 32 | 32 | <wd-radio |
| 33 | 33 | v-for="dict in $dictMethod(DICT_TYPE.${dictType.toUpperCase()})" |
| 34 | 34 | :key="dict.value" | ... | ... |