feat(系统设置): 调整表格高度去除滚动条

frontend/src/assets/style/arco-reset.less

@@ -632,6 +632,12 @@
       background-color: rgb(var(--primary-1)) !important;
     }
   }
+  &-simple {
+    &-jumper {
+      display: flex;
+      align-items: center;
+    }
+  }
 }
 
 /** 折叠面板样式 **/
@@ -702,3 +708,11 @@
     white-space: nowrap;
   }
 }
+
+/** 隐藏drawer-mask **/
+.ms-drawer-no-mask {
+  left: auto;
+  .arco-drawer {
+    box-shadow: -1px 0 4px 0 rgb(2 2 2 / 10%);
+  }
+}

frontend/src/components/pure/ms-pagination/pagination.tsx

@@ -326,7 +326,7 @@ export default defineComponent({
     const renderPager = () => {
       if (props.simple) {
         return (
-          <span class={`${prefixCls}-simple`}>
+          <span class={`${prefixCls}-simple-jumper`}>
             {getPageItemElement('previous', { simple: true })}
             <PageJumper
               disabled={props.disabled}

frontend/src/components/pure/ms-table/base-table.vue

@@ -133,7 +133,7 @@
       </template>
     </a-table>
     <div
-      class="flex h-[64px] w-[100%] flex-row flex-nowrap items-center justify-end px-0 py-4"
+      class="mt-[16px] flex h-[32px] w-[100%] flex-row flex-nowrap items-center justify-end px-0"
       :class="{ 'batch-action': showBatchAction }"
     >
       <batch-action

frontend/src/components/pure/ms-table/useTable.ts

@@ -36,7 +36,7 @@ export default function useTableProps<T>(
     tableKey: '',
     bordered: true,
     showPagination: true,
-    size: 'small',
+    size: 'default',
     scroll: { maxHeight: '800px', minWidth: '1600px', y: '600px' },
     checkable: true,
     loading: false,
@@ -51,9 +51,8 @@ export default function useTableProps<T>(
     columnResizable: true,
     // 禁用 arco-table 的分页
     pagination: false,
+    // 简易分页模式
     pageSimple: false,
-    // 编辑的key
-    editKey: SpecialColumnEnum.NAME,
     // 表格的错误状态
     tableErrorStatus: false,
     debug: false,

frontend/src/enums/tableEnum.ts

@@ -17,6 +17,7 @@ export enum TableKeyEnum {
   PROJECT_MEMBER = 'projectMember',
   ORGANIZATION_MEMBER = 'organizationMember',
   ORGANIZATION_PROJECT = 'organizationProject',
+  ORGANIZATION_PROJECT_USER_DRAWER = 'organizationProjectUserDrawer',
   FILE_MANAGEMENT_FILE = 'fileManagementFile',
 }
 

frontend/src/router/routes/modules/projectManagement.ts

@@ -71,7 +71,7 @@ const ProjectManagement: AppRouteRecordRaw = {
         {
           path: 'projectUserGroup',
           name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_PERMISSION_USER_GROUP,
-          component: () => import('@/views/project-management/projectAndPermission/userGroup/index.vue'),
+          component: () => import('@/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue'),
           meta: {
             locale: 'project.permission.userGroup',
             roles: ['*'],

frontend/src/views/setting/organization/project/components/userDrawer.vue

@@ -1,11 +1,12 @@
 <template>
-  <MsDrawer
-    :mask="false"
+  <a-drawer
     :width="680"
     :visible="currentVisible"
     unmount-on-close
     :footer="false"
     :title="t('system.organization.addMember')"
+    :mask="false"
+    class="ms-drawer-no-mask"
     @cancel="handleCancel"
   >
     <div>
@@ -38,7 +39,7 @@
         </template>
       </ms-base-table>
     </div>
-  </MsDrawer>
+  </a-drawer>
   <AddUserModal
     :project-id="props.projectId"
     :organization-id="props.organizationId"
@@ -53,7 +54,6 @@
   import useTable from '@/components/pure/ms-table/useTable';
   import { useI18n } from '@/hooks/useI18n';
   import { watch, ref } from 'vue';
-  import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import AddUserModal from './addUserModal.vue';
   import { TableData, Message } from '@arco-design/web-vue';
@@ -99,11 +99,10 @@
 
   const { propsRes, propsEvent, loadList, setLoadListParams, setKeyword } = useTable(postProjectMemberByProjectId, {
     columns: projectColumn,
-    showSetting: false,
-    scroll: { y: 'auto', x: '600px' },
+    scroll: { maxHeight: '700px', y: '650px' },
     selectable: false,
-    size: 'small',
     noDisable: false,
+    pageSimple: true,
   });
 
   async function searchUser() {
@@ -157,3 +156,10 @@
     }
   );
 </script>
+
+<style lang="less" scoped>
+  :deep(.custom-height) {
+    height: 100vh !important;
+    border: 1px solid red;
+  }
+</style>

frontend/src/views/setting/system/organizationAndProject/components/projectDrawer.vue

@@ -1,9 +1,10 @@
 <template>
-  <MsDrawer
+  <a-drawer
     :mask="false"
     :width="680"
     :visible="currentVisible"
     unmount-on-close
+    class="ms-drawer-no-mask"
     :footer="false"
     :title="t('system.organization.projectName', { name: props.currentName })"
     @cancel="handleCancel"
@@ -21,7 +22,7 @@
       </div>
       <ms-base-table v-bind="propsRes" v-on="propsEvent" />
     </div>
-  </MsDrawer>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
@@ -30,7 +31,6 @@
   import useTable from '@/components/pure/ms-table/useTable';
   import { useI18n } from '@/hooks/useI18n';
   import { watch, ref } from 'vue';
-  import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
 
   export interface projectDrawerProps {
@@ -72,10 +72,10 @@
 
   const { propsRes, propsEvent, loadList, setLoadListParams, setKeyword } = useTable(postProjectTableByOrgId, {
     columns: projectColumn,
-    showSetting: false,
-    scroll: { y: 'auto', x: '600px' },
+    scroll: { maxHeight: '700px', y: '650px' },
     selectable: false,
     noDisable: false,
+    pageSimple: true,
   });
 
   async function searchUser() {

frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue

@@ -1,10 +1,11 @@
 <template>
-  <MsDrawer
+  <a-drawer
     :mask="false"
     :width="680"
     :visible="currentVisible"
     unmount-on-close
     :footer="false"
+    class="ms-drawer-no-mask"
     :title="t('system.organization.addMember')"
     @cancel="handleCancel"
   >
@@ -38,7 +39,7 @@
         </template>
       </ms-base-table>
     </div>
-  </MsDrawer>
+  </a-drawer>
   <AddUserModal
     :project-id="props.projectId"
     :organization-id="props.organizationId"
@@ -57,7 +58,6 @@
   import useTable from '@/components/pure/ms-table/useTable';
   import { useI18n } from '@/hooks/useI18n';
   import { watch, ref } from 'vue';
-  import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import AddUserModal from './addUserModal.vue';
   import { TableData, Message } from '@arco-design/web-vue';
@@ -106,11 +106,10 @@
     postUserTableByOrgIdOrProjectId,
     {
       columns: projectColumn,
-      showSetting: false,
-      scroll: { y: 'auto', x: '600px' },
+      scroll: { maxHeight: '700px', y: '650px' },
       selectable: false,
-      size: 'small',
       noDisable: false,
+      pageSimple: true,
     },
     (record: any) => ({
       ...record,