From ee7607bccaa8d2b60a3b6c6e8bdee36eda41be62 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 09 Jul 2021 21:12:37 +0800
Subject: [PATCH] 全局注册通用组件
---
ruoyi-ui/src/views/system/role/index.vue | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index ea44d57..c29c8fe 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -123,7 +123,7 @@
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
type="text"
@@ -134,17 +134,21 @@
<el-button
size="mini"
type="text"
- icon="el-icon-circle-check"
- @click="handleDataScope(scope.row)"
- v-hasPermi="['system:role:edit']"
- >数据权限</el-button>
- <el-button
- size="mini"
- type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</el-button>
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+ <span class="el-dropdown-link">
+ <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
+ v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
+ <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
+ v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
</template>
</el-table-column>
</el-table>
@@ -213,7 +217,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"
@@ -276,7 +280,7 @@
open: false,
// 是否显示弹出层（数据权限）
openDataScope: false,
- menuExpand: false,
+ menuExpand: false,
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
@@ -431,7 +435,7 @@
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([]);
}
- this.menuExpand = false,
+ this.menuExpand = false,
this.menuNodeAll = false,
this.deptExpand = true,
this.deptNodeAll = false,
@@ -443,8 +447,8 @@
status: "0",
menuIds: [],
deptIds: [],
- menuCheckStrictly: true,
- deptCheckStrictly: true,
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
remark: undefined
};
this.resetForm("form");
@@ -466,7 +470,20 @@
this.single = selection.length!=1
this.multiple = !selection.length
},
- // 树权限（展开/折叠）
+ // 更多操作触发
+ handleCommand(command, row) {
+ switch (command) {
+ case "handleDataScope":
+ this.handleDataScope(row);
+ break;
+ case "handleAuthUser":
+ this.handleAuthUser(row);
+ break;
+ default:
+ break;
+ }
+ },
+ // 树权限（展开/折叠）
handleCheckedTreeExpand(value, type) {
if (type == 'menu') {
let treeList = this.menuOptions;
@@ -513,11 +530,22 @@
this.open = true;
this.$nextTick(() => {
roleMenu.then(res => {
- this.$refs.menu.setCheckedKeys(res.checkedKeys);
+ let checkedKeys = res.checkedKeys
+ checkedKeys.forEach((v) => {
+ this.$nextTick(()=>{
+ this.$refs.menu.setChecked(v, true ,false);
+ })
+ })
});
});
this.title = "修改角色";
});
+ },
+ /** 选择角色权限范围触发 */
+ dataScopeSelectChange(value) {
+ if(value !== '2') {
+ this.$refs.dept.setCheckedKeys([]);
+ }
},
/** 分配数据权限操作 */
handleDataScope(row) {
@@ -533,6 +561,11 @@
});
this.title = "分配数据权限";
});
+ },
+ /** 分配用户操作 */
+ handleAuthUser: function(row) {
+ const roleId = row.roleId;
+ this.$router.push("/auth/user/" + roleId);
},
/** 提交按钮 */
submitForm: function() {
@@ -579,7 +612,7 @@
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
- })
+ }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
--
Gitblit v1.9.3