From a6139408c7b59e753190fa1473ea0320112522a6 Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Thu, 31 Aug 2023 19:23:18 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/requrls/setting/usergroup.ts            | 2 +-
 frontend/src/assets/style/arco-reset.less                | 9 ++++++---
 .../src/components/pure/ms-pagination/page-jumper.vue    | 2 +-
 frontend/src/views/bug-management/index.vue              | 2 +-
 .../setting/organization/usergroup/orgUserGroup.vue      | 2 ++
 .../organizationAndProject/components/systemProject.vue  | 1 +
 .../setting/system/organizationAndProject/index.vue      | 1 -
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/src/api/requrls/setting/usergroup.ts b/frontend/src/api/requrls/setting/usergroup.ts
index 11e50b1499..223f763e4f 100644
--- a/frontend/src/api/requrls/setting/usergroup.ts
+++ b/frontend/src/api/requrls/setting/usergroup.ts
@@ -21,7 +21,7 @@ export const addUserToUserGroupUrl = `/user/role/relation/global/add`;
 /** 删除用户组用户 */
 export const deleteUserFromUserGroupUrl = `/user/role/relation/global/delete/`;
 /** 获取需要关联的用户选项 */
-export const getSystemUserGroupOptionUrl = `/user/role/relation//global/user/option/`;
+export const getSystemUserGroupOptionUrl = `/user/role/relation/global/user/option/`;
 
 /** 组织 */
 // 组织-修改用户组
diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less
index c4164b6952..e09c0c08d2 100644
--- a/frontend/src/assets/style/arco-reset.less
+++ b/frontend/src/assets/style/arco-reset.less
@@ -570,16 +570,19 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 5px 0;
-    width: 32px;
+    padding: 5px 10px;
+    min-width: 32px;
     height: 32px;
     box-sizing: border-box;
     cursor: pointer;
     &-previous {
       margin-left: 14px !important;
     }
+    &-ellipsis {
+      padding: 5px 0;
+    }
     &-ellipsis:hover {
-      width: 32px;
+      min-width: 32px;
       height: 32px;
     }
     &:not(:last-child):not(:first-child):not(.arco-pagination-item-ellipsis) {
diff --git a/frontend/src/components/pure/ms-pagination/page-jumper.vue b/frontend/src/components/pure/ms-pagination/page-jumper.vue
index ec2ca61906..dc7006be5c 100644
--- a/frontend/src/components/pure/ms-pagination/page-jumper.vue
+++ b/frontend/src/components/pure/ms-pagination/page-jumper.vue
@@ -15,7 +15,7 @@
       @change="handleChange"
     />
     <span v-if="$slots['jumper-append']" :class="`${prefixCls}-append`"><slot name="jumper-append" /></span>
-    <span :class="`${prefixCls}-total-page`" :style="{ width: totalPageWidth }">{{
+    <span :class="`${prefixCls}-total-page`" :style="{ 'min-width': totalPageWidth }">{{
       t('msPagination.page', { page: pages })
     }}</span>
   </span>
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index 20a4284d60..a5ea138bb1 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -1,7 +1,7 @@
 <template>
   <MsCard simple>
     <h1>BugManagement is waiting for development </h1>
-    <ms-pagination size="small" :total="100" show-total show-jumper show-page-size />
+    <ms-pagination size="small" :total="100000" show-total show-jumper show-page-size />
   </MsCard>
 </template>
 
diff --git a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
index eb4b9edee4..d03d4833b2 100644
--- a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
+++ b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
@@ -137,6 +137,8 @@
   }
   .user-group-left {
     position: relative;
+    width: 300px;
+    height: calc(100vh - 125px);
     border-right: 1px solid var(--color-border);
     .usergroup-collapse {
       position: absolute;
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
index 12f2755a79..0cae5fa071 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
@@ -122,6 +122,7 @@
       title: 'system.organization.subordinateOrg',
       dataIndex: 'organizationName',
       sortable: {
+        sorter: true,
         sortDirections: ['ascend', 'descend'],
       },
     },
diff --git a/frontend/src/views/setting/system/organizationAndProject/index.vue b/frontend/src/views/setting/system/organizationAndProject/index.vue
index d2528bf39d..43cd36ea19 100644
--- a/frontend/src/views/setting/system/organizationAndProject/index.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/index.vue
@@ -116,6 +116,5 @@
   );
   onBeforeMount(() => {
     tableSearch();
-    initOrgAndProjectCount();
   });
 </script>