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

package/src/components/header/OHeaderMobile.vue

@@ -5,13 +5,14 @@ import { OIcon, OIconArrowLeft } from '@opensig/opendesign';
 import ContentWrapper from '../common/ContentWrapper.vue';
 import HeaderNavMobile from './components/HeaderNavMobile.vue';
 
-import { type NavT } from './types.ts';
+import type { NavT, LangItemT } from './types.ts';
 
 import IconClose from '~icons/components/icon-close.svg';
 import IconMenu from '~icons/components/icon-header-menu.svg';
 
 export interface OHeaderT {
   (e: 'go-back'): void;
+  (e: 'lang-click', val: LangItemT): void;
   (e: 'go-home'): void;
 }
 
@@ -40,6 +41,11 @@ const mobileClick = () => {
 const handleClick = () => {
   menuPanel();
 };
+
+const langClick = (val: LangItemT) => {
+  emit('lang-click', val);
+  menuPanel();
+};
 </script>
 
 <template>
@@ -89,6 +95,7 @@ const handleClick = () => {
         :menu-show="menuShow"
         @handle-click="handleClick"
         @on-click="mobileClick"
+        @lang-click="langClick"
       >
         <template #tool>
           <slot name="tool"></slot>

package/src/components/header/components/HeaderContent.vue

@@ -33,8 +33,11 @@ const onMouseLeave = () => {
 
 const showDesc = ref(false);
 const descMouseenter = (e: MouseEvent) => {
-  if (!e || !e.target) return;
-  showDesc.value = e.target.clientHeight < e.target.scrollHeight;
+  if (!e || !e.target) {
+    return;
+  }
+  const target = e.target as HTMLElement;
+  showDesc.value = target!.clientHeight < target.scrollHeight;
 };
 
 const onClickNavHref = (item: any, sub: any) => {
@@ -95,7 +98,8 @@ const onClickShortcut = (item: any) => {
                       <OTag v-if="subItem.tag" round="pill" color="danger" size="small" class="content-tag">{{ subItem.tag }}</OTag>
                     </a>
                     <div v-if="subItem.description" class="desc-container">
-                      <p class="item-desc" :title="showDesc ? subItem.description : null" @mouseenter="descMouseenter($event)">
+                      <p class="item-desc" :title="showDesc ? subItem.description : undefined"
+                         @mouseenter="descMouseenter($event)">
                         {{ subItem.description }}
                       </p>
                     </div>

package/src/components/header/components/HeaderNavMobile.vue

@@ -2,10 +2,11 @@
 import { ref, onMounted, watch } from 'vue';
 import { OIcon, OTag } from '@opensig/opendesign';
 
-import { type NavMobileItemT, NavType } from '../types.ts';
+import { type NavMobileItemT, NavType, CodeItemT, LangItemT } from '../types.ts';
 
 export interface OHeaderEmitsT {
   (e: 'on-click'): void;
+  (e: 'lang-click', val: LangItemT): void;
   (e: 'handle-click', val: any): void;
 }
 const emit = defineEmits<OHeaderEmitsT>();
@@ -42,9 +43,11 @@ const onClick = (url: string, target?: string) => {
   emit('on-click');
 };
 
-const onClickNav = (val: any) => {
+const onClickNav = (val: CodeItemT | LangItemT) => {
   if (navActive.value === NavType.CODE) {
     onClick(val.href, val?.target);
+  } else if (navActive.value === NavType.LANG) {
+    emit('lang-click', val);
   }
 };
 

package/src/components/header/types.ts

@@ -11,6 +11,8 @@ export interface ChildrenItemT {
   description?: string; // 描述
   href?: string; // 链接
   tag?: tagT; // 标签
+  icon?: any;
+  target?: string;
   children?: ChildrenItemT[];
 }
 
@@ -22,6 +24,8 @@ export interface ShortcutItemT {
   tag?: tagT; // 标签
   remark?: string; // 时间
   type?: string; // 类型
+  target?: string;
+  icon?: string;
 }
 
 export interface NavItemT {

package/src/components/meeting/OMeetingCalendar.vue

@@ -19,7 +19,14 @@ import IconSummit from '~icons/meeting/icon-summit.svg';
 import IconMeeting from '~icons/meeting/icon-meet.svg';
 import { Locales } from '@/i18n';
 import { useMeetingConfig } from './composables/useMeetingConfig';
-import { CalendarDataType, MeetingCalendarPropsT, MeetingGroupType } from './types.ts';
+import {
+  CalendarDataType,
+  MeetingEventsItemT,
+  MeetingCalendarPropsT,
+  MeetingGroupType, MeetingItemT,
+  meetingTabT,
+  SummitItemT,
+} from './types.ts';
 import { formatDate } from './utils.ts';
 import { useDebounceFn } from '@vueuse/core';
 
@@ -35,16 +42,16 @@ const { t, locale, meetingTabs, getConfig } = useMeetingConfig();
 const isEn = computed(() => locale.value === Locales.EN);
 
 const latestDay = ref<string>('');
-const dateList = ref([]);
-const summitData = ref([]);
-const summitDates = ref([]);
-const eventsData = ref([]);
-const eventsDates = ref([]);
+const dateList = ref<string[]>([]);
+const summitData = ref<SummitItemT[]>([]);
+const summitDates = ref<string[]>([]);
+const eventsData = ref<MeetingEventsItemT[]>([]);
+const eventsDates = ref<string[]>([]);
 const allDates = ref<string[]>([]);
-const meetingData = ref([]);
+const meetingData = ref<MeetingItemT[]>([]);
 const limitTime = '2021-01-01';
-const tabType = ref(CalendarDataType.ALL);
-const tabs = computed(() => {
+const tabType = ref<CalendarDataType>(CalendarDataType.ALL);
+const tabs = computed<meetingTabT[]>(() => {
   let list = meetingTabs.value;
   if (props.hiddenEvents) {
     list = list.filter((item) => item.value !== CalendarDataType.EVENTS);
@@ -68,24 +75,25 @@ const currentDay = ref('');
 const isAutoClick = ref(false);
 // sig组列表
 const group = ref('');
-const getSummitData = async (date) => {
+const getSummitData = async (date: string) => {
   if (props.getSummitListRequest) {
     const list = await props.getSummitListRequest(date);
-    summitData.value = (list || []).map(v => {
+    summitData.value = (list || []).map((v: SummitItemT) => {
       return {
-
         ...v,
         type: CalendarDataType.SUMMIT,
+        start_date_time: `${ formatDate(v.start_date) } ${ v.start }`,
+        end_date_time: `${ formatDate(v.end_date) } ${ v.end }`,
       };
     });
   } else {
     summitData.value = [];
   }
 };
-const getActivityData = async (date) => {
+const getActivityData = async (date: string) => {
   if (props.getEventsListRequest) {
     const list = await props.getEventsListRequest(date);
-    eventsData.value = (list || []).map(v => {
+    eventsData.value = (list || []).map((v: MeetingEventsItemT) => {
       return {
         ...v,
         type: CalendarDataType.EVENTS,
@@ -98,19 +106,19 @@ const getActivityData = async (date) => {
   }
 };
 
-const getDateList = async (date) => {
+const getDateList = async (date: string) => {
   if (props.getDateListRequest) {
-    props.getDateListRequest(date, group.value || '').then(res => {
+    props.getDateListRequest(date, group.value || '').then((res: string[]) => {
       dateList.value = res;
     });
   }
   if (props.getEventsDatesRequest) {
-    props.getEventsDatesRequest(date).then(res => {
+    props.getEventsDatesRequest(date).then((res: string[]) => {
       eventsDates.value = res;
     });
   }
   if (props.getSummitDatesRequest) {
-    props.getSummitDatesRequest(date).then(res => {
+    props.getSummitDatesRequest(date).then((res: string[]) => {
       summitDates.value = res;
     });
   }
@@ -124,12 +132,12 @@ const paramGetDaysData = async (params: { date: string; type: string }) => {
     return;
   }
   try {
-    const res = await props.getMeetingListRequest(params.date, group.value, '');
+    const res: MeetingItemT[] = await props.getMeetingListRequest(params.date, group.value, '');
     meetingData.value = res.map((v) => {
       return {
         ...v,
         time: `${ v.start }-${ v.end }`,
-        type: 'meeting',
+        type: CalendarDataType.MEETING,
         date: v.date || params.date,
       };
     }).sort((a: any, b: any) => {
@@ -146,7 +154,7 @@ const renderData = computed(() => {
     ...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)),
   ].filter((v) => {
-    if (tabType.value === 'all') {
+    if (tabType.value === CalendarDataType.ALL) {
       return true;
     }
     return v.type === tabType.value;
@@ -228,13 +236,17 @@ const watchChange = (element: HTMLElement) => {
   });
 };
 
-onMounted(() => {
+const getCalendarHeight = async () => {
   // 设置右侧 日程列表高度
   const tbody = document.querySelector('.calendar-body .el-calendar__body') as HTMLElement;
   if (tbody) {
     watchChange(tbody);
     calendarHeight.value = `${ tbody.offsetHeight - 2 }px`;
   }
+};
+
+onMounted(() => {
+  getCalendarHeight();
   getDateData();
 });
 
@@ -374,8 +386,10 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
         </div>
 
         <div>
-          <OScroller class="meeting-list" show-type="hover" size="small">
-            <OMeetingCalendarList :list="renderData" :groupType="groupType">
+          <OScroller class="meeting-list" show-type="hover" size="small" :style="{
+            '--height': calendarHeight
+          }">
+            <OMeetingCalendarList :list="renderData as unknown as MeetingItemT[]" :groupType="groupType">
               <template #empty>
                 <slot name="empty"></slot>
               </template>
@@ -866,13 +880,11 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
     }
 
     .meeting-list {
-      height: v-bind('calendarHeight');
+      height: var(--height);
       @include respond-to('<=pad_v') {
         height: auto;
       }
     }
-
   }
-
 }
 </style>

package/src/components/meeting/OMeetingForm.vue

@@ -14,18 +14,19 @@ import {
   ORadioGroup,
   OSelect,
   OSwitch,
-  OTextarea,
+  OTextarea, RulesT,
   useMessage,
 } from '@opensig/opendesign';
 import IconHelp from '~icons/meeting/icon-help.svg';
 import IconTip from '~icons/meeting/icon-tip.svg';
-import { MeetingFormPropsT, MeetingGroupType, MeetingPostT, OptionItemT } from './types';
+import { CycleSubItemT, MeetingFormPropsT, MeetingGroupType, MeetingPostT, OptionItemT, PlatformT } from './types';
 import dayjs from 'dayjs';
 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 { useMeetingConfig } from './composables/useMeetingConfig';
+import { ValidatorResultT } from '@opensig/opendesign/lib/form/types';
 
 const { t, locale, cycleTypeOptions0, intervalWeekOptions, getPlatformLabel } = useMeetingConfig();
 
@@ -43,11 +44,11 @@ const weekOptions = intervalWeekOptions;
 const intervalTypeMax = computed(() => {
   return findLabelFromOptions(form.value.cycle_type, cycleTypeOptions.value, 'max');
 });
-const initForm = {
+const initForm: MeetingPostT = {
   is_record: false,
   agenda: '',
   email_list: '',
-  platform: '',
+  platform: 'WELINK',
   topic: '',
   group_name: '',
   etherpad: '',
@@ -62,10 +63,10 @@ const initForm = {
   cycle_point: [],
 };
 const form = ref<MeetingPostT>(Object.assign({}, initForm) as unknown as MeetingPostT); // 表单数据
-const formRef = ref(null); // 表单实例
+const formRef = ref<any>(null); // 表单实例
 const loading = ref(false); // 提交状态
 // 表单校验规则
-const rules = computed(() => {
+const rules = computed<Record<string, RulesT[]>>(() => {
   return {
     topic: [
       { required: true, message: t('meeting.enterMeetingName') },
@@ -98,23 +99,36 @@ const rules = computed(() => {
     }],
     etherpad: [{ required: true, message: t('meeting.enterEtherpad') }],
     date: [{ required: true, message: t('meeting.selectDate') }],
+    platform: [{ required: true, message: t('meeting.selectPlatform') }],
     time: [
       {
-        validator: (value: string) => {
+        validator: (value: any) => {
           const { is_cycle, cycle_type, cycle_interval, cycle_point, date, date_range } = form.value;
           if (is_cycle) {
-            const msg = {
-              type: 'danger',
-              message: t('meeting.finishMeetingConfig'),
-            };
+            const msg = t('meeting.finishMeetingConfig');
             if (cycle_type === INTERVAL_DAY) {
-              if (!cycle_interval) return msg;
+              if (!cycle_interval) {
+                return {
+                  type: 'danger',
+                  message: msg,
+                };
+              }
             }
             if (cycle_type === INTERVAL_WEEK) {
-              if (!cycle_interval || !cycle_point?.length) return msg;
+              if (!cycle_interval || !cycle_point?.length) {
+                return {
+                  type: 'danger',
+                  message: msg,
+                };
+              }
             }
             if (cycle_type === INTERVAL_MONTH) {
-              if (!cycle_interval || !cycle_point?.length) return msg;
+              if (!cycle_interval || !cycle_point?.length) {
+                return {
+                  type: 'danger',
+                  message: msg,
+                };
+              }
             }
             if (!date_range?.length) {
               return {
@@ -129,7 +143,7 @@ const rules = computed(() => {
               const weeks = new Set();
               while (!dayjs(start).isAfter(dayjs(end))) {
                 weeks.add(dayjs(start).day());
-                start = dayjs(start).add(1, 'day');
+                start = dayjs(start).add(1, 'day').format('YYYY-MM-DD');
               }
               if (cycle_point.every((point) => !weeks.has(point))) {
                 return {
@@ -142,7 +156,7 @@ const rules = computed(() => {
               const days = new Set();
               while (!dayjs(start).isAfter(dayjs(end))) {
                 days.add(dayjs(start).date());
-                start = dayjs(start).add(1, 'day');
+                start = dayjs(start).add(1, 'day').format('YYYY-MM-DD');
               }
               if (cycle_point.every((point) => !days.has(point))) {
                 return {
@@ -165,7 +179,7 @@ const rules = computed(() => {
               message: t('meeting.selectMeetingTime'),
             };
           }
-          const arr = value.split('-').map((v) => v.split(':').map(Number));
+          const arr = value.split('-').map((v: string) => v.split(':').map(Number));
           if (arr[0][0] > arr[1][0] || (arr[0][0] === arr[1][0] && arr[0][1] >= arr[1][1])) {
             return {
               type: 'danger',
@@ -173,8 +187,8 @@ const rules = computed(() => {
             };
           }
           if (!form.value.is_cycle && form.value.date && form.value.start) {
-            const start = dayjs(`${ form.value.date } ${ form.value.start }`);
-            if (new Date(start).getTime() < new Date().getTime()) {
+            const start = `${ form.value.date } ${ form.value.start }`;
+            if (dayjs(start).isBefore(dayjs())) {
               return {
                 type: 'danger',
                 message: t('meeting.startTimeBeforeEndTime'),
@@ -185,12 +199,11 @@ const rules = computed(() => {
         triggers: ['blur', 'change'],
       },
     ],
-    platform: [{ required: true, message: t('meeting.selectPlatform') }],
     email_list: [
       {
-        validator: (value: string) => {
+        validator: (value: any) => {
           if (props.isEdit) {
-            return {};
+            return {} as unknown as ValidatorResultT;
           }
           const str = value.replaceAll(' ', '').replaceAll(',', ';') || '';
           if (str.length) {
@@ -200,7 +213,7 @@ const rules = computed(() => {
                 message: t('meeting.emailTooLong'),
               };
             }
-            const list = str.split(';') || [];
+            const list: string[] = str.split(';') || [];
             if (list.some((v) => !EMAIL_REGEX.test(v))) {
               return {
                 type: 'danger',
@@ -233,7 +246,7 @@ const getSigOptions = async () => {
     return;
   }
   const res = await props.getGroupsRequest();
-  sigOptions.value = res.map((v) => ({ label: v.group_name, value: v.group_name, ...v }));
+  sigOptions.value = res.map((v: OptionItemT) => ({ ...v, label: v.group_name, value: v.group_name }));
   if (props.data) {
     changeSig(form.value.group_name);
   }
@@ -245,9 +258,9 @@ const getPlatformOptions = async () => {
     return;
   }
   const res = await props.getPlatformsRequest();
-  typeOptions.value = res.map((v) => ({ label: getPlatformLabel(v), value: v }));
+  typeOptions.value = res.map((v: string) => ({ label: getPlatformLabel(v), value: v }));
   if (!props.data) {
-    form.value.platform = typeOptions.value[0].value;
+    form.value.platform = typeOptions.value[0].value as unknown as PlatformT;
   }
 };
 
@@ -256,7 +269,7 @@ watch(
   () => props.data,
   (data) => {
     if (data) {
-      const sub = data?.cycle_sub?.find((v) => v.sub_id === props.subId) || {};
+      const sub = data?.cycle_sub?.find((v) => v.sub_id === props.subId) || {} as unknown as CycleSubItemT;
       const { mid, date, start, end, sub_id } = sub;
       Object.assign(
         form.value,
@@ -311,8 +324,8 @@ watch(
 );
 const cancel = () => {
   form.value = Object.assign({}, initForm);
-  formRef.value.clearValidate();
-  formRef.value.resetFields();
+  formRef.value?.clearValidate?.();
+  formRef.value?.resetFields?.();
   emits('cancel');
 };
 
@@ -331,7 +344,7 @@ 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)) {
       return;
     }
     const {
@@ -359,7 +372,7 @@ const confirm = async () => {
       group_name,
       platform,
       is_cycle,
-    } as MeetingPostT;
+    } as MeetingPostT as unknown as any;
     if (is_cycle) {
       params = {
         ...params,
@@ -396,8 +409,14 @@ const confirm = async () => {
           is_notify: true,
         });
       } else {
-        const { email_list, platform, group_name, etherpad, ...data } = params;
-        await props?.editMeetingRequest(props.data.id, {
+        const {
+          email_list: _email_list,
+          platform: _platform,
+          group_name: _group_name,
+          etherpad: _etherpad,
+          ...data
+        } = params;
+        await props?.editMeetingRequest(props.data?.id as unknown as number, {
           ...data,
           is_notify: true,
         });
@@ -423,14 +442,14 @@ onMounted(() => {
   getPlatformOptions();
 });
 
-const changeSig = (sig) => {
+const changeSig = (sig: any) => {
   const find = sigOptions.value.find((v) => v.value === sig);
   if (!props.isEdit) {
     form.value.etherpad = find?.etherpad || '';
     form.value.email_list = find?.email_list || '';
   }
 };
-const disabledDate = (date) => {
+const disabledDate = (date: Date) => {
   return date.getTime() < Date.now() - 24 * 60 * 60 * 1000;
 };
 const changeTime = () => {

package/src/components/meeting/OMeetingPlayback.vue

@@ -93,8 +93,8 @@ const getSubjectList = async (url: string) => {
   subjectList.value = (json || []).map((z: SubjectItemT) => {
     return {
       ...z,
-      startTime: transformTime(z.startTime as string),
-      endTime: transformTime(z.endTime as string),
+      startTimeNumber: transformTime(z.startTime),
+      endTimeNumber: transformTime(z.endTime),
     };
   });
 };
@@ -244,8 +244,8 @@ onUnmounted(() => {
                   :data-start="sub.startTime"
                   :data-end="sub.endTime"
                   :style="{
-                      '--start': (sub.startTime < 0 ? 0 : sub.startTime) / playerDuration,
-                      '--end': (sub.endTime > playerDuration ? playerDuration : sub.endTime) / playerDuration,
+                      '--start': (sub.startTimeNumber < 0 ? 0 : sub.startTimeNumber) / playerDuration,
+                      '--end': (sub.endTimeNumber > playerDuration ? playerDuration : sub.endTimeNumber) / playerDuration,
                       background: getProgressColor(idx),
                     }"
                 ></div>