Merge pull request #75 from suyuan32/dev

Dev
suyuan32 · Jul 14, 2023 · 08f965f · 08f965f
2 parents 64a12fd + 3f9b072
commit 08f965f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git 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/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,

diff --git 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[] = [