@opendesign-plus-test/components 0.0.1-rc.27 → 0.0.1-rc.29

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

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { OLink } from '@opensig/opendesign';
 import { computed, ref } from 'vue';
-import { MeetingItemT } from '@/components/meeting/types.ts';
+import { CalendarDataType, MeetingItemT } from '@/components/meeting/types.ts';
 import MoreText from '@/components/common/MoreText.vue';
 import { Locales, useI18n } from '@/i18n';
-import { formatDate } from '@/components/meeting/utils.ts';
+import { formatDate, getPlatformLabel } from '@/components/meeting/utils.ts';
 
 const props = defineProps<{
   data: MeetingItemT;
@@ -52,8 +52,8 @@ const activityInfoApprovalList = computed(() => [
 ]);
 
 const columns = computed(() => {
-  if (props.data.type === 'activity') {
-    if (props.page === 'approval') {
+  if (props.data.type === CalendarDataType.ACTIVITY || props.data.type === CalendarDataType.EVENTS) {
+    if (props.page === CalendarDataType.APPROVAL) {
       return activityInfoApprovalList.value;
     }
     return activityInfoList.value;
@@ -81,9 +81,15 @@ defineExpose({ copyInfo });
     <div
       ref="domRef"
       class="label-item"
-      :class="`label-item_${data.id} type_${data.type} ${!data[info.key]?.length ? 'is-empty' : ''}`"
       v-for="(info, infoIdx) in columns"
       :key="infoIdx"
+      :class="{
+        'record-item': info.isRecord && data[info.key]?.length,
+        'link-item': info.isLink,
+        'is-empty':!data[info.key]?.length,
+        [`label-item_${data.id}`]: true,
+        [`type_${data.type}`]: true,
+      }"
     >
       <template v-if="data[info.key] && !info.isRecord">
         <span class="label">{{ info.label }}<i>{{ isZh ? '：' : ':' }}</i></span>
@@ -98,18 +104,21 @@ defineExpose({ copyInfo });
         >
           {{ data[info.key] }}
         </OLink>
+        <span v-else-if="info.key === 'platform'">{{ getPlatformLabel(data[info.key]) }}</span>
         <span v-else class="value">
-        <i v-if="info.extra" class="extra">{{ data[info.extra] }}</i>
-        {{ data[info.key] || '-' }}
-      </span>
+          <i v-if="info.extra" class="extra">{{ data[info.extra] }}</i>
+          {{ data[info.key] || '-' }}
+        </span>
       </template>
       <template v-if="info.isRecord && data[info.key]?.length">
         <span class="label">{{ info.label }}{{ isZh ? '：' : ':' }}</span>
-        <p v-for="re in data[info.key]" :key="re.create_time" class="value">
-          {{ re.reason }}&nbsp;&nbsp;
-          {{ formatDate(re.create_time, 'YYYY/MM/DD HH:mm:ss') }}
-          审核{{ re.action === 1 ? '通过' : '驳回' }}
-        </p>
+        <div>
+          <p v-for="re in data[info.key]" :key="re.create_time" class="value">
+            {{ re.reason }}&nbsp;&nbsp;
+            {{ formatDate(re.create_time, 'YYYY/MM/DD HH:mm:ss') }}
+            审核{{ re.action === 1 ? '通过' : '驳回' }}
+          </p>
+        </div>
       </template>
     </div>
   </div>
@@ -131,6 +140,22 @@ defineExpose({ copyInfo });
       gap: var(--o-gap-1);
     }
 
+    &:not(.is-empty) {
+      margin-bottom: var(--o-gap-2);
+    }
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &.record-item {
+      align-items: flex-start;
+
+      .value {
+        margin-bottom: 0;
+      }
+    }
+
     .label {
       width: 4em;
       flex-shrink: 0;
@@ -177,10 +202,6 @@ defineExpose({ copyInfo });
     }
   }
 
-  .label-item + .label-item {
-    margin-top: var(--o-gap-2);
-  }
-
   .label-item.is-empty {
     margin: 0;
   }

package/src/components/meeting/types.ts

@@ -13,6 +13,8 @@ export enum CalendarDataType {
   MEETING = 'meeting',
   EVENTS = 'events',
   SUMMIT = 'summit',
+  ACTIVITY = 'activity',
+  APPROVAL = 'approval'
 }
 
 export interface CalendarOtherDataT {
@@ -36,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
@@ -73,7 +91,8 @@ export interface MeetingFormPropsT {
   editSubMeetingRequest: any;
   getPlatformsRequest: any;
   getGroupsRequest: any;
-  showBtns?: boolean
+  showBtns?: boolean;
+  groupType: MeetingGroupType;
 }
 
 // 会议详情

package/src/components/meeting/utils.ts

@@ -101,6 +101,23 @@ export const transformSeconds = (seconds: number) => {
 };
 
 export const getConfig = (val: CalendarDataType, key: keyof meetingTabT): string => {
-  const find: meetingTabT = MEETING_TABS.find(v => v.value === val)!;
+  let value = val;
+  if (val === CalendarDataType.ACTIVITY) {
+    value = CalendarDataType.EVENTS;
+  }
+  const find: meetingTabT = MEETING_TABS.find(v => v.value === value)!;
   return find?.[key] || '';
+};
+
+export const getPlatformLabel = (platform: string) => {
+  switch (platform) {
+    case 'WELINK':
+      return 'WeLink';
+    case 'ZOOM':
+      return 'Zoom';
+    case 'TENCENT':
+      return '腾讯会议';
+    default:
+      return platform;
+  }
 };

package/src/i18n/en.ts

@@ -64,7 +64,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.',
@@ -79,7 +81,7 @@ export default {
   'meeting.meetingAgenda': 'Content',
   'meeting.enterMeetingAgenda': 'Enter the meeting content.',
   'meeting.emailTooLong': 'Enter a maximum of 1020 characters for the email addresses.',
-  'meeting.enterEmail': 'Enter email addresses, separated by commas (;).',
+  'meeting.enterEmail': 'Enter email addresses, separated by commas (,) or semicolons (;).',
   'meeting.meetingEmail': 'Email',
   'meeting.meetingEmailDesc': 'The system automatically sends notifications to subscribed SIG members. You can include additional SIG or individual email addresses.',
   'meeting.sigGroupEmail': 'SIG Mailing List',
@@ -118,6 +120,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 +130,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',
@@ -134,6 +138,8 @@ export default {
   'meeting.meetingReplay': 'Playback',
   'meeting.searchSubtitlePlaceholder': 'Enter',
   'meeting.detailHalfYearMeetings': '默认显示近半年的会议。',
+  'meeting.tencent': 'Tencent',
+  'meeting.etherpad': 'Etherpad',
   'common.confirm': 'Confirm',
   'common.cancel': 'Cancel',
   'common.copySuccess': 'Copied Successfully',

package/src/i18n/zh.ts

@@ -64,8 +64,10 @@ export default {
   'meeting.meetingNameTooLong': '会议名称不能超过128个字符',
   'meeting.meetingAgendaTooLong': '会议内容不能超过4096个字符',
   'meeting.meetingSig': '所属SIG',
+  'meeting.meetingGroup': '工作组',
   'meeting.selectSig': '请选择所属SIG',
-  'meeting.enterEtherpad': '请输入Etherpad',
+  'meeting.selectGroup': '请选择工作组',
+  'meeting.enterEtherpad': '请输入会议纪要',
   'meeting.etherpadDesc': '会议辅助工具，可以在线记录会议纪要和讨论。',
   'meeting.selectDate': '请选择日期',
   'meeting.finishMeetingConfig': '请完善会议配置',
@@ -79,7 +81,7 @@ export default {
   'meeting.meetingAgenda': '会议内容',
   'meeting.enterMeetingAgenda': '请输入会议内容',
   'meeting.emailTooLong': '邮箱地址不能超过1020个字符',
-  'meeting.enterEmail': '请输入邮件地址，多个邮件地址以“;”间隔',
+  'meeting.enterEmail': '请输入电子邮件地址，多个邮件地址以“,”或“;”间隔',
   'meeting.meetingEmail': '邮件地址',
   'meeting.meetingEmailDesc': '默认会向已订阅SIG组成员发送会议通知也可添加其他SIG组邮件地址或个人邮件地址。',
   'meeting.sigGroupEmail': 'SIG组邮件列表',
@@ -118,6 +120,7 @@ export default {
   'meeting.meetingTypeEvents': '活动',
   'meeting.meetingTypeSummit': '峰会',
   'meeting.allSigs': '全部SIG组',
+  'meeting.allGroups': '全部工作组',
   'meeting.meetingCreator': '发起人',
   'meeting.meetingDate2': '会议时间',
   'meeting.meetingId': '会议ID',
@@ -127,6 +130,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': '会议详情',
@@ -134,6 +138,8 @@ export default {
   'meeting.meetingReplay': '智能回放',
   'meeting.searchSubtitlePlaceholder': '请输入搜索内容',
   'meeting.detailHalfYearMeetings': '默认显示近半年的会议。',
+  'meeting.tencent': '腾讯会议',
+  'meeting.etherpad': '会议纪要',
   'common.confirm': '确认',
   'common.cancel': '取消',
   'common.copySuccess': '复制成功',