From f2a0cdde7522588df775c253fbd5ec80d2ba9680 Mon Sep 17 00:00:00 2001
From: 1myuan <77721700+1myuan@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:08:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E2=80=9D+=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=B9=E7=9B=AE=E2=80=9C=20(#31313)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 项目下拉列表增加"+新建项目"

* fix: 新建项目权限
---
 frontend/src/assets/style/arco-reset.less     |  1 +
 frontend/src/components/pure/navbar/index.vue | 20 ++++++++++++++++++-
 frontend/src/locale/en-US/settings.ts         |  1 +
 frontend/src/locale/zh-CN/settings.ts         |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less
index ee168bbd7d..f6328dd453 100644
--- a/frontend/src/assets/style/arco-reset.less
+++ b/frontend/src/assets/style/arco-reset.less
@@ -545,6 +545,7 @@
   box-shadow: 0 3px 14px 2px rgb(0 0 0 / 5%), 0 8px 10px 1px rgb(0 0 0 / 6%), 0 5px 5px -3px rgb(0 0 0 / 10%);
   .arco-select-dropdown-header {
     margin-bottom: 4px;
+    border-bottom: 1px solid var(--color-text-n8);
   }
   .arco-dropdown-list,
   .arco-select-dropdown-list,
diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index 16dcdcbe73..28ea426f4a 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -25,6 +25,18 @@
           <template #arrow-icon>
             <icon-caret-down />
           </template>
+          <template v-if="hasAnyPermission(['ORGANIZATION_PROJECT:READ+ADD'])" #header>
+            <a-button
+              class="select-header-button mb-[4px] h-[28px] w-full justify-start pl-[7px] pr-0"
+              type="text"
+              @click="projectVisible = true"
+            >
+              <template #icon>
+                <MsIcon type="icon-icon_add_outlined" />
+              </template>
+              {{ t('settings.navbar.createProject') }}
+            </a-button>
+          </template>
           <a-tooltip
             v-for="project of appStore.projectList"
             :key="project.id"
@@ -157,6 +169,7 @@
   </div>
   <TaskCenterModal v-model:visible="taskCenterVisible" />
   <MessageCenterDrawer v-model:visible="messageCenterVisible" />
+  <AddProjectModal :visible="projectVisible" @cancel="projectVisible = false" />
 </template>
 
 <script lang="ts" setup>
@@ -169,6 +182,7 @@
   import MessageCenterDrawer from '@/components/business/ms-message/MessageCenterDrawer.vue';
   import TopMenu from '@/components/business/ms-top-menu/index.vue';
   import TaskCenterModal from './taskCenterModal.vue';
+  import AddProjectModal from '@/views/setting/organization/project/components/addProjectModal.vue';
 
   import { getMessageUnReadCount } from '@/api/modules/message';
   import { switchProject } from '@/api/modules/project-management/project';
@@ -179,7 +193,7 @@
   import useLocale from '@/locale/useLocale';
   import useAppStore from '@/store/modules/app';
   import useUserStore from '@/store/modules/user';
-  import { getFirstRouteNameByPermission } from '@/utils/permission';
+  import { getFirstRouteNameByPermission, hasAnyPermission } from '@/utils/permission';
 
   import { IconInfoCircle } from '@arco-design/web-vue/es/icon';
 
@@ -220,6 +234,7 @@
     }
   );
 
+  const projectVisible = ref(false);
   const showProjectSelect = computed(() => {
     const { getRouteLevelByKey } = usePathMap();
     // 非项目级别页面不需要展示项目选择器
@@ -306,6 +321,9 @@
   .navbar {
     @apply flex h-full justify-between bg-transparent;
   }
+  .select-header-button.arco-btn-text:not(:disabled):hover {
+    background-color: rgb(var(--primary-1)) !important;
+  }
   .center-side {
     @apply flex flex-1 items-center;
   }
diff --git a/frontend/src/locale/en-US/settings.ts b/frontend/src/locale/en-US/settings.ts
index 15839e9d64..09f0ce439b 100644
--- a/frontend/src/locale/en-US/settings.ts
+++ b/frontend/src/locale/en-US/settings.ts
@@ -31,4 +31,5 @@ export default {
   'settings.copySettings.message': 'Copy succeeded, please paste to file src/settings.json.',
   'settings.close': 'Close',
   'settings.color.tooltip': '10 gradient colors generated according to the theme color',
+  'settings.navbar.createProject': 'Create project',
 };
diff --git a/frontend/src/locale/zh-CN/settings.ts b/frontend/src/locale/zh-CN/settings.ts
index c198a9e80c..de5ab63a91 100644
--- a/frontend/src/locale/zh-CN/settings.ts
+++ b/frontend/src/locale/zh-CN/settings.ts
@@ -31,4 +31,5 @@ export default {
   'settings.copySettings.message': '复制成功，请粘贴到 src/settings.json 文件中',
   'settings.close': '关闭',
   'settings.color.tooltip': '根据主题颜色生成的 10 个梯度色（将配置复制到项目中，主题色才能对亮色 / 暗黑模式同时生效）',
+  'settings.navbar.createProject': '新建项目',
 };