Browse Source

feat:【infra】移动端 admin uniapp 的代码生成的优化(优化 formData 放在 searchPlaceholder 前面,移除 wd-radio-group 错误的 size="medium" 属性)

YunaiV 6 months ago
parent
commit
b64516314a

+ 19 - 20
yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm

@@ -55,7 +55,7 @@
         <view class="mb-12rpx text-28rpx text-[#666]">
           ${comment}
         </view>
-        <wd-radio-group v-model="formData.${javaField}" shape="button" size="medium">
+        <wd-radio-group v-model="formData.${javaField}" shape="button">
           <wd-radio :value="-1">
             全部
           </wd-radio>
@@ -171,6 +171,24 @@ const emit = defineEmits<{
 }>()
 
 const visible = ref(false)
+const formData = reactive<SearchFormData>({
+#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<SearchFormData>({
-#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) {

+ 1 - 1
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)
           <wd-cell title="${comment}" title-width="180rpx" prop="${javaField}" center>
-            <wd-radio-group v-model="formData.${javaField}" shape="button" size="medium">
+            <wd-radio-group v-model="formData.${javaField}" shape="button">
               <wd-radio
                 v-for="dict in $dictMethod(DICT_TYPE.${dictType.toUpperCase()})"
                 :key="dict.value"