欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 edd090a0981ad784ce0e160dff910f3f5e0236b1 1 个父辈 3cd88678

代码生成支持文件上传组件

内嵌 并排对比
正在显示 5 个修改的文件 包含 43 行增加 和 3 行删除
@@ -76,9 +76,12 @@ public class GenConstants @@ -76,9 +76,12 @@ public class GenConstants
76 /** 日期控件 */ 76 /** 日期控件 */
77 public static final String HTML_DATETIME = "datetime"; 77 public static final String HTML_DATETIME = "datetime";
78 78
79 - /** 单图上传 */ 79 + /** 图片上传控件 */
80 public static final String HTML_IMAGE_UPLOAD = "imageUpload"; 80 public static final String HTML_IMAGE_UPLOAD = "imageUpload";
81 81
  82 + /** 文件上传控件 */
  83 + public static final String HTML_FILE_UPLOAD = "fileUpload";
  84 +
82 /** 富文本控件 */ 85 /** 富文本控件 */
83 public static final String HTML_EDITOR = "editor"; 86 public static final String HTML_EDITOR = "editor";
84 87
@@ -112,11 +112,16 @@ public class GenUtils @@ -112,11 +112,16 @@ public class GenUtils
112 { 112 {
113 column.setHtmlType(GenConstants.HTML_SELECT); 113 column.setHtmlType(GenConstants.HTML_SELECT);
114 } 114 }
115 - // 图片字段设置单图控件 115 + // 图片字段设置图片上传控件
116 else if (StringUtils.endsWithIgnoreCase(columnName, "image")) 116 else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
117 { 117 {
118 column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); 118 column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
119 } 119 }
  120 + // 文件字段设置文件上传控件
  121 + else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
  122 + {
  123 + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
  124 + }
120 // 内容字段设置富文本控件 125 // 内容字段设置富文本控件
121 else if (StringUtils.endsWithIgnoreCase(columnName, "content")) 126 else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
122 { 127 {
@@ -157,6 +157,10 @@ @@ -157,6 +157,10 @@
157 <el-form-item label="${comment}"> 157 <el-form-item label="${comment}">
158 <imageUpload v-model="form.${field}"/> 158 <imageUpload v-model="form.${field}"/>
159 </el-form-item> 159 </el-form-item>
  160 +#elseif($column.htmlType == "fileUpload")
  161 + <el-form-item label="${comment}">
  162 + <imageUpload v-model="form.${field}"/>
  163 + </el-form-item>
160 #elseif($column.htmlType == "editor") 164 #elseif($column.htmlType == "editor")
161 <el-form-item label="${comment}"> 165 <el-form-item label="${comment}">
162 <editor v-model="form.${field}" :min-height="192"/> 166 <editor v-model="form.${field}" :min-height="192"/>
@@ -249,6 +253,11 @@ import ImageUpload from '@/components/ImageUpload'; @@ -249,6 +253,11 @@ import ImageUpload from '@/components/ImageUpload';
249 #break 253 #break
250 #end 254 #end
251 #end 255 #end
  256 +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
  257 +import FileUpload from '@/components/FileUpload';
  258 +#break
  259 +#end
  260 +#end
252 #foreach($column in $columns) 261 #foreach($column in $columns)
253 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") 262 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
254 import Editor from '@/components/Editor'; 263 import Editor from '@/components/Editor';
@@ -266,6 +275,12 @@ export default { @@ -266,6 +275,12 @@ export default {
266 #end 275 #end
267 #end 276 #end
268 #foreach($column in $columns) 277 #foreach($column in $columns)
  278 +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
  279 + FileUpload,
  280 +#break
  281 +#end
  282 +#end
  283 +#foreach($column in $columns)
269 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") 284 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
270 Editor, 285 Editor,
271 #break 286 #break
@@ -189,6 +189,10 @@ @@ -189,6 +189,10 @@
189 <el-form-item label="${comment}"> 189 <el-form-item label="${comment}">
190 <imageUpload v-model="form.${field}"/> 190 <imageUpload v-model="form.${field}"/>
191 </el-form-item> 191 </el-form-item>
  192 +#elseif($column.htmlType == "fileUpload")
  193 + <el-form-item label="${comment}">
  194 + <fileUpload v-model="form.${field}"/>
  195 + </el-form-item>
192 #elseif($column.htmlType == "editor") 196 #elseif($column.htmlType == "editor")
193 <el-form-item label="${comment}"> 197 <el-form-item label="${comment}">
194 <editor v-model="form.${field}" :min-height="192"/> 198 <editor v-model="form.${field}" :min-height="192"/>
@@ -280,6 +284,12 @@ import ImageUpload from '@/components/ImageUpload'; @@ -280,6 +284,12 @@ import ImageUpload from '@/components/ImageUpload';
280 #end 284 #end
281 #end 285 #end
282 #foreach($column in $columns) 286 #foreach($column in $columns)
  287 +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
  288 +import FileUpload from '@/components/FileUpload';
  289 +#break
  290 +#end
  291 +#end
  292 +#foreach($column in $columns)
283 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") 293 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
284 import Editor from '@/components/Editor'; 294 import Editor from '@/components/Editor';
285 #break 295 #break
@@ -296,6 +306,12 @@ export default { @@ -296,6 +306,12 @@ export default {
296 #end 306 #end
297 #end 307 #end
298 #foreach($column in $columns) 308 #foreach($column in $columns)
  309 +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
  310 + FileUpload,
  311 +#break
  312 +#end
  313 +#end
  314 +#foreach($column in $columns)
299 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") 315 #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
300 Editor, 316 Editor,
301 #break 317 #break
@@ -90,7 +90,8 @@ @@ -90,7 +90,8 @@
90 <el-option label="单选框" value="radio" /> 90 <el-option label="单选框" value="radio" />
91 <el-option label="复选框" value="checkbox" /> 91 <el-option label="复选框" value="checkbox" />
92 <el-option label="日期控件" value="datetime" /> 92 <el-option label="日期控件" value="datetime" />
93 - <el-option label="单图上传" value="imageUpload" /> 93 + <el-option label="图片上传" value="imageUpload" />
  94 + <el-option label="文件上传" value="fileUpload" />
94 <el-option label="富文本控件" value="editor" /> 95 <el-option label="富文本控件" value="editor" />
95 </el-select> 96 </el-select>
96 </template> 97 </template>