Merge branch 'TencentBlueKing:main' into tenant-yzygyin

src/pages/bk.config.js

@@ -9,20 +9,20 @@ module.exports = {
   open: true,
   replaceStatic: true,
   outputAssetsDirName: '',
+  https: true,
 
   // webpack config 配置
   configureWebpack() {
     return {
       devServer: {
         setupMiddlewares: mockServer,
-        https: true,
-        proxy: {
+        proxy: [{
           '/api': {
             target: process.env.BK_AJAX_BASE_URL,
             changeOrigin: true,
             secure: false,
           },
-        },
+        }],
         client: {
           overlay: false,
         },

src/pages/package.json

@@ -53,10 +53,10 @@
     "vue-router": "^4.1.6"
   },
   "devDependencies": {
-    "@blueking/babel-preset-bk": "^2.1.0-beta7",
-    "@blueking/cli-service-webpack": "0.0.0-beta.109",
-    "@blueking/eslint-config-bk": "2.1.0-beta.12",
-    "@blueking/stylelint-config-bk": "^2.1.0-beta.9",
+    "@blueking/babel-preset-bk": "^2.1.0-beta.11",
+    "@blueking/cli-service-webpack": "^0.0.1",
+    "@blueking/eslint-config-bk": "^2.1.0-beta.22",
+    "@blueking/stylelint-config-bk": "^2.1.0-beta.10",
     "@types/node": "^20.5.1",
     "enhanced-resolve": "^5.10.0",
     "eslint-plugin-import": "^2.28.1",

src/pages/src/components/layouts/MainBreadcrumbs.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main-breadcrumbs">
+  <div :class="['main-breadcrumbs', { 'hidden-box-shadow': hiddenBoxShadow }]">
     <slot>
       <i
         v-if="showBack"
@@ -31,6 +31,9 @@ const current = computed(() => store.breadCrumbsTitle || route.meta.navName);
  * back control
  */
 const showBack = computed(() => route.meta.showBack);
+
+const hiddenBoxShadow = computed(() => route.meta.hiddenBoxShadow);
+
 const handleBack = () => {
   const { back } = window.history.state;
   if (back) {
@@ -75,4 +78,8 @@ const handleBack = () => {
       margin-right: 4px;
     }
   }
+
+  .hidden-box-shadow {
+    box-shadow: none !important;
+  }
 </style>

src/pages/src/components/layouts/MainView.vue

@@ -14,7 +14,9 @@
           class="main-container__view user-scroll-y user-scroll-x"
           :class="[{
             'pd-24': mainViewStore.hasPadding,
-            'has-breadcrumbs': !mainViewStore.customBreadcrumbs
+            'has-breadcrumbs': !mainViewStore.customBreadcrumbs,
+            'has-alert': userStore.showAlert,
+            'overflow-hidden': hiddenBoxShadow,
           }]">
           <RouterView />
         </div>
@@ -23,18 +25,22 @@
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts"> import { computed } from 'vue';
 import MainBreadcrumbs from './MainBreadcrumbs.vue';
 
-import { useMainViewStore, useMenu } from '@/store';
+import { useRoute } from 'vue-router';
+import { useMainViewStore, useMenu, useUser } from '@/store';
 const menuStore = useMenu();
 const mainViewStore = useMainViewStore();
+const userStore = useUser();
+const route = useRoute();
+
+const hiddenBoxShadow = computed(() => route.meta.hiddenBoxShadow);
 </script>
 
 <style lang="less">
 .main-container {
   display: flex;
-  height: calc(100vh - 52px);
 }
 
 .main-container-content {
@@ -50,10 +56,20 @@ const mainViewStore = useMainViewStore();
   background-color: #f5f7fa;
 
   &.has-breadcrumbs {
-    height: calc(100% - 52px);
+    height: calc(100vh - 104px);
   }
 }
 
+.has-alert {
+  &.has-breadcrumbs {
+    height: calc(100vh - 144px);
+  }
+}
+
+.overflow-hidden {
+  overflow: hidden;
+}
+
 .main-menu {
   position: relative;
   z-index: 101;

src/pages/src/hooks/useOrganizationAside.ts

@@ -1,5 +1,5 @@
 
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 
 import { getDepartmentsList } from '@/http/organizationFiles';
 import useAppStore from '@/store/app';
@@ -43,25 +43,26 @@ export default function useOrganizationAside(currentTenant: any) {
     };
   };
 
+
+  const findNode = (item: IOrg, id: number) => {
+    if (item.id === id) {
+      return item;
+    }
+    if (item.children) {
+      for (const child of item.children) {
+        const result = findNode(child, id);
+        if (result) {
+          return result;
+        }
+      }
+    }
+    return null;
+  };
+
   /**
    * 添加子组织
    */
   const addNode = (id, node) => {
-    const findNode = (item: IOrg, id: number) => {
-      if (item.id === id) {
-        return item;
-      }
-      if (item.children) {
-        for (const child of item.children) {
-          const result = findNode(child, id);
-          if (result) {
-            return result;
-          }
-        }
-      }
-      return null;
-    };
-
     for (const item of treeData.value) {
       const current = findNode(item, id);
       if (current) {
@@ -75,25 +76,28 @@ export default function useOrganizationAside(currentTenant: any) {
   };
 
   /**
-   * 重命名
-   * @param node
+   * 删除组织
    */
-  const updateNode = (node: IOrg) => {
-    const findNode = (item: IOrg, id: number) => {
-      if (item.id === id) {
-        return item;
+  const deleteDept = (id, list) => {
+    for (let i = 0; i < list.length; i++) {
+      if (list[i].id === id) {
+        list.splice(i, 1);
+        break;
       }
-      if (item.children) {
-        for (const child of item.children) {
-          const result = findNode(child, id);
-          if (result) {
-            return result;
-          }
-        }
+      if (list[i].children) {
+        deleteDept(id, list[i].children);
       }
-      return null;
-    };
+    }
+  };
+  const deleteNode = (id) => {
+    deleteDept(id, treeData.value);
+  };
 
+  /**
+   * 重命名
+   * @param node
+   */
+  const updateNode = (node: IOrg) => {
     for (const item of treeData.value) {
       const current = findNode(item, node.id);
       if (current) {
@@ -108,6 +112,7 @@ export default function useOrganizationAside(currentTenant: any) {
     getRemoteData,
     getPrefixIcon,
     addNode,
+    deleteNode,
     updateNode,
   };
 };

src/pages/src/http/organizationFiles.ts

@@ -30,10 +30,6 @@ export const putTenantOrganizationDetails = (id: string, params: UpdateTenantPar
  */
 export const getTenantDepartments = (id: string) => http.get(`/api/v1/web/tenant-organization/departments/${id}/children/`);
 
-/**
- * 租户下部门单个用户详情
- */
-export const getTenantOrganizationUsers = (id: string) => http.get(`/api/v1/web/tenant-organization/users/${id}/`);
 
 /**
  * 租户下部门下用户列表
@@ -62,16 +58,36 @@ export const getCurrentTenant = () => http.get(`${prefix}/current-tenant/`);
 export const getDepartmentsList = (deptId: number, id: string) => http.get(`${prefix}/tenants/${id}/departments/`, { parent_department_id: deptId });
 
 /**
- * 创建租户部门
+ * 创建租户组织
  */
 export const addDepartment = (id: string, params: any) => http.post(`${prefix}/tenants/${id}/departments/`, params);
 
 /**
- * 更新租户部门
+ * 删除租户组织
+ */
+export const deleteDepartment = (id: string) => http.delete(`${prefix}/tenants/departments/${id}/`);
+
+/**
+ * 更新租户组织
  */
 export const updateDepartment = (id: string, params: any) => http.put(`${prefix}/tenants/departments/${id}/`, params);
 
 /**
  * 获取当前租户的协作租户信息
  */
 export const getCollaboration = () => http.get(`${prefix}/collaborative-tenants/`);
+
+/**
+ * 搜索组织
+ */
+export const searchOrganization = (params: any) => http.get(`${prefix}/tenants/departments/`, params);
+
+/**
+ * 搜索用户
+ */
+export const searchUser = (params: any) => http.get(`${prefix}/tenants/users/`, params);
+
+/**
+ * 租户下部门单个用户详情
+ */
+export const getOrganizationUsers = (id: string) => http.get(`${prefix}/tenants/users/${id}/`);

src/pages/src/language/en.json

@@ -454,5 +454,11 @@
   "重命名": "Rename",
   "协同租户": "Collaboration Tenant",
   "协同配置": "Collaboration Configuration",
+  "用户": "User",
+  "暂无搜索结果": "No search results",
+  "已停用": "Disabled",
+  "删除组织": "Delete organization",
+  "确认删除该组织？": "Delete this organization?",
+  "删除该组织同时会删除其下用户与子组织，请谨慎操作": "Deleting this organization will also delete its users and sub-organizations. Please proceed with caution",
   "新增": "Add"
 }

src/pages/src/language/zh.json

@@ -454,5 +454,11 @@
   "重命名": "重命名",
   "协同租户": "协同租户",
   "协同配置": "协同配置",
+  "用户": "用户",
+  "暂无搜索结果": "暂无搜索结果",
+  "已停用": "已停用",
+  "删除组织": "删除组织",
+  "确认删除该组织？": "确认删除该组织？",
+  "删除该组织同时会删除其下用户与子组织，请谨慎操作": "删除该组织同时会删除其下用户与子组织，请谨慎操作",
   "新增": "新增"
 }

src/pages/src/router/index.ts

@@ -68,6 +68,7 @@ export default createRouter({
             routeParentName: 'setting',
             navName: t('跨租户协同'),
             isMenu: true,
+            hiddenBoxShadow: true,
           },
           component: () => import('@/views/setting/cross-tenant-collaboration/index.vue'),
         },

src/pages/src/router/router.d.ts

@@ -8,6 +8,7 @@ declare module 'vue-router' {
     navName?: string, // 设置面包屑 name
     isMenu?: boolean, // 判断是否为 bk-menu 导航，若是则不显示返回按钮
     showBack?: boolean, // 用于判断是否显示面包屑返回按钮
+    hiddenBoxShadow?: boolean, // 是否隐藏 box-shadow
   }
 }
 

src/pages/src/store/app.ts

@@ -1,11 +1,17 @@
 import { defineStore } from 'pinia';
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 
 
 export default defineStore('app', () => {
   const currentOrg = ref({});
 
+  const isSearchTree = ref(false);
+
+  const reloadIndex = ref(1);
+
   return {
     currentOrg,
+    isSearchTree,
+    reloadIndex,
   };
 });

src/pages/src/store/user.ts

@@ -7,10 +7,14 @@ export const useUser = defineStore('user', {
       username: '',
       avatar_url: '',
     },
+    showAlert: false, // 消息通知显示状态
   }),
   actions: {
     setUser(user: IUser) {
       this.user = user;
     },
+    setShowAlert(status: boolean) {
+      this.showAlert = status;
+    },
   },
 });