From 56a943bf48e204f24d0e1bbbf2cb7e82f3eb2662 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 24 五月 2021 11:24:54 +0800
Subject: [PATCH] 升级druid到最新版本v1.2.6
---
ruoyi-ui/src/views/system/role/index.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 6e96faa..4892615 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -94,6 +94,7 @@
plain
icon="el-icon-download"
size="mini"
+ :loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button>
@@ -213,7 +214,7 @@
<el-input v-model="form.roleKey" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
- <el-select v-model="form.dataScope">
+ <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
<el-option
v-for="item in dataScopeOptions"
:key="item.value"
@@ -258,6 +259,8 @@
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
@@ -524,6 +527,12 @@
this.title = "修改角色";
});
},
+ /** 选择角色权限范围触发 */
+ dataScopeSelectChange(value) {
+ if(value !== '2') {
+ this.$refs.dept.setCheckedKeys([]);
+ }
+ },
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
@@ -593,10 +602,12 @@
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportRole(queryParams);
}).then(response => {
this.download(response.msg);
+ this.exportLoading = false;
})
}
}
--
Gitblit v1.9.2