@opendesign-plus/components 0.0.1-rc.25 → 0.0.1-rc.27

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

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>
@@ -445,8 +446,10 @@ watch(
     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);

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

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