From 47a4c311afd1e2792da9aa24f6a0cad9b0694e3f Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Fri, 29 Mar 2024 14:06:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Drole=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91bug,=20=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/add.vue   | 6 +++++-
 src/views/system/role/index.vue | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue
index 6a9c8c5..f988177 100644
--- a/src/views/system/role/add.vue
+++ b/src/views/system/role/add.vue
@@ -154,7 +154,11 @@ const filterMenu = (value, data) => {
 }
 
 const checkChange = (data) => {
-  return menuTree.value.getCheckedKeys()
+  // 获取已选
+  const checkedKeys = menuTree.value.getCheckedKeys()
+  // 获取半选
+  const halfCheckedKeys = menuTree.value.getHalfCheckedKeys()
+  return [...checkedKeys, ...halfCheckedKeys]
 }
 
 const checkBoxChange = (val) => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 4decb41..0e0247b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -109,10 +109,10 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'dataScope',
-      label: '数据范围',
+      prop: 'template',
+      label: '是否为模版角色',
       align: 'center',
-      currentRender: ({row, index}) => (<span>{formatDataScope(row.dataScope)}</span>)
+      currentRender: ({row, index}) => (<Tag dictType={'yes_no'} value={row.template ? '1' : '0'} />)
     },
     {
       prop: 'roleSort',
@@ -154,7 +154,7 @@ const tableConfig = reactive({
           btn.push({label: '删除', auth: auths.edit, func: ()=>handleDel(row) , type: 'danger'})
         }
         return (
-          <div>
+          <div style={{width: '100%'}}>
             {
               btn.map(item=>(
                 <el-button