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

package/dist/index.d.ts

@@ -6,6 +6,11 @@ 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';
 export * from './components/section';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.62",
+  "version": "0.0.1-rc.63",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -25,26 +25,26 @@
       "require": "./dist/components.css"
     }
   },
-  "dependencies": {
-    "@opensig/opendesign": "1.2.3-sp1",
-    "@vueuse/core": "10.11.1",
+  "peerDependencies": {
+    "@opensig/opendesign": "1.2.4",
+    "@vueuse/core": "^14.0.0",
     "aos": "^2.3.4",
     "dayjs": "^1.11.13",
     "video.js": "^8.23.7",
     "vue-dompurify-html": "^3.1.2",
+    "vue": "^3.5.13",
+    "element-plus": "2.13.1",
     "@opendesign-plus/composables": "0.0.1-rc.8",
     "@opendesign-plus/styles": "0.0.1-rc.2"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.1.0",
-    "element-plus": "^2.13.1",
+    "@vitejs/plugin-vue": "^5.2.1",
     "sass": "^1.71.1",
     "typescript": "~5.8.2",
     "unplugin-element-plus": "^0.11.2",
     "unplugin-icons": "^0.14.1",
     "vite": "^6.2.3",
     "vite-plugin-dts": "^4.5.3",
-    "vue": "^3.4.0",
     "vue-tsc": "2.2.8"
   },
   "scripts": {

package/src/assets/styles/element-plus.scss

@@ -169,6 +169,8 @@
 
   .el-input__wrapper {
     background: var(--o-color-fill2);
+    box-shadow: none;
+    border: 1px solid var(--el-input-border-color);
   }
 
   .el-select__wrapper {

package/src/components/header/index.ts

@@ -1,10 +1,5 @@
 import _OHeader from './OHeader.vue';
 import _OHeaderMobile from './OHeaderMobile.vue';
-import _OHeaderUser from './OHeaderUser.vue';
-import _OHeaderSearch from './OHeaderSearch.vue';
-import _OHeaderTheme from './OHeaderTheme.vue';
-import _OHeaderSourceCode from './OHeaderSourceCode.vue';
-import _OHeaderLanguageSwitcher from './OHeaderLanguageSwitcher.vue';
 import type { App } from 'vue';
 
 const OHeader = Object.assign(_OHeader, {
@@ -19,35 +14,5 @@ const OHeaderMobile = Object.assign(_OHeaderMobile, {
   },
 });
 
-const OHeaderUser = Object.assign(_OHeaderUser, {
-  install(app: App) {
-    app.component('OHeaderUser', _OHeaderUser);
-  },
-});
-
-const OHeaderSearch = Object.assign(_OHeaderSearch, {
-  install(app: App) {
-    app.component('OHeaderSearch', _OHeaderSearch);
-  },
-});
-
-const OHeaderTheme = Object.assign(_OHeaderTheme, {
-  install(app: App) {
-    app.component('OHeaderTheme', _OHeaderTheme);
-  },
-});
-
-const OHeaderSourceCode = Object.assign(_OHeaderSourceCode, {
-  install(app: App) {
-    app.component('OHeaderSourceCode', _OHeaderSourceCode);
-  },
-});
-
-const OHeaderLanguageSwitcher = Object.assign(_OHeaderLanguageSwitcher, {
-  install(app: App) {
-    app.component('OHeaderLanguageSwitcher', _OHeaderLanguageSwitcher);
-  },
-});
-
 export * from './types';
-export { OHeader, OHeaderMobile, OHeaderUser, OHeaderSearch, OHeaderTheme, OHeaderSourceCode, OHeaderLanguageSwitcher };
+export { OHeader, OHeaderMobile };

package/src/components/header-language-switcher/index.ts

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

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

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

package/src/components/header-source-code/index.ts

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

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

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

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

@@ -467,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);
 });

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) }`;
         }
       }
 

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

@@ -8,6 +8,11 @@ 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';
 export * from './components/section';