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

package/src/components/meeting/components/OMeetingPlaybackVideo.vue

@@ -26,7 +26,7 @@ const closeSpeakerMenu = () => {
   speakerMenuVisible.value = false;
 };
 
-const handleCue = (textTrack, init = false) => {
+const handleCue = (textTrack: any, init = false) => {
   const player = props.instance;
   if (!player) return;
   // 修改字幕
@@ -133,7 +133,7 @@ const videoInit = async () => {
         FullscreenToggle: true,
       },
     },
-  });
+  }) as unknown as any;
   emits('getInstance', player);
   // 加载视频
   player.src(props.src);
@@ -150,10 +150,10 @@ const videoInit = async () => {
 
   // 添加自定义控制字幕的按钮
   class CustomSubsCapsButton extends videojs.getComponent('Button') {
-    constructor(player, options) {
+    constructor(player: any, options: object) {
       super(player, options);
       this.addClass('vjs-subtitle-toggle-button', 'vjs-subtitle-hidden');
-      this.controlText('Toggle Subtitles');
+      (this as any).controlText('Toggle Subtitles');
     }
 
     buildCSSClass() {
@@ -161,7 +161,7 @@ const videoInit = async () => {
     }
 
     handleClick() {
-      const tracks = this.player().textTracks();
+      const tracks = this.player().textTracks() as unknown as any[];
       for (let i = 0; i < tracks.length; i++) {
         if (tracks[i].kind === 'subtitles') {
           handleCue(tracks[i], true);
@@ -181,14 +181,14 @@ const videoInit = async () => {
 
   if (props.vtt) {
     videojs.registerComponent('SubtitleToggleButton', CustomSubsCapsButton);
-    if (!player.controlBar.children_.some((v) => v.name_ === 'SubtitleToggleButton')) {
+    if (!player.controlBar.children_.some((v: any) => v.name_ === 'SubtitleToggleButton')) {
       player.controlBar.addChild('SubtitleToggleButton', {}, 8);
     }
   }
 
   // 动态修改字幕
   const textTracks = player?.textTracks().tracks_;
-  textTracks.forEach((textTrack) => {
+  textTracks.forEach((textTrack: any) => {
     textTrack?.addEventListener('cuechange', () => {
       handleCue(textTrack);
     });

package/src/components/meeting/components/OSigMeetingAside.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { OIcon, OIconArrowLeft, OIconArrowRight } from '@opensig/opendesign';
-import IconMeetinging from '~icons/meeting/icon-meet.svg';
 import { useMeetingConfig } from '@/components/meeting/composables/useMeetingConfig';
 import { CalendarDataType } from '@/components/meeting';
 
@@ -18,11 +17,11 @@ const props = defineProps<{
 const STEP = 1;
 
 const emits = defineEmits(['click-date', 'change-month']);
-const clickDate = (date) => {
+const clickDate = (date: string) => {
   emits('click-date', date);
 };
 
-const changeMonth = (step) => {
+const changeMonth = (step: number) => {
   if (props.current + step >= props.total || props.current + step < 0) return;
   emits('change-month', step);
 };

package/src/components/meeting/config.ts

@@ -4,21 +4,10 @@ import IconEvent from '~icons/meeting/icon-event.svg';
 import IconMeeting from '~icons/meeting/icon-meet.svg';
 import IconSummit from '~icons/meeting/icon-summit.svg';
 
-const getMeetingColor = () => {
-  if (typeof document !== 'undefined') {
-    const deepBlue = getComputedStyle(document.documentElement)
-      .getPropertyValue('--o-deep-blue-6')?.trim();
-    if (deepBlue) {
-      return 'rgba(var(--o-deep-blue-6))';
-    }
-  }
-  return 'var(--o-color-primary1)';
-};
-
 export const TYPE_COLOR_MAP = {
   summit: 'rgba(var(--o-orange-6))',
   events: 'rgba(var(--o-cyan-6))',
-  meeting: getMeetingColor(),
+  meeting: 'rgba(var(--o-deep-blue-6))',
 };
 
 export const INTERVAL_DAY = 0;

package/src/components/meeting/types.ts

@@ -13,7 +13,6 @@ export enum CalendarDataType {
   MEETING = 'meeting',
   EVENTS = 'events',
   SUMMIT = 'summit',
-  ACTIVITY = 'activity',
   APPROVAL = 'approval'
 }
 
@@ -33,10 +32,12 @@ export interface CalendarOtherDataT {
 export interface OptionItemT {
   label: string;
   value: string | number;
+
+  [key: string]: any;
 }
 
 
-export type PlatformT = 'welink' | 'tencent';
+export type PlatformT = 'welink' | 'tencent' | 'zoom' | 'WELINK' | 'TENCENT' | 'ZOOM';
 
 export enum MeetingGroupType {
   SIG = 'sig',
@@ -55,11 +56,12 @@ export interface MeetingCalendarPropsT {
   groupType: MeetingGroupType;
   groups: string[];
 }
+
 // 会议新增、修改
 export interface MeetingPostT {
   id?: number; // 会议id
   topic: string; // 会议主题 128
-  sponsor: string; // 会议发起人 20
+  sponsor?: string; // 会议发起人 20
   group_name: string; // 所属SIG 64
   platform: PlatformT; // 会议平台
   date: string; // 会议日期
@@ -72,14 +74,16 @@ export interface MeetingPostT {
   email_list: string; // 通知邮件列表 1020
   is_record: boolean; // 会议录制
   is_cycle: boolean; // 是否重复
-  cycle_start_date: string;
-  cycle_end_date: string;
-  cycle_start: string;
-  cycle_end: string;
+  cycle_start_date?: string;
+  cycle_end_date?: string;
+  cycle_start?: string;
+  cycle_end?: string;
   cycle_interval: number; // 重复周期, 当intervalType为month时固定为1
   cycle_type: typeof INTERVAL_DAY | typeof INTERVAL_WEEK | typeof INTERVAL_MONTH; // 重复类型，默认为INTERVAL_DAY
   cycle_point: number[]; // 重复节点，当intervalType为week|month时存在值
   is_notify?: boolean;
+  mid?: string;
+  sub_id?: string;
 }
 
 export interface MeetingFormPropsT {
@@ -97,6 +101,29 @@ export interface MeetingFormPropsT {
   bookText?: string
 }
 
+export interface ObsDataItemT {
+  id: number;
+  mid: string;
+  sub_id: string;
+  status: number;
+  text_vtt_url: string;
+  text_json_url: string;
+  text_video_url: string;
+  text_picture_url: string;
+  topic_url: string;
+  meeting_id: number;
+}
+
+export interface CycleSubItemT {
+  id: number;
+  mid: string;
+  sub_id: string;
+  date: string;
+  start: string;
+  end: string;
+  meeting_id: number;
+}
+
 // 会议详情
 export interface MeetingItemT extends MeetingPostT {
   id: number;
@@ -109,8 +136,55 @@ export interface MeetingItemT extends MeetingPostT {
   is_delete: boolean; // 是否取消
   update_time: string;
   time: string; // 处理一下时间范围
-  cycle_sub: any[];
+  cycle_sub: CycleSubItemT[];
   live_url?: string;
+  type: CalendarDataType;
+  obs_data?: ObsDataItemT[]; // 回放数据
+  isExpired?: boolean; // 处理数据，是否过期
+  sub_id: string; // 处理数据，周期会议平铺之后的id
+  dateRange?: string; // 计算属性
+  hasObsData?: boolean; // 计算属性
+}
+
+export interface MeetingEventsItemT {
+  id: number;
+  title: string;
+  start_date: string;
+  end_date: string;
+  activity_type: number;
+  synopsis: string;
+  create_time: string;
+  address: string;
+  status: number;
+  sponsor: string;
+  is_delete: number;
+  start: string;
+  end: string;
+  register_url: string;
+  content_url: string;
+  live_url: null;
+  register_end_date: string;
+  update_activity_id: null;
+  approver: string;
+  organizer: string;
+  email_list: string;
+  dates?: string[]; // 处理数据，如果时跨天活动，有多个元素
+  type: CalendarDataType;
+}
+
+export interface SummitItemT {
+  id: string;
+  name: string;
+  url: string;
+  dates: string[];
+  location: string;
+  address: string;
+  start_date: string;
+  end_date: string;
+  start: string;
+  end: string;
+  activity_type: number;
+  type: CalendarDataType;
 }
 
 export interface PageParamsT {
@@ -118,14 +192,9 @@ export interface PageParamsT {
   size: number;
 }
 
-export interface OptionItemT {
-  label: string;
-  value: string | number;
-}
-
 export interface meetingTabT {
   label: string;
-  value: string;
+  value: CalendarDataType;
   icon: any;
   color?: string;
   zIndex?: number;
@@ -133,7 +202,7 @@ export interface meetingTabT {
 
 
 // -------------------- 会议回放 --------------------
-interface MeetingPlaybackPropsDetailT {
+export interface MeetingPlaybackPropsDetailT {
   topic: string; // 会议主题
   date: string; // 会议日期
   start: string; // 会议开始时间
@@ -143,7 +212,7 @@ interface MeetingPlaybackPropsDetailT {
   groupName: string; // 会议所属sig组
 }
 
-interface MeetingPlaybackPropsDataT {
+export interface MeetingPlaybackPropsDataT {
   mid: string; // 会议ID
   subId?: string; //子会议ID
   textJson: string;  // 字幕json文件
@@ -161,8 +230,10 @@ export interface MeetingPlaybackPropsT {
 
 export interface SubjectItemT {
   title: string; // 议题
-  startTime: string | number; // 议题开始时间 时:分:秒格式
-  endTime: string | number; // 议题结束时间 时:分:秒格式
+  startTime: string; // 议题开始时间 【时:分:秒】格式
+  endTime: string; // 议题结束时间 【时:分:秒】格式
+  startTimeNumber: number;
+  endTimeNumber: number;
 }
 
 

package/vite.config.ts

@@ -67,6 +67,7 @@ export default defineConfig(({ mode }) => {
       alias: {
         vue: 'vue/dist/vue.esm-bundler.js',
         '@': path.resolve(__dirname, 'src'),
+        '@opendesign-plus/styles': path.resolve(__dirname, '../styles/src'),
       },
     },
     css: {
@@ -78,7 +79,7 @@ export default defineConfig(({ mode }) => {
           @use "@opendesign-plus/styles/mixin/font.scss" as *;
           @use "@opendesign-plus/styles/mixin/common.scss" as *;
           @use "@opendesign-plus/styles/mixin/gap.scss" as *;
-          @use "@opendesign-plus/styles/element-plus.css" as *;
+          @use "@opendesign-plus/styles/element-plus.scss" as *;
         `,
         },
       },
@@ -94,7 +95,7 @@ export default defineConfig(({ mode }) => {
         },
       }) as any,
       dts({
-        include: ['./src/components/**/*', './src/index.ts'],
+        include: ['./src/components/**/*', './src/index.ts', './src/*.d.ts'],
         exclude: ['./src/components/common/**/*']
       }),
       Icons({