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

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>
 
@@ -748,11 +763,11 @@ const deleteActions = computed<DialogActionT[]>(() => {
     gap: var(--o-gap-4);
     height: 100%;
     --phone-padding-top: 0;
-    @include respond-to('pad_v') {
+    @include respond('pad_v') {
       flex-direction: column;
       gap: var(--o-gap-4);
     }
-    @include respond-to('phone') {
+    @include respond('phone') {
       flex-direction: column;
       gap: var(--o-gap-3);
       --phone-padding-top: calc(var(--o-gap-5) + var(--o-gap-3) + var(--o-gap-3));
@@ -793,7 +808,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
       }
     }
 
-    @include respond-to('phone') {
+    @include respond('phone') {
       padding-top: var(--o-gap-7);
       background-color: var(--o-color-ubmc-bg);
       padding-bottom: var(--o-gap-4);
@@ -811,7 +826,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
   .left-calendar {
     width: 336px;
     flex-shrink: 0;
-    @include respond-to('pad_h') {
+    @include respond('pad_h') {
       .el-calendar {
         .el-calendar__body {
           padding-left: 12px;
@@ -829,10 +844,10 @@ const deleteActions = computed<DialogActionT[]>(() => {
         }
       }
     }
-    @include respond-to('pad_v') {
+    @include respond('pad_v') {
       width: 100%;
     }
-    @include respond-to('phone') {
+    @include respond('phone') {
       display: none;
     }
 
@@ -962,7 +977,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
 
             &.clickable {
               &::after {
-                background-color: rgb(var(--o-mixedgray-6));
+                background-color: rgb(var(--o-grey-6));
               }
 
               &.approved::after {
@@ -970,11 +985,11 @@ const deleteActions = computed<DialogActionT[]>(() => {
               }
 
               &.expired::after {
-                background-color: rgb(var(--o-mixedgray-6));
+                background-color: rgb(var(--o-grey-6));
               }
 
               &.all-deleted::after {
-                background-color: rgb(var(--o-mixedgray-6));
+                background-color: rgb(var(--o-grey-6));
               }
             }
           }
@@ -993,7 +1008,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     flex-grow: 1;
     background-color: var(--o-color-fill2);
 
-    @include respond-to('phone') {
+    @include respond('phone') {
       margin-top: calc(var(--phone-padding-top) - var(--o-gap-4));
     }
 
@@ -1013,7 +1028,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     .scroller-container {
       height: 100%;
       max-height: calc(var(--layout-left-height, 900px) - 4 * var(--o-gap-5) - var(--header-height) * 1px);
-      @include respond-to('phone') {
+      @include respond('phone') {
         max-height: fit-content;
       }
 
@@ -1025,7 +1040,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
           flex-grow: 1;
         }
 
-        @include respond-to('phone') {
+        @include respond('phone') {
           padding-left: var(--o-gap-2);
         }
 
@@ -1054,13 +1069,13 @@ const deleteActions = computed<DialogActionT[]>(() => {
             width: 16px;
             height: 26px;
             position: relative;
-            @include respond-to('laptop') {
+            @include respond('laptop') {
               height: 24px;
             }
-            @include respond-to('pad_h') {
+            @include respond('pad_h') {
               height: 22px;
             }
-            @include respond-to('<=pad_v') {
+            @include respond('<=pad_v') {
               height: 22px;
             }
 
@@ -1113,7 +1128,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
           margin-bottom: var(--o-gap-2);
           color: var(--o-color-info1);
           @include text2;
-          @include respond-to('phone') {
+          @include respond('phone') {
             padding-left: var(--o-gap-5);
           }
 
@@ -1128,7 +1143,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
   .list-body {
     height: 100%;
 
-    @include respond-to('phone') {
+    @include respond('phone') {
       height: fit-content;
       padding: var(--o-gap-4) !important;
     }
@@ -1143,7 +1158,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
       @include hover {
         --btn-color: var(--o-color-primary2);
       }
-      @include respond-to('phone') {
+      @include respond('phone') {
         display: none;
       }
 
@@ -1194,22 +1209,22 @@ const deleteActions = computed<DialogActionT[]>(() => {
         transition: margin var(--o-easing-standard) var(--o-duration-s);
         --copy-display: none;
         --icon-size: 24px;
-        @include respond-to('<=pad_v') {
+        @include respond('<=pad_v') {
           padding: var(--o-gap-3) var(--o-gap-4);
         }
 
         &:hover {
-          @include respond-to('>pad_v') {
+          @include respond('>pad_v') {
             --copy-display: inline-flex;
           }
         }
 
-        @include respond-to('phone') {
+        @include respond('phone') {
           --icon-size: 20px;
         }
 
         &.o-collapse-item-expanded {
-          @include respond-to('<=pad_v') {
+          @include respond('<=pad_v') {
             --copy-display: inline-flex;
           }
         }
@@ -1233,7 +1248,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
           position: relative;
           top: 4px;
           flex-shrink: 0;
-          @include respond-to('phone') {
+          @include respond('phone') {
             position: absolute;
             right: 0;
             width: 20px;
@@ -1259,7 +1274,8 @@ const deleteActions = computed<DialogActionT[]>(() => {
             align-items: flex-start;
             gap: var(--o-gap-3);
             width: 100%;
-            @include respond-to('phone') {
+            padding-right: 48px;
+            @include respond('phone') {
               flex-grow: 1;
               width: 100%;
               align-self: stretch;
@@ -1393,7 +1409,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
             height: 18px;
             width: 18px;
             display: var(--copy-display);
-            @include respond-to('phone') {
+            @include respond('phone') {
               bottom: var(--o-gap-2);
               transform: revert;
               top: revert;
@@ -1419,7 +1435,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
 
         .activity-detail {
           padding-left: calc(var(--o-gap-3) + var(--icon-size));
-          @include respond-to('phone') {
+          @include respond('phone') {
             padding-left: 0;
           }
 

package/src/components/activity/config.ts

@@ -1 +1 @@
-export const WEBSITE_REGEXP = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w ./?%&=-]*)?$/;
+export const WEBSITE_REGEXP = /^https?:\/\/\S+/;

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/ContentWrapper.vue

@@ -59,16 +59,16 @@ const paddingBottom = computed(() => {
   --layout-content-padding: 64px;
   --layout-header-height: 80px;
 
-  @include respond-to('<=laptop') {
+  @include respond('<=laptop') {
     --layout-content-max-width: 100%;
     --layout-content-padding: 40px;
   }
 
-  @include respond-to('<=pad') {
+  @include respond('<=pad') {
     --layout-content-padding: 32px;
   }
 
-  @include respond-to('phone') {
+  @include respond('phone') {
     --layout-content-padding: 24px;
   }
 

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>