| ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java | ●●●●● patch | view | raw | blame | history | |
| ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java | ●●●●● patch | view | raw | blame | history | |
| ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java | ●●●●● patch | view | raw | blame | history | |
| ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm | ●●●●● patch | view | raw | blame | history | |
| ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm | ●●●●● patch | view | raw | blame | history | |
| ruoyi-ui/src/components/FileUpload/index.vue | ●●●●● patch | view | raw | blame | history | |
| ruoyi-ui/src/components/ImageUpload/index.vue | ●●●●● patch | view | raw | blame | history | |
| ruoyi-ui/src/views/tool/gen/editTable.vue | ●●●●● patch | view | raw | blame | history |
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
@@ -76,8 +76,11 @@ /** 日期控件 */ public static final String HTML_DATETIME = "datetime"; /** 上传控件 */ public static final String HTML_UPLOAD_IMAGE = "uploadImage"; /** 图片上传控件 */ public static final String HTML_IMAGE_UPLOAD = "imageUpload"; /** 文件上传控件 */ public static final String HTML_FILE_UPLOAD = "fileUpload"; /** 富文本控件 */ public static final String HTML_EDITOR = "editor"; ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -60,7 +60,7 @@ /** 查询方式(EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围) */ private String queryType; /** 显示类型(input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件、editor富文本控件) */ /** 显示类型(input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件) */ private String htmlType; /** 字典类型 */ ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
@@ -112,10 +112,15 @@ { column.setHtmlType(GenConstants.HTML_SELECT); } // 文件字段设置上传控件 // 图片字段设置图片上传控件 else if (StringUtils.endsWithIgnoreCase(columnName, "image")) { column.setHtmlType(GenConstants.HTML_UPLOAD_IMAGE); column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); } // 文件字段设置文件上传控件 else if (StringUtils.endsWithIgnoreCase(columnName, "file")) { column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); } // 内容字段设置富文本控件 else if (StringUtils.endsWithIgnoreCase(columnName, "content")) ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -153,9 +153,13 @@ <el-form-item label="${comment}" prop="${field}"> <el-input v-model="form.${field}" placeholder="请输入${comment}" /> </el-form-item> #elseif($column.htmlType == "uploadImage") #elseif($column.htmlType == "imageUpload") <el-form-item label="${comment}"> <uploadImage v-model="form.${field}"/> <imageUpload v-model="form.${field}"/> </el-form-item> #elseif($column.htmlType == "fileUpload") <el-form-item label="${comment}"> <imageUpload v-model="form.${field}"/> </el-form-item> #elseif($column.htmlType == "editor") <el-form-item label="${comment}"> @@ -244,8 +248,13 @@ import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage") import UploadImage from '@/components/UploadImage'; #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") import ImageUpload from '@/components/ImageUpload'; #break #end #end #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") import FileUpload from '@/components/FileUpload'; #break #end #end @@ -260,8 +269,14 @@ name: "${BusinessName}", components: { #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage") UploadImage, #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") ImageUpload, #break #end #end #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") FileUpload, #break #end #end ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@@ -185,9 +185,13 @@ <el-form-item label="${comment}" prop="${field}"> <el-input v-model="form.${field}" placeholder="请输入${comment}" /> </el-form-item> #elseif($column.htmlType == "uploadImage") #elseif($column.htmlType == "imageUpload") <el-form-item label="${comment}"> <uploadImage v-model="form.${field}"/> <imageUpload v-model="form.${field}"/> </el-form-item> #elseif($column.htmlType == "fileUpload") <el-form-item label="${comment}"> <fileUpload v-model="form.${field}"/> </el-form-item> #elseif($column.htmlType == "editor") <el-form-item label="${comment}"> @@ -274,8 +278,14 @@ <script> import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"; #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage") import UploadImage from '@/components/UploadImage'; #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") import ImageUpload from '@/components/ImageUpload'; #break #end #end #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") import FileUpload from '@/components/FileUpload'; #break #end #end @@ -290,8 +300,14 @@ name: "${BusinessName}", components: { #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage") UploadImage, #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") ImageUpload, #break #end #end #foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") FileUpload, #break #end #end ruoyi-ui/src/components/FileUpload/index.vue
New file @@ -0,0 +1,178 @@ <template> <div class="upload-file"> <el-upload :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="1" :on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess" :show-file-list="false" :headers="headers" class="upload-file-uploader" ref="upload" > <!-- 上传按钮 --> <el-button size="mini" type="primary">选取文件</el-button> <!-- 上传提示 --> <div class="el-upload__tip" slot="tip" v-if="showTip"> 请上传 <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template> <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template> 的文件 </div> </el-upload> <!-- 文件列表 --> <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul"> <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in list"> <el-link :href="file.url" :underline="false" target="_blank"> <span class="el-icon-document"> {{ getFileName(file.name) }} </span> </el-link> <div class="ele-upload-list__item-content-action"> <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link> </div> </li> </transition-group> </div> </template> <script> import { getToken } from "@/utils/auth"; export default { props: { // 值 value: [String, Object, Array], // 大小限制(MB) fileSize: { type: Number, default: 5, }, // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { type: Array, default: () => ["doc", "xls", "ppt", "txt", "pdf"], }, // 是否显示提示 isShowTip: { type: Boolean, default: true } }, data() { return { uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, fileList: [], }; }, computed: { // 是否显示提示 showTip() { return this.isShowTip && (this.fileType || this.fileSize); }, // 列表 list() { let temp = 1; if (this.value) { // 首先将值转为数组 const list = Array.isArray(this.value) ? this.value : [this.value]; // 然后将数组转为对象数组 return list.map((item) => { if (typeof item === "string") { item = { name: item, url: item }; } item.uid = item.uid || new Date().getTime() + temp++; return item; }); } else { return []; } }, }, methods: { // 上传前校检格式和大小 handleBeforeUpload(file) { // 校检文件类型 if (this.fileType) { let fileExtension = ""; if (file.name.lastIndexOf(".") > -1) { fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1); } const isTypeOk = this.fileType.some((type) => { if (file.type.indexOf(type) > -1) return true; if (fileExtension && fileExtension.indexOf(type) > -1) return true; return false; }); if (!isTypeOk) { this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`); return false; } } // 校检文件大小 if (this.fileSize) { const isLt = file.size / 1024 / 1024 < this.fileSize; if (!isLt) { this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`); return false; } } return true; }, // 文件个数超出 handleExceed() { this.$message.error(`只允许上传单个文件`); }, // 上传失败 handleUploadError(err) { this.$message.error("上传失败, 请重试"); }, // 上传成功回调 handleUploadSuccess(res, file) { this.$message.success("上传成功"); this.$emit("input", res.data.url); }, // 删除文件 handleDelete(index) { this.fileList.splice(index, 1); this.$emit("input", ''); }, // 获取文件名称 getFileName(name) { if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1).toLowerCase(); } else { return ""; } } }, created() { this.fileList = this.list; }, }; </script> <style scoped lang="scss"> .upload-file-uploader { margin-bottom: 5px; } .upload-file-list .el-upload-list__item { border: 1px solid #e4e7ed; line-height: 2; margin-bottom: 10px; position: relative; } .upload-file-list .ele-upload-list__item-content { display: flex; justify-content: space-between; align-items: center; color: inherit; } .ele-upload-list__item-content-action .el-link { margin-right: 10px; } </style> ruoyi-ui/src/components/ImageUpload/index.vue
File was renamed from ruoyi-ui/src/components/UploadImage/index.vue @@ -43,7 +43,7 @@ data() { return { dialogVisible: false, uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, @@ -60,7 +60,7 @@ this.$emit("input", ""); }, handleUploadSuccess(res) { this.$emit("input", res.url); this.$emit("input", res.data.url); this.loading.close(); }, handleBeforeUpload() { ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -90,7 +90,8 @@ <el-option label="单选框" value="radio" /> <el-option label="复选框" value="checkbox" /> <el-option label="日期控件" value="datetime" /> <el-option label="上传控件" value="uploadImage" /> <el-option label="图片上传" value="imageUpload" /> <el-option label="文件上传" value="fileUpload" /> <el-option label="富文本控件" value="editor" /> </el-select> </template>