@opendesign-plus-test/components 0.0.1-rc.60 → 0.0.1-rc.62

package/src/components/header/types.ts

@@ -35,6 +35,7 @@ export interface NavItemT {
   withPicture: boolean; // 快捷链接是否显示缩略图
   children: ChildrenItemT[]; // 导航子项
   shortcut: ShortcutItemT[]; // 右侧快捷链接
+  tag?: string; // 标签
 }
 
 export interface CodeItemT {

package/src/components/meeting/OMeetingCalendar.vue

@@ -77,13 +77,22 @@ const isAutoClick = ref(false);
 const group = ref('');
 const getSummitData = async (date: string) => {
   if (props.getSummitListRequest) {
+    summitData.value = [];
     const list = await props.getSummitListRequest(date);
     summitData.value = (list || []).map((v: SummitItemT) => {
+      const dates: string[] = [];
+      let cur = dayjs(v.start_date);
+      const end = dayjs(v.end_date);
+      while (!cur.isAfter(end)) {
+        dates.push(cur.format('YYYY-MM-DD'));
+        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: `${ formatDate(v.start_date) } ${ v.start || '' }`,
+        end_date_time: `${ formatDate(v.end_date) } ${ v.end || '' }`,
       };
     });
   } else {
@@ -92,13 +101,22 @@ const getSummitData = async (date: string) => {
 };
 const getActivityData = async (date: string) => {
   if (props.getEventsListRequest) {
+    eventsData.value = [];
     const list = await props.getEventsListRequest(date);
     eventsData.value = (list || []).map((v: MeetingEventsItemT) => {
+      const dates: string[] = [];
+      let cur = dayjs(v.start_date);
+      const end = dayjs(v.end_date);
+      while (!cur.isAfter(end)) {
+        dates.push(cur.format('YYYY-MM-DD'));
+        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: `${ formatDate(v.start_date) } ${ v.start || '' }`,
+        end_date_time: `${ formatDate(v.end_date) } ${ v.end || '' }`,
       };
     });
   } else {
@@ -132,6 +150,7 @@ const paramGetDaysData = async (params: { date: string; type: string }) => {
     return;
   }
   try {
+    meetingData.value = [];
     const res: MeetingItemT[] = await props.getMeetingListRequest(params.date, group.value, '');
     meetingData.value = res.map((v) => {
       return {

package/src/components/meeting/OMeetingForm.vue

@@ -19,7 +19,15 @@ import {
 } from '@opensig/opendesign';
 import IconHelp from '~icons/meeting/icon-help.svg';
 import IconTip from '~icons/meeting/icon-tip.svg';
-import { CycleSubItemT, MeetingFormPropsT, MeetingGroupType, MeetingPostT, OptionItemT, PlatformT } from './types';
+import {
+  CycleSubItemT,
+  MeetingFormPropsT,
+  MeetingGroupType,
+  MeetingItemT,
+  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';
@@ -31,8 +39,6 @@ import { ValidatorResultT } from '@opensig/opendesign/lib/form/types';
 const { t, locale, cycleTypeOptions0, intervalWeekOptions, getPlatformLabel } = useMeetingConfig();
 
 const props = withDefaults(defineProps<MeetingFormPropsT>(), {
-  isSub: false,
-  isEdit: false,
   showBtns: true,
   groupType: MeetingGroupType.SIG,
 });
@@ -41,6 +47,8 @@ const message = useMessage(null);
 const cycleTypeOptions = cycleTypeOptions0;
 const weekOptions = intervalWeekOptions;
 
+const isEdit = computed(() => Object.keys(props?.data || {}).length > 0);
+const isSub = computed(() => !!props.subId);
 const intervalTypeMax = computed(() => {
   return findLabelFromOptions(form.value.cycle_type, cycleTypeOptions.value, 'max');
 });
@@ -202,7 +210,7 @@ const rules = computed<Record<string, RulesT[]>>(() => {
     email_list: [
       {
         validator: (value: any) => {
-          if (props.isEdit) {
+          if (isEdit.value) {
             return {} as unknown as ValidatorResultT;
           }
           const str = value.replaceAll(' ', '').replaceAll(',', ';') || '';
@@ -287,7 +295,7 @@ const getPropData = () => {
     ...(is_cycle
       ? {
         date_range: [cycle_start_date, cycle_end_date],
-        cycle_point: cycle_point?.map((v) => parseInt(v)) || [],
+        cycle_point: cycle_point?.map((v) => parseInt(v as unknown as string)) || [],
         cycle_interval: cycle_interval || 1,
         time: `${ cycle_start }-${ cycle_end }`,
         start: cycle_start,
@@ -301,13 +309,13 @@ watch(
   () => props.data,
   (data) => {
     if (data) {
-      const propData = getPropData() as unknown as CycleSubItemT;
-      const sub = propData?.cycle_sub?.find((v) => v.sub_id === (props.subId || propData.sub_id)) || {} as unknown as CycleSubItemT;
+      const propData = getPropData() as unknown as MeetingItemT;
+      const sub = propData?.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,
         propData,
-        props.isSub
+        isSub.value
           ? {
             is_cycle: false,
             mid,
@@ -368,12 +376,12 @@ const changeIntervalType = () => {
 };
 
 const changeIsCycle = () => {
-  form.value.platform = 'WELINK';
+  form.value.platform = typeOptions.value.find(v => (v.value as unknown as string).toLowerCase() === 'welink')?.value as unknown as string || 'WeLink';
 };
 
 const { lePadV } = useScreen();
 const confirm = async () => {
-  let type = props.isEdit ? t('meeting.editSuccess') : t('meeting.booSuccess');
+  let type = isEdit.value ? t('meeting.editSuccess') : t('meeting.booSuccess');
   try {
     loading.value = true;
     const valid = await formRef.value.validate();
@@ -431,8 +439,8 @@ const confirm = async () => {
         end,
       };
     }
-    if (props.isEdit) {
-      if (props.isSub) {
+    if (isEdit.value) {
+      if (isSub.value) {
         const { mid, sub_id } = form.value;
         const { date, start, end } = params;
         flag = await props?.editSubMeetingRequest(sub_id, {
@@ -482,7 +490,7 @@ onMounted(() => {
 
 const changeSig = (sig: any) => {
   const find = sigOptions.value.find((v) => v.value === sig);
-  if (!props.isEdit) {
+  if (!isEdit.value) {
     form.value.etherpad = find?.etherpad || '';
     form.value.email_list = find?.email_list || '';
   }

package/src/components/meeting/OMeetingMyCalendar.vue

@@ -59,10 +59,6 @@ const emits = defineEmits(['edit']);
 const nextLoading = ref(false);
 const bottomReached = ref(false);
 const headerRef = ref();
-const headerHeight = ref(0);
-const getHeaderHeight = () => {
-  headerHeight.value = headerRef.value?.clientHeight || 0;
-};
 
 const getList = async () => {
   if (!props.getMeetingListRequest) {
@@ -597,7 +593,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
           ref="scrollerRef"
           @scrollend="load"
           v-if="list.length"
-          :style="{ '--header-height': headerHeight }"
           class="scroller-container"
           show-type="hover"
         >
@@ -817,7 +812,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
     @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));
+      --phone-padding-top: 56px;
     }
 
     .o-loading {
@@ -855,9 +850,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
       }
 
       @include respond('phone') {
-        padding-top: var(--o-gap-7);
         background-color: var(--o-color-fill1);
-        padding-bottom: var(--o-gap-4);
         display: flex;
         position: fixed;
         height: var(--phone-padding-top);
@@ -1072,7 +1065,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
 
       .scroller-container {
         height: 100%;
-        max-height: calc(var(--layout-left-height, 900px) - 4 * var(--o-gap-5) - var(--header-height) * 1px);
+        max-height: calc(var(--layout-left-height, 900px) - 4 * var(--o-gap-5) - var(--header-height, 64) * 1px);
 
         @include respond('phone') {
           max-height: fit-content;
@@ -1374,6 +1367,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
                     .o-tag {
                       background-color: var(--o-color-control2-light);
                       border: none;
+                      font-weight: 400;
                     }
                   }
 

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

@@ -90,7 +90,11 @@ const computedList = computed<any[]>(() => {
           dateRange = `${ formatDate(v.start_date) } ${ v.start }-${ formatDate(v.end_date) } ${ v.end }`;
         }
       } else {
-        dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD HH:mm') } ${ formatDate(v.end_date, 'YYYY/MM/DD HH:mm') }`;
+        if (v.start_date === v.end_date) {
+          dateRange = formatDate(v.start_date, 'YYYY/MM/DD');
+        } else {
+          dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD') }-${ formatDate(v.end_date, 'YYYY/MM/DD') }`;
+        }
       }
 
       return {
@@ -169,7 +173,7 @@ const computedList = computed<any[]>(() => {
       <OCollapseItem v-for="(item, index) in computedList" :key="item.id" :value="item.id">
         <template #title>
           <div class="meet-title-left">
-            <div class="meet-title" :title="item.topic || item.name">
+            <div class="meet-title" :title="item.topic || item.name || item.title">
               <OIcon
                 :style="{
                   backgroundColor: `${getConfig(item.type, 'color')}`
@@ -492,6 +496,7 @@ const computedList = computed<any[]>(() => {
         .o-tag {
           background-color: var(--o-color-control2-light);
           border: none;
+          font-weight: 400;
         }
       }
 

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

@@ -5,6 +5,7 @@ import { CalendarDataType, MeetingItemT } from '../types.ts';
 import MoreText from '@/components/common/MoreText.vue';
 import { formatDate } from '@/components/meeting/utils.ts';
 import { useMeetingConfig } from '../composables/useMeetingConfig';
+import { useI18n } from '@/i18n';
 
 const props = defineProps<{
   data: MeetingItemT;
@@ -13,7 +14,8 @@ const props = defineProps<{
   page?: CalendarDataType
 }>();
 const { t, getPlatformLabel } = useMeetingConfig();
-
+const { locale } = useI18n();
+const isZh = computed(() => locale.value === 'zh');
 // 会议详情配置
 const infoList = computed(() =>
   [
@@ -83,11 +85,15 @@ const columns = computed<ColumnItemT[]>(() => {
 });
 
 const domRef = ref([]);
+const SPLIT_MARK = '|';
 // 复制会议内容
 const copyInfo = () => {
   try {
-    let text = `${ t('meeting.meetingTopic') + props.data.topic }\n`;
-    text += [...domRef.value].reduce((pre, cur: HTMLDivElement) => `${ pre }${ cur.textContent }\n`, '');
+    const colon = isZh.value ? '：' : ': ';
+    let text = `${ t('meeting.meetingTopic') }${ colon }${ props.data.topic || props.data.name || props.data.title }\n`;
+    text += [...domRef.value].reduce((pre, cur: HTMLDivElement) => {
+      return `${ pre }${ cur.textContent ? cur.textContent.replace(SPLIT_MARK, colon) : '' }\n`;
+    }, '');
     navigator.clipboard.writeText(text);
     return Promise.resolve();
   } catch (e) {
@@ -114,6 +120,7 @@ defineExpose({ copyInfo });
     >
       <template v-if="getField(info.key) && !info.isRecord">
         <span class="label">{{ info.label }}</span>
+        <span class="split-mark">{{ SPLIT_MARK }}</span>
         <MoreText :show="show" v-if="info.ellipsis" :text="getField(info.key) || '-'" />
         <OLink
           v-else-if="info.isLink"
@@ -190,6 +197,13 @@ defineExpose({ copyInfo });
       }
     }
 
+    .split-mark {
+      width: 0;
+      height: 0;
+      opacity: 0;
+      overflow: hidden;
+    }
+
     &.type_events {
       .label {
         width: 6em;

package/src/components/meeting/types.ts

@@ -37,7 +37,7 @@ export interface OptionItemT {
 }
 
 
-export type PlatformT = 'welink' | 'tencent' | 'zoom' | 'WELINK' | 'TENCENT' | 'ZOOM';
+export type PlatformT = 'welink' | 'tencent' | 'zoom' | 'WELINK' | 'TENCENT' | 'ZOOM' | 'WeLink' | 'Tencent';
 
 export enum MeetingGroupType {
   SIG = 'sig',
@@ -63,7 +63,7 @@ export interface MeetingPostT {
   topic: string; // 会议主题 128
   sponsor?: string; // 会议发起人 20
   group_name: string; // 所属SIG 64
-  platform: PlatformT; // 会议平台
+  platform: PlatformT | string; // 会议平台
   date: string; // 会议日期
   date_range?: string[]; // 日期返回
   time: string; // 会议时间
@@ -88,8 +88,6 @@ export interface MeetingPostT {
 
 export interface MeetingFormPropsT {
   data?: MeetingItemT;
-  isSub?: boolean;
-  isEdit?: boolean;
   subId?: string;
   createMeetingRequest: any,
   editMeetingRequest: any;

package/src/components/search/OSearchInput.vue

@@ -230,7 +230,7 @@ const handleSuggestClick = (item: OSearchRecommendItem) => {
   emit('recommend-click', item);
   suppressNextInput = true;
   innerValue.value = item.key;
-  runSearch(item.key);
+  runSearch(item.key ?? '');
 };
 
 const handleOnestepClick = (item: OSearchRecommendItem) => {

package/src/components/{OSection.vue → section/OSection.vue}

@@ -2,7 +2,7 @@
 import { isArray, OLink, OIcon } from '@opensig/opendesign';
 import IconChevronRight from '~icons/components/icon-chevron-right.svg';
 
-interface SectionPropsT {
+export interface SectionPropsT {
   title?: string | Array<string>;
   subtitle?: string;
   full?: boolean;

package/src/components/section/index.ts

@@ -0,0 +1,10 @@
+import _OSection from './OSection.vue';
+import type { App } from 'vue';
+
+const OSection = Object.assign(_OSection, {
+  install(app: App) {
+    app.component('OSection', _OSection);
+  },
+});
+
+export { OSection };

package/src/i18n/en.ts

@@ -146,7 +146,7 @@ export default {
   'meeting.groups': 'Groups',
   'meeting.activityAddress': 'Address',
   'meeting.livePlatform': 'Live Platform',
-  'meeting.meetingTopic': 'Topics: ',
+  'meeting.meetingTopic': 'Topics',
   'meeting.meetingDetail': 'Details',
   'meeting.meetingEtherpad': 'Etherpad',
   'meeting.meetingReplay': 'Playback',

package/src/i18n/zh.ts

@@ -145,7 +145,7 @@ export default {
   'meeting.groups': '工作组',
   'meeting.activityAddress': '活动地点',
   'meeting.livePlatform': '直播平台',
-  'meeting.meetingTopic': '会议主题：',
+  'meeting.meetingTopic': '会议主题',
   'meeting.meetingDetail': '会议详情',
   'meeting.meetingEtherpad': '会议纪要',
   'meeting.meetingReplay': '智能回放',
@@ -165,6 +165,8 @@ export default {
   'common.more': '更多',
   'cookie.desc': '我们使用cookie来确保您的高速浏览体验。继续浏览本站，即表示您同意我们使用cookie。',
   'cookie.about': '查看详情',
+  'cookie.acceptAll': '全部接受',
+  'cookie.saveSetting': '保存设置',
   'meeting.create': '创建',
   'meeting.createMeeting': '创建会议',
   'meeting.createActivity': '创建活动',

package/src/index.ts

@@ -1,46 +1,13 @@
 // OpenDesignPlus Components 库入口文件
 // 此文件由 scripts/generate-components-index.js 自动生成
-
-import OBanner from './components/OBanner.vue';
-import OCookieNotice from './components/OCookieNotice.vue';
-import OFooter from './components/OFooter.vue';
-import OHeaderSearch from './components/OHeaderSearch.vue';
-import OHeaderUser from './components/OHeaderUser.vue';
-import OPlusConfigProvider from './components/OPlusConfigProvider.vue';
-import OSection from './components/OSection.vue';
-import OSourceCode from './components/OSourceCode.vue';
-import OThemeSwitcher from './components/OThemeSwitcher.vue';
-
-// 导出组件
-const components = {
-  OBanner,
-  OCookieNotice,
-  OFooter,
-  OHeaderSearch,
-  OHeaderUser,
-  OPlusConfigProvider,
-  OSection,
-  OSourceCode,
-  OThemeSwitcher
-};
-
-// 导出单个组件
-export { OBanner, OCookieNotice, OFooter, OHeaderSearch, OHeaderUser, OPlusConfigProvider, OSection, OSourceCode, OThemeSwitcher };
-
-// 重新导出子目录中的组件
 export * from './components/activity';
+export * from './components/banner';
+export * from './components/config-provider';
+export * from './components/cookie-notice';
 export * from './components/element-plus';
 export * from './components/events';
+export * from './components/footer';
 export * from './components/header';
 export * from './components/meeting';
 export * from './components/search';
-
-// 默认导出（用于Vue插件安装）
-export default {
-  install: (app: any) => {
-    // 注册所有组件
-    Object.entries(components).forEach(([name, component]) => {
-      app.component(name, component);
-    });
-  }
-};
+export * from './components/section';

package/dist/components/OBanner.vue.d.ts

@@ -1,11 +0,0 @@
-type __VLS_Props = {
-    options: any;
-    size: string;
-    contentJustifyCenter: boolean;
-};
-declare const _default: import('../../vue/dist/vue.esm-bundler.js').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, {}, string, import('../../vue/dist/vue.esm-bundler.js').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
-    options: any;
-    size: string;
-    contentJustifyCenter: boolean;
-}, {}, {}, {}, string, import('../../vue/dist/vue.esm-bundler.js').ComponentProvideOptions, false, {}, HTMLDivElement>;
-export default _default;

package/dist/components/OCookieNotice.vue.d.ts

@@ -1,17 +0,0 @@
-type __VLS_Props = {
-    visible?: boolean;
-    community: string;
-    detailUrl: string;
-    wrapper?: string | HTMLElement;
-    cookieDomain: string;
-};
-declare const _default: import('../../vue/dist/vue.esm-bundler.js').DefineComponent<__VLS_Props, {
-    check(): void;
-}, {}, {}, {}, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, {} & {
-    "update:visible": (value: boolean) => any;
-}, string, import('../../vue/dist/vue.esm-bundler.js').PublicProps, Readonly<__VLS_Props> & Readonly<{
-    "onUpdate:visible"?: ((value: boolean) => any) | undefined;
-}>, {}, {}, {}, {}, string, import('../../vue/dist/vue.esm-bundler.js').ComponentProvideOptions, false, {
-    cookieNoticeRef: HTMLDivElement;
-}, any>;
-export default _default;

package/dist/components/OSourceCode.vue.d.ts

@@ -1,18 +0,0 @@
-interface CodeItemT {
-    label: string;
-    href: string;
-    icon?: string;
-    target?: string;
-}
-interface CodePropsT {
-    title?: string;
-    options?: CodeItemT[];
-    href?: string;
-    target?: string;
-    icon?: string;
-    justify?: string;
-}
-declare const _default: import('../../vue/dist/vue.esm-bundler.js').DefineComponent<CodePropsT, {}, {}, {}, {}, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, {}, string, import('../../vue/dist/vue.esm-bundler.js').PublicProps, Readonly<CodePropsT> & Readonly<{}>, {
-    justify: string;
-}, {}, {}, {}, string, import('../../vue/dist/vue.esm-bundler.js').ComponentProvideOptions, false, {}, HTMLDivElement>;
-export default _default;

package/dist/components/OThemeSwitcher.vue.d.ts

@@ -1,25 +0,0 @@
-export interface OThemeSwitcherPropsT {
-    theme?: string;
-    type?: 'auto' | 'common' | 'mobile';
-    lightValue?: string;
-    darkValue?: string;
-    disabled?: boolean;
-}
-export interface OThemeSwitcherEmitsT {
-    (e: 'update:theme', value: string): void;
-    (e: 'change', val: string): void;
-}
-declare const _default: import('../../vue/dist/vue.esm-bundler.js').DefineComponent<OThemeSwitcherPropsT, {}, {}, {}, {}, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, import('../../vue/dist/vue.esm-bundler.js').ComponentOptionsMixin, {} & {
-    change: (val: string) => any;
-    "update:theme": (value: string) => any;
-}, string, import('../../vue/dist/vue.esm-bundler.js').PublicProps, Readonly<OThemeSwitcherPropsT> & Readonly<{
-    onChange?: ((val: string) => any) | undefined;
-    "onUpdate:theme"?: ((value: string) => any) | undefined;
-}>, {
-    type: "auto" | "common" | "mobile";
-    disabled: boolean;
-    theme: string;
-    lightValue: string;
-    darkValue: string;
-}, {}, {}, {}, string, import('../../vue/dist/vue.esm-bundler.js').ComponentProvideOptions, false, {}, HTMLDivElement>;
-export default _default;