@opendesign-plus-test/components 0.0.1-rc.22 → 0.0.1-rc.24

package/src/components/activity/types.ts

@@ -2,7 +2,6 @@
 export interface ParamsItemT {
   id?: number; // 活动id
   title: string; // 活动名称
-  organizer: string; // 活动主办方
   start_date: string; // 活动起始日期
   end_date: string; // 活动结束日期
   register_end_date: string; // 报名截止时间
@@ -17,8 +16,6 @@ export interface ParamsItemT {
   is_publish: string; // 是否发布 true-发布审核 false-发布为草稿
   update_activity_id?: string;
   approver: string; // 审批人
-  email_list: string;
-  content: string;
 }
 
 export interface ActivityFormPropsT {
@@ -75,4 +72,12 @@ export interface ActivityTablePropsT {
   approveActivityRequest: any;
   rejectActivityRequest: any;
   getActivityDetailRequest: any;
+}
+
+export interface MyActivityCalendarPropsT {
+  getListRequest: any;
+  revokeActivityRequest: any;
+  deleteActivityRequest: any;
+  editActivityRequest: any;
+  getActivityDetailRequest: any;
 }

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -750,39 +750,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
 <style lang="scss">
 .o-my-meeting-calendar {
 
-  .card-content-wrapper {
-    height: 100%;
-    @include respond-to('phone') {
-      padding-top: 0;
-      padding-left: 0;
-      padding-right: 0;
-    }
-
-    &::before {
-      content: '';
-      position: absolute;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      height: 32px;
-      z-index: 11;
-      background: linear-gradient(180deg, rgba(var(--o-gray-1), 0), rgba(var(--o-gray-1), 0.3) 25%, rgba(var(--o-gray-1), 1) 100%,);
-      @include respond-to('phone') {
-        display: none;
-      }
-    }
-
-    @include respond-to('phone') {
-      background-color: transparent;
-    }
-
-    .content-wrapper {
-      @include respond-to('<=pad_v') {
-        padding-top: 0;
-      }
-    }
-  }
-
   .header {
     display: flex;
     align-items: center;

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

@@ -26,27 +26,40 @@ const infoList = computed(() =>
   ].slice(0, props.from === 'my' ? 7 : 8),
 );
 
-const activityInfoList = ref([
-  {
-    label: t('meeting.startDate'),
-    key: 'start_date',
-  },
-  {
-    label: t('meeting.endDate'),
-    key: 'end_date',
-  },
-  {
-    label: t('meeting.activityAddress'),
-    key: 'address',
-  },
+
+const activityInfoList = computed(() =>
+  [
+    { label: '起始日期', key: 'start_date_time' },
+    { label: '结束日期', key: 'end_date_time' },
+    { label: '报名截止时间', key: 'register_end_date' },
+    { label: '活动详情地址', key: 'content_url', isLink: true },
+    { label: '活动地点', key: 'address' },
+    { label: '活动审批人', key: 'approver' },
+    { label: '审核备注', key: 'approve_record', isRecord: true },
+  ].slice(0, props.from === 'home' ? 4 : 7),
+);
+const activityInfoApprovalList = computed(() => [
+  { label: '活动类型', key: 'activity_type', isType: true },
+  { label: '活动地点', key: 'address' },
+  { label: '起始日期', key: 'start_date_time' },
+  { label: '结束日期', key: 'end_date_time' },
+  { label: '报名截止时间', key: 'register_end_date' },
+  { label: '报名网址', key: 'register_url', isLink: true },
+  { label: '活动详情地址', key: 'content_url', isLink: true },
+  { label: '活动审批人', key: 'approver' },
+  { label: '审核备注', key: 'approve_record', isRecord: true },
 ]);
 
 const columns = computed(() => {
-  if (['events', 'summit'].includes(props.data.type)) {
+  if (props.data.type === 'activity') {
+    if (props.page === 'approval') {
+      return activityInfoApprovalList.value;
+    }
     return activityInfoList.value;
   }
   return infoList.value;
 });
+
 const domRef = ref([]);
 // 复制会议内容
 const copyInfo = () => {

package/src/components/meeting/components/OMyCalendarWrapper.vue

@@ -0,0 +1,160 @@
+<script setup lang="ts">
+//
+//import { formatDate } from '@/components/meeting/utils.ts';
+//import dayjs from 'dayjs';
+//import {
+//  OIcon,
+//  OIconArrowLeft,
+//  OIconArrowRight,
+//  OIconChevronLeft,
+//  OIconChevronRight,
+//  OScroller,
+//} from '@opensig/opendesign';
+//import { ElCalendar, useLocale } from 'element-plus';
+//import { Locales, useI18n } from '@/i18n';
+//import { computed, nextTick, onMounted, onUnmounted, ref, ref } from 'vue';
+//
+//const { t, locale } = useI18n();
+//const isEn = computed(() => locale.value === Locales.EN);
+//
+//const props = defineProps<{
+//  selectedDate: string;
+//  allDateList: string[];
+//  list: any[]
+//}>();
+//const emits = defineEmits(['change-month', 'load']);
+//const calendarRef = ref(null);
+//
+//const formatYearMonth = (date) => {
+//  date = dayjs(date ? date : undefined);
+//  if (isEn.value) {
+//    return date.format('MMMM YYYY');
+//  } else {
+//    return date.format('YYYY MM月');
+//  }
+//};
+//
+//const cellClick = (e: PointerEvent & any, clickable: boolean) => {
+//  if (!clickable || !e.target?.className.includes('date-cell-text')) {
+//    e.stopPropagation();
+//    e.preventDefault();
+//  }
+//};
+//const changeMonth = (val) => {
+//  if (!calendarRef.value) {
+//    return;
+//  }
+//  window.scrollTo({
+//    top: 0,
+//    behavior: 'smooth',
+//  });
+//  calendarRef.value.selectDate(val);
+//  nextTick(() => {
+//    emits('change-month', calendarRef.value.selectedDay);
+//
+//  });
+//};
+//
+//const calcIfAllDeleted = (date) => {
+//  const meetingsOfDate = props.list?.filter((v) => v.date === date) || [];
+//  return meetingsOfDate.length && meetingsOfDate.every((v) => v.is_delete);
+//};
+//const load = () => {
+//  emits('load');
+//};
+//
+//onMounted(() => {
+//  getList();
+//  // 添加滚动事件监听
+//  window.addEventListener('scroll', handleScroll);
+//  // 添加resize监听器
+//  window.addEventListener('resize', handleScroll);
+//  getHeaderHeight();
+//  window.addEventListener('resize', getHeaderHeight);
+//});
+//
+//onUnmounted(() => {
+//  window.removeEventListener('scroll', handleScroll);
+//  window.removeEventListener('resize', handleScroll);
+//  window.removeEventListener('resize', getHeaderHeight);
+//  const scrollerContainerEl = scrollerRef.value?.getContainerEl();
+//  scrollerContainerEl?.removeEventListener('scroll', scrollerScroll);
+//});
+
+</script>
+
+<template>
+  <!--  <div class="o-my-calendar-wrapper">-->
+  <!--    <div class="list-calendar-mb">-->
+  <!--      <span>{{ formatYearMonth(selectedDate) }}</span>-->
+  <!--      <span>-->
+  <!--          <OIcon @click="changeMonth('prev-month')"><OIconChevronLeft /></OIcon>-->
+  <!--          <OIcon @click="changeMonth('next-month')"><OIconChevronRight /></OIcon>-->
+  <!--        </span>-->
+  <!--    </div>-->
+  <!--    <div class="list-calendar">-->
+  <!--      <ElCalendar ref="calendarRef" v-model="selectedDate">-->
+  <!--        <template #header>-->
+  <!--          <span>{{ formatYearMonth(selectedDate) }}</span>-->
+  <!--          <div>-->
+  <!--            <OIcon @click="changeMonth('prev-month')">-->
+  <!--              <OIconChevronLeft />-->
+  <!--            </OIcon>-->
+  <!--            <OIcon @click="changeMonth('next-month')">-->
+  <!--              <OIconChevronRight />-->
+  <!--            </OIcon>-->
+  <!--          </div>-->
+  <!--        </template>-->
+  <!--        <template #date-cell="{ data }">-->
+  <!--          <div-->
+  <!--            @click="(e) => cellClick(e, allDateList.includes(data.day))"-->
+  <!--            :class="{-->
+  <!--                'date-cell': true,-->
+  <!--                'is-selected': data.isSelected,-->
+  <!--                'is-today': formatDate(data.day) === formatDate(),-->
+  <!--                clickable: allDateList.includes(data.day),-->
+  <!--                expired: dayjs(formatDate()).isAfter(dayjs(data.day)),-->
+  <!--                'all-deleted': calcIfAllDeleted(data.day),-->
+  <!--              }"-->
+  <!--          >-->
+  <!--            <div class="date-cell-text">-->
+  <!--              {{ Number(data.day.split('-')[2]) }}-->
+  <!--            </div>-->
+  <!--          </div>-->
+  <!--        </template>-->
+  <!--      </ElCalendar>-->
+  <!--    </div>-->
+  <!--    <div class="list-wrapper" :class="!list.length ? 'is-empty' : ''">-->
+  <!--      <OScroller-->
+  <!--        ref="scrollerRef"-->
+  <!--        @scrollend="load"-->
+  <!--        v-if="list.length"-->
+  <!--        :style="{ '&#45;&#45;header-height': headerHeight }"-->
+  <!--        class="scroller-container"-->
+  <!--        show-type="hover"-->
+  <!--      >-->
+  <!--        <div class="list-body">-->
+  <!--          <div class="list-month-change prev-month"  @click="changeMonth('prev-month')">-->
+  <!--            <OIcon>-->
+  <!--              <OIconArrowLeft />-->
+  <!--            </OIcon>-->
+  <!--            <span>{{ t('meeting.preMonth') }}</span>-->
+  <!--          </div>-->
+
+  <!--          <slot></slot>-->
+  <!--          <div class="list-month-change next-month" @click="changeMonth('next-month')">-->
+  <!--            <OIcon>-->
+  <!--              <OIconArrowRight />-->
+  <!--            </OIcon>-->
+  <!--            <span>{{ t('meeting.nextMonth') }}</span>-->
+  <!--          </div>-->
+  <!--        </div>-->
+  <!--      </OScroller>-->
+  <!--  </div>-->
+</template>
+
+<style scoped lang="scss">
+.o-my-calendar-wrapper {
+
+}
+</style>