@opendesign-plus-test/components 0.0.1-rc.34 → 0.0.1-rc.36

package/src/components/meeting/OMeetingForm.vue

@@ -21,20 +21,13 @@ import IconHelp from '~icons/meeting/icon-help.svg';
 import IconTip from '~icons/meeting/icon-tip.svg';
 import { MeetingFormPropsT, MeetingGroupType, MeetingPostT, OptionItemT } from './types';
 import dayjs from 'dayjs';
-import { findLabelFromOptions, formatDateNumber, getDateNumber, getPlatformLabel } from './utils';
-import {
-  CYCLE_TYPE_OPTIONS0,
-  EMAIL_REGEX,
-  INTERVAL_DAY,
-  INTERVAL_MONTH,
-  INTERVAL_WEEK,
-  INTERVAL_WEEK_OPTIONS,
-} from './config';
+import { findLabelFromOptions, formatDateNumber, getDateNumber } from './utils';
+import { EMAIL_REGEX, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from './config';
 import OMeetingCalendarSelector from './components/OMeetingCalendarSelector.vue';
 import { useScreen } from '@opendesign-plus/composables';
-import { useI18n } from '@/i18n';
+import { useMeetingConfig } from './composables/useMeetingConfig';
 
-const { t, locale } = useI18n();
+const { t, locale, cycleTypeOptions0, intervalWeekOptions, getPlatformLabel } = useMeetingConfig();
 
 const props = withDefaults(defineProps<MeetingFormPropsT>(), {
   isSub: false,
@@ -44,9 +37,8 @@ const props = withDefaults(defineProps<MeetingFormPropsT>(), {
 });
 const message = useMessage(null);
 
-const cycleTypeOptions = ref(CYCLE_TYPE_OPTIONS0);
-
-const weekOptions = ref(INTERVAL_WEEK_OPTIONS);
+const cycleTypeOptions = cycleTypeOptions0;
+const weekOptions = intervalWeekOptions;
 
 const intervalTypeMax = computed(() => {
   return findLabelFromOptions(form.value.cycle_type, cycleTypeOptions.value, 'max');
@@ -616,9 +608,10 @@ defineExpose({
       </OFormItem>
       <OFormItem :label="t('meeting.meetingPlatform')" field="platform" :rules="rules.platform">
         <ORadioGroup v-model="form.platform" v-if="!data" :disabled="form.is_cycle">
-          <ORadio v-for="item in typeOptions" :key="item.value" :value="item.value">{{ item.label }}</ORadio>
+          <ORadio v-for="item in typeOptions" :key="item.value" :value="item.value">{{ getPlatformLabel(item.label) }}
+          </ORadio>
         </ORadioGroup>
-        <span v-else>{{ form.platform }}</span>
+        <span v-else>{{ getPlatformLabel(form.platform) }}</span>
       </OFormItem>
       <OFormItem field="agenda" :label="t('meeting.meetingAgenda')" :rules="rules.genda">
         <OTextarea
@@ -639,7 +632,7 @@ defineExpose({
               <OIcon>
                 <IconTip />
               </OIcon>
-              <span>{{ t('meeting.meetingRecordDesc', [form.platform]) }}</span>
+              <span>{{ t('meeting.meetingRecordDesc', [getPlatformLabel(form.platform)]) }}</span>
             </div>
           </div>
         </template>
@@ -651,7 +644,7 @@ defineExpose({
             <OIcon>
               <IconTip />
             </OIcon>
-            <span>{{ t('meeting.meetingRecordDesc', [form.platform]) }}</span>
+            <span>{{ t('meeting.meetingRecordDesc', [getPlatformLabel(form.platform)]) }}</span>
           </div>
         </div>
       </template>

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -23,12 +23,12 @@ import OMeetingDetail from './components/OMeetingDetail.vue';
 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';
+import { INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from './config.ts';
 import { formatDate, getDateNumber } from './utils.ts';
-import { getPointStr } from './utils.ts';
+import { useMeetingConfig } from './composables/useMeetingConfig';
 import { useDebounceFn } from '@vueuse/core';
 import { useScreen } from '@opendesign-plus/composables';
-import { Locales, useI18n } from '@/i18n';
+import { Locales } from '@/i18n';
 import IconCopy from '~icons/meeting/icon-copy.svg';
 
 const message = useMessage(null);
@@ -40,7 +40,7 @@ const list = ref<MeetingItemT[]>([]); // 列表数据
 const originList = ref([]); // 原始数据
 const canLoadMore = computed(() => total.value === null || originList.value.length < total.value);
 const reloadAll = ref(false); // 是否需要清空数据
-const { t, locale } = useI18n();
+const { t, locale, weekDay, getPointStr, getWeekFromDate } = useMeetingConfig();
 const isEn = computed(() => locale.value === Locales.EN);
 
 const props = withDefaults(defineProps<{
@@ -426,10 +426,6 @@ const groupList = computed(() => {
   }, []);
 });
 
-const getWeekFromDate = (date) => {
-  return WEEKDAY[dayjs(date).day()];
-};
-
 // -------------------- 处理滚动事件 --------------------
 const scrollerRef = ref();
 watch(
@@ -875,10 +871,10 @@ const cancelActions = computed<DialogActionT[]>(() => {
 
         .el-calendar__header {
           border-bottom: 1px solid var(--o-color-control4);
+          color: var(--o-color-info1);
 
           & > span {
             font-weight: 500;
-            color: var(--o-color-info1);
             @include h1;
           }
 
@@ -894,6 +890,10 @@ const cancelActions = computed<DialogActionT[]>(() => {
               &:hover {
                 color: var(--o-color-primary1);
               }
+
+              svg path {
+                fill: currentColor;
+              }
             }
           }
         }

package/src/components/meeting/OSigMeetingCalendar.vue

@@ -6,19 +6,17 @@ import IconTips from '~icons/components/icon-tips.svg';
 import OSigMeetingAside from './components/OSigMeetingAside.vue';
 import { CalendarDataType, MeetingItemT } from './types.ts';
 import { useScreen } from '@opendesign-plus/composables';
-import { MEETING_TABS } from './config.ts';
+import { useMeetingConfig } from './composables/useMeetingConfig';
 import OMeetingCalendarList from '@/components/meeting/components/OMeetingCalendarList.vue';
-import { useI18n } from '@/i18n';
 
 const props = defineProps<{
-  //sig name
   sigName: String;
   getMeetingListRequest: any;
   getDateListRequest: any;
   getEventsListRequest: any;
   dates: String[];
 }>();
-const { t } = useI18n();
+const { t, meetingTabs } = useMeetingConfig();
 const { lePadV } = useScreen();
 const selectDate = ref<string>('');
 
@@ -257,7 +255,7 @@ onMounted(() => {
         </OPopover>
       </div>
       <OTab v-model="tabType" @change="selectTab" :line="false">
-        <OTabPane v-for="item in MEETING_TABS.slice(0, -1)" :key="item.value" :value="item.value">
+        <OTabPane v-for="item in meetingTabs.slice(0, -1)" :key="item.value" :value="item.value">
           <template #nav>
             <OIcon>
               <component :is="item.icon" />
@@ -312,7 +310,7 @@ onMounted(() => {
 .o-sig-meeting-calendar {
   width: 100%;
   background-color: var(--o-color-fill2);
-  border-radius: var(--o-radius-m);
+  border-radius: var(--o-radius-xs);
   margin-top: var(--o-gap-5);
   @include respond-to('phone') {
     .meeting-card-header {
@@ -353,6 +351,7 @@ onMounted(() => {
     .header-left {
       width: 35%;
       padding-bottom: 12px;
+      color: var(--o-color-info1);
     }
 
     .o-tab {

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

@@ -2,22 +2,15 @@
 import { OCollapse, OCollapseItem, ODivider, OIcon, OLink, OTag, useMessage } from '@opensig/opendesign';
 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, MeetingGroupType, MeetingItemT } from '../types.ts';
-
-import IconAll from '~icons/meeting/icon-all.svg';
-import IconEvent from '~icons/meeting/icon-event.svg';
-import IconSummit from '~icons/meeting/icon-summit.svg';
-import IconMeeting from '~icons/meeting/icon-meet.svg';
+import { MeetingGroupType, MeetingItemT } from '../types.ts';
 import IconChevronRight from '~icons/components/icon-chevron-right.svg';
-import { CYCLE_TYPE_OPTIONS, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from '../config.ts';
-
-import { formatDate, getConfig, getPointStr } from '../utils.ts';
-import { useI18n } from '@/i18n';
-import { getActicityTypeMap } from '@/components/activity/config.ts';
+import { INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from '../config.ts';
+import { formatDate } from '../utils.ts';
+import { useMeetingConfig } from '../composables/useMeetingConfig';
+import { useActivityConfig } from '@/components/activity/composables/useActivityConfig';
 
-const acticityTypeMap = getActicityTypeMap();
+const { activityTypeMap } = useActivityConfig();
 
 const props = withDefaults(defineProps<{
   list: MeetingItemT[];
@@ -25,9 +18,9 @@ const props = withDefaults(defineProps<{
 }>(), {
   list: () => [],
 });
-const { t, locale } = useI18n();
+const { t, locale, getConfig, getPointStr } = useMeetingConfig();
 const detailRefs = ref([]);
-const message = useMessage();
+const message = useMessage(null);
 const copyInfo = async (idx) => {
   const instance = detailRefs.value[idx];
   await instance.copyInfo();
@@ -49,12 +42,6 @@ const i18n = computed(() => {
   };
 });
 
-const getCurrentIcon = (item) => {
-  if (item.type === 'summit') return IconSummit;
-  if (item.type === 'events') return IconEvent;
-  return IconMeeting;
-};
-
 // -------------------- 监听尺寸变化 --------------------
 const meetInfoRef = ref();
 const resizeObserver = new ResizeObserver((entries) => {
@@ -87,25 +74,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 }`,
-        };
+    if (type !== 'meeting') {
+      let activity_type = activityTypeMap.value.get(v.activity_type)?.label;
+      if (v.start && v.end) {
+        if (v.end_date === v.start_date) {
+          dateRange = `${ formatDate(v.start_date) } ${ v.start }-${ v.end }`;
+        } else {
+          dateRange = `${ formatDate(v.start_date) } ${ v.start }-${ formatDate(v.end_date) } ${ v.end }`;
+        }
+      } else {
+        dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD HH:mm') } ${ formatDate(v.end_date, 'YYYY/MM/DD HH:mm') }`;
       }
+
       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 {
-        ...v,
         dateRange,
       };
     }
@@ -407,6 +390,10 @@ const computedList = computed(() => {
 
       .o-icon {
         font-size: 16px;
+
+        svg path {
+          fill: currentColor;
+        }
       }
     }
 
@@ -421,6 +408,10 @@ const computedList = computed(() => {
       color: var(--o-color-info1);
       @include text2;
 
+      @include respond-to('<=pad_v') {
+        @include h3;
+      }
+
       .tag-wrapper {
         margin-left: var(--o-gap-2);
 
@@ -438,7 +429,7 @@ const computedList = computed(() => {
         margin-right: var(--icon-right);
         width: var(--icon-size2);
         height: var(--icon-size2);
-        font-size: var(--icon-size2);
+        font-size: calc(var(--icon-size2) - 4px);
 
         svg path {
           fill: currentColor;

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

@@ -1,18 +1,18 @@
 <script setup lang="ts">
 import { OLink } from '@opensig/opendesign';
 import { computed, ref } from 'vue';
-import { CalendarDataType, MeetingItemT } from '@/components/meeting/types.ts';
+import { CalendarDataType, MeetingItemT } from '../types.ts';
 import MoreText from '@/components/common/MoreText.vue';
-import { Locales, useI18n } from '@/i18n';
-import { formatDate, getPlatformLabel } from '@/components/meeting/utils.ts';
+import { formatDate } from '@/components/meeting/utils.ts';
+import { useMeetingConfig } from '../composables/useMeetingConfig';
 
 const props = defineProps<{
   data: MeetingItemT;
   from?: string;
   show: boolean;
 }>();
-const { t, locale } = useI18n();
-const isZh = computed(() => locale.value === Locales.ZH);
+const { t, getPlatformLabel } = useMeetingConfig();
+
 // 会议详情配置
 const infoList = computed(() =>
   [
@@ -29,22 +29,23 @@ const infoList = computed(() =>
 
 
 const activityInfoList = computed(() => {
-  const isLive = props.data.activity_type === 2 || props.data.activity_type === '线上';
+  const isLive = props.data.live_url?.length > 0;
   return [
+    { label: t('meeting.activityDetail2'), key: 'agenda', ellipsis: true },
     { label: t('meeting.startDate'), key: 'start_date_time' },
     { label: t('meeting.endDate'), key: 'end_date_time' },
     { label: t('meeting.registrationDeadline'), key: 'register_end_date' },
-    { label: isLive ? t('meeting.livePlatform') : t('meeting.activityAddress'), key: 'address' },
+    { label: isLive ? t('meeting.livePlatform') : t('meeting.activityAddress'), key: isLive ? 'live_url' : 'address' },
     { label: t('meeting.activityDetailUrl'), key: 'content_url', isLink: true },
     { label: t('meeting.activityApprover'), key: 'approver' },
     { label: t('meeting.reviewNotesLabel'), key: 'approve_record', isRecord: true },
-  ].slice(0, props.from === 'home' ? 4 : 7);
+  ].slice(0, props.from === 'home' ? 5 : 8);
 });
 const activityInfoApprovalList = computed(() => {
-  const isLive = props.data.activity_type === 2 || props.data.activity_type === '线上';
+  const isLive = props.data.live_url?.length > 0;
   return [
     { label: t('meeting.activityType'), key: 'activity_type', isType: true },
-    { label: isLive ? t('meeting.livePlatform') : t('meeting.activityAddress'), key: 'address' },
+    { label: isLive ? t('meeting.livePlatform') : t('meeting.activityAddress'), key: isLive ? 'live_url' : 'address' },
     { label: t('meeting.startDate'), key: 'start_date_time' },
     { label: t('meeting.endDate'), key: 'end_date_time' },
     { label: t('meeting.registrationDeadline'), key: 'register_end_date' },
@@ -56,7 +57,7 @@ const activityInfoApprovalList = computed(() => {
 });
 
 const columns = computed(() => {
-  if (props.data.type === CalendarDataType.ACTIVITY || props.data.type === CalendarDataType.EVENTS) {
+  if (props.data.type === CalendarDataType.EVENTS) {
     if (props.page === CalendarDataType.APPROVAL) {
       return activityInfoApprovalList.value;
     }
@@ -139,7 +140,7 @@ defineExpose({ copyInfo });
     font-size: 14px;
     gap: var(--o-gap-5);
 
-    @include respond-to('phone') {
+    @include respond-to('<=pad_v') {
       font-size: 12px;
       gap: var(--o-gap-2);
     }

package/src/components/meeting/components/OSigMeetingAside.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { OIcon, OIconArrowLeft, OIconArrowRight } from '@opensig/opendesign';
 import IconMeetinging from '~icons/meeting/icon-meet.svg';
-import { getConfig } from '@/components/meeting/utils.ts';
+import { useMeetingConfig } from '@/components/meeting/composables/useMeetingConfig';
 import { CalendarDataType } from '@/components/meeting';
 
+const { getConfig } = useMeetingConfig();
+
 const props = defineProps<{
   data: any[];
   current: number;
@@ -132,6 +134,7 @@ const changeMonth = (step) => {
         .day-d {
           font-weight: 500;
           margin-bottom: var(--o-gap-1);
+          color: var(--o-color-info1);
         }
 
         .day-c {

package/src/components/meeting/composables/useMeetingConfig.ts

@@ -0,0 +1,108 @@
+import { computed } from 'vue';
+import dayjs from 'dayjs';
+import { useI18n } from '@/i18n';
+import IconAll from '~icons/meeting/icon-all.svg';
+import IconEvent from '~icons/meeting/icon-event.svg';
+import IconMeeting from '~icons/meeting/icon-meet.svg';
+import IconSummit from '~icons/meeting/icon-summit.svg';
+import { CalendarDataType, meetingTabT, OptionItemT } from '../types';
+import { INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK, TYPE_COLOR_MAP } from '../config';
+
+export const useMeetingConfig = () => {
+  const { t, locale } = useI18n();
+
+  const meetingTabs = computed<meetingTabT[]>(() => [
+    { label: t('meeting.meetingTypeAll'), value: CalendarDataType.ALL, icon: IconAll },
+    { label: t('meeting.meetingTypeMeet'), value: CalendarDataType.MEETING, icon: IconMeeting, color: TYPE_COLOR_MAP.meeting, zIndex: 3 },
+    { label: t('meeting.meetingTypeEvents'), value: CalendarDataType.EVENTS, icon: IconEvent, color: TYPE_COLOR_MAP.events, zIndex: 2 },
+    { label: t('meeting.meetingTypeSummit'), value: CalendarDataType.SUMMIT, icon: IconSummit, color: TYPE_COLOR_MAP.summit, zIndex: 1 },
+  ]);
+
+  const cycleTypeOptions0 = computed<OptionItemT[]>(() => [
+    { label: t('meeting.day0'), value: INTERVAL_DAY, max: 7 },
+    { label: t('meeting.week0'), value: INTERVAL_WEEK, max: 2 },
+    { label: t('meeting.month0'), value: INTERVAL_MONTH, max: 1 },
+  ]);
+
+  const cycleTypeOptions = computed<OptionItemT[]>(() => [
+    { label: t('meeting.day'), value: INTERVAL_DAY, max: 7 },
+    { label: t('meeting.week'), value: INTERVAL_WEEK, max: 2 },
+    { label: t('meeting.month'), value: INTERVAL_MONTH, max: 1 },
+  ]);
+
+  const weekDay = computed(() => [
+    t('meeting.sunday'),
+    t('meeting.monday'),
+    t('meeting.tuesday'),
+    t('meeting.wednesday'),
+    t('meeting.thursday'),
+    t('meeting.friday'),
+    t('meeting.saturday'),
+  ]);
+
+  const intervalWeekOptions = computed(() => {
+    const list: OptionItemT[] = [];
+    for (let i = 1; i <= 7; i++) {
+      const idx = i % 7;
+      list.push({ value: idx, label: weekDay.value[idx] });
+    }
+    return list;
+  });
+
+  const getPointStr = (cycleType: number, points: number[]) => {
+    if (cycleType === INTERVAL_WEEK) {
+      return points
+        .sort((a, b) => {
+          const aIdx = intervalWeekOptions.value.findIndex((v) => v.value === a);
+          const bIdx = intervalWeekOptions.value.findIndex((v) => v.value === b);
+          return aIdx - bIdx;
+        })
+        .map((point: number) => {
+          const opt = intervalWeekOptions.value.find((v) => v.value === point);
+          return opt?.label || String(point);
+        })
+        .join(t('meeting.cycleSplit'));
+    }
+    if (cycleType === INTERVAL_MONTH) {
+      return points.join(t('meeting.cycleSplit'));
+    }
+    return '';
+  };
+
+  const getConfig = (val: CalendarDataType, key: keyof meetingTabT): string => {
+    let value = val;
+    const find: meetingTabT | undefined = meetingTabs.value.find(v => v.value === value);
+    return find?.[key] || '';
+  };
+
+  const getPlatformLabel = (platform: string) => {
+    switch (platform) {
+      case 'WELINK':
+        return 'WeLink';
+      case 'ZOOM':
+        return 'Zoom';
+      case 'TENCENT':
+        return locale.value === 'zh' ? '腾讯会议' : 'Tencent';
+      default:
+        return platform;
+    }
+  };
+
+  const getWeekFromDate = (date: string | Date) => {
+    return weekDay.value[dayjs(date).day()];
+  };
+
+  return {
+    t,
+    locale,
+    meetingTabs,
+    cycleTypeOptions0,
+    cycleTypeOptions,
+    weekDay,
+    intervalWeekOptions,
+    getPointStr,
+    getConfig,
+    getPlatformLabel,
+    getWeekFromDate,
+  };
+};

package/src/components/meeting/config.ts

@@ -1,11 +1,8 @@
+import { CalendarDataType, meetingTabT } from './types.ts';
 import IconAll from '~icons/meeting/icon-all.svg';
 import IconEvent from '~icons/meeting/icon-event.svg';
 import IconMeeting from '~icons/meeting/icon-meet.svg';
 import IconSummit from '~icons/meeting/icon-summit.svg';
-import { useI18n } from '@/i18n';
-import { CalendarDataType, meetingTabT } from './types.ts';
-
-const { t } = useI18n();
 
 const getMeetingColor = () => {
   if (typeof document !== 'undefined') {
@@ -22,8 +19,17 @@ export const TYPE_COLOR_MAP = {
   summit: 'rgba(var(--o-orange-6))',
   events: 'rgba(var(--o-cyan-6))',
   meeting: getMeetingColor(),
-};
-export const MEETING_TABS: meetingTabT[] = [
+};
+
+export const INTERVAL_DAY = 0;
+export const INTERVAL_WEEK = 1;
+export const INTERVAL_MONTH = 2;
+
+export const EMAIL_REGEX = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+
+export const PROGRESS_COLORS = ['var(--o-color-primary1)', 'var(--o-color-warning1)', 'var(--o-color-success1)'];
+
+export const getMeetingTabs = (t: (key: string) => string): meetingTabT[] => [
   {
     label: t('meeting.meetingTypeAll'),
     value: CalendarDataType.ALL,
@@ -50,72 +56,4 @@ export const MEETING_TABS: meetingTabT[] = [
     color: TYPE_COLOR_MAP.summit,
     zIndex: 1,
   },
-];
-
-
-export const INTERVAL_DAY = 0;
-export const INTERVAL_WEEK = 1;
-export const INTERVAL_MONTH = 2;
-
-export const CYCLE_TYPE_OPTIONS0 = [
-  {
-    label: t('meeting.day0'),
-    value: INTERVAL_DAY,
-    max: 7,
-  },
-  {
-    label: t('meeting.week0'),
-    value: INTERVAL_WEEK,
-    max: 2,
-  },
-  {
-    label: t('meeting.month0'),
-    value: INTERVAL_MONTH,
-    max: 1,
-  },
-];
-export const CYCLE_TYPE_OPTIONS = [
-  {
-    label: t('meeting.day'),
-    value: INTERVAL_DAY,
-    max: 7,
-  },
-  {
-    label: t('meeting.week'),
-    value: INTERVAL_WEEK,
-    max: 2,
-  },
-  {
-    label: t('meeting.month'),
-    value: INTERVAL_MONTH,
-    max: 1,
-  },
-];
-export const WEEKDAY = [
-  t('meeting.sunday'),
-  t('meeting.monday'),
-  t('meeting.tuesday'),
-  t('meeting.wednesday'),
-  t('meeting.thursday'),
-  t('meeting.friday'),
-  t('meeting.saturday'),
-];
-
-const getWeekOptions = () => {
-  const list = [];
-  for (let i = 1; i <= 7; i++) {
-    const idx = i % 7;
-    list.push({
-      value: idx,
-      label: WEEKDAY[idx],
-    });
-  }
-  return list;
-};
-
-export const INTERVAL_WEEK_OPTIONS = getWeekOptions();
-
-
-export const EMAIL_REGEX = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
-
-export const PROGRESS_COLORS = ['var(--o-color-primary1)', 'var(--o-color-warning1)', 'var(--o-color-success1)'];
+];

package/src/components/meeting/index.ts

@@ -12,7 +12,7 @@ const OMeetingCalendar = Object.assign(_OMeetingCalendar, {
 });
 const OMeetingForm = Object.assign(_OMeetingForm, {
   install(app: App) {
-    app.component('OMeetingCalendar', _OMeetingForm);
+    app.component('OMeetingForm', _OMeetingForm);
   },
 });
 

package/src/components/meeting/types.ts

@@ -53,6 +53,7 @@ export interface MeetingCalendarPropsT {
   hiddenEvents?: boolean;
   hiddenSummit?: boolean;
   groupType: MeetingGroupType;
+  groups: string[];
 }
 // 会议新增、修改
 export interface MeetingPostT {
@@ -109,6 +110,7 @@ export interface MeetingItemT extends MeetingPostT {
   update_time: string;
   time: string; // 处理一下时间范围
   cycle_sub: any[];
+  live_url?: string;
 }
 
 export interface PageParamsT {