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

package/src/components/activity/OMyActivityCalendar.vue

@@ -26,9 +26,19 @@ 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 { statusMap, acticityTypeMap } 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, activityTypeMap } = useActivityConfig();
+
+const formatMonthYear = (date: string | Date) => {
+  const d = dayjs(date || new Date());
+  return isZh.value ? d.format('YYYY MM月') : d.format('MMMM YYYY');
+};
 
 const message = useMessage(null);
 const { isPhone } = useScreen();
@@ -302,19 +312,19 @@ const confirm = () => {
     return;
   }
   dialogLoading.value = true;
-  props.revokeActivityRequest(currentRow.value?.id)
+props.revokeActivityRequest(currentRow.value?.id)
     .then(() => {
       message.success({
-        content: `“${ currentRow.value.title }”活动撤销审核成功`,
+        content: t('meeting.revokeActivitySuccess', [currentRow.value.title]),
       });
       reloadAll.value = true;
       getList();
     })
     .catch(() => {
       message.danger({
-        content: `“${ currentRow.value.title }”活动撤销审核失败`,
+        content: t('meeting.revokeActivityFail', [currentRow.value.title]),
       });
-    })
+    })
     .finally(() => {
       revokeVisible.value = false;
       dialogLoading.value = false;
@@ -362,21 +372,21 @@ const handleSubmitReviewItem = (val: ActivityItemT) => {
     approver,
     is_publish: 'true',
   } as ParamsItemT;
-  props.editActivityRequest(val.id, params)
+props.editActivityRequest(val.id, params)
     .then(() => {
       message.success({
-        content: `“${ val.title }”活动提交审核成功`,
+        content: t('meeting.submitReviewSuccess', [val.title]),
       });
       reloadAll.value = true;
       getList();
     })
     .catch(() => {
       message.danger({
-        content: `“${ val.title }”活动提交审核失败`,
+        content: t('meeting.submitReviewFail', [val.title]),
       });
     });
 };
-// 删除活动
+// 删除活动
 const deleteVisible = ref(false);
 const handleDeleteItem = (val: ActivityItemT) => {
   currentRow.value = val;
@@ -387,24 +397,24 @@ const confirmDelete = () => {
     return;
   }
   dialogLoading.value = true;
-  props.deleteActivityRequest(currentRow.value?.id)
+props.deleteActivityRequest(currentRow.value?.id)
     .then(() => {
       message.success({
-        content: `“${ currentRow.value.title }”活动删除成功`,
+        content: t('meeting.deleteActivitySuccess', [currentRow.value.title]),
       });
       reloadAll.value = true;
       getList();
     })
     .catch(() => {
       message.danger({
-        content: `“${ currentRow.value.title }”活动删除失败`,
+        content: t('meeting.deleteActivityFail', [currentRow.value.title]),
       });
     })
     .finally(() => {
       deleteVisible.value = false;
       dialogLoading.value = false;
     });
-};
+};
 const cancelDelete = () => {
   deleteVisible.value = false;
 };
@@ -459,7 +469,7 @@ const revokeActions = computed<DialogActionT[]>(() => {
     variant: 'outline',
     round: 'pill',
     size: 'large',
-    label: '确定',
+    label: t('meeting.confirmBtn'),
     onClick: () => {
       confirm();
     },
@@ -469,7 +479,7 @@ const revokeActions = computed<DialogActionT[]>(() => {
     variant: 'solid',
     round: 'pill',
     size: 'large',
-    label: '取消',
+    label: t('meeting.cancelBtn'),
     onClick: () => {
       cancel();
     },
@@ -483,7 +493,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     variant: 'outline',
     round: 'pill',
     size: 'large',
-    label: '确定',
+    label: t('meeting.confirmBtn'),
     onClick: () => {
       confirmDelete();
     },
@@ -493,7 +503,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     variant: 'solid',
     round: 'pill',
     size: 'large',
-    label: '取消',
+    label: t('meeting.cancelBtn'),
     onClick: () => {
       cancelDelete();
     },
@@ -505,7 +515,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
   <div class="o-my-activity-calendar">
     <div class="activity-list">
       <div v-if="isPhone" class="list-calendar-mb">
-        <span>{{ (selectedDate ? dayjs(new Date(selectedDate)) : dayjs()).format('YYYY MM月') }}</span>
+        <span>{{ formatMonthYear(selectedDate) }}</span>
         <span>
           <OIcon @click="changeMonth('prev-month')"><OIconChevronLeft /></OIcon>
           <OIcon @click="changeMonth('next-month')"><OIconChevronRight /></OIcon>
@@ -514,7 +524,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
       <div class="left-calendar">
         <ElCalendar ref="calendarRef" v-model="selectedDate">
           <template #header>
-            <span>{{ (selectedDate ? dayjs(new Date(selectedDate)) : dayjs()).format('YYYY MM月') }}</span>
+            <span>{{ formatMonthYear(selectedDate) }}</span>
             <div>
               <OIcon @click="changeMonth('prev-month')">
                 <OIconChevronLeft />
@@ -558,7 +568,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                   <OIcon>
                     <OIconArrowLeft />
                   </OIcon>
-                  <span>上个月</span>
+                  <span>{{ t('meeting.preMonth') }}</span>
                 </div>
                 <div class="act-item" :class="idx === activityList.length - 1 && 'last-item'">
                   <div
@@ -610,21 +620,21 @@ const deleteActions = computed<DialogActionT[]>(() => {
                               variant="outline"
                               :class="[`tag-${row.is_delete ? 'delete' : statusMap.get(row.status)?.id}`]">
                               {{
-                                row.is_delete === 1 ? '已取消' : statusMap.get(row.status)?.text
+                                row.is_delete === 1 ? t('meeting.statusCanceled') : statusMap.get(row.status)?.text
                               }}
                             </OTag>
                           </div>
                           <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>
                       <div class="item-header-right"
                            v-if="row.content_url && !row.is_delete && [3,4,5,6].includes(row.status)">
                         <OLink v-if="row.content_url" :href="row.content_url" target="_blank" rel="noopener noreferrer">
-                          活动详情
+                          {{ t('meeting.activityDetail') }}
                           <template #suffix>
                             <OIcon>
                               <OIconChevronRight></OIconChevronRight>
@@ -642,7 +652,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           target="_blank"
                           rel="noopener noreferrer"
                         >
-                          我要报名
+                          {{ t('meeting.registerNow') }}
                           <template #suffix>
                             <OIcon>
                               <OIconChevronRight></OIconChevronRight>
@@ -666,25 +676,25 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           variant="text"
                           @click="handleRevokeItem(row)"
                         >
-                          撤销审核
+                          {{ t('meeting.withdrawReview') }}
                         </OButton>
                         <OButton
                           v-if="row.status === 1 || row.status === 3 || row.status === 4 || row.status === 7"
                           variant="text" @click="handleEditItem(row)"
                         >
-                          修改活动
+                          {{ t('meeting.modifyActivity') }}
                         </OButton>
                         <OButton
                           v-if="row.status === 1 || row.status === 7" variant="text"
                           @click="handleDeleteItem(row)"
                         >
-                          删除活动
+                          {{ t('meeting.deleteActivity') }}
                         </OButton>
                         <OButton
                           v-if="row.status === 1 || row.status === 7" variant="text"
                           @click="handleSubmitReviewItem(row)"
                         >
-                          提交审核
+                          {{ t('meeting.submitReview') }}
                         </OButton>
                       </div>
                     </div>
@@ -692,12 +702,12 @@ const deleteActions = computed<DialogActionT[]>(() => {
                   <div class="height-placeholder"></div>
                 </div>
                 <template v-if="idx === activityList.length - 1">
-                  <div class="load-text" v-if="bottomReached">加载中···</div>
+                  <div class="load-text" v-if="bottomReached">{{ t('meeting.loading') }}</div>
                   <div class="list-month-change next-month" @click="changeMonth('next-month')">
                     <OIcon>
                       <OIconArrowRight />
                     </OIcon>
-                    <span>下个月</span>
+                    <span>{{ t('meeting.nextMonth') }}</span>
                   </div>
                 </template>
               </template>
@@ -709,17 +719,17 @@ const deleteActions = computed<DialogActionT[]>(() => {
       </div>
     </div>
   </div>
-  <!-- 撤销审核弹窗 -->
+<!-- 撤销审核弹窗 -->
   <ODialog v-model:visible="revokeVisible" main-class="handle-dialog-active" :actions="revokeActions">
-    <template #header>撤销审核</template>
-    <div class="dialog-content">是否确认要撤销“{{ currentRow.title }}”活动？撤销审核后活动将变成草稿状态。</div>
+    <template #header>{{ t('meeting.withdrawReview') }}</template>
+    <div class="dialog-content">{{ t('meeting.confirmRevokeActivity', [currentRow.title]) }}</div>
   </ODialog>
   <!-- 删除活动弹窗 -->
   <ODialog v-model:visible="deleteVisible" main-class="handle-dialog-active" :actions="deleteActions">
-    <template #header>删除活动</template>
-    <div class="dialog-content">是否确认删除“{{ currentRow.title }}”活动？删除后记录将不再我的个人中心呈现。</div>
+    <template #header>{{ t('meeting.deleteActivity') }}</template>
+    <div class="dialog-content">{{ t('meeting.confirmDeleteActivity', [currentRow.title]) }}</div>
   </ODialog>
-</template>
+</template>
 
 <style lang="scss">
 

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,130 +1 @@
-export const acticityTypeMap = new Map([
-  [
-    1,
-    {
-      label: '线下',
-      value: 1,
-    },
-  ],
-  [
-    2,
-    {
-      label: '线上',
-      value: 2,
-    },
-  ],
-  [
-    3,
-    {
-      label: '线上与线下',
-      value: 3,
-    },
-  ],
-]);
-
-export const WEBSITE_REGEXP = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w ./?%&=-]*)?$/;
-
-
-export const statusMap = new Map([
-  [
-    1,
-    {
-      id: 'draft',
-      label: '草稿',
-      text: '草稿',
-      value: 1,
-    },
-  ],
-  [
-    2,
-    {
-      id: 'under-review',
-      label: '审核中',
-      text: '未审核',
-      value: 2,
-    },
-  ],
-  [
-    3,
-    {
-      id: 'registration',
-      label: '报名中',
-      text: '审核通过',
-      value: 3,
-    },
-  ],
-  [
-    4,
-    {
-      id: 'in-progress',
-      label: '进行中',
-      text: '审核通过',
-      value: 4,
-    },
-  ],
-  [
-    5,
-    {
-      id: 'ended',
-      label: '已结束',
-      text: '已结束',
-      value: 5,
-    },
-  ],
-  [
-    6,
-    {
-      id: 'modified',
-      label: '已修改',
-      text: '已修改',
-      value: 6,
-    },
-  ],
-  [
-    7,
-    {
-      id: 'reject',
-      label: '已驳回',
-      text: '已驳回',
-      value: 7,
-    },
-  ],
-]);
-
-export const approvalStatusMap = new Map([
-  [
-    'all',
-    {
-      label: '全部',
-      value: 'all',
-    },
-  ],
-  [
-    'rejected',
-    {
-      label: '已驳回',
-      value: 'rejected',
-    },
-  ],
-  [
-    'approved',
-    {
-      label: '已通过',
-      value: 'approved',
-    },
-  ],
-  [
-    'publish',
-    {
-      label: '未审核',
-      value: 'publish',
-    },
-  ],
-  [
-    'cancel',
-    {
-      label: '已取消',
-      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(