From 4fcdc40dbdb9c93f7583daf09e98ae662b73bcb2 Mon Sep 17 00:00:00 2001
From: Ryan SU <yuansu.china.work@gmail.com>
Date: Fri, 14 Jul 2023 14:42:45 +0800
Subject: [PATCH 1/2] fix: optimize row in role management

---
 .../dashboard/workbench/components/data.ts    |  2 +-
 src/views/sys/role/role.data.ts               | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts
index 0c2b0206..b00d8ca1 100644
--- a/src/views/dashboard/workbench/components/data.ts
+++ b/src/views/dashboard/workbench/components/data.ts
@@ -52,5 +52,5 @@ export const navItems: NavItem[] = [
 
 export const systemInfoData = [
   ['sys.sys.Name', 'Simple Admin'],
-  ['sys.sys.version', 'V 1.0.13'],
+  ['sys.sys.version', 'V 1.0.14'],
 ];
diff --git a/src/views/sys/role/role.data.ts b/src/views/sys/role/role.data.ts
index 7d606d82..2aaf3b00 100644
--- a/src/views/sys/role/role.data.ts
+++ b/src/views/sys/role/role.data.ts
@@ -16,22 +16,22 @@ export const columns: BasicColumn[] = [
   {
     title: t('sys.role.roleName'),
     dataIndex: 'trans',
-    width: 200,
+    width: 50,
   },
   {
     title: t('sys.role.roleValue'),
     dataIndex: 'code',
-    width: 180,
+    width: 20,
   },
   {
     title: t('common.sort'),
     dataIndex: 'sort',
-    width: 50,
+    width: 20,
   },
   {
     title: t('common.status'),
     dataIndex: 'status',
-    width: 120,
+    width: 50,
     customRender: ({ record }) => {
       if (!Reflect.has(record, 'pendingStatus')) {
         record.pendingStatus = false;
@@ -61,18 +61,19 @@ export const columns: BasicColumn[] = [
       });
     },
   },
+  {
+    title: t('common.remark'),
+    dataIndex: 'remark',
+    width: 50,
+  },
   {
     title: t('common.createTime'),
     dataIndex: 'createdAt',
-    width: 180,
+    width: 50,
     customRender: ({ record }) => {
       return formatToDateTime(record.createdAt);
     },
   },
-  {
-    title: t('common.remark'),
-    dataIndex: 'remark',
-  },
 ];
 
 export const formSchema: FormSchema[] = [

From 3f9b072ba542d20d0f6b710835c15a51e43055e0 Mon Sep 17 00:00:00 2001
From: Ryan SU <yuansu.china.work@gmail.com>
Date: Fri, 14 Jul 2023 15:10:57 +0800
Subject: [PATCH 2/2] fix: required checked bug

---
 src/views/sys/role/RoleDrawer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sys/role/RoleDrawer.vue b/src/views/sys/role/RoleDrawer.vue
index ccb898c9..abee4c32 100644
--- a/src/views/sys/role/RoleDrawer.vue
+++ b/src/views/sys/role/RoleDrawer.vue
@@ -149,7 +149,7 @@
           const roleId = await validate();
           const checkedData = await getApiAuthority({ id: Number(roleId['id']) });
           if (checkedData.data.data === null) {
-            checkedApiKeys.value = [];
+            checkedApiKeys.value = convertApiToCheckedKeys([], apiData.data.data);
           } else {
             checkedApiKeys.value = convertApiToCheckedKeys(
               checkedData.data.data,