@opendesign-plus-test/components 0.0.1-rc.20 → 0.0.1-rc.22

package/src/components/activity/data.ts

@@ -0,0 +1,365 @@
+// 活动审批列表
+export const approveListRes = {
+  'total': 9,
+  'page': '1',
+  'size': 10,
+  'data': [
+    {
+      'id': 84,
+      'title': 'TEST',
+      'start_date': '2025-12-17',
+      'end_date': '2025-12-19',
+      'activity_type': 2,
+      'synopsis': '',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-17T10:38:45.555722',
+      'is_delete': 0,
+      'address': '',
+      'sponsor': 'hid_2o--qyykhbvm5as',
+      'start': '10:42',
+      'end': '13:00',
+      'register_url': 'https://ascend.test.osinfra.cn/',
+      'content_url': 'https://ascend.test.osinfra.cn/',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-17 00:00',
+    },
+    {
+      'id': 83,
+      'title': '广州活动1',
+      'start_date': '2025-12-18',
+      'end_date': '2025-12-18',
+      'activity_type': 1,
+      'synopsis': '',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-17T09:46:46.285323',
+      'is_delete': 0,
+      'address': '广州',
+      'sponsor': 'hid_yjn7z1w59d8rln9',
+      'start': '09:00',
+      'end': '21:00',
+      'register_url': 'https://www.openeuler.org/zh/compatibility/',
+      'content_url': 'https://www.openeuler.org/zh/compatibility/',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-18 00:00',
+    },
+    {
+      'id': 69,
+      'title': '活动名称实验',
+      'start_date': '2025-12-19',
+      'end_date': '2025-12-21',
+      'activity_type': 2,
+      'synopsis': '',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-16T15:33:26.344198',
+      'is_delete': 0,
+      'address': '',
+      'sponsor': 'hid_yjn7z1w59d8rln9',
+      'start': '09:00',
+      'end': '21:00',
+      'register_url': 'https://www.openeuler.org/zh/projects/',
+      'content_url': 'https://www.openeuler.org/zh/projects/',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-17 00:00',
+    },
+    {
+      'id': 51,
+      'title': '123',
+      'start_date': '2025-12-19',
+      'end_date': '2025-12-20',
+      'activity_type': 1,
+      'synopsis': '',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-15T19:20:17.205518',
+      'is_delete': 0,
+      'address': 'test',
+      'sponsor': 'hid_2o--qyykhbvm5as',
+      'start': '08:00',
+      'end': '18:00',
+      'register_url': 'https://cann-website.ascend.test.osinfra.cn/cann/my/approval',
+      'content_url': 'https://cann-website.ascend.test.osinfra.cn/cann/my/approval',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-16 00:00',
+    },
+    {
+      'id': 50,
+      'title': '123',
+      'start_date': '2025-12-20',
+      'end_date': '2025-12-20',
+      'activity_type': 2,
+      'synopsis': '',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-15T19:10:39.170137',
+      'is_delete': 0,
+      'address': '',
+      'sponsor': 'hid_2o--qyykhbvm5as',
+      'start': '08:00',
+      'end': '18:00',
+      'register_url': 'https://element-plus.org/zh-CN/component/datetime-picker',
+      'content_url': 'https://element-plus.org/zh-CN/component/datetime-picker',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-18 00:00',
+    },
+    {
+      'id': 32,
+      'title': 'test2',
+      'start_date': '2025-12-12',
+      'end_date': '2025-12-16',
+      'activity_type': 2,
+      'synopsis': 'test2',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-12T17:31:24.304618',
+      'is_delete': 0,
+      'address': '',
+      'sponsor': 'hid_u18tcgmw-eue4fq',
+      'start': '18:30',
+      'end': '17:30',
+      'register_url': 'https://cann-website.ascend.test.osinfra.cn/cann/my/create-activity',
+      'content_url': 'https://cann-website.ascend.test.osinfra.cn/cann/my/create-activity',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-13 00:00',
+    },
+    {
+      'id': 31,
+      'title': 'test',
+      'start_date': '2025-12-13',
+      'end_date': '2025-12-16',
+      'activity_type': 2,
+      'synopsis': 'test',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-12T17:24:28.092587',
+      'is_delete': 0,
+      'address': '',
+      'sponsor': 'hid_u18tcgmw-eue4fq',
+      'start': '12:00',
+      'end': '08:00',
+      'register_url': 'https://huawei.com',
+      'content_url': 'https://baidu.com',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-12 00:00',
+    },
+    {
+      'id': 24,
+      'title': '1234',
+      'start_date': '2025-12-23',
+      'end_date': '2025-12-24',
+      'activity_type': 1,
+      'synopsis': '1234',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-12T15:02:37.358253',
+      'is_delete': 0,
+      'address': 'shanghai',
+      'sponsor': 'hid_2o--qyykhbvm5as',
+      'start': '15:00',
+      'end': '15:00',
+      'register_url': 'https://www.openeuler.org/zh/',
+      'content_url': 'https://www.openeuler.org/zh/',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-20 00:00',
+    },
+    {
+      'id': 23,
+      'title': 'asdf',
+      'start_date': '2025-12-26',
+      'end_date': '2025-12-27',
+      'activity_type': 2,
+      'synopsis': 'asdf',
+      'activity_mode': 1,
+      'status': 2,
+      'create_time': '2025-12-12T15:01:44.181040',
+      'is_delete': 0,
+      'address': '',
+      'sponsor': 'hid_2o--qyykhbvm5as',
+      'start': '15:00',
+      'end': '15:00',
+      'register_url': 'https://www.openeuler.org/zh/',
+      'content_url': 'https://www.openeuler.org/zh/',
+      'update_activity_id': null,
+      'register_end_date': '2025-12-21 00:00',
+    },
+  ],
+};
+
+// 我的活动列表
+export const listRes = {
+  'total': 8,
+  'page': '1',
+  'size': 50,
+  'data': [
+    {
+      'id': 35,
+      'title': 'test1231awd',
+      'start_date': '2025-12-19',
+      'end_date': '2025-12-20',
+      'activity_type': 1,
+      'synopsis': '',
+      'activity_mode': 1,
+      'create_time': '2025-12-12T19:30:59.578293',
+      'address': 'asdasd',
+      'status': 1,
+      'sponsor': 'jiasensen',
+      'is_delete': 0,
+      'start': '10:00',
+      'end': '09:00',
+      'register_url': 'https://wqeqw.com',
+      'content_url': 'https://wqeqw.com',
+      'register_end_date': '2025-12-19 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_n6-ylcv3nf0jw4n',
+    },
+    {
+      'id': 20,
+      'title': 'test1122',
+      'start_date': '2025-12-20',
+      'end_date': '2025-12-20',
+      'activity_type': 3,
+      'synopsis': 'test112活动简介',
+      'activity_mode': 1,
+      'create_time': '2025-12-12T11:43:55.343739',
+      'address': 'test112活动地址',
+      'status': 2,
+      'sponsor': 'jiasensen',
+      'is_delete': 0,
+      'start': '09:00',
+      'end': '10:00',
+      'register_url': 'https://aaa.com/',
+      'content_url': 'https://aaa111.com/',
+      'register_end_date': '2025-12-20 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_n6-ylcv3nf0jw4n',
+    },
+    {
+      'id': 26,
+      'title': 'test_sensen11',
+      'start_date': '2025-12-20',
+      'end_date': '2025-12-20',
+      'activity_type': 3,
+      'synopsis': 'asdas',
+      'activity_mode': 1,
+      'create_time': '2025-12-12T15:29:33.031145',
+      'address': 'asdqwe',
+      'status': 3,
+      'sponsor': 'jiasensen',
+      'is_delete': 0,
+      'start': '09:00',
+      'end': '12:00',
+      'register_url': 'https://aaa.com/',
+      'content_url': 'https://aaa111.com/',
+      'register_end_date': '2025-12-20 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_2o--qyykhbvm5as',
+    },
+    {
+      'id': 86,
+      'title': 'test1219',
+      'start_date': '2025-12-20',
+      'end_date': '2025-12-20',
+      'activity_type': 1,
+      'synopsis': '',
+      'activity_mode': 1,
+      'create_time': '2025-12-19T13:56:41.860211',
+      'address': 'asdasd',
+      'status': 1,
+      'sponsor': 'jiasensen',
+      'is_delete': 0,
+      'start': '08:00',
+      'end': '12:00',
+      'register_url': 'https://asda.com/',
+      'content_url': 'https://asda12312.com/',
+      'register_end_date': '2025-12-20 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_n6-ylcv3nf0jw4n',
+    },
+    {
+      'id': 27,
+      'title': 'test_sensen22',
+      'start_date': '2025-12-21',
+      'end_date': '2025-12-21',
+      'activity_type': 1,
+      'synopsis': 'asdfasqwe',
+      'activity_mode': 1,
+      'create_time': '2025-12-12T15:31:26.182283',
+      'address': 'adsasd',
+      'status': 3,
+      'sponsor': 'jiasensen',
+      'is_delete': 1,
+      'start': '09:00',
+      'end': '12:00',
+      'register_url': 'https://qqq.com/',
+      'content_url': 'https://qqq111.com/',
+      'register_end_date': '2025-12-21 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_2o--qyykhbvm5as',
+    },
+    {
+      'id': 33,
+      'title': 'test_sensen123',
+      'start_date': '2025-12-26',
+      'end_date': '2025-12-26',
+      'activity_type': 3,
+      'synopsis': 'asdas',
+      'activity_mode': 1,
+      'create_time': '2025-12-12T18:21:25.369919',
+      'address': 'test地址',
+      'status': 3,
+      'sponsor': 'jiasensen',
+      'is_delete': 0,
+      'start': '08:00',
+      'end': '14:00',
+      'register_url': 'https://aaa.com/',
+      'content_url': 'https://aaa111.com/',
+      'register_end_date': '2025-12-26 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_u18tcgmw-eue4fq',
+    },
+    {
+      'id': 45,
+      'title': 'test_ss1215',
+      'start_date': '2025-12-27',
+      'end_date': '2025-12-27',
+      'activity_type': 3,
+      'synopsis': '',
+      'activity_mode': 1,
+      'create_time': '2025-12-15T11:35:14.992243',
+      'address': 'asdas',
+      'status': 3,
+      'sponsor': 'jiasensen',
+      'is_delete': 1,
+      'start': '08:00',
+      'end': '10:00',
+      'register_url': 'https://aaa.com',
+      'content_url': 'https://aaa123.com',
+      'register_end_date': '2025-12-27 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_n6-ylcv3nf0jw4n',
+    },
+    {
+      'id': 88,
+      'title': 'test',
+      'start_date': '2026-04-18',
+      'end_date': '2026-04-18',
+      'activity_type': 3,
+      'synopsis': '',
+      'activity_mode': 1,
+      'create_time': '2026-04-16T17:28:29.775759',
+      'address': '深圳',
+      'status': 2,
+      'sponsor': 'jiasensen',
+      'is_delete': 0,
+      'start': '09:00',
+      'end': '18:00',
+      'register_url': 'https://www.123.com',
+      'content_url': 'https://www.123.com',
+      'register_end_date': '2026-04-18 00:00',
+      'update_activity_id': null,
+      'approver': 'hid_yjn7z1w59d8rln9',
+    },
+  ],
+};

package/src/components/activity/index.ts

@@ -0,0 +1,24 @@
+import _OActivityForm from './OActivityForm.vue';
+import _OActivityApproval from './OActivityApproval.vue';
+import _OMyActivityCalendar from './OMyActivityCalendar.vue';
+import type { App } from 'vue';
+
+
+const OActivityForm = Object.assign(_OActivityForm, {
+  install(app: App) {
+    app.component('OActivityForm', _OActivityForm);
+  },
+});
+const OActivityApproval = Object.assign(_OActivityApproval, {
+  install(app: App) {
+    app.component('OActivityApproval', _OActivityApproval);
+  },
+});
+const OMyActivityCalendar = Object.assign(_OMyActivityCalendar, {
+  install(app: App) {
+    app.component('OMyActivityCalendar', _OMyActivityCalendar);
+  },
+});
+
+export { OActivityForm, OActivityApproval, OMyActivityCalendar };
+export * from './types';

package/src/components/activity/types.ts

@@ -0,0 +1,78 @@
+// 活动新增、修改
+export interface ParamsItemT {
+  id?: number; // 活动id
+  title: string; // 活动名称
+  organizer: string; // 活动主办方
+  start_date: string; // 活动起始日期
+  end_date: string; // 活动结束日期
+  register_end_date: string; // 报名截止时间
+  activity_type: string | number; // 活动类型
+  synopsis: string; // 活动简介
+  register_url: string; // 报名网址
+  content_url: string; // 活动详情网址
+  address: string; // 活动地址
+  start: string; // 活动开始时间
+  end: string; // 活动结束时间
+  schedules?: string;
+  is_publish: string; // 是否发布 true-发布审核 false-发布为草稿
+  update_activity_id?: string;
+  approver: string; // 审批人
+  email_list: string;
+  content: string;
+}
+
+export interface ActivityFormPropsT {
+  data?: ParamsItemT;
+  creatActivity: any;
+  editActivity: any;
+  admins: string[];
+  status?: string | null;
+}
+
+export interface TypeOptionT {
+  label: string;
+  value: number;
+}
+
+export interface ActivityItemT {
+  activity_mode: number;
+  activity_type: number;
+  address: string;
+  approver: string;
+  approve_record: object;
+  start_date: string;
+  end: string;
+  end_date: string;
+  id: number;
+  is_delete: number; // 1-已取消 0-正常
+  live_address: string;
+  register_end_date: string;
+  register_url: string;
+  start: string;
+  status: number; // 1-草稿 2-审核中 3-报名中 4-进行中 5-已结束 6-已修改 7-驳回
+  synopsis: string;
+  title: string;
+  update_activity_id: number;
+  user: string;
+}
+
+export interface ReviewParamsT {
+  page: number;
+  size: number;
+  status: string;
+  activity_mode?: string;
+  is_delete?: number;
+  search: string;
+  sponsor: string;
+  order_by: string;
+}
+
+export interface ActivityTablePropsT {
+  getTableDataRequest: any;
+  applicantList: string[];
+  cancelActivityRequest: any;
+  deleteActivityRequest: any;
+  approveActivityRequest: any;
+  rejectActivityRequest: any;
+  getActivityDetailRequest: any;
+}

package/src/components/common/HeaderEulerNav.vue

@@ -16,7 +16,7 @@ const props = defineProps({
 });
 
 const { locale } = useLocale();
-const { theme } = useTheme();
+const { theme, isDark } = useTheme();
 
 const navRef = ref();
 const navListRef = ref();
@@ -32,9 +32,9 @@ const navShortcut = ref<any>([]);
 const isPicture = ref(false);
 const toggleDebounced = useDebounceFn(function (item: any | null) {
   if (item === null) {
-    // navActive.value = '';
-    // isShow.value = false;
-    // isPicture.value = false;
+    navActive.value = '';
+    isShow.value = false;
+    isPicture.value = false;
   } else {
     navActive.value = item.id;
     isShow.value = true;
@@ -103,7 +103,7 @@ onUnmounted(() => {
       <div class="right-icon" v-if="navVisibleLeft">
         <OIcon @click="scrollNavLeft"><IconCaretLeft /></OIcon>
       </div>
-      <nav ref="navRef" class="o-nav" :class="{ 'o-nav-scroll': navVisibleLeft || !navVisibleRight }">
+      <nav ref="navRef" class="o-nav" :class="{ 'o-nav-scroll': navVisibleLeft || !navVisibleRight, dark: isDark }">
         <ul ref="navListRef" class="o-nav-list">
           <li v-for="item in navData" :key="item.id" @mouseenter="toggleDebounced(item)" @mouseleave="toggleDebounced(null)">
             <span :id="'tour_headerNav_' + item.ID" class="nav-item">{{ item.label }}</span>
@@ -126,7 +126,7 @@ onUnmounted(() => {
                                 </OIcon>
                                 <OTag v-if="subItem.tag" round="pill" color="danger" size="small" class="content-tag">{{ subItem.tag }}</OTag>
                               </a>
-                              <div class="desc-container">
+                              <div v-if="subItem.description" class="desc-container">
                                 <p class="item-desc" :title="showDesc ? subItem.description : null" @mouseenter="descMouseenter($event)">
                                   {{ subItem.description }}
                                 </p>
@@ -214,6 +214,11 @@ onUnmounted(() => {
   &::-webkit-scrollbar {
     display: none;
   }
+  &.dark {
+    &::after {
+      background-image: linear-gradient(90deg, rgba(var(--o-mixedgray-4), 0) 0%, rgba(var(--o-mixedgray-4), 1) 100%);
+    }
+  }
 
   .o-nav-list {
     display: flex;
@@ -285,7 +290,7 @@ onUnmounted(() => {
 }
 .nav-dropdown {
   position: fixed;
-  top: 72px;
+  top: var(--o-header-height);
   left: 0;
   right: 0;
   background: var(--o-color-fill2);
@@ -358,6 +363,7 @@ onUnmounted(() => {
       }
       .content-tag {
         margin-left: var(--o-gap-2);
+        border-radius: var(--o-radius-xs);
         @include respond-to('<=laptop') {
           display: none;
         }
@@ -918,9 +924,9 @@ onUnmounted(() => {
   }
 
   .icon {
-    height: 16px;
-    width: 16px;
-    padding-left: 6px;
+    width: 24px;
+    height: 24px;
+    padding-left: 8px;
   }
 }
 .content-label {

package/src/components/common/HeaderNavMoblie.vue

@@ -132,7 +132,6 @@ watch(
   justify-content: center;
   height: 48px;
   color: var(--o-color-info1);
-  font-weight: 500;
 
   &.active {
     color: var(--o-color-primary1);
@@ -142,7 +141,7 @@ watch(
 
 .header-content-mb {
   position: fixed;
-  top: 48px;
+  top: var(--o-header-height);
   bottom: 0;
   left: 0;
   right: 0;
@@ -157,8 +156,8 @@ watch(
   position: fixed;
   left: 0;
   overflow: hidden;
-  top: 48px;
-  height: calc(100vh - 48px);
+  top: var(--o-header-height);
+  height: calc(100vh - var(--o-header-height));
   transform: translateX(-130%);
 
   transition-duration: 0.333s;
@@ -186,12 +185,12 @@ watch(
     padding: 0;
     margin: 0;
     height: auto;
-    @include h4;
 
     > li {
       position: relative;
-      @include nav-item;
       text-align: center;
+      @include tip1;
+      @include nav-item;
     }
   }
 }
@@ -228,7 +227,7 @@ watch(
       .content-label {
         color: var(--o-color-info3);
         font-weight: 500;
-        @include text1;
+        @include tip1;
       }
 
       .item-not-children {
@@ -277,6 +276,7 @@ watch(
 
   .container-mobile {
     color: var(--o-color-primary1);
+    margin-top: 8px;
     @include text2;
 
     .icon {
@@ -299,7 +299,7 @@ watch(
       color: var(--o-color-primary1);
       display: flex;
       align-items: center;
-      @include text2;
+      @include tip1;
     }
 
     .content-tag {
@@ -316,7 +316,7 @@ watch(
         margin-top: var(--o-gap-1);
         text-align: justify;
         word-break: normal;
-        @include text1;
+        @include tip2;
         @include text-truncate(2);
       }
     }

package/src/components/common/HeaderUbmcNav.vue

@@ -419,7 +419,7 @@ const handelHref = (href: string) => {
   align-items: center;
   height: 100%;
   padding: 0 var(--o-gap-4);
-  color: var(--o-color-info2);
+  color: var(--o-color-info1);
   word-break: keep-all;
   position: relative;
   font-weight: normal;