clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化所有弹窗、导出和提交等待的用户体验 

修复第二页只有一条数据如果删除页面显示无数据，分页那里显示选中的第一页的bug
修复分页页数成小数的bug
优化所有添加删除dialog点击model不会关闭
This commit is contained in:
王欣健 2021-07-14 11:28:49 +08:00
parent 1c2134bf27
commit 9005eb74ab
19 changed files with 750 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -143,7 +143,7 @@
</el-table> </el-table>
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)

4
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -334,8 +334,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listJob(this.queryParams).then(response => { listJob(this.queryParams).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.jobList = response.rows; this.jobList = response.rows;

4
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -219,8 +219,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.jobLogList = response.rows; this.jobLogList = response.rows;

4
ruoyi-ui/src/views/monitor/online/index.vue
View File

@ -90,8 +90,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
list(this.queryParams).then(response => { list(this.queryParams).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.list = response.rows; this.list = response.rows;

6
ruoyi-ui/src/views/system/config/index.vue
View File

@ -149,7 +149,7 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-form-item label="参数名称" prop="configName"> <el-form-item label="参数名称" prop="configName">
<el-input v-model="form.configName" placeholder="请输入参数名称" /> <el-input v-model="form.configName" placeholder="请输入参数名称" />
@ -254,8 +254,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.configList = response.rows; this.configList = response.rows;

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

@ -84,7 +84,7 @@
</el-table> </el-table>
<!-- 添加或修改部门对话框 --> <!-- 添加或修改部门对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24" v-if="form.parentId !== 0"> <el-col :span="24" v-if="form.parentId !== 0">

6
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -133,7 +133,7 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典类型"> <el-form-item label="字典类型">
<el-input v-model="form.dictType" :disabled="true" /> <el-input v-model="form.dictType" :disabled="true" />
@ -291,8 +291,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listData(this.queryParams).then(response => { listData(this.queryParams).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.dataList = response.rows; this.dataList = response.rows;

6
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -164,7 +164,7 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="dictName"> <el-form-item label="字典名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入字典名称" /> <el-input v-model="form.dictName" placeholder="请输入字典名称" />
@ -263,8 +263,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.typeList = response.rows; this.typeList = response.rows;

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

@ -160,8 +160,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => { list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.list = response.rows; this.list = response.rows;

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

@ -88,7 +88,7 @@
</el-table> </el-table>
<!-- 添加或修改菜单对话框 --> <!-- 添加或修改菜单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">

6
ruoyi-ui/src/views/system/notice/index.vue
View File

@ -129,7 +129,7 @@
/> />
<!-- 添加或修改公告对话框 --> <!-- 添加或修改公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -248,8 +248,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listNotice(this.queryParams).then(response => { listNotice(this.queryParams).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.noticeList = response.rows; this.noticeList = response.rows;

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

@ -241,8 +241,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
list(this.addDateRange(this.queryParams, this.dateRange)).then( response => { list(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.list = response.rows; this.list = response.rows;

6
ruoyi-ui/src/views/system/post/index.vue
View File

@ -123,7 +123,7 @@
/> />
<!-- 添加或修改岗位对话框 --> <!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-form-item label="岗位名称" prop="postName"> <el-form-item label="岗位名称" prop="postName">
<el-input v-model="form.postName" placeholder="请输入岗位名称" /> <el-input v-model="form.postName" placeholder="请输入岗位名称" />
@ -224,8 +224,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listPost(this.queryParams).then(response => { listPost(this.queryParams).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.postList = response.rows; this.postList = response.rows;

4
ruoyi-ui/src/views/system/role/authUser.vue
View File

@ -149,8 +149,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
allocatedUserList(this.queryParams).then(response => { allocatedUserList(this.queryParams).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.userList = response.rows; this.userList = response.rows;

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

@ -163,7 +163,7 @@
/> />
<!-- 添加或修改角色配置对话框 --> <!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-form-item label="角色名称" prop="roleName"> <el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" /> <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@ -209,7 +209,7 @@
</el-dialog> </el-dialog>
<!-- 分配角色数据权限对话框 --> <!-- 分配角色数据权限对话框 -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="openDataScope" width="500px" append-to-body>
<el-form v-loading="dialogLoading" :model="form" label-width="80px"> <el-form v-loading="dialogLoading" :model="form" label-width="80px">
<el-form-item label="角色名称"> <el-form-item label="角色名称">
<el-input v-model="form.roleName" :disabled="true" /> <el-input v-model="form.roleName" :disabled="true" />

6
ruoyi-ui/src/views/system/role/selectUser.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<!-- 授权用户 --> <!-- 授权用户 -->
<el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body> <el-dialog title="选择用户" :close-on-click-modal="false" :close-on-click-modal="false" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" v-loading="dialogLoading" ref="queryForm" :inline="true"> <el-form :model="queryParams" v-loading="dialogLoading" ref="queryForm" :inline="true">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="userName">
<el-input <el-input
@ -115,8 +115,8 @@ export default {
// 查询表数据 // 查询表数据
getList() { getList() {
unallocatedUserList(this.queryParams).then(res => { unallocatedUserList(this.queryParams).then(res => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.userList = res.rows; this.userList = res.rows;

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

@ -208,7 +208,7 @@
</el-row> </el-row>
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" v-loading="dialogLoading" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -495,8 +495,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.userList = response.rows; this.userList = response.rows;

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

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div> <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog()"> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog()">
<el-row> <el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}"> <el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper <vue-cropper

4
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -246,8 +246,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listTable(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listTable(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let currentPageNum = response.total / this.queryParams.pageSize; let currentPageNum = response.total % this.queryParams.pageSize > 0 ? parseInt(response.total / this.queryParams.pageSize) + 1 : (response.total / this.queryParams.pageSize);
if(this.queryParams.pageNum > currentPageNum){ if(currentPageNum !== 0 && currentPageNum !== 0 && this.queryParams.pageNum > currentPageNum){
this.queryParams.pageNum = currentPageNum; this.queryParams.pageNum = currentPageNum;
} }
this.tableList = response.rows; this.tableList = response.rows;