From 91af1a7f1b6f10a6247d87977c5e8a91662444e5 Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Thu, 15 Aug 2024 10:52:03 +0800
Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8D=8F?=
 =?UTF-8?q?=E4=BD=9C=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   9 +-
 src/@types/collaboration.ts                   |  14 +
 src/api/api-collaboration.ts                  |  67 ++++
 src/assets/style/theme/table.scss             |   4 +
 src/components/ExternalLink.vue               |   2 +-
 src/components/OTableItemNew.vue              |   4 -
 src/components/Result404.vue                  |  34 ++
 src/components/ResultNoApp.vue                |  16 +-
 src/components/ResultNotFound.vue             |  48 +--
 src/components/collaboration/CBreadcrumb.vue  |  30 ++
 src/components/collaboration/Indicators.vue   | 192 +++++++++++
 .../collaboration/StatusFeedback.vue          | 184 ++++++++++
 src/components/header/AppHeader.vue           |  32 +-
 src/components/header/HeaderNav.vue           |  58 +---
 src/data/nav.ts                               |  14 +-
 src/data/todo/index.ts                        |  44 +++
 src/router/index.ts                           |  49 ++-
 src/shared/axios/index.ts                     |  10 +-
 src/shared/login.ts                           |   2 +-
 src/stores/user.ts                            |   4 +
 src/views/collaboration/TheCollaboration.vue  | 324 ++++++++++++++++++
 src/views/package/RpmContent.vue              |   2 +-
 src/views/todo/ApprovalTable.vue              | 247 +++++++++++++
 src/views/todo/TheTodo.vue                    | 210 ++++++++++++
 src/views/todo/TheTodoDetail.vue              | 138 ++++++++
 25 files changed, 1623 insertions(+), 115 deletions(-)
 create mode 100644 src/@types/collaboration.ts
 create mode 100644 src/api/api-collaboration.ts
 create mode 100644 src/components/Result404.vue
 create mode 100644 src/components/collaboration/CBreadcrumb.vue
 create mode 100644 src/components/collaboration/Indicators.vue
 create mode 100644 src/components/collaboration/StatusFeedback.vue
 create mode 100644 src/data/todo/index.ts
 create mode 100644 src/views/collaboration/TheCollaboration.vue
 create mode 100644 src/views/todo/ApprovalTable.vue
 create mode 100644 src/views/todo/TheTodo.vue
 create mode 100644 src/views/todo/TheTodoDetail.vue

diff --git a/components.d.ts b/components.d.ts
index 297264d..6559f73 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,6 +17,7 @@ declare module 'vue' {
     AppPagination: typeof import('./src/components/AppPagination.vue')['default']
     AppSection: typeof import('./src/components/AppSection.vue')['default']
     AppTableToggle: typeof import('./src/components/AppTableToggle.vue')['default']
+    CBreadcrumb: typeof import('./src/components/collaboration/CBreadcrumb.vue')['default']
     ContentWrapper: typeof import('./src/components/ContentWrapper.vue')['default']
     DetailAside: typeof import('./src/components/detail/DetailAside.vue')['default']
     DetailBasicInfo: typeof import('./src/components/detail/DetailBasicInfo.vue')['default']
@@ -34,14 +35,18 @@ declare module 'vue' {
     FilterItemSkeleton: typeof import('./src/components/skeleton/FilterItemSkeleton.vue')['default']
     FilterOrder: typeof import('./src/components/filter/FilterOrder.vue')['default']
     FilterRadio: typeof import('./src/components/filter/FilterRadio.vue')['default']
+    HeaderMain: typeof import('./src/components/header/HeaderMain.vue')['default']
     HeaderNav: typeof import('./src/components/header/HeaderNav.vue')['default']
     HeaderTheme: typeof import('./src/components/header/HeaderTheme.vue')['default']
     HomeSkeleton: typeof import('./src/components/skeleton/HomeSkeleton.vue')['default']
+    Indicators: typeof import('./src/components/collaboration/Indicators.vue')['default']
+    NavTab: typeof import('./src/components/NavTab.vue')['default']
     OCardItem: typeof import('./src/components/OCardItem.vue')['default']
     OCardItemSkeleton: typeof import('./src/components/skeleton/OCardItemSkeleton.vue')['default']
     OCodeCopy: typeof import('./src/components/OCodeCopy.vue')['default']
     OCodeDown: typeof import('./src/components/OCodeDown.vue')['default']
     OTableItemNew: typeof import('./src/components/OTableItemNew.vue')['default']
+    Result404: typeof import('./src/components/Result404.vue')['default']
     ResultNoApp: typeof import('./src/components/ResultNoApp.vue')['default']
     ResultNotFound: typeof import('./src/components/ResultNotFound.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
@@ -49,8 +54,6 @@ declare module 'vue' {
     SearchFilter: typeof import('./src/components/search/SearchFilter.vue')['default']
     SearchRecommend: typeof import('./src/components/search/SearchRecommend.vue')['default']
     SearchTab: typeof import('./src/components/search/SearchTab.vue')['default']
-  }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+    StatusFeedback: typeof import('./src/components/collaboration/StatusFeedback.vue')['default']
   }
 }
diff --git a/src/@types/collaboration.ts b/src/@types/collaboration.ts
new file mode 100644
index 0000000..b0ece62
--- /dev/null
+++ b/src/@types/collaboration.ts
@@ -0,0 +1,14 @@
+export interface CollaborationT {
+  name: string;
+  pageSize?: number;
+  pageNum?: number;
+}
+
+export interface AdminAppryT extends CollaborationT {
+  applyId?: number;
+  applyStatus?: string;
+  repo?: string;
+  metric?: string;
+  timeOrder?: string;
+}
+
diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
new file mode 100644
index 0000000..92ed797
--- /dev/null
+++ b/src/api/api-collaboration.ts
@@ -0,0 +1,67 @@
+import { request } from '@/shared/axios';
+import type { AxiosResponse } from '@/shared/axios';
+import type { AdminAppryT } from '@/@types/collaboration'
+
+// maintainer权限
+export function getMaintainerPermission() {
+  const url = `/server/collaboration/maintainer/permission`;
+  return request.get(url).then((res: AxiosResponse) => res?.data);
+}
+
+// admin权限
+export function getAdminPermission() {
+  const url = `/server/collaboration/admin/permission`;
+  return request.get(url).then((res: AxiosResponse) => res?.data);
+}
+
+// 软件维护详情 maintainer
+export function getMaintainerRepos() {
+  const url = `/server/collaboration/maintainer/user/repos`;
+  return request.get(url).then((res: AxiosResponse) => res?.data);
+}
+
+// 软件维护详情 admin
+export function getAdminRepos() {
+  const url = `/server/collaboration/admin/user/repos`;
+  return request.get(url).then((res: AxiosResponse) => res?.data);
+}
+
+
+// 待我审批
+export function getAdminApply(params: AdminAppryT) {
+  const url = `/server/collaboration/admin/query/apply`;
+  return request.get(url, { params }).then((res: AxiosResponse) => res?.data);
+}
+// 审批
+export function getAdminRecords(id: number) {
+  const url = `/server/collaboration/admin/query/records?applyId=${id}`;
+  return request.get(url).then((res: AxiosResponse) => res?.data);
+}
+
+
+
+// 我的申请
+export function getMaintainerApply(params: AdminAppryT) {
+  const url = `/server/collaboration/maintainer/query/apply`;
+  return request.get(url, { params }).then((res: AxiosResponse) => res?.data);
+}
+
+// 申请撤销
+export function getMaintainerRevoke(id: number) {
+  const url = `/server/collaboration/maintainer/revoke`;
+  return request.post(url, { applyId: id }).then((res: AxiosResponse) => res?.data);
+}
+
+
+interface FeedbackT {
+  repo: string;
+  metric: string;
+  metricStatus: string;
+  description: string;
+  applyStatus: string;
+}
+
+export function getApplyFeedback(params: FeedbackT) {
+  const url = `/server/collaboration/maintainer/apply`;
+  return request.post(url, { params }).then((res: AxiosResponse) => res?.data);
+}
\ No newline at end of file
diff --git a/src/assets/style/theme/table.scss b/src/assets/style/theme/table.scss
index 88a4cea..f624db0 100644
--- a/src/assets/style/theme/table.scss
+++ b/src/assets/style/theme/table.scss
@@ -1,4 +1,8 @@
 .o-table {
+  --table-edge-padding: 32px;
+  --table-cell-padding: 16px 20px;
+  --table-head-cell-padding: 12px 20px;
+  --table-cell-height: 80px;
   --table-head-bg: var(--o-color-control3-light);
   --table-color: var(--o-color-info1);
   th {
diff --git a/src/components/ExternalLink.vue b/src/components/ExternalLink.vue
index 423a70b..d0f7cd2 100644
--- a/src/components/ExternalLink.vue
+++ b/src/components/ExternalLink.vue
@@ -29,7 +29,7 @@ const onChange = () => {
 </script>
 
 <template>
-  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" size="medium" @change="onChange" class="external-dialog">
+  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" size="large" @change="onChange">
     <template #header>
       <p class="external-title">{{ t('software.external.title') }}</p>
     </template>
diff --git a/src/components/OTableItemNew.vue b/src/components/OTableItemNew.vue
index bb143a5..bb3af05 100644
--- a/src/components/OTableItemNew.vue
+++ b/src/components/OTableItemNew.vue
@@ -209,10 +209,6 @@ const collectDownloadData = (pkgId: string, name: string, version: string) => {
 }
 
 :deep(.o-table) {
-  --table-edge-padding: 32px;
-  --table-cell-padding: 16px 20px;
-  --table-head-cell-padding: 12px 20px;
-  --table-cell-height: 80px;
   .label {
     display: flex;
     align-items: center;
diff --git a/src/components/Result404.vue b/src/components/Result404.vue
new file mode 100644
index 0000000..098ef15
--- /dev/null
+++ b/src/components/Result404.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import ContentWrapper from '@/components/ContentWrapper.vue';
+import { OResult } from '@opensig/opendesign';
+
+import { useTheme } from '@/composables/useTheme';
+import notFoundImage from '@/assets/404.png';
+import notFoundImageDark from '@/assets/404-dark.png';
+
+const { isDark } = useTheme();
+</script>
+
+<template>
+  <ContentWrapper class="result-404">
+    <OResult>
+      <template #image>
+        <slot name="image">
+          <img class="not-found-image" alt="notFound" :src="isDark ? notFoundImageDark : notFoundImage" />
+        </slot>
+      </template>
+      <slot name="extra" />
+      <slot name="description" />
+    </OResult>
+  </ContentWrapper>
+</template>
+
+<style lang="scss" scoped>
+.result-404 {
+  width: 100%;
+  height: var(--layout-content-min-height);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/src/components/ResultNoApp.vue b/src/components/ResultNoApp.vue
index 4ed61bb..8015a8d 100644
--- a/src/components/ResultNoApp.vue
+++ b/src/components/ResultNoApp.vue
@@ -1,14 +1,11 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
-import { OLink, OResult, OFigure } from '@opensig/opendesign';
+import { OLink } from '@opensig/opendesign';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { GITEE } from '@/data/config';
-import { useTheme } from '@/composables/useTheme';
 import ExternalLink from '@/components/ExternalLink.vue';
-
-import result404 from '@/assets/404.png';
-import result404Dark from '@/assets/404-dark.png';
+import Result404 from '@/components/Result404.vue';
 
 const props = defineProps({
   type: {
@@ -17,8 +14,6 @@ const props = defineProps({
   },
 });
 
-const { isDark } = useTheme();
-
 const route = useRoute();
 const { t } = useI18n();
 
@@ -49,16 +44,13 @@ const clickFeedback = () => {
 </script>
 
 <template>
-  <OResult class="result-tips">
-    <template #image>
-      <OFigure :src="isDark ? result404Dark : result404" fit="contain" />
-    </template>
+  <Result404 class="result-tips">
     <template #description>
       <p class="text">
         {{ t('software.nofoundApp') }} <OLink hover-underline color="primary" @click="clickFeedback">{{ t('software.feedbackPkg.btn') }}</OLink>
       </p>
     </template>
-  </OResult>
+  </Result404>
 
   <ExternalLink v-if="showExternalDlg" :href="externalLink" @change="showExternalDlg = false" />
 </template>
diff --git a/src/components/ResultNotFound.vue b/src/components/ResultNotFound.vue
index e655955..ef541e6 100644
--- a/src/components/ResultNotFound.vue
+++ b/src/components/ResultNotFound.vue
@@ -1,45 +1,27 @@
 <script setup lang="ts">
-import ContentWrapper from '@/components/ContentWrapper.vue';
-import { OButton, OResult } from '@opensig/opendesign';
-
-import { useTheme } from '@/composables/useTheme';
-import notFoundImage from '@/assets/404.png';
-import notFoundImageDark from '@/assets/404-dark.png';
+import { OButton } from '@opensig/opendesign';
 
 import { useLocale } from '@/composables/useLocale';
+import Result404 from '@/components/Result404.vue';
+
 const { locale } = useLocale();
-const { isDark } = useTheme();
 </script>
 
 <template>
-  <ContentWrapper class="result-404">
-    <OResult>
-      <template #image>
-        <slot name="image">
-          <img class="not-found-image" alt="notFound" :src="isDark ? notFoundImageDark : notFoundImage" />
-        </slot>
-      </template>
-      <template #extra>
-        <p class="text404">暂无数据</p>
-        <RouterLink :to="`/${locale}/`">
-          <OButton variant="solid" color="primary">返回首页</OButton>
-        </RouterLink>
-      </template>
-    </OResult>
-  </ContentWrapper>
+  <Result404>
+    <template #extra>
+      <p class="text404">暂无数据</p>
+      <RouterLink :to="`/${locale}/`">
+        <OButton variant="solid" color="primary">返回首页</OButton>
+      </RouterLink>
+    </template>
+  </Result404>
 </template>
 
 <style lang="scss" scoped>
-.result-404 {
-  width: 100%;
-  height: var(--layout-content-min-height);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  .text404 {
-    @include text2;
-    color: var(--o-color-info1);
-    margin-bottom: 24px;
-  }
+.text404 {
+  @include text2;
+  color: var(--o-color-info1);
+  margin-bottom: 24px;
 }
 </style>
diff --git a/src/components/collaboration/CBreadcrumb.vue b/src/components/collaboration/CBreadcrumb.vue
new file mode 100644
index 0000000..53d3067
--- /dev/null
+++ b/src/components/collaboration/CBreadcrumb.vue
@@ -0,0 +1,30 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { OBreadcrumb, OBreadcrumbItem } from '@opensig/opendesign';
+import { useLocale } from '@/composables/useLocale';
+import { useI18n } from 'vue-i18n';
+
+defineProps({
+  type: {
+    type: String,
+    default: () => '',
+  },
+  repo: {
+    type: String,
+    default: () => '',
+  },
+});
+
+const { locale } = useLocale();
+const { t } = useI18n();
+</script>
+
+<template>
+  <OBreadcrumb class="app-breadcrumb">
+    <OBreadcrumbItem :to="`/${locale}/collaboration`">待办中心</OBreadcrumbItem>
+    <OBreadcrumbItem :to="`/${locale}/todo/${type}`">{{ type }}</OBreadcrumbItem>
+    <OBreadcrumbItem>{{ repo }} </OBreadcrumbItem>
+  </OBreadcrumb>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/src/components/collaboration/Indicators.vue b/src/components/collaboration/Indicators.vue
new file mode 100644
index 0000000..e2db9b0
--- /dev/null
+++ b/src/components/collaboration/Indicators.vue
@@ -0,0 +1,192 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { OTable, OTag, ODialog } from '@opensig/opendesign';
+
+const columns = [
+  { label: 'CVE分类', key: 'cve', type: 'cve' },
+  { label: 'CVE详细分类', key: 'cveType', type: 'cve_type' },
+  { label: '贡献分类', key: 'contribution', type: 'contribution' },
+  { label: '详细描述', key: 'details', type: 'details' },
+  { label: '维护状态', key: 'maintenance', type: 'maintenance' },
+  { label: '描述', key: 'description', type: 'description' },
+];
+
+const data = [
+  {
+    cve: '有CVE',
+    cveType: 'CVE全部未修复',
+    contribution: '没有ISSUE修复',
+    details: '-',
+    maintenance: 5,
+    description: 'CVE全部未修复，且没有ISSUE修复',
+  },
+  {
+    cve: '有CVE',
+    cveType: 'CVE全部未修复',
+    contribution: '有部分ISSUE修复',
+    details: '-',
+    maintenance: 4,
+    description: 'CVE全部未修复，且有部分ISSUE被修复',
+  },
+  {
+    cve: '有CVE',
+    cveType: 'CVE全部未修复',
+    contribution: '全部ISSUE修复',
+    details: '-',
+    maintenance: 4,
+    description: 'CVE全部未修复，全部ISSUE都被修复',
+  },
+  {
+    cve: '有CVE',
+    cveType: 'CVE部分修复',
+    contribution: '-',
+    details: '-',
+    maintenance: 4,
+    description: 'CVE部分修复',
+  },
+  {
+    cve: '有CVE',
+    cveType: 'CVE全部修复',
+    contribution: '-',
+    details: '-',
+    maintenance: 1,
+    description: 'CVE全部修复',
+  },
+  {
+    cve: '没有CVE',
+    cveType: '没有CVE问题',
+    contribution: '没有PR提交',
+    details: '最新版本',
+    maintenance: 1,
+    description: '没有CVE问题，且也没有PR提交，且软件包是最新版本',
+  },
+  {
+    cve: '没有CVE',
+    cveType: '没有CVE问题',
+    contribution: '没有PR提交',
+    details: '落后版本',
+    maintenance: 3,
+    description: '没有CVE问题，且也没有PR提交，且软件包是落后版本',
+  },
+  {
+    cve: '没有CVE',
+    cveType: '没有CVE问题',
+    contribution: '有PR合入',
+    details: '-',
+    maintenance: 2,
+    description: '没有CVE问题，有PR合入',
+  },
+  {
+    cve: '没有CVE',
+    cveType: '没有CVE问题',
+    contribution: '有PR提交未合入',
+    details: '-',
+    maintenance: 2,
+    description: '没有CVE问题，有PR提交但是没有PR被合入',
+  },
+];
+
+// 单元格合并
+const cellSpanFn = (rowIdx: number, colIdx: number) => {
+  if (rowIdx === 0 && colIdx === 0) {
+    return {
+      rowspan: 5,
+    };
+  }
+  if (rowIdx === 0 && colIdx === 1) {
+    return {
+      rowspan: 3,
+    };
+  }
+  if (rowIdx === 5 && colIdx === 0) {
+    return {
+      rowspan: 4,
+    };
+  }
+  if (rowIdx === 5 && colIdx === 1) {
+    return {
+      rowspan: 4,
+    };
+  }
+  if (rowIdx === 5 && colIdx === 2) {
+    return {
+      rowspan: 2,
+    };
+  }
+};
+
+const mainStatus = {
+  1: '健康',
+  2: '活跃',
+  3: '静止',
+  4: '缺人维护',
+  5: '没有人维护',
+};
+
+const showDlg = ref(true);
+
+const emits = defineEmits<{
+  (e: 'change'): void;
+}>();
+
+const onChange = () => {
+  emits('change');
+};
+</script>
+
+<template>
+  <ODialog
+    v-model:visible="showDlg"
+    :unmount-on-hide="true"
+    :mask="true"
+    size="large"
+    :style="{
+      '--dlg-width': '1170px',
+    }"
+    @change="onChange"
+  >
+    <template #header>
+      <p class="title">状态指标说明</p>
+    </template>
+    <div class="indicators">
+      <p class="title">软件包维护状态指标</p>
+      <OTable class="main-table" :columns="columns" :data="data" :cell-span="cellSpanFn" border="all">
+        <template #td_maintenance="{ row }">
+          <OTag :class="`type${row.maintenance}`" size="small">{{ mainStatus[row.maintenance] }} </OTag>
+        </template>
+      </OTable>
+      <p class="title">详细指标</p>
+    </div>
+  </ODialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.o-tag) {
+  --tag-color: var(--o-color-white);
+  --tag-bd-color: transparent;
+  min-width: 56px;
+
+  &.type1 {
+    --tag-bg-color: var(--o-color-success1);
+  }
+  &.type2 {
+    --tag-bg-color: #03b5a5;
+  }
+  &.type3 {
+    --tag-bg-color: #f5cd05;
+  }
+  &.type4 {
+    --tag-bg-color: var(--o-color-warning1);
+  }
+  &.type5 {
+    --tag-bg-color: var(--o-color-danger1);
+  }
+}
+.o-table {
+  margin: 16px 0;
+}
+.indicators {
+  color: var(--o-color-info1);
+  @include text1;
+}
+</style>
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
new file mode 100644
index 0000000..96f4d95
--- /dev/null
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -0,0 +1,184 @@
+<script lang="ts" setup>
+import { ref, reactive } from 'vue';
+import { ODialog, OButton, OForm, OTextarea, OFormItem, ORadioGroup, ORadio, OSelect, OOption, type FieldResultT, useMessage } from '@opensig/opendesign';
+
+import { getApplyFeedback } from '@/api/api-collaboration';
+
+const props = defineProps({
+  repo: {
+    type: String,
+    default: () => '',
+  },
+});
+
+const showDlg = ref(true);
+const message = useMessage();
+
+const formRef = ref<InstanceType<typeof OForm>>();
+const formData = reactive({
+  repo: props.repo,
+  metric: '',
+  metricStatus: '',
+  description: '',
+  applyStatus: 'PENDDING',
+});
+
+const statusRadios = [
+  {
+    id: 'cveStatus',
+    label: 'CVE状态',
+  },
+  {
+    id: 'issueStatus',
+    label: 'ISSUE状态',
+  },
+  {
+    id: 'prStatus',
+    label: '软件包更新状态',
+  },
+  {
+    id: 'versionStatus',
+    label: '软件包版本状态',
+  },
+  {
+    id: 'orgStatus',
+    label: '贡献组织状态',
+  },
+  {
+    id: 'contributorStatus',
+    label: '贡献人员状态',
+  },
+];
+
+const optionLists = [
+  {
+    id: 'latest',
+    label: '最新版本',
+  },
+  {
+    id: 'outdated',
+    label: '落后版本',
+  },
+];
+
+// 重置表单数据
+const reset = () => {
+  formRef.value?.resetFields();
+};
+
+const onChange = () => {
+  emits('close');
+};
+
+// 验证
+const metricRules = [
+  {
+    required: true,
+    message: '请选择您要修改的状态类别',
+    triggers: ['blur'],
+  },
+];
+
+const modifyRules = [
+  {
+    required: true,
+    message: '请选择修改状态',
+    triggers: ['blur'],
+  },
+];
+
+const descriptionRules = [
+  {
+    required: true,
+    triggers: ['blur'],
+    message: '请输入您的理由',
+    validator: (value: string) => {
+      if (value.length > 1000) {
+        return {
+          type: 'danger',
+          message: '最多不能超过1000字',
+        };
+      }
+    },
+  },
+];
+const emits = defineEmits<{
+  (e: 'close'): void;
+}>();
+
+const onSubmit = (results: FieldResultT[]) => {
+  if (results.find((item) => item?.type === 'danger')) {
+    return;
+  } else {
+    getApplyFeedback(formData)
+      .then((res) => {
+        if (res.code === 200) {
+          message.success({
+            content: '反馈成功',
+          });
+          showDlg.value = false;
+        }
+      })
+      .catch(() => {
+        message.danger({
+          content: '操作失败',
+        });
+        showDlg.value = false;
+      });
+    emits('close');
+  }
+};
+</script>
+
+<template>
+  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" @change="onChange" size="large">
+    <template #header>
+      <p class="title">状态反馈</p>
+    </template>
+    <div class="indicators">
+      <OForm ref="formRef" has-required :model="formData" label-width="220px" label-align="top" @submit="onSubmit">
+        <OFormItem label="请选择您要修改的状态类别" required field="metric" :rules="metricRules">
+          <ORadioGroup class="metric-options" v-model="formData.metric" direction="v">
+            <ORadio v-for="option in statusRadios" :key="option.id" :value="option.id">
+              {{ option.label }}
+            </ORadio>
+          </ORadioGroup>
+        </OFormItem>
+        <OFormItem label="修改状态" required field="metricStatus" :rules="modifyRules">
+          <OSelect v-model="formData.metricStatus" size="large" style="width: 100%">
+            <OOption v-for="item in optionLists" :key="item.id" :label="item.label" :value="item.id" />
+          </OSelect>
+        </OFormItem>
+        <OFormItem label="修改理由" required field="description" :rules="descriptionRules">
+          <OTextarea
+            v-model="formData.description"
+            :max-length="1000"
+            placeholder="请输入您的理由"
+            resize="none"
+            :rows="4"
+            :input-on-outlimit="false"
+            style="width: 100%"
+          >
+          </OTextarea>
+        </OFormItem>
+        <div class="button-box">
+          <OButton variant="solid" color="primary" size="large" type="submit">提交反馈</OButton>
+          <OButton variant="outline" color="primary" size="large" class="reset" @click="reset">取消</OButton>
+        </div>
+      </OForm>
+    </div>
+  </ODialog>
+</template>
+
+<style lang="scss" scoped>
+.metric-options {
+  --radio-group-gap: 12px;
+}
+.button-box {
+  display: flex;
+  justify-content: center;
+  .o-btn + .o-btn {
+    margin-left: 16px;
+  }
+}
+</style>
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index 879ba28..f56e467 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
-import { watch } from 'vue';
-import { ODivider } from '@opensig/opendesign';
-import { useRouter } from 'vue-router';
+import { computed, watch } from 'vue';
+import { ODivider, OLink } from '@opensig/opendesign';
+import { useRouter, useRoute } from 'vue-router';
 import { useLangStore } from '@/stores/common';
 import { OPENEULER } from '@/data/config';
 import { useI18n } from 'vue-i18n';
+import { navs, collaborationNav } from '@/data/nav';
+import { useLoginStore, useUserInfoStore } from '@/stores/user';
+
 import { useTheme } from '@/composables/useTheme';
 import HeaderNav from '@/components/header/HeaderNav.vue';
 import AppLogin from '@/components/header/AppLogin.vue';
@@ -15,8 +18,11 @@ import openeulerLogoDark from '@/assets/openeuler-logo-dark.svg';
 
 const { locale, t } = useI18n();
 const router = useRouter();
+const route = useRoute();
 const langStore = useLangStore();
 const { isDark } = useTheme();
+const loginStore = useLoginStore();
+const userInfoStore = useUserInfoStore();
 
 watch(
   () => {
@@ -32,6 +38,12 @@ const goHome = () => {
     path: `/${locale.value}`,
   });
 };
+
+// 判断是否是协作平台
+const collaborationRouteName = ['todo', 'collaboration', 'todo-detail'];
+const isCollaboration = computed(() => {
+  return collaborationRouteName.includes(route.name as string);
+});
 </script>
 
 <template>
@@ -43,12 +55,14 @@ const goHome = () => {
             <img :src="isDark ? openeulerLogoDark : openeulerLogo" />
           </a>
           <ODivider direction="v" :darker="true" />
-          <span @click="goHome" class="logo-text">{{ t('software.softwareHome') }}</span>
+          <span v-if="isCollaboration" class="logo-text">{{ t('software.softwareHome') }}协作平台</span>
+          <span v-else @click="goHome" class="logo-text">{{ t('software.softwareHome') }}</span>
         </div>
-
-        <HeaderNav />
+        <HeaderNav :options="isCollaboration ? collaborationNav : navs" />
       </div>
       <div class="header-right">
+        <OLink v-if="isCollaboration" class="collaboration" :href="`/${locale}/todo/application`">待办中心</OLink>
+        <OLink v-else class="collaboration" target="_blank" :href="`/${locale}/collaboration`">协作平台</OLink>
         <HeaderTheme />
         <AppLogin />
       </div>
@@ -87,6 +101,12 @@ const goHome = () => {
       height: 100%;
       display: flex;
       align-items: center;
+
+      .collaboration {
+        margin-right: 16px;
+        color: var(--o-color-info1);
+        @include tip1;
+      }
     }
   }
   .logo {
diff --git a/src/components/header/HeaderNav.vue b/src/components/header/HeaderNav.vue
index efdbfc5..4af9ed3 100644
--- a/src/components/header/HeaderNav.vue
+++ b/src/components/header/HeaderNav.vue
@@ -1,11 +1,27 @@
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, type PropType } from 'vue';
 import { navs } from '@/data/nav';
 import { useRoute, useRouter } from 'vue-router';
 import { computed } from 'vue';
 import { useLocale } from '@/composables/useLocale';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
 
+interface NavsT {
+  id: string;
+  label: {
+    zh: string;
+    en: string;
+  };
+  href: string;
+}
+
+const props = defineProps({
+  options: {
+    type: Array as PropType<NavsT[]>,
+    default: () => [],
+  },
+});
+
 const route = useRoute();
 const router = useRouter();
 const userInfoStore = useUserInfoStore();
@@ -26,43 +42,7 @@ const onMouseLeave = () => {
 
 // -------------------- 选中事件 --------------------
 const selectedIndex = computed(() => {
-  let idx = -1;
-
-  if (route.path === `/${locale.value}` || route.path === `/${locale.value}/`) {
-    idx = 0;
-    return idx;
-  }
-
-  if (route.path.includes('/field')) {
-    idx = 1;
-    return idx;
-  }
-
-  if (route.path.includes('/rpm')) {
-    idx = 2;
-    return idx;
-  }
-
-  if (route.path.includes('/image')) {
-    idx = 3;
-    return idx;
-  }
-
-  // if (route.path.includes('/epkg')) {
-  //   idx = 4;
-  //   return idx;
-  // }
-  if (route.path.includes('/oepkg')) {
-    idx = 4;
-    return idx;
-  }
-
-  if (route.path.includes('/upstream')) {
-    idx = 5;
-    return idx;
-  }
-
-  return idx;
+  return props.options.findIndex((item) => route.name?.toString().includes(item.id));
 });
 
 // 导航跳转
@@ -74,7 +54,7 @@ const jumpTo = (href: string) => {
 <template>
   <nav class="header-nav">
     <ul class="nav-list">
-      <template v-for="(item, idx) in navs" :key="item.id">
+      <template v-for="(item, idx) in options" :key="item.id">
         <li
           v-if="item.id !== 'upstream' || upstreamPermission"
           :id="'e2e_headerNav_' + item.id"
diff --git a/src/data/nav.ts b/src/data/nav.ts
index 1a72338..498b00f 100644
--- a/src/data/nav.ts
+++ b/src/data/nav.ts
@@ -24,7 +24,7 @@ export const navs = [
     href: '/rpm',
   },
   {
-    id: 'apppkg',
+    id: 'image',
     label: {
       zh: '应用镜像',
       en: 'Image',
@@ -56,3 +56,15 @@ export const navs = [
     href: '/upstream',
   },
 ];
+
+
+export const collaborationNav = [
+  {
+    id: 'collaboration',
+    label: {
+      zh: '软件维护详情',
+      en: 'Collaboration',
+    },
+    href: '/collaboration',
+  },
+]
\ No newline at end of file
diff --git a/src/data/todo/index.ts b/src/data/todo/index.ts
new file mode 100644
index 0000000..ac0e14a
--- /dev/null
+++ b/src/data/todo/index.ts
@@ -0,0 +1,44 @@
+export const applicationColumns = [
+  { label: '软件仓库', key: 'repo', type: 'repo' },
+  { label: '申请类型', key: 'metric', type: 'metric' },
+  { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
+  { label: '修改理由', key: 'description', type: 'description' },
+  { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
+  { label: '审批人', key: 'adminstrator', type: 'adminstrator' },
+  { label: '审批意见', key: 'maintainer', type: 'maintainer' },
+  { label: '申请单号', key: 'applyId', type: 'applyId' },
+  { label: '申请时间', key: 'updateAt', type: 'updateAt' },
+  { label: '操作', key: 'operation', type: 'operation' },
+]
+
+export const approvalColumns = [
+  { label: '软件仓库', key: 'repo', type: 'repo' },
+  { label: '申请类型', key: 'metric', type: 'metric' },
+  { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
+  { label: '修改理由', key: 'description', type: 'description' },
+  { label: '申请人', key: 'maintainer', type: 'maintainer' },
+  { label: '申请单号', key: 'applyId', type: 'applyId' },
+  { label: '申请时间', key: 'updateAt', type: 'updateAt' },
+  { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
+  { label: '操作', key: 'operation', type: 'operation' },
+]
+
+export const approvalHistoryColumns = [
+  { label: '软件仓库', key: 'name', type: 'name' },
+  { label: '申请类型', key: 'type', type: 'type' },
+  { label: '修改状态', key: 'sig', type: 'sig' },
+  { label: '审批意见', key: 'cve', type: 'cve' },
+  { label: '申请人', key: 'issue', type: 'issue' },
+  { label: '申请单号', key: 'pkg', type: 'pkg' },
+  { label: '审批时间', key: 'version', type: 'version' },
+  { label: '审批状态', key: 'member', type: 'member' },
+  { label: '操作', key: 'operation', type: 'operation' },
+]
+
+
+export const applyStatus = {
+  PENDDING: '待审批',
+  DISMISSED: '已驳回',
+  PASSED: '已通过',
+  REVOKED: '已撤销',
+};
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index feae0da..09a8d1b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,6 +5,7 @@ import { useLangStore, useViewStore } from '@/stores/common';
 import { tryLogin } from '@/shared/login';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
 import { queryUpstreamPermission } from '@/api/api-user';
+import { getAdminPermission } from '@/api/api-collaboration';
 
 const routes = [
   {
@@ -82,6 +83,22 @@ const routes = [
     name: 'openstack',
     component: () => import('@/views/solution/TheOpenStack.vue'),
   },
+  {
+    path: '/zh/collaboration',
+    name: 'collaboration',
+    component: () => import('@/views/collaboration/TheCollaboration.vue'),
+  },
+
+  {
+    path: '/zh/todo/:type',
+    name: 'todo',
+    component: () => import('@/views/todo/TheTodo.vue'),
+  },
+  {
+    path: '/zh/todo/:type/:id',
+    name: 'todo-detail',
+    component: () => import('@/views/todo/TheTodoDetail.vue'),
+  },
   // 默认路由
   {
     path: '/:path(.*)*',
@@ -114,29 +131,43 @@ router.beforeEach(async (to) => {
 
   const userInfoStore = useUserInfoStore();
   const isUpstream = to.name === 'upstream';
+  const isCollaboration = to.name === 'collaboration';
   const loginStore = useLoginStore();
+
   if (loginStore.isLogined) {
     if (isUpstream) {
       return userInfoStore.upstreamPermission ? true : { name: 'notFound' };
     }
+    if (isCollaboration) {
+      return userInfoStore.platformAdminPermission ? true : { name: 'notFound' };
+    }
+
     return true;
   }
 
   await tryLogin();
-  if (userInfoStore.upstreamPermission === null && loginStore.isLogined) {
+  // if (userInfoStore.upstreamPermission === null && loginStore.isLogined) {
+  //   try {
+  //     // const upstreamPermission = await queryUpstreamPermission();
+  //     // userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
+  //   } catch {
+  //     // 如果queryUpstreamPermission不是401
+  //     return isUpstream ? { name: 'notFound' } : true;
+  //   }
+  // }
+
+
+  // 协作平台管理员权限
+  if (userInfoStore.platformAdminPermission === null && loginStore.isLogined) {
     try {
-      const upstreamPermission = await queryUpstreamPermission();
-      userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
+      const queryAdminPermission = await getAdminPermission();
+      userInfoStore.platformAdminPermission = queryAdminPermission.data.allow_access;
     } catch {
-      // 如果queryUpstreamPermission不是401
-      return isUpstream ? { name: 'notFound' } : true;
+      console.log('queryAdminPermission :>> ');
+      return isCollaboration ? { name: 'notFound' } : true;
     }
   }
 
-  if (isUpstream) {
-    return loginStore.isLogined && userInfoStore.upstreamPermission ? true : { name: 'notFound' };
-  }
-
   return true;
 });
 
diff --git a/src/shared/axios/index.ts b/src/shared/axios/index.ts
index d817060..bea201c 100644
--- a/src/shared/axios/index.ts
+++ b/src/shared/axios/index.ts
@@ -172,11 +172,11 @@ const responseInterceptorId = request.interceptors.response.use(
       });
     }
 
-    if (err.response?.status === 401) {
-      clearUserAuth();
-      useLoginStore().setLoginStatus(LOGIN_STATUS.FAILED);
-      router.push('/');
-    }
+    // if (err.response?.status === 401) {
+    //   clearUserAuth();
+    //   useLoginStore().setLoginStatus(LOGIN_STATUS.FAILED);
+    //   router.push('/');
+    // }
 
     return Promise.reject(err);
   }
diff --git a/src/shared/login.ts b/src/shared/login.ts
index 05f2aa3..6440a72 100644
--- a/src/shared/login.ts
+++ b/src/shared/login.ts
@@ -61,7 +61,7 @@ export async function tryLogin() {
   }
   try {
     loginStore.setLoginStatus(LOGIN_STATUS.DOING);
-    userInfoStore.$patch(await queryUserInfo());
+    // userInfoStore.$patch(await queryUserInfo());
     loginStore.setLoginStatus(LOGIN_STATUS.DONE);
   } catch (error) {
     loginStore.setLoginStatus(LOGIN_STATUS.FAILED);
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 912a1bb..b7b5d7b 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -10,6 +10,10 @@ export const useUserInfoStore = defineStore('userInfo', {
       photo: '' as string,
       username: '' as string,
       upstreamPermission: null as boolean | null,
+      // 协作平台admin权限
+      platformAdminPermission: null as boolean | null,
+      // 协作平台maintainer权限
+      platformMaintainerPermission: null as boolean | null,
     }
   },
 });
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
new file mode 100644
index 0000000..c3060c4
--- /dev/null
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -0,0 +1,324 @@
+<script setup lang="ts">
+import { ref, watch, computed, onMounted } from 'vue';
+import { OTable, OTag, OLink, OIcon } from '@opensig/opendesign';
+import { getMaintainerRepos, getAdminRepos } from '@/api/api-collaboration';
+import { useLoginStore, useUserInfoStore } from '@/stores/user';
+import ExternalLink from '@/components/ExternalLink.vue';
+import Indicators from '@/components/collaboration/Indicators.vue';
+import StatusFeedback from '@/components/collaboration/StatusFeedback.vue';
+
+import IconOutlink from '~icons/pkg/icon-outlink.svg';
+
+const columns = [
+  { label: '软件仓库', key: 'repo', type: 'repo' },
+  { label: '类别', key: 'kind', type: 'kind' },
+  { label: 'SIG名称', key: 'sigName', type: 'sig' },
+  { label: 'CVE状态', key: 'cveStatus', type: 'cve' },
+  { label: 'ISSUE状态', key: 'issueStatus', type: 'issue' },
+  { label: '软件包更新状态', key: 'prStatus', type: 'pr' },
+  { label: '软件包版本状态', key: 'versionStatus', type: 'version' },
+  { label: '贡献组织状态', key: 'orgStatus', type: 'org' },
+  { label: '贡献人员状态', key: 'contributorStatus', type: 'personnel' },
+  { label: '状态', key: 'status', type: 'status' },
+  { label: '操作', key: 'operation', type: 'operation' },
+];
+
+const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
+
+const userInfoStore = useUserInfoStore();
+const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
+const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
+
+// 分页
+const currentPage = ref(1);
+const pageSize = ref(10);
+const total = ref(0);
+
+const data = ref([]);
+const isLoading = ref(false);
+const queryMaintainerRepos = () => {
+  getMaintainerRepos()
+    .then((res) => {
+      data.value = res.data.list;
+      total.value = res.data.total;
+      isLoading.value = false;
+    })
+    .catch(() => {});
+};
+
+const queryAdminRepos = () => {
+  getAdminRepos()
+    .then((res) => {
+      data.value = res.data.list;
+      total.value = res.data.total;
+      isLoading.value = false;
+    })
+    .catch(() => {});
+};
+
+const pageInit = () => {
+  // if (isMainPer) {
+  //   queryMaintainerRepos();
+  // }
+
+  if (isAdminPer.value) {
+    queryAdminRepos();
+  }
+};
+
+const loading = ref(false);
+
+// 分页
+const handleSizeChange = (val: number) => {
+  pageSize.value = val;
+  currentPage.value = 1;
+};
+const handleCurrentChange = (val: number) => {
+  currentPage.value = val;
+};
+
+// 外链确认
+const showExternalDlg = ref(false);
+const externalLink = ref('');
+const onExternalDialog = (href: string) => {
+  externalLink.value = href;
+  showExternalDlg.value = true;
+};
+
+const showDlg = ref(false);
+
+const showFeedbackDlg = ref(false);
+const repoValue = ref('');
+const changeFeedback = (v: string) => {
+  showFeedbackDlg.value = true;
+  repoValue.value = v;
+};
+
+onMounted(() => {
+  pageInit();
+});
+</script>
+<template>
+  <div class="platform-header">
+    <ContentWrapper>
+      <h1>软件维护详情</h1>
+    </ContentWrapper>
+  </div>
+  <ContentWrapper vertical-padding="24px" class="pkg-content-wrap">
+    <div class="indicators">
+      <span @click="showDlg = true" class="text">状态指标说明</span>
+      <Indicators v-if="showDlg" @change="showDlg = false" />
+    </div>
+    <div class="platform-main" :class="isAdminPer ? 'maintainer' : 'admin'">
+      <OTable :columns="columns" :data="data" :loading="loading" border="row">
+        <template #head="{ columns }">
+          <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
+        </template>
+        <template #td_repo="{ row }">
+          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}`)"
+            ><span class="text">{{ row.repo }} </span><OIcon><IconOutlink /></OIcon
+          ></OLink>
+        </template>
+        <template #td_issueStatus="{ row }">
+          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}/issues`)"
+            ><span class="text">{{ row.issueStatus }}</span> <OIcon><IconOutlink /></OIcon
+          ></OLink>
+        </template>
+        <template #td_prStatus="{ row }">
+          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}/pulls`)"
+            ><span class="text">{{ row.prStatus }}</span> <OIcon><IconOutlink /></OIcon
+          ></OLink>
+        </template>
+        <template #td_cveStatus="{ row }">
+          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}/issues?single_label_id=85497765`)">
+            <span class="text">{{ row.cveStatus }}</span> <OIcon><IconOutlink /></OIcon
+          ></OLink>
+        </template>
+        <template #td_status="{ row }">
+          <OTag class="app-tag">{{ row.status }} </OTag>
+        </template>
+        <template #td_operation="{ row }">
+          <div class="operation-box">
+            <OLink color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
+            <OLink color="primary" hover-underline> 反馈历史</OLink>
+          </div>
+        </template>
+      </OTable>
+
+      <div class="pagination-box">
+        <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 跳转外部链接提示 -->
+    <ExternalLink v-if="showExternalDlg" :href="externalLink" @change="showExternalDlg = false" />
+    <!-- 状态反馈 -->
+
+    <StatusFeedback :repo="repoValue" v-if="showFeedbackDlg" @close="showFeedbackDlg = false" />
+  </ContentWrapper>
+</template>
+
+<style scoped lang="scss">
+.platform-header {
+  border-bottom: 1px solid var(--o-color-control4);
+  padding: 48px 0 24px;
+  h1 {
+    color: var(--o-color-info1);
+    font-weight: 500;
+    @include h1;
+  }
+}
+.indicators {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 24px;
+  .text {
+    color: var(--o-color-info1);
+    cursor: pointer;
+    @include text1;
+  }
+}
+.operation-box {
+  display: flex;
+  align-items: center;
+  .o-link + .o-link {
+    margin-left: 16px;
+  }
+}
+:deep(.link-external .o-link-label) {
+  font-size: 0;
+  .text {
+    @include text1;
+  }
+  .o-icon {
+    display: inline-block;
+    vertical-align: middle;
+    svg {
+      width: 16px;
+      height: 16px;
+      margin-left: 8px;
+    }
+  }
+}
+.platform-main {
+  @mixin liner {
+    content: '';
+    box-shadow: inset -10px 0 10px -10px rgba(0, 0, 0, 0.15);
+    height: 100%;
+    position: absolute;
+    top: 0;
+    width: 8px;
+  }
+  :deep(.o-table) {
+    thead {
+      .repo {
+        width: 200px;
+      }
+      .cve,
+      .sig,
+      .issue,
+      .pr,
+      .version {
+        width: 180px;
+      }
+      .org,
+      .personnel {
+        width: 140px;
+      }
+      .kind {
+        width: 120px;
+      }
+      .status {
+        width: 125px;
+      }
+      .operation {
+        width: var(--oper-width);
+      }
+    }
+  }
+  &.maintainer {
+    :deep(.o-table) {
+      --oper-width: 215px;
+
+      .o-table-wrap {
+        overflow-x: auto;
+        overflow-y: hidden;
+        @include scrollbar;
+      }
+      table {
+        table-layout: fixed;
+      }
+
+      tr {
+        td {
+          &:first-child,
+          &:nth-of-type(10),
+          &:nth-of-type(11) {
+            position: sticky;
+            z-index: 2;
+            background: var(--table-bg-color);
+          }
+          &:first-child {
+            left: 0;
+            &::before {
+              right: 0;
+              transform: scaleX(-1);
+              @include liner;
+            }
+          }
+          &:nth-of-type(11) {
+            right: 0px;
+          }
+          &:nth-of-type(10) {
+            right: var(--oper-width);
+            &::before {
+              left: 0;
+              @include liner;
+            }
+          }
+        }
+        &.last {
+          td {
+            border-bottom: 0 none;
+          }
+        }
+        &:hover td {
+          background: var(--table-row-hover);
+        }
+      }
+      th {
+        &:first-child,
+        &:nth-of-type(10),
+        &:nth-of-type(11) {
+          position: sticky;
+          z-index: 2;
+          background: var(--table-head-bg);
+        }
+        &:first-child {
+          left: 0;
+          &::before {
+            right: 0;
+            transform: scaleX(-1);
+            @include liner;
+          }
+        }
+        &:nth-of-type(10) {
+          right: var(--oper-width);
+          &::before {
+            left: 0;
+            @include liner;
+          }
+        }
+        &:nth-of-type(11) {
+          right: 0;
+        }
+      }
+    }
+  }
+}
+
+.pagination-box {
+  margin-top: 24px;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/src/views/package/RpmContent.vue b/src/views/package/RpmContent.vue
index 2776e82..833dd25 100644
--- a/src/views/package/RpmContent.vue
+++ b/src/views/package/RpmContent.vue
@@ -148,7 +148,7 @@ const isFilterLoading = ref(false);
 const rpmColumn = {
   os,
   arch,
-  category: ['AI', 'HPC', '云服务', '分布式存储', '大数据', '其他'],
+  category: ['AI', 'HPC', '云服务', '分布式存储', '大数据', '数据库', '其他'],
 };
 
 const queryFilter = () => {
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
new file mode 100644
index 0000000..6e9d61c
--- /dev/null
+++ b/src/views/todo/ApprovalTable.vue
@@ -0,0 +1,247 @@
+<script lang="ts" setup>
+import { ref, type PropType } from 'vue';
+import { OTable, OLink, OTag } from '@opensig/opendesign';
+import { useLocale } from '@/composables/useLocale';
+import { useI18n } from 'vue-i18n';
+import { formatDateTime } from '@/utils/common';
+import { useRouter, useRoute } from 'vue-router';
+import { applyStatus } from '@/data/todo';
+
+interface ColumnsT {
+  key: string;
+  label: string;
+  width?: string;
+  type?: string;
+}
+
+const props = defineProps({
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  type: {
+    type: String,
+    default: () => '',
+  },
+  columns: {
+    type: Array as PropType<ColumnsT[]>,
+    default: () => [],
+  },
+  loading: {
+    type: Boolean,
+    default: () => false,
+  },
+});
+
+const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
+const { locale } = useLocale();
+const jumpTo = (id: number) => {
+  const type = route.params?.type as string;
+  router.push({
+    path: `/${locale.value}/todo/${type}/${id}`,
+  });
+};
+
+const emits = defineEmits<{
+  (e: 'revoke', id: number): void;
+}>();
+
+const revokeApplication = (id: number) => {
+  emits('revoke', id);
+};
+</script>
+
+<template>
+  <div class="table-main" :class="type">
+    <OTable :columns="columns" :data="data" :loading="loading" border="all">
+      <template #head="{ columns }">
+        <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
+      </template>
+      <template #td_updateAt="{ row }">
+        {{ formatDateTime(row.updateAt) }}
+      </template>
+      <template #td_applyStatus="{ row }">
+        <OTag class="app-tag" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+      </template>
+      <template #td_operation="{ row }">
+        <template v-if="type === 'application'">
+          <div class="oper-box">
+            <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">申请详情</OLink>
+            <OLink color="danger" hover-underline @click="revokeApplication(row.applyId)">撤销申请</OLink>
+          </div>
+        </template>
+        <template v-if="type === 'approval'">
+          <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">审批</OLink>
+        </template>
+        <template v-if="type === 'approvalHistory'">
+          <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">审批详情</OLink>
+        </template>
+      </template>
+    </OTable>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.oper-box {
+  display: flex;
+  align-items: center;
+  .o-link + .o-link {
+    margin-left: 24px;
+  }
+}
+
+.app-tag {
+  min-width: 72px;
+  color: var(--o-color-white);
+  &.pendding {
+    --tag-bg-color: var(--o-color-warning1);
+    --tag-bd-color: var(--o-color-warning1);
+  }
+  &.passed {
+    --tag-bg-color: var(--o-color-success1);
+    --tag-bd-color: var(--o-color-success1);
+  }
+  &.revoked {
+    --tag-bg-color: var(--o-color-control1);
+    --tag-bd-color: transparent;
+  }
+
+  &.dismissed {
+    --tag-bg-color: var(--o-color-danger1);
+    --tag-bd-color: var(--o-color-danger1);
+  }
+}
+
+:deep(.o-table) {
+  --table-edge-padding: 32px;
+  --table-cell-padding: 16px 20px;
+  --table-head-cell-padding: 12px 20px;
+  --table-cell-height: 80px;
+  .label {
+    display: flex;
+    align-items: center;
+    .icon-filter {
+      cursor: pointer;
+      svg {
+        fill: currentColor;
+        color: var(--o-color-info3);
+        width: 20px;
+        margin-left: 3px;
+      }
+    }
+    .icon-time-order {
+      margin-left: 4px;
+      cursor: pointer;
+      svg {
+        fill: currentColor;
+        color: var(--o-color-info3);
+        width: 24px;
+      }
+      &.on {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  .td-break {
+    word-break: break-all;
+  }
+  .max {
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    position: relative;
+    word-break: break-all;
+  }
+  .row-name {
+    display: flex;
+    align-items: center;
+  }
+}
+
+.application {
+  :deep(.o-table) {
+    @mixin liner {
+      content: '';
+      box-shadow: inset -10px 0 10px -10px rgba(0, 0, 0, 0.15);
+      height: 100%;
+      position: absolute;
+      top: 0;
+      width: 8px;
+    }
+    .o-table-wrap {
+      overflow-x: auto;
+      overflow-y: hidden;
+      @include scrollbar;
+    }
+    table {
+      table-layout: fixed;
+    }
+
+    tr {
+      td {
+        &:last-child {
+          width: 220px;
+          position: sticky;
+          right: 0;
+          z-index: 2;
+          background: var(--table-bg-color);
+          &::before {
+            left: 0;
+            @include liner;
+          }
+        }
+      }
+      &.last {
+        td {
+          border-bottom: 0 none;
+        }
+      }
+      &:hover td {
+        background: var(--table-row-hover);
+      }
+    }
+    thead {
+      .repo {
+        width: 180px;
+      }
+      .metric,
+      .metricStatus,
+      .description {
+        width: 150px;
+      }
+      .applyStatus,
+      .adminstrator,
+      .applyId {
+        width: 120px;
+      }
+
+      .maintainer {
+        width: 180px;
+      }
+      .updateAt {
+        width: 130px;
+      }
+      .operation {
+        width: 220px;
+      }
+    }
+    th {
+      &:last-child {
+        width: 220px;
+        position: sticky;
+        right: 0;
+        z-index: 2;
+        background: var(--table-head-bg);
+        &::before {
+          left: 0;
+          @include liner;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
new file mode 100644
index 0000000..424b00e
--- /dev/null
+++ b/src/views/todo/TheTodo.vue
@@ -0,0 +1,210 @@
+<script lang="ts" setup>
+import { ref, onMounted, computed, watch } from 'vue';
+import { OTab, OTabPane, useMessage } from '@opensig/opendesign';
+import { useRoute, useRouter } from 'vue-router';
+import { useLocale } from '@/composables/useLocale';
+import { approvalColumns, applicationColumns } from '@/data/todo';
+import { getAdminApply, getMaintainerApply, getMaintainerRevoke } from '@/api/api-collaboration';
+import { useUserInfoStore } from '@/stores/user';
+import Result404 from '@/components/Result404.vue';
+import ApprovalTable from './ApprovalTable.vue';
+import { COUNT_PAGESIZE } from '@/data/query';
+
+const tabList = [
+  {
+    id: 'application',
+    label: '我的申请',
+  },
+  {
+    id: 'approval',
+    label: '待我审批',
+  },
+  {
+    id: 'approval-history',
+    label: '我审批过的',
+  },
+];
+
+const { locale } = useLocale();
+const route = useRoute();
+const router = useRouter();
+const userInfoStore = useUserInfoStore();
+const message = useMessage();
+
+const isAdminPermission = computed(() => userInfoStore.platformAdminPermission);
+
+// 分页
+const currentPage = ref(1);
+const pageSize = ref(10);
+const total = ref(0);
+
+const todoName = ref('formPage');
+const applyId = ref();
+const isError = ref(false);
+
+const todoParams = computed(() => {
+  return {
+    name: todoName.value,
+    applyId: applyId.value,
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
+  };
+});
+
+// 我的申请数据
+const applicationData = ref([]);
+// 审批
+const approvalData = ref([]);
+// 审批历史
+const approvalHistoryData = ref([]);
+const isLoading = ref(false);
+
+const activeName = ref();
+const onChange = (type: string) => {
+  // 切换url参数
+  router.push({
+    path: `/${locale.value}/todo/${type}`,
+  });
+};
+
+/* ---------------分页事件------------------ */
+const handleSizeChange = (val: number) => {
+  pageSize.value = val;
+  currentPage.value = 1;
+};
+const handleCurrentChange = (val: number) => {
+  currentPage.value = val;
+};
+
+// 我的申请
+const queryMyApplication = () => {
+  getMaintainerApply({ name: todoName.value })
+    .then((res) => {
+      applicationData.value = res.data.list;
+      total.value = res.data.total;
+      isLoading.value = false;
+    })
+    .catch(() => {
+      isLoading.value = false;
+      isError.value = true;
+    });
+};
+
+const revokeApplication = (applyId: number) => {
+  getMaintainerRevoke(applyId)
+    .then((res) => {
+      if (res.code === 200) {
+        message.success({
+          content: '撤销成功',
+        });
+      }
+    })
+    .catch(() => {
+      message.danger({
+        content: '操作失败',
+      });
+    });
+};
+
+// 待我审批
+const queryApprovalApply = () => {
+  if (isAdminPermission.value) {
+    getAdminApply({ name: todoName.value })
+      .then((res) => {
+        approvalData.value = res.data.list;
+        total.value = res.data.total;
+        isLoading.value = false;
+      })
+      .catch(() => {
+        isError.value = true;
+      });
+  }
+};
+
+const pageInit = () => {
+  isLoading.value = true;
+  if (activeName.value === 'application') {
+    queryMyApplication();
+  } else if (activeName.value === 'approval') {
+    queryApprovalApply();
+  }
+};
+
+onMounted(() => {
+  activeName.value = (route.params?.type as string) || 'application';
+  pageInit();
+});
+
+watch(
+  () => route.params.type as string,
+  (v: string) => {
+    activeName.value = v || 'application';
+    pageInit();
+  }
+);
+</script>
+
+<template>
+  <div class="platform-header">
+    <ContentWrapper>
+      <h1>待办中心</h1>
+    </ContentWrapper>
+  </div>
+  <OTab variant="text" @change="onChange" v-model="activeName" size="large" :style="{ '--tab-nav-justify': 'flex-start' }">
+    <OTabPane class="tab-pane" v-for="item in tabList" :key="item.id" :value="item.id" :label="item.label">
+      <!-- 我的申请 -->
+      <template v-if="item.id === 'application' && applicationData.length > 0">
+        <ApprovalTable :columns="applicationColumns" :type="item.id" :data="applicationData" :loading="isLoading" @revoke="revokeApplication" />
+        <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+          <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
+      </template>
+      <!-- 判断admin权限 -->
+      <template v-if="isAdminPermission">
+        <template v-if="item.id === 'approval' && approvalData.length > 0">
+          <ApprovalTable :columns="approvalColumns" :type="item.id" :data="approvalData" :loading="isLoading" />
+          <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+            <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          </div>
+        </template>
+        <template v-if="item.id === 'approvalHistory' && approvalHistoryData.length > 0">approvalHistoryData {{ approvalHistoryData.length }} </template>
+      </template>
+
+      <!-- 暂无记录 -->
+      <template v-if="(item.id === 'application' && isError) || (item.id === 'approval' && isError) || (item.id === 'approvalHistory' && isError)">
+        <Result404>
+          <template #description>
+            <p class="text404">暂无{{ item.id === 'application' ? '申请' : '审批' }}记录</p>
+          </template>
+        </Result404>
+      </template>
+    </OTabPane>
+  </OTab>
+</template>
+
+<style lang="scss" scoped>
+.loading-box {
+  position: relative;
+}
+.platform-header {
+  padding: 48px 0 24px;
+  h1 {
+    color: var(--o-color-info1);
+    font-weight: 500;
+    @include h1;
+  }
+}
+
+:deep(.o-tab-navs) {
+  max-width: var(--layout-content-max-width);
+  padding-left: var(--layout-content-padding);
+  padding-right: var(--layout-content-padding);
+  margin: 0 auto;
+}
+:deep(.o-tab-pane) {
+  max-width: var(--layout-content-max-width);
+  padding-left: var(--layout-content-padding);
+  padding-right: var(--layout-content-padding);
+  margin: 24px auto;
+}
+</style>
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
new file mode 100644
index 0000000..cf8c48f
--- /dev/null
+++ b/src/views/todo/TheTodoDetail.vue
@@ -0,0 +1,138 @@
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue';
+import { OButton, OTag, OTextarea } from '@opensig/opendesign';
+import { useRoute, useRouter } from 'vue-router';
+import { getAdminRecords, getMaintainerApply } from '@/api/api-collaboration';
+import { applyStatus } from '@/data/todo';
+import { formatDateTime } from '@/utils/common';
+
+const route = useRoute();
+const router = useRouter();
+
+const type = ref();
+const applyId = ref(Number(route.params.id) || 0);
+const todoData = ref();
+
+// 我的申请
+const queryApplicationApply = () => {
+  getMaintainerApply({ name: 'formContent', applyId: applyId.value }).then((res) => {
+    todoData.value = res.data.list[0];
+  });
+};
+
+// 待我审批
+const queryApprovalApply = () => {
+  getAdminRecords(applyId.value).then((res) => {
+    todoData.value = res.data.list[0];
+  });
+};
+
+onMounted(() => {
+  type.value = route.params.type;
+  if (type.value === 'application') {
+    queryApplicationApply();
+  } else if (type.value === 'approval') {
+    queryApprovalApply();
+  }
+});
+</script>
+
+<template>
+  <ContentWrapper verticalPadding="32px">
+    <CBreadcrumb :type="type" :repo="todoData?.repo" />
+    <div v-if="todoData" class="todo-detail">
+      <div class="title">
+        <h2>{{ todoData.repo }}</h2>
+        <OTag class="app-tag" :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatus[todoData.applyStatus] }} </OTag>
+      </div>
+      <dl>
+        <dt>基本信息</dt>
+        <dd><span class="label">申请单号：</span>{{ todoData.applyId }}</dd>
+        <dd><span class="label">申请类型：</span>{{ todoData.metric }}</dd>
+        <dd><span class="label">修改状态：</span>{{ todoData.metricStatus }}</dd>
+        <dd><span class="label">修改理由：</span>{{ todoData.description }}</dd>
+        <dd><span class="label">申请时间：</span>{{ formatDateTime(todoData.updateAt) }}</dd>
+      </dl>
+      <dl>
+        <dt>审批信息</dt>
+        <dd><span class="label">审批人：</span>{{ todoData.adminstrator }}</dd>
+        <dd>
+          <span class="label">审批意见：</span>
+        </dd>
+        <dd>
+          <span class="label">审批时间：</span>
+        </dd>
+      </dl>
+      <dl>
+        <dt>审批</dt>
+        <dd>
+          <span class="label">审批意见：</span>
+          <OTextarea></OTextarea>
+        </dd>
+        <dd>
+          <OButton variant="solid" color="primary">通过</OButton>
+          <OButton color="primary">驳回</OButton>
+        </dd>
+      </dl>
+    </div>
+  </ContentWrapper>
+</template>
+
+<style lang="scss" scoped>
+.todo-detail {
+  padding: 32px 40px;
+  background: var(--o-color-fill2);
+  box-shadow: var(--o-shadow-1);
+  margin: 24px 0 0;
+  min-height: calc(var(--layout-content-min-height) - 24px);
+  .title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 32px;
+    h2 {
+      color: var(--o-color-info1);
+      font-weight: 500;
+      margin-right: 16px;
+      @include h3;
+    }
+  }
+  dt {
+    color: var(--o-color-info1);
+    margin-top: 24px;
+    font-weight: 500;
+    @include h4;
+  }
+  dd {
+    color: var(--o-color-info1);
+    display: flex;
+    margin-top: 16px;
+    @include text1;
+    .label {
+      min-width: 80px;
+      margin-right: 24px;
+    }
+  }
+}
+
+.app-tag {
+  min-width: 72px;
+  color: var(--o-color-white);
+  &.pendding {
+    --tag-bg-color: var(--o-color-warning1);
+    --tag-bd-color: var(--o-color-warning1);
+  }
+  &.passed {
+    --tag-bg-color: var(--o-color-success1);
+    --tag-bd-color: var(--o-color-success1);
+  }
+  &.revoked {
+    --tag-bg-color: var(--o-color-control1);
+    --tag-bd-color: transparent;
+  }
+
+  &.dismissed {
+    --tag-bg-color: var(--o-color-danger1);
+    --tag-bd-color: var(--o-color-danger1);
+  }
+}
+</style>
-- 
Gitee


From e86747d173eae965a9487de984ebaae6e445a2ad Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Tue, 20 Aug 2024 16:13:09 +0800
Subject: [PATCH 02/17] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=AE=A1=E6=89=B9=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   3 +-
 components.d.ts                               |   2 -
 src/@types/collaboration.ts                   |   8 +
 src/api/api-collaboration.ts                  |  23 ++-
 src/assets/style/theme/popup.scss             |   7 +
 .../collaboration/StatusFeedback.vue          |   1 +
 src/components/header/AppHeader.vue           |  11 +-
 src/data/query.ts                             |   4 +
 src/router/index.ts                           |  50 +++--
 src/shared/login.ts                           |  12 +-
 src/utils/common.ts                           |   4 +-
 src/views/collaboration/TheCollaboration.vue  |  29 ++-
 src/views/todo/ApprovalTable.vue              |  52 ++---
 src/views/todo/TheTodo.vue                    |  54 +++++-
 src/views/todo/TheTodoDetail.vue              | 181 +++++++++++++-----
 15 files changed, 321 insertions(+), 120 deletions(-)

diff --git a/.env.production b/.env.production
index 418dc12..a35287b 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,4 @@
 VITE_LOGIN_URL = https://id.openeuler.org
 VITE_XSRF_COOKIE_NAME = '_U_T_'
-VITE_XSRF_HEADER_NAME = 'Token'
\ No newline at end of file
+VITE_XSRF_HEADER_NAME = 'Token'
+VITE_COOKIE_DOMAIN = .openeuler.org
\ No newline at end of file
diff --git a/components.d.ts b/components.d.ts
index 6559f73..483377d 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -35,12 +35,10 @@ declare module 'vue' {
     FilterItemSkeleton: typeof import('./src/components/skeleton/FilterItemSkeleton.vue')['default']
     FilterOrder: typeof import('./src/components/filter/FilterOrder.vue')['default']
     FilterRadio: typeof import('./src/components/filter/FilterRadio.vue')['default']
-    HeaderMain: typeof import('./src/components/header/HeaderMain.vue')['default']
     HeaderNav: typeof import('./src/components/header/HeaderNav.vue')['default']
     HeaderTheme: typeof import('./src/components/header/HeaderTheme.vue')['default']
     HomeSkeleton: typeof import('./src/components/skeleton/HomeSkeleton.vue')['default']
     Indicators: typeof import('./src/components/collaboration/Indicators.vue')['default']
-    NavTab: typeof import('./src/components/NavTab.vue')['default']
     OCardItem: typeof import('./src/components/OCardItem.vue')['default']
     OCardItemSkeleton: typeof import('./src/components/skeleton/OCardItemSkeleton.vue')['default']
     OCodeCopy: typeof import('./src/components/OCodeCopy.vue')['default']
diff --git a/src/@types/collaboration.ts b/src/@types/collaboration.ts
index b0ece62..b834ffc 100644
--- a/src/@types/collaboration.ts
+++ b/src/@types/collaboration.ts
@@ -12,3 +12,11 @@ export interface AdminAppryT extends CollaborationT {
   timeOrder?: string;
 }
 
+export interface CollaborationRepoT {
+  pageNum: number;
+  pageSize: number;
+  repo?: string;
+  kind?: string;
+  sigName?: string;
+  status?: string;
+}
diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index 92ed797..52febef 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -1,6 +1,6 @@
 import { request } from '@/shared/axios';
 import type { AxiosResponse } from '@/shared/axios';
-import type { AdminAppryT } from '@/@types/collaboration'
+import type { AdminAppryT, CollaborationRepoT } from '@/@types/collaboration'
 
 // maintainer权限
 export function getMaintainerPermission() {
@@ -15,15 +15,15 @@ export function getAdminPermission() {
 }
 
 // 软件维护详情 maintainer
-export function getMaintainerRepos() {
+export function getMaintainerRepos(params: CollaborationRepoT) {
   const url = `/server/collaboration/maintainer/user/repos`;
-  return request.get(url).then((res: AxiosResponse) => res?.data);
+  return request.get(url, { params }).then((res: AxiosResponse) => res?.data);
 }
 
 // 软件维护详情 admin
-export function getAdminRepos() {
+export function getAdminRepos(params: CollaborationRepoT) {
   const url = `/server/collaboration/admin/user/repos`;
-  return request.get(url).then((res: AxiosResponse) => res?.data);
+  return request.get(url, { params }).then((res: AxiosResponse) => res?.data);
 }
 
 
@@ -63,5 +63,16 @@ interface FeedbackT {
 
 export function getApplyFeedback(params: FeedbackT) {
   const url = `/server/collaboration/maintainer/apply`;
-  return request.post(url, { params }).then((res: AxiosResponse) => res?.data);
+  return request.post(url, { ...params }).then((res: AxiosResponse) => res?.data);
+}
+
+interface ProcessT {
+  applyId: string;
+  comment: string;
+  applyStatus: string;
+}
+
+export function getAdminProcess(params: ProcessT) {
+  const url = `/server/collaboration/admin/process`;
+  return request.post(url, { ...params }).then((res: AxiosResponse) => res?.data);
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/popup.scss b/src/assets/style/theme/popup.scss
index d05b39e..10af9e7 100644
--- a/src/assets/style/theme/popup.scss
+++ b/src/assets/style/theme/popup.scss
@@ -1,3 +1,10 @@
 .o-popup {
   --popup-shadow: var(--o-shadow-2);
+  .o-popup-wrap {
+    border: 1px solid var(--o-color-control4);
+  }
+  .o-popover-anchor {
+    border: 1px solid var(--o-color-control4);
+    border-width: 1px 0 0 1px;
+  }
 }
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index 96f4d95..ecea284 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -64,6 +64,7 @@ const optionLists = [
 // 重置表单数据
 const reset = () => {
   formRef.value?.resetFields();
+  emits('close');
 };
 
 const onChange = () => {
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index f56e467..d6b2d2d 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -7,6 +7,7 @@ import { OPENEULER } from '@/data/config';
 import { useI18n } from 'vue-i18n';
 import { navs, collaborationNav } from '@/data/nav';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
+import { COLLABORATIONPERMISSION } from '@/data/query';
 
 import { useTheme } from '@/composables/useTheme';
 import HeaderNav from '@/components/header/HeaderNav.vue';
@@ -40,9 +41,9 @@ const goHome = () => {
 };
 
 // 判断是否是协作平台
-const collaborationRouteName = ['todo', 'collaboration', 'todo-detail'];
+
 const isCollaboration = computed(() => {
-  return collaborationRouteName.includes(route.name as string);
+  return COLLABORATIONPERMISSION.includes(route.name as string);
 });
 </script>
 
@@ -61,8 +62,10 @@ const isCollaboration = computed(() => {
         <HeaderNav :options="isCollaboration ? collaborationNav : navs" />
       </div>
       <div class="header-right">
-        <OLink v-if="isCollaboration" class="collaboration" :href="`/${locale}/todo/application`">待办中心</OLink>
-        <OLink v-else class="collaboration" target="_blank" :href="`/${locale}/collaboration`">协作平台</OLink>
+        <template v-if="loginStore.isLogined && (userInfoStore.platformAdminPermission || userInfoStore.platformMaintainerPermission)">
+          <OLink v-if="isCollaboration" class="collaboration" :href="`/${locale}/todo/application`">待办中心</OLink>
+          <OLink v-else class="collaboration" target="_blank" :href="`/${locale}/collaboration`">协作平台</OLink>
+        </template>
         <HeaderTheme />
         <AppLogin />
       </div>
diff --git a/src/data/query.ts b/src/data/query.ts
index 3a07e45..45ad408 100644
--- a/src/data/query.ts
+++ b/src/data/query.ts
@@ -44,3 +44,7 @@ export const maintainerDefaults = {
   gitee_id: 'georgecao',
 }
 
+
+
+// 协作平台权限 route name
+export const COLLABORATIONPERMISSION = ['todo', 'collaboration', 'todo-detail'];
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 09a8d1b..099426a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,7 +5,8 @@ import { useLangStore, useViewStore } from '@/stores/common';
 import { tryLogin } from '@/shared/login';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
 import { queryUpstreamPermission } from '@/api/api-user';
-import { getAdminPermission } from '@/api/api-collaboration';
+import { getAdminPermission, getMaintainerPermission } from '@/api/api-collaboration';
+import { COLLABORATIONPERMISSION } from '@/data/query';
 
 const routes = [
   {
@@ -131,14 +132,14 @@ router.beforeEach(async (to) => {
 
   const userInfoStore = useUserInfoStore();
   const isUpstream = to.name === 'upstream';
-  const isCollaboration = to.name === 'collaboration';
+  const isPlatform = COLLABORATIONPERMISSION.includes(to.name as string);
   const loginStore = useLoginStore();
 
   if (loginStore.isLogined) {
     if (isUpstream) {
       return userInfoStore.upstreamPermission ? true : { name: 'notFound' };
     }
-    if (isCollaboration) {
+    if (isPlatform) {
       return userInfoStore.platformAdminPermission ? true : { name: 'notFound' };
     }
 
@@ -146,25 +147,40 @@ router.beforeEach(async (to) => {
   }
 
   await tryLogin();
-  // if (userInfoStore.upstreamPermission === null && loginStore.isLogined) {
-  //   try {
-  //     // const upstreamPermission = await queryUpstreamPermission();
-  //     // userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
-  //   } catch {
-  //     // 如果queryUpstreamPermission不是401
-  //     return isUpstream ? { name: 'notFound' } : true;
-  //   }
-  // }
-
-
-  // 协作平台管理员权限
+
+  // 没登陆、没权限 直接404
+  if (!loginStore.isLogined && (isUpstream || isPlatform)) {
+    return { name: 'notFound' };
+  }
+
+  if (userInfoStore.upstreamPermission === null && loginStore.isLogined) {
+    try {
+      const upstreamPermission = await queryUpstreamPermission();
+      userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
+    } catch {
+      // 如果queryUpstreamPermission不是401
+      return isUpstream ? { name: 'notFound' } : true;
+    }
+  }
+
+
+  // 协作平台Admin权限
   if (userInfoStore.platformAdminPermission === null && loginStore.isLogined) {
     try {
       const queryAdminPermission = await getAdminPermission();
       userInfoStore.platformAdminPermission = queryAdminPermission.data.allow_access;
     } catch {
-      console.log('queryAdminPermission :>> ');
-      return isCollaboration ? { name: 'notFound' } : true;
+      return isPlatform ? { name: 'notFound' } : true;
+    }
+  }
+
+  // 协作平台Maintainer权限
+  if (userInfoStore.platformMaintainerPermission === null && loginStore.isLogined) {
+    try {
+      const queryMaintainerPermission = await getMaintainerPermission();
+      userInfoStore.platformMaintainerPermission = queryMaintainerPermission.data.allow_access;
+    } catch {
+      return isPlatform ? { name: 'notFound' } : true;
     }
   }
 
diff --git a/src/shared/login.ts b/src/shared/login.ts
index 6440a72..d006fb0 100644
--- a/src/shared/login.ts
+++ b/src/shared/login.ts
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie';
-import { useLangStore } from '@/stores/common';
+import { useLangStore, useViewStore } from '@/stores/common';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
 import { queryUpstreamPermission, queryUserInfo } from '@/api/api-user';
 
@@ -43,7 +43,7 @@ export function clearUserAuth() {
   // 清除内存中用户信息
   useUserInfoStore().$reset();
   // 清除cookie
-  Cookies.remove(LOGIN_KEYS.CSRF_TOKEN);
+  Cookies.remove(LOGIN_KEYS.CSRF_TOKEN, { domain: import.meta.env.VITE_COOKIE_DOMAIN, path: '/', secure: true });
 }
 
 /**
@@ -57,13 +57,17 @@ export async function tryLogin() {
   if (!csrfToken) {
     userInfoStore.$reset();
     loginStore.setLoginStatus(LOGIN_STATUS.NOT);
-    return;
+
+
+    return false;
   }
   try {
     loginStore.setLoginStatus(LOGIN_STATUS.DOING);
-    // userInfoStore.$patch(await queryUserInfo());
+    userInfoStore.$patch(await queryUserInfo());
     loginStore.setLoginStatus(LOGIN_STATUS.DONE);
   } catch (error) {
     loginStore.setLoginStatus(LOGIN_STATUS.FAILED);
+
+
   }
 }
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 9d1aea8..f0021cf 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -88,10 +88,10 @@ export const checkOriginLink = (path: string) => {
  */
 import type { SearchSQLT, SearchESParamsT } from '@/@types/domain';
 export const getParamsRules = (data: any) => {
-  type ParamsKeyT = keyof SearchSQLT | SearchESParamsT;
+  type ParamsKeyT = keyof any;
 
   type NewDataT = {
-    [x: string]: SearchSQLT | SearchESParamsT;
+    [x: string]: any;
   };
 
   const newData: NewDataT = {};
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index c3060c4..c633c82 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -34,10 +34,17 @@ const currentPage = ref(1);
 const pageSize = ref(10);
 const total = ref(0);
 
+const searchParams = computed(() => {
+  return {
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
+  };
+});
+
 const data = ref([]);
 const isLoading = ref(false);
 const queryMaintainerRepos = () => {
-  getMaintainerRepos()
+  getMaintainerRepos(searchParams.value)
     .then((res) => {
       data.value = res.data.list;
       total.value = res.data.total;
@@ -47,7 +54,7 @@ const queryMaintainerRepos = () => {
 };
 
 const queryAdminRepos = () => {
-  getAdminRepos()
+  getAdminRepos(searchParams.value)
     .then((res) => {
       data.value = res.data.list;
       total.value = res.data.total;
@@ -57,12 +64,10 @@ const queryAdminRepos = () => {
 };
 
 const pageInit = () => {
-  // if (isMainPer) {
-  //   queryMaintainerRepos();
-  // }
-
   if (isAdminPer.value) {
     queryAdminRepos();
+  } else {
+    queryMaintainerRepos();
   }
 };
 
@@ -97,6 +102,16 @@ const changeFeedback = (v: string) => {
 onMounted(() => {
   pageInit();
 });
+
+watch(
+  () => searchParams.value,
+  () => {
+    pageInit();
+  },
+  {
+    immediate: true,
+  }
+);
 </script>
 <template>
   <div class="platform-header">
@@ -109,7 +124,7 @@ onMounted(() => {
       <span @click="showDlg = true" class="text">状态指标说明</span>
       <Indicators v-if="showDlg" @change="showDlg = false" />
     </div>
-    <div class="platform-main" :class="isAdminPer ? 'maintainer' : 'admin'">
+    <div class="platform-main" :class="isMainPer ? 'maintainer' : 'admin'">
       <OTable :columns="columns" :data="data" :loading="loading" border="row">
         <template #head="{ columns }">
           <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 6e9d61c..705b217 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -63,7 +63,7 @@ const revokeApplication = (id: number) => {
         {{ formatDateTime(row.updateAt) }}
       </template>
       <template #td_applyStatus="{ row }">
-        <OTag class="app-tag" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+        <OTag v-if="row.applyStatus" class="app-tag" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
       </template>
       <template #td_operation="{ row }">
         <template v-if="type === 'application'">
@@ -75,7 +75,7 @@ const revokeApplication = (id: number) => {
         <template v-if="type === 'approval'">
           <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">审批</OLink>
         </template>
-        <template v-if="type === 'approvalHistory'">
+        <template v-if="type === 'approved'">
           <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">审批详情</OLink>
         </template>
       </template>
@@ -161,7 +161,31 @@ const revokeApplication = (id: number) => {
     align-items: center;
   }
 }
+thead {
+  .repo {
+    width: 180px;
+  }
+  .metric,
+  .metricStatus,
+  .description {
+    width: 150px;
+  }
+  .applyStatus,
+  .adminstrator,
+  .applyId {
+    width: 120px;
+  }
 
+  .maintainer {
+    width: 180px;
+  }
+  .updateAt {
+    width: 130px;
+  }
+  .operation {
+    width: 220px;
+  }
+}
 .application {
   :deep(.o-table) {
     @mixin liner {
@@ -204,31 +228,7 @@ const revokeApplication = (id: number) => {
         background: var(--table-row-hover);
       }
     }
-    thead {
-      .repo {
-        width: 180px;
-      }
-      .metric,
-      .metricStatus,
-      .description {
-        width: 150px;
-      }
-      .applyStatus,
-      .adminstrator,
-      .applyId {
-        width: 120px;
-      }
 
-      .maintainer {
-        width: 180px;
-      }
-      .updateAt {
-        width: 130px;
-      }
-      .operation {
-        width: 220px;
-      }
-    }
     th {
       &:last-child {
         width: 220px;
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 424b00e..7df0904 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -9,6 +9,7 @@ import { useUserInfoStore } from '@/stores/user';
 import Result404 from '@/components/Result404.vue';
 import ApprovalTable from './ApprovalTable.vue';
 import { COUNT_PAGESIZE } from '@/data/query';
+import { getParamsRules } from '@/utils/common';
 
 const tabList = [
   {
@@ -20,7 +21,7 @@ const tabList = [
     label: '待我审批',
   },
   {
-    id: 'approval-history',
+    id: 'approved',
     label: '我审批过的',
   },
 ];
@@ -56,7 +57,7 @@ const applicationData = ref([]);
 // 审批
 const approvalData = ref([]);
 // 审批历史
-const approvalHistoryData = ref([]);
+const approvedData = ref([]);
 const isLoading = ref(false);
 
 const activeName = ref();
@@ -78,7 +79,8 @@ const handleCurrentChange = (val: number) => {
 
 // 我的申请
 const queryMyApplication = () => {
-  getMaintainerApply({ name: todoName.value })
+  const newData = getParamsRules(todoParams.value);
+  getMaintainerApply(newData)
     .then((res) => {
       applicationData.value = res.data.list;
       total.value = res.data.total;
@@ -90,6 +92,7 @@ const queryMyApplication = () => {
     });
 };
 
+// 撤销申请
 const revokeApplication = (applyId: number) => {
   getMaintainerRevoke(applyId)
     .then((res) => {
@@ -109,7 +112,8 @@ const revokeApplication = (applyId: number) => {
 // 待我审批
 const queryApprovalApply = () => {
   if (isAdminPermission.value) {
-    getAdminApply({ name: todoName.value })
+    const newData = getParamsRules(todoParams.value);
+    getAdminApply(newData)
       .then((res) => {
         approvalData.value = res.data.list;
         total.value = res.data.total;
@@ -121,12 +125,30 @@ const queryApprovalApply = () => {
   }
 };
 
+// 待我审批
+const queryApprovedApply = () => {
+  if (isAdminPermission.value) {
+    // { name: todoName.value, applyStatus: 'PASSED,DISMISSED' }
+    getAdminApply({ name: 'approved' })
+      .then((res) => {
+        approvedData.value = res.data.list;
+        total.value = res.data.total;
+        isLoading.value = false;
+      })
+      .catch(() => {
+        isError.value = true;
+      });
+  }
+};
+
 const pageInit = () => {
   isLoading.value = true;
   if (activeName.value === 'application') {
     queryMyApplication();
   } else if (activeName.value === 'approval') {
     queryApprovalApply();
+  } else if (activeName.value === 'approved') {
+    queryApprovedApply();
   }
 };
 
@@ -142,6 +164,16 @@ watch(
     pageInit();
   }
 );
+
+watch(
+  () => todoParams.value,
+  () => {
+    pageInit();
+  },
+  {
+    immediate: true,
+  }
+);
 </script>
 
 <template>
@@ -167,11 +199,16 @@ watch(
             <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
           </div>
         </template>
-        <template v-if="item.id === 'approvalHistory' && approvalHistoryData.length > 0">approvalHistoryData {{ approvalHistoryData.length }} </template>
+        <template v-if="item.id === 'approved' && approvedData.length > 0">
+          <ApprovalTable :columns="approvalColumns" :type="item.id" :data="approvedData" :loading="isLoading" />
+          <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+            <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          </div>
+        </template>
       </template>
 
       <!-- 暂无记录 -->
-      <template v-if="(item.id === 'application' && isError) || (item.id === 'approval' && isError) || (item.id === 'approvalHistory' && isError)">
+      <template v-if="(item.id === 'application' && isError) || (item.id === 'approval' && isError) || (item.id === 'approved' && isError)">
         <Result404>
           <template #description>
             <p class="text404">暂无{{ item.id === 'application' ? '申请' : '审批' }}记录</p>
@@ -183,6 +220,11 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+.pagination-box {
+  margin-top: 24px;
+  display: flex;
+  justify-content: end;
+}
 .loading-box {
   position: relative;
 }
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
index cf8c48f..4345fd9 100644
--- a/src/views/todo/TheTodoDetail.vue
+++ b/src/views/todo/TheTodoDetail.vue
@@ -1,17 +1,26 @@
 <script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import { OButton, OTag, OTextarea } from '@opensig/opendesign';
-import { useRoute, useRouter } from 'vue-router';
-import { getAdminRecords, getMaintainerApply } from '@/api/api-collaboration';
+import { ref, onMounted, computed, reactive } from 'vue';
+import { OButton, OTag, OForm, OTextarea, OFormItem, useMessage, type FieldResultT } from '@opensig/opendesign';
+import { useRoute } from 'vue-router';
+import { getAdminApply, getMaintainerApply, getAdminProcess } from '@/api/api-collaboration';
 import { applyStatus } from '@/data/todo';
 import { formatDateTime } from '@/utils/common';
+import { useUserInfoStore } from '@/stores/user';
 
 const route = useRoute();
-const router = useRouter();
+const message = useMessage();
+const userInfoStore = useUserInfoStore();
+const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 
 const type = ref();
 const applyId = ref(Number(route.params.id) || 0);
 const todoData = ref();
+const formRef = ref<InstanceType<typeof OForm>>();
+const formData = reactive({
+  applyId: applyId.value,
+  comment: '',
+  applyStatus: '',
+});
 
 // 我的申请
 const queryApplicationApply = () => {
@@ -22,16 +31,75 @@ const queryApplicationApply = () => {
 
 // 待我审批
 const queryApprovalApply = () => {
-  getAdminRecords(applyId.value).then((res) => {
+  getAdminApply({ name: 'formContent', applyId: applyId.value }).then((res) => {
     todoData.value = res.data.list[0];
   });
 };
 
+// --------------------审批开始------------------------
+
+// 审批意见验证
+const commentRules = [
+  {
+    required: true,
+    triggers: ['blur'],
+    message: '请输入审批意见',
+    validator: (value: string) => {
+      if (value.length > 1000) {
+        return {
+          type: 'danger',
+          message: '最多不能超过1000字',
+        };
+      }
+    },
+  },
+];
+
+// 通过
+const onSubmit = (results: FieldResultT[]) => {
+  if (results.find((item) => item?.type === 'danger')) {
+    return;
+  } else {
+    formData.applyStatus = 'approved';
+    queryAdminProcess();
+  }
+};
+
+// 驳回
+const rejected = async () => {
+  const items = await formRef.value?.validate();
+  if (items?.find((item) => item?.type === 'danger')) {
+    return;
+  }
+  formData.applyStatus = 'rejected';
+  queryAdminProcess();
+};
+
+const queryAdminProcess = () => {
+  getAdminProcess(formData)
+    .then((res) => {
+      if (res.code === 200) {
+        message.success({
+          content: '审批成功',
+        });
+        formRef.value?.resetFields();
+      }
+    })
+    .catch(() => {
+      message.danger({
+        content: '审批失败',
+      });
+      formRef.value?.resetFields();
+    });
+};
+
+// --------------------审批结束------------------------
+
 onMounted(() => {
   type.value = route.params.type;
   if (type.value === 'application') {
     queryApplicationApply();
-  } else if (type.value === 'approval') {
+  } else if (type.value === 'approval' || type.value === 'approved') {
     queryApprovalApply();
   }
 });
@@ -45,35 +113,51 @@ onMounted(() => {
         <h2>{{ todoData.repo }}</h2>
         <OTag class="app-tag" :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatus[todoData.applyStatus] }} </OTag>
       </div>
-      <dl>
-        <dt>基本信息</dt>
-        <dd><span class="label">申请单号：</span>{{ todoData.applyId }}</dd>
-        <dd><span class="label">申请类型：</span>{{ todoData.metric }}</dd>
-        <dd><span class="label">修改状态：</span>{{ todoData.metricStatus }}</dd>
-        <dd><span class="label">修改理由：</span>{{ todoData.description }}</dd>
-        <dd><span class="label">申请时间：</span>{{ formatDateTime(todoData.updateAt) }}</dd>
-      </dl>
-      <dl>
-        <dt>审批信息</dt>
-        <dd><span class="label">审批人：</span>{{ todoData.adminstrator }}</dd>
-        <dd>
-          <span class="label">审批意见：</span>
-        </dd>
-        <dd>
-          <span class="label">审批时间：</span>
-        </dd>
-      </dl>
-      <dl>
-        <dt>审批</dt>
-        <dd>
-          <span class="label">审批意见：</span>
-          <OTextarea></OTextarea>
-        </dd>
-        <dd>
-          <OButton variant="solid" color="primary">通过</OButton>
-          <OButton color="primary">驳回</OButton>
-        </dd>
-      </dl>
+
+      <h3 class="caption">基本信息</h3>
+      <OForm label-width="92px" label-align="top">
+        <OFormItem label="申请单号：">
+          {{ todoData.applyId }}
+        </OFormItem>
+        <OFormItem label="申请类型：">
+          {{ todoData.metric }}
+        </OFormItem>
+        <OFormItem label="修改状态："> {{ todoData.metricStatus }} </OFormItem>
+        <OFormItem label="修改理由：">{{ todoData.description }} </OFormItem>
+        <OFormItem label="申请时间："> {{ formatDateTime(todoData.updateAt) }} </OFormItem>
+      </OForm>
+      <template v-if="todoData.applyStatus !== 'PENDDING'">
+        <h3 class="caption">审批信息</h3>
+        <OForm label-width="92px" label-align="top">
+          <OFormItem label="审批人：">
+            {{ todoData.adminstrator }}
+          </OFormItem>
+          <OFormItem label="审批意见：">
+            {{ todoData.comment }}
+          </OFormItem>
+          <OFormItem label="审批时间："> - </OFormItem>
+        </OForm>
+      </template>
+      <template v-if="todoData.applyStatus === 'PENDDING' && type === 'approval'">
+        <h3 class="caption">审批</h3>
+        <OForm ref="formRef" has-required :model="formData" label-width="92px" label-align="top" @submit="onSubmit">
+          <OFormItem label="审批意见：" required field="comment" :rules="commentRules">
+            <OTextarea
+              v-model="formData.comment"
+              :max-length="1000"
+              placeholder="请输入审批意见"
+              resize="none"
+              :rows="4"
+              :input-on-outlimit="false"
+              style="width: 480px"
+            ></OTextarea>
+          </OFormItem>
+          <div class="button-box">
+            <OButton variant="solid" color="primary" size="large" type="submit">通过</OButton>
+            <OButton variant="outline" color="primary" size="large" class="reset" @click="rejected">驳回</OButton>
+          </div>
+        </OForm>
+      </template>
     </div>
   </ContentWrapper>
 </template>
@@ -96,20 +180,27 @@ onMounted(() => {
       @include h3;
     }
   }
-  dt {
+  .caption {
     color: var(--o-color-info1);
-    margin-top: 24px;
+    margin: 24px 0 16px;
     font-weight: 500;
     @include h4;
   }
-  dd {
-    color: var(--o-color-info1);
-    display: flex;
-    margin-top: 16px;
+  :deep(.o-form) {
+    --form-item-gap: 16px;
+    --form-label-gap-top: 0;
+    --form-label-main-gap: 24px;
+    .o-form-item-main-wrap {
+      min-height: 24px;
+    }
     @include text1;
-    .label {
-      min-width: 80px;
-      margin-right: 24px;
+  }
+
+  .button-box {
+    display: flex;
+    margin-top: 32px;
+    .o-btn + .o-btn {
+      margin-left: 24px;
     }
   }
 }
-- 
Gitee


From df8187cd31213fb2b83c110f1c8be5970e7f1706 Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Wed, 21 Aug 2024 11:53:24 +0800
Subject: [PATCH 03/17] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api-collaboration.ts                  | 11 +--
 .../collaboration/StatusFeedback.vue          |  2 +-
 src/components/header/AppHeader.vue           |  9 ++-
 src/data/todo/index.ts                        |  6 +-
 src/router/index.ts                           | 29 ++++----
 src/views/collaboration/TheCollaboration.vue  | 68 +++++++++++++------
 src/views/todo/ApprovalTable.vue              | 45 ++++++++++--
 src/views/todo/TheTodo.vue                    | 61 +++++++++++------
 8 files changed, 159 insertions(+), 72 deletions(-)

diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index 52febef..e357703 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -2,17 +2,12 @@ import { request } from '@/shared/axios';
 import type { AxiosResponse } from '@/shared/axios';
 import type { AdminAppryT, CollaborationRepoT } from '@/@types/collaboration'
 
-// maintainer权限
-export function getMaintainerPermission() {
-  const url = `/server/collaboration/maintainer/permission`;
+// 权限
+export function getCollaborationPermissions() {
+  const url = `/server/collaboration/maintainer/permissions`;
   return request.get(url).then((res: AxiosResponse) => res?.data);
 }
 
-// admin权限
-export function getAdminPermission() {
-  const url = `/server/collaboration/admin/permission`;
-  return request.get(url).then((res: AxiosResponse) => res?.data);
-}
 
 // 软件维护详情 maintainer
 export function getMaintainerRepos(params: CollaborationRepoT) {
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index ecea284..c58a2d0 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -20,7 +20,7 @@ const formData = reactive({
   metric: '',
   metricStatus: '',
   description: '',
-  applyStatus: 'PENDDING',
+  applyStatus: 'OPEN',
 });
 
 const statusRadios = [
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index d6b2d2d..e649b2e 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -41,10 +41,15 @@ const goHome = () => {
 };
 
 // 判断是否是协作平台
-
 const isCollaboration = computed(() => {
   return COLLABORATIONPERMISSION.includes(route.name as string);
 });
+
+const jump = (href: string) => {
+  router.push({
+    path: href,
+  });
+};
 </script>
 
 <template>
@@ -63,7 +68,7 @@ const isCollaboration = computed(() => {
       </div>
       <div class="header-right">
         <template v-if="loginStore.isLogined && (userInfoStore.platformAdminPermission || userInfoStore.platformMaintainerPermission)">
-          <OLink v-if="isCollaboration" class="collaboration" :href="`/${locale}/todo/application`">待办中心</OLink>
+          <OLink v-if="isCollaboration" class="collaboration" @click="jump(`/${locale}/todo/application`)">待办中心</OLink>
           <OLink v-else class="collaboration" target="_blank" :href="`/${locale}/collaboration`">协作平台</OLink>
         </template>
         <HeaderTheme />
diff --git a/src/data/todo/index.ts b/src/data/todo/index.ts
index ac0e14a..a43e168 100644
--- a/src/data/todo/index.ts
+++ b/src/data/todo/index.ts
@@ -37,8 +37,8 @@ export const approvalHistoryColumns = [
 
 
 export const applyStatus = {
-  PENDDING: '待审批',
-  DISMISSED: '已驳回',
-  PASSED: '已通过',
+  OPEN: '待审批',
+  REJECTED: '已驳回',
+  APPROVED: '已通过',
   REVOKED: '已撤销',
 };
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 099426a..b0d5e85 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,7 +5,7 @@ import { useLangStore, useViewStore } from '@/stores/common';
 import { tryLogin } from '@/shared/login';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
 import { queryUpstreamPermission } from '@/api/api-user';
-import { getAdminPermission, getMaintainerPermission } from '@/api/api-collaboration';
+import { getCollaborationPermissions } from '@/api/api-collaboration';
 import { COLLABORATIONPERMISSION } from '@/data/query';
 
 const routes = [
@@ -164,21 +164,22 @@ router.beforeEach(async (to) => {
   }
 
 
-  // 协作平台Admin权限
-  if (userInfoStore.platformAdminPermission === null && loginStore.isLogined) {
+  // 协作平台权限
+  if ((userInfoStore.platformMaintainerPermission === null || userInfoStore.platformAdminPermission === null) && loginStore.isLogined) {
     try {
-      const queryAdminPermission = await getAdminPermission();
-      userInfoStore.platformAdminPermission = queryAdminPermission.data.allow_access;
-    } catch {
-      return isPlatform ? { name: 'notFound' } : true;
-    }
-  }
+      const { data } = await getCollaborationPermissions();
+
+      if (data.permissions.length > 0) {
+        if (data.permissions.includes('adminstrator')) {
+          userInfoStore.platformAdminPermission = true;
+        }
+        if (data.permissions.includes('maintainer')) {
+          userInfoStore.platformMaintainerPermission = true;
+        }
+      } else {
+        return isPlatform ? { name: 'notFound' } : true;
+      }
 
-  // 协作平台Maintainer权限
-  if (userInfoStore.platformMaintainerPermission === null && loginStore.isLogined) {
-    try {
-      const queryMaintainerPermission = await getMaintainerPermission();
-      userInfoStore.platformMaintainerPermission = queryMaintainerPermission.data.allow_access;
     } catch {
       return isPlatform ? { name: 'notFound' } : true;
     }
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index c633c82..e4edb3f 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, watch, computed } from 'vue';
 import { OTable, OTag, OLink, OIcon } from '@opensig/opendesign';
 import { getMaintainerRepos, getAdminRepos } from '@/api/api-collaboration';
-import { useLoginStore, useUserInfoStore } from '@/stores/user';
+import { useUserInfoStore } from '@/stores/user';
 import ExternalLink from '@/components/ExternalLink.vue';
 import Indicators from '@/components/collaboration/Indicators.vue';
 import StatusFeedback from '@/components/collaboration/StatusFeedback.vue';
+import Result404 from '@/components/Result404.vue';
 
 import IconOutlink from '~icons/pkg/icon-outlink.svg';
 
@@ -41,26 +42,44 @@ const searchParams = computed(() => {
   };
 });
 
-const data = ref([]);
+const reposData = ref([]);
 const isLoading = ref(false);
+const isError = ref(false);
+
+// Maintainer 数据
 const queryMaintainerRepos = () => {
   getMaintainerRepos(searchParams.value)
     .then((res) => {
-      data.value = res.data.list;
-      total.value = res.data.total;
+      if (res.data.list.length > 0) {
+        reposData.value = res.data.list;
+        total.value = res.data.total;
+      } else {
+        isError.value = true;
+      }
       isLoading.value = false;
     })
-    .catch(() => {});
+    .catch(() => {
+      isError.value = true;
+      isLoading.value = false;
+    });
 };
 
+// Admin 数据
 const queryAdminRepos = () => {
   getAdminRepos(searchParams.value)
     .then((res) => {
-      data.value = res.data.list;
-      total.value = res.data.total;
+      if (res.data.list.length > 0) {
+        reposData.value = res.data.list;
+        total.value = res.data.total;
+      } else {
+        isError.value = true;
+      }
       isLoading.value = false;
     })
-    .catch(() => {});
+    .catch(() => {
+      isError.value = true;
+      isLoading.value = false;
+    });
 };
 
 const pageInit = () => {
@@ -85,7 +104,7 @@ const handleCurrentChange = (val: number) => {
 // 外链确认
 const showExternalDlg = ref(false);
 const externalLink = ref('');
-const onExternalDialog = (href: string) => {
+const changeExternalDialog = (href: string) => {
   externalLink.value = href;
   showExternalDlg.value = true;
 };
@@ -99,10 +118,6 @@ const changeFeedback = (v: string) => {
   repoValue.value = v;
 };
 
-onMounted(() => {
-  pageInit();
-});
-
 watch(
   () => searchParams.value,
   () => {
@@ -125,27 +140,32 @@ watch(
       <Indicators v-if="showDlg" @change="showDlg = false" />
     </div>
     <div class="platform-main" :class="isMainPer ? 'maintainer' : 'admin'">
-      <OTable :columns="columns" :data="data" :loading="loading" border="row">
+      <OTable :columns="columns" :data="reposData" :loading="loading" border="row">
         <template #head="{ columns }">
           <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
         </template>
         <template #td_repo="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}`)"
+          <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}`)"
             ><span class="text">{{ row.repo }} </span><OIcon><IconOutlink /></OIcon
           ></OLink>
         </template>
         <template #td_issueStatus="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}/issues`)"
+          <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/issues`)"
             ><span class="text">{{ row.issueStatus }}</span> <OIcon><IconOutlink /></OIcon
           ></OLink>
         </template>
         <template #td_prStatus="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}/pulls`)"
+          <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/pulls`)"
             ><span class="text">{{ row.prStatus }}</span> <OIcon><IconOutlink /></OIcon
           ></OLink>
         </template>
         <template #td_cveStatus="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="onExternalDialog(`${SRCOPENEULER + row.repo}/issues?single_label_id=85497765`)">
+          <OLink
+            color="primary"
+            class="link-external"
+            hover-underline
+            @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/issues?single_label_id=85497765`)"
+          >
             <span class="text">{{ row.cveStatus }}</span> <OIcon><IconOutlink /></OIcon
           ></OLink>
         </template>
@@ -164,6 +184,16 @@ watch(
         <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
+
+    <!-- 暂无记录 -->
+    <template v-if="isError">
+      <Result404>
+        <template #description>
+          <p class="text404">暂无记录</p>
+        </template>
+      </Result404>
+    </template>
+
     <!-- 跳转外部链接提示 -->
     <ExternalLink v-if="showExternalDlg" :href="externalLink" @change="showExternalDlg = false" />
     <!-- 状态反馈 -->
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 705b217..37e8c43 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { ref, type PropType } from 'vue';
-import { OTable, OLink, OTag } from '@opensig/opendesign';
+import { OTable, OLink, OTag, ODialog, OButton } from '@opensig/opendesign';
 import { useLocale } from '@/composables/useLocale';
 import { useI18n } from 'vue-i18n';
 import { formatDateTime } from '@/utils/common';
@@ -48,8 +48,16 @@ const emits = defineEmits<{
   (e: 'revoke', id: number): void;
 }>();
 
+const showDlg = ref(false);
+const applayId = ref();
 const revokeApplication = (id: number) => {
-  emits('revoke', id);
+  applayId.value = id;
+  showDlg.value = true;
+};
+
+const revoke = () => {
+  emits('revoke', applayId.value);
+  showDlg.value = false;
 };
 </script>
 
@@ -69,7 +77,7 @@ const revokeApplication = (id: number) => {
         <template v-if="type === 'application'">
           <div class="oper-box">
             <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">申请详情</OLink>
-            <OLink color="danger" hover-underline @click="revokeApplication(row.applyId)">撤销申请</OLink>
+            <OLink color="danger" v-if="row.applyStatus === 'open'" hover-underline @click="revokeApplication(row.applyId)">撤销申请</OLink>
           </div>
         </template>
         <template v-if="type === 'approval'">
@@ -80,10 +88,35 @@ const revokeApplication = (id: number) => {
         </template>
       </template>
     </OTable>
+
+    <ODialog v-model:visible="showDlg" class="revoke-dlg" :unmount-on-hide="true" :mask="true" size="small">
+      <template #header>
+        <p class="title">确认撤销</p>
+      </template>
+      <p class="revoke-text">撤销后内容不可恢复，确认是否撤销？</p>
+      <template #footer>
+        <div class="dlg-action">
+          <OButton variant="solid" size="large" color="primary" class="upload" @click="revoke">确认</OButton>
+          <OButton variant="outline" size="large" color="primary" class="upload" @click="showDlg = false">取消</OButton>
+        </div>
+      </template>
+    </ODialog>
   </div>
 </template>
 
 <style lang="scss" scoped>
+.revoke-text {
+  color: var(--o-color-info1);
+  text-align: center;
+  @include text1;
+}
+.dlg-action {
+  display: flex;
+  justify-content: center;
+  .o-btn + .o-btn {
+    margin-left: 16px;
+  }
+}
 .oper-box {
   display: flex;
   align-items: center;
@@ -95,11 +128,11 @@ const revokeApplication = (id: number) => {
 .app-tag {
   min-width: 72px;
   color: var(--o-color-white);
-  &.pendding {
+  &.open {
     --tag-bg-color: var(--o-color-warning1);
     --tag-bd-color: var(--o-color-warning1);
   }
-  &.passed {
+  &.approved {
     --tag-bg-color: var(--o-color-success1);
     --tag-bd-color: var(--o-color-success1);
   }
@@ -108,7 +141,7 @@ const revokeApplication = (id: number) => {
     --tag-bd-color: transparent;
   }
 
-  &.dismissed {
+  &.rejected {
     --tag-bg-color: var(--o-color-danger1);
     --tag-bd-color: var(--o-color-danger1);
   }
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 7df0904..134645b 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -42,13 +42,14 @@ const total = ref(0);
 const todoName = ref('formPage');
 const applyId = ref();
 const isError = ref(false);
-
+const applyStatus = ref('');
 const todoParams = computed(() => {
   return {
     name: todoName.value,
     applyId: applyId.value,
     pageNum: currentPage.value,
     pageSize: pageSize.value,
+    applyStatus: applyStatus.value,
   };
 });
 
@@ -82,8 +83,12 @@ const queryMyApplication = () => {
   const newData = getParamsRules(todoParams.value);
   getMaintainerApply(newData)
     .then((res) => {
-      applicationData.value = res.data.list;
-      total.value = res.data.total;
+      if (res.data.list.length > 0) {
+        applicationData.value = res.data.list;
+        total.value = res.data.total;
+      } else {
+        isError.value = true;
+      }
       isLoading.value = false;
     })
     .catch(() => {
@@ -115,27 +120,37 @@ const queryApprovalApply = () => {
     const newData = getParamsRules(todoParams.value);
     getAdminApply(newData)
       .then((res) => {
-        approvalData.value = res.data.list;
-        total.value = res.data.total;
+        if (res.data.list.length > 0) {
+          approvalData.value = res.data.list;
+          total.value = res.data.total;
+        } else {
+          isError.value = true;
+        }
         isLoading.value = false;
       })
       .catch(() => {
         isError.value = true;
+        isLoading.value = false;
       });
   }
 };
 
-// 待我审批
+// 我审批过的
 const queryApprovedApply = () => {
   if (isAdminPermission.value) {
-    // { name: todoName.value, applyStatus: 'PASSED,DISMISSED' }
-    getAdminApply({ name: 'approved' })
+    const newData = getParamsRules(todoParams.value);
+    getAdminApply(newData)
       .then((res) => {
-        approvedData.value = res.data.list;
-        total.value = res.data.total;
+        if (res.data.list.length > 0) {
+          approvedData.value = res.data.list;
+          total.value = res.data.total;
+        } else {
+          isError.value = true;
+        }
         isLoading.value = false;
       })
       .catch(() => {
+        isLoading.value = false;
         isError.value = true;
       });
   }
@@ -144,10 +159,16 @@ const queryApprovedApply = () => {
 const pageInit = () => {
   isLoading.value = true;
   if (activeName.value === 'application') {
+    applyStatus.value = '';
+    todoName.value = 'formPage';
     queryMyApplication();
   } else if (activeName.value === 'approval') {
+    todoName.value = 'formPage';
+    applyStatus.value = 'OPEN';
     queryApprovalApply();
   } else if (activeName.value === 'approved') {
+    todoName.value = 'approved';
+    applyStatus.value = 'APPROVED,REJECTED';
     queryApprovedApply();
   }
 };
@@ -162,18 +183,20 @@ watch(
   (v: string) => {
     activeName.value = v || 'application';
     pageInit();
+    console.log(' watch activeName');
   }
 );
 
-watch(
-  () => todoParams.value,
-  () => {
-    pageInit();
-  },
-  {
-    immediate: true,
-  }
-);
+// watch(
+//   () => todoParams.value,
+//   () => {
+//     pageInit();
+//     console.log(' watch todoParams.value');
+//   },
+//   {
+//     immediate: true,
+//   }
+// );
 </script>
 
 <template>
-- 
Gitee


From 50836025e7408ed178db4ba7f38984facc733789 Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Wed, 21 Aug 2024 17:33:31 +0800
Subject: [PATCH 04/17] =?UTF-8?q?feature:=20=E5=8D=8F=E4=BD=9C=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=A1=A8=E6=A0=BC=E5=88=97=E5=8A=A0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feature: 进入协作平台页面时判断是否绑定gitee账号
---
 src/@types/type-user.ts                      |  14 +++
 src/api/api-collaboration.ts                 |  23 +++-
 src/api/api-user.ts                          |  14 +--
 src/components/FilterableCheckboxes.vue      | 115 +++++++++++++++++
 src/composables/useCheckbox.ts               |  74 +++++++++++
 src/data/filter/index.ts                     |  33 ++++-
 src/router/index.ts                          |   5 +-
 src/shared/login.ts                          |  13 +-
 src/stores/user.ts                           |   2 +
 src/views/collaboration/TheCollaboration.vue | 123 ++++++++++++++++++-
 10 files changed, 384 insertions(+), 32 deletions(-)
 create mode 100644 src/components/FilterableCheckboxes.vue
 create mode 100644 src/composables/useCheckbox.ts

diff --git a/src/@types/type-user.ts b/src/@types/type-user.ts
index b362726..f7459da 100644
--- a/src/@types/type-user.ts
+++ b/src/@types/type-user.ts
@@ -1,4 +1,18 @@
+export interface Identity {
+  login_name: string,
+  userIdInIdp: string,
+  identity: string, // 第三方平台类型，gitee/github
+  user_name: string,
+  accessToken: string
+}
+
+// 用户账号数据类型
 export interface UserInfoT {
   photo: string; // 头像
   username: string; // 用户名
+  email: string; // 邮箱
+  phoneCountryCode: string, // 区号
+  phone: string, // 手机号
+  identities: Identity[]; // 绑定的第三方平台账号
+  recipientId?: number; // 接收人id
 }
\ No newline at end of file
diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index e357703..92eeae8 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -1,6 +1,6 @@
 import { request } from '@/shared/axios';
 import type { AxiosResponse } from '@/shared/axios';
-import type { AdminAppryT, CollaborationRepoT } from '@/@types/collaboration'
+import type { AdminAppryT, CollaborationRepoT } from '@/@types/collaboration';
 
 // 权限
 export function getCollaborationPermissions() {
@@ -8,7 +8,6 @@ export function getCollaborationPermissions() {
   return request.get(url).then((res: AxiosResponse) => res?.data);
 }
 
-
 // 软件维护详情 maintainer
 export function getMaintainerRepos(params: CollaborationRepoT) {
   const url = `/server/collaboration/maintainer/user/repos`;
@@ -21,6 +20,21 @@ export function getAdminRepos(params: CollaborationRepoT) {
   return request.get(url, { params }).then((res: AxiosResponse) => res?.data);
 }
 
+/**
+ * 获取sig列表
+ */
+export function getSigList() {
+  const url = `/api-dsapi/query/sig/name?community=openeuler`;
+  return request.get<{ data: Record<'openeuler', string[]> }>(url).then((res) => res.data.data.openeuler);
+}
+
+/**
+ * 获取仓库列表
+ */
+export function getRepoList() {
+  const url = `/api-dsapi/query/repo/sig/list?community=openeuler`;
+  return request.get<{ data: Record<string, string>[] }>(url).then((res) => res.data.data.map((item) => Object.keys(item)[0]));
+}
 
 // 待我审批
 export function getAdminApply(params: AdminAppryT) {
@@ -33,8 +47,6 @@ export function getAdminRecords(id: number) {
   return request.get(url).then((res: AxiosResponse) => res?.data);
 }
 
-
-
 // 我的申请
 export function getMaintainerApply(params: AdminAppryT) {
   const url = `/server/collaboration/maintainer/query/apply`;
@@ -47,7 +59,6 @@ export function getMaintainerRevoke(id: number) {
   return request.post(url, { applyId: id }).then((res: AxiosResponse) => res?.data);
 }
 
-
 interface FeedbackT {
   repo: string;
   metric: string;
@@ -70,4 +81,4 @@ interface ProcessT {
 export function getAdminProcess(params: ProcessT) {
   const url = `/server/collaboration/admin/process`;
   return request.post(url, { ...params }).then((res: AxiosResponse) => res?.data);
-}
\ No newline at end of file
+}
diff --git a/src/api/api-user.ts b/src/api/api-user.ts
index d13bb80..7744af2 100644
--- a/src/api/api-user.ts
+++ b/src/api/api-user.ts
@@ -1,7 +1,6 @@
 import type { ResponseT } from '@/@types/response';
 import type { UserInfoT } from '@/@types/type-user';
 import { request } from '@/shared/axios';
-import { getCsrfToken } from '@/shared/login';
 
 interface UserPermissionResponseT {
   msg: string;
@@ -14,16 +13,9 @@ interface UserPermissionResponseT {
  * @param community community字段，默认openeuler
  * @returns {Promise<UserInfoT>} 用户信息
  */
-export function queryUserInfo(community = 'openeuler') {
-  const url = '/api-id/oneid/user/permission';
-  const token = getCsrfToken();
-  return request
-    .get<UserPermissionResponseT>(url, {
-      params: { community },
-      global: true,
-      headers: { token },
-    })
-    .then((res) => res.data.data);
+export function queryUserInfo() {
+  const url = '/api-id/oneid/personal/center/user?community=openeuler';
+  return request.get<UserPermissionResponseT>(url).then((res) => res.data.data);
 }
 
 /**
diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
new file mode 100644
index 0000000..6a572fb
--- /dev/null
+++ b/src/components/FilterableCheckboxes.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import { computed, onMounted, onUnmounted, ref, watch, type PropType } from 'vue';
+import { useDebounceFn } from '@vueuse/core';
+import { OCheckbox, OCheckboxGroup, OInput, OScroller } from '@opensig/opendesign';
+
+import IconSearch from '~icons/app/icon-search.svg';
+import { useCheckbox } from '@/composables/useCheckbox';
+
+const props = defineProps({
+  /** 是否显示筛选输入 */
+  filterable: {
+    type: Boolean,
+    default: true,
+  },
+  /** 多选值 */
+  values: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+  /** 是否开启检测滚动到底部 */
+  detectScrollBottom: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits<{
+  (event: 'change', values: (string | number)[]): void
+  (event: 'scrollBottom'): void
+}>();
+
+const wrapDiv = ref<HTMLDivElement>();
+
+const onScroll = (event: Event) => {
+  const el = event.target as HTMLDivElement;
+  if (el.scrollHeight - Math.round(el.scrollTop) <= el.clientHeight) {
+    emit('scrollBottom');
+  }
+};
+
+onMounted(() => {
+  if (props.detectScrollBottom) {
+    const container = wrapDiv.value?.querySelector('.o-scroller-container') as HTMLDivElement;
+    container && container.addEventListener('scroll', onScroll);
+  }
+});
+
+onUnmounted(() => {
+  if (props.detectScrollBottom) {
+    const container = wrapDiv.value?.querySelector('.o-scroller-container') as HTMLDivElement;
+    container && container.removeEventListener('scroll', onScroll);
+  }
+})
+
+const searchVal = ref<string>();
+
+const actualValues = computed(() => {
+  const search = searchVal.value;
+  if (search) {
+    return props.values.filter((val) => val.includes(search));
+  } else {
+    return props.values;
+  }
+});
+
+const onFilterInput = useDebounceFn((search?: string) => {
+  searchVal.value = search;
+}, 200);
+
+const { checkboxes, parentCheckbox, indeterminate } = useCheckbox(actualValues, (item) => item);
+
+watch(checkboxes, (values) => emit('change', values));
+</script>
+
+<template>
+  <div class="filterable-checkboxes-wrap" :style="filterable ? {} : { paddingTop: '0' }" ref="wrapDiv">
+    <OInput v-if="filterable" clearable @clear="onFilterInput()" @input="onFilterInput" class="filter-input" placeholder="搜索">
+      <template #prefix>
+        <IconSearch />
+      </template>
+    </OInput>
+    <OScroller class="content">
+      <div class="check-all-wrap">
+        <OCheckbox v-model="parentCheckbox" :indeterminate="indeterminate" :value="1">全选</OCheckbox>
+      </div>
+      <OCheckboxGroup v-model="checkboxes" direction="v">
+        <OCheckbox v-for="item in actualValues" :key="item" :value="item">{{ item }}</OCheckbox>
+      </OCheckboxGroup>
+    </OScroller>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.filterable-checkboxes-wrap {
+  background-color: var(--o-color-fill2);
+  padding: 8px;
+  border-radius: 4px;
+
+  .filter-input {
+    --input-radius: 4px;
+    width: 100%;
+  }
+
+  .content {
+    padding: 12px;
+    padding-bottom: 0;
+    max-height: 200px;
+  }
+
+  .check-all-wrap {
+    padding: 16px 0;
+    padding-top: 0;
+  }
+}
+</style>
diff --git a/src/composables/useCheckbox.ts b/src/composables/useCheckbox.ts
new file mode 100644
index 0000000..fef21eb
--- /dev/null
+++ b/src/composables/useCheckbox.ts
@@ -0,0 +1,74 @@
+import { computed, ref, toValue, watch, type MaybeRef } from 'vue';
+
+export const useCheckbox = <T>(datasource: MaybeRef<T[]>, cbValueExtractor: (item: T) => string | number) => {
+  const checkboxes = ref<(string | number)[]>([]);
+  const indeterminate = ref<boolean>(false);
+  const parentCheckbox = ref<(string | number)[]>([]);
+  const isCheckedAll = computed(() => parentCheckbox.value.length > 0);
+  const ONE = [1];
+  const EMPTY: any[] = [];
+
+  const checkAll = () => {
+    indeterminate.value = false;
+    parentCheckbox.value = ONE;
+  };
+
+  const clearCheckboxes = () => {
+    indeterminate.value = false;
+    parentCheckbox.value = EMPTY;
+  };
+
+  watch(
+    () => parentCheckbox.value.length,
+    (length) => {
+      const ds = toValue(datasource);
+      if (ds.length === 0) {
+        return;
+      }
+      if (length) {
+        if (checkboxes.value.length < ds.length) {
+          checkboxes.value = ds.map(cbValueExtractor);
+        }
+      } else {
+        if (!indeterminate.value && checkboxes.value.length > 0) {
+          checkboxes.value = EMPTY;
+        }
+      }
+    }
+  );
+
+  watch(
+    () => checkboxes.value.length,
+    (length) => {
+      const ds = toValue(datasource);
+      if (ds.length === 0) {
+        return;
+      }
+      if (length === ds.length) {
+        if (!isCheckedAll.value) {
+          parentCheckbox.value = ONE;
+        }
+        indeterminate.value = false;
+      } else if (length === 0) {
+        if (isCheckedAll.value) {
+          parentCheckbox.value = EMPTY;
+        }
+        indeterminate.value = false;
+      } else {
+        if (isCheckedAll.value) {
+          parentCheckbox.value = EMPTY;
+        }
+        indeterminate.value = true;
+      }
+    }
+  );
+
+  return {
+    checkboxes,
+    indeterminate,
+    parentCheckbox,
+    isCheckedAll,
+    clearCheckboxes,
+    checkAll,
+  };
+};
diff --git a/src/data/filter/index.ts b/src/data/filter/index.ts
index e38afba..8f0e8f3 100644
--- a/src/data/filter/index.ts
+++ b/src/data/filter/index.ts
@@ -26,4 +26,35 @@ export const arch = [
   "riscv64",
   "loongarch64",
   "sw_64",
-]
\ No newline at end of file
+]
+
+export const collaborationFilter: Record<string, string[]> = {
+  cveStatus: [
+    '有CVE且全部未修复',
+    '有CVE部分修复',
+    '有CVE且全部修复',
+    '没有CVE问题',
+  ],
+  issueStatus: [
+    '没有ISSUE修复',
+    '有部分ISSUE修复',
+    '全部ISSUE修复',
+  ],
+  prStatus: [
+    '没有PR提交',
+    '有PR提交未合入',
+    '有PR合入',
+  ],
+  versionStatus: [
+    '最新版本',
+    '落后版本',
+  ],
+  orgStatus: [
+    '贡献组织多',
+    '贡献组织少',
+  ],
+  contributorStatus: [
+    '贡献人员多',
+    '贡献人员少',
+  ],
+}
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index b0d5e85..011b215 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -153,7 +153,7 @@ router.beforeEach(async (to) => {
     return { name: 'notFound' };
   }
 
-  if (userInfoStore.upstreamPermission === null && loginStore.isLogined) {
+  if (userInfoStore.upstreamPermission === null) {
     try {
       const upstreamPermission = await queryUpstreamPermission();
       userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
@@ -163,9 +163,8 @@ router.beforeEach(async (to) => {
     }
   }
 
-
   // 协作平台权限
-  if ((userInfoStore.platformMaintainerPermission === null || userInfoStore.platformAdminPermission === null) && loginStore.isLogined) {
+  if (userInfoStore.platformMaintainerPermission === null || userInfoStore.platformAdminPermission === null) {
     try {
       const { data } = await getCollaborationPermissions();
 
diff --git a/src/shared/login.ts b/src/shared/login.ts
index d006fb0..b7c1545 100644
--- a/src/shared/login.ts
+++ b/src/shared/login.ts
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie';
-import { useLangStore, useViewStore } from '@/stores/common';
+import { useLangStore } from '@/stores/common';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
-import { queryUpstreamPermission, queryUserInfo } from '@/api/api-user';
+import { queryUserInfo } from '@/api/api-user';
 
 const LOGIN_URL = import.meta.env.VITE_LOGIN_URL;
 const XSRF_COOKIE_NAME = import.meta.env.VITE_XSRF_COOKIE_NAME;
@@ -43,7 +43,11 @@ export function clearUserAuth() {
   // 清除内存中用户信息
   useUserInfoStore().$reset();
   // 清除cookie
-  Cookies.remove(LOGIN_KEYS.CSRF_TOKEN, { domain: import.meta.env.VITE_COOKIE_DOMAIN, path: '/', secure: true });
+  if (import.meta.env.DEV) {
+    Cookies.remove(LOGIN_KEYS.CSRF_TOKEN);
+  } else {
+    Cookies.remove(LOGIN_KEYS.CSRF_TOKEN, { domain: import.meta.env.VITE_COOKIE_DOMAIN, path: '/', secure: true });
+  }
 }
 
 /**
@@ -57,9 +61,6 @@ export async function tryLogin() {
   if (!csrfToken) {
     userInfoStore.$reset();
     loginStore.setLoginStatus(LOGIN_STATUS.NOT);
-
-
-    return false;
   }
   try {
     loginStore.setLoginStatus(LOGIN_STATUS.DOING);
diff --git a/src/stores/user.ts b/src/stores/user.ts
index b7b5d7b..221eeb6 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -1,3 +1,4 @@
+import type { Identity } from '@/@types/type-user';
 import { LOGIN_STATUS, type LoginStatusT } from '@/shared/login';
 import { defineStore } from 'pinia';
 
@@ -7,6 +8,7 @@ import { defineStore } from 'pinia';
 export const useUserInfoStore = defineStore('userInfo', {
   state: () => {
     return {
+      identities: [] as Identity[],
       photo: '' as string,
       username: '' as string,
       upstreamPermission: null as boolean | null,
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index e4edb3f..24124ee 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { ref, watch, computed } from 'vue';
-import { OTable, OTag, OLink, OIcon } from '@opensig/opendesign';
-import { getMaintainerRepos, getAdminRepos } from '@/api/api-collaboration';
+import { ref, watch, computed, onMounted, type ComponentPublicInstance, reactive, toRefs } from 'vue';
+import { OTable, OTag, OLink, OIcon, OPopup, OPopover } from '@opensig/opendesign';
+import { getMaintainerRepos, getAdminRepos, getSigList, getRepoList } from '@/api/api-collaboration';
 import { useUserInfoStore } from '@/stores/user';
 import ExternalLink from '@/components/ExternalLink.vue';
 import Indicators from '@/components/collaboration/Indicators.vue';
@@ -9,6 +9,10 @@ import StatusFeedback from '@/components/collaboration/StatusFeedback.vue';
 import Result404 from '@/components/Result404.vue';
 
 import IconOutlink from '~icons/pkg/icon-outlink.svg';
+import IconFilter from '~icons/app/icon-filter.svg';
+import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
+import { collaborationFilter } from '@/data/filter';
+import { useDebounceFn } from '@vueuse/core';
 
 const columns = [
   { label: '软件仓库', key: 'repo', type: 'repo' },
@@ -24,6 +28,42 @@ const columns = [
   { label: '操作', key: 'operation', type: 'operation' },
 ];
 
+const { identities } = toRefs(useUserInfoStore());
+
+const hasGiteeAccount = computed(() => !!identities.value.find((id) => id.identity === 'gitee'));
+
+const allSigs = ref<string[]>();
+const allRepos = ref<string[]>();
+const displayRepos = ref<string[]>();
+
+// 筛选
+const filterPopupTargets = ref(new Array<ComponentPublicInstance>(columns.length));
+
+// 筛选组件是否显示的开关
+const filterSwitches = ref(columns.map(() => false));
+
+// 切换某个筛选组件显示开关
+const switchFilterVisible = (index: number) => {
+  filterSwitches.value[index] = !filterSwitches.value[index];
+};
+
+const onFilterChange = useDebounceFn((type: string, values: (string | number)[]) => {
+  filterParams[type] = values.join();
+}, 300);
+
+watch(
+  () => filterSwitches.value[0],
+  (val) => {
+    if (!val) {
+      displayRepos.value = allRepos.value?.slice(0, 30);
+    }
+  }
+);
+
+const onRepoFilterScrollBottom = () => {
+  displayRepos.value && (displayRepos.value = allRepos.value?.slice(0, displayRepos.value?.length + 30));
+};
+
 const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
 
 const userInfoStore = useUserInfoStore();
@@ -35,10 +75,25 @@ const currentPage = ref(1);
 const pageSize = ref(10);
 const total = ref(0);
 
+// 筛选条件
+const filterParams = reactive<Record<string, string>>({
+  repo: '' as string,
+  kind: '' as string,
+  sigName: '' as string,
+  cveStatus: '' as string,
+  issueStatus: '' as string,
+  prStatus: '' as string,
+  versionStatus: '' as string,
+  orgStatus: '' as string,
+  contributorStatus: '' as string,
+  status: '' as string,
+});
+
 const searchParams = computed(() => {
   return {
     pageNum: currentPage.value,
     pageSize: pageSize.value,
+    ...filterParams
   };
 });
 
@@ -82,6 +137,14 @@ const queryAdminRepos = () => {
     });
 };
 
+onMounted(() => {
+  getSigList().then((list) => (allSigs.value = list));
+  getRepoList().then((list) => {
+    allRepos.value = list;
+    displayRepos.value = allRepos.value.slice(0, 30);
+  });
+});
+
 const pageInit = () => {
   if (isAdminPer.value) {
     queryAdminRepos();
@@ -142,7 +205,33 @@ watch(
     <div class="platform-main" :class="isMainPer ? 'maintainer' : 'admin'">
       <OTable :columns="columns" :data="reposData" :loading="loading" border="row">
         <template #head="{ columns }">
-          <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
+          <th v-for="(item, index) in columns" :key="item.type" :class="item.type" :ref="(el) => (filterPopupTargets[index] = el as ComponentPublicInstance)">
+            <div class="header-cell">
+              {{ item.label }}
+              <template v-if="item.key !== 'operation'">
+                <OPopover>
+                  <p class="bubble-content">
+                    <span class="title">{{ item.label }}:</span> {{ reposData.map((row) => row[item.key]).join('、') }}
+                  </p>
+                  <template #target>
+                    <OIcon class="filter-icon" @click="switchFilterVisible(index)"><IconFilter /></OIcon>
+                  </template>
+                </OPopover>
+                <OPopup trigger="none" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl" :target="filterPopupTargets[index]">
+                  <FilterableCheckboxes
+                    @scroll-bottom="onRepoFilterScrollBottom"
+                    :detect-scroll-bottom="true"
+                    @change="onFilterChange(item.key, $event)"
+                    v-if="item.key === 'repo'"
+                    :values="displayRepos"
+                  />
+                  <FilterableCheckboxes @change="onFilterChange(item.key, $event)" v-else-if="item.key === 'sigName'" :values="allSigs" />
+                  <FilterableCheckboxes @change="onFilterChange(item.key, $event)" v-else-if="item.key === 'kind'" />
+                  <FilterableCheckboxes :filterable="false" @change="onFilterChange(item.key, $event)" v-else :values="collaborationFilter[item.key]" />
+                </OPopup>
+              </template>
+            </div>
+          </th>
         </template>
         <template #td_repo="{ row }">
           <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}`)"
@@ -186,7 +275,7 @@ watch(
     </div>
 
     <!-- 暂无记录 -->
-    <template v-if="isError">
+    <template v-if="isError || !hasGiteeAccount">
       <Result404>
         <template #description>
           <p class="text404">暂无记录</p>
@@ -203,6 +292,30 @@ watch(
 </template>
 
 <style scoped lang="scss">
+.bubble-content {
+  color: var(--o-color-info1);
+  max-width: 300px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  line-clamp: 3;
+  overflow: hidden;
+
+  .title {
+    font-weight: bold;
+  }
+}
+
+.header-cell {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .filter-icon {
+    width: 16px;
+    cursor: pointer;
+  }
+}
 .platform-header {
   border-bottom: 1px solid var(--o-color-control4);
   padding: 48px 0 24px;
-- 
Gitee


From 00eea4ff49700d6694593e652bae1c00ae5df909 Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Wed, 21 Aug 2024 18:54:10 +0800
Subject: [PATCH 05/17] =?UTF-8?q?fix:=20loading=E6=8F=90=E7=A4=BA=E3=80=81?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96=E3=80=81=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E3=80=81=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   5 +
 src/@types/collaboration.ts                   |   5 +-
 src/api/api-collaboration.ts                  |   8 +-
 .../style/category/collaboration/index.scss   |  47 ++++++
 src/assets/style/theme/index.scss             |   1 +
 src/assets/style/theme/result.scss            |   3 +
 src/components/collaboration/CBreadcrumb.vue  |   2 +-
 .../collaboration/FeedbackHistroy.vue         | 149 +++++++++++++++++
 .../collaboration/GiteeAccountDialog.vue      |  47 ++++++
 src/components/collaboration/Indicators.vue   |  52 ++----
 .../collaboration/StatusFeedback.vue          |  62 ++-----
 src/components/header/AppHeader.vue           |  34 +++-
 src/components/header/AppLogin.vue            |   3 +-
 src/data/todo/index.ts                        |  49 +++++-
 src/i18n/collaboration/collaboration-en.ts    |   5 +
 src/i18n/collaboration/collaboration-zh.ts    |   5 +
 src/i18n/collaboration/index.ts               |   7 +
 src/i18n/index.ts                             |   3 +
 src/router/index.ts                           |   9 +-
 src/stores/user.ts                            |   2 +
 src/views/collaboration/TheCollaboration.vue  |  56 ++++++-
 src/views/package/RpmContent.vue              |   3 -
 src/views/todo/ApprovalTable.vue              | 109 +++++--------
 src/views/todo/TheTodo.vue                    | 154 ++++++++++--------
 src/views/todo/TheTodoDetail.vue              |  74 +++++----
 25 files changed, 610 insertions(+), 284 deletions(-)
 create mode 100644 src/assets/style/category/collaboration/index.scss
 create mode 100644 src/assets/style/theme/result.scss
 create mode 100644 src/components/collaboration/FeedbackHistroy.vue
 create mode 100644 src/components/collaboration/GiteeAccountDialog.vue
 create mode 100644 src/i18n/collaboration/collaboration-en.ts
 create mode 100644 src/i18n/collaboration/collaboration-zh.ts
 create mode 100644 src/i18n/collaboration/index.ts

diff --git a/components.d.ts b/components.d.ts
index 483377d..8211204 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -19,6 +19,7 @@ declare module 'vue' {
     AppTableToggle: typeof import('./src/components/AppTableToggle.vue')['default']
     CBreadcrumb: typeof import('./src/components/collaboration/CBreadcrumb.vue')['default']
     ContentWrapper: typeof import('./src/components/ContentWrapper.vue')['default']
+    copy: typeof import('./src/components/collaboration/StatusFeedback copy.vue')['default']
     DetailAside: typeof import('./src/components/detail/DetailAside.vue')['default']
     DetailBasicInfo: typeof import('./src/components/detail/DetailBasicInfo.vue')['default']
     DetailHeader: typeof import('./src/components/detail/DetailHeader.vue')['default']
@@ -30,11 +31,15 @@ declare module 'vue' {
     ExternalLink: typeof import('./src/components/ExternalLink.vue')['default']
     FeedbackHistory: typeof import('./src/components/feedbackHistory/FeedbackHistory.vue')['default']
     FeedbackHistoryItem: typeof import('./src/components/feedbackHistory/FeedbackHistoryItem.vue')['default']
+    FeedbackHistroy: typeof import('./src/components/collaboration/FeedbackHistroy.vue')['default']
+    FilterableCheckboxes: typeof import('./src/components/FilterableCheckboxes.vue')['default']
     FilterCheckbox: typeof import('./src/components/filter/FilterCheckbox.vue')['default']
     FilterHeader: typeof import('./src/components/filter/FilterHeader.vue')['default']
     FilterItemSkeleton: typeof import('./src/components/skeleton/FilterItemSkeleton.vue')['default']
     FilterOrder: typeof import('./src/components/filter/FilterOrder.vue')['default']
     FilterRadio: typeof import('./src/components/filter/FilterRadio.vue')['default']
+    GiteeAccountDialog: typeof import('./src/components/collaboration/GiteeAccountDialog.vue')['default']
+    GiteeDialog: typeof import('./src/components/collaboration/GiteeDialog.vue')['default']
     HeaderNav: typeof import('./src/components/header/HeaderNav.vue')['default']
     HeaderTheme: typeof import('./src/components/header/HeaderTheme.vue')['default']
     HomeSkeleton: typeof import('./src/components/skeleton/HomeSkeleton.vue')['default']
diff --git a/src/@types/collaboration.ts b/src/@types/collaboration.ts
index b834ffc..a083e11 100644
--- a/src/@types/collaboration.ts
+++ b/src/@types/collaboration.ts
@@ -1,11 +1,12 @@
 export interface CollaborationT {
-  name: string;
+  name?: string;
   pageSize?: number;
   pageNum?: number;
 }
 
 export interface AdminAppryT extends CollaborationT {
-  applyId?: number;
+  applyId?: string | number;
+  applyIdString?: string;
   applyStatus?: string;
   repo?: string;
   metric?: string;
diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index 92eeae8..ab060c6 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -41,11 +41,7 @@ export function getAdminApply(params: AdminAppryT) {
   const url = `/server/collaboration/admin/query/apply`;
   return request.get(url, { params }).then((res: AxiosResponse) => res?.data);
 }
-// 审批
-export function getAdminRecords(id: number) {
-  const url = `/server/collaboration/admin/query/records?applyId=${id}`;
-  return request.get(url).then((res: AxiosResponse) => res?.data);
-}
+
 
 // 我的申请
 export function getMaintainerApply(params: AdminAppryT) {
@@ -68,7 +64,7 @@ interface FeedbackT {
 }
 
 export function getApplyFeedback(params: FeedbackT) {
-  const url = `/server/collaboration/maintainer/apply`;
+  const url = `/server/collaboration/maintainer/apply?repo=${params.repo}`;
   return request.post(url, { ...params }).then((res: AxiosResponse) => res?.data);
 }
 
diff --git a/src/assets/style/category/collaboration/index.scss b/src/assets/style/category/collaboration/index.scss
new file mode 100644
index 0000000..66a570c
--- /dev/null
+++ b/src/assets/style/category/collaboration/index.scss
@@ -0,0 +1,47 @@
+.repo-status {
+  :deep(.o-tag) {
+    --tag-color: var(--o-color-white);
+    --tag-bd-color: transparent;
+    min-width: 72px;
+
+    &.type0 {
+      --tag-bg-color: var(--o-color-success1);
+    }
+    &.type1 {
+      --tag-bg-color: #03b5a5;
+    }
+    &.type2 {
+      --tag-bg-color: #f5cd05;
+    }
+    &.type3 {
+      --tag-bg-color: var(--o-color-warning1);
+    }
+    &.type4 {
+      --tag-bg-color: var(--o-color-danger1);
+    }
+  }
+}
+
+.apply-status {
+  :deep(.o-tag) {
+    min-width: 72px;
+    color: var(--o-color-white);
+    &.open {
+      --tag-bg-color: var(--o-color-warning1);
+      --tag-bd-color: var(--o-color-warning1);
+    }
+    &.approved {
+      --tag-bg-color: var(--o-color-success1);
+      --tag-bd-color: var(--o-color-success1);
+    }
+    &.revoked {
+      --tag-bg-color: var(--o-color-control1);
+      --tag-bd-color: transparent;
+    }
+
+    &.rejected {
+      --tag-bg-color: var(--o-color-danger1);
+      --tag-bd-color: var(--o-color-danger1);
+    }
+  }
+}
diff --git a/src/assets/style/theme/index.scss b/src/assets/style/theme/index.scss
index 3aaaeb1..dd6e726 100644
--- a/src/assets/style/theme/index.scss
+++ b/src/assets/style/theme/index.scss
@@ -11,3 +11,4 @@
 @use './popup.scss' as *;
 @use './tab.scss' as *;
 @use './rate.scss' as *;
+@use './result.scss' as *;
diff --git a/src/assets/style/theme/result.scss b/src/assets/style/theme/result.scss
new file mode 100644
index 0000000..274b722
--- /dev/null
+++ b/src/assets/style/theme/result.scss
@@ -0,0 +1,3 @@
+.o-result-content {
+  color: var(--o-color-info1);
+}
diff --git a/src/components/collaboration/CBreadcrumb.vue b/src/components/collaboration/CBreadcrumb.vue
index 53d3067..d28a0af 100644
--- a/src/components/collaboration/CBreadcrumb.vue
+++ b/src/components/collaboration/CBreadcrumb.vue
@@ -22,7 +22,7 @@ const { t } = useI18n();
 <template>
   <OBreadcrumb class="app-breadcrumb">
     <OBreadcrumbItem :to="`/${locale}/collaboration`">待办中心</OBreadcrumbItem>
-    <OBreadcrumbItem :to="`/${locale}/todo/${type}`">{{ type }}</OBreadcrumbItem>
+    <OBreadcrumbItem :to="`/${locale}/todo/${type}`">{{ t(`collaboration.${type}`) }}</OBreadcrumbItem>
     <OBreadcrumbItem>{{ repo }} </OBreadcrumbItem>
   </OBreadcrumb>
 </template>
diff --git a/src/components/collaboration/FeedbackHistroy.vue b/src/components/collaboration/FeedbackHistroy.vue
new file mode 100644
index 0000000..a249071
--- /dev/null
+++ b/src/components/collaboration/FeedbackHistroy.vue
@@ -0,0 +1,149 @@
+<script lang="ts" setup>
+import { ref, onMounted, computed, watch } from 'vue';
+import { ODialog, OTable, OTag } from '@opensig/opendesign';
+
+import { getMaintainerApply } from '@/api/api-collaboration';
+import { formatDateTime } from '@/utils/common';
+import { applyStatus } from '@/data/todo';
+
+import { COUNT_PAGESIZE } from '@/data/query';
+
+const props = defineProps({
+  repo: {
+    type: String,
+    default: () => '',
+  },
+});
+
+const showDlg = ref(true);
+
+// 分页
+const currentPage = ref(1);
+const pageSize = ref(10);
+const total = ref(0);
+
+const columns = [
+  { label: '申请类型', key: 'metric', type: 'metric' },
+  { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
+  { label: '修改理由', key: 'description', type: 'description' },
+  { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
+  { label: '审批人', key: 'adminstrator', type: 'adminstrator' },
+  { label: '审批意见', key: 'comment', type: 'comment' },
+  { label: '申请单号', key: 'applyIdString', type: 'applyId' },
+  { label: '申请时间', key: 'updateAt', type: 'time' },
+];
+
+const emits = defineEmits<{
+  (e: 'close'): void;
+}>();
+
+const searchParams = computed(() => {
+  return {
+    name: 'formPage',
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
+    repo: props.repo,
+  };
+});
+
+const isLoading = ref(false);
+const reposData = ref([]);
+
+const queryMaintainerApply = () => {
+  isLoading.value = true;
+  getMaintainerApply(searchParams.value)
+    .then((res) => {
+      if (res.data.list.length > 0) {
+        reposData.value = res.data.list;
+        total.value = res.data.total;
+      } else {
+        reposData.value = [];
+      }
+
+      isLoading.value = false;
+    })
+    .catch(() => {
+      reposData.value = [];
+      isLoading.value = false;
+    });
+};
+
+/* ---------------分页事件------------------ */
+const handleSizeChange = (val: number) => {
+  pageSize.value = val;
+  currentPage.value = 1;
+};
+const handleCurrentChange = (val: number) => {
+  currentPage.value = val;
+};
+
+const onChange = () => {
+  emits('close');
+};
+
+onMounted(() => {
+  queryMaintainerApply();
+});
+
+watch(
+  () => searchParams.value,
+  () => {
+    queryMaintainerApply();
+  },
+  { deep: true }
+);
+</script>
+
+<template>
+  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" @change="onChange" size="large">
+    <template #header>
+      <p class="title">反馈历史</p>
+    </template>
+    <div class="feedback-histroy">
+      <OTable :columns="columns" :data="reposData" :loading="isLoading" border="row">
+        <template #head="{ columns }">
+          <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
+        </template>
+        <template #td_updateAt="{ row }">
+          {{ formatDateTime(row.updateAt) }}
+        </template>
+        <template #td_applyStatus="{ row }">
+          <div class="apply-status">
+            <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+          </div>
+        </template>
+      </OTable>
+      <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+        <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+  </ODialog>
+</template>
+
+<style lang="scss" scoped>
+@import '@/assets/style/category/collaboration/index.scss';
+.feedback-histroy {
+  :deep(.o-table) {
+    .o-table-wrap {
+      overflow-x: auto;
+      overflow-y: hidden;
+      @include scrollbar;
+    }
+    table {
+      table-layout: fixed;
+    }
+    th {
+      width: 168px;
+      &.applyStatus {
+        width: 120px;
+      }
+      &.adminstrator {
+        width: 120px;
+      }
+      .time {
+        width: 145px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/collaboration/GiteeAccountDialog.vue b/src/components/collaboration/GiteeAccountDialog.vue
new file mode 100644
index 0000000..4a71980
--- /dev/null
+++ b/src/components/collaboration/GiteeAccountDialog.vue
@@ -0,0 +1,47 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ODialog, OButton } from '@opensig/opendesign';
+import { windowOpen } from '@/utils/common';
+
+const showGiteeDlg = ref(true);
+
+const emits = defineEmits<{
+  (e: 'close'): void;
+}>();
+
+// 跳转个人中心绑定账号
+const USER_CENTER = import.meta.env.VITE_LOGIN_URL;
+const jumpAccount = () => {
+  showGiteeDlg.value = false;
+  emits('close');
+  windowOpen(USER_CENTER);
+};
+const onChange = () => {
+  emits('close');
+};
+</script>
+
+<template>
+  <ODialog v-model:visible="showGiteeDlg" class="revoke-dlg" :unmount-on-hide="true" :mask="true" size="small" @change="onChange">
+    <template #header>
+      <p class="title">绑定账号</p>
+    </template>
+    <p class="revoke-text">想要获取相关信息，请先前往个人中心-账号绑定 绑定您的Gitee账号</p>
+    <template #footer>
+      <div class="dlg-action">
+        <OButton variant="solid" size="large" color="primary" class="upload" @click="jumpAccount">前往绑定</OButton>
+        <OButton variant="outline" size="large" color="primary" class="upload" @click="showGiteeDlg = false">取消</OButton>
+      </div>
+    </template>
+  </ODialog>
+</template>
+
+<style lang="scss" scoped>
+.dlg-action {
+  display: flex;
+  justify-content: center;
+  .o-btn + .o-btn {
+    margin-left: 16px;
+  }
+}
+</style>
diff --git a/src/components/collaboration/Indicators.vue b/src/components/collaboration/Indicators.vue
index e2db9b0..76a654c 100644
--- a/src/components/collaboration/Indicators.vue
+++ b/src/components/collaboration/Indicators.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import { OTable, OTag, ODialog } from '@opensig/opendesign';
+import { repoStatusIndex } from '@/data/todo';
 
 const columns = [
   { label: 'CVE分类', key: 'cve', type: 'cve' },
@@ -17,7 +18,7 @@ const data = [
     cveType: 'CVE全部未修复',
     contribution: '没有ISSUE修复',
     details: '-',
-    maintenance: 5,
+    maintenance: '没有人维护',
     description: 'CVE全部未修复，且没有ISSUE修复',
   },
   {
@@ -25,7 +26,7 @@ const data = [
     cveType: 'CVE全部未修复',
     contribution: '有部分ISSUE修复',
     details: '-',
-    maintenance: 4,
+    maintenance: '缺人维护',
     description: 'CVE全部未修复，且有部分ISSUE被修复',
   },
   {
@@ -33,7 +34,7 @@ const data = [
     cveType: 'CVE全部未修复',
     contribution: '全部ISSUE修复',
     details: '-',
-    maintenance: 4,
+    maintenance: '缺人维护',
     description: 'CVE全部未修复，全部ISSUE都被修复',
   },
   {
@@ -41,7 +42,7 @@ const data = [
     cveType: 'CVE部分修复',
     contribution: '-',
     details: '-',
-    maintenance: 4,
+    maintenance: '缺人维护',
     description: 'CVE部分修复',
   },
   {
@@ -49,7 +50,7 @@ const data = [
     cveType: 'CVE全部修复',
     contribution: '-',
     details: '-',
-    maintenance: 1,
+    maintenance: '健康',
     description: 'CVE全部修复',
   },
   {
@@ -57,7 +58,7 @@ const data = [
     cveType: '没有CVE问题',
     contribution: '没有PR提交',
     details: '最新版本',
-    maintenance: 1,
+    maintenance: '健康',
     description: '没有CVE问题，且也没有PR提交，且软件包是最新版本',
   },
   {
@@ -65,7 +66,7 @@ const data = [
     cveType: '没有CVE问题',
     contribution: '没有PR提交',
     details: '落后版本',
-    maintenance: 3,
+    maintenance: '静止',
     description: '没有CVE问题，且也没有PR提交，且软件包是落后版本',
   },
   {
@@ -73,7 +74,7 @@ const data = [
     cveType: '没有CVE问题',
     contribution: '有PR合入',
     details: '-',
-    maintenance: 2,
+    maintenance: '活跃',
     description: '没有CVE问题，有PR合入',
   },
   {
@@ -81,7 +82,7 @@ const data = [
     cveType: '没有CVE问题',
     contribution: '有PR提交未合入',
     details: '-',
-    maintenance: 2,
+    maintenance: '活跃',
     description: '没有CVE问题，有PR提交但是没有PR被合入',
   },
 ];
@@ -115,14 +116,6 @@ const cellSpanFn = (rowIdx: number, colIdx: number) => {
   }
 };
 
-const mainStatus = {
-  1: '健康',
-  2: '活跃',
-  3: '静止',
-  4: '缺人维护',
-  5: '没有人维护',
-};
-
 const showDlg = ref(true);
 
 const emits = defineEmits<{
@@ -152,7 +145,9 @@ const onChange = () => {
       <p class="title">软件包维护状态指标</p>
       <OTable class="main-table" :columns="columns" :data="data" :cell-span="cellSpanFn" border="all">
         <template #td_maintenance="{ row }">
-          <OTag :class="`type${row.maintenance}`" size="small">{{ mainStatus[row.maintenance] }} </OTag>
+          <div class="repo-status">
+            <OTag :class="`type${repoStatusIndex(row.maintenance)}`" size="small">{{ row.maintenance }} </OTag>
+          </div>
         </template>
       </OTable>
       <p class="title">详细指标</p>
@@ -161,27 +156,8 @@ const onChange = () => {
 </template>
 
 <style lang="scss" scoped>
-:deep(.o-tag) {
-  --tag-color: var(--o-color-white);
-  --tag-bd-color: transparent;
-  min-width: 56px;
+@import '@/assets/style/category/collaboration/index.scss';
 
-  &.type1 {
-    --tag-bg-color: var(--o-color-success1);
-  }
-  &.type2 {
-    --tag-bg-color: #03b5a5;
-  }
-  &.type3 {
-    --tag-bg-color: #f5cd05;
-  }
-  &.type4 {
-    --tag-bg-color: var(--o-color-warning1);
-  }
-  &.type5 {
-    --tag-bg-color: var(--o-color-danger1);
-  }
-}
 .o-table {
   margin: 16px 0;
 }
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index c58a2d0..cef14f1 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { ODialog, OButton, OForm, OTextarea, OFormItem, ORadioGroup, ORadio, OSelect, OOption, type FieldResultT, useMessage } from '@opensig/opendesign';
 
 import { getApplyFeedback } from '@/api/api-collaboration';
+import { applicationType } from '@/data/todo/';
 
 const props = defineProps({
   repo: {
@@ -23,43 +24,17 @@ const formData = reactive({
   applyStatus: 'OPEN',
 });
 
-const statusRadios = [
-  {
-    id: 'cveStatus',
-    label: 'CVE状态',
-  },
-  {
-    id: 'issueStatus',
-    label: 'ISSUE状态',
-  },
-  {
-    id: 'prStatus',
-    label: '软件包更新状态',
-  },
-  {
-    id: 'versionStatus',
-    label: '软件包版本状态',
-  },
-  {
-    id: 'orgStatus',
-    label: '贡献组织状态',
-  },
-  {
-    id: 'contributorStatus',
-    label: '贡献人员状态',
-  },
-];
+const emits = defineEmits<{
+  (e: 'close'): void;
+}>();
 
-const optionLists = [
-  {
-    id: 'latest',
-    label: '最新版本',
-  },
-  {
-    id: 'outdated',
-    label: '落后版本',
-  },
-];
+const metricIndex = ref(-1);
+const onChangeRadio = (v: string) => {
+  formData.metricStatus = '';
+  metricIndex.value = applicationType.findIndex((item) => item.label === v);
+};
+// 根据状态获取
+const metricCategory = computed(() => (metricIndex.value === -1 ? [] : applicationType[metricIndex.value].children));
 
 // 重置表单数据
 const reset = () => {
@@ -103,9 +78,6 @@ const descriptionRules = [
     },
   },
 ];
-const emits = defineEmits<{
-  (e: 'close'): void;
-}>();
 
 const onSubmit = (results: FieldResultT[]) => {
   if (results.find((item) => item?.type === 'danger')) {
@@ -118,6 +90,7 @@ const onSubmit = (results: FieldResultT[]) => {
             content: '反馈成功',
           });
           showDlg.value = false;
+          emits('close');
         }
       })
       .catch(() => {
@@ -126,28 +99,27 @@ const onSubmit = (results: FieldResultT[]) => {
         });
         showDlg.value = false;
       });
-    emits('close');
   }
 };
 </script>
 
 <template>
-  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" @change="onChange" size="large">
+  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" @change="onChange" size="large">
     <template #header>
       <p class="title">状态反馈</p>
     </template>
     <div class="indicators">
       <OForm ref="formRef" has-required :model="formData" label-width="220px" label-align="top" @submit="onSubmit">
         <OFormItem label="请选择您要修改的状态类别" required field="metric" :rules="metricRules">
-          <ORadioGroup class="metric-options" v-model="formData.metric" direction="v">
-            <ORadio v-for="option in statusRadios" :key="option.id" :value="option.id">
+          <ORadioGroup class="metric-options" v-model="formData.metric" direction="v" @change="(v) => onChangeRadio(v)">
+            <ORadio v-for="option in applicationType" :key="option.label" :value="option.label">
               {{ option.label }}
             </ORadio>
           </ORadioGroup>
         </OFormItem>
         <OFormItem label="修改状态" required field="metricStatus" :rules="modifyRules">
           <OSelect v-model="formData.metricStatus" size="large" style="width: 100%">
-            <OOption v-for="item in optionLists" :key="item.id" :label="item.label" :value="item.id" />
+            <OOption v-for="item in metricCategory" :key="item" :label="item" :value="item" />
           </OSelect>
         </OFormItem>
         <OFormItem label="修改理由" required field="description" :rules="descriptionRules">
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index e649b2e..2ac1469 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, watch } from 'vue';
+import { computed, watch, ref } from 'vue';
 import { ODivider, OLink } from '@opensig/opendesign';
 import { useRouter, useRoute } from 'vue-router';
 import { useLangStore } from '@/stores/common';
@@ -8,11 +8,13 @@ import { useI18n } from 'vue-i18n';
 import { navs, collaborationNav } from '@/data/nav';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
 import { COLLABORATIONPERMISSION } from '@/data/query';
+import { windowOpen } from '@/utils/common';
 
 import { useTheme } from '@/composables/useTheme';
 import HeaderNav from '@/components/header/HeaderNav.vue';
 import AppLogin from '@/components/header/AppLogin.vue';
 import HeaderTheme from '@/components/header/HeaderTheme.vue';
+import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
 
 import openeulerLogo from '@/assets/openeuler-logo.svg';
 import openeulerLogoDark from '@/assets/openeuler-logo-dark.svg';
@@ -24,6 +26,8 @@ const langStore = useLangStore();
 const { isDark } = useTheme();
 const loginStore = useLoginStore();
 const userInfoStore = useUserInfoStore();
+const isMainPer = computed(() => userInfoStore.platformMaintainerAllPermission);
+const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 
 watch(
   () => {
@@ -45,10 +49,20 @@ const isCollaboration = computed(() => {
   return COLLABORATIONPERMISSION.includes(route.name as string);
 });
 
+const showGiteeDlg = ref(false);
 const jump = (href: string) => {
-  router.push({
-    path: href,
-  });
+  if (isAdminPer.value || isMainPer.value) {
+    if (href === 'collaboration') {
+      windowOpen(`/${locale.value}/${href}`, '_blank');
+    } else {
+      router.push({
+        path: `/${locale.value}/${href}`,
+      });
+    }
+  } else {
+    // 如果Maintainer没有绑定gitee，弹窗提醒
+    showGiteeDlg.value = true;
+  }
 };
 </script>
 
@@ -64,17 +78,18 @@ const jump = (href: string) => {
           <span v-if="isCollaboration" class="logo-text">{{ t('software.softwareHome') }}协作平台</span>
           <span v-else @click="goHome" class="logo-text">{{ t('software.softwareHome') }}</span>
         </div>
-        <HeaderNav :options="isCollaboration ? collaborationNav : navs" />
+        <HeaderNav v-if="route.name" :options="isCollaboration ? collaborationNav : navs" />
       </div>
       <div class="header-right">
-        <template v-if="loginStore.isLogined && (userInfoStore.platformAdminPermission || userInfoStore.platformMaintainerPermission)">
-          <OLink v-if="isCollaboration" class="collaboration" @click="jump(`/${locale}/todo/application`)">待办中心</OLink>
-          <OLink v-else class="collaboration" target="_blank" :href="`/${locale}/collaboration`">协作平台</OLink>
+        <template v-if="loginStore.isLogined">
+          <OLink v-if="isCollaboration" class="todo" @click="jump(`todo/application`)">待办中心</OLink>
+          <OLink v-else class="collaboration" @click="jump(`collaboration`)">协作平台</OLink>
         </template>
         <HeaderTheme />
         <AppLogin />
       </div>
     </div>
+    <GiteeAccountDialog v-if="showGiteeDlg" @close="showGiteeDlg = false" />
   </div>
 </template>
 
@@ -110,7 +125,8 @@ const jump = (href: string) => {
       display: flex;
       align-items: center;
 
-      .collaboration {
+      .collaboration,
+      .todo {
         margin-right: 16px;
         color: var(--o-color-info1);
         @include tip1;
diff --git a/src/components/header/AppLogin.vue b/src/components/header/AppLogin.vue
index 621ac6a..fe273fc 100644
--- a/src/components/header/AppLogin.vue
+++ b/src/components/header/AppLogin.vue
@@ -4,6 +4,7 @@ import { storeToRefs } from 'pinia';
 import { ODropdown, ODropdownItem, OIcon, OIconLoading } from '@opensig/opendesign';
 import { doLogin, logout } from '@/shared/login';
 import { useLoginStore, useUserInfoStore } from '@/stores/user';
+import { windowOpen } from '@/utils/common';
 import LoginIcon from '~icons/app/icon-login.svg';
 
 const USER_CENTER = import.meta.env.VITE_LOGIN_URL;
@@ -15,7 +16,7 @@ const loginStore = useLoginStore();
 const login = () => doLogin();
 
 const toUserCenter = () => {
-  window.open(USER_CENTER);
+  windowOpen(USER_CENTER);
 };
 </script>
 
diff --git a/src/data/todo/index.ts b/src/data/todo/index.ts
index a43e168..381dbe8 100644
--- a/src/data/todo/index.ts
+++ b/src/data/todo/index.ts
@@ -5,8 +5,8 @@ export const applicationColumns = [
   { label: '修改理由', key: 'description', type: 'description' },
   { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
   { label: '审批人', key: 'adminstrator', type: 'adminstrator' },
-  { label: '审批意见', key: 'maintainer', type: 'maintainer' },
-  { label: '申请单号', key: 'applyId', type: 'applyId' },
+  { label: '审批意见', key: 'comment', type: 'comment' },
+  { label: '申请单号', key: 'applyIdString', type: 'applyId' },
   { label: '申请时间', key: 'updateAt', type: 'updateAt' },
   { label: '操作', key: 'operation', type: 'operation' },
 ]
@@ -17,7 +17,7 @@ export const approvalColumns = [
   { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
   { label: '修改理由', key: 'description', type: 'description' },
   { label: '申请人', key: 'maintainer', type: 'maintainer' },
-  { label: '申请单号', key: 'applyId', type: 'applyId' },
+  { label: '申请单号', key: 'applyIdString', type: 'applyId' },
   { label: '申请时间', key: 'updateAt', type: 'updateAt' },
   { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
   { label: '操作', key: 'operation', type: 'operation' },
@@ -41,4 +41,45 @@ export const applyStatus = {
   REJECTED: '已驳回',
   APPROVED: '已通过',
   REVOKED: '已撤销',
-};
\ No newline at end of file
+};
+
+
+const repoStatusArr = ['健康', '活跃', '静止', '缺人维护', '没有人维护'];
+export const repoStatusIndex = (v: string) => {
+  return repoStatusArr.findIndex((item) => item === v);
+};
+
+
+// 申请类型
+export const applicationType = [
+  {
+    id: 'cveStatus',
+    label: 'CVE状态',
+    children: ['有CVE且全部未修复', '有CVE部分修复', '有CVE且全部修复', '没有CVE问题'],
+  },
+  {
+    id: 'issueStatus',
+    label: 'ISSUE状态',
+    children: ['没有ISSUE修复', '有部分ISSUE修复', '全部ISSUE修复'],
+  },
+  {
+    id: 'prStatus',
+    label: '软件包更新状态',
+    children: ['没有PR提交', '有PR提交未合入', '有PR合入'],
+  },
+  {
+    id: 'versionStatus',
+    label: '软件包版本状态',
+    children: ['最新版本', '落后版本'],
+  },
+  {
+    id: 'orgStatus',
+    label: '贡献组织状态',
+    children: ['贡献组织多', '贡献组织少'],
+  },
+  {
+    id: 'contributorStatus',
+    label: '贡献人员状态',
+    children: ['贡献人员多', '贡献人员少'],
+  },
+];
\ No newline at end of file
diff --git a/src/i18n/collaboration/collaboration-en.ts b/src/i18n/collaboration/collaboration-en.ts
new file mode 100644
index 0000000..c243a55
--- /dev/null
+++ b/src/i18n/collaboration/collaboration-en.ts
@@ -0,0 +1,5 @@
+export default {
+  application: '我的申请',
+  approval: '待我审批',
+  approved: '我审批过的',
+};
diff --git a/src/i18n/collaboration/collaboration-zh.ts b/src/i18n/collaboration/collaboration-zh.ts
new file mode 100644
index 0000000..c243a55
--- /dev/null
+++ b/src/i18n/collaboration/collaboration-zh.ts
@@ -0,0 +1,5 @@
+export default {
+  application: '我的申请',
+  approval: '待我审批',
+  approved: '我审批过的',
+};
diff --git a/src/i18n/collaboration/index.ts b/src/i18n/collaboration/index.ts
new file mode 100644
index 0000000..d80bc75
--- /dev/null
+++ b/src/i18n/collaboration/index.ts
@@ -0,0 +1,7 @@
+import zh from './collaboration-zh';
+import en from './collaboration-en';
+
+export default {
+  zh,
+  en,
+};
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index 6490d6d..3d78515 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -4,6 +4,7 @@ import common from './common';
 import software from './software';
 import upstream from './upstream';
 import detail from '@/i18n/detail';
+import collaboration from '@/i18n/collaboration';
 
 const messages = {
   zh: {
@@ -11,12 +12,14 @@ const messages = {
     software: software.zh,
     upstream: upstream.zh,
     detail: detail.zh,
+    collaboration: collaboration.zh,
   },
   en: {
     common: common.en,
     software: software.en,
     upstream: upstream.en,
     detail: detail.en,
+    collaboration: collaboration.en,
   },
 };
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 011b215..53b8fee 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -140,7 +140,7 @@ router.beforeEach(async (to) => {
       return userInfoStore.upstreamPermission ? true : { name: 'notFound' };
     }
     if (isPlatform) {
-      return userInfoStore.platformAdminPermission ? true : { name: 'notFound' };
+      return userInfoStore.platformAdminPermission || userInfoStore.platformMaintainerPermission ? true : { name: 'notFound' };
     }
 
     return true;
@@ -153,7 +153,7 @@ router.beforeEach(async (to) => {
     return { name: 'notFound' };
   }
 
-  if (userInfoStore.upstreamPermission === null) {
+  if (userInfoStore.upstreamPermission === null && !isPlatform) {
     try {
       const upstreamPermission = await queryUpstreamPermission();
       userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
@@ -163,6 +163,7 @@ router.beforeEach(async (to) => {
     }
   }
 
+
   // 协作平台权限
   if (userInfoStore.platformMaintainerPermission === null || userInfoStore.platformAdminPermission === null) {
     try {
@@ -174,6 +175,10 @@ router.beforeEach(async (to) => {
         }
         if (data.permissions.includes('maintainer')) {
           userInfoStore.platformMaintainerPermission = true;
+          // 判断是否绑定gitee
+          const hasGiteeAccount = () => !!userInfoStore.identities.find((id) => id.identity === 'gitee');
+
+          userInfoStore.platformMaintainerAllPermission = hasGiteeAccount() ? true : false;
         }
       } else {
         return isPlatform ? { name: 'notFound' } : true;
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 221eeb6..3b53de6 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -16,6 +16,8 @@ export const useUserInfoStore = defineStore('userInfo', {
       platformAdminPermission: null as boolean | null,
       // 协作平台maintainer权限
       platformMaintainerPermission: null as boolean | null,
+      // 协作平台maintainer权限并绑定gitee
+      platformMaintainerAllPermission: null as boolean | null,
     }
   },
 });
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 24124ee..e97430b 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -11,8 +11,10 @@ import Result404 from '@/components/Result404.vue';
 import IconOutlink from '~icons/pkg/icon-outlink.svg';
 import IconFilter from '~icons/app/icon-filter.svg';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
+import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
 import { collaborationFilter } from '@/data/filter';
 import { useDebounceFn } from '@vueuse/core';
+import { repoStatusIndex } from '@/data/todo';
 
 const columns = [
   { label: '软件仓库', key: 'repo', type: 'repo' },
@@ -68,6 +70,7 @@ const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
 
 const userInfoStore = useUserInfoStore();
 const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
+const isMainAllPer = computed(() => userInfoStore.platformMaintainerAllPermission);
 const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 
 // 分页
@@ -91,9 +94,10 @@ const filterParams = reactive<Record<string, string>>({
 
 const searchParams = computed(() => {
   return {
+    name: 'fromPage',
     pageNum: currentPage.value,
     pageSize: pageSize.value,
-    ...filterParams
+    ...filterParams,
   };
 });
 
@@ -103,17 +107,20 @@ const isError = ref(false);
 
 // Maintainer 数据
 const queryMaintainerRepos = () => {
+  isLoading.value = true;
   getMaintainerRepos(searchParams.value)
     .then((res) => {
       if (res.data.list.length > 0) {
         reposData.value = res.data.list;
         total.value = res.data.total;
       } else {
+        reposData.value = [];
         isError.value = true;
       }
       isLoading.value = false;
     })
     .catch(() => {
+      reposData.value = [];
       isError.value = true;
       isLoading.value = false;
     });
@@ -121,17 +128,20 @@ const queryMaintainerRepos = () => {
 
 // Admin 数据
 const queryAdminRepos = () => {
+  isLoading.value = true;
   getAdminRepos(searchParams.value)
     .then((res) => {
       if (res.data.list.length > 0) {
         reposData.value = res.data.list;
         total.value = res.data.total;
       } else {
+        reposData.value = [];
         isError.value = true;
       }
       isLoading.value = false;
     })
     .catch(() => {
+      reposData.value = [];
       isError.value = true;
       isLoading.value = false;
     });
@@ -148,7 +158,8 @@ onMounted(() => {
 const pageInit = () => {
   if (isAdminPer.value) {
     queryAdminRepos();
-  } else {
+  }
+  if (isMainPer.value) {
     queryMaintainerRepos();
   }
 };
@@ -176,9 +187,21 @@ const showDlg = ref(false);
 
 const showFeedbackDlg = ref(false);
 const repoValue = ref('');
+const showGiteeDlg = ref(false);
 const changeFeedback = (v: string) => {
-  showFeedbackDlg.value = true;
+  if (isMainAllPer.value) {
+    showFeedbackDlg.value = true;
+    repoValue.value = v;
+  } else {
+    showGiteeDlg.value = true;
+  }
+};
+
+// 反馈历史
+const showFeedbacHistroykDlg = ref(false);
+const changeFeedbackHistory = (v: string) => {
   repoValue.value = v;
+  showFeedbacHistroykDlg.value = true;
 };
 
 watch(
@@ -197,12 +220,13 @@ watch(
       <h1>软件维护详情</h1>
     </ContentWrapper>
   </div>
-  <ContentWrapper vertical-padding="24px" class="pkg-content-wrap">
+  <ContentWrapper vertical-padding="24px" class="collaboration-wrap">
+    <AppLoading :loading="isLoading" />
     <div class="indicators">
       <span @click="showDlg = true" class="text">状态指标说明</span>
       <Indicators v-if="showDlg" @change="showDlg = false" />
     </div>
-    <div class="platform-main" :class="isMainPer ? 'maintainer' : 'admin'">
+    <div class="platform-main maintainer">
       <OTable :columns="columns" :data="reposData" :loading="loading" border="row">
         <template #head="{ columns }">
           <th v-for="(item, index) in columns" :key="item.type" :class="item.type" :ref="(el) => (filterPopupTargets[index] = el as ComponentPublicInstance)">
@@ -259,12 +283,14 @@ watch(
           ></OLink>
         </template>
         <template #td_status="{ row }">
-          <OTag class="app-tag">{{ row.status }} </OTag>
+          <div class="repo-status">
+            <OTag :class="`type${repoStatusIndex(row.status)}`">{{ row.status }} </OTag>
+          </div>
         </template>
         <template #td_operation="{ row }">
           <div class="operation-box">
-            <OLink color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
-            <OLink color="primary" hover-underline> 反馈历史</OLink>
+            <OLink v-if="!isAdminPer" color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
+            <OLink color="primary" hover-underline @click="changeFeedbackHistory(row.repo)">反馈历史</OLink>
           </div>
         </template>
       </OTable>
@@ -274,6 +300,8 @@ watch(
       </div>
     </div>
 
+    <GiteeAccountDialog v-if="showGiteeDlg" @close="showGiteeDlg = false" />
+
     <!-- 暂无记录 -->
     <template v-if="isError || !hasGiteeAccount">
       <Result404>
@@ -288,10 +316,20 @@ watch(
     <!-- 状态反馈 -->
 
     <StatusFeedback :repo="repoValue" v-if="showFeedbackDlg" @close="showFeedbackDlg = false" />
+
+    // 反馈历史
+    <FeedbackHistroy v-if="showFeedbacHistroykDlg" :repo="repoValue" @close="showFeedbacHistroykDlg = false" />
   </ContentWrapper>
 </template>
 
 <style scoped lang="scss">
+@import '@/assets/style/category/collaboration/index.scss';
+
+.collaboration-wrap {
+  position: relative;
+  min-height: calc(var(--layout-content-min-height) - 200px);
+}
+
 .bubble-content {
   color: var(--o-color-info1);
   max-width: 300px;
@@ -383,7 +421,7 @@ watch(
         width: 140px;
       }
       .kind {
-        width: 120px;
+        width: 180px;
       }
       .status {
         width: 125px;
diff --git a/src/views/package/RpmContent.vue b/src/views/package/RpmContent.vue
index 833dd25..90156fb 100644
--- a/src/views/package/RpmContent.vue
+++ b/src/views/package/RpmContent.vue
@@ -164,9 +164,6 @@ const queryFilter = () => {
 const handleCloseTag = (idx: string | number, type: string) => {
   if (type === 'os') {
     searchOs.value.splice(Number(idx), 1);
-    if (searchOs.value.length === 0) {
-      console.log(route.query);
-    }
   }
   if (type === 'arch') {
     searchArch.value.splice(Number(idx), 1);
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 37e8c43..d81eaa8 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -1,11 +1,14 @@
 <script lang="ts" setup>
-import { ref, type PropType } from 'vue';
+import { ref, type PropType, computed } from 'vue';
 import { OTable, OLink, OTag, ODialog, OButton } from '@opensig/opendesign';
 import { useLocale } from '@/composables/useLocale';
 import { useI18n } from 'vue-i18n';
 import { formatDateTime } from '@/utils/common';
 import { useRouter, useRoute } from 'vue-router';
 import { applyStatus } from '@/data/todo';
+import { useUserInfoStore } from '@/stores/user';
+
+import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
 
 interface ColumnsT {
   key: string;
@@ -37,6 +40,10 @@ const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
 const { locale } = useLocale();
+
+const userInfoStore = useUserInfoStore();
+const isMainAllPer = computed(() => userInfoStore.platformMaintainerAllPermission);
+
 const jumpTo = (id: number) => {
   const type = route.params?.type as string;
   router.push({
@@ -49,10 +56,15 @@ const emits = defineEmits<{
 }>();
 
 const showDlg = ref(false);
+const showGiteeDlg = ref(false);
 const applayId = ref();
 const revokeApplication = (id: number) => {
-  applayId.value = id;
-  showDlg.value = true;
+  if (isMainAllPer.value) {
+    applayId.value = id;
+    showDlg.value = true;
+  } else {
+    showGiteeDlg.value = true;
+  }
 };
 
 const revoke = () => {
@@ -70,25 +82,33 @@ const revoke = () => {
       <template #td_updateAt="{ row }">
         {{ formatDateTime(row.updateAt) }}
       </template>
+      <template #td_comment="{ row }">
+        <div class="line-clamp">{{ row.comment }}</div>
+      </template>
+      <template #td_description="{ row }">
+        <div class="line-clamp">{{ row.description }}</div>
+      </template>
       <template #td_applyStatus="{ row }">
-        <OTag v-if="row.applyStatus" class="app-tag" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+        <div class="apply-status">
+          <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+        </div>
       </template>
       <template #td_operation="{ row }">
         <template v-if="type === 'application'">
           <div class="oper-box">
-            <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">申请详情</OLink>
-            <OLink color="danger" v-if="row.applyStatus === 'open'" hover-underline @click="revokeApplication(row.applyId)">撤销申请</OLink>
+            <OLink color="primary" hover-underline @click="jumpTo(row.applyIdString)">申请详情</OLink>
+            <OLink color="danger" v-if="row.applyStatus === 'OPEN'" hover-underline @click="revokeApplication(row.applyIdString)">撤销申请</OLink>
           </div>
         </template>
         <template v-if="type === 'approval'">
-          <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">审批</OLink>
+          <OLink color="primary" hover-underline @click="jumpTo(row.applyIdString)">审批</OLink>
         </template>
         <template v-if="type === 'approved'">
-          <OLink color="primary" hover-underline @click="jumpTo(row.applyId)">审批详情</OLink>
+          <OLink color="primary" hover-underline @click="jumpTo(row.applyIdString)">审批详情</OLink>
         </template>
       </template>
     </OTable>
-
+    <GiteeAccountDialog v-if="showGiteeDlg" @close="showGiteeDlg = false" />
     <ODialog v-model:visible="showDlg" class="revoke-dlg" :unmount-on-hide="true" :mask="true" size="small">
       <template #header>
         <p class="title">确认撤销</p>
@@ -105,6 +125,7 @@ const revoke = () => {
 </template>
 
 <style lang="scss" scoped>
+@import '@/assets/style/category/collaboration/index.scss';
 .revoke-text {
   color: var(--o-color-info1);
   text-align: center;
@@ -124,60 +145,16 @@ const revoke = () => {
     margin-left: 24px;
   }
 }
-
-.app-tag {
-  min-width: 72px;
-  color: var(--o-color-white);
-  &.open {
-    --tag-bg-color: var(--o-color-warning1);
-    --tag-bd-color: var(--o-color-warning1);
-  }
-  &.approved {
-    --tag-bg-color: var(--o-color-success1);
-    --tag-bd-color: var(--o-color-success1);
-  }
-  &.revoked {
-    --tag-bg-color: var(--o-color-control1);
-    --tag-bd-color: transparent;
-  }
-
-  &.rejected {
-    --tag-bg-color: var(--o-color-danger1);
-    --tag-bd-color: var(--o-color-danger1);
-  }
+.line-clamp {
+  display: -webkit-box;
+  overflow: hidden;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  position: relative;
+  word-break: break-all;
 }
 
 :deep(.o-table) {
-  --table-edge-padding: 32px;
-  --table-cell-padding: 16px 20px;
-  --table-head-cell-padding: 12px 20px;
-  --table-cell-height: 80px;
-  .label {
-    display: flex;
-    align-items: center;
-    .icon-filter {
-      cursor: pointer;
-      svg {
-        fill: currentColor;
-        color: var(--o-color-info3);
-        width: 20px;
-        margin-left: 3px;
-      }
-    }
-    .icon-time-order {
-      margin-left: 4px;
-      cursor: pointer;
-      svg {
-        fill: currentColor;
-        color: var(--o-color-info3);
-        width: 24px;
-      }
-      &.on {
-        transform: rotate(180deg);
-      }
-    }
-  }
-
   .td-break {
     word-break: break-all;
   }
@@ -205,11 +182,15 @@ thead {
   }
   .applyStatus,
   .adminstrator,
-  .applyId {
+  .maintainer {
     width: 120px;
   }
 
-  .maintainer {
+  .applyId {
+    width: 150px;
+  }
+
+  .comment {
     width: 180px;
   }
   .updateAt {
@@ -247,7 +228,7 @@ thead {
           z-index: 2;
           background: var(--table-bg-color);
           &::before {
-            left: 0;
+            left: -9px;
             @include liner;
           }
         }
@@ -270,7 +251,7 @@ thead {
         z-index: 2;
         background: var(--table-head-bg);
         &::before {
-          left: 0;
+          left: -9px;
           @include liner;
         }
       }
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 134645b..61e58b9 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -33,6 +33,7 @@ const userInfoStore = useUserInfoStore();
 const message = useMessage();
 
 const isAdminPermission = computed(() => userInfoStore.platformAdminPermission);
+const isMaintainerPermission = computed(() => userInfoStore.platformMaintainerPermission);
 
 // 分页
 const currentPage = ref(1);
@@ -46,7 +47,7 @@ const applyStatus = ref('');
 const todoParams = computed(() => {
   return {
     name: todoName.value,
-    applyId: applyId.value,
+    applyIdString: applyId.value,
     pageNum: currentPage.value,
     pageSize: pageSize.value,
     applyStatus: applyStatus.value,
@@ -63,6 +64,7 @@ const isLoading = ref(false);
 
 const activeName = ref();
 const onChange = (type: string) => {
+  pageInit();
   // 切换url参数
   router.push({
     path: `/${locale.value}/todo/${type}`,
@@ -80,21 +82,29 @@ const handleCurrentChange = (val: number) => {
 
 // 我的申请
 const queryMyApplication = () => {
-  const newData = getParamsRules(todoParams.value);
-  getMaintainerApply(newData)
-    .then((res) => {
-      if (res.data.list.length > 0) {
-        applicationData.value = res.data.list;
-        total.value = res.data.total;
-      } else {
+  isLoading.value = true;
+  if (isMaintainerPermission.value) {
+    const newData = getParamsRules(todoParams.value);
+    getMaintainerApply(newData)
+      .then((res) => {
+        if (res.data.list.length > 0) {
+          applicationData.value = res.data.list;
+          total.value = res.data.total;
+        } else {
+          isError.value = true;
+          applicationData.value = [];
+        }
+        isLoading.value = false;
+      })
+      .catch(() => {
+        applicationData.value = [];
+        isLoading.value = false;
         isError.value = true;
-      }
-      isLoading.value = false;
-    })
-    .catch(() => {
-      isLoading.value = false;
-      isError.value = true;
-    });
+      });
+  } else {
+    isError.value = true;
+    isLoading.value = false;
+  }
 };
 
 // 撤销申请
@@ -116,27 +126,34 @@ const revokeApplication = (applyId: number) => {
 
 // 待我审批
 const queryApprovalApply = () => {
+  isLoading.value = true;
   if (isAdminPermission.value) {
     const newData = getParamsRules(todoParams.value);
-    getAdminApply(newData)
+    getAdminApply(todoParams.value)
       .then((res) => {
         if (res.data.list.length > 0) {
           approvalData.value = res.data.list;
           total.value = res.data.total;
         } else {
           isError.value = true;
+          approvalData.value = [];
         }
         isLoading.value = false;
       })
       .catch(() => {
+        approvalData.value = [];
         isError.value = true;
         isLoading.value = false;
       });
+  } else {
+    isError.value = true;
+    isLoading.value = false;
   }
 };
 
 // 我审批过的
 const queryApprovedApply = () => {
+  isLoading.value = true;
   if (isAdminPermission.value) {
     const newData = getParamsRules(todoParams.value);
     getAdminApply(newData)
@@ -146,28 +163,34 @@ const queryApprovedApply = () => {
           total.value = res.data.total;
         } else {
           isError.value = true;
+          approvedData.value = [];
         }
         isLoading.value = false;
       })
       .catch(() => {
+        approvedData.value = [];
         isLoading.value = false;
         isError.value = true;
       });
+  } else {
+    isError.value = true;
+    isLoading.value = false;
   }
 };
 
 const pageInit = () => {
-  isLoading.value = true;
+  isError.value = false;
   if (activeName.value === 'application') {
     applyStatus.value = '';
     todoName.value = 'formPage';
+    applyId.value = '';
     queryMyApplication();
   } else if (activeName.value === 'approval') {
     todoName.value = 'formPage';
     applyStatus.value = 'OPEN';
     queryApprovalApply();
   } else if (activeName.value === 'approved') {
-    todoName.value = 'approved';
+    todoName.value = 'APPROVED';
     applyStatus.value = 'APPROVED,REJECTED';
     queryApprovedApply();
   }
@@ -178,24 +201,12 @@ onMounted(() => {
   pageInit();
 });
 
-watch(
-  () => route.params.type as string,
-  (v: string) => {
-    activeName.value = v || 'application';
-    pageInit();
-    console.log(' watch activeName');
-  }
-);
-
 // watch(
 //   () => todoParams.value,
 //   () => {
 //     pageInit();
-//     console.log(' watch todoParams.value');
 //   },
-//   {
-//     immediate: true,
-//   }
+//   { deep: true }
 // );
 </script>
 
@@ -206,40 +217,42 @@ watch(
     </ContentWrapper>
   </div>
   <OTab variant="text" @change="onChange" v-model="activeName" size="large" :style="{ '--tab-nav-justify': 'flex-start' }">
-    <OTabPane class="tab-pane" v-for="item in tabList" :key="item.id" :value="item.id" :label="item.label">
-      <!-- 我的申请 -->
-      <template v-if="item.id === 'application' && applicationData.length > 0">
-        <ApprovalTable :columns="applicationColumns" :type="item.id" :data="applicationData" :loading="isLoading" @revoke="revokeApplication" />
+    <OTabPane v-for="item in tabList" :key="item.id" :value="item.id" :label="item.label"> </OTabPane>
+  </OTab>
+  <div class="todo-content">
+    <AppLoading :loading="isLoading" />
+    <!-- 我的申请 -->
+    <div v-if="activeName === 'application' && applicationData.length > 0" class="application">
+      <ApprovalTable :columns="applicationColumns" :type="activeName" :data="applicationData" :loading="isLoading" @revoke="revokeApplication" />
+      <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+        <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 判断admin权限 -->
+    <template v-if="isAdminPermission">
+      <div v-if="activeName === 'approval' && approvalData.length > 0" class="approval">
+        <ApprovalTable :columns="approvalColumns" :type="activeName" :data="approvalData" :loading="isLoading" />
         <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
-      </template>
-      <!-- 判断admin权限 -->
-      <template v-if="isAdminPermission">
-        <template v-if="item.id === 'approval' && approvalData.length > 0">
-          <ApprovalTable :columns="approvalColumns" :type="item.id" :data="approvalData" :loading="isLoading" />
-          <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
-            <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-          </div>
-        </template>
-        <template v-if="item.id === 'approved' && approvedData.length > 0">
-          <ApprovalTable :columns="approvalColumns" :type="item.id" :data="approvedData" :loading="isLoading" />
-          <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
-            <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-          </div>
-        </template>
-      </template>
+      </div>
+      <div v-if="activeName === 'approved' && approvedData.length > 0" class="approved">
+        <ApprovalTable :columns="approvalColumns" :type="activeName" :data="approvedData" :loading="isLoading" />
+        <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+          <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
+      </div>
+    </template>
 
-      <!-- 暂无记录 -->
-      <template v-if="(item.id === 'application' && isError) || (item.id === 'approval' && isError) || (item.id === 'approved' && isError)">
-        <Result404>
-          <template #description>
-            <p class="text404">暂无{{ item.id === 'application' ? '申请' : '审批' }}记录</p>
-          </template>
-        </Result404>
-      </template>
-    </OTabPane>
-  </OTab>
+    <!-- 暂无记录 -->
+    <template v-if="(activeName === 'application' && isError) || (activeName === 'approval' && isError) || (activeName === 'approved' && isError)">
+      <Result404>
+        <template #description>
+          <p class="text404">暂无{{ activeName === 'application' ? '申请' : '审批' }}记录</p>
+        </template>
+      </Result404>
+    </template>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -248,9 +261,7 @@ watch(
   display: flex;
   justify-content: end;
 }
-.loading-box {
-  position: relative;
-}
+
 .platform-header {
   padding: 48px 0 24px;
   h1 {
@@ -270,6 +281,21 @@ watch(
   max-width: var(--layout-content-max-width);
   padding-left: var(--layout-content-padding);
   padding-right: var(--layout-content-padding);
+  position: relative;
+}
+.todo-content {
+  position: relative;
+  min-height: calc(var(--layout-content-min-height) - 200px);
   margin: 24px auto;
+  max-width: var(--layout-content-max-width);
+  padding-left: var(--layout-content-padding);
+  padding-right: var(--layout-content-padding);
+}
+.approval {
+  :deep(thead) {
+    .operation {
+      width: 100px;
+    }
+  }
 }
 </style>
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
index 4345fd9..0d50526 100644
--- a/src/views/todo/TheTodoDetail.vue
+++ b/src/views/todo/TheTodoDetail.vue
@@ -11,29 +11,47 @@ const route = useRoute();
 const message = useMessage();
 const userInfoStore = useUserInfoStore();
 const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
+const isLoading = ref(true);
+const isError = ref(false);
 
 const type = ref();
-const applyId = ref(Number(route.params.id) || 0);
+const applyId = ref(route.params.id || '');
 const todoData = ref();
 const formRef = ref<InstanceType<typeof OForm>>();
 const formData = reactive({
-  applyId: applyId.value,
+  applyIdString: applyId.value,
   comment: '',
   applyStatus: '',
 });
 
 // 我的申请
 const queryApplicationApply = () => {
-  getMaintainerApply({ name: 'formContent', applyId: applyId.value }).then((res) => {
-    todoData.value = res.data.list[0];
-  });
+  getMaintainerApply({ name: 'formContent', applyId: applyId.value })
+    .then((res) => {
+      if (res.data.list.length > 0) {
+        todoData.value = res.data.list[0];
+      }
+      isLoading.value = false;
+    })
+    .catch(() => {
+      isError.value = true;
+      isLoading.value = false;
+    });
 };
 
 // 待我审批
 const queryApprovalApply = () => {
-  getAdminApply({ name: 'formContent', applyId: applyId.value }).then((res) => {
-    todoData.value = res.data.list[0];
-  });
+  getAdminApply({ name: 'formContent', applyIdString: applyId.value })
+    .then((res) => {
+      if (res.data.list.length > 0) {
+        todoData.value = res.data.list[0];
+      }
+      isLoading.value = false;
+    })
+    .catch(() => {
+      isError.value = true;
+      isLoading.value = false;
+    });
 };
 
 // --------------------审批开始------------------------
@@ -60,7 +78,7 @@ const onSubmit = (results: FieldResultT[]) => {
   if (results.find((item) => item?.type === 'danger')) {
     return;
   } else {
-    formData.applyStatus = 'approved';
+    formData.applyStatus = 'APPROVED';
     queryAdminProcess();
   }
 };
@@ -71,7 +89,7 @@ const rejected = async () => {
   if (items?.find((item) => item?.type === 'danger')) {
     return;
   }
-  formData.applyStatus = 'rejected';
+  formData.applyStatus = 'REJECTED';
   queryAdminProcess();
 };
 
@@ -83,6 +101,7 @@ const queryAdminProcess = () => {
           content: '审批成功',
         });
         formRef.value?.resetFields();
+        queryApprovalApply();
       }
     })
     .catch(() => {
@@ -107,17 +126,20 @@ onMounted(() => {
 
 <template>
   <ContentWrapper verticalPadding="32px">
+    <AppLoading :loading="isLoading" />
     <CBreadcrumb :type="type" :repo="todoData?.repo" />
     <div v-if="todoData" class="todo-detail">
       <div class="title">
         <h2>{{ todoData.repo }}</h2>
-        <OTag class="app-tag" :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatus[todoData.applyStatus] }} </OTag>
+        <div class="apply-status">
+          <OTag :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatus[todoData.applyStatus] }} </OTag>
+        </div>
       </div>
 
       <h3 class="caption">基本信息</h3>
       <OForm label-width="92px" label-align="top">
         <OFormItem label="申请单号：">
-          {{ todoData.applyId }}
+          {{ todoData.applyIdString }}
         </OFormItem>
         <OFormItem label="申请类型：">
           {{ todoData.metric }}
@@ -126,7 +148,7 @@ onMounted(() => {
         <OFormItem label="修改理由：">{{ todoData.description }} </OFormItem>
         <OFormItem label="申请时间："> {{ formatDateTime(todoData.updateAt) }} </OFormItem>
       </OForm>
-      <template v-if="todoData.applyStatus !== 'PENDDING'">
+      <template v-if="todoData.applyStatus !== 'OPEN'">
         <h3 class="caption">审批信息</h3>
         <OForm label-width="92px" label-align="top">
           <OFormItem label="审批人：">
@@ -138,7 +160,7 @@ onMounted(() => {
           <OFormItem label="审批时间："> - </OFormItem>
         </OForm>
       </template>
-      <template v-if="todoData.applyStatus === 'PENDDING' && type === 'approval'">
+      <template v-if="todoData.applyStatus === 'OPEN' && type === 'approval'">
         <h3 class="caption">审批</h3>
         <OForm ref="formRef" has-required :model="formData" label-width="92px" label-align="top" @submit="onSubmit">
           <OFormItem label="审批意见：" required field="comment" :rules="commentRules">
@@ -163,6 +185,7 @@ onMounted(() => {
 </template>
 
 <style lang="scss" scoped>
+@import '@/assets/style/category/collaboration/index.scss';
 .todo-detail {
   padding: 32px 40px;
   background: var(--o-color-fill2);
@@ -193,6 +216,7 @@ onMounted(() => {
     .o-form-item-main-wrap {
       min-height: 24px;
     }
+    color: var(--o-color-info1);
     @include text1;
   }
 
@@ -204,26 +228,4 @@ onMounted(() => {
     }
   }
 }
-
-.app-tag {
-  min-width: 72px;
-  color: var(--o-color-white);
-  &.pendding {
-    --tag-bg-color: var(--o-color-warning1);
-    --tag-bd-color: var(--o-color-warning1);
-  }
-  &.passed {
-    --tag-bg-color: var(--o-color-success1);
-    --tag-bd-color: var(--o-color-success1);
-  }
-  &.revoked {
-    --tag-bg-color: var(--o-color-control1);
-    --tag-bd-color: transparent;
-  }
-
-  &.dismissed {
-    --tag-bg-color: var(--o-color-danger1);
-    --tag-bd-color: var(--o-color-danger1);
-  }
-}
 </style>
-- 
Gitee


From 69c6e62e7a7548f332d0adf7a081a6f6100ac324 Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Thu, 22 Aug 2024 20:17:35 +0800
Subject: [PATCH 06/17] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=A1=A8=E6=A0=BC=E5=88=97=E5=8A=A0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api-collaboration.ts                  |  12 ++
 .../style/category/collaboration/index.scss   |  26 +++
 src/components/FilterableCheckboxes.vue       |  79 +++++----
 src/composables/useCheckbox.ts                |   4 +-
 src/views/collaboration/TheCollaboration.vue  | 152 +++++++++---------
 src/views/todo/ApprovalTable.vue              | 114 ++++++++++++-
 src/views/todo/TheTodo.vue                    |  31 ++--
 7 files changed, 290 insertions(+), 128 deletions(-)

diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index ab060c6..c54f457 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -55,6 +55,18 @@ export function getMaintainerRevoke(id: number) {
   return request.post(url, { applyId: id }).then((res: AxiosResponse) => res?.data);
 }
 
+/** 待办中心获取我的申请所有仓库 */
+export function getMaintainerApplyRepos() {
+  const url = `/server/collaboration/maintainer/apply/repos`;
+  return request.get<{ data: { total: number, list: string[] } }>(url).then((res) => res?.data.data);
+}
+
+/** 待办中心获取待我审批/我审批过所有仓库 */
+export function getAdminApplyRepos() {
+  const url = `/server/collaboration/admin/apply/repos`;
+  return request.get<{ data: { total: number, list: string[] } }>(url).then((res) => res?.data.data);
+}
+
 interface FeedbackT {
   repo: string;
   metric: string;
diff --git a/src/assets/style/category/collaboration/index.scss b/src/assets/style/category/collaboration/index.scss
index 66a570c..a13d785 100644
--- a/src/assets/style/category/collaboration/index.scss
+++ b/src/assets/style/category/collaboration/index.scss
@@ -45,3 +45,29 @@
     }
   }
 }
+
+.bubble-content {
+  color: var(--o-color-info1);
+  max-width: 300px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  line-clamp: 3;
+  overflow: hidden;
+
+  .title {
+    font-weight: bold;
+  }
+}
+
+.header-cell {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .filter-icon {
+    width: 16px;
+    cursor: pointer;
+    margin-left: 8px;
+  }
+}
diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
index 6a572fb..1af16f2 100644
--- a/src/components/FilterableCheckboxes.vue
+++ b/src/components/FilterableCheckboxes.vue
@@ -6,6 +6,8 @@ import { OCheckbox, OCheckboxGroup, OInput, OScroller } from '@opensig/opendesig
 import IconSearch from '~icons/app/icon-search.svg';
 import { useCheckbox } from '@/composables/useCheckbox';
 
+type ValueT = string | { label: string; value: string };
+
 const props = defineProps({
   /** 是否显示筛选输入 */
   filterable: {
@@ -14,62 +16,75 @@ const props = defineProps({
   },
   /** 多选值 */
   values: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<ValueT[]>,
     default: () => [],
   },
-  /** 是否开启检测滚动到底部 */
-  detectScrollBottom: {
-    type: Boolean,
-    default: false,
+  filterDebounceTimeout: {
+    type: Number,
+    default: 300,
   },
 });
 
 const emit = defineEmits<{
-  (event: 'change', values: (string | number)[]): void
-  (event: 'scrollBottom'): void
+  (event: 'change', val: { values: (string | number)[]; isCheckAll: boolean }): void;
 }>();
 
+const rawValues = computed(() =>
+  props.values.map((val) => {
+    if (typeof val === 'string') {
+      return { label: val, value: val };
+    }
+    return val;
+  })
+);
+
+const searchVal = ref<string>();
+
+const filteredValues = computed(() => {
+  const search = searchVal.value;
+  if (search) {
+    return rawValues.value.filter((val) => val.label.includes(search));
+  } else {
+    return rawValues.value;
+  }
+});
+
+const displayCount = ref(30);
+const displayValues = computed(() => {
+  return filteredValues.value.slice(0, Math.min(filteredValues.value.length, displayCount.value));
+});
+
 const wrapDiv = ref<HTMLDivElement>();
 
 const onScroll = (event: Event) => {
   const el = event.target as HTMLDivElement;
   if (el.scrollHeight - Math.round(el.scrollTop) <= el.clientHeight) {
-    emit('scrollBottom');
+    displayCount.value += 30;
   }
 };
 
 onMounted(() => {
-  if (props.detectScrollBottom) {
-    const container = wrapDiv.value?.querySelector('.o-scroller-container') as HTMLDivElement;
-    container && container.addEventListener('scroll', onScroll);
-  }
+  const container = wrapDiv.value?.querySelector('.o-scroller-container') as HTMLDivElement;
+  container && container.addEventListener('scroll', onScroll);
 });
 
 onUnmounted(() => {
-  if (props.detectScrollBottom) {
-    const container = wrapDiv.value?.querySelector('.o-scroller-container') as HTMLDivElement;
-    container && container.removeEventListener('scroll', onScroll);
-  }
-})
-
-const searchVal = ref<string>();
-
-const actualValues = computed(() => {
-  const search = searchVal.value;
-  if (search) {
-    return props.values.filter((val) => val.includes(search));
-  } else {
-    return props.values;
-  }
+  const container = wrapDiv.value?.querySelector('.o-scroller-container') as HTMLDivElement;
+  container && container.removeEventListener('scroll', onScroll);
 });
 
 const onFilterInput = useDebounceFn((search?: string) => {
+  // 重置显示个数
+  displayCount.value = 30;
   searchVal.value = search;
-}, 200);
+}, props.filterDebounceTimeout);
 
-const { checkboxes, parentCheckbox, indeterminate } = useCheckbox(actualValues, (item) => item);
+const { checkboxes, parentCheckbox, indeterminate, isCheckedAll } = useCheckbox(
+  () => rawValues.value,
+  (item) => item.value
+);
 
-watch(checkboxes, (values) => emit('change', values));
+watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.value }));
 </script>
 
 <template>
@@ -79,12 +94,12 @@ watch(checkboxes, (values) => emit('change', values));
         <IconSearch />
       </template>
     </OInput>
-    <OScroller class="content">
+    <OScroller class="content" showType="always">
       <div class="check-all-wrap">
         <OCheckbox v-model="parentCheckbox" :indeterminate="indeterminate" :value="1">全选</OCheckbox>
       </div>
       <OCheckboxGroup v-model="checkboxes" direction="v">
-        <OCheckbox v-for="item in actualValues" :key="item" :value="item">{{ item }}</OCheckbox>
+        <OCheckbox v-for="item in displayValues" :key="item.value" :value="item.value">{{ item.label }}</OCheckbox>
       </OCheckboxGroup>
     </OScroller>
   </div>
diff --git a/src/composables/useCheckbox.ts b/src/composables/useCheckbox.ts
index fef21eb..7839266 100644
--- a/src/composables/useCheckbox.ts
+++ b/src/composables/useCheckbox.ts
@@ -1,6 +1,6 @@
-import { computed, ref, toValue, watch, type MaybeRef } from 'vue';
+import { computed, ref, toValue, watch, type MaybeRefOrGetter } from 'vue';
 
-export const useCheckbox = <T>(datasource: MaybeRef<T[]>, cbValueExtractor: (item: T) => string | number) => {
+export const useCheckbox = <T>(datasource: MaybeRefOrGetter<T[]>, cbValueExtractor: (item: T) => string | number) => {
   const checkboxes = ref<(string | number)[]>([]);
   const indeterminate = ref<boolean>(false);
   const parentCheckbox = ref<(string | number)[]>([]);
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index e97430b..ce452ab 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -36,35 +36,43 @@ const hasGiteeAccount = computed(() => !!identities.value.find((id) => id.identi
 
 const allSigs = ref<string[]>();
 const allRepos = ref<string[]>();
-const displayRepos = ref<string[]>();
 
 // 筛选
-const filterPopupTargets = ref(new Array<ComponentPublicInstance>(columns.length));
+const filterIconRefs = ref(new Array<ComponentPublicInstance>(columns.length));
 
-// 筛选组件是否显示的开关
+/** 筛选组件是否显示的开关 */
 const filterSwitches = ref(columns.map(() => false));
 
-// 切换某个筛选组件显示开关
+/** 切换某个筛选组件显示开关 */
 const switchFilterVisible = (index: number) => {
-  filterSwitches.value[index] = !filterSwitches.value[index];
+  filterSwitches.value = columns.map((_, idx) => {
+    if (idx === index) {
+      return !filterSwitches.value[idx];
+    }
+    return false;
+  });
 };
 
-const onFilterChange = useDebounceFn((type: string, values: (string | number)[]) => {
-  filterParams[type] = values.join();
-}, 300);
+/** 各表格列对应的已选中的筛选项 */
+const activeFilterValues = ref(new Array<string[]>(columns.length));
 
-watch(
-  () => filterSwitches.value[0],
-  (val) => {
-    if (!val) {
-      displayRepos.value = allRepos.value?.slice(0, 30);
-    }
-  }
-);
+/** 当前有选中筛选项的表格列的数组下标 */
+const currentActiveFilterIndices = ref(new Set<number>());
 
-const onRepoFilterScrollBottom = () => {
-  displayRepos.value && (displayRepos.value = allRepos.value?.slice(0, displayRepos.value?.length + 30));
-};
+const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[], isCheckAll: boolean }) => {
+  // 关掉筛选组件
+  filterSwitches.value = columns.map(() => false);
+  currentPage.value = 1;
+  if (val.isCheckAll) {
+    filterParams[type] = '';
+    currentActiveFilterIndices.value.add(index);
+    activeFilterValues.value[index] = [];
+  } else {
+    filterParams[type] = val.values.join();
+    activeFilterValues.value[index] = val.values as string[];
+    currentActiveFilterIndices.value.delete(index);
+  }
+}, 300);
 
 const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
 
@@ -80,16 +88,16 @@ const total = ref(0);
 
 // 筛选条件
 const filterParams = reactive<Record<string, string>>({
-  repo: '' as string,
-  kind: '' as string,
-  sigName: '' as string,
-  cveStatus: '' as string,
-  issueStatus: '' as string,
-  prStatus: '' as string,
-  versionStatus: '' as string,
-  orgStatus: '' as string,
-  contributorStatus: '' as string,
-  status: '' as string,
+  repo: '',
+  kind: '',
+  sigName: '',
+  cveStatus: '',
+  issueStatus: '',
+  prStatus: '',
+  versionStatus: '',
+  orgStatus: '',
+  contributorStatus: '',
+  status: '',
 });
 
 const searchParams = computed(() => {
@@ -149,10 +157,7 @@ const queryAdminRepos = () => {
 
 onMounted(() => {
   getSigList().then((list) => (allSigs.value = list));
-  getRepoList().then((list) => {
-    allRepos.value = list;
-    displayRepos.value = allRepos.value.slice(0, 30);
-  });
+  getRepoList().then((list) => (allRepos.value = list));
 });
 
 const pageInit = () => {
@@ -229,33 +234,42 @@ watch(
     <div class="platform-main maintainer">
       <OTable :columns="columns" :data="reposData" :loading="loading" border="row">
         <template #head="{ columns }">
-          <th v-for="(item, index) in columns" :key="item.type" :class="item.type" :ref="(el) => (filterPopupTargets[index] = el as ComponentPublicInstance)">
-            <div class="header-cell">
-              {{ item.label }}
-              <template v-if="item.key !== 'operation'">
-                <OPopover>
-                  <p class="bubble-content">
-                    <span class="title">{{ item.label }}:</span> {{ reposData.map((row) => row[item.key]).join('、') }}
-                  </p>
-                  <template #target>
-                    <OIcon class="filter-icon" @click="switchFilterVisible(index)"><IconFilter /></OIcon>
+          <OPopup
+            trigger="none"
+            style="--popup-radius: 4px"
+            v-for="(item, index) in columns"
+            :key="item.type"
+            :visible="filterSwitches[index]"
+            :unmount-on-hide="false"
+            position="bl"
+          >
+            <template #target>
+              <th :class="item.type">
+                <div class="header-cell">
+                  {{ item.label }}
+                  <template v-if="item.key !== 'operation'">
+                    <OIcon
+                      :ref="(el) => (filterIconRefs[index] = el as ComponentPublicInstance)"
+                      class="filter-icon"
+                      :style="currentActiveFilterIndices.has(index) ? { color: 'var(--o-color-primary1)' } : {}"
+                      @click="switchFilterVisible(index)"
+                      ><IconFilter
+                    /></OIcon>
+                    <OPopover :target="filterIconRefs[index]" trigger="hover">
+                      <p class="bubble-content">
+                        <span class="title">{{ item.label }}:</span>
+                        {{ activeFilterValues[index]?.join('、') }}
+                      </p>
+                    </OPopover>
                   </template>
-                </OPopover>
-                <OPopup trigger="none" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl" :target="filterPopupTargets[index]">
-                  <FilterableCheckboxes
-                    @scroll-bottom="onRepoFilterScrollBottom"
-                    :detect-scroll-bottom="true"
-                    @change="onFilterChange(item.key, $event)"
-                    v-if="item.key === 'repo'"
-                    :values="displayRepos"
-                  />
-                  <FilterableCheckboxes @change="onFilterChange(item.key, $event)" v-else-if="item.key === 'sigName'" :values="allSigs" />
-                  <FilterableCheckboxes @change="onFilterChange(item.key, $event)" v-else-if="item.key === 'kind'" />
-                  <FilterableCheckboxes :filterable="false" @change="onFilterChange(item.key, $event)" v-else :values="collaborationFilter[item.key]" />
-                </OPopup>
-              </template>
-            </div>
-          </th>
+                </div>
+              </th>
+            </template>
+            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-if="item.key === 'repo'" :values="allRepos" />
+            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'sigName'" :values="allSigs" />
+            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'kind'" />
+            <FilterableCheckboxes :filterable="false" @change="onFilterChange(item.key, index, $event)" v-else :values="collaborationFilter[item.key]" />
+          </OPopup>
         </template>
         <template #td_repo="{ row }">
           <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}`)"
@@ -325,25 +339,6 @@ watch(
 <style scoped lang="scss">
 @import '@/assets/style/category/collaboration/index.scss';
 
-.collaboration-wrap {
-  position: relative;
-  min-height: calc(var(--layout-content-min-height) - 200px);
-}
-
-.bubble-content {
-  color: var(--o-color-info1);
-  max-width: 300px;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  line-clamp: 3;
-  overflow: hidden;
-
-  .title {
-    font-weight: bold;
-  }
-}
-
 .header-cell {
   position: relative;
   display: flex;
@@ -352,6 +347,7 @@ watch(
   .filter-icon {
     width: 16px;
     cursor: pointer;
+    margin-left: 8px;
   }
 }
 .platform-header {
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index d81eaa8..8e6dc28 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -1,14 +1,18 @@
 <script lang="ts" setup>
-import { ref, type PropType, computed } from 'vue';
-import { OTable, OLink, OTag, ODialog, OButton } from '@opensig/opendesign';
+import { ref, type PropType, computed, type ComponentPublicInstance, reactive, watch, onMounted } from 'vue';
+import { OTable, OLink, OTag, ODialog, OButton, OPopup, OIcon, OPopover } from '@opensig/opendesign';
 import { useLocale } from '@/composables/useLocale';
-import { useI18n } from 'vue-i18n';
 import { formatDateTime } from '@/utils/common';
 import { useRouter, useRoute } from 'vue-router';
-import { applyStatus } from '@/data/todo';
+import { applicationType, applyStatus } from '@/data/todo';
 import { useUserInfoStore } from '@/stores/user';
 
+import IconFilter from '~icons/app/icon-filter.svg';
+
 import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
+import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
+import { useDebounceFn } from '@vueuse/core';
+import { getAdminApplyRepos, getMaintainerApplyRepos } from '@/api/api-collaboration';
 
 interface ColumnsT {
   key: string;
@@ -18,6 +22,10 @@ interface ColumnsT {
 }
 
 const props = defineProps({
+  filterableColumns: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
   data: {
     type: Array,
     default: () => [],
@@ -36,11 +44,72 @@ const props = defineProps({
   },
 });
 
-const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
 const { locale } = useLocale();
 
+const repoList = ref<string[]>([]);
+
+onMounted(() => {
+  if (props.type === 'approval' || props.type === 'approved') {
+    getAdminApplyRepos().then((data) => {
+      repoList.value = data.list;
+    });
+  } else {
+    getMaintainerApplyRepos().then((data) => {
+      repoList.value = data.list;
+    });
+  }
+})
+
+const filterParams = reactive(
+  props.filterableColumns.reduce(
+    (obj, col) => {
+      obj[col] = '';
+      return obj;
+    },
+    {} as Record<string, string>
+  )
+);
+
+watch(filterParams, (params) => emits('queryData', params));
+
+const filterableColSet = computed(() => new Set(props.filterableColumns));
+const applyTypes = applicationType.map((item) => ({ label: item.label, value: item.id }));
+const filterIconRefs = ref(new Array<ComponentPublicInstance>(props.columns.length));
+
+/** 筛选组件是否显示的开关 */
+const filterSwitches = ref(props.columns.map(() => false));
+
+/** 当前有选中筛选项的表格列的数组下标 */
+const currentActiveFilterIndices = ref(new Set<number>());
+
+/** 切换某个筛选组件显示开关 */
+const switchFilterVisible = (index: number) => {
+  filterSwitches.value = props.columns.map((_, idx) => {
+    if (idx === index) {
+      return !filterSwitches.value[idx];
+    }
+    return false;
+  });
+};
+
+/** 各表格列对应的已选中的筛选项 */
+const activeFilterValues = ref(new Array<string[]>(props.columns.length));
+
+const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[]; isCheckAll: boolean }) => {
+  filterSwitches.value = props.columns.map(() => false);
+  if (val.isCheckAll) {
+    filterParams[type] = '';
+    currentActiveFilterIndices.value.add(index);
+    activeFilterValues.value[index] = [];
+  } else {
+    filterParams[type] = val.values.join();
+    activeFilterValues.value[index] = val.values as string[];
+    currentActiveFilterIndices.value.delete(index);
+  }
+}, 300);
+
 const userInfoStore = useUserInfoStore();
 const isMainAllPer = computed(() => userInfoStore.platformMaintainerAllPermission);
 
@@ -53,6 +122,7 @@ const jumpTo = (id: number) => {
 
 const emits = defineEmits<{
   (e: 'revoke', id: number): void;
+  (e: 'queryData', params: Record<string, string>): void;
 }>();
 
 const showDlg = ref(false);
@@ -77,7 +147,38 @@ const revoke = () => {
   <div class="table-main" :class="type">
     <OTable :columns="columns" :data="data" :loading="loading" border="all">
       <template #head="{ columns }">
-        <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
+        <template v-for="(item, index) in columns" :key="item.type">
+          <th v-if="!filterableColSet.size || !filterableColSet.has(item.key)" :class="item.type">
+            {{ item.label }}
+          </th>
+          <OPopup v-else trigger="none" style="--popup-radius: 4px" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
+            <template #target>
+              <th :class="item.type">
+                <div class="header-cell">
+                  {{ item.label }}
+                  <template v-if="item.key !== 'operation'">
+                    <OIcon
+                      :ref="(el) => (filterIconRefs[index] = el as ComponentPublicInstance)"
+                      class="filter-icon"
+                      :style="currentActiveFilterIndices.has(index) ? { color: 'var(--o-color-primary1)' } : {}"
+                      @click="switchFilterVisible(index)"
+                      ><IconFilter
+                    /></OIcon>
+                    <OPopover :target="filterIconRefs[index]" trigger="hover">
+                      <p class="bubble-content">
+                        <span class="title">{{ item.label }}:</span>
+                        {{ activeFilterValues[index]?.join('、') }}
+                      </p>
+                    </OPopover>
+                  </template>
+                </div>
+              </th>
+            </template>
+            <FilterableCheckboxes v-if="item.key === 'metric'" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
+            <FilterableCheckboxes v-else-if="item.key === 'repo'" @change="onFilterChange(item.key, index, $event)" :values="repoList" />
+            <FilterableCheckboxes v-else-if="item.key === 'applyStatus'" @change="onFilterChange(item.key, index, $event)" :values="Object.keys(applyStatus)" />
+          </OPopup>
+        </template>
       </template>
       <template #td_updateAt="{ row }">
         {{ formatDateTime(row.updateAt) }}
@@ -126,6 +227,7 @@ const revoke = () => {
 
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
+
 .revoke-text {
   color: var(--o-color-info1);
   text-align: center;
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 61e58b9..435f000 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, onMounted, computed, watch } from 'vue';
+import { ref, onMounted, computed } from 'vue';
 import { OTab, OTabPane, useMessage } from '@opensig/opendesign';
 import { useRoute, useRouter } from 'vue-router';
 import { useLocale } from '@/composables/useLocale';
@@ -75,17 +75,22 @@ const onChange = (type: string) => {
 const handleSizeChange = (val: number) => {
   pageSize.value = val;
   currentPage.value = 1;
+  pageInit();
 };
 const handleCurrentChange = (val: number) => {
   currentPage.value = val;
+  pageInit();
 };
 
 // 我的申请
-const queryMyApplication = () => {
+const queryMyApplication = (params = {}) => {
   isLoading.value = true;
   if (isMaintainerPermission.value) {
+    if (Object.keys(params).length) {
+      currentPage.value = 1;
+    }
     const newData = getParamsRules(todoParams.value);
-    getMaintainerApply(newData)
+    getMaintainerApply({ ...newData, ...params })
       .then((res) => {
         if (res.data.list.length > 0) {
           applicationData.value = res.data.list;
@@ -125,11 +130,14 @@ const revokeApplication = (applyId: number) => {
 };
 
 // 待我审批
-const queryApprovalApply = () => {
+const queryApprovalApply = (params = {}) => {
   isLoading.value = true;
   if (isAdminPermission.value) {
+    if (Object.keys(params).length) {
+      currentPage.value = 1;
+    }
     const newData = getParamsRules(todoParams.value);
-    getAdminApply(todoParams.value)
+    getAdminApply({ ...newData, ...params })
       .then((res) => {
         if (res.data.list.length > 0) {
           approvalData.value = res.data.list;
@@ -152,11 +160,14 @@ const queryApprovalApply = () => {
 };
 
 // 我审批过的
-const queryApprovedApply = () => {
+const queryApprovedApply = (params = {}) => {
   isLoading.value = true;
   if (isAdminPermission.value) {
+    if (Object.keys(params).length) {
+      currentPage.value = 1;
+    }
     const newData = getParamsRules(todoParams.value);
-    getAdminApply(newData)
+    getAdminApply({ ...newData, ...params })
       .then((res) => {
         if (res.data.list.length > 0) {
           approvedData.value = res.data.list;
@@ -223,7 +234,7 @@ onMounted(() => {
     <AppLoading :loading="isLoading" />
     <!-- 我的申请 -->
     <div v-if="activeName === 'application' && applicationData.length > 0" class="application">
-      <ApprovalTable :columns="applicationColumns" :type="activeName" :data="applicationData" :loading="isLoading" @revoke="revokeApplication" />
+      <ApprovalTable :columns="applicationColumns" @queryData="queryMyApplication" :filterable-columns="['repo', 'metric', 'applyStatus']" :type="activeName" :data="applicationData" :loading="isLoading" @revoke="revokeApplication" />
       <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
         <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
@@ -231,13 +242,13 @@ onMounted(() => {
     <!-- 判断admin权限 -->
     <template v-if="isAdminPermission">
       <div v-if="activeName === 'approval' && approvalData.length > 0" class="approval">
-        <ApprovalTable :columns="approvalColumns" :type="activeName" :data="approvalData" :loading="isLoading" />
+        <ApprovalTable :columns="approvalColumns" @queryData="queryApprovalApply" :filterable-columns="['repo', 'metric']" :type="activeName" :data="approvalData" :loading="isLoading" />
         <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </div>
       <div v-if="activeName === 'approved' && approvedData.length > 0" class="approved">
-        <ApprovalTable :columns="approvalColumns" :type="activeName" :data="approvedData" :loading="isLoading" />
+        <ApprovalTable :columns="approvalColumns" @queryData="queryApprovedApply" :filterable-columns="['repo', 'metric']" :type="activeName" :data="approvedData" :loading="isLoading" />
         <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
-- 
Gitee


From a5ac4ccb9220cf413e8b5c17440c7011b88537d1 Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Fri, 23 Aug 2024 10:18:46 +0800
Subject: [PATCH 07/17] =?UTF-8?q?fix:=20=E6=A3=80=E8=A7=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api-collaboration.ts                  |  2 +-
 src/components/collaboration/CBreadcrumb.vue  |  2 +-
 .../collaboration/FeedbackHistroy.vue         |  7 +++-
 src/components/collaboration/Indicators.vue   |  2 +-
 .../collaboration/StatusFeedback.vue          |  8 +++-
 src/components/header/AppHeader.vue           | 22 ++++------
 src/data/filter/index.ts                      | 33 +--------------
 src/data/todo/index.ts                        | 42 +++++++++----------
 src/router/index.ts                           |  9 +---
 src/shared/login.ts                           |  2 +
 src/stores/user.ts                            |  2 -
 src/utils/collaboration.ts                    | 27 ++++++++++++
 src/views/collaboration/TheCollaboration.vue  | 41 +++++++++---------
 src/views/todo/ApprovalTable.vue              | 35 ++++++++--------
 src/views/todo/TheTodo.vue                    | 39 +++++++++++++----
 src/views/todo/TheTodoDetail.vue              | 18 ++++----
 16 files changed, 152 insertions(+), 139 deletions(-)
 create mode 100644 src/utils/collaboration.ts

diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index c54f457..a1e5ba1 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -52,7 +52,7 @@ export function getMaintainerApply(params: AdminAppryT) {
 // 申请撤销
 export function getMaintainerRevoke(id: number) {
   const url = `/server/collaboration/maintainer/revoke`;
-  return request.post(url, { applyId: id }).then((res: AxiosResponse) => res?.data);
+  return request.post(url, { applyIdString: id }).then((res: AxiosResponse) => res?.data);
 }
 
 /** 待办中心获取我的申请所有仓库 */
diff --git a/src/components/collaboration/CBreadcrumb.vue b/src/components/collaboration/CBreadcrumb.vue
index d28a0af..b05543e 100644
--- a/src/components/collaboration/CBreadcrumb.vue
+++ b/src/components/collaboration/CBreadcrumb.vue
@@ -21,7 +21,7 @@ const { t } = useI18n();
 
 <template>
   <OBreadcrumb class="app-breadcrumb">
-    <OBreadcrumbItem :to="`/${locale}/collaboration`">待办中心</OBreadcrumbItem>
+    <OBreadcrumbItem :to="`/${locale}/todo/application`">待办中心</OBreadcrumbItem>
     <OBreadcrumbItem :to="`/${locale}/todo/${type}`">{{ t(`collaboration.${type}`) }}</OBreadcrumbItem>
     <OBreadcrumbItem>{{ repo }} </OBreadcrumbItem>
   </OBreadcrumb>
diff --git a/src/components/collaboration/FeedbackHistroy.vue b/src/components/collaboration/FeedbackHistroy.vue
index a249071..098b28e 100644
--- a/src/components/collaboration/FeedbackHistroy.vue
+++ b/src/components/collaboration/FeedbackHistroy.vue
@@ -4,7 +4,7 @@ import { ODialog, OTable, OTag } from '@opensig/opendesign';
 
 import { getMaintainerApply } from '@/api/api-collaboration';
 import { formatDateTime } from '@/utils/common';
-import { applyStatus } from '@/data/todo';
+import { applicationTypeConvert, applyStatusConvert } from '@/utils/collaboration';
 
 import { COUNT_PAGESIZE } from '@/data/query';
 
@@ -107,9 +107,12 @@ watch(
         <template #td_updateAt="{ row }">
           {{ formatDateTime(row.updateAt) }}
         </template>
+        <template #td_metric="{ row }">
+          {{ applicationTypeConvert(row.metric) }}
+        </template>
         <template #td_applyStatus="{ row }">
           <div class="apply-status">
-            <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+            <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatusConvert(row.applyStatus) }} </OTag>
           </div>
         </template>
       </OTable>
diff --git a/src/components/collaboration/Indicators.vue b/src/components/collaboration/Indicators.vue
index 76a654c..f54cb66 100644
--- a/src/components/collaboration/Indicators.vue
+++ b/src/components/collaboration/Indicators.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import { OTable, OTag, ODialog } from '@opensig/opendesign';
-import { repoStatusIndex } from '@/data/todo';
+import { repoStatusIndex } from '@/utils/collaboration';
 
 const columns = [
   { label: 'CVE分类', key: 'cve', type: 'cve' },
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index cef14f1..68a9786 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -31,7 +31,7 @@ const emits = defineEmits<{
 const metricIndex = ref(-1);
 const onChangeRadio = (v: string) => {
   formData.metricStatus = '';
-  metricIndex.value = applicationType.findIndex((item) => item.label === v);
+  metricIndex.value = applicationType.findIndex((item) => item.id === v);
 };
 // 根据状态获取
 const metricCategory = computed(() => (metricIndex.value === -1 ? [] : applicationType[metricIndex.value].children));
@@ -112,7 +112,7 @@ const onSubmit = (results: FieldResultT[]) => {
       <OForm ref="formRef" has-required :model="formData" label-width="220px" label-align="top" @submit="onSubmit">
         <OFormItem label="请选择您要修改的状态类别" required field="metric" :rules="metricRules">
           <ORadioGroup class="metric-options" v-model="formData.metric" direction="v" @change="(v) => onChangeRadio(v)">
-            <ORadio v-for="option in applicationType" :key="option.label" :value="option.label">
+            <ORadio v-for="option in applicationType" :key="option.label" :value="option.id">
               {{ option.label }}
             </ORadio>
           </ORadioGroup>
@@ -154,4 +154,8 @@ const onSubmit = (results: FieldResultT[]) => {
     margin-left: 16px;
   }
 }
+
+:deep(.o-form) {
+  color: var(--o-color-info1);
+}
 </style>
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index 2ac1469..32c2997 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -14,7 +14,6 @@ import { useTheme } from '@/composables/useTheme';
 import HeaderNav from '@/components/header/HeaderNav.vue';
 import AppLogin from '@/components/header/AppLogin.vue';
 import HeaderTheme from '@/components/header/HeaderTheme.vue';
-import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
 
 import openeulerLogo from '@/assets/openeuler-logo.svg';
 import openeulerLogoDark from '@/assets/openeuler-logo-dark.svg';
@@ -26,7 +25,7 @@ const langStore = useLangStore();
 const { isDark } = useTheme();
 const loginStore = useLoginStore();
 const userInfoStore = useUserInfoStore();
-const isMainPer = computed(() => userInfoStore.platformMaintainerAllPermission);
+const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
 const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 
 watch(
@@ -49,19 +48,13 @@ const isCollaboration = computed(() => {
   return COLLABORATIONPERMISSION.includes(route.name as string);
 });
 
-const showGiteeDlg = ref(false);
 const jump = (href: string) => {
-  if (isAdminPer.value || isMainPer.value) {
-    if (href === 'collaboration') {
-      windowOpen(`/${locale.value}/${href}`, '_blank');
-    } else {
-      router.push({
-        path: `/${locale.value}/${href}`,
-      });
-    }
+  if (href === 'collaboration') {
+    windowOpen(`/${locale.value}/${href}`, '_blank');
   } else {
-    // 如果Maintainer没有绑定gitee，弹窗提醒
-    showGiteeDlg.value = true;
+    router.push({
+      path: `/${locale.value}/${href}`,
+    });
   }
 };
 </script>
@@ -81,7 +74,7 @@ const jump = (href: string) => {
         <HeaderNav v-if="route.name" :options="isCollaboration ? collaborationNav : navs" />
       </div>
       <div class="header-right">
-        <template v-if="loginStore.isLogined">
+        <template v-if="loginStore.isLogined && (isAdminPer || isMainPer)">
           <OLink v-if="isCollaboration" class="todo" @click="jump(`todo/application`)">待办中心</OLink>
           <OLink v-else class="collaboration" @click="jump(`collaboration`)">协作平台</OLink>
         </template>
@@ -89,7 +82,6 @@ const jump = (href: string) => {
         <AppLogin />
       </div>
     </div>
-    <GiteeAccountDialog v-if="showGiteeDlg" @close="showGiteeDlg = false" />
   </div>
 </template>
 
diff --git a/src/data/filter/index.ts b/src/data/filter/index.ts
index 8f0e8f3..e38afba 100644
--- a/src/data/filter/index.ts
+++ b/src/data/filter/index.ts
@@ -26,35 +26,4 @@ export const arch = [
   "riscv64",
   "loongarch64",
   "sw_64",
-]
-
-export const collaborationFilter: Record<string, string[]> = {
-  cveStatus: [
-    '有CVE且全部未修复',
-    '有CVE部分修复',
-    '有CVE且全部修复',
-    '没有CVE问题',
-  ],
-  issueStatus: [
-    '没有ISSUE修复',
-    '有部分ISSUE修复',
-    '全部ISSUE修复',
-  ],
-  prStatus: [
-    '没有PR提交',
-    '有PR提交未合入',
-    '有PR合入',
-  ],
-  versionStatus: [
-    '最新版本',
-    '落后版本',
-  ],
-  orgStatus: [
-    '贡献组织多',
-    '贡献组织少',
-  ],
-  contributorStatus: [
-    '贡献人员多',
-    '贡献人员少',
-  ],
-}
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/src/data/todo/index.ts b/src/data/todo/index.ts
index 381dbe8..56cce93 100644
--- a/src/data/todo/index.ts
+++ b/src/data/todo/index.ts
@@ -24,31 +24,24 @@ export const approvalColumns = [
 ]
 
 export const approvalHistoryColumns = [
-  { label: '软件仓库', key: 'name', type: 'name' },
-  { label: '申请类型', key: 'type', type: 'type' },
-  { label: '修改状态', key: 'sig', type: 'sig' },
-  { label: '审批意见', key: 'cve', type: 'cve' },
-  { label: '申请人', key: 'issue', type: 'issue' },
-  { label: '申请单号', key: 'pkg', type: 'pkg' },
-  { label: '审批时间', key: 'version', type: 'version' },
-  { label: '审批状态', key: 'member', type: 'member' },
+  { label: '软件仓库', key: 'repo', type: 'repo' },
+  { label: '申请类型', key: 'metric', type: 'metric' },
+  { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
+  { label: '审批意见', key: 'comment', type: 'comment' },
+  { label: '申请人', key: 'maintainer', type: 'maintainer' },
+  { label: '申请单号', key: 'applyIdString', type: 'applyId' },
+  { label: '审批时间', key: 'updateAt', type: 'updateAt' },
+  { label: '审批状态', key: 'applyStatus', type: 'applyStatus' },
   { label: '操作', key: 'operation', type: 'operation' },
 ]
 
-
-export const applyStatus = {
-  OPEN: '待审批',
-  REJECTED: '已驳回',
-  APPROVED: '已通过',
-  REVOKED: '已撤销',
-};
-
-
-const repoStatusArr = ['健康', '活跃', '静止', '缺人维护', '没有人维护'];
-export const repoStatusIndex = (v: string) => {
-  return repoStatusArr.findIndex((item) => item === v);
-};
-
+// 申请状态
+export const applyStatusType = [
+  { label: '待审批', value: 'OPEN' },
+  { label: '已驳回', value: 'REJECTED' },
+  { label: '已通过', value: 'APPROVED' },
+  { label: '已撤销', value: 'REVOKED' },
+]
 
 // 申请类型
 export const applicationType = [
@@ -82,4 +75,7 @@ export const applicationType = [
     label: '贡献人员状态',
     children: ['贡献人员多', '贡献人员少'],
   },
-];
\ No newline at end of file
+];
+
+export const kindTypes = ['everything-exclude-baseos', 'epol', 'baseos']
+
diff --git a/src/router/index.ts b/src/router/index.ts
index 53b8fee..e5df8fd 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -89,7 +89,6 @@ const routes = [
     name: 'collaboration',
     component: () => import('@/views/collaboration/TheCollaboration.vue'),
   },
-
   {
     path: '/zh/todo/:type',
     name: 'todo',
@@ -153,7 +152,7 @@ router.beforeEach(async (to) => {
     return { name: 'notFound' };
   }
 
-  if (userInfoStore.upstreamPermission === null && !isPlatform) {
+  if (userInfoStore.upstreamPermission === null && loginStore.isLogined && !isPlatform) {
     try {
       const upstreamPermission = await queryUpstreamPermission();
       userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
@@ -165,7 +164,7 @@ router.beforeEach(async (to) => {
 
 
   // 协作平台权限
-  if (userInfoStore.platformMaintainerPermission === null || userInfoStore.platformAdminPermission === null) {
+  if ((userInfoStore.platformMaintainerPermission === null || userInfoStore.platformAdminPermission === null) && loginStore.isLogined) {
     try {
       const { data } = await getCollaborationPermissions();
 
@@ -175,10 +174,6 @@ router.beforeEach(async (to) => {
         }
         if (data.permissions.includes('maintainer')) {
           userInfoStore.platformMaintainerPermission = true;
-          // 判断是否绑定gitee
-          const hasGiteeAccount = () => !!userInfoStore.identities.find((id) => id.identity === 'gitee');
-
-          userInfoStore.platformMaintainerAllPermission = hasGiteeAccount() ? true : false;
         }
       } else {
         return isPlatform ? { name: 'notFound' } : true;
diff --git a/src/shared/login.ts b/src/shared/login.ts
index b7c1545..07c04a4 100644
--- a/src/shared/login.ts
+++ b/src/shared/login.ts
@@ -61,7 +61,9 @@ export async function tryLogin() {
   if (!csrfToken) {
     userInfoStore.$reset();
     loginStore.setLoginStatus(LOGIN_STATUS.NOT);
+    return;
   }
+
   try {
     loginStore.setLoginStatus(LOGIN_STATUS.DOING);
     userInfoStore.$patch(await queryUserInfo());
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 3b53de6..221eeb6 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -16,8 +16,6 @@ export const useUserInfoStore = defineStore('userInfo', {
       platformAdminPermission: null as boolean | null,
       // 协作平台maintainer权限
       platformMaintainerPermission: null as boolean | null,
-      // 协作平台maintainer权限并绑定gitee
-      platformMaintainerAllPermission: null as boolean | null,
     }
   },
 });
diff --git a/src/utils/collaboration.ts b/src/utils/collaboration.ts
new file mode 100644
index 0000000..16631a6
--- /dev/null
+++ b/src/utils/collaboration.ts
@@ -0,0 +1,27 @@
+import { applicationType, applyStatusType } from '@/data/todo/'
+
+// 申请类型转换
+export const applicationTypeConvert = (v: string) => {
+  const index = applicationType.findIndex((item) => item.id === v);
+  if (index === -1) {
+    return v;
+  }
+  return applicationType[index].label;
+}
+
+
+// 仓库活跃度
+export const repoStatusArr = ['健康', '活跃', '静止', '缺人维护', '没有人维护'];
+export const repoStatusIndex = (v: string) => {
+  return repoStatusArr.findIndex((item) => item === v);
+};
+
+
+// 申请状态
+export const applyStatusConvert = (v: string) => {
+  const index = applyStatusType.findIndex((item) => item.value === v);
+  if (index === -1) {
+    return v;
+  }
+  return applyStatusType[index].label;
+};
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index ce452ab..2626a65 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -11,10 +11,9 @@ import Result404 from '@/components/Result404.vue';
 import IconOutlink from '~icons/pkg/icon-outlink.svg';
 import IconFilter from '~icons/app/icon-filter.svg';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
-import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
-import { collaborationFilter } from '@/data/filter';
+import { kindTypes, applicationType } from '@/data/todo';
 import { useDebounceFn } from '@vueuse/core';
-import { repoStatusIndex } from '@/data/todo';
+import { repoStatusIndex, repoStatusArr } from '@/utils/collaboration';
 
 const columns = [
   { label: '软件仓库', key: 'repo', type: 'repo' },
@@ -59,7 +58,7 @@ const activeFilterValues = ref(new Array<string[]>(columns.length));
 /** 当前有选中筛选项的表格列的数组下标 */
 const currentActiveFilterIndices = ref(new Set<number>());
 
-const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[], isCheckAll: boolean }) => {
+const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[]; isCheckAll: boolean }) => {
   // 关掉筛选组件
   filterSwitches.value = columns.map(() => false);
   currentPage.value = 1;
@@ -78,7 +77,6 @@ const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
 
 const userInfoStore = useUserInfoStore();
 const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
-const isMainAllPer = computed(() => userInfoStore.platformMaintainerAllPermission);
 const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 
 // 分页
@@ -192,14 +190,9 @@ const showDlg = ref(false);
 
 const showFeedbackDlg = ref(false);
 const repoValue = ref('');
-const showGiteeDlg = ref(false);
 const changeFeedback = (v: string) => {
-  if (isMainAllPer.value) {
-    showFeedbackDlg.value = true;
-    repoValue.value = v;
-  } else {
-    showGiteeDlg.value = true;
-  }
+  showFeedbackDlg.value = true;
+  repoValue.value = v;
 };
 
 // 反馈历史
@@ -209,6 +202,15 @@ const changeFeedbackHistory = (v: string) => {
   showFeedbacHistroykDlg.value = true;
 };
 
+// 类型数据
+const metricTypes = (v: string) => {
+  const index = applicationType.findIndex((item) => item.id === v);
+  if (index === -1) {
+    return [];
+  }
+  return applicationType[index].children;
+};
+
 watch(
   () => searchParams.value,
   () => {
@@ -267,8 +269,9 @@ watch(
             </template>
             <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-if="item.key === 'repo'" :values="allRepos" />
             <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'sigName'" :values="allSigs" />
-            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'kind'" />
-            <FilterableCheckboxes :filterable="false" @change="onFilterChange(item.key, index, $event)" v-else :values="collaborationFilter[item.key]" />
+            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'kind'" :values="kindTypes" />
+            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'status'" :values="repoStatusArr" />
+            <FilterableCheckboxes :filterable="false" @change="onFilterChange(item.key, index, $event)" v-else :values="metricTypes(item.key)" />
           </OPopup>
         </template>
         <template #td_repo="{ row }">
@@ -303,7 +306,7 @@ watch(
         </template>
         <template #td_operation="{ row }">
           <div class="operation-box">
-            <OLink v-if="!isAdminPer" color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
+            <OLink v-if="isMainPer" color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
             <OLink color="primary" hover-underline @click="changeFeedbackHistory(row.repo)">反馈历史</OLink>
           </div>
         </template>
@@ -314,8 +317,6 @@ watch(
       </div>
     </div>
 
-    <GiteeAccountDialog v-if="showGiteeDlg" @close="showGiteeDlg = false" />
-
     <!-- 暂无记录 -->
     <template v-if="isError || !hasGiteeAccount">
       <Result404>
@@ -331,7 +332,7 @@ watch(
 
     <StatusFeedback :repo="repoValue" v-if="showFeedbackDlg" @close="showFeedbackDlg = false" />
 
-    // 反馈历史
+    <!-- 反馈历史 -->
     <FeedbackHistroy v-if="showFeedbacHistroykDlg" :repo="repoValue" @close="showFeedbacHistroykDlg = false" />
   </ContentWrapper>
 </template>
@@ -410,11 +411,11 @@ watch(
       .issue,
       .pr,
       .version {
-        width: 180px;
+        width: 188px;
       }
       .org,
       .personnel {
-        width: 140px;
+        width: 160px;
       }
       .kind {
         width: 180px;
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 8e6dc28..2200077 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -4,12 +4,11 @@ import { OTable, OLink, OTag, ODialog, OButton, OPopup, OIcon, OPopover } from '
 import { useLocale } from '@/composables/useLocale';
 import { formatDateTime } from '@/utils/common';
 import { useRouter, useRoute } from 'vue-router';
-import { applicationType, applyStatus } from '@/data/todo';
+import { applicationType, applyStatusType } from '@/data/todo';
+import { applicationTypeConvert, applyStatusConvert } from '@/utils/collaboration';
 import { useUserInfoStore } from '@/stores/user';
 
 import IconFilter from '~icons/app/icon-filter.svg';
-
-import GiteeAccountDialog from '@/components/collaboration/GiteeAccountDialog.vue';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
 import { useDebounceFn } from '@vueuse/core';
 import { getAdminApplyRepos, getMaintainerApplyRepos } from '@/api/api-collaboration';
@@ -60,7 +59,7 @@ onMounted(() => {
       repoList.value = data.list;
     });
   }
-})
+});
 
 const filterParams = reactive(
   props.filterableColumns.reduce(
@@ -76,8 +75,11 @@ watch(filterParams, (params) => emits('queryData', params));
 
 const filterableColSet = computed(() => new Set(props.filterableColumns));
 const applyTypes = applicationType.map((item) => ({ label: item.label, value: item.id }));
+
 const filterIconRefs = ref(new Array<ComponentPublicInstance>(props.columns.length));
 
+const applyStatusList = computed(() => {});
+
 /** 筛选组件是否显示的开关 */
 const filterSwitches = ref(props.columns.map(() => false));
 
@@ -111,7 +113,7 @@ const onFilterChange = useDebounceFn((type: string, index: number, val: { values
 }, 300);
 
 const userInfoStore = useUserInfoStore();
-const isMainAllPer = computed(() => userInfoStore.platformMaintainerAllPermission);
+const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
 
 const jumpTo = (id: number) => {
   const type = route.params?.type as string;
@@ -126,15 +128,10 @@ const emits = defineEmits<{
 }>();
 
 const showDlg = ref(false);
-const showGiteeDlg = ref(false);
 const applayId = ref();
 const revokeApplication = (id: number) => {
-  if (isMainAllPer.value) {
-    applayId.value = id;
-    showDlg.value = true;
-  } else {
-    showGiteeDlg.value = true;
-  }
+  applayId.value = id;
+  showDlg.value = true;
 };
 
 const revoke = () => {
@@ -176,13 +173,16 @@ const revoke = () => {
             </template>
             <FilterableCheckboxes v-if="item.key === 'metric'" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
             <FilterableCheckboxes v-else-if="item.key === 'repo'" @change="onFilterChange(item.key, index, $event)" :values="repoList" />
-            <FilterableCheckboxes v-else-if="item.key === 'applyStatus'" @change="onFilterChange(item.key, index, $event)" :values="Object.keys(applyStatus)" />
+            <FilterableCheckboxes v-else-if="item.key === 'applyStatus'" @change="onFilterChange(item.key, index, $event)" :values="applyStatusType" />
           </OPopup>
         </template>
       </template>
       <template #td_updateAt="{ row }">
         {{ formatDateTime(row.updateAt) }}
       </template>
+      <template #td_metric="{ row }">
+        {{ applicationTypeConvert(row.metric) }}
+      </template>
       <template #td_comment="{ row }">
         <div class="line-clamp">{{ row.comment }}</div>
       </template>
@@ -191,14 +191,14 @@ const revoke = () => {
       </template>
       <template #td_applyStatus="{ row }">
         <div class="apply-status">
-          <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatus[row.applyStatus] }} </OTag>
+          <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatusConvert(row.applyStatus) }} </OTag>
         </div>
       </template>
       <template #td_operation="{ row }">
         <template v-if="type === 'application'">
           <div class="oper-box">
             <OLink color="primary" hover-underline @click="jumpTo(row.applyIdString)">申请详情</OLink>
-            <OLink color="danger" v-if="row.applyStatus === 'OPEN'" hover-underline @click="revokeApplication(row.applyIdString)">撤销申请</OLink>
+            <OLink color="danger" v-if="row.applyStatus === 'OPEN' && isMainPer" hover-underline @click="revokeApplication(row.applyIdString)">撤销申请</OLink>
           </div>
         </template>
         <template v-if="type === 'approval'">
@@ -209,7 +209,6 @@ const revoke = () => {
         </template>
       </template>
     </OTable>
-    <GiteeAccountDialog v-if="showGiteeDlg" @close="showGiteeDlg = false" />
     <ODialog v-model:visible="showDlg" class="revoke-dlg" :unmount-on-hide="true" :mask="true" size="small">
       <template #header>
         <p class="title">确认撤销</p>
@@ -282,7 +281,9 @@ thead {
   .description {
     width: 150px;
   }
-  .applyStatus,
+  .applyStatus {
+    width: 135px;
+  }
   .adminstrator,
   .maintainer {
     width: 120px;
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 435f000..265f3a1 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -3,7 +3,7 @@ import { ref, onMounted, computed } from 'vue';
 import { OTab, OTabPane, useMessage } from '@opensig/opendesign';
 import { useRoute, useRouter } from 'vue-router';
 import { useLocale } from '@/composables/useLocale';
-import { approvalColumns, applicationColumns } from '@/data/todo';
+import { approvalColumns, applicationColumns, approvalHistoryColumns } from '@/data/todo';
 import { getAdminApply, getMaintainerApply, getMaintainerRevoke } from '@/api/api-collaboration';
 import { useUserInfoStore } from '@/stores/user';
 import Result404 from '@/components/Result404.vue';
@@ -64,6 +64,7 @@ const isLoading = ref(false);
 
 const activeName = ref();
 const onChange = (type: string) => {
+  currentPage.value = 1;
   pageInit();
   // 切换url参数
   router.push({
@@ -120,6 +121,7 @@ const revokeApplication = (applyId: number) => {
         message.success({
           content: '撤销成功',
         });
+        pageInit();
       }
     })
     .catch(() => {
@@ -201,7 +203,7 @@ const pageInit = () => {
     applyStatus.value = 'OPEN';
     queryApprovalApply();
   } else if (activeName.value === 'approved') {
-    todoName.value = 'APPROVED';
+    todoName.value = 'formPage';
     applyStatus.value = 'APPROVED,REJECTED';
     queryApprovedApply();
   }
@@ -234,7 +236,15 @@ onMounted(() => {
     <AppLoading :loading="isLoading" />
     <!-- 我的申请 -->
     <div v-if="activeName === 'application' && applicationData.length > 0" class="application">
-      <ApprovalTable :columns="applicationColumns" @queryData="queryMyApplication" :filterable-columns="['repo', 'metric', 'applyStatus']" :type="activeName" :data="applicationData" :loading="isLoading" @revoke="revokeApplication" />
+      <ApprovalTable
+        :columns="applicationColumns"
+        @queryData="queryMyApplication"
+        :filterable-columns="['repo', 'metric', 'applyStatus']"
+        :type="activeName"
+        :data="applicationData"
+        :loading="isLoading"
+        @revoke="revokeApplication"
+      />
       <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
         <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
@@ -242,13 +252,27 @@ onMounted(() => {
     <!-- 判断admin权限 -->
     <template v-if="isAdminPermission">
       <div v-if="activeName === 'approval' && approvalData.length > 0" class="approval">
-        <ApprovalTable :columns="approvalColumns" @queryData="queryApprovalApply" :filterable-columns="['repo', 'metric']" :type="activeName" :data="approvalData" :loading="isLoading" />
+        <ApprovalTable
+          :columns="approvalColumns"
+          @queryData="queryApprovalApply"
+          :filterable-columns="['repo', 'metric']"
+          :type="activeName"
+          :data="approvalData"
+          :loading="isLoading"
+        />
         <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </div>
       <div v-if="activeName === 'approved' && approvedData.length > 0" class="approved">
-        <ApprovalTable :columns="approvalColumns" @queryData="queryApprovedApply" :filterable-columns="['repo', 'metric']" :type="activeName" :data="approvedData" :loading="isLoading" />
+        <ApprovalTable
+          :columns="approvalHistoryColumns"
+          @queryData="queryApprovedApply"
+          :filterable-columns="['repo', 'metric']"
+          :type="activeName"
+          :data="approvedData"
+          :loading="isLoading"
+        />
         <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
@@ -302,10 +326,11 @@ onMounted(() => {
   padding-left: var(--layout-content-padding);
   padding-right: var(--layout-content-padding);
 }
-.approval {
+.approval,
+.approved {
   :deep(thead) {
     .operation {
-      width: 100px;
+      width: 112px;
     }
   }
 }
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
index 0d50526..c6618a8 100644
--- a/src/views/todo/TheTodoDetail.vue
+++ b/src/views/todo/TheTodoDetail.vue
@@ -3,7 +3,7 @@ import { ref, onMounted, computed, reactive } from 'vue';
 import { OButton, OTag, OForm, OTextarea, OFormItem, useMessage, type FieldResultT } from '@opensig/opendesign';
 import { useRoute } from 'vue-router';
 import { getAdminApply, getMaintainerApply, getAdminProcess } from '@/api/api-collaboration';
-import { applyStatus } from '@/data/todo';
+import { applicationTypeConvert, applyStatusConvert } from '@/utils/collaboration';
 import { formatDateTime } from '@/utils/common';
 import { useUserInfoStore } from '@/stores/user';
 
@@ -15,7 +15,7 @@ const isLoading = ref(true);
 const isError = ref(false);
 
 const type = ref();
-const applyId = ref(route.params.id || '');
+const applyId = ref((route.params.id as string) || '');
 const todoData = ref();
 const formRef = ref<InstanceType<typeof OForm>>();
 const formData = reactive({
@@ -26,7 +26,7 @@ const formData = reactive({
 
 // 我的申请
 const queryApplicationApply = () => {
-  getMaintainerApply({ name: 'formContent', applyId: applyId.value })
+  getMaintainerApply({ name: 'formContent', applyIdString: applyId.value })
     .then((res) => {
       if (res.data.list.length > 0) {
         todoData.value = res.data.list[0];
@@ -132,7 +132,7 @@ onMounted(() => {
       <div class="title">
         <h2>{{ todoData.repo }}</h2>
         <div class="apply-status">
-          <OTag :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatus[todoData.applyStatus] }} </OTag>
+          <OTag :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatusConvert(todoData.applyStatus) }} </OTag>
         </div>
       </div>
 
@@ -142,25 +142,25 @@ onMounted(() => {
           {{ todoData.applyIdString }}
         </OFormItem>
         <OFormItem label="申请类型：">
-          {{ todoData.metric }}
+          {{ applicationTypeConvert(todoData.metric) }}
         </OFormItem>
         <OFormItem label="修改状态："> {{ todoData.metricStatus }} </OFormItem>
         <OFormItem label="修改理由：">{{ todoData.description }} </OFormItem>
         <OFormItem label="申请时间："> {{ formatDateTime(todoData.updateAt) }} </OFormItem>
       </OForm>
-      <template v-if="todoData.applyStatus !== 'OPEN'">
+      <template v-if="todoData.applyStatus === 'REJECTED' || todoData.applyStatus === 'APPROVED'">
         <h3 class="caption">审批信息</h3>
         <OForm label-width="92px" label-align="top">
-          <OFormItem label="审批人：">
+          <OFormItem v-if="todoData.adminstrator" label="审批人：">
             {{ todoData.adminstrator }}
           </OFormItem>
           <OFormItem label="审批意见：">
             {{ todoData.comment }}
           </OFormItem>
-          <OFormItem label="审批时间："> - </OFormItem>
+          <OFormItem label="审批时间："> {{ formatDateTime(todoData.approvalTime) }} </OFormItem>
         </OForm>
       </template>
-      <template v-if="todoData.applyStatus === 'OPEN' && type === 'approval'">
+      <template v-if="isAdminPer && todoData.applyStatus === 'OPEN'">
         <h3 class="caption">审批</h3>
         <OForm ref="formRef" has-required :model="formData" label-width="92px" label-align="top" @submit="onSubmit">
           <OFormItem label="审批意见：" required field="comment" :rules="commentRules">
-- 
Gitee


From 437101f1aa8ebddfcbb8d035bd7f518d981492ca Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Fri, 23 Aug 2024 15:12:15 +0800
Subject: [PATCH 08/17] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E9=80=82=E9=85=8D=E6=9A=97=E8=89=B2=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E7=94=B3=E8=AF=B7=E7=B1=BB=E5=9E=8B=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E6=B0=94=E6=B3=A1=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FilterableCheckboxes.vue | 10 ++++++++--
 src/views/todo/ApprovalTable.vue        |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
index 1af16f2..61ad553 100644
--- a/src/components/FilterableCheckboxes.vue
+++ b/src/components/FilterableCheckboxes.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch, type PropType } from 'vue';
 import { useDebounceFn } from '@vueuse/core';
-import { OCheckbox, OCheckboxGroup, OInput, OScroller } from '@opensig/opendesign';
+import { OCheckbox, OCheckboxGroup, OIcon, OInput, OScroller } from '@opensig/opendesign';
 
 import IconSearch from '~icons/app/icon-search.svg';
 import { useCheckbox } from '@/composables/useCheckbox';
@@ -91,7 +91,9 @@ watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.
   <div class="filterable-checkboxes-wrap" :style="filterable ? {} : { paddingTop: '0' }" ref="wrapDiv">
     <OInput v-if="filterable" clearable @clear="onFilterInput()" @input="onFilterInput" class="filter-input" placeholder="搜索">
       <template #prefix>
-        <IconSearch />
+        <OIcon class="search-icon">
+          <IconSearch />
+        </OIcon>
       </template>
     </OInput>
     <OScroller class="content" showType="always">
@@ -106,6 +108,10 @@ watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.
 </template>
 
 <style lang="scss" scoped>
+.search-icon {
+  color: var(--o-color-info1);
+}
+
 .filterable-checkboxes-wrap {
   background-color: var(--o-color-fill2);
   padding: 8px;
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 2200077..3f77480 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -107,7 +107,11 @@ const onFilterChange = useDebounceFn((type: string, index: number, val: { values
     activeFilterValues.value[index] = [];
   } else {
     filterParams[type] = val.values.join();
-    activeFilterValues.value[index] = val.values as string[];
+    if (type === 'metric') {
+      activeFilterValues.value[index] = val.values.map(item => applyStatusConvert(item as string));
+    } else {
+      activeFilterValues.value[index] = val.values as string[];
+    }
     currentActiveFilterIndices.value.delete(index);
   }
 }, 300);
-- 
Gitee


From ce4104ad8a7f4855261461be1a4b6a66df9bc0fe Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Fri, 23 Aug 2024 17:32:49 +0800
Subject: [PATCH 09/17] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=E7=8A=B6=E6=80=81=E6=8C=87=E6=A0=87=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   6 +-
 src/api/api-collaboration.ts                  |  10 +-
 src/assets/icon/icon-outlink.svg              |   3 +-
 src/assets/icon/icon-state.svg                |   4 +
 .../style/category/collaboration/index.scss   |   8 +
 src/assets/style/element-plus/input.scss      |   1 +
 src/assets/style/element-plus/pagination.scss |   3 +
 src/assets/style/theme/select.scss            |   3 +-
 src/assets/style/theme/table.scss             |  12 +-
 src/assets/svg-icons/icon-outlink.svg         |   3 +-
 src/components/AppPagination.vue              |   2 +-
 src/components/ExternalLink.vue               |   2 +-
 src/components/OTableItemNew.vue              |   1 +
 .../collaboration/FeedbackHistroy.vue         |  68 +++++-
 .../collaboration/GiteeAccountDialog.vue      |  47 ----
 src/components/collaboration/Indicators.vue   |  88 +++++++-
 .../collaboration/StatusFeedback.vue          |  17 +-
 src/components/header/AppHeader.vue           |  14 +-
 src/data/todo/index.ts                        |   8 +-
 src/router/index.ts                           |  11 +-
 src/utils/collaboration.ts                    |   5 +
 src/utils/common.ts                           |  23 +-
 .../collaboration/CollaborationPermission.vue |  49 ++++
 src/views/collaboration/TheCollaboration.vue  | 212 +++++++++---------
 src/views/todo/ApprovalTable.vue              |  11 +-
 src/views/todo/TheTodo.vue                    |  62 ++---
 src/views/todo/TheTodoDetail.vue              |  27 ++-
 27 files changed, 445 insertions(+), 255 deletions(-)
 create mode 100644 src/assets/icon/icon-state.svg
 delete mode 100644 src/components/collaboration/GiteeAccountDialog.vue
 create mode 100644 src/views/collaboration/CollaborationPermission.vue

diff --git a/components.d.ts b/components.d.ts
index 8211204..1bf75fd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -19,7 +19,6 @@ declare module 'vue' {
     AppTableToggle: typeof import('./src/components/AppTableToggle.vue')['default']
     CBreadcrumb: typeof import('./src/components/collaboration/CBreadcrumb.vue')['default']
     ContentWrapper: typeof import('./src/components/ContentWrapper.vue')['default']
-    copy: typeof import('./src/components/collaboration/StatusFeedback copy.vue')['default']
     DetailAside: typeof import('./src/components/detail/DetailAside.vue')['default']
     DetailBasicInfo: typeof import('./src/components/detail/DetailBasicInfo.vue')['default']
     DetailHeader: typeof import('./src/components/detail/DetailHeader.vue')['default']
@@ -38,8 +37,6 @@ declare module 'vue' {
     FilterItemSkeleton: typeof import('./src/components/skeleton/FilterItemSkeleton.vue')['default']
     FilterOrder: typeof import('./src/components/filter/FilterOrder.vue')['default']
     FilterRadio: typeof import('./src/components/filter/FilterRadio.vue')['default']
-    GiteeAccountDialog: typeof import('./src/components/collaboration/GiteeAccountDialog.vue')['default']
-    GiteeDialog: typeof import('./src/components/collaboration/GiteeDialog.vue')['default']
     HeaderNav: typeof import('./src/components/header/HeaderNav.vue')['default']
     HeaderTheme: typeof import('./src/components/header/HeaderTheme.vue')['default']
     HomeSkeleton: typeof import('./src/components/skeleton/HomeSkeleton.vue')['default']
@@ -59,4 +56,7 @@ declare module 'vue' {
     SearchTab: typeof import('./src/components/search/SearchTab.vue')['default']
     StatusFeedback: typeof import('./src/components/collaboration/StatusFeedback.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }
diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index a1e5ba1..d17b4e0 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -50,9 +50,13 @@ export function getMaintainerApply(params: AdminAppryT) {
 }
 
 // 申请撤销
-export function getMaintainerRevoke(id: number) {
+interface RevokeT {
+  applyIdString: string;
+  applyStatus: string;
+}
+export function getMaintainerRevoke(params: RevokeT) {
   const url = `/server/collaboration/maintainer/revoke`;
-  return request.post(url, { applyIdString: id }).then((res: AxiosResponse) => res?.data);
+  return request.post(url, { params }).then((res: AxiosResponse) => res?.data);
 }
 
 /** 待办中心获取我的申请所有仓库 */
@@ -81,7 +85,7 @@ export function getApplyFeedback(params: FeedbackT) {
 }
 
 interface ProcessT {
-  applyId: string;
+  applyIdString: string;
   comment: string;
   applyStatus: string;
 }
diff --git a/src/assets/icon/icon-outlink.svg b/src/assets/icon/icon-outlink.svg
index b284bea..1b62f8d 100644
--- a/src/assets/icon/icon-outlink.svg
+++ b/src/assets/icon/icon-outlink.svg
@@ -1,4 +1,5 @@
 
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-<path d="M12.339 4.3c0.387 0 0.7 0.313 0.7 0.7s-0.313 0.7-0.7 0.7h-7.139c-0.276 0-0.5 0.224-0.5 0.5v12.6c0 0.276 0.224 0.5 0.5 0.5h12.6c0.276 0 0.5-0.224 0.5-0.5v-7.12c0-0.387 0.313-0.7 0.7-0.7s0.7 0.313 0.7 0.7v7.12c0 1.049-0.851 1.9-1.9 1.9h-12.6c-1.049 0-1.9-0.851-1.9-1.9v-12.6c0-1.049 0.851-1.9 1.9-1.9h7.139zM19.048 3.126c0.994 0 1.8 0.806 1.8 1.8v3.095c0 0.331-0.269 0.6-0.6 0.6s-0.6-0.269-0.6-0.6l-0.001-2.653-6.43 6.358c-0.275 0.272-0.718 0.269-0.99-0.006s-0.269-0.718 0.006-0.99l6.478-6.405h-2.709c-0.331 0-0.6-0.269-0.6-0.6s0.269-0.6 0.6-0.6h3.046z"></path>
+<path d="M8.121 2.346c0.331 0 0.6 0.269 0.6 0.6 0 0.298-0.218 0.546-0.503 0.592l-0.097 0.008h-2.334c-1.27 0-2.31 0.987-2.394 2.236l-0.006 0.164v12.107c0 1.27 0.987 2.31 2.236 2.394l0.164 0.006h12.427c1.27 0 2.31-0.987 2.394-2.236l0.006-0.164v-1.642c0-0.331 0.269-0.6 0.6-0.6 0.298 0 0.546 0.218 0.592 0.503l0.008 0.097v1.642c0 1.924-1.509 3.496-3.409 3.595l-0.191 0.005h-12.427c-1.924 0-3.496-1.509-3.595-3.409l-0.005-0.191v-12.107c0-1.924 1.509-3.496 3.409-3.595l0.191-0.005h2.334z"></path>
+<path d="M19.994 5.256l0.006 0.134v6.153c0 0.329-0.267 0.595-0.595 0.595-0.296 0-0.542-0.216-0.588-0.499l-0.008-0.097 0-5.511-8.793 8.794c-0.233 0.233-0.61 0.233-0.842 0-0.209-0.209-0.23-0.536-0.063-0.768l0.063-0.074 8.792-8.793-5.509 0.001c-0.329 0-0.595-0.267-0.595-0.595 0-0.296 0.216-0.542 0.499-0.588l0.097-0.008h6.153c0.722 0 1.316 0.551 1.383 1.256z"></path>
 </svg>
diff --git a/src/assets/icon/icon-state.svg b/src/assets/icon/icon-state.svg
new file mode 100644
index 0000000..a8c5b84
--- /dev/null
+++ b/src/assets/icon/icon-state.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path d="M19 2.050c0.782 0 1.42 0.619 1.449 1.394l0.001 0.056v12.571c0 0.031-0.003 0.060-0.009 0.089 0.006 0.028 0.009 0.059 0.009 0.089 0 0.236-0.182 0.43-0.413 0.448l-0.037 0.002h-4c-0.291 0-0.528 0.225-0.549 0.511l-0.001 0.039-0.001 3.357 2.917-2.612c0.175-0.157 0.438-0.151 0.607 0.006l0.029 0.029c0.157 0.175 0.151 0.438-0.006 0.607l-0.029 0.029-3.54 3.169c-0.072 0.065-0.163 0.104-0.259 0.113l-0.041 0.002h-10.126c-0.782 0-1.42-0.619-1.449-1.394l-0.001-0.056v-17.095c0-0.728 0.569-1.325 1.285-1.354l0.054-0.001h14.111zM19 2.95h-14.111c-0.229 0-0.419 0.182-0.437 0.417l-0.001 0.038v17.095c0 0.291 0.225 0.528 0.511 0.549l0.039 0.001h9.549l0.001-3.8c0-0.782 0.619-1.42 1.394-1.449l0.056-0.001h3.549l0.001-12.3c0-0.291-0.225-0.528-0.511-0.549l-0.039-0.001zM11.75 15.836c0.249 0 0.45 0.224 0.45 0.5 0 0.262-0.182 0.477-0.413 0.498l-0.037 0.002h-4.5c-0.249 0-0.45-0.224-0.45-0.5 0-0.262 0.182-0.477 0.413-0.498l0.037-0.002h4.5zM15.125 12.175c0.249 0 0.45 0.224 0.45 0.5 0 0.262-0.182 0.477-0.413 0.498l-0.037 0.002h-8c-0.249 0-0.45-0.224-0.45-0.5 0-0.262 0.182-0.477 0.413-0.498l0.037-0.002h8z"></path>
+<path d="M17 5.050h-10c-0.249 0-0.45 0.201-0.45 0.45v3c0 0.249 0.201 0.45 0.45 0.45h10c0.249 0 0.45-0.201 0.45-0.45v-3c0-0.249-0.201-0.45-0.45-0.45zM16.55 5.95v2.1h-9.1v-2.1h9.1z"></path>
+</svg>
diff --git a/src/assets/style/category/collaboration/index.scss b/src/assets/style/category/collaboration/index.scss
index a13d785..2337ba2 100644
--- a/src/assets/style/category/collaboration/index.scss
+++ b/src/assets/style/category/collaboration/index.scss
@@ -21,6 +21,14 @@
     }
   }
 }
+.indicators {
+  .repo-status {
+    :deep(.o-tag) {
+      min-width: 56px;
+      border-radius: 2px;
+    }
+  }
+}
 
 .apply-status {
   :deep(.o-tag) {
diff --git a/src/assets/style/element-plus/input.scss b/src/assets/style/element-plus/input.scss
index 1577222..9241397 100644
--- a/src/assets/style/element-plus/input.scss
+++ b/src/assets/style/element-plus/input.scss
@@ -1,4 +1,5 @@
 .el-input {
+  --el-input-text-color: var(--o-color-info2);
   .el-input__wrapper {
     box-shadow: none !important;
     border: 1px solid var(--o-color-control1);
diff --git a/src/assets/style/element-plus/pagination.scss b/src/assets/style/element-plus/pagination.scss
index a8102f1..a7439bf 100644
--- a/src/assets/style/element-plus/pagination.scss
+++ b/src/assets/style/element-plus/pagination.scss
@@ -3,6 +3,9 @@
   --el-pagination-button-bg-color: var(--o-color-fill2);
   --el-disabled-bg-color: var(--o-color-fill2);
   --el-pagination-button-color: var(--o-color-info1);
+  .el-pagination__total {
+    color: var(--o-color-info2);
+  }
   .el-pager {
     li {
       --el-pagination-button-color: var(--o-color-info1);
diff --git a/src/assets/style/theme/select.scss b/src/assets/style/theme/select.scss
index 08e58b5..698f1d0 100644
--- a/src/assets/style/theme/select.scss
+++ b/src/assets/style/theme/select.scss
@@ -1,3 +1,4 @@
-.o-select-medium {
+.o-select {
   --select-icon-size: 20px;
+  --select-radius: 4px;
 }
diff --git a/src/assets/style/theme/table.scss b/src/assets/style/theme/table.scss
index f624db0..6745d74 100644
--- a/src/assets/style/theme/table.scss
+++ b/src/assets/style/theme/table.scss
@@ -1,8 +1,8 @@
+@use '../mixin/font.scss' as *;
 .o-table {
   --table-edge-padding: 32px;
   --table-cell-padding: 16px 20px;
   --table-head-cell-padding: 12px 20px;
-  --table-cell-height: 80px;
   --table-head-bg: var(--o-color-control3-light);
   --table-color: var(--o-color-info1);
   th {
@@ -18,4 +18,14 @@
   td {
     word-break: break-word;
   }
+  &.o-table-small {
+    --table-cell-height: auto;
+    --table-cell-padding: 12px 16px;
+    --table-head-cell-padding: 9px 16px;
+    --table-edge-padding: 16px;
+    td,
+    th {
+      @include tip1;
+    }
+  }
 }
diff --git a/src/assets/svg-icons/icon-outlink.svg b/src/assets/svg-icons/icon-outlink.svg
index 1aca2b4..743500c 100644
--- a/src/assets/svg-icons/icon-outlink.svg
+++ b/src/assets/svg-icons/icon-outlink.svg
@@ -1,3 +1,4 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-<path d="M11.664 3.425c0.387 0 0.7 0.313 0.7 0.7s-0.313 0.7-0.7 0.7h-6.474c-0.331 0-0.6 0.269-0.6 0.6v0 13.374c0 0.331 0.269 0.6 0.6 0.6v0h13.624c0.331 0 0.6-0.269 0.6-0.6v0-6.227c0-0.387 0.313-0.7 0.7-0.7s0.7 0.313 0.7 0.7v0 6.227c0 1.105-0.895 2-2 2v0h-13.624c-1.105 0-2-0.895-2-2v0-13.374c0-1.105 0.895-2 2-2v0h6.474zM18.815 3.422c1.105 0 2 0.895 2 2v0 3.95c0 0.387-0.313 0.7-0.7 0.7s-0.7-0.313-0.7-0.7v-3.515l-4.932 4.887c-0.126 0.125-0.301 0.203-0.493 0.203-0.387 0-0.7-0.313-0.7-0.7 0-0.194 0.079-0.37 0.207-0.497l4.974-4.929-3.606 0.001c-0.387 0-0.7-0.313-0.7-0.7s0.313-0.7 0.7-0.7v0h3.95z"></path>
+<path d="M8.121 2.346c0.331 0 0.6 0.269 0.6 0.6 0 0.298-0.218 0.546-0.503 0.592l-0.097 0.008h-2.334c-1.27 0-2.31 0.987-2.394 2.236l-0.006 0.164v12.107c0 1.27 0.987 2.31 2.236 2.394l0.164 0.006h12.427c1.27 0 2.31-0.987 2.394-2.236l0.006-0.164v-1.642c0-0.331 0.269-0.6 0.6-0.6 0.298 0 0.546 0.218 0.592 0.503l0.008 0.097v1.642c0 1.924-1.509 3.496-3.409 3.595l-0.191 0.005h-12.427c-1.924 0-3.496-1.509-3.595-3.409l-0.005-0.191v-12.107c0-1.924 1.509-3.496 3.409-3.595l0.191-0.005h2.334z"></path>
+<path d="M19.994 5.256l0.006 0.134v6.153c0 0.329-0.267 0.595-0.595 0.595-0.296 0-0.542-0.216-0.588-0.499l-0.008-0.097 0-5.511-8.793 8.794c-0.233 0.233-0.61 0.233-0.842 0-0.209-0.209-0.23-0.536-0.063-0.768l0.063-0.074 8.792-8.793-5.509 0.001c-0.329 0-0.595-0.267-0.595-0.595 0-0.296 0.216-0.542 0.499-0.588l0.097-0.008h6.153c0.722 0 1.316 0.551 1.383 1.256z"></path>
 </svg>
diff --git a/src/components/AppPagination.vue b/src/components/AppPagination.vue
index 1eaa155..7db948b 100644
--- a/src/components/AppPagination.vue
+++ b/src/components/AppPagination.vue
@@ -46,7 +46,7 @@ onMounted(() => {
       :current-page="current"
       :page-size="pagesize"
       background
-      layout="sizes, prev, pager, next, jumper"
+      layout="total ,sizes, prev, pager, next, jumper"
       :total="total"
       :page-sizes="isFieldPage ? COUNT_PAGESIZE_FIELD : COUNT_PAGESIZE"
       @size-change="handleSizeChange"
diff --git a/src/components/ExternalLink.vue b/src/components/ExternalLink.vue
index d0f7cd2..1a66954 100644
--- a/src/components/ExternalLink.vue
+++ b/src/components/ExternalLink.vue
@@ -29,7 +29,7 @@ const onChange = () => {
 </script>
 
 <template>
-  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" size="large" @change="onChange">
+  <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" @change="onChange">
     <template #header>
       <p class="external-title">{{ t('software.external.title') }}</p>
     </template>
diff --git a/src/components/OTableItemNew.vue b/src/components/OTableItemNew.vue
index bb3af05..118efc8 100644
--- a/src/components/OTableItemNew.vue
+++ b/src/components/OTableItemNew.vue
@@ -209,6 +209,7 @@ const collectDownloadData = (pkgId: string, name: string, version: string) => {
 }
 
 :deep(.o-table) {
+  --table-cell-height: 80px;
   .label {
     display: flex;
     align-items: center;
diff --git a/src/components/collaboration/FeedbackHistroy.vue b/src/components/collaboration/FeedbackHistroy.vue
index 098b28e..418a35a 100644
--- a/src/components/collaboration/FeedbackHistroy.vue
+++ b/src/components/collaboration/FeedbackHistroy.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import { ref, onMounted, computed, watch } from 'vue';
 import { ODialog, OTable, OTag } from '@opensig/opendesign';
-
-import { getMaintainerApply } from '@/api/api-collaboration';
+import { useUserInfoStore } from '@/stores/user';
+import { getMaintainerApply, getAdminApply } from '@/api/api-collaboration';
 import { formatDateTime } from '@/utils/common';
-import { applicationTypeConvert, applyStatusConvert } from '@/utils/collaboration';
+import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 
 import { COUNT_PAGESIZE } from '@/data/query';
 
@@ -16,6 +16,9 @@ const props = defineProps({
 });
 
 const showDlg = ref(true);
+const userInfoStore = useUserInfoStore();
+const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
+const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 
 // 分页
 const currentPage = ref(1);
@@ -27,7 +30,7 @@ const columns = [
   { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
   { label: '修改理由', key: 'description', type: 'description' },
   { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
-  { label: '审批人', key: 'adminstrator', type: 'adminstrator' },
+  { label: '审批人', key: 'administrator', type: 'administrator' },
   { label: '审批意见', key: 'comment', type: 'comment' },
   { label: '申请单号', key: 'applyIdString', type: 'applyId' },
   { label: '申请时间', key: 'updateAt', type: 'time' },
@@ -68,6 +71,25 @@ const queryMaintainerApply = () => {
     });
 };
 
+const queryAdminApply = () => {
+  isLoading.value = true;
+  getAdminApply(searchParams.value)
+    .then((res) => {
+      if (res.data.list.length > 0) {
+        reposData.value = res.data.list;
+        total.value = res.data.total;
+      } else {
+        reposData.value = [];
+      }
+
+      isLoading.value = false;
+    })
+    .catch(() => {
+      reposData.value = [];
+      isLoading.value = false;
+    });
+};
+
 /* ---------------分页事件------------------ */
 const handleSizeChange = (val: number) => {
   pageSize.value = val;
@@ -81,14 +103,23 @@ const onChange = () => {
   emits('close');
 };
 
+const pageInit = () => {
+  if (isMainPer.value) {
+    queryMaintainerApply();
+  }
+  if (isAdminPer.value) {
+    queryAdminApply();
+  }
+};
+
 onMounted(() => {
-  queryMaintainerApply();
+  pageInit();
 });
 
 watch(
   () => searchParams.value,
   () => {
-    queryMaintainerApply();
+    pageInit();
   },
   { deep: true }
 );
@@ -100,7 +131,7 @@ watch(
       <p class="title">反馈历史</p>
     </template>
     <div class="feedback-histroy">
-      <OTable :columns="columns" :data="reposData" :loading="isLoading" border="row">
+      <OTable :columns="columns" :data="reposData" :loading="isLoading" border="row" :small="true">
         <template #head="{ columns }">
           <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
         </template>
@@ -110,6 +141,18 @@ watch(
         <template #td_metric="{ row }">
           {{ applicationTypeConvert(row.metric) }}
         </template>
+        <template #td_metricStatus="{ row }">
+          {{ versionLatestStatusConvert(row.metricStatus) }}
+        </template>
+        <template #td_description="{ row }">
+          <div :title="row.description" class="td-nowrap">{{ row.description }}</div>
+        </template>
+        <template #td_applyIdString="{ row }">
+          <div :title="row.applyIdString" class="td-nowrap">{{ row.applyIdString }}</div>
+        </template>
+        <template #td_comment="{ row }">
+          <div :title="row.comment" class="td-nowrap">{{ row.comment }}</div>
+        </template>
         <template #td_applyStatus="{ row }">
           <div class="apply-status">
             <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatusConvert(row.applyStatus) }} </OTag>
@@ -126,6 +169,8 @@ watch(
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
 .feedback-histroy {
+  border: 1px solid var(--o-color-control4);
+  border-radius: 4px;
   :deep(.o-table) {
     .o-table-wrap {
       overflow-x: auto;
@@ -137,16 +182,23 @@ watch(
     }
     th {
       width: 168px;
+      @include tip1;
       &.applyStatus {
         width: 120px;
       }
-      &.adminstrator {
+      &.administrator {
         width: 120px;
       }
       .time {
         width: 145px;
       }
     }
+    .td-nowrap {
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      overflow: hidden;
+    }
   }
 }
 </style>
diff --git a/src/components/collaboration/GiteeAccountDialog.vue b/src/components/collaboration/GiteeAccountDialog.vue
deleted file mode 100644
index 4a71980..0000000
--- a/src/components/collaboration/GiteeAccountDialog.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<script lang="ts" setup>
-import { ref } from 'vue';
-import { ODialog, OButton } from '@opensig/opendesign';
-import { windowOpen } from '@/utils/common';
-
-const showGiteeDlg = ref(true);
-
-const emits = defineEmits<{
-  (e: 'close'): void;
-}>();
-
-// 跳转个人中心绑定账号
-const USER_CENTER = import.meta.env.VITE_LOGIN_URL;
-const jumpAccount = () => {
-  showGiteeDlg.value = false;
-  emits('close');
-  windowOpen(USER_CENTER);
-};
-const onChange = () => {
-  emits('close');
-};
-</script>
-
-<template>
-  <ODialog v-model:visible="showGiteeDlg" class="revoke-dlg" :unmount-on-hide="true" :mask="true" size="small" @change="onChange">
-    <template #header>
-      <p class="title">绑定账号</p>
-    </template>
-    <p class="revoke-text">想要获取相关信息，请先前往个人中心-账号绑定 绑定您的Gitee账号</p>
-    <template #footer>
-      <div class="dlg-action">
-        <OButton variant="solid" size="large" color="primary" class="upload" @click="jumpAccount">前往绑定</OButton>
-        <OButton variant="outline" size="large" color="primary" class="upload" @click="showGiteeDlg = false">取消</OButton>
-      </div>
-    </template>
-  </ODialog>
-</template>
-
-<style lang="scss" scoped>
-.dlg-action {
-  display: flex;
-  justify-content: center;
-  .o-btn + .o-btn {
-    margin-left: 16px;
-  }
-}
-</style>
diff --git a/src/components/collaboration/Indicators.vue b/src/components/collaboration/Indicators.vue
index f54cb66..da766c1 100644
--- a/src/components/collaboration/Indicators.vue
+++ b/src/components/collaboration/Indicators.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { OTable, OTag, ODialog } from '@opensig/opendesign';
 import { repoStatusIndex } from '@/utils/collaboration';
+import { applicationType } from '@/data/todo/';
 
 const columns = [
   { label: 'CVE分类', key: 'cve', type: 'cve' },
@@ -57,7 +58,7 @@ const data = [
     cve: '没有CVE',
     cveType: '没有CVE问题',
     contribution: '没有PR提交',
-    details: '最新版本',
+    details: '版本正常',
     maintenance: '健康',
     description: '没有CVE问题，且也没有PR提交，且软件包是最新版本',
   },
@@ -87,6 +88,23 @@ const data = [
   },
 ];
 
+const applicationTypeDesc: Record<string, string[]> = {
+  cveStatus: [],
+  issueStatus: ['所有Issue都没有被修复', '一部分Issue被修复了，一部分Issue没有修复', '所有Issue都被修复了'],
+  prStatus: ['-', '有PR提交，且都没有被合入代码仓', '有PR提及，且有PR被合入到代码仓'],
+  versionStatus: ['软件包版本与上游版本一致', '软件包版本比上游版本低'],
+  orgStatus: ['参与贡献组织数 > 5人', '参与贡献组织数 <= 5人'],
+  contributorStatus: ['参与贡献人数 > 10人', '参与贡献人数 <= 10人'],
+};
+
+const indicatorsInfo = computed(() => {
+  return applicationType.map((item) => {
+    return { ...item, desc: applicationTypeDesc[item.id] || [] };
+  });
+});
+
+console.log('indicatorsInfo', indicatorsInfo.value);
+
 // 单元格合并
 const cellSpanFn = (rowIdx: number, colIdx: number) => {
   if (rowIdx === 0 && colIdx === 0) {
@@ -143,7 +161,7 @@ const onChange = () => {
     </template>
     <div class="indicators">
       <p class="title">软件包维护状态指标</p>
-      <OTable class="main-table" :columns="columns" :data="data" :cell-span="cellSpanFn" border="all">
+      <OTable class="main-table" :columns="columns" :data="data" :cell-span="cellSpanFn" border="all" :small="true">
         <template #td_maintenance="{ row }">
           <div class="repo-status">
             <OTag :class="`type${repoStatusIndex(row.maintenance)}`" size="small">{{ row.maintenance }} </OTag>
@@ -151,6 +169,14 @@ const onChange = () => {
         </template>
       </OTable>
       <p class="title">详细指标</p>
+      <div v-for="item in indicatorsInfo" :key="item.id" class="indicators-info">
+        <div class="title">{{ item.label }}</div>
+        <div class="box">
+          <div v-for="(child, index) in item.children" :key="child" class="rows">
+            <span class="child"> {{ child }}</span> <span v-if="item.desc[index]" class="desc">{{ item.desc[index] }}</span>
+          </div>
+        </div>
+      </div>
     </div>
   </ODialog>
 </template>
@@ -158,11 +184,65 @@ const onChange = () => {
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
 
-.o-table {
+:deep(.o-table) {
   margin: 16px 0;
+  tbody {
+    tr {
+      &:hover {
+        background: none !important;
+      }
+    }
+  }
+  td[rowspan='4'] {
+    border-bottom: 0 none;
+  }
 }
 .indicators {
   color: var(--o-color-info1);
   @include text1;
 }
+
+.indicators-info {
+  --indicators-border: 1px solid var(--o-color-control4);
+  border: var(--indicators-border);
+  display: flex;
+  margin-top: 16px;
+  border-radius: 4px;
+  @include tip1;
+  .title {
+    background: var(--o-color-control3-light);
+    display: flex;
+    align-items: center;
+    width: 195px;
+    font-weight: 500;
+    justify-content: center;
+  }
+  .box {
+    flex: 1;
+    border-left: var(--indicators-border);
+    .rows {
+      &:not(:last-child) {
+        border-bottom: var(--indicators-border);
+      }
+      color: var(--o-color-info1);
+
+      display: flex;
+      align-items: center;
+      span {
+        padding: 12px 16px;
+        display: block;
+      }
+      .child {
+        padding-left: 78px;
+      }
+      .desc {
+        flex: 1;
+      }
+      .child:has(+ span) {
+        width: 40%;
+        border-right: var(--indicators-border);
+      }
+    }
+  }
+}
 </style>
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index 68a9786..c60eca8 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -3,7 +3,6 @@ import { ref, reactive, computed } from 'vue';
 import { ODialog, OButton, OForm, OTextarea, OFormItem, ORadioGroup, ORadio, OSelect, OOption, type FieldResultT, useMessage } from '@opensig/opendesign';
 
 import { getApplyFeedback } from '@/api/api-collaboration';
-import { applicationType } from '@/data/todo/';
 
 const props = defineProps({
   repo: {
@@ -15,6 +14,19 @@ const props = defineProps({
 const showDlg = ref(true);
 const message = useMessage();
 
+const applicationType = [
+  {
+    id: 'cveStatus',
+    label: 'CVE状态',
+    children: ['有CVE且全部未修复', '有CVE部分修复', '有CVE且全部修复', '没有CVE问题'],
+  },
+  {
+    id: 'versionStatus',
+    label: '软件包版本状态',
+    children: ['版本正常', '落后版本'],
+  },
+];
+
 const formRef = ref<InstanceType<typeof OForm>>();
 const formData = reactive({
   repo: props.repo,
@@ -83,6 +95,9 @@ const onSubmit = (results: FieldResultT[]) => {
   if (results.find((item) => item?.type === 'danger')) {
     return;
   } else {
+    if (formData.metricStatus === '版本正常') {
+      formData.metricStatus = '最新版本';
+    }
     getApplyFeedback(formData)
       .then((res) => {
         if (res.code === 200) {
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index 32c2997..aa8da23 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -49,11 +49,17 @@ const isCollaboration = computed(() => {
 });
 
 const jump = (href: string) => {
-  if (href === 'collaboration') {
-    windowOpen(`/${locale.value}/${href}`, '_blank');
+  if (isAdminPer.value || isMainPer.value) {
+    if (href === 'collaboration') {
+      windowOpen(`/${locale.value}/${href}`, '_blank');
+    } else {
+      router.push({
+        path: `/${locale.value}/${href}`,
+      });
+    }
   } else {
     router.push({
-      path: `/${locale.value}/${href}`,
+      path: `/${locale.value}/collaboration-permission`,
     });
   }
 };
@@ -74,7 +80,7 @@ const jump = (href: string) => {
         <HeaderNav v-if="route.name" :options="isCollaboration ? collaborationNav : navs" />
       </div>
       <div class="header-right">
-        <template v-if="loginStore.isLogined && (isAdminPer || isMainPer)">
+        <template v-if="loginStore.isLogined">
           <OLink v-if="isCollaboration" class="todo" @click="jump(`todo/application`)">待办中心</OLink>
           <OLink v-else class="collaboration" @click="jump(`collaboration`)">协作平台</OLink>
         </template>
diff --git a/src/data/todo/index.ts b/src/data/todo/index.ts
index 56cce93..cf6ffdb 100644
--- a/src/data/todo/index.ts
+++ b/src/data/todo/index.ts
@@ -4,7 +4,7 @@ export const applicationColumns = [
   { label: '修改状态', key: 'metricStatus', type: 'metricStatus' },
   { label: '修改理由', key: 'description', type: 'description' },
   { label: '申请状态', key: 'applyStatus', type: 'applyStatus' },
-  { label: '审批人', key: 'adminstrator', type: 'adminstrator' },
+  { label: '审批人', key: 'administrator', type: 'administrator' },
   { label: '审批意见', key: 'comment', type: 'comment' },
   { label: '申请单号', key: 'applyIdString', type: 'applyId' },
   { label: '申请时间', key: 'updateAt', type: 'updateAt' },
@@ -52,8 +52,8 @@ export const applicationType = [
   },
   {
     id: 'issueStatus',
-    label: 'ISSUE状态',
-    children: ['没有ISSUE修复', '有部分ISSUE修复', '全部ISSUE修复'],
+    label: 'Issue状态',
+    children: ['没有Issue修复', '有部分Issue修复', '全部Issue修复'],
   },
   {
     id: 'prStatus',
@@ -63,7 +63,7 @@ export const applicationType = [
   {
     id: 'versionStatus',
     label: '软件包版本状态',
-    children: ['最新版本', '落后版本'],
+    children: ['版本正常', '落后版本'],
   },
   {
     id: 'orgStatus',
diff --git a/src/router/index.ts b/src/router/index.ts
index e5df8fd..24821bb 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -89,6 +89,11 @@ const routes = [
     name: 'collaboration',
     component: () => import('@/views/collaboration/TheCollaboration.vue'),
   },
+  {
+    path: '/zh/collaboration-permission',
+    name: 'collaboration-permission',
+    component: () => import('@/views/collaboration/CollaborationPermission.vue'),
+  },
   {
     path: '/zh/todo/:type',
     name: 'todo',
@@ -169,18 +174,18 @@ router.beforeEach(async (to) => {
       const { data } = await getCollaborationPermissions();
 
       if (data.permissions.length > 0) {
-        if (data.permissions.includes('adminstrator')) {
+        if (data.permissions.includes('administrator')) {
           userInfoStore.platformAdminPermission = true;
         }
         if (data.permissions.includes('maintainer')) {
           userInfoStore.platformMaintainerPermission = true;
         }
       } else {
-        return isPlatform ? { name: 'notFound' } : true;
+        return isPlatform ? { name: 'collaboration-permission' } : true;
       }
 
     } catch {
-      return isPlatform ? { name: 'notFound' } : true;
+      return isPlatform ? { name: 'collaboration-permission' } : true;
     }
   }
 
diff --git a/src/utils/collaboration.ts b/src/utils/collaboration.ts
index 16631a6..6c84083 100644
--- a/src/utils/collaboration.ts
+++ b/src/utils/collaboration.ts
@@ -25,3 +25,8 @@ export const applyStatusConvert = (v: string) => {
   }
   return applyStatusType[index].label;
 };
+
+// 最新版本修改为版本正常
+export const versionLatestStatusConvert = (v: string) => {
+  return v === '最新版本' ? '版本正常' : v
+}
diff --git a/src/utils/common.ts b/src/utils/common.ts
index f0021cf..d83df16 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -20,16 +20,27 @@ export const xssAllTag = (str: string) => {
 /**
  * 日期转 xxxx/xx/xx 格式时间
  * @param {v}  待转换时间
+ * @param {isTime:boolean} 返回格式 2024/01/01 01:00
  * @returns {string} 返回格式化时间，如 2024/01/01
  */
-export const formatDateTime = (v: string) => {
-  const date = new Date(v);
+export const formatDateTime = (v: string, isTime?: boolean) => {
+  if (v) {
+    const date = new Date(v);
 
-  const year = date.getFullYear();
-  const month = ('0' + (date.getMonth() + 1)).slice(-2);
-  const day = ('0' + date.getDate()).slice(-2);
+    const year = date.getFullYear();
+    const month = ('0' + (date.getMonth() + 1)).slice(-2);
+    const day = ('0' + date.getDate()).slice(-2);
 
-  return `${year}/${month}/${day}`;
+    if (isTime) {
+      const hh = ('0' + date.getHours()).slice(-2);
+      const mm = ('0' + date.getMinutes()).slice(-2);
+
+      return `${year}/${month}/${day} ${hh}:${mm}`;
+    }
+
+    return `${year}/${month}/${day}`;
+  }
+  return ''
 };
 
 /**
diff --git a/src/views/collaboration/CollaborationPermission.vue b/src/views/collaboration/CollaborationPermission.vue
new file mode 100644
index 0000000..7ac9555
--- /dev/null
+++ b/src/views/collaboration/CollaborationPermission.vue
@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { OButton } from '@opensig/opendesign';
+import { windowOpen } from '@/utils/common';
+import { useUserInfoStore } from '@/stores/user';
+
+const userInfoStore = useUserInfoStore();
+
+// 判断是否绑定gitee
+const isGiteeAccount = computed(() => !!userInfoStore.identities.find((id) => id.identity === 'gitee'));
+const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
+const isMaintainerPer = computed(() => userInfoStore.platformMaintainerPermission);
+
+// 跳转个人中心绑定账号
+const USER_CENTER = import.meta.env.VITE_LOGIN_URL;
+const jumpAccount = () => {
+  windowOpen(USER_CENTER);
+};
+</script>
+
+<template>
+  <ContentWrapper verticalPadding="40px">
+    <Result404>
+      <template #description>
+        <template v-if="isGiteeAccount && (!isAdminPer || !isMaintainerPer)">
+          <div class="content">无权限访问协作平台</div>
+        </template>
+        <template v-else>
+          <div class="content">
+            <p>如果您是Maintainer</p>
+            <p>想要获取相关信息，请先前往个人中心-账号绑定 绑定您的Gitee账号</p>
+          </div>
+          <OButton variant="solid" size="large" color="primary" @click="jumpAccount">前往绑定</OButton>
+        </template>
+      </template>
+    </Result404>
+  </ContentWrapper>
+</template>
+
+<style lang="scss" scoped>
+.content {
+  color: var(--o-color-info1);
+  margin-bottom: 24px;
+  @include text1;
+  p {
+    margin-bottom: 8px;
+  }
+}
+</style>
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 2626a65..8112d5c 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -9,18 +9,19 @@ import StatusFeedback from '@/components/collaboration/StatusFeedback.vue';
 import Result404 from '@/components/Result404.vue';
 
 import IconOutlink from '~icons/pkg/icon-outlink.svg';
+import IconState from '~icons/pkg/icon-state.svg';
 import IconFilter from '~icons/app/icon-filter.svg';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
 import { kindTypes, applicationType } from '@/data/todo';
 import { useDebounceFn } from '@vueuse/core';
-import { repoStatusIndex, repoStatusArr } from '@/utils/collaboration';
+import { repoStatusIndex, repoStatusArr, versionLatestStatusConvert } from '@/utils/collaboration';
 
 const columns = [
   { label: '软件仓库', key: 'repo', type: 'repo' },
   { label: '类别', key: 'kind', type: 'kind' },
   { label: 'SIG名称', key: 'sigName', type: 'sig' },
   { label: 'CVE状态', key: 'cveStatus', type: 'cve' },
-  { label: 'ISSUE状态', key: 'issueStatus', type: 'issue' },
+  { label: 'Issue状态', key: 'issueStatus', type: 'issue' },
   { label: '软件包更新状态', key: 'prStatus', type: 'pr' },
   { label: '软件包版本状态', key: 'versionStatus', type: 'version' },
   { label: '贡献组织状态', key: 'orgStatus', type: 'org' },
@@ -29,10 +30,6 @@ const columns = [
   { label: '操作', key: 'operation', type: 'operation' },
 ];
 
-const { identities } = toRefs(useUserInfoStore());
-
-const hasGiteeAccount = computed(() => !!identities.value.find((id) => id.identity === 'gitee'));
-
 const allSigs = ref<string[]>();
 const allRepos = ref<string[]>();
 
@@ -71,6 +68,9 @@ const onFilterChange = useDebounceFn((type: string, index: number, val: { values
     activeFilterValues.value[index] = val.values as string[];
     currentActiveFilterIndices.value.delete(index);
   }
+  if (filterParams.versionStatus === '版本正常') {
+    filterParams.versionStatus = '最新版本';
+  }
 }, 300);
 
 const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
@@ -100,7 +100,6 @@ const filterParams = reactive<Record<string, string>>({
 
 const searchParams = computed(() => {
   return {
-    name: 'fromPage',
     pageNum: currentPage.value,
     pageSize: pageSize.value,
     ...filterParams,
@@ -114,15 +113,11 @@ const isError = ref(false);
 // Maintainer 数据
 const queryMaintainerRepos = () => {
   isLoading.value = true;
+
   getMaintainerRepos(searchParams.value)
     .then((res) => {
-      if (res.data.list.length > 0) {
-        reposData.value = res.data.list;
-        total.value = res.data.total;
-      } else {
-        reposData.value = [];
-        isError.value = true;
-      }
+      reposData.value = res.data.list;
+      total.value = res.data.total;
       isLoading.value = false;
     })
     .catch(() => {
@@ -135,15 +130,11 @@ const queryMaintainerRepos = () => {
 // Admin 数据
 const queryAdminRepos = () => {
   isLoading.value = true;
+
   getAdminRepos(searchParams.value)
     .then((res) => {
-      if (res.data.list.length > 0) {
-        reposData.value = res.data.list;
-        total.value = res.data.total;
-      } else {
-        reposData.value = [];
-        isError.value = true;
-      }
+      reposData.value = res.data.list;
+      total.value = res.data.total;
       isLoading.value = false;
     })
     .catch(() => {
@@ -229,12 +220,15 @@ watch(
   </div>
   <ContentWrapper vertical-padding="24px" class="collaboration-wrap">
     <AppLoading :loading="isLoading" />
+
     <div class="indicators">
-      <span @click="showDlg = true" class="text">状态指标说明</span>
+      <span @click="showDlg = true" class="text"
+        ><OIcon><IconState /></OIcon>状态指标说明</span
+      >
       <Indicators v-if="showDlg" @change="showDlg = false" />
     </div>
-    <div class="platform-main maintainer">
-      <OTable :columns="columns" :data="reposData" :loading="loading" border="row">
+    <div class="platform-main">
+      <OTable :columns="columns" :data="reposData" :loading="loading" border="row" :class="{ admin: isAdminPer }">
         <template #head="{ columns }">
           <OPopup
             trigger="none"
@@ -304,6 +298,10 @@ watch(
             <OTag :class="`type${repoStatusIndex(row.status)}`">{{ row.status }} </OTag>
           </div>
         </template>
+        <template #td_versionStatus="{ row }">
+          {{ versionLatestStatusConvert(row.versionStatus) }}
+        </template>
+
         <template #td_operation="{ row }">
           <div class="operation-box">
             <OLink v-if="isMainPer" color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
@@ -316,9 +314,8 @@ watch(
         <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
-
     <!-- 暂无记录 -->
-    <template v-if="isError || !hasGiteeAccount">
+    <template v-if="isError">
       <Result404>
         <template #description>
           <p class="text404">暂无记录</p>
@@ -367,7 +364,14 @@ watch(
   .text {
     color: var(--o-color-info1);
     cursor: pointer;
+    display: flex;
+    align-items: center;
     @include text1;
+    svg {
+      width: 16px;
+      height: 16px;
+      margin-right: 8px;
+    }
   }
 }
 .operation-box {
@@ -402,89 +406,28 @@ watch(
     width: 8px;
   }
   :deep(.o-table) {
-    thead {
-      .repo {
-        width: 200px;
-      }
-      .cve,
-      .sig,
-      .issue,
-      .pr,
-      .version {
-        width: 188px;
-      }
-      .org,
-      .personnel {
-        width: 160px;
-      }
-      .kind {
-        width: 180px;
-      }
-      .status {
-        width: 125px;
-      }
-      .operation {
-        width: var(--oper-width);
-      }
+    --oper-width: 215px;
+    &.admin {
+      --oper-width: 125px;
     }
-  }
-  &.maintainer {
-    :deep(.o-table) {
-      --oper-width: 215px;
-
-      .o-table-wrap {
-        overflow-x: auto;
-        overflow-y: hidden;
-        @include scrollbar;
-      }
-      table {
-        table-layout: fixed;
-      }
 
-      tr {
-        td {
-          &:first-child,
-          &:nth-of-type(10),
-          &:nth-of-type(11) {
-            position: sticky;
-            z-index: 2;
-            background: var(--table-bg-color);
-          }
-          &:first-child {
-            left: 0;
-            &::before {
-              right: 0;
-              transform: scaleX(-1);
-              @include liner;
-            }
-          }
-          &:nth-of-type(11) {
-            right: 0px;
-          }
-          &:nth-of-type(10) {
-            right: var(--oper-width);
-            &::before {
-              left: 0;
-              @include liner;
-            }
-          }
-        }
-        &.last {
-          td {
-            border-bottom: 0 none;
-          }
-        }
-        &:hover td {
-          background: var(--table-row-hover);
-        }
-      }
-      th {
+    .o-table-wrap {
+      overflow-x: auto;
+      overflow-y: hidden;
+      @include scrollbar;
+    }
+    table {
+      table-layout: fixed;
+    }
+
+    tr {
+      td {
         &:first-child,
         &:nth-of-type(10),
         &:nth-of-type(11) {
           position: sticky;
           z-index: 2;
-          background: var(--table-head-bg);
+          background: var(--table-bg-color);
         }
         &:first-child {
           left: 0;
@@ -494,17 +437,78 @@ watch(
             @include liner;
           }
         }
+        &:nth-of-type(11) {
+          right: 0;
+        }
         &:nth-of-type(10) {
           right: var(--oper-width);
           &::before {
-            left: 0;
+            left: -9px;
             @include liner;
           }
         }
-        &:nth-of-type(11) {
+      }
+      &.last {
+        td {
+          border-bottom: 0 none;
+        }
+      }
+      &:hover td {
+        background: var(--table-row-hover);
+      }
+    }
+    th {
+      &:first-child,
+      &:nth-of-type(10),
+      &:nth-of-type(11) {
+        position: sticky;
+        z-index: 2;
+        background: var(--table-head-bg);
+      }
+      &:first-child {
+        left: 0;
+        &::before {
           right: 0;
+          transform: scaleX(-1);
+          @include liner;
         }
       }
+      &:nth-of-type(10) {
+        right: var(--oper-width);
+        &::before {
+          left: -9px;
+          @include liner;
+        }
+      }
+      &:nth-of-type(11) {
+        right: 0;
+      }
+    }
+
+    thead {
+      .repo {
+        width: 200px;
+      }
+      .cve,
+      .sig,
+      .issue,
+      .pr,
+      .version {
+        width: 188px;
+      }
+      .org,
+      .personnel {
+        width: 160px;
+      }
+      .kind {
+        width: 180px;
+      }
+      .status {
+        width: 125px;
+      }
+      .operation {
+        width: var(--oper-width);
+      }
     }
   }
 }
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 3f77480..eeabb16 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -5,7 +5,7 @@ import { useLocale } from '@/composables/useLocale';
 import { formatDateTime } from '@/utils/common';
 import { useRouter, useRoute } from 'vue-router';
 import { applicationType, applyStatusType } from '@/data/todo';
-import { applicationTypeConvert, applyStatusConvert } from '@/utils/collaboration';
+import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 import { useUserInfoStore } from '@/stores/user';
 
 import IconFilter from '~icons/app/icon-filter.svg';
@@ -78,8 +78,6 @@ const applyTypes = applicationType.map((item) => ({ label: item.label, value: it
 
 const filterIconRefs = ref(new Array<ComponentPublicInstance>(props.columns.length));
 
-const applyStatusList = computed(() => {});
-
 /** 筛选组件是否显示的开关 */
 const filterSwitches = ref(props.columns.map(() => false));
 
@@ -108,7 +106,7 @@ const onFilterChange = useDebounceFn((type: string, index: number, val: { values
   } else {
     filterParams[type] = val.values.join();
     if (type === 'metric') {
-      activeFilterValues.value[index] = val.values.map(item => applyStatusConvert(item as string));
+      activeFilterValues.value[index] = val.values.map((item) => applyStatusConvert(item as string));
     } else {
       activeFilterValues.value[index] = val.values as string[];
     }
@@ -187,6 +185,9 @@ const revoke = () => {
       <template #td_metric="{ row }">
         {{ applicationTypeConvert(row.metric) }}
       </template>
+      <template #td_metricStatus="{ row }">
+        {{ versionLatestStatusConvert(row.metricStatus) }}
+      </template>
       <template #td_comment="{ row }">
         <div class="line-clamp">{{ row.comment }}</div>
       </template>
@@ -288,7 +289,7 @@ thead {
   .applyStatus {
     width: 135px;
   }
-  .adminstrator,
+  .administrator,
   .maintainer {
     width: 120px;
   }
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 265f3a1..29fcdf5 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -51,6 +51,7 @@ const todoParams = computed(() => {
     pageNum: currentPage.value,
     pageSize: pageSize.value,
     applyStatus: applyStatus.value,
+    timeOrder: 'desc',
   };
 });
 
@@ -65,6 +66,7 @@ const isLoading = ref(false);
 const activeName = ref();
 const onChange = (type: string) => {
   currentPage.value = 1;
+  pageSize.value = 10;
   pageInit();
   // 切换url参数
   router.push({
@@ -87,19 +89,12 @@ const handleCurrentChange = (val: number) => {
 const queryMyApplication = (params = {}) => {
   isLoading.value = true;
   if (isMaintainerPermission.value) {
-    if (Object.keys(params).length) {
-      currentPage.value = 1;
-    }
     const newData = getParamsRules(todoParams.value);
     getMaintainerApply({ ...newData, ...params })
       .then((res) => {
-        if (res.data.list.length > 0) {
-          applicationData.value = res.data.list;
-          total.value = res.data.total;
-        } else {
-          isError.value = true;
-          applicationData.value = [];
-        }
+        applicationData.value = res.data.list;
+        total.value = res.data.total;
+
         isLoading.value = false;
       })
       .catch(() => {
@@ -114,8 +109,12 @@ const queryMyApplication = (params = {}) => {
 };
 
 // 撤销申请
-const revokeApplication = (applyId: number) => {
-  getMaintainerRevoke(applyId)
+const revokeApplication = (id: string) => {
+  const params = {
+    applyIdString: id,
+    applyStatus: 'OPEN',
+  };
+  getMaintainerRevoke(params)
     .then((res) => {
       if (res.code === 200) {
         message.success({
@@ -135,19 +134,12 @@ const revokeApplication = (applyId: number) => {
 const queryApprovalApply = (params = {}) => {
   isLoading.value = true;
   if (isAdminPermission.value) {
-    if (Object.keys(params).length) {
-      currentPage.value = 1;
-    }
     const newData = getParamsRules(todoParams.value);
     getAdminApply({ ...newData, ...params })
       .then((res) => {
-        if (res.data.list.length > 0) {
-          approvalData.value = res.data.list;
-          total.value = res.data.total;
-        } else {
-          isError.value = true;
-          approvalData.value = [];
-        }
+        approvalData.value = res.data.list;
+        total.value = res.data.total;
+
         isLoading.value = false;
       })
       .catch(() => {
@@ -165,19 +157,11 @@ const queryApprovalApply = (params = {}) => {
 const queryApprovedApply = (params = {}) => {
   isLoading.value = true;
   if (isAdminPermission.value) {
-    if (Object.keys(params).length) {
-      currentPage.value = 1;
-    }
     const newData = getParamsRules(todoParams.value);
     getAdminApply({ ...newData, ...params })
       .then((res) => {
-        if (res.data.list.length > 0) {
-          approvedData.value = res.data.list;
-          total.value = res.data.total;
-        } else {
-          isError.value = true;
-          approvedData.value = [];
-        }
+        approvedData.value = res.data.list;
+        total.value = res.data.total;
         isLoading.value = false;
       })
       .catch(() => {
@@ -213,14 +197,6 @@ onMounted(() => {
   activeName.value = (route.params?.type as string) || 'application';
   pageInit();
 });
-
-// watch(
-//   () => todoParams.value,
-//   () => {
-//     pageInit();
-//   },
-//   { deep: true }
-// );
 </script>
 
 <template>
@@ -235,7 +211,7 @@ onMounted(() => {
   <div class="todo-content">
     <AppLoading :loading="isLoading" />
     <!-- 我的申请 -->
-    <div v-if="activeName === 'application' && applicationData.length > 0" class="application">
+    <div v-if="activeName === 'application' && !isError" class="application">
       <ApprovalTable
         :columns="applicationColumns"
         @queryData="queryMyApplication"
@@ -251,7 +227,7 @@ onMounted(() => {
     </div>
     <!-- 判断admin权限 -->
     <template v-if="isAdminPermission">
-      <div v-if="activeName === 'approval' && approvalData.length > 0" class="approval">
+      <div v-if="activeName === 'approval' && !isError" class="approval">
         <ApprovalTable
           :columns="approvalColumns"
           @queryData="queryApprovalApply"
@@ -264,7 +240,7 @@ onMounted(() => {
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </div>
-      <div v-if="activeName === 'approved' && approvedData.length > 0" class="approved">
+      <div v-if="activeName === 'approved' && !isError" class="approved">
         <ApprovalTable
           :columns="approvalHistoryColumns"
           @queryData="queryApprovedApply"
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
index c6618a8..3bcc67f 100644
--- a/src/views/todo/TheTodoDetail.vue
+++ b/src/views/todo/TheTodoDetail.vue
@@ -3,7 +3,7 @@ import { ref, onMounted, computed, reactive } from 'vue';
 import { OButton, OTag, OForm, OTextarea, OFormItem, useMessage, type FieldResultT } from '@opensig/opendesign';
 import { useRoute } from 'vue-router';
 import { getAdminApply, getMaintainerApply, getAdminProcess } from '@/api/api-collaboration';
-import { applicationTypeConvert, applyStatusConvert } from '@/utils/collaboration';
+import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 import { formatDateTime } from '@/utils/common';
 import { useUserInfoStore } from '@/stores/user';
 
@@ -11,6 +11,7 @@ const route = useRoute();
 const message = useMessage();
 const userInfoStore = useUserInfoStore();
 const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
+const isMaintainerPer = computed(() => userInfoStore.platformMaintainerPermission);
 const isLoading = ref(true);
 const isError = ref(false);
 
@@ -28,9 +29,7 @@ const formData = reactive({
 const queryApplicationApply = () => {
   getMaintainerApply({ name: 'formContent', applyIdString: applyId.value })
     .then((res) => {
-      if (res.data.list.length > 0) {
-        todoData.value = res.data.list[0];
-      }
+      todoData.value = res.data.list[0];
       isLoading.value = false;
     })
     .catch(() => {
@@ -43,9 +42,8 @@ const queryApplicationApply = () => {
 const queryApprovalApply = () => {
   getAdminApply({ name: 'formContent', applyIdString: applyId.value })
     .then((res) => {
-      if (res.data.list.length > 0) {
-        todoData.value = res.data.list[0];
-      }
+      todoData.value = res.data.list[0];
+
       isLoading.value = false;
     })
     .catch(() => {
@@ -144,20 +142,21 @@ onMounted(() => {
         <OFormItem label="申请类型：">
           {{ applicationTypeConvert(todoData.metric) }}
         </OFormItem>
-        <OFormItem label="修改状态："> {{ todoData.metricStatus }} </OFormItem>
+        <OFormItem label="修改状态："> {{ versionLatestStatusConvert(todoData.metricStatus) }} </OFormItem>
         <OFormItem label="修改理由：">{{ todoData.description }} </OFormItem>
-        <OFormItem label="申请时间："> {{ formatDateTime(todoData.updateAt) }} </OFormItem>
+        <OFormItem label="申请时间："> {{ formatDateTime(todoData.createdAt, true) }} </OFormItem>
       </OForm>
-      <template v-if="todoData.applyStatus === 'REJECTED' || todoData.applyStatus === 'APPROVED'">
+
+      <template v-if="isMaintainerPer || todoData.applyStatus === 'REJECTED' || todoData.applyStatus === 'APPROVED'">
         <h3 class="caption">审批信息</h3>
         <OForm label-width="92px" label-align="top">
-          <OFormItem v-if="todoData.adminstrator" label="审批人：">
-            {{ todoData.adminstrator }}
+          <OFormItem label="审批人：">
+            {{ todoData.administrator ?? ' -' }}
           </OFormItem>
           <OFormItem label="审批意见：">
-            {{ todoData.comment }}
+            {{ todoData.comment ?? ' -' }}
           </OFormItem>
-          <OFormItem label="审批时间："> {{ formatDateTime(todoData.approvalTime) }} </OFormItem>
+          <OFormItem label="审批时间："> {{ formatDateTime(todoData.approvalTime, true) ?? ' -' }} </OFormItem>
         </OForm>
       </template>
       <template v-if="isAdminPer && todoData.applyStatus === 'OPEN'">
-- 
Gitee


From 8c6975a7fb2ee999abae9e263acf1678c9649207 Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Mon, 26 Aug 2024 17:09:30 +0800
Subject: [PATCH 10/17] =?UTF-8?q?fix:=20=E6=A3=80=E8=A7=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: pr评论问题整改
---
 src/components/FilterableCheckboxes.vue      | 21 ++++++
 src/views/collaboration/TheCollaboration.vue | 68 +++++++++++++++-----
 src/views/todo/ApprovalTable.vue             | 45 ++++++++-----
 3 files changed, 104 insertions(+), 30 deletions(-)

diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
index 61ad553..0e16e29 100644
--- a/src/components/FilterableCheckboxes.vue
+++ b/src/components/FilterableCheckboxes.vue
@@ -5,6 +5,7 @@ import { OCheckbox, OCheckboxGroup, OIcon, OInput, OScroller } from '@opensig/op
 
 import IconSearch from '~icons/app/icon-search.svg';
 import { useCheckbox } from '@/composables/useCheckbox';
+import IconLoading from '~icons/app/icon-loading.svg';
 
 type ValueT = string | { label: string; value: string };
 
@@ -14,6 +15,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
   /** 多选值 */
   values: {
     type: Array as PropType<ValueT[]>,
@@ -97,6 +102,9 @@ watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.
       </template>
     </OInput>
     <OScroller class="content" showType="always">
+      <div class="loading-mask" v-show="loading">
+        <OIcon><IconLoading class="o-rotating" /></OIcon>
+      </div>
       <div class="check-all-wrap">
         <OCheckbox v-model="parentCheckbox" :indeterminate="indeterminate" :value="1">全选</OCheckbox>
       </div>
@@ -108,6 +116,19 @@ watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.
 </template>
 
 <style lang="scss" scoped>
+.loading-mask {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background-color: var(--o-color-fill2);
+  z-index: 2;
+  left: 0;
+  top: 0;
+}
+
 .search-icon {
   color: var(--o-color-info1);
 }
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 8112d5c..0ff096e 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, computed, onMounted, type ComponentPublicInstance, reactive, toRefs } from 'vue';
+import { ref, watch, computed, type ComponentPublicInstance, reactive, toRefs } from 'vue';
 import { OTable, OTag, OLink, OIcon, OPopup, OPopover } from '@opensig/opendesign';
 import { getMaintainerRepos, getAdminRepos, getSigList, getRepoList } from '@/api/api-collaboration';
 import { useUserInfoStore } from '@/stores/user';
@@ -13,7 +13,7 @@ import IconState from '~icons/pkg/icon-state.svg';
 import IconFilter from '~icons/app/icon-filter.svg';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
 import { kindTypes, applicationType } from '@/data/todo';
-import { useDebounceFn } from '@vueuse/core';
+import { onClickOutside, useDebounceFn } from '@vueuse/core';
 import { repoStatusIndex, repoStatusArr, versionLatestStatusConvert } from '@/utils/collaboration';
 
 const columns = [
@@ -39,6 +39,15 @@ const filterIconRefs = ref(new Array<ComponentPublicInstance>(columns.length));
 /** 筛选组件是否显示的开关 */
 const filterSwitches = ref(columns.map(() => false));
 
+const setPopupClickoutSideFn = (el: any, index: number) => {
+  onClickOutside(el, () => {
+    filterSwitches.value[index] = false;
+  });
+};
+
+const repoFilterLoading = ref(false);
+const sigFilterLoading = ref(false);
+
 /** 切换某个筛选组件显示开关 */
 const switchFilterVisible = (index: number) => {
   filterSwitches.value = columns.map((_, idx) => {
@@ -47,6 +56,20 @@ const switchFilterVisible = (index: number) => {
     }
     return false;
   });
+  if (index === 0) {
+    // 筛选仓库
+    repoFilterLoading.value = true;
+    getRepoList()
+      .then((list) => (allRepos.value = list))
+      .finally(() => (repoFilterLoading.value = false));
+  }
+  if (index === 2) {
+    // 筛选sig
+    sigFilterLoading.value = true;
+    getSigList()
+      .then((list) => (allSigs.value = list))
+      .finally(() => (sigFilterLoading.value = false));
+  }
 };
 
 /** 各表格列对应的已选中的筛选项 */
@@ -59,14 +82,18 @@ const onFilterChange = useDebounceFn((type: string, index: number, val: { values
   // 关掉筛选组件
   filterSwitches.value = columns.map(() => false);
   currentPage.value = 1;
+  if (val.values.length > 0) {
+    currentActiveFilterIndices.value.add(index);
+  } else {
+    currentActiveFilterIndices.value.delete(index);
+  }
   if (val.isCheckAll) {
     filterParams[type] = '';
-    currentActiveFilterIndices.value.add(index);
     activeFilterValues.value[index] = [];
+    currentActiveFilterIndices.value.delete(index);
   } else {
     filterParams[type] = val.values.join();
     activeFilterValues.value[index] = val.values as string[];
-    currentActiveFilterIndices.value.delete(index);
   }
   if (filterParams.versionStatus === '版本正常') {
     filterParams.versionStatus = '最新版本';
@@ -144,11 +171,6 @@ const queryAdminRepos = () => {
     });
 };
 
-onMounted(() => {
-  getSigList().then((list) => (allSigs.value = list));
-  getRepoList().then((list) => (allRepos.value = list));
-});
-
 const pageInit = () => {
   if (isAdminPer.value) {
     queryAdminRepos();
@@ -234,9 +256,11 @@ watch(
             trigger="none"
             style="--popup-radius: 4px"
             v-for="(item, index) in columns"
+            :ref="(el) => setPopupClickoutSideFn(el, index)"
             :key="item.type"
             :visible="filterSwitches[index]"
             :unmount-on-hide="false"
+            :offset="-8"
             position="bl"
           >
             <template #target>
@@ -251,7 +275,11 @@ watch(
                       @click="switchFilterVisible(index)"
                       ><IconFilter
                     /></OIcon>
-                    <OPopover :target="filterIconRefs[index]" trigger="hover">
+                    <OPopover
+                      v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index].length > 0"
+                      :target="filterIconRefs[index]"
+                      trigger="hover"
+                    >
                       <p class="bubble-content">
                         <span class="title">{{ item.label }}:</span>
                         {{ activeFilterValues[index]?.join('、') }}
@@ -261,11 +289,21 @@ watch(
                 </div>
               </th>
             </template>
-            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-if="item.key === 'repo'" :values="allRepos" />
-            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'sigName'" :values="allSigs" />
-            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'kind'" :values="kindTypes" />
-            <FilterableCheckboxes @change="onFilterChange(item.key, index, $event)" v-else-if="item.key === 'status'" :values="repoStatusArr" />
-            <FilterableCheckboxes :filterable="false" @change="onFilterChange(item.key, index, $event)" v-else :values="metricTypes(item.key)" />
+            <FilterableCheckboxes
+              v-if="item.key === 'repo'"
+              :loading="repoFilterLoading"
+              @change="onFilterChange(item.key, index, $event)"
+              :values="allRepos"
+            />
+            <FilterableCheckboxes
+              v-else-if="item.key === 'sigName'"
+              :loading="sigFilterLoading"
+              @change="onFilterChange(item.key, index, $event)"
+              :values="allSigs"
+            />
+            <FilterableCheckboxes v-else-if="item.key === 'kind'" @change="onFilterChange(item.key, index, $event)" :filterable="false" :values="kindTypes" />
+            <FilterableCheckboxes v-else-if="item.key === 'status'" @change="onFilterChange(item.key, index, $event)" :values="repoStatusArr" />
+            <FilterableCheckboxes v-else :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="metricTypes(item.key)" />
           </OPopup>
         </template>
         <template #td_repo="{ row }">
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index eeabb16..173ffcb 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -10,7 +10,7 @@ import { useUserInfoStore } from '@/stores/user';
 
 import IconFilter from '~icons/app/icon-filter.svg';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
-import { useDebounceFn } from '@vueuse/core';
+import { onClickOutside, useDebounceFn } from '@vueuse/core';
 import { getAdminApplyRepos, getMaintainerApplyRepos } from '@/api/api-collaboration';
 
 interface ColumnsT {
@@ -49,17 +49,16 @@ const { locale } = useLocale();
 
 const repoList = ref<string[]>([]);
 
-onMounted(() => {
+const getRepoList = () => {
   if (props.type === 'approval' || props.type === 'approved') {
-    getAdminApplyRepos().then((data) => {
-      repoList.value = data.list;
-    });
+    getAdminApplyRepos()
+      .then((data) => repoList.value = data.list)
+      .finally(() => repoFilterLoading.value = false);
   } else {
-    getMaintainerApplyRepos().then((data) => {
-      repoList.value = data.list;
-    });
+      getMaintainerApplyRepos().then((data) => repoList.value = data.list)
+      .finally(() => repoFilterLoading.value = false);
   }
-});
+};
 
 const filterParams = reactive(
   props.filterableColumns.reduce(
@@ -81,9 +80,17 @@ const filterIconRefs = ref(new Array<ComponentPublicInstance>(props.columns.leng
 /** 筛选组件是否显示的开关 */
 const filterSwitches = ref(props.columns.map(() => false));
 
+const setPopupClickoutSideFn = (el: any, index: number) => {
+  onClickOutside(el, () => {
+    filterSwitches.value[index] = false;
+  });
+};
+
 /** 当前有选中筛选项的表格列的数组下标 */
 const currentActiveFilterIndices = ref(new Set<number>());
 
+const repoFilterLoading = ref(false);
+
 /** 切换某个筛选组件显示开关 */
 const switchFilterVisible = (index: number) => {
   filterSwitches.value = props.columns.map((_, idx) => {
@@ -92,6 +99,10 @@ const switchFilterVisible = (index: number) => {
     }
     return false;
   });
+  if (index === 0) {
+    repoFilterLoading.value = true;
+    getRepoList();
+  }
 };
 
 /** 各表格列对应的已选中的筛选项 */
@@ -99,10 +110,15 @@ const activeFilterValues = ref(new Array<string[]>(props.columns.length));
 
 const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[]; isCheckAll: boolean }) => {
   filterSwitches.value = props.columns.map(() => false);
+  if (val.values.length > 0) {
+    currentActiveFilterIndices.value.add(index);
+  } else {
+    currentActiveFilterIndices.value.delete(index);
+  }
   if (val.isCheckAll) {
     filterParams[type] = '';
-    currentActiveFilterIndices.value.add(index);
     activeFilterValues.value[index] = [];
+    currentActiveFilterIndices.value.delete(index);
   } else {
     filterParams[type] = val.values.join();
     if (type === 'metric') {
@@ -110,7 +126,6 @@ const onFilterChange = useDebounceFn((type: string, index: number, val: { values
     } else {
       activeFilterValues.value[index] = val.values as string[];
     }
-    currentActiveFilterIndices.value.delete(index);
   }
 }, 300);
 
@@ -150,7 +165,7 @@ const revoke = () => {
           <th v-if="!filterableColSet.size || !filterableColSet.has(item.key)" :class="item.type">
             {{ item.label }}
           </th>
-          <OPopup v-else trigger="none" style="--popup-radius: 4px" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
+          <OPopup :ref="(el) => setPopupClickoutSideFn(el, index)" v-else trigger="none" style="--popup-radius: 4px" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
             <template #target>
               <th :class="item.type">
                 <div class="header-cell">
@@ -173,9 +188,9 @@ const revoke = () => {
                 </div>
               </th>
             </template>
-            <FilterableCheckboxes v-if="item.key === 'metric'" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
-            <FilterableCheckboxes v-else-if="item.key === 'repo'" @change="onFilterChange(item.key, index, $event)" :values="repoList" />
-            <FilterableCheckboxes v-else-if="item.key === 'applyStatus'" @change="onFilterChange(item.key, index, $event)" :values="applyStatusType" />
+            <FilterableCheckboxes v-if="item.key === 'metric'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
+            <FilterableCheckboxes v-else-if="item.key === 'repo'" :loading="repoFilterLoading" @change="onFilterChange(item.key, index, $event)" :values="repoList" />
+            <FilterableCheckboxes v-else-if="item.key === 'applyStatus'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyStatusType" />
           </OPopup>
         </template>
       </template>
-- 
Gitee


From ba824e7897c9f1d442c9e289d747285f1a33cce0 Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Tue, 27 Aug 2024 14:41:21 +0800
Subject: [PATCH 11/17] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5dev=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81,=E6=A3=80?=
 =?UTF-8?q?=E8=A7=86=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api-collaboration.ts                  |   2 +-
 src/assets/default-logo-cover_dark.png        | Bin 3901 -> 53519 bytes
 src/assets/icon/icon-app-type.svg             |   2 +-
 src/assets/icon/icon-status.svg               |   5 +-
 src/assets/solution/openhpc/img1-dark.png     | Bin 65293 -> 71727 bytes
 src/assets/style/category/detail/index.scss   |   4 +-
 src/assets/style/global.scss                  |  35 ++++++++-
 src/assets/style/markdown.scss                |   6 +-
 src/assets/style/theme/popup.scss             |   4 +-
 src/assets/style/theme/rate.scss              |   2 +-
 src/components/OCardItem.vue                  |  30 +------
 src/components/OCodeCopy.vue                  |   4 +-
 src/components/collaboration/Indicators.vue   |   2 +-
 .../collaboration/StatusFeedback.vue          |   6 +-
 src/components/detail/DetailAside.vue         |  11 +--
 src/components/header/AppHeader.vue           |   4 +-
 src/composables/useTheme.ts                   |  17 ++--
 src/router/index.ts                           |   8 +-
 src/shared/axios/index.ts                     |  10 +--
 src/utils/common.ts                           |   2 +-
 src/utils/cookie.ts                           |  30 +++++++
 src/views/home/HomeHeader.vue                 |   2 +
 src/views/home/HomeNews.vue                   |  26 +-----
 src/views/solution/TheOpenStack.vue           |  10 ++-
 src/views/todo/ApprovalTable.vue              |  74 ++++++++++++++----
 src/views/todo/TheTodoDetail.vue              |   6 +-
 26 files changed, 186 insertions(+), 116 deletions(-)
 create mode 100644 src/utils/cookie.ts

diff --git a/src/api/api-collaboration.ts b/src/api/api-collaboration.ts
index d17b4e0..6439f63 100644
--- a/src/api/api-collaboration.ts
+++ b/src/api/api-collaboration.ts
@@ -56,7 +56,7 @@ interface RevokeT {
 }
 export function getMaintainerRevoke(params: RevokeT) {
   const url = `/server/collaboration/maintainer/revoke`;
-  return request.post(url, { params }).then((res: AxiosResponse) => res?.data);
+  return request.post(url, { ...params }).then((res: AxiosResponse) => res?.data);
 }
 
 /** 待办中心获取我的申请所有仓库 */
diff --git a/src/assets/default-logo-cover_dark.png b/src/assets/default-logo-cover_dark.png
index 9bee7eb9174e5ffbb508b1edafc32f2fbcd9a33c..0d482aa1b4be713cf76933ea7dc9f4884fa498bc 100644
GIT binary patch
literal 53519
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

literal 3901
zcmeAS@N?(olHy`uVBq!ia0y~yVCrCCV2t5l0*V~Tx#0<<7>k44ofy`glX(f`xTHpS
zruq6ZXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWD?sbc{%jLjGWQm7-GIGurk
zZ@H(7V@L(#+pCVe3<f;R8*~2%ipH9XeJ>Dn@mqRlrez-kBNGdUKnBMiHy%w60R@K!
zhDQB_8GjkU!W^6u&jKVDfrS|lzhMU}aPT-_(0)pw6|7St%^s))sMv|A%`&7-18A0l
z!vTZeVC@P5LI!6R8o4Nfm9*XDhnPR1A(3yYA{SVR!I?U+c8(Snp5hfefnXaN62CEn
z4N_1^nBkn-;RIH~vsoVGJVqu(#=|mN&LSXpD*&Ae@xiE5M?-Zqt&V1^(ZXu9Tm{t<
zqqWs&#X8zt0hI-#EvwP?>S)t?w8Ju(`&JR_@>!nAZu+GN>biQm`njxgN@xNAI%S7a

diff --git a/src/assets/icon/icon-app-type.svg b/src/assets/icon/icon-app-type.svg
index 63eeb0c..7e285fd 100644
--- a/src/assets/icon/icon-app-type.svg
+++ b/src/assets/icon/icon-app-type.svg
@@ -1 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M0 0h24v24H0z"/><path d="M10.027 2.55H3.973c-.786 0-1.423.637-1.423 1.423v6.054c0 .786.637 1.423 1.423 1.423h6.054c.786 0 1.423-.637 1.423-1.423V3.973c0-.786-.637-1.423-1.423-1.423zm0 .9c.289 0 .523.234.523.523v6.054a.523.523 0 0 1-.523.523H3.973a.523.523 0 0 1-.523-.523V3.973c0-.289.234-.523.523-.523h6.054zm10 9.1h-6.054c-.786 0-1.423.637-1.423 1.423v6.054c0 .786.637 1.423 1.423 1.423h6.054c.786 0 1.423-.637 1.423-1.423v-6.054c0-.786-.637-1.423-1.423-1.423zm0 .9c.289 0 .523.234.523.523v6.054a.523.523 0 0 1-.523.523h-6.054a.523.523 0 0 1-.523-.523v-6.054c0-.289.234-.523.523-.523h6.054zm-10-.9H3.973c-.786 0-1.423.637-1.423 1.423v6.054c0 .786.637 1.423 1.423 1.423h6.054c.786 0 1.423-.637 1.423-1.423v-6.054c0-.786-.637-1.423-1.423-1.423zm0 .9c.289 0 .523.234.523.523v6.054a.523.523 0 0 1-.523.523H3.973a.523.523 0 0 1-.523-.523v-6.054c0-.289.234-.523.523-.523h6.054zm6.301-10.415l-3.293 3.293a.95.95 0 0 0 0 1.344l3.293 3.293a.95.95 0 0 0 1.344 0l3.293-3.293a.95.95 0 0 0 0-1.344l-3.293-3.293a.95.95 0 0 0-1.344 0zm.707.637l3.293 3.293a.05.05 0 0 1 0 .07l-3.293 3.293a.05.05 0 0 1-.07 0l-3.293-3.293a.05.05 0 0 1 0-.07l3.293-3.293a.05.05 0 0 1 .07 0z" fill-opacity=".8" fill="#000" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10.027 2.55h-6.054c-0.786 0-1.423 0.637-1.423 1.423v6.054c0 0.786 0.637 1.423 1.423 1.423h6.054c0.786 0 1.423-0.637 1.423-1.423v-6.054c0-0.786-0.637-1.423-1.423-1.423zM10.027 3.45c0.289 0 0.523 0.234 0.523 0.523v6.054c0 0.289-0.234 0.523-0.523 0.523v0h-6.054c-0.289 0-0.523-0.234-0.523-0.523v0-6.054c0-0.289 0.234-0.523 0.523-0.523h6.054zM20.027 12.55h-6.054c-0.786 0-1.423 0.637-1.423 1.423v6.054c0 0.786 0.637 1.423 1.423 1.423h6.054c0.786 0 1.423-0.637 1.423-1.423v-6.054c0-0.786-0.637-1.423-1.423-1.423zM20.027 13.45c0.289 0 0.523 0.234 0.523 0.523v6.054c0 0.289-0.234 0.523-0.523 0.523v0h-6.054c-0.289 0-0.523-0.234-0.523-0.523v0-6.054c0-0.289 0.234-0.523 0.523-0.523h6.054zM10.027 12.55h-6.054c-0.786 0-1.423 0.637-1.423 1.423v6.054c0 0.786 0.637 1.423 1.423 1.423h6.054c0.786 0 1.423-0.637 1.423-1.423v-6.054c0-0.786-0.637-1.423-1.423-1.423zM10.027 13.45c0.289 0 0.523 0.234 0.523 0.523v6.054c0 0.289-0.234 0.523-0.523 0.523v0h-6.054c-0.289 0-0.523-0.234-0.523-0.523v0-6.054c0-0.289 0.234-0.523 0.523-0.523h6.054zM16.328 3.035l-3.293 3.293c-0.172 0.172-0.279 0.41-0.279 0.672s0.106 0.5 0.278 0.672l3.293 3.293c0.172 0.172 0.41 0.279 0.672 0.279s0.5-0.106 0.672-0.278l3.293-3.293c0.172-0.172 0.279-0.41 0.279-0.672s-0.106-0.5-0.278-0.672l-3.293-3.293c-0.172-0.172-0.41-0.279-0.672-0.279s-0.5 0.106-0.672 0.278v0zM17.035 3.672l3.293 3.293c0.009 0.009 0.014 0.021 0.014 0.035s-0.005 0.026-0.014 0.035v0l-3.293 3.293c-0.009 0.009-0.021 0.014-0.035 0.014s-0.026-0.005-0.035-0.014v0l-3.293-3.293c-0.009-0.009-0.014-0.021-0.014-0.035s0.005-0.026 0.014-0.035v0l3.293-3.293c0.009-0.009 0.021-0.014 0.035-0.014s0.026 0.005 0.035 0.014v0z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icon/icon-status.svg b/src/assets/icon/icon-status.svg
index c171d99..fb84165 100644
--- a/src/assets/icon/icon-status.svg
+++ b/src/assets/icon/icon-status.svg
@@ -1 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="none" d="M0 0h24v24H0z"/><path d="M.125.125h23.75v23.75H.125z"/><path d="M1.8 10v.268c0 .252.197.45.45.45.25 0 .45-.198.45-.45V5c0-.185.045-.322.137-.412.09-.093.228-.14.413-.14h17.5c.365 0 .55.184.55.552v5.268c0 .252.197.45.45.45.25 0 .45-.198.45-.45V5c0-.202-.038-.388-.108-.558a1.447 1.447 0 0 0-.317-.47 1.447 1.447 0 0 0-.47-.317 1.444 1.444 0 0 0-.555-.105H3.25c-.203 0-.388.035-.558.105-.172.07-.327.178-.47.318-.14.142-.247.297-.317.47-.07.17-.105.355-.105.557v5zm20.365 3.71c0-.25-.2-.448-.453-.448a.448.448 0 0 0-.447.453l.027 5.28a.53.53 0 0 1-.16.392.532.532 0 0 1-.39.163H3.25a.532.532 0 0 1-.39-.163A.529.529 0 0 1 2.7 19v-5.287c0-.253-.2-.45-.45-.45a.445.445 0 0 0-.45.45V19c0 .2.035.385.105.555.07.172.177.328.317.47.143.14.298.248.47.318.17.07.355.105.558.105h17.492a1.4 1.4 0 0 0 1.03-.425c.283-.285.423-.63.42-1.033l-.027-5.28z" fill-opacity=".8" fill="#000"/><path d="M4.655 11.555h-3.26a.445.445 0 0 0-.45.45c0 .252.197.45.45.45h3.527c.088 0 .165-.02.23-.057a.46.46 0 0 0 .163-.175L7.507 8.26l2.585 8.03c.093.288.283.383.568.293a.44.44 0 0 0 .275-.25l2.36-5.45 2.552 3.96c.163.25.37.294.623.132a.444.444 0 0 0 .157-.175l1.585-3.168.7.698c.09.09.195.133.32.133l3.423-.008c.252 0 .45-.2.45-.45 0-.253-.2-.45-.45-.45l-3.238.008-1.007-1.01a.475.475 0 0 0-.118-.083c-.267-.135-.47-.068-.605.2l-1.512 3.02-2.58-4.002a.436.436 0 0 0-.198-.17c-.275-.118-.472-.04-.592.234l-2.223 5.125-2.537-7.885a.444.444 0 0 0-.21-.255c-.13-.072-.248-.095-.35-.064-.1.03-.188.11-.26.24l-2.57 4.642z" fill-opacity=".8" fill="#000"/></g></svg>
\ No newline at end of file
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path d="M1.8 10v0.268c0 0.252 0.197 0.45 0.45 0.45 0.25 0 0.45-0.198 0.45-0.45v-5.268c0-0.185 0.045-0.322 0.137-0.412 0.090-0.093 0.228-0.14 0.413-0.14h17.5c0.365 0 0.55 0.184 0.55 0.552v5.268c0 0.252 0.197 0.45 0.45 0.45 0.25 0 0.45-0.198 0.45-0.45v-5.268c0-0.202-0.038-0.388-0.108-0.558-0.078-0.183-0.185-0.339-0.317-0.47l-0-0c-0.131-0.132-0.287-0.239-0.461-0.313l-0.009-0.004c-0.16-0.066-0.346-0.105-0.541-0.105-0.005 0-0.010 0-0.015 0h-17.499c-0.203 0-0.388 0.035-0.558 0.105-0.172 0.070-0.327 0.178-0.47 0.318-0.14 0.142-0.247 0.297-0.317 0.47-0.070 0.17-0.105 0.355-0.105 0.557v5zM22.165 13.71c0-0.25-0.2-0.448-0.453-0.448-0.247 0.001-0.447 0.201-0.447 0.448 0 0.002 0 0.004 0 0.005v-0l0.027 5.28c0 0.004 0 0.008 0 0.012 0 0.149-0.061 0.283-0.16 0.38l-0 0c-0.097 0.101-0.233 0.163-0.383 0.163-0.002 0-0.005-0-0.007-0h-17.492c-0.002 0-0.004 0-0.007 0-0.15 0-0.286-0.062-0.383-0.163l-0-0c-0.099-0.096-0.16-0.231-0.16-0.379 0-0.003 0-0.006 0-0.008v0-5.287c0-0.253-0.2-0.45-0.45-0.45-0.001-0-0.003-0-0.005-0-0.246 0-0.445 0.199-0.445 0.445 0 0.002 0 0.004 0 0.005v-0 5.287c0 0.2 0.035 0.385 0.105 0.555 0.070 0.172 0.177 0.328 0.317 0.47 0.143 0.14 0.298 0.248 0.47 0.318 0.17 0.070 0.355 0.105 0.558 0.105h17.492c0.007 0 0.016 0 0.025 0 0.394 0 0.75-0.163 1.005-0.425l0-0c0.283-0.285 0.423-0.63 0.42-1.033l-0.027-5.28z"></path>
+<path d="M4.655 11.555h-3.26c-0.002-0-0.003-0-0.005-0-0.246 0-0.445 0.199-0.445 0.445 0 0.002 0 0.004 0 0.005v-0c0 0.252 0.197 0.45 0.45 0.45h3.527c0.088 0 0.165-0.020 0.23-0.057 0.069-0.043 0.124-0.103 0.162-0.173l0.001-0.002 2.192-3.963 2.585 8.030c0.093 0.288 0.283 0.383 0.568 0.293 0.125-0.040 0.224-0.13 0.274-0.247l0.001-0.003 2.36-5.45 2.552 3.96c0.163 0.25 0.37 0.294 0.623 0.132 0.067-0.044 0.12-0.103 0.156-0.172l0.001-0.003 1.585-3.168 0.7 0.698c0.090 0.090 0.195 0.133 0.32 0.133l3.423-0.008c0.252 0 0.45-0.2 0.45-0.45 0-0.253-0.2-0.45-0.45-0.45l-3.238 0.008-1.007-1.010c-0.034-0.033-0.073-0.060-0.115-0.082l-0.003-0.001c-0.267-0.135-0.47-0.068-0.605 0.2l-1.512 3.020-2.58-4.002c-0.047-0.075-0.115-0.134-0.195-0.169l-0.003-0.001c-0.275-0.118-0.472-0.040-0.592 0.234l-2.223 5.125-2.537-7.885c-0.036-0.11-0.111-0.2-0.208-0.254l-0.002-0.001c-0.13-0.072-0.248-0.095-0.35-0.064-0.1 0.030-0.188 0.11-0.26 0.24l-2.57 4.642z"></path>
+</svg>
diff --git a/src/assets/solution/openhpc/img1-dark.png b/src/assets/solution/openhpc/img1-dark.png
index 647c07e3b05223aa3e677b20ee49148d36c3ee34..af819dc1c23ede763a539d474a502118b9d531ca 100644
GIT binary patch
literal 71727
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

literal 65293
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%0Ai
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%0D)f1_u*|}j>zCFfSwPIdtx%tR!!*xuwttkS
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

diff --git a/src/assets/style/category/detail/index.scss b/src/assets/style/category/detail/index.scss
index 2a29aec..047f150 100644
--- a/src/assets/style/category/detail/index.scss
+++ b/src/assets/style/category/detail/index.scss
@@ -45,7 +45,7 @@
       border-top: 1px solid var(--o-color-control4);
     }
     .label {
-      background: var(--o-color-fill3);
+      background: var(--o-color-control2-light);
       padding: 16px 24px;
       color: var(--o-color-info2);
       min-width: 150px;
@@ -129,7 +129,7 @@
 }
 
 .ver {
-  background: var(--o-color-fill3);
+  background: var(--o-color-control2-light);
   @include text2;
   border: none;
   border-radius: var(--layout-pkg-radius);
diff --git a/src/assets/style/global.scss b/src/assets/style/global.scss
index e140180..a30bb9d 100644
--- a/src/assets/style/global.scss
+++ b/src/assets/style/global.scss
@@ -25,7 +25,7 @@ html {
   .o-tag {
     cursor: pointer;
     --tag-padding: 2px 4px;
-    --tag-bd-color: var(--o-color-control3-light);
+    --tag-bd-color: var(--o-color-control1-light);
     &.image-icon .o-icon {
       color: #007af0;
     }
@@ -36,7 +36,7 @@ html {
       color: #00a7b3;
     }
     &:hover {
-      --tag-bg-color: var(--o-color-control1-light);
+      --tag-bg-color: var(--o-color-control2-light);
     }
     .o-tag-icon {
       height: 16px;
@@ -61,3 +61,34 @@ html {
 .o-tab-nav-active {
   font-weight: 500;
 }
+
+.o-card-pkg {
+  .desc {
+    margin-top: 8px;
+    color: var(--o-color-info2);
+    overflow: hidden;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    position: relative;
+    word-break: break-all;
+    height: 48px;
+    --linear-gradient: var(--o-mixedgray-1);
+    &.dark {
+      --linear-gradient: var(--o-mixedgray-4);
+    }
+    @include text1;
+    &::after {
+      background-image: linear-gradient(90deg, rgba(var(--linear-gradient), 0), rgba(var(--linear-gradient), 0.8) 59%, var(--o-color-control-light) 100%);
+      bottom: 0;
+      content: '';
+      height: 24px;
+      pointer-events: none;
+      position: absolute;
+      right: 0;
+      width: 4em;
+    }
+    span {
+      color: var(--o-color-primary1);
+    }
+  }
+}
diff --git a/src/assets/style/markdown.scss b/src/assets/style/markdown.scss
index 326eb1b..22f477c 100644
--- a/src/assets/style/markdown.scss
+++ b/src/assets/style/markdown.scss
@@ -47,7 +47,7 @@
   }
   code {
     border-radius: var(--layout-pkg-radius);
-    background-color: var(--o-color-fill3);
+    background-color: var(--o-color-control2-light);
     margin: 0 4px;
   }
   p code:first-child {
@@ -57,7 +57,7 @@
   pre {
     position: relative;
     border-radius: var(--layout-pkg-radius);
-    background-color: var(--o-color-fill3);
+    background-color: var(--o-color-control2-light);
     padding: 0;
     overflow: hidden;
 
@@ -119,7 +119,7 @@
     position: absolute;
     top: 0;
     right: 0;
-    background-color: var(--o-color-fill3);
+    background-color: var(--o-color-control2-light);
     opacity: 1;
     padding: 12px 12px 0 0;
     .icon-copy {
diff --git a/src/assets/style/theme/popup.scss b/src/assets/style/theme/popup.scss
index 10af9e7..184129f 100644
--- a/src/assets/style/theme/popup.scss
+++ b/src/assets/style/theme/popup.scss
@@ -3,8 +3,8 @@
   .o-popup-wrap {
     border: 1px solid var(--o-color-control4);
   }
-  .o-popover-anchor {
-    border: 1px solid var(--o-color-control4);
+  .o-popup-anchor {
+    border: 1px solid var(--o-color-control1);
     border-width: 1px 0 0 1px;
   }
 }
diff --git a/src/assets/style/theme/rate.scss b/src/assets/style/theme/rate.scss
index aa3c812..30ee6f6 100644
--- a/src/assets/style/theme/rate.scss
+++ b/src/assets/style/theme/rate.scss
@@ -1,4 +1,4 @@
 .o-rate {
-  --rate-color: var(--o-color-control2);
+  --rate-color: var(--o-color-info4);
   --rate-size: 24px;
 }
diff --git a/src/components/OCardItem.vue b/src/components/OCardItem.vue
index a3fe26e..be7bc96 100644
--- a/src/components/OCardItem.vue
+++ b/src/components/OCardItem.vue
@@ -77,6 +77,7 @@ onMounted(() => {
       '--card-main-padding': '24px',
     }"
     hoverable
+    class="o-card-pkg"
     :class="{ search: isPageSearch, home: isPageHome }"
   >
     <template #main>
@@ -198,35 +199,6 @@ onMounted(() => {
         }
       }
     }
-    .desc {
-      margin-top: 8px;
-      color: var(--o-color-info2);
-      overflow: hidden;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-      position: relative;
-      word-break: break-all;
-      height: 48px;
-
-      --linear-gradient: var(--o-mixedgray-1);
-      &.dark {
-        --linear-gradient: var(--o-mixedgray-4);
-      }
-      @include text1;
-      &::after {
-        background-image: linear-gradient(90deg, rgba(var(--linear-gradient), 0), rgba(var(--linear-gradient), 0.8) 59%, var(--o-color-control-light) 100%);
-        bottom: 0;
-        content: '';
-        height: 24px;
-        pointer-events: none;
-        position: absolute;
-        right: 0;
-        width: 4em;
-      }
-      span {
-        color: var(--o-color-primary1);
-      }
-    }
   }
 }
 </style>
diff --git a/src/components/OCodeCopy.vue b/src/components/OCodeCopy.vue
index 6d7a1bc..819273a 100644
--- a/src/components/OCodeCopy.vue
+++ b/src/components/OCodeCopy.vue
@@ -43,7 +43,7 @@ const copyText = (e: MouseEvent) => {
 
 <style lang="scss" scoped>
 .download-code {
-  background: var(--o-color-fill3);
+  background: var(--o-color-control2-light);
   border-radius: var(--layout-pkg-radius);
   height: auto;
   width: 100%;
@@ -66,7 +66,7 @@ const copyText = (e: MouseEvent) => {
     padding: 12px 12px 0 0;
     top: 0;
     right: 0;
-    background-color: var(--o-color-fill3);
+    background-color: var(--o-color-control2-light);
     height: 24px;
     box-sizing: content-box;
     border-radius: 0 4px 0 0;
diff --git a/src/components/collaboration/Indicators.vue b/src/components/collaboration/Indicators.vue
index da766c1..f560619 100644
--- a/src/components/collaboration/Indicators.vue
+++ b/src/components/collaboration/Indicators.vue
@@ -60,7 +60,7 @@ const data = [
     contribution: '没有PR提交',
     details: '版本正常',
     maintenance: '健康',
-    description: '没有CVE问题，且也没有PR提交，且软件包是最新版本',
+    description: '没有CVE问题，且也没有PR提交，且软件包是正常稳定的',
   },
   {
     cve: '没有CVE',
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index c60eca8..6d9958b 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -80,11 +80,13 @@ const descriptionRules = [
     required: true,
     triggers: ['blur'],
     message: '请输入您的理由',
+  },
+  {
     validator: (value: string) => {
-      if (value.length > 1000) {
+      if (value.trim().length < 1 || value.length > 1000) {
         return {
           type: 'danger',
-          message: '最多不能超过1000字',
+          message: '长度为1-1000个字符',
         };
       }
     },
diff --git a/src/components/detail/DetailAside.vue b/src/components/detail/DetailAside.vue
index aafc614..09be570 100644
--- a/src/components/detail/DetailAside.vue
+++ b/src/components/detail/DetailAside.vue
@@ -318,12 +318,6 @@ const onCodeSuccess = () => {
   }
 }
 :deep(.o-table) {
-  th,
-  td {
-    padding: 2px 12px;
-    font-size: 14px !important;
-  }
-
   tbody tr:hover {
     background: none;
   }
@@ -339,11 +333,12 @@ const onCodeSuccess = () => {
 
 .obtn {
   border-radius: 4px;
-  background: var(--o-color-fill3);
+  background: var(--o-color-control2-light);
   border: none;
+  transition: none;
   --btn-color: var(--o-color-info1);
   &:hover {
-    background: var(--o-color-primary4-light);
+    background: var(--o-color-control3-light);
   }
 }
 </style>
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index aa8da23..93e5dc6 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -54,7 +54,7 @@ const jump = (href: string) => {
       windowOpen(`/${locale.value}/${href}`, '_blank');
     } else {
       router.push({
-        path: `/${locale.value}/${href}`,
+        path: `/${locale.value}/${href}${isMainPer.value ? '/application' : '/approval'}`,
       });
     }
   } else {
@@ -81,7 +81,7 @@ const jump = (href: string) => {
       </div>
       <div class="header-right">
         <template v-if="loginStore.isLogined">
-          <OLink v-if="isCollaboration" class="todo" @click="jump(`todo/application`)">待办中心</OLink>
+          <OLink v-if="isCollaboration" class="todo" @click="jump(`todo`)">待办中心</OLink>
           <OLink v-else class="collaboration" @click="jump(`collaboration`)">协作平台</OLink>
         </template>
         <HeaderTheme />
diff --git a/src/composables/useTheme.ts b/src/composables/useTheme.ts
index 33668b8..6f3757c 100644
--- a/src/composables/useTheme.ts
+++ b/src/composables/useTheme.ts
@@ -1,9 +1,12 @@
 import { watch, computed, onMounted } from 'vue';
 import { useAppearance } from '@/stores/common';
-
+import {
+  getCustomCookie,
+  setCustomCookie,
+} from '@/utils/cookie';
 import { isClient } from '@opensig/opendesign';
 
-const APPEARANCE_KEY = 'easysoftware-theme';
+const APPEARANCE_KEY = 'openEuler-theme-appearance';
 
 export const useTheme = () => {
   const appearanceStore = useAppearance();
@@ -15,7 +18,8 @@ export const useTheme = () => {
     if (isClient) {
       const theme = appearanceStore.value === 'dark' ? 'light' : 'dark';
       appearanceStore.value = theme;
-      localStorage.setItem(APPEARANCE_KEY, theme);
+
+      setCustomCookie(APPEARANCE_KEY, theme, 180, import.meta.env.VITE_COOKIE_DOMAIN);
     }
   };
 
@@ -27,18 +31,21 @@ export const useTheme = () => {
       const documentElement = document.documentElement;
       val === 'light' && documentElement.removeAttribute('data-o-theme');
       val === 'dark' && documentElement.setAttribute('data-o-theme', 'dark');
+    },
+    {
+      immediate: true
     }
   );
 
   onMounted(() => {
     let theme;
-    if (!localStorage.getItem(APPEARANCE_KEY)) {
+    if (!getCustomCookie(APPEARANCE_KEY)) {
       const prefereDark = window.matchMedia(
         '(prefers-color-scheme: dark)'
       ).matches;
       theme = prefereDark ? 'dark' : 'light';
     } else {
-      theme = localStorage.getItem(APPEARANCE_KEY);
+      theme = getCustomCookie(APPEARANCE_KEY);
     }
 
     appearanceStore.value = theme === 'dark' ? 'dark' : 'light';
diff --git a/src/router/index.ts b/src/router/index.ts
index 24821bb..7de9f54 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -159,8 +159,12 @@ router.beforeEach(async (to) => {
 
   if (userInfoStore.upstreamPermission === null && loginStore.isLogined && !isPlatform) {
     try {
-      const upstreamPermission = await queryUpstreamPermission();
-      userInfoStore.upstreamPermission = upstreamPermission.data.allow_access;
+      const { data } = await queryUpstreamPermission();
+      if (data.allow_access) {
+        userInfoStore.upstreamPermission = data.allow_access;
+      } else {
+        return isUpstream ? { name: 'notFound' } : true;
+      }
     } catch {
       // 如果queryUpstreamPermission不是401
       return isUpstream ? { name: 'notFound' } : true;
diff --git a/src/shared/axios/index.ts b/src/shared/axios/index.ts
index bea201c..d817060 100644
--- a/src/shared/axios/index.ts
+++ b/src/shared/axios/index.ts
@@ -172,11 +172,11 @@ const responseInterceptorId = request.interceptors.response.use(
       });
     }
 
-    // if (err.response?.status === 401) {
-    //   clearUserAuth();
-    //   useLoginStore().setLoginStatus(LOGIN_STATUS.FAILED);
-    //   router.push('/');
-    // }
+    if (err.response?.status === 401) {
+      clearUserAuth();
+      useLoginStore().setLoginStatus(LOGIN_STATUS.FAILED);
+      router.push('/');
+    }
 
     return Promise.reject(err);
   }
diff --git a/src/utils/common.ts b/src/utils/common.ts
index d83df16..87cb450 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -40,7 +40,7 @@ export const formatDateTime = (v: string, isTime?: boolean) => {
 
     return `${year}/${month}/${day}`;
   }
-  return ''
+  return '-'
 };
 
 /**
diff --git a/src/utils/cookie.ts b/src/utils/cookie.ts
new file mode 100644
index 0000000..e147a39
--- /dev/null
+++ b/src/utils/cookie.ts
@@ -0,0 +1,30 @@
+import Cookies from 'js-cookie';
+
+/**
+ * 获取指定key的cookie值
+ * @param key
+ * @returns
+ */
+export const getCustomCookie = (key: string) => {
+  return Cookies.get(key);
+}
+
+/**
+ * 设置cookie
+ * @param key cookie的key
+ * @param value cookie的值
+ * @param day cookie的过期时间 默认180天
+ * @param domain domain地址
+ */
+export const setCustomCookie = (key: string, value: string, day = 180, domain: string = location.hostname) => {
+  Cookies.set(key, value, { expires: day, path: '/', domain: domain });
+}
+
+/**
+ * 删除cookie
+ * @param key cookie的key
+ * @param domain domain地址
+ */
+export const removeCustomCookie = (key: string, domain: string = location.hostname) => {
+  Cookies.remove(key, { path: '/', domain: domain });
+}
diff --git a/src/views/home/HomeHeader.vue b/src/views/home/HomeHeader.vue
index d8d4ec8..874f19e 100644
--- a/src/views/home/HomeHeader.vue
+++ b/src/views/home/HomeHeader.vue
@@ -73,6 +73,8 @@ onMounted(() => {
     inset: 0;
     height: 100%;
     width: 100%;
+    user-select: none;
+    pointer-events: none;
   }
 }
 
diff --git a/src/views/home/HomeNews.vue b/src/views/home/HomeNews.vue
index 32c625c..e7d56a3 100644
--- a/src/views/home/HomeNews.vue
+++ b/src/views/home/HomeNews.vue
@@ -12,7 +12,7 @@ const { isDark } = useTheme();
     <OCol v-for="subItem in homeNewsData" :key="subItem.title" flex="0 1 33%" :laptop="{ flex: '0 1 33%' }">
       <OCard
         :href="subItem.url"
-        class="news-item"
+        class="news-item o-card-pkg"
         target="_blank"
         rel="noopener noreferrer"
         :title="subItem.title"
@@ -52,30 +52,6 @@ const { isDark } = useTheme();
       height: 255px;
     }
   }
-  .desc {
-    display: flex;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    position: relative;
-    --linear-gradient: var(--o-mixedgray-1);
-    &.dark {
-      --linear-gradient: var(--o-mixedgray-4);
-    }
-
-    @include text1;
-    &::after {
-      background-image: linear-gradient(90deg, rgba(var(--linear-gradient), 0), rgba(var(--linear-gradient), 0.8) 59%, var(--o-color-control-light) 100%);
-      bottom: 0;
-      content: '';
-      height: 24px;
-      pointer-events: none;
-      position: absolute;
-      right: 0;
-      width: 4em;
-    }
-  }
 }
 
 :deep(.o-card-main) {
diff --git a/src/views/solution/TheOpenStack.vue b/src/views/solution/TheOpenStack.vue
index 189400c..1ac84b3 100644
--- a/src/views/solution/TheOpenStack.vue
+++ b/src/views/solution/TheOpenStack.vue
@@ -137,13 +137,19 @@ const advImg = computed(() => {
           v-for="item in OpenStack.caseList"
           :key="item.name"
           cursor="auto"
+          class="o-card-pkg"
           :title="item.name"
           :href="OPENEULER + item.href"
           target="_blank"
           rel="noopener noreferrer"
-          :detail="item.desc"
           :cover="item.img"
-        />
+        >
+          <template #default>
+            <div class="desc" :class="{ dark: isDark }">
+              {{ item.desc }}
+            </div>
+          </template>
+        </OCard>
       </div>
     </div>
     <!-- 跳转外部链接提示 -->
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 173ffcb..c82e525 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -7,11 +7,12 @@ import { useRouter, useRoute } from 'vue-router';
 import { applicationType, applyStatusType } from '@/data/todo';
 import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 import { useUserInfoStore } from '@/stores/user';
-
-import IconFilter from '~icons/app/icon-filter.svg';
-import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
 import { onClickOutside, useDebounceFn } from '@vueuse/core';
 import { getAdminApplyRepos, getMaintainerApplyRepos } from '@/api/api-collaboration';
+import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
+
+import IconFilter from '~icons/app/icon-filter.svg';
+import IconHelp from '~icons/app/icon-help.svg';
 
 interface ColumnsT {
   key: string;
@@ -52,11 +53,12 @@ const repoList = ref<string[]>([]);
 const getRepoList = () => {
   if (props.type === 'approval' || props.type === 'approved') {
     getAdminApplyRepos()
-      .then((data) => repoList.value = data.list)
-      .finally(() => repoFilterLoading.value = false);
+      .then((data) => (repoList.value = data.list))
+      .finally(() => (repoFilterLoading.value = false));
   } else {
-      getMaintainerApplyRepos().then((data) => repoList.value = data.list)
-      .finally(() => repoFilterLoading.value = false);
+    getMaintainerApplyRepos()
+      .then((data) => (repoList.value = data.list))
+      .finally(() => (repoFilterLoading.value = false));
   }
 };
 
@@ -140,13 +142,13 @@ const jumpTo = (id: number) => {
 };
 
 const emits = defineEmits<{
-  (e: 'revoke', id: number): void;
+  (e: 'revoke', id: string): void;
   (e: 'queryData', params: Record<string, string>): void;
 }>();
 
 const showDlg = ref(false);
 const applayId = ref();
-const revokeApplication = (id: number) => {
+const revokeApplication = (id: string) => {
   applayId.value = id;
   showDlg.value = true;
 };
@@ -163,9 +165,28 @@ const revoke = () => {
       <template #head="{ columns }">
         <template v-for="(item, index) in columns" :key="item.type">
           <th v-if="!filterableColSet.size || !filterableColSet.has(item.key)" :class="item.type">
-            {{ item.label }}
+            <template v-if="item.label === '申请人'">
+              <div class="th-maintainer">
+                申请人
+                <OPopover position="top" trigger="hover">
+                  <template #target>
+                    <OIcon class="maintainer-icon"><IconHelp /></OIcon>
+                  </template>
+                  <div class="box">展示Gitee ID 不是openEuler用户名</div>
+                </OPopover>
+              </div>
+            </template>
+            <template v-else> {{ item.label }}</template>
           </th>
-          <OPopup :ref="(el) => setPopupClickoutSideFn(el, index)" v-else trigger="none" style="--popup-radius: 4px" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
+          <OPopup
+            v-else
+            trigger="none"
+            style="--popup-radius: 4px"
+            :visible="filterSwitches[index]"
+            :unmount-on-hide="false"
+            position="bl"
+            :ref="(el) => setPopupClickoutSideFn(el, index)"
+          >
             <template #target>
               <th :class="item.type">
                 <div class="header-cell">
@@ -189,8 +210,18 @@ const revoke = () => {
               </th>
             </template>
             <FilterableCheckboxes v-if="item.key === 'metric'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
-            <FilterableCheckboxes v-else-if="item.key === 'repo'" :loading="repoFilterLoading" @change="onFilterChange(item.key, index, $event)" :values="repoList" />
-            <FilterableCheckboxes v-else-if="item.key === 'applyStatus'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyStatusType" />
+            <FilterableCheckboxes
+              v-else-if="item.key === 'repo'"
+              :loading="repoFilterLoading"
+              @change="onFilterChange(item.key, index, $event)"
+              :values="repoList"
+            />
+            <FilterableCheckboxes
+              v-else-if="item.key === 'applyStatus'"
+              :filterable="false"
+              @change="onFilterChange(item.key, index, $event)"
+              :values="applyStatusType"
+            />
           </OPopup>
         </template>
       </template>
@@ -209,6 +240,7 @@ const revoke = () => {
       <template #td_description="{ row }">
         <div class="line-clamp">{{ row.description }}</div>
       </template>
+
       <template #td_applyStatus="{ row }">
         <div class="apply-status">
           <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatusConvert(row.applyStatus) }} </OTag>
@@ -246,7 +278,15 @@ const revoke = () => {
 
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
-
+.th-maintainer {
+  display: flex;
+  align-items: center;
+  .maintainer-icon {
+    width: 16px;
+    margin-left: 8px;
+    color: var(--o-color-info1);
+  }
+}
 .revoke-text {
   color: var(--o-color-info1);
   text-align: center;
@@ -302,15 +342,15 @@ thead {
     width: 150px;
   }
   .applyStatus {
-    width: 135px;
+    width: 130px;
   }
   .administrator,
   .maintainer {
-    width: 120px;
+    width: 130px;
   }
 
   .applyId {
-    width: 150px;
+    width: 140px;
   }
 
   .comment {
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
index 3bcc67f..d9fd723 100644
--- a/src/views/todo/TheTodoDetail.vue
+++ b/src/views/todo/TheTodoDetail.vue
@@ -60,11 +60,13 @@ const commentRules = [
     required: true,
     triggers: ['blur'],
     message: '请输入审批意见',
+  },
+  {
     validator: (value: string) => {
-      if (value.length > 1000) {
+      if (value.trim().length < 1 || value.length > 1000) {
         return {
           type: 'danger',
-          message: '最多不能超过1000字',
+          message: '长度为1-1000个字符',
         };
       }
     },
-- 
Gitee


From 54ef8c0269cf14af997063177df48fd62b4e04cf Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Tue, 27 Aug 2024 16:23:41 +0800
Subject: [PATCH 12/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=E3=80=81=E5=8D=8F=E4=BD=9C=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=A1=A8=E7=AD=9B=E9=80=89=E7=BB=84=E4=BB=B6=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=86=85=E9=83=A8=E4=B9=9F=E4=BC=9A=E8=A2=AB=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 筛选改成大小写不敏感
---
 src/components/FilterableCheckboxes.vue      |  7 ++--
 src/views/collaboration/TheCollaboration.vue | 33 ++++++++---------
 src/views/todo/ApprovalTable.vue             | 38 +++++++++-----------
 3 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
index 0e16e29..cb53a73 100644
--- a/src/components/FilterableCheckboxes.vue
+++ b/src/components/FilterableCheckboxes.vue
@@ -46,12 +46,11 @@ const rawValues = computed(() =>
 const searchVal = ref<string>();
 
 const filteredValues = computed(() => {
-  const search = searchVal.value;
-  if (search) {
-    return rawValues.value.filter((val) => val.label.includes(search));
-  } else {
+  if (!searchVal.value) {
     return rawValues.value;
   }
+  const search = searchVal.value.toLowerCase();
+  return rawValues.value.filter((val) => val.label.toLowerCase().includes(search));
 });
 
 const displayCount = ref(30);
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 0ff096e..a1b2431 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -256,7 +256,6 @@ watch(
             trigger="none"
             style="--popup-radius: 4px"
             v-for="(item, index) in columns"
-            :ref="(el) => setPopupClickoutSideFn(el, index)"
             :key="item.type"
             :visible="filterSwitches[index]"
             :unmount-on-hide="false"
@@ -289,21 +288,23 @@ watch(
                 </div>
               </th>
             </template>
-            <FilterableCheckboxes
-              v-if="item.key === 'repo'"
-              :loading="repoFilterLoading"
-              @change="onFilterChange(item.key, index, $event)"
-              :values="allRepos"
-            />
-            <FilterableCheckboxes
-              v-else-if="item.key === 'sigName'"
-              :loading="sigFilterLoading"
-              @change="onFilterChange(item.key, index, $event)"
-              :values="allSigs"
-            />
-            <FilterableCheckboxes v-else-if="item.key === 'kind'" @change="onFilterChange(item.key, index, $event)" :filterable="false" :values="kindTypes" />
-            <FilterableCheckboxes v-else-if="item.key === 'status'" @change="onFilterChange(item.key, index, $event)" :values="repoStatusArr" />
-            <FilterableCheckboxes v-else :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="metricTypes(item.key)" />
+            <div :ref="(el) => setPopupClickoutSideFn(el, index)">
+              <FilterableCheckboxes
+                v-if="item.key === 'repo'"
+                :loading="repoFilterLoading"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="allRepos"
+              />
+              <FilterableCheckboxes
+                v-else-if="item.key === 'sigName'"
+                :loading="sigFilterLoading"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="allSigs"
+              />
+              <FilterableCheckboxes v-else-if="item.key === 'kind'" @change="onFilterChange(item.key, index, $event)" :filterable="false" :values="kindTypes" />
+              <FilterableCheckboxes v-else-if="item.key === 'status'" @change="onFilterChange(item.key, index, $event)" :values="repoStatusArr" />
+              <FilterableCheckboxes v-else :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="metricTypes(item.key)" />
+            </div>
           </OPopup>
         </template>
         <template #td_repo="{ row }">
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index c82e525..88f0d46 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -178,15 +178,7 @@ const revoke = () => {
             </template>
             <template v-else> {{ item.label }}</template>
           </th>
-          <OPopup
-            v-else
-            trigger="none"
-            style="--popup-radius: 4px"
-            :visible="filterSwitches[index]"
-            :unmount-on-hide="false"
-            position="bl"
-            :ref="(el) => setPopupClickoutSideFn(el, index)"
-          >
+          <OPopup v-else trigger="none" style="--popup-radius: 4px" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
             <template #target>
               <th :class="item.type">
                 <div class="header-cell">
@@ -209,19 +201,21 @@ const revoke = () => {
                 </div>
               </th>
             </template>
-            <FilterableCheckboxes v-if="item.key === 'metric'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
-            <FilterableCheckboxes
-              v-else-if="item.key === 'repo'"
-              :loading="repoFilterLoading"
-              @change="onFilterChange(item.key, index, $event)"
-              :values="repoList"
-            />
-            <FilterableCheckboxes
-              v-else-if="item.key === 'applyStatus'"
-              :filterable="false"
-              @change="onFilterChange(item.key, index, $event)"
-              :values="applyStatusType"
-            />
+            <div :ref="(el) => setPopupClickoutSideFn(el, index)">
+              <FilterableCheckboxes v-if="item.key === 'metric'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
+              <FilterableCheckboxes
+                v-else-if="item.key === 'repo'"
+                :loading="repoFilterLoading"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="repoList"
+              />
+              <FilterableCheckboxes
+                v-else-if="item.key === 'applyStatus'"
+                :filterable="false"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="applyStatusType"
+              />
+            </div>
           </OPopup>
         </template>
       </template>
-- 
Gitee


From f7405c217ff27ab6255f13e17e38fe68fe6f5b0f Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Tue, 27 Aug 2024 17:29:58 +0800
Subject: [PATCH 13/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 7de9f54..8c02f51 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -162,12 +162,9 @@ router.beforeEach(async (to) => {
       const { data } = await queryUpstreamPermission();
       if (data.allow_access) {
         userInfoStore.upstreamPermission = data.allow_access;
-      } else {
-        return isUpstream ? { name: 'notFound' } : true;
       }
     } catch {
-      // 如果queryUpstreamPermission不是401
-      return isUpstream ? { name: 'notFound' } : true;
+      userInfoStore.upstreamPermission = false;
     }
   }
 
-- 
Gitee


From 30b49830d94aa9e206e2a04d3eb893dc3ad42de2 Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Wed, 28 Aug 2024 11:09:14 +0800
Subject: [PATCH 14/17] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E3=80=81=E5=8D=8F=E4=BD=9C=E5=B9=B3=E5=8F=B0=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=AD=9B=E9=80=89=E6=94=B9=E6=88=90=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E3=80=81=E4=BF=9D=E7=95=99=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FilterableCheckboxes.vue      | 22 +++++------
 src/views/collaboration/TheCollaboration.vue | 31 ++++++---------
 src/views/todo/ApprovalTable.vue             | 41 ++++++++------------
 3 files changed, 36 insertions(+), 58 deletions(-)

diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
index cb53a73..c67eadd 100644
--- a/src/components/FilterableCheckboxes.vue
+++ b/src/components/FilterableCheckboxes.vue
@@ -1,16 +1,15 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch, type PropType } from 'vue';
 import { useDebounceFn } from '@vueuse/core';
-import { OCheckbox, OCheckboxGroup, OIcon, OInput, OScroller } from '@opensig/opendesign';
+import { OIcon, OInput, ORadio, ORadioGroup, OScroller } from '@opensig/opendesign';
 
 import IconSearch from '~icons/app/icon-search.svg';
-import { useCheckbox } from '@/composables/useCheckbox';
 import IconLoading from '~icons/app/icon-loading.svg';
 
 type ValueT = string | { label: string; value: string };
 
 const props = defineProps({
-  /** 是否显示筛选输入 */
+  /** 是否显示搜索 */
   filterable: {
     type: Boolean,
     default: true,
@@ -31,7 +30,7 @@ const props = defineProps({
 });
 
 const emit = defineEmits<{
-  (event: 'change', val: { values: (string | number)[]; isCheckAll: boolean }): void;
+  (event: 'change', val: string): void;
 }>();
 
 const rawValues = computed(() =>
@@ -83,12 +82,9 @@ const onFilterInput = useDebounceFn((search?: string) => {
   searchVal.value = search;
 }, props.filterDebounceTimeout);
 
-const { checkboxes, parentCheckbox, indeterminate, isCheckedAll } = useCheckbox(
-  () => rawValues.value,
-  (item) => item.value
-);
+const radioVal = ref('');
 
-watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.value }));
+watch(radioVal, (val) => emit('change', val));
 </script>
 
 <template>
@@ -105,11 +101,11 @@ watch(checkboxes, (values) => emit('change', { values, isCheckAll: isCheckedAll.
         <OIcon><IconLoading class="o-rotating" /></OIcon>
       </div>
       <div class="check-all-wrap">
-        <OCheckbox v-model="parentCheckbox" :indeterminate="indeterminate" :value="1">全选</OCheckbox>
+        <ORadio v-model="radioVal" :value="''">全选</ORadio>
       </div>
-      <OCheckboxGroup v-model="checkboxes" direction="v">
-        <OCheckbox v-for="item in displayValues" :key="item.value" :value="item.value">{{ item.label }}</OCheckbox>
-      </OCheckboxGroup>
+      <ORadioGroup v-model="radioVal" direction="v">
+        <ORadio v-for="item in displayValues" :key="item.value" :value="item.value">{{ item.label }}</ORadio>
+      </ORadioGroup>
     </OScroller>
   </div>
 </template>
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index a1b2431..5614fa7 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -50,12 +50,7 @@ const sigFilterLoading = ref(false);
 
 /** 切换某个筛选组件显示开关 */
 const switchFilterVisible = (index: number) => {
-  filterSwitches.value = columns.map((_, idx) => {
-    if (idx === index) {
-      return !filterSwitches.value[idx];
-    }
-    return false;
-  });
+  filterSwitches.value[index] = true;
   if (index === 0) {
     // 筛选仓库
     repoFilterLoading.value = true;
@@ -73,32 +68,28 @@ const switchFilterVisible = (index: number) => {
 };
 
 /** 各表格列对应的已选中的筛选项 */
-const activeFilterValues = ref(new Array<string[]>(columns.length));
+const activeFilterValues = ref(new Array<string>(columns.length));
 
 /** 当前有选中筛选项的表格列的数组下标 */
 const currentActiveFilterIndices = ref(new Set<number>());
 
-const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[]; isCheckAll: boolean }) => {
+const onFilterChange = (type: string, index: number, val: string) => {
   // 关掉筛选组件
   filterSwitches.value = columns.map(() => false);
   currentPage.value = 1;
-  if (val.values.length > 0) {
+  if (val) {
+    filterParams[type] = val;
+    activeFilterValues.value[index] = val;
     currentActiveFilterIndices.value.add(index);
   } else {
-    currentActiveFilterIndices.value.delete(index);
-  }
-  if (val.isCheckAll) {
     filterParams[type] = '';
-    activeFilterValues.value[index] = [];
+    activeFilterValues.value[index] = '';
     currentActiveFilterIndices.value.delete(index);
-  } else {
-    filterParams[type] = val.values.join();
-    activeFilterValues.value[index] = val.values as string[];
   }
   if (filterParams.versionStatus === '版本正常') {
     filterParams.versionStatus = '最新版本';
   }
-}, 300);
+};
 
 const SRCOPENEULER = 'https://gitee.com/src-openeuler/';
 
@@ -112,7 +103,7 @@ const pageSize = ref(10);
 const total = ref(0);
 
 // 筛选条件
-const filterParams = reactive<Record<string, string>>({
+const filterParams = reactive<Record<string, string | number>>({
   repo: '',
   kind: '',
   sigName: '',
@@ -275,13 +266,13 @@ watch(
                       ><IconFilter
                     /></OIcon>
                     <OPopover
-                      v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index].length > 0"
+                      v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index]"
                       :target="filterIconRefs[index]"
                       trigger="hover"
                     >
                       <p class="bubble-content">
                         <span class="title">{{ item.label }}:</span>
-                        {{ activeFilterValues[index]?.join('、') }}
+                        {{ activeFilterValues[index] }}
                       </p>
                     </OPopover>
                   </template>
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index 88f0d46..f527b99 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -7,7 +7,7 @@ import { useRouter, useRoute } from 'vue-router';
 import { applicationType, applyStatusType } from '@/data/todo';
 import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 import { useUserInfoStore } from '@/stores/user';
-import { onClickOutside, useDebounceFn } from '@vueuse/core';
+import { onClickOutside } from '@vueuse/core';
 import { getAdminApplyRepos, getMaintainerApplyRepos } from '@/api/api-collaboration';
 import FilterableCheckboxes from '@/components/FilterableCheckboxes.vue';
 
@@ -95,12 +95,7 @@ const repoFilterLoading = ref(false);
 
 /** 切换某个筛选组件显示开关 */
 const switchFilterVisible = (index: number) => {
-  filterSwitches.value = props.columns.map((_, idx) => {
-    if (idx === index) {
-      return !filterSwitches.value[idx];
-    }
-    return false;
-  });
+  filterSwitches.value[index] = true;
   if (index === 0) {
     repoFilterLoading.value = true;
     getRepoList();
@@ -108,28 +103,24 @@ const switchFilterVisible = (index: number) => {
 };
 
 /** 各表格列对应的已选中的筛选项 */
-const activeFilterValues = ref(new Array<string[]>(props.columns.length));
+const activeFilterValues = ref(new Array<string>(props.columns.length));
 
-const onFilterChange = useDebounceFn((type: string, index: number, val: { values: (string | number)[]; isCheckAll: boolean }) => {
+const onFilterChange = (type: string, index: number, val: string) => {
   filterSwitches.value = props.columns.map(() => false);
-  if (val.values.length > 0) {
+  if (val) {
+    filterParams[type] = val;
+    if (type === 'metric') {
+      activeFilterValues.value[index] = applyStatusConvert(val);
+    } else {
+      activeFilterValues.value[index] = val;
+    }
     currentActiveFilterIndices.value.add(index);
   } else {
-    currentActiveFilterIndices.value.delete(index);
-  }
-  if (val.isCheckAll) {
     filterParams[type] = '';
-    activeFilterValues.value[index] = [];
+    activeFilterValues.value[index] = '';
     currentActiveFilterIndices.value.delete(index);
-  } else {
-    filterParams[type] = val.values.join();
-    if (type === 'metric') {
-      activeFilterValues.value[index] = val.values.map((item) => applyStatusConvert(item as string));
-    } else {
-      activeFilterValues.value[index] = val.values as string[];
-    }
   }
-}, 300);
+};
 
 const userInfoStore = useUserInfoStore();
 const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
@@ -178,7 +169,7 @@ const revoke = () => {
             </template>
             <template v-else> {{ item.label }}</template>
           </th>
-          <OPopup v-else trigger="none" style="--popup-radius: 4px" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
+          <OPopup v-else trigger="none" style="--popup-radius: 4px" :offset="-8" :visible="filterSwitches[index]" :unmount-on-hide="false" position="bl">
             <template #target>
               <th :class="item.type">
                 <div class="header-cell">
@@ -191,10 +182,10 @@ const revoke = () => {
                       @click="switchFilterVisible(index)"
                       ><IconFilter
                     /></OIcon>
-                    <OPopover :target="filterIconRefs[index]" trigger="hover">
+                    <OPopover v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index]" :target="filterIconRefs[index]" trigger="hover">
                       <p class="bubble-content">
                         <span class="title">{{ item.label }}:</span>
-                        {{ activeFilterValues[index]?.join('、') }}
+                        {{ activeFilterValues[index] }}
                       </p>
                     </OPopover>
                   </template>
-- 
Gitee


From fae29baf7053849c1791c500366e32f969c4d662 Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Wed, 28 Aug 2024 11:44:05 +0800
Subject: [PATCH 15/17] =?UTF-8?q?fix:=20=E5=8D=8F=E4=BD=9C=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=93=E5=BA=93=E3=80=81sig=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=E5=8F=AA=E8=AF=B7=E6=B1=82=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collaboration/TheCollaboration.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 5614fa7..836fb79 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -53,17 +53,21 @@ const switchFilterVisible = (index: number) => {
   filterSwitches.value[index] = true;
   if (index === 0) {
     // 筛选仓库
-    repoFilterLoading.value = true;
-    getRepoList()
-      .then((list) => (allRepos.value = list))
-      .finally(() => (repoFilterLoading.value = false));
+    if (!allRepos.value?.length) {
+      repoFilterLoading.value = true;
+      getRepoList()
+        .then((list) => (allRepos.value = list))
+        .finally(() => (repoFilterLoading.value = false));
+    }
   }
   if (index === 2) {
     // 筛选sig
-    sigFilterLoading.value = true;
-    getSigList()
-      .then((list) => (allSigs.value = list))
-      .finally(() => (sigFilterLoading.value = false));
+    if (!allSigs.value?.length) {
+      sigFilterLoading.value = true;
+      getSigList()
+        .then((list) => (allSigs.value = list))
+        .finally(() => (sigFilterLoading.value = false));
+    }
   }
 };
 
-- 
Gitee


From 97887d0fd8028400035e8606b770dbcf09b93f39 Mon Sep 17 00:00:00 2001
From: Erotik <1723168479@qq.com>
Date: Wed, 28 Aug 2024 14:06:30 +0800
Subject: [PATCH 16/17] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=A1=A8=E6=A0=BC=E7=AD=9B=E9=80=89=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: push
---
 src/components/FilterableCheckboxes.vue      | 16 +++++----
 src/views/collaboration/TheCollaboration.vue | 34 ++++++++++++++------
 src/views/todo/ApprovalTable.vue             | 12 +++++--
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/components/FilterableCheckboxes.vue b/src/components/FilterableCheckboxes.vue
index c67eadd..cb31614 100644
--- a/src/components/FilterableCheckboxes.vue
+++ b/src/components/FilterableCheckboxes.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref, watch, type PropType } from 'vue';
-import { useDebounceFn } from '@vueuse/core';
+import { computed, onMounted, onUnmounted, ref, type PropType } from 'vue';
+import { useDebounceFn, useVModel } from '@vueuse/core';
 import { OIcon, OInput, ORadio, ORadioGroup, OScroller } from '@opensig/opendesign';
 
 import IconSearch from '~icons/app/icon-search.svg';
@@ -9,6 +9,10 @@ import IconLoading from '~icons/app/icon-loading.svg';
 type ValueT = string | { label: string; value: string };
 
 const props = defineProps({
+  modelValue: {
+    type: [String, Number],
+    default: '',
+  },
   /** 是否显示搜索 */
   filterable: {
     type: Boolean,
@@ -82,9 +86,7 @@ const onFilterInput = useDebounceFn((search?: string) => {
   searchVal.value = search;
 }, props.filterDebounceTimeout);
 
-const radioVal = ref('');
-
-watch(radioVal, (val) => emit('change', val));
+const radioVal = useVModel(props, 'modelValue', emit);
 </script>
 
 <template>
@@ -101,9 +103,9 @@ watch(radioVal, (val) => emit('change', val));
         <OIcon><IconLoading class="o-rotating" /></OIcon>
       </div>
       <div class="check-all-wrap">
-        <ORadio v-model="radioVal" :value="''">全选</ORadio>
+        <ORadio @change="$emit('change', $event as string)" v-model="radioVal" :value="''">全选</ORadio>
       </div>
-      <ORadioGroup v-model="radioVal" direction="v">
+      <ORadioGroup v-model="radioVal" direction="v" @change="$emit('change', $event as string)">
         <ORadio v-for="item in displayValues" :key="item.value" :value="item.value">{{ item.label }}</ORadio>
       </ORadioGroup>
     </OScroller>
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 836fb79..42924f9 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -82,11 +82,9 @@ const onFilterChange = (type: string, index: number, val: string) => {
   filterSwitches.value = columns.map(() => false);
   currentPage.value = 1;
   if (val) {
-    filterParams[type] = val;
     activeFilterValues.value[index] = val;
     currentActiveFilterIndices.value.add(index);
   } else {
-    filterParams[type] = '';
     activeFilterValues.value[index] = '';
     currentActiveFilterIndices.value.delete(index);
   }
@@ -269,11 +267,7 @@ watch(
                       @click="switchFilterVisible(index)"
                       ><IconFilter
                     /></OIcon>
-                    <OPopover
-                      v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index]"
-                      :target="filterIconRefs[index]"
-                      trigger="hover"
-                    >
+                    <OPopover v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index]" :target="filterIconRefs[index]" trigger="hover">
                       <p class="bubble-content">
                         <span class="title">{{ item.label }}:</span>
                         {{ activeFilterValues[index] }}
@@ -286,19 +280,39 @@ watch(
             <div :ref="(el) => setPopupClickoutSideFn(el, index)">
               <FilterableCheckboxes
                 v-if="item.key === 'repo'"
+                v-model="filterParams[item.key]"
                 :loading="repoFilterLoading"
                 @change="onFilterChange(item.key, index, $event)"
                 :values="allRepos"
               />
               <FilterableCheckboxes
                 v-else-if="item.key === 'sigName'"
+                v-model="filterParams[item.key]"
                 :loading="sigFilterLoading"
                 @change="onFilterChange(item.key, index, $event)"
                 :values="allSigs"
               />
-              <FilterableCheckboxes v-else-if="item.key === 'kind'" @change="onFilterChange(item.key, index, $event)" :filterable="false" :values="kindTypes" />
-              <FilterableCheckboxes v-else-if="item.key === 'status'" @change="onFilterChange(item.key, index, $event)" :values="repoStatusArr" />
-              <FilterableCheckboxes v-else :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="metricTypes(item.key)" />
+              <FilterableCheckboxes
+                v-else-if="item.key === 'kind'"
+                v-model="filterParams[item.key]"
+                @change="onFilterChange(item.key, index, $event)"
+                :filterable="false"
+                :values="kindTypes"
+              />
+              <FilterableCheckboxes
+                v-else-if="item.key === 'status'"
+                :filterable="false"
+                v-model="filterParams[item.key]"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="repoStatusArr"
+              />
+              <FilterableCheckboxes
+                v-else
+                v-model="filterParams[item.key]"
+                :filterable="false"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="metricTypes(item.key)"
+              />
             </div>
           </OPopup>
         </template>
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index f527b99..d843686 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -108,7 +108,6 @@ const activeFilterValues = ref(new Array<string>(props.columns.length));
 const onFilterChange = (type: string, index: number, val: string) => {
   filterSwitches.value = props.columns.map(() => false);
   if (val) {
-    filterParams[type] = val;
     if (type === 'metric') {
       activeFilterValues.value[index] = applyStatusConvert(val);
     } else {
@@ -116,7 +115,6 @@ const onFilterChange = (type: string, index: number, val: string) => {
     }
     currentActiveFilterIndices.value.add(index);
   } else {
-    filterParams[type] = '';
     activeFilterValues.value[index] = '';
     currentActiveFilterIndices.value.delete(index);
   }
@@ -193,14 +191,22 @@ const revoke = () => {
               </th>
             </template>
             <div :ref="(el) => setPopupClickoutSideFn(el, index)">
-              <FilterableCheckboxes v-if="item.key === 'metric'" :filterable="false" @change="onFilterChange(item.key, index, $event)" :values="applyTypes" />
               <FilterableCheckboxes
+                v-model="filterParams[item.key]"
+                v-if="item.key === 'metric'"
+                :filterable="false"
+                @change="onFilterChange(item.key, index, $event)"
+                :values="applyTypes"
+              />
+              <FilterableCheckboxes
+                v-model="filterParams[item.key]"
                 v-else-if="item.key === 'repo'"
                 :loading="repoFilterLoading"
                 @change="onFilterChange(item.key, index, $event)"
                 :values="repoList"
               />
               <FilterableCheckboxes
+                v-model="filterParams[item.key]"
                 v-else-if="item.key === 'applyStatus'"
                 :filterable="false"
                 @change="onFilterChange(item.key, index, $event)"
-- 
Gitee


From 99b50f7021ce8d3129fb69aa234ba6140c3ac5cd Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Wed, 28 Aug 2024 14:18:15 +0800
Subject: [PATCH 17/17] =?UTF-8?q?fix:=20=E6=A3=80=E8=A7=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   4 +-
 src/App.vue                                   |   2 +-
 src/assets/style/category/content/index.scss  |   2 +-
 .../collaboration/FeedbackHistroy.vue         | 111 ++++---
 src/components/collaboration/Indicators.vue   |   4 +-
 .../collaboration/StatusFeedback.vue          |  22 +-
 .../collaboration/TableShowOverflowTips.vue   |  51 +++
 .../feedbackHistory/FeedbackHistory.vue       |   2 +-
 src/components/header/AppHeader.vue           |  11 +-
 src/data/todo/index.ts                        |  14 +
 .../collaboration/CollaborationPermission.vue |   5 +-
 src/views/collaboration/TheCollaboration.vue  | 297 +++++++++---------
 src/views/todo/ApprovalTable.vue              |  26 +-
 src/views/todo/TheTodo.vue                    |  77 ++---
 src/views/todo/TheTodoDetail.vue              |  65 +++-
 src/views/upstream/TheUpstream.vue            |   2 +-
 16 files changed, 416 insertions(+), 279 deletions(-)
 create mode 100644 src/components/collaboration/TableShowOverflowTips.vue

diff --git a/components.d.ts b/components.d.ts
index 1bf75fd..d8e78a0 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -55,8 +55,6 @@ declare module 'vue' {
     SearchRecommend: typeof import('./src/components/search/SearchRecommend.vue')['default']
     SearchTab: typeof import('./src/components/search/SearchTab.vue')['default']
     StatusFeedback: typeof import('./src/components/collaboration/StatusFeedback.vue')['default']
-  }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+    TableShowOverflowTips: typeof import('./src/components/collaboration/TableShowOverflowTips.vue')['default']
   }
 }
diff --git a/src/App.vue b/src/App.vue
index 20e9bf4..ecbacfc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -74,7 +74,7 @@ initSensor();
 
   --layout-screen-height: 100vh;
 
-  --layout-content-min-height: calc(var(--layout-screen-height) - var(--layout-header-height));
+  --layout-content-min-height: calc(var(--layout-screen-height) - var(--layout-header-height) - var(--layout-footer-height));
 
   @include respond-to('<=laptop') {
     --layout-header-max-width: 100%;
diff --git a/src/assets/style/category/content/index.scss b/src/assets/style/category/content/index.scss
index e574df7..5281051 100644
--- a/src/assets/style/category/content/index.scss
+++ b/src/assets/style/category/content/index.scss
@@ -79,7 +79,7 @@
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    margin: 40px 0;
+    margin: 32px 0;
     :deep(.el-input) {
       --el-input-text-color: var(--o-color-info1);
     }
diff --git a/src/components/collaboration/FeedbackHistroy.vue b/src/components/collaboration/FeedbackHistroy.vue
index 418a35a..53061ee 100644
--- a/src/components/collaboration/FeedbackHistroy.vue
+++ b/src/components/collaboration/FeedbackHistroy.vue
@@ -1,11 +1,16 @@
 <script lang="ts" setup>
 import { ref, onMounted, computed, watch } from 'vue';
 import { ODialog, OTable, OTag } from '@opensig/opendesign';
+import { useLocale } from '@/composables/useLocale';
 import { useUserInfoStore } from '@/stores/user';
 import { getMaintainerApply, getAdminApply } from '@/api/api-collaboration';
 import { formatDateTime } from '@/utils/common';
 import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 
+import { ElPagination, ElConfigProvider } from 'element-plus';
+import zhCn from 'element-plus/es/locale/lang/zh-cn';
+import English from 'element-plus/es/locale/lang/en';
+
 import { COUNT_PAGESIZE } from '@/data/query';
 
 const props = defineProps({
@@ -15,6 +20,7 @@ const props = defineProps({
   },
 });
 
+const { isZh } = useLocale();
 const showDlg = ref(true);
 const userInfoStore = useUserInfoStore();
 const isMainPer = computed(() => userInfoStore.platformMaintainerPermission);
@@ -56,17 +62,14 @@ const queryMaintainerApply = () => {
   isLoading.value = true;
   getMaintainerApply(searchParams.value)
     .then((res) => {
-      if (res.data.list.length > 0) {
-        reposData.value = res.data.list;
-        total.value = res.data.total;
-      } else {
-        reposData.value = [];
-      }
+      reposData.value = res.data.list;
+      total.value = res.data.total;
 
       isLoading.value = false;
     })
     .catch(() => {
       reposData.value = [];
+      total.value = 0;
       isLoading.value = false;
     });
 };
@@ -75,17 +78,14 @@ const queryAdminApply = () => {
   isLoading.value = true;
   getAdminApply(searchParams.value)
     .then((res) => {
-      if (res.data.list.length > 0) {
-        reposData.value = res.data.list;
-        total.value = res.data.total;
-      } else {
-        reposData.value = [];
-      }
+      reposData.value = res.data.list;
+      total.value = res.data.total;
 
       isLoading.value = false;
     })
     .catch(() => {
       reposData.value = [];
+      total.value = 0;
       isLoading.value = false;
     });
 };
@@ -131,36 +131,54 @@ watch(
       <p class="title">反馈历史</p>
     </template>
     <div class="feedback-histroy">
-      <OTable :columns="columns" :data="reposData" :loading="isLoading" border="row" :small="true">
-        <template #head="{ columns }">
-          <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
-        </template>
-        <template #td_updateAt="{ row }">
-          {{ formatDateTime(row.updateAt) }}
-        </template>
-        <template #td_metric="{ row }">
-          {{ applicationTypeConvert(row.metric) }}
-        </template>
-        <template #td_metricStatus="{ row }">
-          {{ versionLatestStatusConvert(row.metricStatus) }}
-        </template>
-        <template #td_description="{ row }">
-          <div :title="row.description" class="td-nowrap">{{ row.description }}</div>
-        </template>
-        <template #td_applyIdString="{ row }">
-          <div :title="row.applyIdString" class="td-nowrap">{{ row.applyIdString }}</div>
-        </template>
-        <template #td_comment="{ row }">
-          <div :title="row.comment" class="td-nowrap">{{ row.comment }}</div>
-        </template>
-        <template #td_applyStatus="{ row }">
-          <div class="apply-status">
-            <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatusConvert(row.applyStatus) }} </OTag>
-          </div>
-        </template>
-      </OTable>
+      <div class="histroy-table">
+        <OTable :columns="columns" :data="reposData" :loading="isLoading" border="row" :small="true">
+          <template #head="{ columns }">
+            <th v-for="item in columns" :key="item.type" :class="item.type">{{ item.label }}</th>
+          </template>
+          <template #td_updateAt="{ row }">
+            {{ formatDateTime(row.updateAt, true) }}
+          </template>
+          <template #td_metric="{ row }">
+            {{ applicationTypeConvert(row.metric) }}
+          </template>
+          <template #td_metricStatus="{ row }">
+            {{ versionLatestStatusConvert(row.metricStatus) }}
+          </template>
+          <template #td_administrator="{ row }">
+            {{ row.administrator ?? '-' }}
+          </template>
+          <template #td_description="{ row }">
+            <TableShowOverflowTips v-if="row.description" :content="row.description" :line="1" />
+            <template v-else>-</template>
+          </template>
+          <template #td_applyIdString="{ row }">
+            <TableShowOverflowTips v-if="row.applyIdString" :content="row.applyIdString" :line="1" />
+            <template v-else>-</template>
+          </template>
+          <template #td_comment="{ row }">
+            <TableShowOverflowTips v-if="row.comment" :content="row.comment" :line="1" />
+            <template v-else>-</template>
+          </template>
+          <template #td_applyStatus="{ row }">
+            <div class="apply-status">
+              <OTag v-if="row.applyStatus" :class="row.applyStatus?.toLocaleLowerCase()">{{ applyStatusConvert(row.applyStatus) }} </OTag>
+            </div>
+          </template>
+        </OTable>
+      </div>
       <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
-        <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        <el-config-provider :locale="isZh ? zhCn : English">
+          <el-pagination
+            :current-page="currentPage"
+            background
+            layout="total , prev, pager, next, jumper"
+            :total="total"
+            :page-sizes="COUNT_PAGESIZE"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </el-config-provider>
       </div>
     </div>
   </ODialog>
@@ -168,9 +186,16 @@ watch(
 
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
+.pagination-box {
+  margin-top: 24px;
+  display: flex;
+  justify-content: end;
+}
 .feedback-histroy {
-  border: 1px solid var(--o-color-control4);
-  border-radius: 4px;
+  .histroy-table {
+    border: 1px solid var(--o-color-control4);
+    border-radius: 4px;
+  }
   :deep(.o-table) {
     .o-table-wrap {
       overflow-x: auto;
diff --git a/src/components/collaboration/Indicators.vue b/src/components/collaboration/Indicators.vue
index f560619..9e374e8 100644
--- a/src/components/collaboration/Indicators.vue
+++ b/src/components/collaboration/Indicators.vue
@@ -91,7 +91,7 @@ const data = [
 const applicationTypeDesc: Record<string, string[]> = {
   cveStatus: [],
   issueStatus: ['所有Issue都没有被修复', '一部分Issue被修复了，一部分Issue没有修复', '所有Issue都被修复了'],
-  prStatus: ['-', '有PR提交，且都没有被合入代码仓', '有PR提及，且有PR被合入到代码仓'],
+  prStatus: ['-', '有PR提交，且都没有被合入代码仓', '有PR提交，且有PR被合入到代码仓'],
   versionStatus: ['软件包版本与上游版本一致', '软件包版本比上游版本低'],
   orgStatus: ['参与贡献组织数 > 5人', '参与贡献组织数 <= 5人'],
   contributorStatus: ['参与贡献人数 > 10人', '参与贡献人数 <= 10人'],
@@ -103,8 +103,6 @@ const indicatorsInfo = computed(() => {
   });
 });
 
-console.log('indicatorsInfo', indicatorsInfo.value);
-
 // 单元格合并
 const cellSpanFn = (rowIdx: number, colIdx: number) => {
   if (rowIdx === 0 && colIdx === 0) {
diff --git a/src/components/collaboration/StatusFeedback.vue b/src/components/collaboration/StatusFeedback.vue
index 6d9958b..a3692a9 100644
--- a/src/components/collaboration/StatusFeedback.vue
+++ b/src/components/collaboration/StatusFeedback.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { ref, reactive, computed } from 'vue';
 import { ODialog, OButton, OForm, OTextarea, OFormItem, ORadioGroup, ORadio, OSelect, OOption, type FieldResultT, useMessage } from '@opensig/opendesign';
-
+import { applicationTypeCurrent } from '@/data/todo';
 import { getApplyFeedback } from '@/api/api-collaboration';
 
 const props = defineProps({
@@ -14,19 +14,6 @@ const props = defineProps({
 const showDlg = ref(true);
 const message = useMessage();
 
-const applicationType = [
-  {
-    id: 'cveStatus',
-    label: 'CVE状态',
-    children: ['有CVE且全部未修复', '有CVE部分修复', '有CVE且全部修复', '没有CVE问题'],
-  },
-  {
-    id: 'versionStatus',
-    label: '软件包版本状态',
-    children: ['版本正常', '落后版本'],
-  },
-];
-
 const formRef = ref<InstanceType<typeof OForm>>();
 const formData = reactive({
   repo: props.repo,
@@ -43,10 +30,10 @@ const emits = defineEmits<{
 const metricIndex = ref(-1);
 const onChangeRadio = (v: string) => {
   formData.metricStatus = '';
-  metricIndex.value = applicationType.findIndex((item) => item.id === v);
+  metricIndex.value = applicationTypeCurrent.findIndex((item) => item.id === v);
 };
 // 根据状态获取
-const metricCategory = computed(() => (metricIndex.value === -1 ? [] : applicationType[metricIndex.value].children));
+const metricCategory = computed(() => (metricIndex.value === -1 ? [] : applicationTypeCurrent[metricIndex.value].children));
 
 // 重置表单数据
 const reset = () => {
@@ -129,7 +116,7 @@ const onSubmit = (results: FieldResultT[]) => {
       <OForm ref="formRef" has-required :model="formData" label-width="220px" label-align="top" @submit="onSubmit">
         <OFormItem label="请选择您要修改的状态类别" required field="metric" :rules="metricRules">
           <ORadioGroup class="metric-options" v-model="formData.metric" direction="v" @change="(v) => onChangeRadio(v)">
-            <ORadio v-for="option in applicationType" :key="option.label" :value="option.id">
+            <ORadio v-for="option in applicationTypeCurrent" :key="option.label" :value="option.id">
               {{ option.label }}
             </ORadio>
           </ORadioGroup>
@@ -146,6 +133,7 @@ const onSubmit = (results: FieldResultT[]) => {
             placeholder="请输入您的理由"
             resize="none"
             :rows="4"
+            :clearable="false"
             :input-on-outlimit="false"
             style="width: 100%"
           >
diff --git a/src/components/collaboration/TableShowOverflowTips.vue b/src/components/collaboration/TableShowOverflowTips.vue
new file mode 100644
index 0000000..b156561
--- /dev/null
+++ b/src/components/collaboration/TableShowOverflowTips.vue
@@ -0,0 +1,51 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { OPopover } from '@opensig/opendesign';
+const props = defineProps({
+  content: {
+    type: String,
+    default: () => {
+      return '';
+    },
+  },
+  line: {
+    type: Number,
+    default: () => {
+      return 2;
+    },
+  },
+});
+
+const contentLen = computed(() => props.content.length > props.line * 11);
+</script>
+
+<template>
+  <OPopover v-if="contentLen" position="top" trigger="hover">
+    <template #target>
+      <div class="line-clamp">{{ content }}</div>
+    </template>
+    <div class="box">
+      {{ content }}
+    </div>
+  </OPopover>
+  <template v-else>{{ content }} </template>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  max-width: 184px;
+  max-height: 154px;
+  color: var(--o-color-info1);
+  overflow: hidden auto;
+  @include scrollbar;
+  @include tip1;
+}
+.line-clamp {
+  display: -webkit-box;
+  overflow: hidden;
+  -webkit-line-clamp: v-bind(line);
+  -webkit-box-orient: vertical;
+  position: relative;
+  word-break: break-all;
+}
+</style>
diff --git a/src/components/feedbackHistory/FeedbackHistory.vue b/src/components/feedbackHistory/FeedbackHistory.vue
index 8a28362..33c6068 100644
--- a/src/components/feedbackHistory/FeedbackHistory.vue
+++ b/src/components/feedbackHistory/FeedbackHistory.vue
@@ -159,7 +159,7 @@ const handleCurrentChange = (page: number) => {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  margin: 40px 0;
+  margin: 24px 0;
   :deep(.el-input) {
     --el-input-text-color: var(--o-color-info1);
   }
diff --git a/src/components/header/AppHeader.vue b/src/components/header/AppHeader.vue
index 93e5dc6..1d7717b 100644
--- a/src/components/header/AppHeader.vue
+++ b/src/components/header/AppHeader.vue
@@ -74,8 +74,8 @@ const jump = (href: string) => {
             <img :src="isDark ? openeulerLogoDark : openeulerLogo" />
           </a>
           <ODivider direction="v" :darker="true" />
-          <span v-if="isCollaboration" class="logo-text">{{ t('software.softwareHome') }}协作平台</span>
-          <span v-else @click="goHome" class="logo-text">{{ t('software.softwareHome') }}</span>
+          <span @click="goHome" class="logo-text">{{ t('software.softwareHome') }}</span>
+          <span v-if="isCollaboration" class="collaboration-text">协作平台</span>
         </div>
         <HeaderNav v-if="route.name" :options="isCollaboration ? collaborationNav : navs" />
       </div>
@@ -117,6 +117,13 @@ const jump = (href: string) => {
       cursor: pointer;
       @include h4;
     }
+    .collaboration-text {
+      color: var(--o-color-info1);
+      font-weight: bold;
+      margin-left: 48px;
+      cursor: default;
+      @include h4;
+    }
     .header-left,
     .header-right {
       height: 100%;
diff --git a/src/data/todo/index.ts b/src/data/todo/index.ts
index cf6ffdb..18f18d9 100644
--- a/src/data/todo/index.ts
+++ b/src/data/todo/index.ts
@@ -76,6 +76,20 @@ export const applicationType = [
     children: ['贡献人员多', '贡献人员少'],
   },
 ];
+// 能申请的类型
+export const applicationTypeCurrent = [
+  {
+    id: 'cveStatus',
+    label: 'CVE状态',
+    children: ['有CVE且全部未修复', '有CVE部分修复', '有CVE且全部修复', '没有CVE问题'],
+  },
+  {
+    id: 'versionStatus',
+    label: '软件包版本状态',
+    children: ['版本正常', '落后版本'],
+  },
+];
+
 
 export const kindTypes = ['everything-exclude-baseos', 'epol', 'baseos']
 
diff --git a/src/views/collaboration/CollaborationPermission.vue b/src/views/collaboration/CollaborationPermission.vue
index 7ac9555..9213641 100644
--- a/src/views/collaboration/CollaborationPermission.vue
+++ b/src/views/collaboration/CollaborationPermission.vue
@@ -23,12 +23,11 @@ const jumpAccount = () => {
     <Result404>
       <template #description>
         <template v-if="isGiteeAccount && (!isAdminPer || !isMaintainerPer)">
-          <div class="content">无权限访问协作平台</div>
+          <div class="content">您无权限访问协作平台</div>
         </template>
         <template v-else>
           <div class="content">
-            <p>如果您是Maintainer</p>
-            <p>想要获取相关信息，请先前往个人中心-账号绑定 绑定您的Gitee账号</p>
+            <p>如果您是Maintainer,请先前往个人中心-账号绑定 绑定您的Gitee账号, 以获取软件包维护详情信息</p>
           </div>
           <OButton variant="solid" size="large" color="primary" @click="jumpAccount">前往绑定</OButton>
         </template>
diff --git a/src/views/collaboration/TheCollaboration.vue b/src/views/collaboration/TheCollaboration.vue
index 42924f9..3aca613 100644
--- a/src/views/collaboration/TheCollaboration.vue
+++ b/src/views/collaboration/TheCollaboration.vue
@@ -7,6 +7,7 @@ import ExternalLink from '@/components/ExternalLink.vue';
 import Indicators from '@/components/collaboration/Indicators.vue';
 import StatusFeedback from '@/components/collaboration/StatusFeedback.vue';
 import Result404 from '@/components/Result404.vue';
+import { COUNT_PAGESIZE } from '@/data/query';
 
 import IconOutlink from '~icons/pkg/icon-outlink.svg';
 import IconState from '~icons/pkg/icon-state.svg';
@@ -233,158 +234,162 @@ watch(
       <h1>软件维护详情</h1>
     </ContentWrapper>
   </div>
-  <ContentWrapper vertical-padding="24px" class="collaboration-wrap">
+  <ContentWrapper :vertical-padding="['24px', '72px']" class="collaboration-wrap">
     <AppLoading :loading="isLoading" />
-
-    <div class="indicators">
-      <span @click="showDlg = true" class="text"
-        ><OIcon><IconState /></OIcon>状态指标说明</span
-      >
-      <Indicators v-if="showDlg" @change="showDlg = false" />
-    </div>
-    <div class="platform-main">
-      <OTable :columns="columns" :data="reposData" :loading="loading" border="row" :class="{ admin: isAdminPer }">
-        <template #head="{ columns }">
-          <OPopup
-            trigger="none"
-            style="--popup-radius: 4px"
-            v-for="(item, index) in columns"
-            :key="item.type"
-            :visible="filterSwitches[index]"
-            :unmount-on-hide="false"
-            :offset="-8"
-            position="bl"
-          >
-            <template #target>
-              <th :class="item.type">
-                <div class="header-cell">
-                  {{ item.label }}
-                  <template v-if="item.key !== 'operation'">
-                    <OIcon
-                      :ref="(el) => (filterIconRefs[index] = el as ComponentPublicInstance)"
-                      class="filter-icon"
-                      :style="currentActiveFilterIndices.has(index) ? { color: 'var(--o-color-primary1)' } : {}"
-                      @click="switchFilterVisible(index)"
-                      ><IconFilter
-                    /></OIcon>
-                    <OPopover v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index]" :target="filterIconRefs[index]" trigger="hover">
-                      <p class="bubble-content">
-                        <span class="title">{{ item.label }}:</span>
-                        {{ activeFilterValues[index] }}
-                      </p>
-                    </OPopover>
-                  </template>
-                </div>
-              </th>
-            </template>
-            <div :ref="(el) => setPopupClickoutSideFn(el, index)">
-              <FilterableCheckboxes
-                v-if="item.key === 'repo'"
-                v-model="filterParams[item.key]"
-                :loading="repoFilterLoading"
-                @change="onFilterChange(item.key, index, $event)"
-                :values="allRepos"
-              />
-              <FilterableCheckboxes
-                v-else-if="item.key === 'sigName'"
-                v-model="filterParams[item.key]"
-                :loading="sigFilterLoading"
-                @change="onFilterChange(item.key, index, $event)"
-                :values="allSigs"
-              />
-              <FilterableCheckboxes
-                v-else-if="item.key === 'kind'"
-                v-model="filterParams[item.key]"
-                @change="onFilterChange(item.key, index, $event)"
-                :filterable="false"
-                :values="kindTypes"
-              />
-              <FilterableCheckboxes
-                v-else-if="item.key === 'status'"
-                :filterable="false"
-                v-model="filterParams[item.key]"
-                @change="onFilterChange(item.key, index, $event)"
-                :values="repoStatusArr"
-              />
-              <FilterableCheckboxes
-                v-else
-                v-model="filterParams[item.key]"
-                :filterable="false"
-                @change="onFilterChange(item.key, index, $event)"
-                :values="metricTypes(item.key)"
-              />
+    <template v-if="!isLoading">
+      <div class="indicators">
+        <span @click="showDlg = true" class="text"
+          ><OIcon><IconState /></OIcon>状态指标说明</span
+        >
+        <Indicators v-if="showDlg" @change="showDlg = false" />
+      </div>
+      <div class="platform-main">
+        <OTable :columns="columns" :data="reposData" :loading="loading" border="row" :class="{ admin: isAdminPer }">
+          <template #head="{ columns }">
+            <OPopup
+              trigger="none"
+              style="--popup-radius: 4px"
+              v-for="(item, index) in columns"
+              :key="item.type"
+              :visible="filterSwitches[index]"
+              :unmount-on-hide="false"
+              :offset="-8"
+              position="bl"
+            >
+              <template #target>
+                <th :class="item.type">
+                  <div class="header-cell">
+                    {{ item.label }}
+                    <template v-if="item.key !== 'operation'">
+                      <OIcon
+                        :ref="(el) => (filterIconRefs[index] = el as ComponentPublicInstance)"
+                        class="filter-icon"
+                        :style="currentActiveFilterIndices.has(index) ? { color: 'var(--o-color-primary1)' } : {}"
+                        @click="switchFilterVisible(index)"
+                        ><IconFilter
+                      /></OIcon>
+                      <OPopover v-if="currentActiveFilterIndices.has(index) && activeFilterValues[index]" :target="filterIconRefs[index]" trigger="hover">
+                        <p class="bubble-content">
+                          <span class="title">{{ item.label }}:</span>
+                          {{ activeFilterValues[index] }}
+                        </p>
+                      </OPopover>
+                    </template>
+                  </div>
+                </th>
+              </template>
+              <div :ref="(el) => setPopupClickoutSideFn(el, index)">
+                <FilterableCheckboxes
+                  v-if="item.key === 'repo'"
+                  v-model="filterParams[item.key]"
+                  :loading="repoFilterLoading"
+                  @change="onFilterChange(item.key, index, $event)"
+                  :values="allRepos"
+                />
+                <FilterableCheckboxes
+                  v-else-if="item.key === 'sigName'"
+                  v-model="filterParams[item.key]"
+                  :loading="sigFilterLoading"
+                  @change="onFilterChange(item.key, index, $event)"
+                  :values="allSigs"
+                />
+                <FilterableCheckboxes
+                  v-else-if="item.key === 'kind'"
+                  v-model="filterParams[item.key]"
+                  @change="onFilterChange(item.key, index, $event)"
+                  :filterable="false"
+                  :values="kindTypes"
+                />
+                <FilterableCheckboxes
+                  v-else-if="item.key === 'status'"
+                  :filterable="false"
+                  v-model="filterParams[item.key]"
+                  @change="onFilterChange(item.key, index, $event)"
+                  :values="repoStatusArr"
+                />
+                <FilterableCheckboxes
+                  v-else
+                  v-model="filterParams[item.key]"
+                  :filterable="false"
+                  @change="onFilterChange(item.key, index, $event)"
+                  :values="metricTypes(item.key)"
+                />
+              </div>
+            </OPopup>
+          </template>
+          <template #td_repo="{ row }">
+            <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}`)"
+              ><span class="text">{{ row.repo }} </span><OIcon><IconOutlink /></OIcon
+            ></OLink>
+          </template>
+          <template #td_issueStatus="{ row }">
+            <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/issues`)"
+              ><span class="text">{{ row.issueStatus }}</span> <OIcon><IconOutlink /></OIcon
+            ></OLink>
+          </template>
+          <template #td_prStatus="{ row }">
+            <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/pulls`)"
+              ><span class="text">{{ row.prStatus }}</span> <OIcon><IconOutlink /></OIcon
+            ></OLink>
+          </template>
+          <template #td_cveStatus="{ row }">
+            <OLink
+              color="primary"
+              class="link-external"
+              hover-underline
+              @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/issues?single_label_id=85497765`)"
+            >
+              <span class="text">{{ row.cveStatus }}</span> <OIcon><IconOutlink /></OIcon
+            ></OLink>
+          </template>
+          <template #td_status="{ row }">
+            <div class="repo-status">
+              <OTag :class="`type${repoStatusIndex(row.status)}`">{{ row.status }} </OTag>
+            </div>
+          </template>
+          <template #td_versionStatus="{ row }">
+            {{ versionLatestStatusConvert(row.versionStatus) }}
+          </template>
+
+          <template #td_operation="{ row }">
+            <div class="operation-box">
+              <OLink v-if="isMainPer" color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
+              <OLink color="primary" hover-underline @click="changeFeedbackHistory(row.repo)">反馈历史</OLink>
             </div>
-          </OPopup>
-        </template>
-        <template #td_repo="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}`)"
-            ><span class="text">{{ row.repo }} </span><OIcon><IconOutlink /></OIcon
-          ></OLink>
-        </template>
-        <template #td_issueStatus="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/issues`)"
-            ><span class="text">{{ row.issueStatus }}</span> <OIcon><IconOutlink /></OIcon
-          ></OLink>
-        </template>
-        <template #td_prStatus="{ row }">
-          <OLink color="primary" class="link-external" hover-underline @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/pulls`)"
-            ><span class="text">{{ row.prStatus }}</span> <OIcon><IconOutlink /></OIcon
-          ></OLink>
-        </template>
-        <template #td_cveStatus="{ row }">
-          <OLink
-            color="primary"
-            class="link-external"
-            hover-underline
-            @click="changeExternalDialog(`${SRCOPENEULER + row.repo}/issues?single_label_id=85497765`)"
-          >
-            <span class="text">{{ row.cveStatus }}</span> <OIcon><IconOutlink /></OIcon
-          ></OLink>
-        </template>
-        <template #td_status="{ row }">
-          <div class="repo-status">
-            <OTag :class="`type${repoStatusIndex(row.status)}`">{{ row.status }} </OTag>
-          </div>
-        </template>
-        <template #td_versionStatus="{ row }">
-          {{ versionLatestStatusConvert(row.versionStatus) }}
-        </template>
-
-        <template #td_operation="{ row }">
-          <div class="operation-box">
-            <OLink v-if="isMainPer" color="primary" hover-underline @click="changeFeedback(row.repo)">状态反馈</OLink>
-            <OLink color="primary" hover-underline @click="changeFeedbackHistory(row.repo)">反馈历史</OLink>
-          </div>
-        </template>
-      </OTable>
-
-      <div class="pagination-box">
-        <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          </template>
+        </OTable>
+
+        <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+          <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
       </div>
-    </div>
-    <!-- 暂无记录 -->
-    <template v-if="isError">
-      <Result404>
-        <template #description>
-          <p class="text404">暂无记录</p>
-        </template>
-      </Result404>
+      <!-- 暂无记录 -->
+      <template v-if="isError">
+        <Result404>
+          <template #description>
+            <p class="text404">暂无记录</p>
+          </template>
+        </Result404>
+      </template>
+
+      <!-- 跳转外部链接提示 -->
+      <ExternalLink v-if="showExternalDlg" :href="externalLink" @change="showExternalDlg = false" />
+      <!-- 状态反馈 -->
+
+      <StatusFeedback :repo="repoValue" v-if="showFeedbackDlg" @close="showFeedbackDlg = false" />
+
+      <!-- 反馈历史 -->
+      <FeedbackHistroy v-if="showFeedbacHistroykDlg" :repo="repoValue" @close="showFeedbacHistroykDlg = false" />
     </template>
-
-    <!-- 跳转外部链接提示 -->
-    <ExternalLink v-if="showExternalDlg" :href="externalLink" @change="showExternalDlg = false" />
-    <!-- 状态反馈 -->
-
-    <StatusFeedback :repo="repoValue" v-if="showFeedbackDlg" @close="showFeedbackDlg = false" />
-
-    <!-- 反馈历史 -->
-    <FeedbackHistroy v-if="showFeedbacHistroykDlg" :repo="repoValue" @close="showFeedbacHistroykDlg = false" />
   </ContentWrapper>
 </template>
 
 <style scoped lang="scss">
 @import '@/assets/style/category/collaboration/index.scss';
-
+.collaboration-wrap {
+  position: relative;
+  min-height: calc(var(--layout-content-min-height) - 154px);
+}
 .header-cell {
   position: relative;
   display: flex;
@@ -480,7 +485,7 @@ watch(
         &:first-child {
           left: 0;
           &::before {
-            right: 0;
+            right: -9px;
             transform: scaleX(-1);
             @include liner;
           }
@@ -516,7 +521,7 @@ watch(
       &:first-child {
         left: 0;
         &::before {
-          right: 0;
+          right: -7px;
           transform: scaleX(-1);
           @include liner;
         }
@@ -562,7 +567,7 @@ watch(
 }
 
 .pagination-box {
-  margin-top: 24px;
+  margin-top: 32px;
   display: flex;
   justify-content: end;
 }
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index d843686..5894c6e 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -4,7 +4,7 @@ import { OTable, OLink, OTag, ODialog, OButton, OPopup, OIcon, OPopover } from '
 import { useLocale } from '@/composables/useLocale';
 import { formatDateTime } from '@/utils/common';
 import { useRouter, useRoute } from 'vue-router';
-import { applicationType, applyStatusType } from '@/data/todo';
+import { applicationTypeCurrent, applyStatusType } from '@/data/todo';
 import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 import { useUserInfoStore } from '@/stores/user';
 import { onClickOutside } from '@vueuse/core';
@@ -75,7 +75,7 @@ const filterParams = reactive(
 watch(filterParams, (params) => emits('queryData', params));
 
 const filterableColSet = computed(() => new Set(props.filterableColumns));
-const applyTypes = applicationType.map((item) => ({ label: item.label, value: item.id }));
+const applyTypes = applicationTypeCurrent.map((item) => ({ label: item.label, value: item.id }));
 
 const filterIconRefs = ref(new Array<ComponentPublicInstance>(props.columns.length));
 
@@ -217,7 +217,7 @@ const revoke = () => {
         </template>
       </template>
       <template #td_updateAt="{ row }">
-        {{ formatDateTime(row.updateAt) }}
+        {{ formatDateTime(row.updateAt, true) }}
       </template>
       <template #td_metric="{ row }">
         {{ applicationTypeConvert(row.metric) }}
@@ -226,10 +226,14 @@ const revoke = () => {
         {{ versionLatestStatusConvert(row.metricStatus) }}
       </template>
       <template #td_comment="{ row }">
-        <div class="line-clamp">{{ row.comment }}</div>
+        <TableShowOverflowTips v-if="row.comment" :content="row.comment" />
+        <template v-else>-</template>
+      </template>
+      <template #td_administrator="{ row }">
+        {{ row.administrator ?? '-' }}
       </template>
       <template #td_description="{ row }">
-        <div class="line-clamp">{{ row.description }}</div>
+        <TableShowOverflowTips v-if="row.description" :content="row.description" />
       </template>
 
       <template #td_applyStatus="{ row }">
@@ -297,14 +301,6 @@ const revoke = () => {
     margin-left: 24px;
   }
 }
-.line-clamp {
-  display: -webkit-box;
-  overflow: hidden;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  position: relative;
-  word-break: break-all;
-}
 
 :deep(.o-table) {
   .td-break {
@@ -330,7 +326,7 @@ thead {
   .metric,
   .metricStatus,
   .description {
-    width: 150px;
+    width: 140px;
   }
   .applyStatus {
     width: 130px;
@@ -348,7 +344,7 @@ thead {
     width: 180px;
   }
   .updateAt {
-    width: 130px;
+    width: 178px;
   }
   .operation {
     width: 220px;
diff --git a/src/views/todo/TheTodo.vue b/src/views/todo/TheTodo.vue
index 29fcdf5..811b380 100644
--- a/src/views/todo/TheTodo.vue
+++ b/src/views/todo/TheTodo.vue
@@ -212,46 +212,52 @@ onMounted(() => {
     <AppLoading :loading="isLoading" />
     <!-- 我的申请 -->
     <div v-if="activeName === 'application' && !isError" class="application">
-      <ApprovalTable
-        :columns="applicationColumns"
-        @queryData="queryMyApplication"
-        :filterable-columns="['repo', 'metric', 'applyStatus']"
-        :type="activeName"
-        :data="applicationData"
-        :loading="isLoading"
-        @revoke="revokeApplication"
-      />
-      <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
-        <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-      </div>
-    </div>
-    <!-- 判断admin权限 -->
-    <template v-if="isAdminPermission">
-      <div v-if="activeName === 'approval' && !isError" class="approval">
+      <template v-if="!isLoading">
         <ApprovalTable
-          :columns="approvalColumns"
-          @queryData="queryApprovalApply"
-          :filterable-columns="['repo', 'metric']"
+          :columns="applicationColumns"
+          @queryData="queryMyApplication"
+          :filterable-columns="['repo', 'metric', 'applyStatus']"
           :type="activeName"
-          :data="approvalData"
+          :data="applicationData"
           :loading="isLoading"
+          @revoke="revokeApplication"
         />
         <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
           <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
+      </template>
+    </div>
+    <!-- 判断admin权限 -->
+    <template v-if="isAdminPermission">
+      <div v-if="activeName === 'approval' && !isError" class="approval">
+        <template v-if="!isLoading">
+          <ApprovalTable
+            :columns="approvalColumns"
+            @queryData="queryApprovalApply"
+            :filterable-columns="['repo', 'metric']"
+            :type="activeName"
+            :data="approvalData"
+            :loading="isLoading"
+          />
+          <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+            <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          </div>
+        </template>
       </div>
       <div v-if="activeName === 'approved' && !isError" class="approved">
-        <ApprovalTable
-          :columns="approvalHistoryColumns"
-          @queryData="queryApprovedApply"
-          :filterable-columns="['repo', 'metric']"
-          :type="activeName"
-          :data="approvedData"
-          :loading="isLoading"
-        />
-        <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
-          <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-        </div>
+        <template v-if="!isLoading">
+          <ApprovalTable
+            :columns="approvalHistoryColumns"
+            @queryData="queryApprovedApply"
+            :filterable-columns="['repo', 'metric']"
+            :type="activeName"
+            :data="approvedData"
+            :loading="isLoading"
+          />
+          <div v-if="total > COUNT_PAGESIZE[0]" class="pagination-box">
+            <AppPagination :current="currentPage" :pagesize="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          </div>
+        </template>
       </div>
     </template>
 
@@ -268,7 +274,7 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .pagination-box {
-  margin-top: 24px;
+  margin-top: 32px;
   display: flex;
   justify-content: end;
 }
@@ -297,16 +303,15 @@ onMounted(() => {
 .todo-content {
   position: relative;
   min-height: calc(var(--layout-content-min-height) - 200px);
-  margin: 24px auto;
+  margin: 0 auto;
   max-width: var(--layout-content-max-width);
-  padding-left: var(--layout-content-padding);
-  padding-right: var(--layout-content-padding);
+  padding: 24px var(--layout-content-padding) 72px;
 }
 .approval,
 .approved {
   :deep(thead) {
     .operation {
-      width: 112px;
+      width: 115px;
     }
   }
 }
diff --git a/src/views/todo/TheTodoDetail.vue b/src/views/todo/TheTodoDetail.vue
index d9fd723..7c922c1 100644
--- a/src/views/todo/TheTodoDetail.vue
+++ b/src/views/todo/TheTodoDetail.vue
@@ -1,17 +1,24 @@
 <script lang="ts" setup>
 import { ref, onMounted, computed, reactive } from 'vue';
-import { OButton, OTag, OForm, OTextarea, OFormItem, useMessage, type FieldResultT } from '@opensig/opendesign';
-import { useRoute } from 'vue-router';
+import { OButton, OTag, OForm, OTextarea, OFormItem, useMessage, type FieldResultT, ODialog, OBreadcrumb, OBreadcrumbItem } from '@opensig/opendesign';
+import { useRoute, useRouter } from 'vue-router';
 import { getAdminApply, getMaintainerApply, getAdminProcess } from '@/api/api-collaboration';
 import { applicationTypeConvert, applyStatusConvert, versionLatestStatusConvert } from '@/utils/collaboration';
 import { formatDateTime } from '@/utils/common';
 import { useUserInfoStore } from '@/stores/user';
+import { useLocale } from '@/composables/useLocale';
+import { useI18n } from 'vue-i18n';
 
 const route = useRoute();
+const router = useRouter();
 const message = useMessage();
+const { locale } = useLocale();
+const { t } = useI18n();
+
 const userInfoStore = useUserInfoStore();
 const isAdminPer = computed(() => userInfoStore.platformAdminPermission);
 const isMaintainerPer = computed(() => userInfoStore.platformMaintainerPermission);
+
 const isLoading = ref(true);
 const isError = ref(false);
 
@@ -92,7 +99,7 @@ const rejected = async () => {
   formData.applyStatus = 'REJECTED';
   queryAdminProcess();
 };
-
+// 审批
 const queryAdminProcess = () => {
   getAdminProcess(formData)
     .then((res) => {
@@ -113,6 +120,21 @@ const queryAdminProcess = () => {
 };
 
 // --------------------审批结束------------------------
+const showDlg = ref(false);
+const showHref = ref('');
+const jump = (path: string) => {
+  if (formData.comment.trim().length > 0) {
+    showDlg.value = true;
+    showHref.value = path;
+  } else {
+    router.push(path);
+  }
+};
+
+const confirmExit = () => {
+  showDlg.value = false;
+  router.push(showHref.value);
+};
 
 onMounted(() => {
   type.value = route.params.type;
@@ -125,9 +147,13 @@ onMounted(() => {
 </script>
 
 <template>
-  <ContentWrapper verticalPadding="32px">
+  <ContentWrapper :verticalPadding="['32px', '72px']">
     <AppLoading :loading="isLoading" />
-    <CBreadcrumb :type="type" :repo="todoData?.repo" />
+    <OBreadcrumb class="app-breadcrumb">
+      <OBreadcrumbItem @click="jump(`/${locale}/todo/application`)">待办中心</OBreadcrumbItem>
+      <OBreadcrumbItem @click="jump(`/${locale}/todo/${type}`)">{{ t(`collaboration.${type}`) }}</OBreadcrumbItem>
+      <OBreadcrumbItem>{{ todoData?.repo }} </OBreadcrumbItem>
+    </OBreadcrumb>
     <div v-if="todoData" class="todo-detail">
       <div class="title">
         <h2>{{ todoData.repo }}</h2>
@@ -135,7 +161,6 @@ onMounted(() => {
           <OTag :class="todoData.applyStatus.toLocaleLowerCase()">{{ applyStatusConvert(todoData.applyStatus) }} </OTag>
         </div>
       </div>
-
       <h3 class="caption">基本信息</h3>
       <OForm label-width="92px" label-align="top">
         <OFormItem label="申请单号：">
@@ -170,6 +195,7 @@ onMounted(() => {
               :max-length="1000"
               placeholder="请输入审批意见"
               resize="none"
+              :clearable="false"
               :rows="4"
               :input-on-outlimit="false"
               style="width: 480px"
@@ -182,17 +208,42 @@ onMounted(() => {
         </OForm>
       </template>
     </div>
+
+    <!--退出弹窗 -->
+    <ODialog v-model:visible="showDlg" :unmount-on-hide="true" :mask="true" size="small">
+      <template #header>
+        <p class="title">确认退出</p>
+      </template>
+      <p class="revoke-text">退出后输入内容将会丢失，确认是否退出？</p>
+      <template #footer>
+        <div class="dlg-action">
+          <OButton variant="solid" size="large" color="primary" class="upload" @click="confirmExit">确认</OButton>
+          <OButton variant="outline" size="large" color="primary" class="upload" @click="showDlg = false">取消</OButton>
+        </div>
+      </template>
+    </ODialog>
   </ContentWrapper>
 </template>
 
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
+.revoke-text {
+  text-align: center;
+}
+.dlg-action {
+  display: flex;
+  justify-content: center;
+  .o-btn + .o-btn {
+    margin-left: 16px;
+  }
+}
+
 .todo-detail {
   padding: 32px 40px;
   background: var(--o-color-fill2);
   box-shadow: var(--o-shadow-1);
   margin: 24px 0 0;
-  min-height: calc(var(--layout-content-min-height) - 24px);
+  min-height: calc(var(--layout-content-min-height) - 154px);
   .title {
     display: flex;
     align-items: center;
diff --git a/src/views/upstream/TheUpstream.vue b/src/views/upstream/TheUpstream.vue
index 5b1d15b..b6d3b33 100644
--- a/src/views/upstream/TheUpstream.vue
+++ b/src/views/upstream/TheUpstream.vue
@@ -39,6 +39,6 @@ const bannerInfo = {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  margin: 40px 0;
+  margin: 32px 0;
 }
 </style>
-- 
Gitee