From e447fb806b66adb1150773582ca7c54dd9d09c4f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 8 Jul 2021 12:36:02 +0800 Subject: [PATCH 01/11] =?UTF-8?q?FileUpload=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/FileUpload/index.vue | 73 +++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue index d19a0122..649e0772 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/ruoyi-ui/src/components/FileUpload/index.vue @@ -4,9 +4,7 @@ :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" @@ -26,8 +24,8 @@ -
  • - +
  • + {{ getFileName(file.name) }}
    @@ -42,6 +40,7 @@ import { getToken } from "@/utils/auth"; export default { + name: "FileUpload", props: { // 值 value: [String, Object, Array], @@ -63,6 +62,7 @@ export default { }, data() { return { + baseUrl: process.env.VUE_APP_BASE_API, uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), @@ -70,30 +70,35 @@ export default { fileList: [], }; }, + watch: { + value: { + handler(val) { + if (val) { + let temp = 1; + // 首先将值转为数组 + const list = Array.isArray(val) ? val : this.value.split(','); + // 然后将数组转为对象数组 + this.fileList = list.map(item => { + if (typeof item === "string") { + item = { name: item, url: item }; + } + item.uid = item.uid || new Date().getTime() + temp++; + return item; + }); + } else { + this.fileList = []; + return []; + } + }, + deep: true, + immediate: true + } + }, 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 { - this.fileList = []; - return []; - } - }, }, methods: { // 上传前校检格式和大小 @@ -124,10 +129,6 @@ export default { } return true; }, - // 文件个数超出 - handleExceed() { - this.$message.error(`只允许上传单个文件`); - }, // 上传失败 handleUploadError(err) { this.$message.error("上传失败, 请重试"); @@ -135,12 +136,13 @@ export default { // 上传成功回调 handleUploadSuccess(res, file) { this.$message.success("上传成功"); - this.$emit("input", res.url); + this.fileList.push({ name: res.fileName, url: res.fileName }); + this.$emit("input", this.listToString(this.fileList)); }, // 删除文件 handleDelete(index) { this.fileList.splice(index, 1); - this.$emit("input", ''); + this.$emit("input", this.listToString(this.fileList)); }, // 获取文件名称 getFileName(name) { @@ -149,11 +151,16 @@ export default { } else { return ""; } + }, + // 对象转成分隔字符串 + listToString(list) { + let files = ""; + for (let key in list) { + files += list[key].url + ","; + } + return files.substr(0, files.length - 1); } - }, - created() { - this.fileList = this.list; - }, + } }; From e963a86b15583f0099380ae47b429b86be26f363 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 8 Jul 2021 15:48:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/Editor/index.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue index d63a48d1..8e616794 100644 --- a/ruoyi-ui/src/components/Editor/index.vue +++ b/ruoyi-ui/src/components/Editor/index.vue @@ -9,7 +9,7 @@ :headers="headers" style="display: none" ref="upload" - v-if="this.uploadUrl" + v-if="this.type == 'url'" >
    @@ -46,14 +46,15 @@ export default { type: Boolean, default: false, }, - /* 上传地址 */ - uploadUrl: { + /* 类型（base64格式、url格式） */ + type: { type: String, default: "", } }, data() { return { + uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken() }, @@ -119,7 +120,7 @@ export default { const editor = this.$refs.editor; this.Quill = new Quill(editor, this.options); // 如果设置了上传地址则自定义图片上传事件 - if (this.uploadUrl) { + if (this.type == 'url') { let toolbar = this.Quill.getModule("toolbar"); toolbar.addHandler("image", (value) => { this.uploadType = "image"; @@ -165,7 +166,7 @@ export default { // 获取光标所在位置 let length = quill.getSelection().index; // 插入图片 res.url为服务器返回的图片地址 - quill.insertEmbed(length, "image", res.url); + quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); // 调整光标到最后 quill.setSelection(length + 1); } else { From e259093e01a924469ed599fd3311c5b2fc04d49b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 8 Jul 2021 15:49:04 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=95=B0=E9=87=8F=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/FileUpload/index.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue index 649e0772..6e7992ad 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/ruoyi-ui/src/components/FileUpload/index.vue @@ -4,7 +4,9 @@ :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" + :limit="limit" :on-error="handleUploadError" + :on-exceed="handleExceed" :on-success="handleUploadSuccess" :show-file-list="false" :headers="headers" @@ -44,6 +46,11 @@ export default { props: { // 值 value: [String, Object, Array], + // 数量限制 + limit: { + type: Number, + default: 5, + }, // 大小限制(MB) fileSize: { type: Number, @@ -129,6 +136,10 @@ export default { } return true; }, + // 文件个数超出 + handleExceed() { + this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`); + }, // 上传失败 handleUploadError(err) { this.$message.error("上传失败, 请重试"); From f56da498ab4a174e2fe6c6562b36b3a7dcc81cea Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 8 Jul 2021 19:17:09 +0800 Subject: [PATCH 04/11] =?UTF-8?q?ImageUpload=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/FileUpload/index.vue | 13 +- ruoyi-ui/src/components/ImageUpload/index.vue | 202 ++++++++++++++---- ruoyi-ui/src/components/TopNav/index.vue | 4 +- 3 files changed, 165 insertions(+), 54 deletions(-) diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue index 6e7992ad..bdbb0694 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/ruoyi-ui/src/components/FileUpload/index.vue @@ -163,13 +163,14 @@ export default { return ""; } }, - // 对象转成分隔字符串 - listToString(list) { - let files = ""; - for (let key in list) { - files += list[key].url + ","; + // 对象转成指定字符串分隔 + listToString(list, separator) { + let strs = ""; + separator = separator || ","; + for (let i in list) { + strs += list[i].url + separator; } - return files.substr(0, files.length - 1); + return strs != '' ? strs.substr(0, strs.length - 1) : ''; } } }; diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue index ce540eb8..062e27d4 100644 --- a/ruoyi-ui/src/components/ImageUpload/index.vue +++ b/ruoyi-ui/src/components/ImageUpload/index.vue @@ -5,33 +5,38 @@ list-type="picture-card" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload" + :limit="limit" :on-error="handleUploadError" + :on-exceed="handleExceed" name="file" - :show-file-list="false" + :on-remove="handleRemove" + :show-file-list="true" :headers="headers" - style="display: inline-block; vertical-align: top" + :file-list="fileList" + :on-preview="handlePictureCardPreview" + :class="{hide: this.fileList.length >= this.limit}" > - -
    - -
    -     -
    - -
    -
    - - - - - - -
    -
    -
    + - - + + +
    + 请上传 + + + 的文件 +
    + + +
    @@ -40,36 +45,128 @@ import { getToken } from "@/utils/auth"; export default { + props: { + value: [String, Object, Array], + // 图片数量限制 + limit: { + type: Number, + default: 5, + }, + // 大小限制(MB) + fileSize: { + type: Number, + default: 5, + }, + // 文件类型, 例如['png', 'jpg', 'jpeg'] + fileType: { + type: Array, + default: () => ["png", "jpg", "jpeg"], + }, + // 是否显示提示 + isShowTip: { + type: Boolean, + default: true + } + }, data() { return { + dialogImageUrl: "", dialogVisible: false, + hideUpload: false, + baseUrl: process.env.VUE_APP_BASE_API, uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, + fileList: [] }; }, - props: { + watch: { value: { - type: String, - default: "", + handler(val) { + if (val) { + // 首先将值转为数组 + const list = Array.isArray(val) ? val : this.value.split(','); + // 然后将数组转为对象数组 + this.fileList = list.map(item => { + if (typeof item === "string") { + if (item.indexOf(this.baseUrl) === -1) { + item = { name: this.baseUrl + item, url: this.baseUrl + item }; + } else { + item = { name: item, url: item }; + } + } + return item; + }); + } else { + this.fileList = []; + return []; + } + }, + deep: true, + immediate: true + } + }, + computed: { + // 是否显示提示 + showTip() { + return this.isShowTip && (this.fileType || this.fileSize); }, }, methods: { - removeImage() { - this.$emit("input", ""); + // 删除图片 + handleRemove(file, fileList) { + const findex = this.fileList.indexOf(file.name); + this.fileList.splice(findex, 1); + this.$emit("input", this.listToString(this.fileList)); }, + // 上传成功回调 handleUploadSuccess(res) { - this.$emit("input", res.url); + this.fileList.push({ name: res.fileName, url: res.fileName }); + this.$emit("input", this.listToString(this.fileList)); this.loading.close(); }, - handleBeforeUpload() { + // 上传前loading加载 + handleBeforeUpload(file) { + let isImg = false; + if (this.fileType.length) { + let fileExtension = ""; + if (file.name.lastIndexOf(".") > -1) { + fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1); + } + isImg = this.fileType.some(type => { + if (file.type.indexOf(type) > -1) return true; + if (fileExtension && fileExtension.indexOf(type) > -1) return true; + return false; + }); + } else { + isImg = file.type.indexOf("image") > -1; + } + + if (!isImg) { + 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; + } + } this.loading = this.$loading({ lock: true, text: "上传中", background: "rgba(0, 0, 0, 0.7)", }); }, + // 文件个数超出 + handleExceed() { + this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`); + }, + // 上传失败 handleUploadError() { this.$message({ type: "error", @@ -77,24 +174,37 @@ export default { }); this.loading.close(); }, - }, - watch: {}, + // 预览 + handlePictureCardPreview(file) { + this.dialogImageUrl = file.url; + this.dialogVisible = true; + }, + // 对象转成指定字符串分隔 + listToString(list, separator) { + let strs = ""; + separator = separator || ","; + for (let i in list) { + strs += list[i].url + separator; + } + return strs != '' ? strs.substr(0, strs.length - 1) : ''; + } + } }; - \ No newline at end of file +// 去掉动画效果 +::v-deep .el-list-enter-active, +::v-deep .el-list-leave-active { + transition: all 0s; +} + +::v-deep .el-list-enter, .el-list-leave-active { + opacity: 0; + transform: translateY(0); +} + + diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index d89930a8..c8837f2a 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -73,9 +73,9 @@ export default { if(router.path === "/") { router.children[item].path = "/redirect/" + router.children[item].path; } else { - if(!this.ishttp(router.children[item].path)) { + if(!this.ishttp(router.children[item].path)) { router.children[item].path = router.path + "/" + router.children[item].path; - } + } } router.children[item].parentPath = router.path; } From da1095e298ce7ae9a3a34cea357e0bc7c01d7499 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 9 Jul 2021 17:08:30 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/system/SysRoleController.java | 2 ++ .../java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index d4798053..953f3362 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -220,6 +220,7 @@ public class SysRoleController extends BaseController /** * 批量取消授权用户 */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) @@ -230,6 +231,7 @@ public class SysRoleController extends BaseController /** * 批量选择用户授权 */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 81b350a3..baa93529 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -275,6 +275,7 @@ public class SysUserServiceImpl implements ISysUserService * @param roleIds 角色组 */ @Override + @Transactional public void insertUserAuth(Long userId, Long[] roleIds) { userRoleMapper.deleteUserRoleByUserId(userId); From 8321f92d2cfbf2b92d28f920f37711256d20f109 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 9 Jul 2021 17:09:57 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index-tree.vue.vm | 36 ------------------ .../src/main/resources/vm/vue/index.vue.vm | 38 ------------------- ruoyi-ui/src/main.js | 13 ++++++- ruoyi-ui/src/views/system/notice/index.vue | 4 -- 4 files changed, 11 insertions(+), 80 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index ab870681..f7105cba 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -258,46 +258,10 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}"; 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 == "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 -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") -import Editor from '@/components/Editor'; -#break -#end -#end export default { name: "${BusinessName}", components: { -#foreach($column in $columns) -#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 -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") - Editor, -#break -#end -#end Treeselect }, data() { diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 9fd6adf5..caaf9e10 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -310,47 +310,9 @@ diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 0de4c2fd..7f0b1059 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -6,6 +6,7 @@ Vue.use(Router) /* Layout */ import Layout from '@/layout' import ParentView from '@/components/ParentView'; +import InnerLink from '@/layout/components/InnerLink' /** * Note: 路由配置项 diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js index f3a1d11f..340524ab 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/ruoyi-ui/src/store/modules/permission.js @@ -2,6 +2,7 @@ import { constantRoutes } from '@/router' import { getRouters } from '@/api/menu' import Layout from '@/layout/index' import ParentView from '@/components/ParentView'; +import InnerLink from '@/layout/components/InnerLink' const permission = { state: { @@ -65,6 +66,8 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { route.component = Layout } else if (route.component === 'ParentView') { route.component = ParentView + } else if (route.component === 'InnerLink') { + route.component = InnerLink } else { route.component = loadView(route.component) } From 170cfb356c93c32fa804799c4bc9d02b83b21dae Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 12 Jul 2021 08:42:11 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=203.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- ruoyi-admin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-framework/pom.xml | 2 +- ruoyi-generator/pom.xml | 2 +- ruoyi-quartz/pom.xml | 2 +- ruoyi-system/pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 41 ++++++++++++++++++- 10 files changed, 50 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 456b1480..60c01e2e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.5.0 + 3.6.0 ruoyi http://www.ruoyi.vip 若依管理系统 - 3.5.0 + 3.6.0 UTF-8 UTF-8 1.8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 25016b05..a0cb8a85 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.5.0 + 3.6.0 4.0.0 jar diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 3e6d53b7..eb6af14c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 名称 name: RuoYi # 版本 - version: 3.5.0 + version: 3.6.0 # 版权年份 copyrightYear: 2021 # 实例演示开关 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 653cfdb8..02be00ce 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.5.0 + 3.6.0 4.0.0 diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index e6a567c2..eb58d187 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.5.0 + 3.6.0 4.0.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index d65176e0..c87ee7cf 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.5.0 + 3.6.0 4.0.0 diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index 477333c4..67b7abd4 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.5.0 + 3.6.0 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index c68f4c2f..da5569ee 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.5.0 + 3.6.0 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 3e5c3eab..b765eee7 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.5.0", + "version": "3.6.0", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index f8249711..1fc8586c 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -147,6 +147,45 @@ 更新日志 + +
      +
    1. 角色管理新增分配用户功能
      2. +
    2. 用户管理新增分配角色功能
      3. +
    3. 日志列表支持排序操作
      4. +
    4. 优化参数&字典缓存操作
      5. +
    5. 系统布局配置支持动态标题开关
      6. +
    6. 菜单路由配置支持内链访问
      7. +
    7. 默认访问后端首页新增提示语
      8. +
    8. 富文本默认上传返回url类型
      9. +
    9. 新增自定义弹窗拖拽指令
      10. +
    10. 全局注册常用通用组件
      11. +
    11. 全局挂载字典标签组件
      12. +
    12. ImageUpload组件支持多图片上传
      13. +
    13. FileUpload组件支持多文件上传
      14. +
    14. 文件上传组件添加数量限制属性
      15. +
    15. 富文本编辑组件添加类型属性
      16. +
    16. 富文本组件工具栏配置视频
      17. +
    17. 封装通用iframe组件
      18. +
    18. 限制超级管理员不允许操作
      19. +
    19. 用户信息长度校验限制
      20. +
    20. 分页组件新增pagerCount属性
      21. +
    21. 添加bat脚本执行应用
      22. +
    22. 升级oshi到最新版本v5.7.4
      23. +
    23. 升级element-ui到最新版本2.15.2
      24. +
    24. 升级pagehelper到最新版1.3.1
      25. +
    25. 升级commons.io到最新版本v2.10.0
      26. +
    26. 升级commons.fileupload到最新版本v1.4
      27. +
    27. 升级swagger到最新版本v3.0.0
      28. +
    28. 修复关闭confirm提示框控制台报错问题
      29. +
    29. 修复存在的SQL注入漏洞问题
      30. +
    30. 定时任务屏蔽rmi远程调用
      31. +
    31. 修复用户搜索分页变量错误
      32. +
    32. 修复导出角色数据范围翻译缺少仅本人
      33. +
    33. 修复表单构建选择下拉选择控制台报错问题
      34. +
    34. 优化图片工具类读取文件
      35. +
    35. 其他细节优化
      36. +
    +
    1. 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）
      2. @@ -566,7 +605,7 @@ export default { data() { return { // 版本号 - version: "3.5.0", + version: "3.6.0", }; }, methods: {