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

package/src/components/banner/OBannerContent.vue

@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { OButton, OFigure } from '@opensig/opendesign';
+import ContentWrapper from '../common/ContentWrapper.vue';
+import type { BannerContentProps } from './types';
+
+defineProps<BannerContentProps>();
+
+// 内联定义 emits 类型
+const emit = defineEmits<{
+  (e: 'click', href: string | undefined): void;
+}>();
+
+const onClick = (href: string | undefined, hasBtn: string | undefined) => {
+  if (href && !hasBtn) {
+    window.open(href);
+    emit('click', href);
+  }
+};
+</script>
+
+<template>
+  <OFigure
+    class="banner-bg"
+    :src="info.bg"
+    :class="{
+      'with-sticky-bg': info.withStickyBg,
+      'cursor-pointer': info.href && !info.btn,
+    }"
+    :style="{
+      '--pad-offset': info.pad_offset,
+    }"
+    @click="onClick(info.href, info.btn)"
+  >
+    <ContentWrapper class="banner-wrapper" :class="['banner-wrapper', contentJustifyCenter ? 'content-center' : '']">
+      <div class="banner-content">
+        <img v-if="!isPhone && info.attach" :src="info.attach" class="banner-attach" />
+
+        <!-- 标题 -->
+        <div 
+          :class="{
+            'banner-title': true, 
+            'text-dark': info.text_theme === 'dark' 
+          }" 
+          v-if="info.title"
+        >
+          {{ info.title }}
+        </div>
+        <!-- 副标题 -->
+        <div 
+          :class="{
+            'banner-subtitle': true, 
+            'text-dark': info.text_theme === 'dark' 
+          }" 
+          v-if="info.subtitle"
+        >
+          {{ info.subtitle }}
+        </div>
+        <div
+          class="banner-text"
+          v-if="info.bg_text"
+          :style="{
+            backgroundImage: `url(${info.bg_text})`,
+            '--pc-width': info.pc_text_width,
+            '--pc-height': info.pc_text_height,
+            '--pad-width': info.pad_text_width,
+            '--pad-height': info.pad_text_height,
+          }"
+        ></div>
+        <!-- 操作按钮 -->
+        <div v-if="info.btn" class="banner-opts">
+          <OButton 
+            :href="info.href" 
+            target="_blank" 
+            variant="solid" 
+            color="primary" 
+            :size="size === 'tiny' ? undefined : size"
+          >
+            {{ info.btn }}
+          </OButton>
+        </div>
+      </div>
+    </ContentWrapper>
+  </OFigure>
+</template>
+
+<style lang="scss" scoped>
+.banner-bg {
+  width: 100%;
+  height: 100%;
+
+  :deep(.o-figure-img) {
+    width: 100%;
+    height: 100%;
+  }
+
+  @include respond-to('pad') {
+    :deep(.o-figure-img) {
+      transition: object-position 0.3s ease;
+      object-position: var(--pad-offset);
+    }
+  }
+
+  @include respond-to('phone') {
+    --figure-radius: 4px;
+  }
+}
+
+.banner-wrapper {
+  height: 100%;
+
+  &.content-center {
+    display: flex;
+    justify-content: center;
+
+    & .banner-content {
+      align-items: center;
+    }
+  }
+}
+
+.banner-content {
+  height: 100%;
+  display: inline-flex;
+  flex-direction: column;
+  justify-content: center;
+  position: relative;
+}
+
+.banner-title {
+  @include display1;
+  color: var(--o-color-info1);
+  font-weight: 500;
+  margin-bottom: 8px;
+
+  &.text-dark {
+    color: var(--o-color-info1-inverse);
+  }
+
+  @include respond-to('<=pad_v') {
+    font-size: 22px;
+    line-height: 30px;
+  }
+}
+
+.banner-subtitle {
+  color: var(--o-color-info1);
+  margin-top: 8px;
+  font-size: 16px;
+
+  &.text-dark {
+    color: var(--o-color-info1-inverse);
+  }
+}
+
+.banner-text {
+  height: var(--pc-height);
+  width: var(--pc-width);
+  background-size: contain;
+  background-repeat: no-repeat;
+
+  @include respond-to('pad') {
+    height: var(--pad-height);
+    width: var(--pad-width);
+  }
+}
+
+.banner-opts {
+  margin-top: 24px;
+  --d: 20px;
+}
+
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>

package/src/components/banner/index.ts

@@ -0,0 +1,18 @@
+import _OBanner from './OBanner.vue';
+import _OBannerContent from './OBannerContent.vue';
+import type { App } from 'vue';
+
+
+const OBanner = Object.assign(_OBanner, {
+  install(app: App) {
+    app.component('OBanner', _OBanner);
+  },
+});
+const OBannerContent = Object.assign(_OBannerContent, {
+  install(app: App) {
+    app.component('OBannerContent', _OBannerContent);
+  },
+});
+
+export { OBanner, OBannerContent };
+export * from './types';

package/src/components/banner/types.ts

@@ -0,0 +1,39 @@
+// Banner 项的类型定义
+export interface BannerItem {
+  title?: string;
+  subtitle?: string;
+  bg: string;
+  text_theme?: 'light' | 'dark';
+  bg_text?: string;
+  pc_text_width?: string;
+  pc_text_height?: string;
+  pad_text_width?: string;
+  pad_text_height?: string;
+  attach?: string;
+  href?: string;
+  btn?: string;
+  withStickyBg?: boolean;
+  pad_offset?: string;
+}
+
+// BannerContent 组件的 Props 类型
+export interface BannerContentProps {
+  info: BannerItem;
+  size?: 'large' | 'medium' | 'small' | 'tiny';
+  contentJustifyCenter?: boolean;
+  isPhone?: boolean;
+  isLight?: boolean;
+}
+
+// Emits 事件类型
+export interface HomeBannerEmits {
+  (e: 'before-change', index: number): void;
+  (e: 'click', href: string | undefined): void;
+}
+
+export interface BannerContentEmits {
+  (e: 'click', href: string | undefined): void;
+}
+
+// 组件尺寸类型
+export type ComponentSize = 'large' | 'medium' | 'small' | 'tiny';

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/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')}`

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/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': '智能回放',

package/src/index.ts

@@ -1,11 +1,11 @@
 // 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 OLanguageSwitcher from './components/OLanguageSwitcher.vue';
 import OPlusConfigProvider from './components/OPlusConfigProvider.vue';
 import OSection from './components/OSection.vue';
 import OSourceCode from './components/OSourceCode.vue';
@@ -13,11 +13,11 @@ import OThemeSwitcher from './components/OThemeSwitcher.vue';
 
 // 导出组件
 const components = {
-  OBanner,
   OCookieNotice,
   OFooter,
   OHeaderSearch,
   OHeaderUser,
+  OLanguageSwitcher,
   OPlusConfigProvider,
   OSection,
   OSourceCode,
@@ -25,10 +25,11 @@ const components = {
 };
 
 // 导出单个组件
-export { OBanner, OCookieNotice, OFooter, OHeaderSearch, OHeaderUser, OPlusConfigProvider, OSection, OSourceCode, OThemeSwitcher };
+export { OCookieNotice, OFooter, OHeaderSearch, OHeaderUser, OLanguageSwitcher, OPlusConfigProvider, OSection, OSourceCode, OThemeSwitcher };
 
 // 重新导出子目录中的组件
 export * from './components/activity';
+export * from './components/banner';
 export * from './components/element-plus';
 export * from './components/events';
 export * from './components/header';

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;