@opendesign-plus-test/components 0.0.1-rc.64 → 0.0.1-rc.65

package/package.json

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

package/src/components/meeting/OMeetingCalendar.vue

@@ -84,15 +84,15 @@ const getSummitData = async (date: string) => {
       let cur = dayjs(v.start_date);
       const end = dayjs(v.end_date);
       while (!cur.isAfter(end)) {
-        dates.push(cur.format('YYYY-MM-DD'));
+        dates.push(formatDate(cur));
         cur = cur.add(1, 'day');
       }
       return {
         ...v,
         dates,
         type: CalendarDataType.SUMMIT,
-        start_date_time: `${ formatDate(v.start_date) } ${ v.start || '' }`,
-        end_date_time: `${ formatDate(v.end_date) } ${ v.end || '' }`,
+        start_date_time: `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start || '' }`,
+        end_date_time: `${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end || '' }`,
       };
     });
   } else {
@@ -108,15 +108,15 @@ const getActivityData = async (date: string) => {
       let cur = dayjs(v.start_date);
       const end = dayjs(v.end_date);
       while (!cur.isAfter(end)) {
-        dates.push(cur.format('YYYY-MM-DD'));
+        dates.push(formatDate(cur));
         cur = cur.add(1, 'day');
       }
       return {
         ...v,
         dates,
         type: CalendarDataType.EVENTS,
-        start_date_time: `${ formatDate(v.start_date) } ${ v.start || '' }`,
-        end_date_time: `${ formatDate(v.end_date) } ${ v.end || '' }`,
+        start_date_time: `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start || '' }`,
+        end_date_time: `${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end || '' }`,
       };
     });
   } else {
@@ -170,8 +170,8 @@ const paramGetDaysData = async (params: { date: string; type: string }) => {
 const renderData = computed(() => {
   return [
     ...meetingData.value,
-    ...eventsData.value.filter(v => (!dayjs(v.start_date).isAfter(dayjs(currentDay.value)) && !dayjs(currentDay.value).isAfter(dayjs(v.end_date))) || v.dates?.includes(currentDay.value)),
-    ...summitData.value.filter(v => v.dates?.includes(currentDay.value)),
+    ...eventsData.value.filter(v => (!dayjs(v.start_date).isAfter(dayjs(currentDay.value)) && !dayjs(currentDay.value).isAfter(dayjs(v.end_date))) || v.dates?.includes(formatDate(currentDay.value))),
+    ...summitData.value.filter(v => v.dates?.includes(formatDate(currentDay.value))),
   ].filter((v) => {
     if (tabType.value === CalendarDataType.ALL) {
       return true;
@@ -413,7 +413,11 @@ defineExpose({
           <OScroller class="meeting-list" show-type="hover" size="small" :style="{
             '--height': calendarHeight
           }">
-            <OMeetingCalendarList :list="renderData as unknown as MeetingItemT[]" :groupType="groupType">
+            <OMeetingCalendarList
+              :list="renderData as unknown as MeetingItemT[]"
+              :groupType="groupType"
+              :disableFormat="disableFormat"
+            >
               <template #empty>
                 <slot name="empty"></slot>
               </template>

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

@@ -24,6 +24,7 @@ const { activityTypeMap } = useActivityConfig();
 const props = withDefaults(defineProps<{
   list: MeetingItemT[];
   groupType?: MeetingGroupType;
+  disableFormat?: boolean;
 }>(), {
   list: () => [],
 });
@@ -94,15 +95,15 @@ const computedList = computed<any[]>(() => {
       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 }`;
+          dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start } - ${ v.end }`;
         } else {
-          dateRange = `${ formatDate(v.start_date) } ${ v.start }-${ formatDate(v.end_date) } ${ v.end }`;
+          dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end }`;
         }
       } else {
         if (v.start_date === v.end_date) {
-          dateRange = formatDate(v.start_date);
+          dateRange = props.disableFormat ? v.start_date : formatDate(v.start_date);
         } else {
-          dateRange = `${ formatDate(v.start_date) }-${ formatDate(v.end_date) }`;
+          dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
         }
       }
 
@@ -125,9 +126,9 @@ const computedList = computed<any[]>(() => {
       cycle_interval,
       cycle_point,
     } = v;
-    dateRange = `${ formatDate(date) } ${ start } - ${ end }`;
+    dateRange = `${ props.disableFormat ? date : formatDate(date) } ${ start } - ${ end }`;
     if (is_cycle) {
-      dateRange = `${ formatDate(cycle_start_date) } - ${ formatDate(cycle_end_date) }`;
+      dateRange = `${ props.disableFormat ? cycle_start_date : formatDate(cycle_start_date) } - ${ props.disableFormat ? cycle_end_date : formatDate(cycle_end_date) }`;
     }
 
     let timeRange = `${ start } - ${ end }`;

package/src/components/meeting/types.ts

@@ -55,6 +55,7 @@ export interface MeetingCalendarPropsT {
   hiddenSummit?: boolean;
   groupType: MeetingGroupType;
   groups: string[];
+  disableFormat?: boolean; //是否禁用日期格式化
 }
 
 // 会议新增、修改