Merge pull request 'fix: 修复role新增编辑bug, 调整列表页' (#45) from role into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/45

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) => {

src/views/system/role/index.vue

@@ -109,10 +109,10 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'dataScope',
+      prop: 'template',
-      label: '数据范围',
+      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