@opendesign-plus-test/components 0.0.1-rc.51 → 0.0.1-rc.53

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { OCollapse, OCollapseItem, ODivider, OIcon, OLink, OTag, useMessage } from '@opensig/opendesign';
+import { isClient, OCollapse, OCollapseItem, ODivider, OIcon, OLink, OTag, useMessage } from '@opensig/opendesign';
 import OMeetingDetail from './OMeetingDetail.vue';
 import { computed, nextTick, ref, watch } from 'vue';
 import IconCopy from '~icons/meeting/icon-copy.svg';
@@ -44,29 +44,36 @@ const i18n = computed(() => {
 
 // -------------------- 监听尺寸变化 --------------------
 const meetInfoRef = ref<HTMLDivElement[]>();
-const resizeObserver = new ResizeObserver((entries) => {
-  for (let entry of entries) {
-    const { height } = entry.contentRect;
-    entry.target.classList.remove('hidden-divider');
-    if (height >= 30) {
-      entry.target.classList.add('hidden-divider');
-    }
-  }
-});
 
+let resizeObserver: ResizeObserver | null = null;
 watch(
-  () => props.list,
+  [() => props.list, () => isClient],
   () => {
     if (props.list.length === 1) {
       collapseNames.value = [props.list[0].id];
     } else {
       collapseNames.value = [];
     }
-    nextTick(() => {
-      meetInfoRef.value?.forEach((targetDiv) => {
-        resizeObserver.observe(targetDiv);
+    if (isClient) {
+      nextTick(() => {
+        if (!resizeObserver) {
+          resizeObserver = new ResizeObserver((entries) => {
+            for (let entry of entries) {
+              const { height } = entry.contentRect;
+              entry.target.classList.remove('hidden-divider');
+              if (height >= 30) {
+                entry.target.classList.add('hidden-divider');
+              }
+            }
+          });
+        } else {
+          resizeObserver.disconnect();
+        }
+        meetInfoRef.value?.forEach((targetDiv) => {
+          resizeObserver!.observe(targetDiv);
+        });
       });
-    });
+    }
   },
 );
 
@@ -165,8 +172,8 @@ const computedList = computed<any[]>(() => {
             <div class="meet-title" :title="item.topic || item.name">
               <OIcon
                 :style="{
-              backgroundColor: `${getConfig(item.type, 'color')}`
-            }"
+                  backgroundColor: `${getConfig(item.type, 'color')}`
+                }"
               >
                 <component :is="getConfig(item.type, 'icon')" />
               </OIcon>
@@ -187,7 +194,13 @@ const computedList = computed<any[]>(() => {
                 <template v-if="item.activity_type">{{ item.activity_type }}</template>
               </div>
             </div>
-            <OLink v-if="item.url" :href="item.url" target="_blank" class="jump-detail-link">
+            <OLink
+              :hover-underline="false"
+              v-if="item.url"
+              :href="item.url"
+              target="_blank"
+              class="jump-detail-link"
+            >
               <span>{{ i18n.LEARN_MORE }}</span>
               <template #suffix>
                 <OIcon>
@@ -195,7 +208,13 @@ const computedList = computed<any[]>(() => {
                 </OIcon>
               </template>
             </OLink>
-            <OLink v-if="item.join_url" :href="item.join_url" target="_blank" class="jump-detail-link">
+            <OLink
+              :hover-underline="false"
+              v-if="item.join_url"
+              :href="item.join_url"
+              target="_blank"
+              class="jump-detail-link"
+            >
               <span>{{ i18n.JOIN_MEETING }}</span>
               <template #suffix>
                 <OIcon>
@@ -203,7 +222,13 @@ const computedList = computed<any[]>(() => {
                 </OIcon>
               </template>
             </OLink>
-            <OLink v-if="item.content_url" :href="item.content_url" target="_blank" class="jump-detail-link">
+            <OLink
+              :hover-underline="false"
+              v-if="item.content_url"
+              :href="item.content_url"
+              target="_blank"
+              class="jump-detail-link"
+            >
               <span>{{ i18n.DETAILS }}</span>
               <template #suffix>
                 <OIcon>
@@ -211,7 +236,13 @@ const computedList = computed<any[]>(() => {
                 </OIcon>
               </template>
             </OLink>
-            <OLink v-if="item.register_url" :href="item.register_url" target="_blank" class="jump-detail-link">
+            <OLink
+              :hover-underline="false"
+              v-if="item.register_url"
+              :href="item.register_url"
+              target="_blank"
+              class="jump-detail-link"
+            >
               <span>{{ i18n.SIGN }}</span>
               <template #suffix>
                 <OIcon>
@@ -226,7 +257,8 @@ const computedList = computed<any[]>(() => {
         </template>
         <div class="calendar-info">
           <OMeetingDetail
-            :show="collapseNames.includes(item.id)" :data="item"
+            :show="collapseNames.includes(item.id)"
+            :data="item"
             :ref="(insRef) => (detailRefs[index] = insRef)"
             from="home"
           />
@@ -241,6 +273,7 @@ const computedList = computed<any[]>(() => {
 
 
   &.is-empty {
+    min-height: 400px;
     height: 100%;
     display: flex;
     align-items: center;
@@ -264,6 +297,7 @@ const computedList = computed<any[]>(() => {
     .o-collapse-item {
       position: relative;
       border-top: none;
+      border-bottom: none;
 
       &::after {
         position: absolute;
@@ -353,6 +387,7 @@ const computedList = computed<any[]>(() => {
           display: inline-flex;
           opacity: 0;
           visibility: hidden;
+          color: var(--o-color-info1);
 
           &:hover {
             color: var(--o-color-primary1);
@@ -389,7 +424,7 @@ const computedList = computed<any[]>(() => {
         flex-direction: column;
         background-color: color-mix(in srgb, var(--o-color-control2-light) 40%, transparent);
         padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + var(--o-gap-5) - 12px);
-        border-radius: var(--o-radius-xs);
+        border-radius: var(--meeting-card-radius);
         @include tip1;
 
         @include respond('<=pad_v') {
@@ -420,6 +455,7 @@ const computedList = computed<any[]>(() => {
       padding-left: calc(var(--icon-right) + var(--icon-size2));
       margin-top: var(--o-gap-2);
       color: var(--o-color-info2);
+      font-weight: 400;
       @include tip1;
 
       &:hover {
@@ -442,7 +478,7 @@ const computedList = computed<any[]>(() => {
     .meet-title {
       display: flex;
       align-items: center;
-      width: calc(100% - 48px);
+      width: 100%;
       color: var(--o-color-info2);
       @include text2;
 

package/src/components/meeting/components/OMeetingCalendarSelector.vue

@@ -79,10 +79,10 @@ const removeTag = (val: number) => {
 </script>
 
 <template>
-  <div class="calendar-selector" :class="!multiple && 'is-single'">
+  <div class="o-meeting-calendar-selector" :class="!multiple && 'is-single'">
     <ElSelect
       ref="selectorRef"
-      popper-class="calendar-selector-popper"
+      popper-class="o-meeting-calendar-selector-popper"
       :placeholder="t('meeting.selectRepeatDate')"
       size="large"
       multiple
@@ -106,11 +106,11 @@ const removeTag = (val: number) => {
   </div>
 </template>
 
-<style scoped lang="scss">
-.calendar-selector {
+<style lang="scss">
+.o-meeting-calendar-selector {
   width: 100%;
 
-  :deep(.el-select) {
+  .el-select {
     .el-select__placeholder {
       @include text1;
     }
@@ -134,7 +134,7 @@ const removeTag = (val: number) => {
   }
 
   &.is-single {
-    :deep(.el-select) {
+    .el-select {
       .el-select__selection {
         margin-left: 0;
       }
@@ -154,8 +154,11 @@ const removeTag = (val: number) => {
 }
 </style>
 <style lang="scss">
-.calendar-selector-popper {
-  padding: 0 24px;
+.o-meeting-calendar-selector-popper {
+  --meeting-card-radius: var(--o-radius-xs);
+  --meeting-input-radius: var(--o-radius-xs);
+  --meeting-cell-radius: var(--o-radius-xs);
+  padding: 0 var(--o-gap-5);
 
   .el-select-dropdown__list {
     padding: 16px 0;
@@ -173,7 +176,7 @@ const removeTag = (val: number) => {
       justify-content: center;
       background-color: var(--o-color-fill2);
       color: var(--o-color-info1);
-      border-radius: var(--o-radius-xs);
+      border-radius: var(--meeting-cell-radius);
 
       &:hover,
       &.is-checked {

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

@@ -146,7 +146,7 @@ defineExpose({ copyInfo });
 
 </template>
 
-<style scoped lang="scss">
+<style lang="scss">
 .o-meeting-detail {
   position: relative;
   .label-item {

package/src/components/meeting/components/OMeetingPlaybackSubtitles.vue

@@ -329,7 +329,7 @@ watch(
         </ElSelect>
       </div>
     </div>
-    <OTab v-model="activeTab" variant="text" class="captions-tab" @change="changeTab">
+    <OTab v-model="activeTab" variant="text" class="captions-tab" @change="changeTab" :max-show="9999">
       <OTabPane :value="0" :label="t('meeting.audioToText')">
         <OScroller v-if="computedCaptions.length" id="captionsScrollDom" class="captions-scroller" show-type="hover"
                    size="small" disabled-x>
@@ -350,8 +350,9 @@ watch(
             </OCol>
           </ORow>
         </OScroller>
-        <div v-else>111</div>
-        <!--        <AppEmpty v-else height="100%" />-->
+        <div v-else>
+          <slot name="empty"></slot>
+        </div>
       </OTabPane>
     </OTab>
   </div>
@@ -363,7 +364,7 @@ watch(
   height: 100%;
   min-height: calc(var(--layout-content-min-height) - 104px);
   background-color: var(--o-color-fill2);
-  border-radius: var(--o-radius-xs);
+  border-radius: var(--meeting-card-radius);
 
   .search-captions {
     display: flex;
@@ -371,8 +372,8 @@ watch(
     gap: var(--o-gap-4);
 
     .input-captions {
-      --input-radius: var(--o-radius-xs);
-      --_box-radius: var(--o-radius-xs);
+      --input-radius: var(--meeting-input-radius);
+      --_box-radius: var(--meeting-input-radius);
       flex-grow: 1;
 
       .o-icon {
@@ -443,9 +444,12 @@ watch(
   .o-tab {
     margin-top: var(--o-gap-5);
     height: calc(100% - 64px);
+    --tab-nav-justify: flex-start;
 
+    .o-tab-nav-list {
+      width: 100%;
+    }
     .o-tab-navs {
-      justify-content: flex-start;
 
       .o-tab-nav {
         padding-bottom: var(--o-gap-4);
@@ -456,7 +460,7 @@ watch(
       height: calc(100% - var(--o-line_height-text2) - var(--o-gap-4));
       .o-tab-pane {
         height: 100%;
-        padding-top: var(--o-gap-4);
+        padding-top: var(--o-gap-5);
 
         .o-scroller {
           height: 100%;
@@ -483,7 +487,7 @@ watch(
     .captions-item {
       padding: 4px 8px;
       cursor: pointer;
-      border-radius: var(--o-radius-xs);
+      border-radius: var(--meeting-cell-radius);
       @include hover {
         background-color: rgba(var(--o-blue-6), 0.1);
       }
@@ -500,7 +504,7 @@ watch(
           width: 18px;
           height: 18px;
           border-radius: 50%;
-          background-color: var(--o-color-primary2);
+          background-color: var(--o-color-primary1);
           color: var(--o-color-info1-inverse);
           display: flex;
           justify-content: center;
@@ -509,13 +513,13 @@ watch(
         }
 
         .speaker {
-          color: var(--o-color-info4);
+          color: var(--o-color-info3);
           margin-left: 4px;
           @include tip2;
         }
 
         .start-time {
-          color: var(--o-color-info4);
+          color: var(--o-color-info3);
           margin-left: 16px;
           @include tip2;
         }
@@ -534,7 +538,7 @@ watch(
       .text {
         color: var(--o-color-info2);
         margin-top: 8px;
-        @include tip1;
+        @include text1;
 
         .light-keyword {
           background-color: rgba(var(--o-blue-6), 0.2);

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

@@ -264,7 +264,7 @@ defineExpose({
   min-height: calc(var(--layout-content-min-height) - 104px);
   background-color: var(--o-color-fill2);
   position: relative;
-  border-radius: var(--o-radius-xs);
+  border-radius: var(--meeting-card-radius);
   overflow: hidden;
 
   .video-placeholder {
@@ -443,7 +443,7 @@ defineExpose({
           width: calc(100% + 5em);
           max-height: 22em;
           padding: 8px 16px;
-          border-radius: var(--o-radius-xs);
+          border-radius: var(--meeting-cell-radius);
           margin-left: -2.5em;
           background-color: var(--o-color-info2);
           box-shadow: 0 3px 9px 0 rgba(var(--o-kleinblue-10), 0.08);
@@ -509,7 +509,7 @@ defineExpose({
         input {
           order: 1;
           margin-right: 12px;
-          border-radius: 4px;
+          border-radius: var(--meeting-input-radius);
           cursor: inherit;
           position: relative;
           top: -1px;
@@ -598,7 +598,7 @@ defineExpose({
     }
 
     .vjs-volume-control {
-      border-radius: var(--o-radius-xs);
+      border-radius: var(--meeting-cell-radius);
       background-color: var(--o-color-info2);
       box-shadow: 0 3px 9px 0 rgba(var(--o-kleinblue-10), 0.08);
       backdrop-filter: blur(13.59);
@@ -647,7 +647,7 @@ defineExpose({
       left: 0;
 
       div {
-        border-radius: 4px;
+        border-radius: var(--meeting-cell-radius);
       }
 
       .vjs-progress-holder {
@@ -692,7 +692,7 @@ defineExpose({
         width: fit-content !important;
         color: var(--o-color-info1-inverse) !important;
         background-color: rgba(0, 0, 0, 0.4) !important;
-        border-radius: var(--o-radius-xs);
+        border-radius: var(--meeting-cell-radius);
         display: block !important;
         padding: var(--o-gap-1) var(--o-gap-4);
         @include tip1;

package/src/components/meeting/components/{OSigMeetingAside.vue → OMeetingSigAside.vue}

@@ -118,7 +118,7 @@ const changeMonth = (step: number) => {
 
       .day-item {
         height: 64px;
-        border-radius: 4px;
+        border-radius: var(--meeting-cell-radius);
         background-color: var(--o-color-control2-light);
         padding: 8px 12px;
         cursor: pointer;

package/src/components/meeting/composables/useMeetingConfig.ts

@@ -49,16 +49,16 @@ export const useMeetingConfig = () => {
     return list;
   });
 
-  const getPointStr = (cycleType: number, points: number[]) => {
+  const getPointStr = (cycleType: number, points: (number | string)[]) => {
     if (cycleType === INTERVAL_WEEK) {
       return points
         .sort((a, b) => {
-          const aIdx = intervalWeekOptions.value.findIndex((v) => v.value === a);
-          const bIdx = intervalWeekOptions.value.findIndex((v) => v.value === b);
+          const aIdx = intervalWeekOptions.value.findIndex((v) => v.value === a || v.value.toString() === a);
+          const bIdx = intervalWeekOptions.value.findIndex((v) => v.value === b || v.value.toString() === b);
           return aIdx - bIdx;
         })
-        .map((point: number) => {
-          const opt = intervalWeekOptions.value.find((v) => v.value === point);
+        .map((point: number | string) => {
+          const opt = intervalWeekOptions.value.find((v) => v.value === point || v.value.toString() === point);
           return opt?.label || String(point);
         })
         .join(t('meeting.cycleSplit'));

package/src/components/meeting/config.ts

@@ -7,7 +7,7 @@ import IconSummit from '~icons/meeting/icon-summit.svg';
 export const TYPE_COLOR_MAP = {
   summit: 'rgba(var(--o-orange-6))',
   events: 'rgba(var(--o-cyan-6))',
-  meeting: 'rgba(var(--o-deep-blue-6))',
+  meeting: 'rgba(var(--o-deepblue-6))',
 };
 
 export const INTERVAL_DAY = 0;

package/src/components/meeting/index.ts

@@ -2,8 +2,8 @@ import type { App } from 'vue';
 import _OMeetingCalendar from './OMeetingCalendar.vue';
 import _OMeetingForm from './OMeetingForm.vue';
 import _OMeetingPlayback from './OMeetingPlayback.vue';
-import _OSigMeetingCalendar from './OSigMeetingCalendar.vue';
-import _OMyMeetingCalendar from './OMyMeetingCalendar.vue';
+import _OMeetingSigCalendar from './OMeetingSigCalendar.vue';
+import _OMeetingMyCalendar from './OMeetingMyCalendar.vue';
 
 const OMeetingCalendar = Object.assign(_OMeetingCalendar, {
   install(app: App) {
@@ -22,15 +22,15 @@ const OMeetingPlayback = Object.assign(_OMeetingPlayback, {
   },
 });
 
-const OSigMeetingCalendar = Object.assign(_OSigMeetingCalendar, {
+const OMeetingSigCalendar = Object.assign(_OMeetingSigCalendar, {
   install(app: App) {
-    app.component('OSigMeetingCalendar', _OSigMeetingCalendar);
+    app.component('OMeetingSigCalendar', _OMeetingSigCalendar);
   },
 });
 
-const OMyMeetingCalendar = Object.assign(_OMyMeetingCalendar, {
+const OMeetingMyCalendar = Object.assign(_OMeetingMyCalendar, {
   install(app: App) {
-    app.component('OMyMeetingCalendar', _OMyMeetingCalendar);
+    app.component('OMeetingMyCalendar', _OMeetingMyCalendar);
   },
 });
 
@@ -38,8 +38,8 @@ export {
   OMeetingCalendar,
   OMeetingForm,
   OMeetingPlayback,
-  OSigMeetingCalendar,
-  OMyMeetingCalendar,
+  OMeetingSigCalendar,
+  OMeetingMyCalendar,
 };
 
 export * from './types';

package/src/components/meeting/types.ts

@@ -98,7 +98,7 @@ export interface MeetingFormPropsT {
   getGroupsRequest: any;
   showBtns?: boolean;
   groupType: MeetingGroupType;
-  bookText?: string
+  confirmText?: string
 }
 
 export interface ObsDataItemT {

package/src/i18n/en.ts

@@ -4,16 +4,6 @@ export default {
   'search.placeholder': 'Please enter the content',
   'search.expandedPlaceholder': 'Please enter the content',
   'search.history': 'History',
-  'search.imagePlaceholder': 'Search by text or upload image of any error',
-  'search.extendedPlaceholder': 'Press Enter to start, or refine your search with more info',
-  'search.imageUploadTooltip': 'JPG, PNG, JPEG supported (max 10 MB)',
-  'search.imageUploadFailed': 'Upload failed. Check connection and try again.',
-  'search.imageSizeExceeded': 'Image size exceeds the limit',
-  'search.imageInvalidType': 'Please upload an image file',
-  'search.onestep': 'Quick Navigation',
-  'search.suggest': 'Suggestions',
-  'search.noData': 'No data',
-  'search.suggestListLabel': 'Did you mean: ',
   'meeting.audioToText': 'Speech to Text',
   'meeting.item1': 'Convener: ',
   'meeting.item2': 'SIG: ',
@@ -32,8 +22,8 @@ export default {
   'meeting.sunday': 'Sunday',
   'meeting.sigGroup': 'The {0} group',
   'meeting.invite': ' invites you to',
-  'meeting.edit': ' [modified]',
-  'meeting.cancel': ' [canceled]',
+  'meeting.edit': ' modify',
+  'meeting.cancel': ' cancel',
   'meeting.dateTime': ' {1} on {0}',
   'meeting.meeting': ' the meeting',
   'meeting.cycleMeeting': ' the recurring meeting',

package/src/i18n/zh.ts

@@ -4,16 +4,6 @@ export default {
   'search.placeholder': '搜索',
   'search.expandedPlaceholder': '请输入搜索内容',
   'search.history': '历史搜索',
-  'search.imagePlaceholder': '输入文字搜索，支持粘贴或上传报错截图',
-  'search.extendedPlaceholder': '按下回车立即搜索，或补充更多信息进行搜索',
-  'search.imageUploadTooltip': '报错截图搜索，支持jpg、png、jpeg等，最大10M',
-  'search.imageUploadFailed': '图片上传失败，请检查网络后重试',
-  'search.imageSizeExceeded': '图片大小超出限制',
-  'search.imageInvalidType': '请上传图片文件',
-  'search.onestep': '导航搜索直达',
-  'search.suggest': '搜索建议',
-  'search.noData': '暂无数据',
-  'search.suggestListLabel': '您是不是在寻找：',
   'meeting.audioToText': '语音转文字',
   'meeting.item1': '发起人：',
   'meeting.item2': 'SIG组：',
@@ -42,7 +32,7 @@ export default {
   'meeting.cycleMeetingText': '{startDate} 至 {endDate} {cycleType} {startTime} 到 {endTime}的周期会议',
   'meeting.cycleMeetingText2': '{cycleType} {startTime} 到 {endTime} (UTC+08:00)Beijing 有效期从{startDate} 至 {endDate}',
   'meeting.cycleDay': '每天',
-  'meeting.cycleWeek.one': '每{1}周{0}',
+  'meeting.cycleWeek.one': '每周{0}',
   'meeting.cycleWeek.other': '每{1}周{0}',
   'meeting.cycleSplit': '、',
   'meeting.cycleMonth': '每月{0}号',

package/src/index.ts

@@ -33,7 +33,6 @@ export * from './components/element-plus';
 export * from './components/events';
 export * from './components/header';
 export * from './components/meeting';
-export * from './components/search';
 
 // 默认导出（用于Vue插件安装）
 export default {

package/vite.config.ts

@@ -36,10 +36,6 @@ export default defineConfig(({ mode }) => {
                 ) {
                   return false;
                 }
-                // locale 子路径打包进库，避免消费方路径解析问题
-                if (id.startsWith('@opensig/opendesign/es/locale/')) {
-                  return false;
-                }
                 // element-plus JS 保持外部化
                 if (/^element-plus/.test(id)) return true;
                 // 其他外部依赖
@@ -83,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.scss" as *;
+          @use "@/assets/styles/element-plus.scss" as *;
         `,
         },
       },