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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.34",
+  "version": "0.0.1-rc.35",
   "type": "module",
   "publishConfig": {
     "access": "public",

package/src/components/activity/OActivityApproval.vue

@@ -15,15 +15,14 @@ import {
 import { useScreen } from '@opendesign-plus/composables';
 import { onMounted, watch, ref, reactive, computed } from 'vue';
 import { ActivityItemT, ActivityTablePropsT, ReviewParamsT, TypeOptionT } from './types';
-import { getApprovalStatusMap, getStatusMap } from './config';
+import { useActivityConfig } from './composables/useActivityConfig';
 import ThFilter from '../common/ThFilter.vue';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n } from '@/i18n';
 
 const { t, locale } = useI18n();
 const isZh = computed(() => locale.value === 'zh');
-const approvalStatusMap = getApprovalStatusMap();
-const statusMap = getStatusMap();
+const { approvalStatusMap, statusMap } = useActivityConfig();
 
 
 const message = useMessage(null);
@@ -58,7 +57,7 @@ const sortTime = () => {
 const statusValue = ref();
 const statusOptions = computed<TypeOptionT[]>(() => {
   let list: TypeOptionT[] | { label: string; value: string; }[] = [];
-  approvalStatusMap.forEach((item) => {
+  approvalStatusMap.value.forEach((item) => {
     list.push(item);
   });
   return list.slice(1);

package/src/components/activity/OActivityForm.vue

@@ -15,9 +15,10 @@ import { computed, ref, watch } from 'vue';
 import { ActivityFormPropsT, ParamsItemT } from './types';
 import { useScreen } from '@opendesign-plus/composables';
 import { dayjs, ElDatePicker } from 'element-plus';
-import { getActicityTypeMap, WEBSITE_REGEXP } from './config';
+import { WEBSITE_REGEXP } from './config';
 import { EMAIL_REGEX } from '@/components/meeting/config.ts';
 import { useI18n } from '@/i18n';
+import { useActivityConfig } from './composables/useActivityConfig';
 
 const emits = defineEmits(['confirm', 'close']);
 
@@ -25,7 +26,7 @@ const message = useMessage(null);
 const { lePadV } = useScreen();
 const { t } = useI18n();
 const $t = t;
-const acticityTypeMap = getActicityTypeMap();
+const { activityTypeMap } = useActivityConfig();
 
 interface TypeOptionT {
   label: string;
@@ -226,7 +227,7 @@ const approverList = computed(() => {
 
 const typeValue = ref<string>('');
 const typeOptions = ref<TypeOptionT[]>([]); // 活动类型
-acticityTypeMap.forEach((item) => {
+activityTypeMap.value.forEach((item) => {
   typeOptions.value.push(item);
 });
 const changeType = (val: SelectValueT) => {
@@ -279,7 +280,7 @@ watch(
         organizer,
       } as ParamsItemT;
       form.value = { ...params };
-      typeValue.value = acticityTypeMap.get(val.activity_type)?.label;
+      typeValue.value = activityTypeMap.value.get(val.activity_type)?.label;
       form.value.start_date = `${ form.value.start_date } ${ form.value.start }`;
       form.value.end_date = `${ form.value.end_date } ${ form.value.end }`;
     }

package/src/components/activity/OMyActivityCalendar.vue

@@ -26,15 +26,14 @@ import IconEvent from '~icons/meeting/icon-event.svg';
 import type { ActivityItemT, MyActivityCalendarPropsT, ParamsItemT } from './types';
 import { useScreen } from '@opendesign-plus/composables';
 import { formatDate, getDateNumber } from '../meeting/utils';
-import { getStatusMap, getActicityTypeMap } from './config';
+import { useActivityConfig } from './composables/useActivityConfig';
 import { PageParamsT } from '../meeting/types';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n, Locales } from '@/i18n';
 
 const { t, locale } = useI18n();
 const isZh = computed(() => locale.value === Locales.ZH);
-const statusMap = getStatusMap();
-const acticityTypeMap = getActicityTypeMap();
+const { statusMap, activityTypeMap } = useActivityConfig();
 
 const formatMonthYear = (date: string | Date) => {
   const d = dayjs(date || new Date());
@@ -628,7 +627,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           <div class="act-info">
                             <span class="date-range">{{ row.dateRange }}</span>
                             <ODivider direction="v"></ODivider>
-                            <span>{{ acticityTypeMap.get(row.activity_type)?.label }}</span>
+                            <span>{{ activityTypeMap.get(row.activity_type)?.label }}</span>
                           </div>
                         </div>
                       </div>

package/src/components/activity/composables/useActivityConfig.ts

@@ -0,0 +1,141 @@
+import { computed } from 'vue';
+import { useI18n } from '@/i18n';
+
+export const useActivityConfig = () => {
+  const { t } = useI18n();
+
+  const activityTypeMap = computed(() => new Map([
+    [
+      1,
+      {
+        label: t('meeting.offline'),
+        value: 1,
+      },
+    ],
+    [
+      2,
+      {
+        label: t('meeting.online'),
+        value: 2,
+      },
+    ],
+    [
+      3,
+      {
+        label: t('meeting.onlineOffline'),
+        value: 3,
+      },
+    ],
+  ]));
+
+  const statusMap = computed(() => new Map([
+    [
+      1,
+      {
+        id: 'draft',
+        label: t('meeting.statusDraft'),
+        text: t('meeting.statusDraft'),
+        value: 1,
+      },
+    ],
+    [
+      2,
+      {
+        id: 'under-review',
+        label: t('meeting.statusUnderReview'),
+        text: t('meeting.statusPending'),
+        value: 2,
+      },
+    ],
+    [
+      3,
+      {
+        id: 'registration',
+        label: t('meeting.statusRegistering'),
+        text: t('meeting.statusApproved'),
+        value: 3,
+      },
+    ],
+    [
+      4,
+      {
+        id: 'in-progress',
+        label: t('meeting.statusInProgress'),
+        text: t('meeting.statusApproved'),
+        value: 4,
+      },
+    ],
+    [
+      5,
+      {
+        id: 'ended',
+        label: t('meeting.statusEnded'),
+        text: t('meeting.statusEnded'),
+        value: 5,
+      },
+    ],
+    [
+      6,
+      {
+        id: 'modified',
+        label: t('meeting.statusModified'),
+        text: t('meeting.statusModified'),
+        value: 6,
+      },
+    ],
+    [
+      7,
+      {
+        id: 'reject',
+        label: t('meeting.statusRejected'),
+        text: t('meeting.statusRejected'),
+        value: 7,
+      },
+    ],
+  ]));
+
+  const approvalStatusMap = computed(() => new Map([
+    [
+      'all',
+      {
+        label: t('common.all'),
+        value: 'all',
+      },
+    ],
+    [
+      'rejected',
+      {
+        label: t('meeting.statusRejected'),
+        value: 'rejected',
+      },
+    ],
+    [
+      'approved',
+      {
+        label: t('meeting.statusApproved'),
+        value: 'approved',
+      },
+    ],
+    [
+      'publish',
+      {
+        label: t('meeting.statusPending'),
+        value: 'publish',
+      },
+    ],
+    [
+      'cancel',
+      {
+        label: t('meeting.statusCanceled'),
+        value: 'cancel',
+      },
+    ],
+  ]));
+
+  return {
+    t,
+    activityTypeMap,
+    statusMap,
+    approvalStatusMap,
+  };
+};

package/src/components/activity/config.ts

@@ -1,141 +1 @@
-import { useI18n } from '@/i18n';
-
-export const getActicityTypeMap = () => {
-  const { t } = useI18n();
-  return new Map([
-    [
-      1,
-      {
-        label: t('meeting.offline'),
-        value: 1,
-      },
-    ],
-    [
-      2,
-      {
-        label: t('meeting.online'),
-        value: 2,
-      },
-    ],
-    [
-      3,
-      {
-        label: t('meeting.onlineOffline'),
-        value: 3,
-      },
-    ],
-  ]);
-};
-
-export const WEBSITE_REGEXP = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w ./?%&=-]*)?$/;
-
-
-export const getStatusMap = () => {
-  const { t } = useI18n();
-  return new Map([
-    [
-      1,
-      {
-        id: 'draft',
-        label: t('meeting.statusDraft'),
-        text: t('meeting.statusDraft'),
-        value: 1,
-      },
-    ],
-    [
-      2,
-      {
-        id: 'under-review',
-        label: t('meeting.statusUnderReview'),
-        text: t('meeting.statusPending'),
-        value: 2,
-      },
-    ],
-    [
-      3,
-      {
-        id: 'registration',
-        label: t('meeting.statusRegistering'),
-        text: t('meeting.statusApproved'),
-        value: 3,
-      },
-    ],
-    [
-      4,
-      {
-        id: 'in-progress',
-        label: t('meeting.statusInProgress'),
-        text: t('meeting.statusApproved'),
-        value: 4,
-      },
-    ],
-    [
-      5,
-      {
-        id: 'ended',
-        label: t('meeting.statusEnded'),
-        text: t('meeting.statusEnded'),
-        value: 5,
-      },
-    ],
-    [
-      6,
-      {
-        id: 'modified',
-        label: t('meeting.statusModified'),
-        text: t('meeting.statusModified'),
-        value: 6,
-      },
-    ],
-    [
-      7,
-      {
-        id: 'reject',
-        label: t('meeting.statusRejected'),
-        text: t('meeting.statusRejected'),
-        value: 7,
-      },
-    ],
-  ]);
-};
-
-export const getApprovalStatusMap = () => {
-  const { t } = useI18n();
-  return new Map([
-    [
-      'all',
-      {
-        label: t('common.all'),
-        value: 'all',
-      },
-    ],
-    [
-      'rejected',
-      {
-        label: t('meeting.statusRejected'),
-        value: 'rejected',
-      },
-    ],
-    [
-      'approved',
-      {
-        label: t('meeting.statusApproved'),
-        value: 'approved',
-      },
-    ],
-    [
-      'publish',
-      {
-        label: t('meeting.statusPending'),
-        value: 'publish',
-      },
-    ],
-    [
-      'cancel',
-      {
-        label: t('meeting.statusCanceled'),
-        value: 'cancel',
-      },
-    ],
-  ]);
-};
+export const WEBSITE_REGEXP = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w ./?%&=-]*)?$/;

package/src/components/meeting/OMeetingCalendar.vue

@@ -17,10 +17,10 @@ import OMeetingCalendarList from './components/OMeetingCalendarList.vue';
 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 { Locales, useI18n } from '@/i18n';
-import { MEETING_TABS } from './config';
+import { Locales } from '@/i18n';
+import { useMeetingConfig } from './composables/useMeetingConfig';
 import { CalendarDataType, GroupItemT, MeetingCalendarPropsT, MeetingGroupType } from './types.ts';
-import { formatDate, getConfig } from './utils.ts';
+import { formatDate } from './utils.ts';
 import { useDebounceFn } from '@vueuse/core';
 
 const props = withDefaults(defineProps<MeetingCalendarPropsT>(), {
@@ -31,11 +31,10 @@ const props = withDefaults(defineProps<MeetingCalendarPropsT>(), {
   groupType: MeetingGroupType.SIG,
 });
 
-const { t, locale } = useI18n();
+const { t, locale, meetingTabs, getConfig } = useMeetingConfig();
 const isEn = computed(() => locale.value === Locales.EN);
 
-// -------------------- 获取存在会议的日期列表 --------------------
-const latestDay = ref<string>(''); // 截止当天最新的活动日期
+const latestDay = ref<string>('');
 const dateList = ref([]);
 const summitData = ref([]);
 const summitDates = ref([]);
@@ -43,11 +42,10 @@ const eventsData = ref([]);
 const eventsDates = ref([]);
 const allDates = ref<string[]>([]);
 const meetingData = ref([]);
-// 日历展示时间限制
 const limitTime = '2021-01-01';
-const tabType = ref(MEETING_TABS[0].value);
+const tabType = ref(CalendarDataType.ALL);
 const tabs = computed(() => {
-  let list = MEETING_TABS;
+  let list = meetingTabs.value;
   if (props.hiddenEvents) {
     list = list.filter((item) => item.value !== CalendarDataType.EVENTS);
   }

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(

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" />

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

@@ -11,13 +11,12 @@ 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 IconChevronRight from '~icons/components/icon-chevron-right.svg';
-import { CYCLE_TYPE_OPTIONS, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from '../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';
 
-import { formatDate, getConfig, getPointStr } from '../utils.ts';
-import { useI18n } from '@/i18n';
-import { getActicityTypeMap } from '@/components/activity/config.ts';
-
-const acticityTypeMap = getActicityTypeMap();
+const { activityTypeMap } = useActivityConfig();
 
 const props = withDefaults(defineProps<{
   list: MeetingItemT[];
@@ -25,7 +24,7 @@ const props = withDefaults(defineProps<{
 }>(), {
   list: () => [],
 });
-const { t, locale } = useI18n();
+const { t, locale, getConfig, getPointStr } = useMeetingConfig();
 const detailRefs = ref([]);
 const message = useMessage();
 const copyInfo = async (idx) => {
@@ -88,7 +87,7 @@ const computedList = computed(() => {
     const type = v.type;
     let dateRange = '';
     if (['activity'].includes(type)) {
-      let activity_type = acticityTypeMap.get(v.activity_type)?.label;
+      let activity_type = activityTypeMap.value.get(v.activity_type)?.label;
       if (v.end_date === v.start_date) {
         return {
           ...v,

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,8 +29,9 @@ 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' },
@@ -38,10 +39,10 @@ const activityInfoList = computed(() => {
     { 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' },

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;