jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐬发布 4.3.1 修复了一些问题建议升级

Browse Source
This commit is contained in:
疯狂的狮子li
2022-10-24 14:35:07 +08:00
parent 0f237ef7ed
commit 02e9ac799d
50 changed files with 308 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
"version": "4.3.0",
"version": "4.3.1",
"description": "RuoYi-Vue-Plus后台管理系统",
"author": "LionLi",
"license": "MIT",
@ -38,9 +38,9 @@
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.19.1",
"core-js": "3.25.3",
"echarts": "4.9.0",
"element-ui": "2.15.8",
"element-ui": "2.15.10",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",

15
ruoyi-ui/src/App.vue
View File

@ -1,12 +1,16 @@
<template>
<div id="app">
<router-view />
<theme-picker />
</div>
</template>
<script>
export default {
name: 'App',
import ThemePicker from "@/components/ThemePicker";
export default {
name: "App",
components: { ThemePicker },
metaInfo() {
return {
title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
@ -15,5 +19,10 @@ export default {
}
}
}
}
};
</script>
<style scoped>
#app .theme-picker {
display: none;
}
</style>

5
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -264,9 +264,10 @@
}
.avatar-upload-preview {
position: absolute;
position: relative;
top: 50%;
transform: translate(50%, -50%);
left: 50%;
transform: translate(-50%, -50%);
width: 200px;
height: 200px;
border-radius: 50%;

16
ruoyi-ui/src/components/FileUpload/index.vue
View File

@ -74,7 +74,7 @@ export default {
number: 0,
uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传文件服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
@ -124,15 +124,9 @@ export default {
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;
});
const fileName = file.name.split('.');
const fileExt = fileName[fileName.length - 1];
const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
if (!isTypeOk) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
return false;
@ -156,7 +150,7 @@ export default {
},
// 上传失败
handleUploadError(err) {
this.$modal.msgError("上传图片失败，请重试");
this.$modal.msgError("上传文件失败，请重试");
this.$modal.closeLoading();
},
// 上传成功回调

5
ruoyi-ui/src/utils/request.js
View File

@ -132,12 +132,13 @@ service.interceptors.response.use(res => {
)
// 通用下载方法
export function download(url, params, filename) {
export function download(url, params, filename, config) {
downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
return service.post(url, params, {
transformRequest: [(params) => { return tansParams(params) }],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob'
responseType: 'blob',
...config
}).then(async (data) => {
const isLogin = await blobValidate(data);
if (isLogin) {

2
ruoyi-ui/src/views/index.vue
View File

@ -114,7 +114,7 @@ export default {
data() {
return {
// 版本号
version: "4.3.0",
version: "4.3.1",
};
},
methods: {

2
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@ -189,8 +189,8 @@ export default {
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
},
/** 多选框选中数据 */
handleSelectionChange(selection) {

2
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@ -255,8 +255,8 @@ export default {
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
},
/** 多选框选中数据 */
handleSelectionChange(selection) {

63
ruoyi-ui/src/views/system/oss/index.vue
View File

@ -118,7 +118,10 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange"
:header-cell-class-name="handleHeaderClass"
@header-click="handleHeaderCLick"
v-if="showTable">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="对象存储主键" align="center" prop="ossId" v-if="false"/>
<el-table-column label="文件名" align="center" prop="fileName" />
@ -135,13 +138,15 @@
v-if="!checkFileSuffix(scope.row.fileSuffix) || !previewListResource"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="创建时间" align="center" prop="createTime" width="180"
sortable="custom">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="上传人" align="center" prop="createBy" />
<el-table-column label="服务商" align="center" prop="service" />
<el-table-column label="服务商" align="center" prop="service"
sortable="custom"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -193,6 +198,7 @@ export default {
name: "Oss",
data() {
return {
showTable: true,
// 按钮loading
buttonLoading: false,
// 遮罩层
@ -221,6 +227,8 @@ export default {
previewListResource: true,
// 创建时间时间范围
daterangeCreateTime: [],
// 默认排序
defaultSort: {prop: 'createTime', order: 'ascending'},
// 查询参数
queryParams: {
pageNum: 1,
@ -262,6 +270,7 @@ export default {
this.ossList = response.rows;
this.total = response.total;
this.loading = false;
this.showTable = true;
});
},
checkFileSuffix(fileSuffix) {
@ -289,8 +298,11 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.showTable = false;
this.daterangeCreateTime = [];
this.resetForm("queryForm");
this.queryParams.orderByColumn = this.defaultSort.prop;
this.queryParams.isAsc = this.defaultSort.order;
this.handleQuery();
},
// 多选框选中数据
@ -299,6 +311,51 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
// 设置列的排序为我们自定义的排序
handleHeaderClass({column}) {
column.order = column.multiOrder
},
// 点击表头进行排序
handleHeaderCLick(column) {
if (column.sortable !== 'custom') {
return
}
switch (column.multiOrder) {
case 'descending':
column.multiOrder = 'ascending';
break;
case 'ascending':
column.multiOrder = '';
break;
default:
column.multiOrder = 'descending';
break;
}
this.handleOrderChange(column.property, column.multiOrder)
},
handleOrderChange(prop, order) {
let orderByArr = this.queryParams.orderByColumn ? this.queryParams.orderByColumn.split(",") : [];
let isAscArr = this.queryParams.isAsc ? this.queryParams.isAsc.split(",") : [];
let propIndex = orderByArr.indexOf(prop)
if (propIndex !== -1) {
if (order) {
//排序里已存在 只修改排序
isAscArr[propIndex] = order;
} else {
//如果order为null 则删除排序字段和属性
isAscArr.splice(propIndex, 1);//删除排序
orderByArr.splice(propIndex, 1);//删除属性
}
} else {
//排序里不存在则新增排序
orderByArr.push(prop);
isAscArr.push(order);
}
//合并排序
this.queryParams.orderByColumn = orderByArr.join(",");
this.queryParams.isAsc = isAscArr.join(",");
this.getList();
},
/** 任务日志列表查询 */
handleOssConfig() {
this.$router.push({ path: '/system/oss-config/index'})

4
ruoyi-ui/src/views/system/user/index.vue
View File

@ -576,8 +576,8 @@ export default {
this.form = response.data.user;
this.postOptions = response.data.posts;
this.roleOptions = response.data.roles;
this.form.postIds = response.data.postIds;
this.form.roleIds = response.data.roleIds;
this.$set(this.form, "postIds", response.data.postIds);
this.$set(this.form, "roleIds", response.data.roleIds);
this.open = true;
this.title = "修改用户";
this.form.password = "";

27
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View File

@ -24,7 +24,7 @@
</el-row>
<br />
<el-row>
<el-col :lg="2" :md="2">
<el-col :lg="2" :sm="3" :xs="3">
<el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
<el-button size="small">
选择
@ -32,19 +32,19 @@
</el-button>
</el-upload>
</el-col>
<el-col :lg="{span: 1, offset: 2}" :md="2">
<el-col :lg="{span: 1, offset: 2}" :sm="2" :xs="2">
<el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
</el-col>
<el-col :lg="{span: 1, offset: 1}" :md="2">
<el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
<el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
</el-col>
<el-col :lg="{span: 1, offset: 1}" :md="2">
<el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
<el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
</el-col>
<el-col :lg="{span: 1, offset: 1}" :md="2">
<el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
<el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
</el-col>
<el-col :lg="{span: 2, offset: 6}" :md="2">
<el-col :lg="{span: 2, offset: 6}" :sm="2" :xs="2">
<el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
</el-col>
</el-row>
@ -56,6 +56,7 @@
import store from "@/store";
import { VueCropper } from "vue-cropper";
import { uploadAvatar } from "@/api/system/user";
import { debounce } from '@/utils'
export default {
components: { VueCropper },
@ -80,7 +81,8 @@ export default {
fixedBox: true, // 固定截图框大小 不允许改变
filename: ''
},
previews: {}
previews: {},
resizeHandler: null
};
},
methods: {
@ -91,6 +93,16 @@ export default {
// 打开弹出层结束时的回调
modalOpened() {
this.visible = true;
if (!this.resizeHandler) {
this.resizeHandler = debounce(() => {
this.refresh()
}, 100)
}
window.addEventListener("resize", this.resizeHandler)
},
// 刷新组件
refresh() {
this.$refs.cropper.refresh();
},
// 覆盖默认的上传行为
requestUpload() {
@ -144,6 +156,7 @@ export default {
closeDialog() {
this.options.img = store.getters.avatar
this.visible = false;
window.removeEventListener("resize", this.resizeHandler)
}
}
};

10
ruoyi-ui/src/views/tool/gen/editTable.vue
View File

@ -45,22 +45,22 @@
<el-table-column label="插入" min-width="5%">
<template slot-scope="scope">
<el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
<el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="编辑" min-width="5%">
<template slot-scope="scope">
<el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
<el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="列表" min-width="5%">
<template slot-scope="scope">
<el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
<el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="查询" min-width="5%">
<template slot-scope="scope">
<el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
<el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="查询方式" min-width="10%">
@ -79,7 +79,7 @@
</el-table-column>
<el-table-column label="必填" min-width="5%">
<template slot-scope="scope">
<el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
<el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="显示类型" min-width="12%">