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

package/src/components/{OHeaderUser.vue → header-user/OHeaderUser.vue}

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { OIcon, OBadge, ODropdown, ODropdownItem } from '@opensig/opendesign';
 
-import AppAvatar from './common/AppAvatar.vue';
+import AppAvatar from '../common/AppAvatar.vue';
 
 import IconAvatar from '~icons/components/icon-avatar-line.svg';
 import IconChevronDown from '~icons/components/icon-chevron-down.svg';
@@ -10,12 +10,12 @@ import { useScreen } from '@opendesign-plus/composables';
 
 const { lePadV } = useScreen();
 
-interface UserInfoT {
+export interface UserInfoT {
   photo: string;
   username: string;
 }
 
-interface OptionsItemT {
+export interface OptionsItemT {
   id: string; // id
   label: string; // 标题
   icon?: string; // icon
@@ -25,7 +25,7 @@ interface OptionsItemT {
   logout: boolean; // 是否是退出登录 item
 }
 
-interface UserPropsT {
+export interface UserPropsT {
   token?: string;
   lang?: string;
   noticeTotal?: number;

package/src/components/header-user/index.ts

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

package/src/components/meeting/OMeetingCalendar.vue

@@ -326,6 +326,7 @@ defineExpose({
               </OIcon>
             </div>
             <OSelect
+              v-if="groupType !== MeetingGroupType.NONE"
               v-model="group"
               :placeholder="t(groupType === MeetingGroupType.GROUP ? 'meeting.allGroups' : 'meeting.allSigs')"
               clearable
@@ -337,7 +338,7 @@ defineExpose({
 
           <div class="right-title">
             {{ t('meeting.latestMeeting') }}&nbsp;
-            <span>{{ dayjs(latestDay).format('YYYY/MM/DD') }}</span>
+            <span>{{ formatDate(dayjs(latestDay)) }}</span>
           </div>
         </template>
         <template #date-cell="{ data }">
@@ -383,7 +384,7 @@ defineExpose({
       <div class="detail-list">
         <div class="current-day">
           {{ t('meeting.latestMeeting') }}&nbsp;
-          <span>{{ dayjs(currentDay).format('YYYY/MM/DD') }}</span>
+          <span>{{ formatDate(dayjs(currentDay)) }}</span>
         </div>
         <div class="right-title">
           <div class="title-list">
@@ -864,9 +865,10 @@ defineExpose({
         justify-content: center;
         align-items: flex-end;
         height: 60px;
-      }
-
-      .o-tab {
+        
+        @include respond-to('pad_v') {
+          --tab-nav-justify: flex-end;
+        }
         .o-icon {
           svg path {
             fill: currentColor;

package/src/components/meeting/OMeetingForm.vue

@@ -29,7 +29,7 @@ import {
   PlatformT,
 } from './types';
 import dayjs from 'dayjs';
-import { findLabelFromOptions, formatDateNumber, getDateNumber } from './utils';
+import { findLabelFromOptions, formatDate, 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';
@@ -514,7 +514,7 @@ defineExpose({
 <template>
   <div class="o-meeting-form">
     <OForm :model="form" ref="formRef" has-required :layout="lePadV ? 'v' : 'h'" class="form-wrapper">
-      <OFormItem :rules="rules.topic" :label="t('meeting.meetingName')" field="topic">
+      <OFormItem :rules="rules.topic" :label="labelMap?.topic ?? t('meeting.meetingName')" field="topic">
         <OInput
           :disabled="isSub"
           size="large"
@@ -524,7 +524,7 @@ defineExpose({
       </OFormItem>
       <OFormItem
         :rules="rules.group_name"
-        :label="groupType === MeetingGroupType.GROUP ? t('meeting.meetingGroup'):t('meeting.meetingSig')"
+        :label="labelMap?.group_name ?? (groupType === MeetingGroupType.GROUP ? t('meeting.meetingGroup') : t('meeting.meetingSig'))"
         field="group_name">
         <OSelect
           :disabled="isEdit"
@@ -539,7 +539,8 @@ defineExpose({
       </OFormItem>
       <OFormItem :rules="rules.etherpad" label="Etherpad" field="etherpad" v-if="form.group_name">
         <template #label>
-          <div class="label-wrapper">
+          <template v-if="labelMap?.etherpad">{{ labelMap.etherpad }}</template>
+          <div v-else class="label-wrapper">
             <span>{{ t('meeting.etherpad') }}&nbsp;</span>
             <OPopover>
               <div class="o-meeting-form-popover-content etherpad">{{ t('meeting.etherpadDesc') }}</div>
@@ -560,7 +561,7 @@ defineExpose({
         />
       </OFormItem>
 
-      <OFormItem :label="t('meeting.meetingTime')" field="time" :rules="rules.time" class="repeat-row" required>
+      <OFormItem :label="labelMap?.time ?? t('meeting.meetingTime')" field="time" :rules="rules.time" class="repeat-row" required>
         <div class="repeat-config-wrapper">
           <OFormItem field="repeat" class="repeat-item" v-if="!isSub">
             <ORadioGroup v-model="form.is_cycle" @change="changeIsCycle" :disabled="isEdit">
@@ -589,7 +590,7 @@ defineExpose({
                 </div>
               </OFormItem>
               <OFormItem
-                :label="t('meeting.in')"
+                :label="labelMap?.cycle_point ?? t('meeting.in')"
                 field="cycle_point"
                 class="point-item"
                 v-if="form.cycle_type !== INTERVAL_DAY"
@@ -606,7 +607,7 @@ defineExpose({
                 </OSelect>
                 <OMeetingCalendarSelector v-if="form.cycle_type === INTERVAL_MONTH" v-model="form.cycle_point" />
               </OFormItem>
-              <OFormItem :label="t('meeting.meetingDuration')" field="date_range">
+              <OFormItem :label="labelMap?.date_range ?? t('meeting.meetingDuration')" field="date_range">
                 <ElDatePicker
                   size="large"
                   v-model="form.date_range"
@@ -622,7 +623,7 @@ defineExpose({
               </OFormItem>
             </template>
             <template v-else>
-              <OFormItem :label="t('meeting.meetingDate')" field="date">
+              <OFormItem :label="labelMap?.date ?? t('meeting.meetingDate')" field="date">
                 <ElDatePicker
                   popper-class="o-meeting-form-date-picker-popper"
                   size="large"
@@ -671,14 +672,14 @@ defineExpose({
           </div>
         </div>
       </OFormItem>
-      <OFormItem :label="t('meeting.meetingPlatform')" field="platform" :rules="rules.platform" class="platform-item">
+      <OFormItem :label="labelMap?.platform ?? t('meeting.meetingPlatform')" field="platform" :rules="rules.platform" class="platform-item">
         <ORadioGroup v-model="form.platform" v-if="!data" :disabled="form.is_cycle">
           <ORadio v-for="item in typeOptions" :key="item.value" :value="item.value">{{ getPlatformLabel(item.label) }}
           </ORadio>
         </ORadioGroup>
         <span v-else>{{ getPlatformLabel(form.platform) }}</span>
       </OFormItem>
-      <OFormItem field="agenda" :label="t('meeting.meetingAgenda')" :rules="rules.genda">
+      <OFormItem field="agenda" :label="labelMap?.agenda ?? t('meeting.meetingAgenda')" :rules="rules.genda">
         <OTextarea
           :disabled="isSub"
           size="large"
@@ -686,7 +687,7 @@ defineExpose({
           style="width: 100%"
           :rows="4" v-model="form.agenda" />
       </OFormItem>
-      <OFormItem :label="t('meeting.meetingRecord')" field="is_record" class="record-item full-width-item">
+      <OFormItem :label="labelMap?.is_record ?? t('meeting.meetingRecord')" field="is_record" class="record-item full-width-item">
         <template v-if="lePadV">
           <OSwitch v-model="form.is_record" :disabled="isSub" />
         </template>
@@ -723,7 +724,8 @@ defineExpose({
       </template>
       <OFormItem field="email_list" :rules="rules.email_list">
         <template #label>
-          <div class="label-wrapper">
+          <template v-if="labelMap?.email_list">{{ labelMap.email_list }}</template>
+          <div v-else class="label-wrapper">
             <span>{{ t('meeting.meetingEmail') }}&nbsp;</span>
             <OPopover>
               <div class="o-meeting-form-popover-content">

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) {
@@ -471,14 +467,11 @@ onMounted(() => {
   window.addEventListener('scroll', handleScroll);
   // 添加resize监听器
   window.addEventListener('resize', handleScroll);
-  getHeaderHeight();
-  window.addEventListener('resize', getHeaderHeight);
 });
 
 onUnmounted(() => {
   window.removeEventListener('scroll', handleScroll);
   window.removeEventListener('resize', handleScroll);
-  window.removeEventListener('resize', getHeaderHeight);
   const scrollerContainerEl = scrollerRef.value?.getContainerEl();
   scrollerContainerEl?.removeEventListener('scroll', scrollerScroll);
 });
@@ -597,7 +590,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 +809,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 +847,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 +1062,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 +1364,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

@@ -91,9 +91,9 @@ const computedList = computed<any[]>(() => {
         }
       } else {
         if (v.start_date === v.end_date) {
-          dateRange = formatDate(v.start_date, 'YYYY/MM/DD');
+          dateRange = formatDate(v.start_date);
         } else {
-          dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD') }-${ formatDate(v.end_date, 'YYYY/MM/DD') }`;
+          dateRange = `${ formatDate(v.start_date) }-${ formatDate(v.end_date) }`;
         }
       }
 
@@ -496,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

@@ -161,11 +161,11 @@ defineExpose({ copyInfo });
     display: flex;
     align-items: flex-start;
     font-size: 14px;
-    gap: var(--o-gap-5);
+    gap: var(--o-gap-2);
 
     @include respond('<=pad_v') {
       font-size: 12px;
-      gap: var(--o-gap-2);
+      gap: var(--o-gap-1);
     }
 
     &:not(.is-empty) {

package/src/components/meeting/types.ts

@@ -42,6 +42,7 @@ export type PlatformT = 'welink' | 'tencent' | 'zoom' | 'WELINK' | 'TENCENT' | '
 export enum MeetingGroupType {
   SIG = 'sig',
   GROUP = 'group',
+  NONE = 'none',
 }
 
 export interface MeetingCalendarPropsT {
@@ -96,7 +97,8 @@ export interface MeetingFormPropsT {
   getGroupsRequest: any;
   showBtns?: boolean;
   groupType: MeetingGroupType;
-  confirmText?: string
+  confirmText?: string;
+  labelMap?: Record<string, string>;
 }
 
 export interface ObsDataItemT {

package/src/components/meeting/utils.ts

@@ -1,10 +1,10 @@
-import dayjs from 'dayjs';
+import dayjs, { Dayjs } from 'dayjs';
 import { OptionItemT } from './types';
 
-export const formatDate = (date: string | Date = new Date(), format: string = 'YYYY-MM-DD'): string => {
-  let dateStr = date;
+export const formatDate = (date: undefined | string | Date | Dayjs = new Date(), format: string = 'YYYY/MM/DD'): string => {
+  let dateStr: any = date;
   if (!dateStr) {
-    dateStr = new Date();
+    dateStr = undefined;
   }
   if (!dayjs(new Date(dateStr)).isValid()) {
     return dateStr as string;

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/zh.ts

@@ -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,47 +1,18 @@
 // OpenDesignPlus Components 库入口文件
 // 此文件由 scripts/generate-components-index.js 自动生成
-
-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';
-import OThemeSwitcher from './components/OThemeSwitcher.vue';
-
-// 导出组件
-const components = {
-  OCookieNotice,
-  OFooter,
-  OHeaderSearch,
-  OHeaderUser,
-  OLanguageSwitcher,
-  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/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/header-language-switcher';
+export * from './components/header-search';
+export * from './components/header-source-code';
+export * from './components/header-theme';
+export * from './components/header-user';
 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/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;
-}>, {
-    disabled: boolean;
-    type: "auto" | "common" | "mobile";
-    theme: string;
-    lightValue: string;
-    darkValue: string;
-}, {}, {}, {}, string, import('../../vue/dist/vue.esm-bundler.js').ComponentProvideOptions, false, {}, HTMLDivElement>;
-export default _default;