@opendesign-plus-test/components 0.0.1-rc.28 → 0.0.1-rc.30

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -20,7 +20,7 @@ import {
 import { ElCalendar } from 'element-plus';
 import { computed, nextTick, onMounted, ref, onUnmounted, watch } from 'vue';
 import OMeetingDetail from './components/OMeetingDetail.vue';
-import type { MeetingItemT, PageParamsT } from './types.ts';
+import { MeetingGroupType, MeetingItemT, PageParamsT } from './types.ts';
 import dayjs from 'dayjs';
 import IconMeeting from '~icons/meeting/icon-meet.svg';
 import { INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK, WEEKDAY } from './config.ts';
@@ -43,11 +43,14 @@ const reloadAll = ref(false); // 是否需要清空数据
 const { t, locale } = useI18n();
 const isEn = computed(() => locale.value === Locales.EN);
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   cancelSubMeetingRequest: any;
   deleteMeetingRequest: any;
-  getMeetingListRequest: any
-}>();
+  getMeetingListRequest: any;
+  groupType: MeetingGroupType
+}>(), {
+  groupType: MeetingGroupType.SIG,
+});
 
 const dialogLoading = ref(false); // 弹窗按钮状态
 const { isPhone } = useScreen();
@@ -648,7 +651,10 @@ const cancelActions = computed<DialogActionT[]>(() => {
                           <div class="meeting-info">
                             <span>{{ row.dateRange }}</span>
                             <ODivider direction="v" />
-                            <span>{{ t('meeting.sigs') }}: {{ row.group_name }}</span>
+                            <span>
+                              {{ groupType === MeetingGroupType.GROUP ? t('meeting.groups') : t('meeting.sigs')
+                              }}: {{ row.group_name }}
+                            </span>
                           </div>
                         </div>
                       </div>
@@ -1365,11 +1371,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
                 font-size: 14px;
                 line-height: 21px;
               }
-
-              .o-link + .o-link {
-                margin-left: var(--o-gap-section-6);
-              }
-
               .o-icon {
                 font-size: 16px;
               }

package/src/components/meeting/components/OMeetingCalendarList.vue

@@ -4,7 +4,7 @@ import OMeetingDetail from './OMeetingDetail.vue';
 import { computed, nextTick, ref, watch } from 'vue';
 import IconMeetinging from '~icons/meeting/icon-meet.svg';
 import IconCopy from '~icons/meeting/icon-copy.svg';
-import { CalendarDataType, MeetingItemT } from '../types.ts';
+import { CalendarDataType, MeetingGroupType, MeetingItemT } from '../types.ts';
 
 import IconAll from '~icons/meeting/icon-all.svg';
 import IconEvent from '~icons/meeting/icon-event.svg';
@@ -15,8 +15,12 @@ import { CYCLE_TYPE_OPTIONS, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from
 
 import { formatDate, getConfig, getPointStr } from '../utils.ts';
 import { useI18n } from '@/i18n';
+import { acticityTypeMap } from '@/components/activity/config.ts';
 
-const props = withDefaults(defineProps<{ list: MeetingItemT[] }>(), {
+const props = withDefaults(defineProps<{
+  list: MeetingItemT[];
+  groupType: MeetingGroupType;
+}>(), {
   list: () => [],
 });
 const { t, locale } = useI18n();
@@ -31,14 +35,17 @@ const copyInfo = async (idx) => {
 };
 
 const collapseNames = ref([]);
-const i18n = {
-  SIG_GROUP: `${ t('meeting.sigs') }: `,
-  NEW_DATE: t('meeting.latestMeeting'),
-  EMPTY_TEXT: t('meeting.meetingEmptyText'),
-  LEARN_MORE: t('common.seeMore'),
-  JOIN_MEETING: t('meeting.joinMeeting'),
-  SIGN: t('meeting.sign'),
-};
+const i18n = computed(() => {
+  return {
+    SIG_GROUP: `${ props.groupType === MeetingGroupType.GROUP ? t('meeting.groups') : t('meeting.sigs') }: `,
+    NEW_DATE: t('meeting.latestMeeting'),
+    EMPTY_TEXT: t('meeting.meetingEmptyText'),
+    LEARN_MORE: t('common.seeMore'),
+    JOIN_MEETING: t('meeting.joinMeeting'),
+    SIGN: t('meeting.sign'),
+    DETAILS: t('meeting.detail'),
+  };
+});
 
 const getCurrentIcon = (item) => {
   if (item.type === 'summit') return IconSummit;
@@ -78,6 +85,21 @@ const computedList = computed(() => {
   return props.list.map((v) => {
     const type = v.type;
     let dateRange = '';
+    if (['activity'].includes(type)) {
+      let activity_type = acticityTypeMap.get(v.activity_type)?.label;
+      if (v.end_date === v.start_date) {
+        return {
+          ...v,
+          activity_type,
+          dateRange: `${ formatDate(v.start_date) } ${ v.start }-${ v.end }`,
+        };
+      }
+      return {
+        ...v,
+        activity_type,
+        dateRange: `${ formatDate(v.start_date) } ${ v.start }-${ formatDate(v.end_date) } ${ v.end }`,
+      };
+    }
     if (['events', 'summit'].includes(type)) {
       dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD HH:mm') } ${ formatDate(v.end_date, 'YYYY/MM/DD HH:mm') }`;
       return {
@@ -163,7 +185,7 @@ const computedList = computed(() => {
               <component :is="getConfig(item.type, 'icon')" />
             </OIcon>
             <div class="text">
-              {{ item.topic || item.name }}
+              {{ item.topic || item.name || item.title }}
             </div>
             <div class="tag-wrapper" v-if="item.is_cycle">
               <OTag color="primary" variant="outline">{{ t('meeting.cycle') }}</OTag>
@@ -195,7 +217,15 @@ const computedList = computed(() => {
               </OIcon>
             </template>
           </OLink>
-          <OLink v-if="item.signUrl" :href="item.signUrl" target="_blank" class="jump-detail-link">
+          <OLink v-if="item.content_url" :href="item.content_url" target="_blank" class="jump-detail-link">
+            <span>{{ i18n.DETAILS }}</span>
+            <template #suffix>
+              <OIcon>
+                <IconChevronRight />
+              </OIcon>
+            </template>
+          </OLink>
+          <OLink v-if="item.register_url" :href="item.register_url" target="_blank" class="jump-detail-link">
             <span>{{ i18n.SIGN }}</span>
             <template #suffix>
               <OIcon>
@@ -319,12 +349,44 @@ const computedList = computed(() => {
     }
 
     .o-collapse-item-body {
-      background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
       margin-bottom: 0;
+      padding: 0 12px 16px 12px;
 
       a {
         word-break: break-all;
       }
+
+      .calendar-info {
+        display: flex;
+        color: var(--o-color-info3);
+        flex-direction: column;
+        background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
+        padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + var(--o-gap-5) - 12px);
+        border-radius: var(--o-radius-xs);
+        @include tip1;
+
+        @include respond-to('<=pad_v') {
+          padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + 16px - 12px);
+
+        }
+        @include respond-to('phone') {
+          padding: 12px 16px;
+        }
+
+        .info-item {
+          display: flex;
+          margin-top: 8px;
+
+          .item-title {
+            min-width: 110px;
+          }
+        }
+
+        .info-item:first-child {
+          margin-top: 0;
+        }
+      }
+
     }
 
     .jump-detail-link {
@@ -431,34 +493,6 @@ const computedList = computed(() => {
       }
     }
 
-    .calendar-info {
-      display: flex;
-      color: var(--o-color-info3);
-      flex-direction: column;
-      padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + var(--o-gap-5));
-      @include tip1;
-
-      @include respond-to('<=pad_v') {
-        padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + 16px);
-
-      }
-      @include respond-to('phone') {
-        padding: 12px 16px;
-      }
-
-      .info-item {
-        display: flex;
-        margin-top: 8px;
-
-        .item-title {
-          min-width: 110px;
-        }
-      }
-
-      .info-item:first-child {
-        margin-top: 0;
-      }
-    }
   }
 }
 

package/src/components/meeting/components/OMeetingDetail.vue

@@ -33,8 +33,8 @@ const activityInfoList = computed(() =>
     { label: '起始日期', key: 'start_date_time' },
     { label: '结束日期', key: 'end_date_time' },
     { label: '报名截止时间', key: 'register_end_date' },
-    { label: '活动详情地址', key: 'content_url', isLink: true },
     { label: '活动地点', key: 'address' },
+    { label: '活动详情地址', key: 'content_url', isLink: true },
     { label: '活动审批人', key: 'approver' },
     { label: '审核备注', key: 'approve_record', isRecord: true },
   ].slice(0, props.from === 'home' ? 4 : 7),
@@ -92,7 +92,7 @@ defineExpose({ copyInfo });
       }"
     >
       <template v-if="data[info.key] && !info.isRecord">
-        <span class="label">{{ info.label }}<i>{{ isZh ? '：' : ':' }}</i></span>
+        <span class="label">{{ info.label }}</span>
         <MoreText :show="show" v-if="info.ellipsis" :text="data[info.key] || '-'" />
         <OLink
           v-else-if="info.isLink"
@@ -111,7 +111,7 @@ defineExpose({ copyInfo });
         </span>
       </template>
       <template v-if="info.isRecord && data[info.key]?.length">
-        <span class="label">{{ info.label }}{{ isZh ? '：' : ':' }}</span>
+        <span class="label">{{ info.label }}</span>
         <div>
           <p v-for="re in data[info.key]" :key="re.create_time" class="value">
             {{ re.reason }}&nbsp;&nbsp;

package/src/components/meeting/types.ts

@@ -38,6 +38,22 @@ export interface OptionItemT {
 
 export type PlatformT = 'welink' | 'tencent';
 
+export enum MeetingGroupType {
+  SIG = 'sig',
+  GROUP = 'group',
+}
+
+export interface MeetingCalendarPropsT {
+  getDateListRequest: any;
+  getMeetingListRequest: any;
+  getSummitListRequest: any;
+  getSummitDatesRequest: any;
+  getEventsListRequest: any;
+  getEventsDatesRequest: any;
+  hiddenEvents?: boolean;
+  hiddenSummit?: boolean;
+  groupType: MeetingGroupType;
+}
 // 会议新增、修改
 export interface MeetingPostT {
   id?: number; // 会议id
@@ -75,7 +91,8 @@ export interface MeetingFormPropsT {
   editSubMeetingRequest: any;
   getPlatformsRequest: any;
   getGroupsRequest: any;
-  showBtns?: boolean
+  showBtns?: boolean;
+  groupType: MeetingGroupType;
 }
 
 // 会议详情

package/src/i18n/en.ts

@@ -49,6 +49,7 @@ export default {
   'meeting.cycle': 'Recurrence',
   'meeting.joinMeeting': 'Join',
   'meeting.sign': 'Sign Up',
+  'meeting.detail': 'View Details',
   'meeting.meetingSummary': 'Minutes',
   'meeting.viewRecord': 'Playback',
   'meeting.editMeeting': 'Modify',
@@ -64,7 +65,9 @@ export default {
   'meeting.meetingNameTooLong': 'Enter a maximum of 128 characters.',
   'meeting.meetingAgendaTooLong': 'Enter a maximum of 4096 characters.',
   'meeting.meetingSig': 'SIG',
+  'meeting.meetingGroup': 'Group',
   'meeting.selectSig': 'Select a SIG.',
+  'meeting.selectGroup': 'Select a Group.',
   'meeting.enterEtherpad': 'Enter Etherpad.',
   'meeting.etherpadDesc': 'A meeting assistant for recording meeting minutes and conversations.',
   'meeting.selectDate': 'Select a date.',
@@ -118,6 +121,7 @@ export default {
   'meeting.meetingTypeEvents': 'Activities',
   'meeting.meetingTypeSummit': 'Summit',
   'meeting.allSigs': 'All SIGs',
+  'meeting.allGroups': 'All Groups',
   'meeting.meetingCreator': 'Organizer',
   'meeting.meetingDate2': 'Time',
   'meeting.meetingId': 'Meeting ID',
@@ -127,6 +131,7 @@ export default {
   'meeting.version2509Banner': 'openUBMC 25.09 Available Now',
   'meeting.version2512Banner': 'openUBMC 25.12 LTS 社区发行版正式上线',
   'meeting.sigs': 'SIG Groups',
+  'meeting.groups': 'Groups',
   'meeting.activityAddress': 'Address',
   'meeting.meetingTopic': 'Topics: ',
   'meeting.meetingDetail': 'Details',

package/src/i18n/zh.ts

@@ -49,6 +49,7 @@ export default {
   'meeting.cycle': '周期',
   'meeting.joinMeeting': '加入会议',
   'meeting.sign': '我要报名',
+  'meeting.detail': '查看详情',
   'meeting.meetingSummary': '会议纪要',
   'meeting.viewRecord': '查看回放',
   'meeting.editMeeting': '修改会议',
@@ -64,7 +65,9 @@ export default {
   'meeting.meetingNameTooLong': '会议名称不能超过128个字符',
   'meeting.meetingAgendaTooLong': '会议内容不能超过4096个字符',
   'meeting.meetingSig': '所属SIG',
+  'meeting.meetingGroup': '工作组',
   'meeting.selectSig': '请选择所属SIG',
+  'meeting.selectGroup': '请选择工作组',
   'meeting.enterEtherpad': '请输入会议纪要',
   'meeting.etherpadDesc': '会议辅助工具，可以在线记录会议纪要和讨论。',
   'meeting.selectDate': '请选择日期',
@@ -118,6 +121,7 @@ export default {
   'meeting.meetingTypeEvents': '活动',
   'meeting.meetingTypeSummit': '峰会',
   'meeting.allSigs': '全部SIG组',
+  'meeting.allGroups': '全部工作组',
   'meeting.meetingCreator': '发起人',
   'meeting.meetingDate2': '会议时间',
   'meeting.meetingId': '会议ID',
@@ -127,6 +131,7 @@ export default {
   'meeting.version2509Banner': 'openUBMC 25.09社区发行版正式上线',
   'meeting.version2512Banner': 'openUBMC 25.12 LTS 社区发行版正式上线',
   'meeting.sigs': 'SIG 组',
+  'meeting.groups': '工作组',
   'meeting.activityAddress': '活动地点',
   'meeting.meetingTopic': '会议主题：',
   'meeting.meetingDetail': '会议详情',