From 09be7c6af42925e100825f9ae97907a9050d0ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Sat, 26 Oct 2024 22:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/index.vue.vm    | 207 +++++++++---------
 1 file changed, 104 insertions(+), 103 deletions(-)

diff --git a/common-ruoyi/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/common-ruoyi/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 95c8faf..07276bd 100644
--- a/common-ruoyi/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/common-ruoyi/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -181,109 +181,109 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </form-col>
-#elseif($column.htmlType == "imageUpload")
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </form-col>
-#elseif($column.htmlType == "fileUpload")
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </form-col>
-#elseif($column.htmlType == "editor")
-        <form-col :span="span"  label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </form-col>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :value="parseInt(dict.value)"
-#else
-              :value="dict.value"
-#end
-            ></el-option>
-          </el-select>
-        </form-col>
-#elseif($column.htmlType == "select" && $dictType)
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </form-col>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.value">
-              {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </form-col>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </form-col>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :label="parseInt(dict.value)"
-#else
-              :label="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </form-col>
-#elseif($column.htmlType == "radio" && $dictType)
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </form-col>
-#elseif($column.htmlType == "datetime")
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </form-col>
-#elseif($column.htmlType == "textarea")
-        <form-col :span="span"  label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </form-col>
-#end
-#end
-#end
-#end
-    </el-row>
+  #foreach($column in $columns)
+  #set($field=$column.javaField)
+  #if($column.insert && !$column.pk)
+  #if(($column.usableColumn) || (!$column.superColumn))
+  #set($parentheseIndex=$column.columnComment.indexOf("（"))
+  #if($parentheseIndex != -1)
+  #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+  #else
+  #set($comment=$column.columnComment)
+  #end
+  #set($dictType=$column.dictType)
+  #if($column.htmlType == "input")
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+          </form-col>
+  #elseif($column.htmlType == "imageUpload")
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <image-upload v-model="form.${field}"/>
+          </form-col>
+  #elseif($column.htmlType == "fileUpload")
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <file-upload v-model="form.${field}"/>
+          </form-col>
+  #elseif($column.htmlType == "editor")
+          <form-col :span="span"  label="${comment}">
+            <editor v-model="form.${field}" :min-height="192"/>
+          </form-col>
+  #elseif($column.htmlType == "select" && "" != $dictType)
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-select v-model="form.${field}" placeholder="请选择${comment}">
+              <el-option
+                v-for="dict in dict.type.${dictType}"
+                :key="dict.value"
+                :label="dict.label"
+  #if($column.javaType == "Integer" || $column.javaType == "Long")
+                :value="parseInt(dict.value)"
+  #else
+                :value="dict.value"
+  #end
+              ></el-option>
+            </el-select>
+          </form-col>
+  #elseif($column.htmlType == "select" && $dictType)
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-select v-model="form.${field}" placeholder="请选择${comment}">
+              <el-option label="请选择字典生成" value="" />
+            </el-select>
+          </form-col>
+  #elseif($column.htmlType == "checkbox" && "" != $dictType)
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-checkbox-group v-model="form.${field}">
+              <el-checkbox
+                v-for="dict in dict.type.${dictType}"
+                :key="dict.value"
+                :label="dict.value">
+                {{dict.label}}
+              </el-checkbox>
+            </el-checkbox-group>
+          </form-col>
+  #elseif($column.htmlType == "checkbox" && $dictType)
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-checkbox-group v-model="form.${field}">
+              <el-checkbox>请选择字典生成</el-checkbox>
+            </el-checkbox-group>
+          </form-col>
+  #elseif($column.htmlType == "radio" && "" != $dictType)
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-radio-group v-model="form.${field}">
+              <el-radio
+                v-for="dict in dict.type.${dictType}"
+                :key="dict.value"
+  #if($column.javaType == "Integer" || $column.javaType == "Long")
+                :label="parseInt(dict.value)"
+  #else
+                :label="dict.value"
+  #end
+              >{{dict.label}}</el-radio>
+            </el-radio-group>
+          </form-col>
+  #elseif($column.htmlType == "radio" && $dictType)
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-radio-group v-model="form.${field}">
+              <el-radio label="1">请选择字典生成</el-radio>
+            </el-radio-group>
+          </form-col>
+  #elseif($column.htmlType == "datetime")
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-date-picker clearable
+              v-model="form.${field}"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择${comment}">
+            </el-date-picker>
+          </form-col>
+  #elseif($column.htmlType == "textarea")
+          <form-col :span="span"  label="${comment}" prop="${field}">
+            <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+          </form-col>
+      #end
+      #end
+      #end
+      #end
+        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -372,6 +372,7 @@ export default {
   components: {FormCol},
   data() {
     return {
+      span: 24,
       // 字段列表
       columns: [
 #foreach($column in $columns)