From fab408b5745c9aae957767d4bce726adc3c1fdfe Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Wed, 24 Apr 2024 15:24:28 +0800
Subject: [PATCH] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=BB=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035250 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001035250
--bug=1035253 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001035253
---
 .../createOrUpdateUserGroup.vue               |   7 +-
 .../ms-user-group-comp/msUserGroupLeft.vue    | 211 +++++++++---------
 2 files changed, 111 insertions(+), 107 deletions(-)

diff --git a/frontend/src/components/business/ms-user-group-comp/createOrUpdateUserGroup.vue b/frontend/src/components/business/ms-user-group-comp/createOrUpdateUserGroup.vue
index dec9c7b429..d97023865c 100644
--- a/frontend/src/components/business/ms-user-group-comp/createOrUpdateUserGroup.vue
+++ b/frontend/src/components/business/ms-user-group-comp/createOrUpdateUserGroup.vue
@@ -2,7 +2,7 @@
   <a-popover
     ref="popoverRef"
     :popup-visible="currentVisible"
-    position="bl"
+    position="br"
     trigger="click"
     class="w-[350px]"
     :content-class="props.id ? 'move-left' : ''"
@@ -30,10 +30,7 @@
                 @press-enter="handleBeforeOk"
                 @keyup.esc="handleCancel"
               />
-              <span
-                v-if="!props.id && props.authScope === AuthScopeEnum.SYSTEM"
-                class="mt-[8px] text-[13px] font-medium text-[var(--color-text-4)]"
-              >
+              <span v-if="!props.id" class="mt-[8px] text-[13px] font-medium text-[var(--color-text-4)]">
                 {{ t('system.userGroup.createUserGroupTip') }}
               </span>
             </a-form-item>
diff --git a/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue b/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue
index a87c2b1297..cf57d9fa4c 100644
--- a/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue
+++ b/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue
@@ -10,42 +10,45 @@
       />
     </div>
     <div v-if="showSystem" v-permission="['SYSTEM_USER_ROLE:READ']" class="mt-2">
-      <CreateUserGroupPopup
-        :list="systemUserGroupList"
-        :visible="systemUserGroupVisible"
-        :auth-scope="AuthScopeEnum.SYSTEM"
-        @cancel="systemUserGroupVisible = false"
-        @submit="handleCreateUserGroup"
-      >
-        <div class="flex items-center justify-between px-[4px] py-[7px]">
-          <div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
-            <MsIcon
-              v-if="systemToggle"
-              class="cursor-pointer"
-              type="icon-icon_expand-down_filled"
-              size="12"
-              @click="systemToggle = false"
-            />
-            <MsIcon
-              v-else
-              class="cursor-pointer"
-              type="icon-icon_expand-right_filled"
-              size="12"
-              @click="systemToggle = true"
-            />
-            <div class="text-[14px]">
-              {{ t('system.userGroup.systemUserGroup') }}
-            </div>
-          </div>
-
-          <icon-plus-circle-fill
-            v-permission="props.addPermission"
-            class="cursor-pointer text-[rgb(var(--primary-7))]"
-            size="20"
-            @click="handleCreateUG(AuthScopeEnum.SYSTEM)"
+      <div class="flex items-center justify-between px-[4px] py-[7px]">
+        <div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
+          <MsIcon
+            v-if="systemToggle"
+            class="cursor-pointer"
+            type="icon-icon_expand-down_filled"
+            size="12"
+            @click="systemToggle = false"
           />
+          <MsIcon
+            v-else
+            class="cursor-pointer"
+            type="icon-icon_expand-right_filled"
+            size="12"
+            @click="systemToggle = true"
+          />
+          <div class="text-[14px]">
+            {{ t('system.userGroup.systemUserGroup') }}
+          </div>
         </div>
-      </CreateUserGroupPopup>
+        <CreateUserGroupPopup
+          :list="systemUserGroupList"
+          :visible="systemUserGroupVisible"
+          :auth-scope="AuthScopeEnum.SYSTEM"
+          @cancel="systemUserGroupVisible = false"
+          @submit="handleCreateUserGroup"
+        >
+          <a-tooltip :content="`创建${t('system.userGroup.systemUserGroup')}`" position="right">
+            <MsIcon
+              v-permission="props.addPermission"
+              type="icon-icon_create_planarity"
+              size="20"
+              class="cursor-pointer text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
+              @click="handleCreateUG(AuthScopeEnum.SYSTEM)"
+            />
+          </a-tooltip>
+        </CreateUserGroupPopup>
+      </div>
+
       <Transition>
         <div v-if="systemToggle">
           <div
@@ -112,42 +115,44 @@
       </Transition>
     </div>
     <div v-if="showOrg" v-permission="['ORGANIZATION_USER_ROLE:READ']" class="mt-2">
-      <CreateUserGroupPopup
-        :list="orgUserGroupList"
-        :visible="orgUserGroupVisible"
-        :auth-scope="AuthScopeEnum.ORGANIZATION"
-        @cancel="orgUserGroupVisible = false"
-        @submit="handleCreateUserGroup"
-      >
-        <div class="flex items-center justify-between px-[4px] py-[7px]">
-          <div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
-            <MsIcon
-              v-if="orgToggle"
-              class="cursor-pointer"
-              type="icon-icon_expand-down_filled"
-              size="12"
-              @click="orgToggle = false"
-            />
-            <MsIcon
-              v-else
-              class="cursor-pointer"
-              type="icon-icon_expand-right_filled"
-              size="12"
-              @click="orgToggle = true"
-            />
-            <div class="text-[14px]">
-              {{ t('system.userGroup.orgUserGroup') }}
-            </div>
-          </div>
-
-          <icon-plus-circle-fill
-            v-permission="props.addPermission"
-            class="cursor-pointer text-[rgb(var(--primary-7))]"
-            size="20"
-            @click="orgUserGroupVisible = true"
+      <div class="flex items-center justify-between px-[4px] py-[7px]">
+        <div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
+          <MsIcon
+            v-if="orgToggle"
+            class="cursor-pointer"
+            type="icon-icon_expand-down_filled"
+            size="12"
+            @click="orgToggle = false"
           />
+          <MsIcon
+            v-else
+            class="cursor-pointer"
+            type="icon-icon_expand-right_filled"
+            size="12"
+            @click="orgToggle = true"
+          />
+          <div class="text-[14px]">
+            {{ t('system.userGroup.orgUserGroup') }}
+          </div>
         </div>
-      </CreateUserGroupPopup>
+        <CreateUserGroupPopup
+          :list="orgUserGroupList"
+          :visible="orgUserGroupVisible"
+          :auth-scope="AuthScopeEnum.ORGANIZATION"
+          @cancel="orgUserGroupVisible = false"
+          @submit="handleCreateUserGroup"
+        >
+          <a-tooltip :content="`创建${t('system.userGroup.orgUserGroup')}`" position="right">
+            <MsIcon
+              v-permission="props.addPermission"
+              type="icon-icon_create_planarity"
+              size="20"
+              class="cursor-pointer text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
+              @click="orgUserGroupVisible = true"
+            />
+          </a-tooltip>
+        </CreateUserGroupPopup>
+      </div>
       <Transition>
         <div v-if="orgToggle">
           <div
@@ -240,42 +245,44 @@
       </Transition>
     </div>
     <div v-if="showProject" v-permission="['PROJECT_GROUP:READ']" class="mt-2">
-      <CreateUserGroupPopup
-        :list="projectUserGroupList"
-        :visible="projectUserGroupVisible"
-        :auth-scope="AuthScopeEnum.PROJECT"
-        @cancel="projectUserGroupVisible = false"
-        @submit="handleCreateUserGroup"
-      >
-        <div class="flex items-center justify-between px-[4px] py-[7px]">
-          <div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
-            <MsIcon
-              v-if="projectToggle"
-              class="cursor-pointer"
-              type="icon-icon_expand-down_filled"
-              size="12"
-              @click="projectToggle = false"
-            />
-            <MsIcon
-              v-else
-              class="cursor-pointer"
-              type="icon-icon_expand-right_filled"
-              size="12"
-              @click="projectToggle = true"
-            />
-            <div class="text-[14px]">
-              {{ t('system.userGroup.projectUserGroup') }}
-            </div>
-          </div>
-
-          <icon-plus-circle-fill
-            v-permission="props.addPermission"
-            class="cursor-pointer text-[rgb(var(--primary-7))]"
-            size="20"
-            @click="projectUserGroupVisible = true"
+      <div class="flex items-center justify-between px-[4px] py-[7px]">
+        <div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
+          <MsIcon
+            v-if="projectToggle"
+            class="cursor-pointer"
+            type="icon-icon_expand-down_filled"
+            size="12"
+            @click="projectToggle = false"
           />
+          <MsIcon
+            v-else
+            class="cursor-pointer"
+            type="icon-icon_expand-right_filled"
+            size="12"
+            @click="projectToggle = true"
+          />
+          <div class="text-[14px]">
+            {{ t('system.userGroup.projectUserGroup') }}
+          </div>
         </div>
-      </CreateUserGroupPopup>
+        <CreateUserGroupPopup
+          :list="projectUserGroupList"
+          :visible="projectUserGroupVisible"
+          :auth-scope="AuthScopeEnum.PROJECT"
+          @cancel="projectUserGroupVisible = false"
+          @submit="handleCreateUserGroup"
+        >
+          <a-tooltip :content="`创建${t('system.userGroup.projectUserGroup')}`" position="right">
+            <MsIcon
+              v-permission="props.addPermission"
+              type="icon-icon_create_planarity"
+              size="20"
+              class="cursor-pointer text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
+              @click="projectUserGroupVisible = true"
+            />
+          </a-tooltip>
+        </CreateUserGroupPopup>
+      </div>
       <Transition>
         <div v-if="projectToggle">
           <div