@opendesign-plus-test/components 0.0.1-rc.42 → 0.0.1-rc.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.42",
+  "version": "0.0.1-rc.43",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -32,7 +32,7 @@
     "dayjs": "^1.11.13",
     "video.js": "^8.23.7",
     "vue-dompurify-html": "^3.1.2",
-    "@opendesign-plus/composables": "0.0.1-rc.6",
+    "@opendesign-plus/composables": "0.0.1-rc.11",
     "@opendesign-plus/styles": "0.0.1-rc.2"
   },
   "devDependencies": {

package/src/components/OSourceCode.vue

@@ -6,28 +6,26 @@ import IconChevronDown from '~icons/components/icon-chevron-down.svg';
 
 interface CodeItemT {
   label: string;
-  url: string;
+  href: string;
   icon?: string;
+  target?: string;
 }
 
 interface CodePropsT {
   title?: string;
   options?: CodeItemT[];
-  url?: string;
+  href?: string;
+  target?: string;
   icon?: string;
   justify?: string;
 }
 
 withDefaults(defineProps<CodePropsT>(), {
-  title: undefined,
-  options: undefined,
-  url: undefined,
-  icon: undefined,
   justify: 'center',
 });
 
-const itemChange = (data: any) => {
-  window.open(data.url, '_blank');
+const itemChange = (data: Pick<CodeItemT, 'href' | 'target'>) => {
+  window.open(data.href, data.target ? data.target : '_blank');
 };
 
 const dropdownVisible = ref(false);
@@ -38,7 +36,7 @@ const visibleChange = (val: boolean) => {
 
 <template>
   <div class="source-code">
-    <div v-if="url" class="info-wrap" @click="itemChange({ url: url })">
+    <div v-if="href" class="info-wrap" @click="itemChange({ href: href, target: target })">
       <span class="title">{{ title }}</span>
       <OIcon v-if="icon">
         <component :is="icon" class="icon" />
@@ -57,7 +55,7 @@ const visibleChange = (val: boolean) => {
         <OIcon class="icon"><IconChevronDown /></OIcon>
       </div>
       <template #dropdown>
-        <ODropdownItem v-for="item in options" @click="itemChange(item)" :key="item.url" class="list" :style="{ '--dropdown-item-justify': justify }">
+        <ODropdownItem v-for="item in options" @click="itemChange(item)" :key="item.href" class="list" :style="{ '--dropdown-item-justify': justify }">
           {{ item.label }}
           <OIcon v-if="item.icon">
             <component :is="item.icon" class="icon" />

package/src/components/activity/OActivityApproval.vue

@@ -14,12 +14,12 @@ import {
 } from '@opensig/opendesign';
 import { useScreen } from '@opendesign-plus/composables';
 import { onMounted, watch, ref, reactive, computed } from 'vue';
-import { ActivityItemT, ActivityTablePropsT, ReviewParamsT, TypeOptionT } from './types';
+import { ActivityItemT, ActivityTablePropsT, ReviewParamsT } from './types';
 import { useActivityConfig } from './composables/useActivityConfig';
 import ThFilter from '../common/ThFilter.vue';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n } from '@/i18n';
-import { CalendarDataType } from '@/components/meeting';
+import { CalendarDataType, MeetingItemT } from '@/components/meeting';
 
 const { t, locale } = useI18n();
 const isZh = computed(() => locale.value === 'zh');
@@ -55,13 +55,12 @@ const sortTime = () => {
 
 // -------------------- 状态 --------------------
 const statusValue = ref();
-const statusOptions = computed<TypeOptionT[]>(() => {
-  let list: TypeOptionT[] | { label: string; value: string; }[] = [];
+const statusOptions = computed(() => {
+  const list: { label: string; value: string | number }[] = [];
   approvalStatusMap.value.forEach((item) => {
     list.push(item);
   });
   return list.slice(1);
-
 });
 const filterStatusList = () => {
   params.status = statusValue.value;
@@ -72,7 +71,7 @@ const filterStatusList = () => {
   }
 };
 
-const tableData = ref([]);
+const tableData = ref<ActivityItemT[]>([]);
 const total = ref(0);
 
 const COUNT_PER_PAGE = [10, 20, 30, 40];
@@ -93,7 +92,7 @@ const getData = async () => {
   }
   const res = await props.getTableDataRequest(paramsData);
   tableData.value = (res.data || [])
-    .map((item) => {
+    .map((item: ActivityItemT) => {
       const { start_date, end_date, start, end, activity_type } = item;
       return [
         {
@@ -144,14 +143,14 @@ const confirm = async () => {
   try {
     loading.value = true;
     const valid = await formRef.value?.validate();
-    if (valid.some((v) => !!v)) {
+    if (!valid || valid.some((v: any) => !!v)) {
       loading.value = false;
       return;
     }
     if (reviewStatus.value === 1) {
-      await props.approveActivityRequest(currentRow.value.id, form.value);
+      await props.approveActivityRequest(currentRow.value?.id, form.value);
     } else {
-      await props.rejectActivityRequest(currentRow.value.id, form.value);
+      await props.rejectActivityRequest(currentRow.value?.id, form.value);
     }
     getData();
     cancel();
@@ -175,9 +174,9 @@ const confirmCancel = async () => {
     try {
       loading.value = true;
       if (cancelStatus.value === 1) {
-        await props.cancelActivityRequest(currentRow.value.id, form.value);
+        await props.cancelActivityRequest(currentRow.value!.id, form.value);
       } else {
-        await props.deleteActivityRequest(currentRow.value.id, form.value);
+        await props.deleteActivityRequest(currentRow.value!.id, form.value);
       }
       getData();
       cancel();
@@ -224,16 +223,17 @@ const rejectItem = (row: ActivityItemT) => {
   reviewVisible.value = true;
 };
 
-const expandList = ref([]);
-const expandedRows = ref([]);
+const expandList = ref<string[]>([]);
+const expandedRows = ref<string[]>([]);
 
-const getActivityDetail = (val: number) => {
+const getActivityDetail = (id: number) => {
+  const val = id.toString();
   if (!props.getActivityDetailRequest) {
     return;
   }
   if (!expandList.value.includes(val)) {
     expandList.value.push(val);
-    props.getActivityDetailRequest(val).then((res) => {
+    props.getActivityDetailRequest(val).then((res: ActivityItemT) => {
       tableData.value?.forEach((item) => {
         if (item.id === res.id) {
           item.approve_record = res.approve_record;
@@ -250,26 +250,26 @@ const getActivityDetail = (val: number) => {
   }
 };
 
-const expandChange = (val) => {
+const expandChange = (val: ActivityItemT) => {
   getActivityDetail(val.id);
 };
 
-const getRowKey = (row) => {
-  return row.id;
+const getRowKey = (row: ActivityItemT): string => {
+  return row.id.toString();
 };
 
 // -------------------- 移动端 ---------------------
-const expanded = ref([]); // 展开的数据，id
-const change = (val: number[]) => {
+const expanded = ref<(string | number)[]>([]); // 展开的数据，id
+const change = (val: (string | number)[]) => {
   if (val.length) {
-    val.forEach((item: number) => {
-      getActivityDetail(item);
+    val.forEach((item) => {
+      getActivityDetail(item as number);
     });
   }
 };
 
-const detailRefs = ref({});
-const getDetailRefs = (insRef, id) => {
+const detailRefs = ref<Record<number, any>>({});
+const getDetailRefs = (insRef: any, id: number) => {
   if (insRef && id) {
     detailRefs.value[id] = insRef;
   }
@@ -345,7 +345,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
         <ElTableColumn type="expand">
           <template #default="props">
             <div class="expand-detail">
-              <OMeetingDetail :data="props.row" page="approval" show />
+              <OMeetingDetail :data="props.row" :page="CalendarDataType.APPROVAL" show />
             </div>
           </template>
         </ElTableColumn>
@@ -447,7 +447,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
     </div>
     <div v-else class="collapse-wrapper">
       <OCollapse v-model="expanded" :accordion="isPhone" @change="change">
-        <template v-for="(act, idx) in tableData" :key="act.id">
+        <template v-for="(act) in tableData" :key="act.id">
           <div class="title-top">
             <p class="act-title">{{ act.title }}</p>
             <OTag v-if="act.is_delete !== 1" color="primary" variant="outline"
@@ -502,7 +502,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
             <div class="activity-detail">
               <OMeetingDetail
                 :show="expanded.includes(act.id)"
-                :data="act"
+                :data="act as unknown as MeetingItemT"
                 :ref="(insRef) => getDetailRefs(insRef, act.id)"
                 :page="CalendarDataType.APPROVAL"
               />

package/src/components/activity/OActivityForm.vue

@@ -225,7 +225,7 @@ const approverList = computed(() => {
   return props.admins || [];
 });
 
-const typeValue = ref<string>('');
+const typeValue = ref<string | undefined>('');
 const typeOptions = ref<TypeOptionT[]>([]); // 活动类型
 activityTypeMap.value.forEach((item) => {
   typeOptions.value.push(item);
@@ -280,7 +280,7 @@ watch(
         organizer,
       } as ParamsItemT;
       form.value = { ...params };
-      typeValue.value = activityTypeMap.value.get(val.activity_type)?.label;
+      typeValue.value = activityTypeMap.value.get(Number(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 }`;
     }
@@ -292,7 +292,7 @@ const confirm = async (val: boolean) => {
   let type = isEdit.value ? t('meeting.modifyActivity') : val ? t('meeting.create') : t('meeting.saveDraft');
   try {
     const valid = await formRef.value?.validate();
-    if (valid.some((v) => !!v)) {
+    if (valid.some((v: any) => !!v)) {
       return;
     }
     loading.value = true;

package/src/components/activity/OMyActivityCalendar.vue

@@ -27,7 +27,7 @@ import type { ActivityItemT, MyActivityCalendarPropsT, ParamsItemT } from './typ
 import { useScreen } from '@opendesign-plus/composables';
 import { formatDate, getDateNumber } from '../meeting/utils';
 import { useActivityConfig } from './composables/useActivityConfig';
-import { CalendarDataType, PageParamsT } from '../meeting/types';
+import { CalendarDataType, MeetingItemT, PageParamsT } from '../meeting/types';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n, Locales } from '@/i18n';
 
@@ -47,19 +47,19 @@ const props = defineProps<MyActivityCalendarPropsT>();
 
 const emits = defineEmits(['edit']);
 const list = ref<ActivityItemT[]>([]); // 列表数据
-const originList = ref([]); // 原始数据
+const originList = ref<ActivityItemT[]>([]); // 原始数据
 
 const currentPage = ref(1); // 分页-当前页
 const pageSize = ref(50); // 分页-每页数量
-const total = ref(null); // 分页-总数
+const total = ref<number | null>(null); // 分页-总数
 const reloadAll = ref(false); // 是否需要清空数据
 
-const expanded = ref([]);  // 展开的数据，id
+const expanded = ref<number[]>([]);  // 展开的数据，id
 
 const nextLoading = ref(false);
 const bottomReached = ref(false);
 
-const canLoadMore = computed(() => originList.value.length < total.value || total.value === null);
+const canLoadMore = computed(() => total.value === null || originList.value.length < total.value);
 
 const getList = async () => {
   if (!props.getListRequest) {
@@ -69,7 +69,7 @@ const getList = async () => {
     return;
   }
   try {
-    if (total.value > 0 && (currentPage.value - 1) * pageSize.value > total.value) {
+    if (total.value !== null && total.value > 0 && (currentPage.value - 1) * pageSize.value > total.value) {
       return;
     }
     // 当月数据已加载完，手动切换下一月
@@ -99,7 +99,7 @@ const getList = async () => {
         ];
       })
       .flat()
-      .filter((v) => {
+      .filter((v: ActivityItemT) => {
         return v.start_date.slice(0, 7) === formatDate(selectedDate.value, 'YYYY-MM-DD').slice(0, 7);
       });
     if (reloadAll.value) {
@@ -143,7 +143,7 @@ const getActivityDetail = (val: number) => {
   }
   if (!expandList.value.includes(val)) {
     expandList.value.push(val);
-    props.getActivityDetailRequest(val).then((res) => {
+    props.getActivityDetailRequest(val).then((res: ActivityItemT) => {
       list.value?.forEach((item) => {
         if (item.id === res.id) {
           item.approve_record = res.approve_record;
@@ -153,20 +153,20 @@ const getActivityDetail = (val: number) => {
   }
 };
 
-const change = (val: number[]) => {
+const change = (val: (number | string)[]) => {
   if (val.length) {
-    val.forEach((item: number) => {
-      getActivityDetail(item);
+    val.forEach((item) => {
+      getActivityDetail(item as unknown as number);
     });
   }
 };
 
-const calcIfApproved = (date) => {
+const calcIfApproved = (date: string) => {
   const activityOfDate = list.value.filter((v) => v.start_date === date);
   return activityOfDate.length && activityOfDate.every((v) => v.status === 3 || v.status === 4);
 };
 
-const scrollerScroll = (el) => {
+const scrollerScroll = (el: any) => {
   const container = el.target;
   if (!container) return;
   const scrollTop = container.scrollTop; // 已经滚动的距离
@@ -183,7 +183,7 @@ const updateScroller = () => {
 
 // -------------------- 日历 --------------------
 const calendarRef = ref();
-const selectedDate = ref(dayjs().format('YYYY-MM-DD'));
+const selectedDate = ref<any>(dayjs().format('YYYY-MM-DD'));
 const allDateList = computed<string[]>(() => [...new Set(list.value.map((v) => v.start_date))].sort((a, b) => (dayjs(a).isBefore(dayjs(b)) ? -1 : 1)));
 const dateList = computed<string[]>(() =>
   [...new Set(list.value.filter((v) => !v.isExpired && !v.is_delete).map((v) => v.start_date))].sort((a, b) => (dayjs(a).isBefore(dayjs(b)) ? -1 : 1)),
@@ -231,8 +231,13 @@ const changeMonth = (val: string) => {
 
 
 // -------------------- 活动列表 --------------------
-const activityList = computed(() => {
-  return list.value.reduce((prev, cur) => {
+interface ActivityListItemT {
+  start_date: string;
+  list: ActivityItemT[];
+}
+
+const activityList = computed<ActivityListItemT[]>(() => {
+  return list.value.reduce((prev: ActivityListItemT[], cur: ActivityItemT) => {
     if (!prev.length) {
       return [
         {
@@ -256,13 +261,19 @@ const activityList = computed(() => {
 });
 
 // -------------------- 活动详情组件实例 --------------------
-const detailRefs = ref({});
-const getDetailRefs = (insRef, id) => {
+const detailRefs = ref<any>({});
+const getDetailRefs = (insRef: any, id: number) => {
   if (insRef && id) {
     detailRefs.value[id] = insRef;
   }
 };
-
+const copyInfo = async (idx: number) => {
+  const instance = detailRefs.value[idx];
+  await instance.copyInfo();
+  message.success({
+    content: t('common.copySuccess'),
+  });
+};
 // -------------------- 处理滚动事件 --------------------
 const scrollerRef = ref();
 const scrollToSelectedDate = (date: string) => {
@@ -312,11 +323,14 @@ const confirm = () => {
   if (!props.revokeActivityRequest) {
     return;
   }
+  if (!currentRow.value) {
+    return;
+  }
   dialogLoading.value = true;
   props.revokeActivityRequest(currentRow.value?.id)
     .then(() => {
       message.success({
-        content: t('meeting.revokeActivitySuccess', [currentRow.value.title]),
+        content: t('meeting.revokeActivitySuccess', [currentRow.value?.title]),
       });
       reloadAll.value = true;
       getList();
@@ -391,7 +405,7 @@ const confirmDelete = () => {
   props.deleteActivityRequest(currentRow.value?.id)
     .then(() => {
       message.success({
-        content: t('meeting.deleteActivitySuccess', [currentRow.value.title]),
+        content: t('meeting.deleteActivitySuccess', [currentRow.value?.title]),
       });
       reloadAll.value = true;
       getList();
@@ -495,6 +509,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     },
   }];
 });
+
 </script>
 
 <template>
@@ -653,7 +668,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                     <div class="activity-detail">
                       <OMeetingDetail
                         :show="expanded.includes(row.id)"
-                        :data="row"
+                        :data="row as unknown as MeetingItemT"
                         :ref="(insRef) => getDetailRefs(insRef, row.id)"
                       />
                       <div class="activity-btn" v-if="!row.isExpired && !row.is_delete">
@@ -708,12 +723,12 @@ const deleteActions = computed<DialogActionT[]>(() => {
   <!-- 撤销审核弹窗 -->
   <ODialog v-model:visible="revokeVisible" main-class="handle-dialog-active" :actions="revokeActions">
     <template #header>{{ t('meeting.withdrawReview') }}</template>
-    <div class="dialog-content">{{ t('meeting.confirmRevokeActivity', [currentRow.title]) }}</div>
+    <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>{{ t('meeting.deleteActivity') }}</template>
-    <div class="dialog-content">{{ t('meeting.confirmDeleteActivity', [currentRow.title]) }}</div>
+    <div class="dialog-content">{{ t('meeting.confirmDeleteActivity', [currentRow?.title]) }}</div>
   </ODialog>
 </template>
 
@@ -1259,6 +1274,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
             align-items: flex-start;
             gap: var(--o-gap-3);
             width: 100%;
+            padding-right: 48px;
             @include respond-to('phone') {
               flex-grow: 1;
               width: 100%;

package/src/components/activity/types.ts

@@ -14,10 +14,11 @@ export interface ParamsItemT {
   end: string; // 活动结束时间
   schedules?: string;
   is_publish: string; // 是否发布 true-发布审核 false-发布为草稿
-  update_activity_id?: string;
+  update_activity_id?: string | number;
   email_list?: string; // 邮件列表
   organizer?: string; // 主办方
   approver: string; // 审批人
+  status?: number; // 状态
 }
 
 export interface ActivityFormPropsT {
@@ -50,12 +51,18 @@ export interface ActivityItemT {
   live_address: string;
   register_end_date: string;
   register_url: string;
+  content_url: string;
   start: string;
   status: number; // 1-草稿 2-审核中 3-报名中 4-进行中 5-已结束 6-已修改 7-驳回
   synopsis: string;
   title: string;
   update_activity_id: number;
   user: string;
+  sponsor: string; // 创建人
+  create_time: string; // 创建时间
+  isExpired?: number; // 计算属性表示是否过期
+  sub_id?: string;
+  dateRange?: string;  // 计算属性
 }
 
 export interface ReviewParamsT {

package/src/components/common/MoreText.vue

@@ -23,7 +23,7 @@ const { t } = useI18n();
 const expanded = ref(false); // 是否展开
 const showBtn = ref(false); // 受否显示展开按钮
 const offsetHeight = ref(0); // 内容高度
-const contentRef = ref(null); // 内容节点
+const contentRef = ref<any>(null); // 内容节点
 
 onMounted(() => {
   determineHeight();

package/src/components/common/ThFilter.vue

@@ -58,7 +58,7 @@ const visible = ref(false); // 控制浮窗展示
 
 watch(
   () => props.modelValue,
-  (val: TItem) => {
+  (val: any) => {
     if (!props.multiple) {
       checked.value = val;
     } else {
@@ -67,16 +67,16 @@ watch(
   },
 );
 // -------------------- 普通多选 --------------------
-const multiChecked = ref([]); // 选中的值
+const multiChecked = ref<any>([]); // 选中的值
 
-const change = (val: string | number) => {
+const change = (val: (string | number)[]) => {
   multiChecked.value = val;
 };
 
 // -------------------- 级联选择 --------------------
 const cascaderValue = ref([]);
 // -------------------- 单选 --------------------
-const checked = ref(null); // 选中的值
+const checked = ref<any>(null); // 选中的值
 // 单选没有按钮，点击即是确认
 const handleCommand = (val: string | number) => {
   if (checked.value === val) {
@@ -115,8 +115,8 @@ const hasChecked = computed(() => {
   return multiChecked.value.length || cascaderValue.value.length || checked.value || props.modelValue;
 });
 // -------------------- 自定义级联选择器label --------------------
-const aref = ref(null);
-const clickLabelSpan = async (e) => {
+const aref = ref<any>(null);
+const clickLabelSpan = async (e: any) => {
   const ele = e.target.parentElement.parentElement;
   await nextTick();
   const input = ele.querySelector('input');
@@ -127,7 +127,7 @@ const clickLabelSpan = async (e) => {
   aref.value?.$forceUpdate();
   cascaderValue.value = JSON.parse(JSON.stringify(cascaderValue.value));
 };
-const renderLabel = ({ data }) => {
+const renderLabel = ({ data }: any) => {
   return h('span', { onclick: clickLabelSpan }, data.label);
 };
 </script>

package/src/components/element-plus/OElCookieNotice.vue

@@ -25,7 +25,7 @@ const emits = defineEmits<{
   (e: 'update:visible', value: boolean): void;
 }>();
 
-const { lePadV, isPhone } = useScreen();
+const { lePadV } = useScreen();
 const { locale, t } = useI18n();
 const isZh = computed(() => locale.value === 'zh');
 

package/src/components/events/OEventsList.vue

@@ -17,6 +17,7 @@ import { useI18n } from '@/i18n';
 
 import { CITY_MAP, DEFAULT_COVER } from './config.ts';
 import { useScreen } from '@opendesign-plus/composables';
+import dayjs from 'dayjs';
 
 const { t } = useI18n();
 const { lePadV } = useScreen();
@@ -84,12 +85,30 @@ const changeKeyword = () => {
 const list = computed(() => {
   return props.data
     .map((v: EventsCardItemT) => {
+      let startDate = v.startDate;
+      let endDate = v.endDate;
+      let dateStr = dayjs(v.date).format('YYYY/MM/DD');
+      if (startDate && endDate) {
+        const yearFirstDay = dayjs().format('YYYY-01-01');
+        if (compareDate(yearFirstDay, startDate)) {
+          startDate = yearFirstDay;
+        }
+        const yearLastDay = dayjs().format('YYYY-12-31');
+        if (compareDate(endDate, yearLastDay)) {
+          endDate = yearLastDay;
+        }
+        dateStr = `${ dayjs(startDate).format('YYYY/MM/DD') }-${ dayjs(endDate).format('MM/DD') }`;
+      }
       return {
         ...v,
-        status: !compareDate(new Date(), v.date as string) ? EventsStatusT.ING : EventsStatusT.FINISH,
+        startDate,
+        endDate,
+        dateStr,
+        status: !compareDate(new Date(), v.date || v.endDate as string) ? EventsStatusT.ING : EventsStatusT.FINISH,
+
       };
     })
-    .sort((a: EventsCardItemT, b: EventsCardItemT) => (compareDate(a.date as string, b.date as string) ? -1 : 1))
+    .sort((a: EventsCardItemT, b: EventsCardItemT) => (compareDate(a.date || a.endDate as string, b.date || b.endDate as string) ? -1 : 1))
     .map((v) => {
       const city = v.city?.replace('市', '')?.replace('中国', '')?.replaceAll(' ', '');
       let cover = null;
@@ -143,7 +162,7 @@ const list = computed(() => {
         </OTag>
         <div class="event-name">{{ item.name }}</div>
         <div class="event-desc">
-          <div class="event-date">{{ item.date }}</div>
+          <div class="event-date">{{ item.dateStr }}</div>
           <ODivider direction="v" />
           <div class="event-location" v-if="item.city">{{ item.city }}</div>
         </div>
@@ -249,18 +268,17 @@ const list = computed(() => {
       }
       @container (max-width: 300px) {
         height: 140px;
+        width: 100%;
         aspect-ratio: unset;
       }
 
       .o-card-cover {
         padding: 0;
+        height: 100%;
       }
 
-      .o-card-content {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
+      .o-card-main {
+        padding: 0;
         position: absolute;
         overflow: hidden; // 防止内容溢出
         box-sizing: border-box; // 确保 padding 计入总尺寸
@@ -268,11 +286,20 @@ const list = computed(() => {
         top: 0;
         width: 100%;
         height: 100%;
+      }
+      .o-card-content {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
         color: var(--o-color-white);
         text-align: center;
-        cursor: pointer;
         padding: var(--o-gap-6);
-        z-index: 10;
 
         @include respond-to('pad_v') {
           margin-top: var(--o-gap-4);

package/src/components/events/config.ts

@@ -17,7 +17,7 @@ export const EVENTS_ICON_MAP = {
   summit: IconSummit,
 };
 
-export const CITY_MAP = {
+export const CITY_MAP: Record<string, string | string[]> = {
   上海: 'https://infrastructure-website.osinfra.cn/picture/city/shanghai.jpg',
   北京: 'https://infrastructure-website.osinfra.cn/picture/city/beijing.jpg',
   南京: 'https://infrastructure-website.osinfra.cn/picture/city/nanjing.jpg',

package/src/components/events/types.ts

@@ -47,7 +47,10 @@ export interface StepItemT {
 // 活动列表
 export interface EventsCardItemT {
   name: string; // 事件名称
-  date: string; // 事件日期
+  date?: string; // 事件日期
+  startDate?: string; // 事件开始日期
+  endDate?: string; // 事件结束日期
+  dateStr?: string; // 经处理后的展示时间
   city: string; // 事件城市
   cover?: string; // 卡片封面，如果不传递，组件内部通过date计算得出
   status?: EventsStatusT; // 事件状态，不传递，组件内部通过date计算得出