@opendesign-plus/components 0.0.1-rc.33 → 0.0.1-rc.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus/components",
-  "version": "0.0.1-rc.33",
+  "version": "0.0.1-rc.34",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -35,7 +35,7 @@
     "vue": "^3.5.13",
     "element-plus": "2.13.1",
     "@opendesign-plus/styles": "0.0.1-rc.2",
-    "@opendesign-plus/composables": "0.0.1-rc.9"
+    "@opendesign-plus/composables": "0.0.1-rc.10"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",

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

@@ -249,6 +249,18 @@
       --el-component-size-large: calc(var(--o-control_size-l) - 2px);
     }
 
+    .el-input__wrapper {
+
+      &:hover {
+        --el-input-border-color: var(--o-color-primary2);
+      }
+
+      &.is-focus {
+        --el-input-border-color: var(--o-color-primary3);
+      }
+
+    }
+
     .el-input-number__decrease,
     .el-input-number__increase {
       &:hover ~ .el-input:not(.is-disabled) .el-input__wrapper {

package/src/components/common/MoreText.vue

@@ -59,7 +59,7 @@ const clickText = () => {
       :class="['more-text-content', link && 'is-link']"
       ref="contentRef"
       :style="{
-        'max-height': expanded ? offsetHeight + 'px' : '66px',
+        'max-height': expanded ? offsetHeight + 'px' : '4.5em',
         '-webkit-line-clamp': expanded ? 'initial' : lines,
       }"
       @click="clickText"
@@ -86,7 +86,7 @@ const clickText = () => {
 <style lang="scss" scoped>
 .more-text-wrapper {
   .more-text-content {
-    line-height: 22px;
+    line-height: 1.5em;
     overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
@@ -111,7 +111,7 @@ const clickText = () => {
     }
 
     & > div {
-      height: 22px;
+      height: 1.5em;
       cursor: pointer;
       display: flex;
       align-items: center;

package/src/components/meeting/OMeetingCalendar.vue

@@ -205,6 +205,7 @@ const changeMeetingDay = useDebounceFn((day: string, event?: Event) => {
 
 watch(() => latestDay.value,
   () => {
+    calendar.value?.pickDay(dayjs((latestDay.value)));
     changeMeetingDay(latestDay.value);
   },
   {

package/src/components/meeting/OMeetingMyCalendar.vue

@@ -1153,7 +1153,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
 
           .group-title {
             font-weight: 500;
-            margin-bottom: var(--o-gap-2);
             color: var(--o-color-info1);
             @include text2;
             @include respond('phone') {
@@ -1229,19 +1228,31 @@ const cancelActions = computed<DialogActionT[]>(() => {
 
         .o-collapse-item {
           padding: var(--o-gap-4) var(--o-gap-5);
-          padding-bottom: calc(var(--o-gap-5) - var(--o-gap-4));
           border-top: none;
           border-radius: var(--meeting-card-radius);
           transition: margin var(--o-easing-standard) var(--o-duration-s);
           --icon-size: 24px;
-          @include respond('<=pad_v') {
+          @include respond-to('pad_h') {
             padding: var(--o-gap-3) var(--o-gap-4);
           }
+          @include respond('<=pad_v') {
+            padding: var(--o-gap-2) var(--o-gap-4);
+          }
 
           @include respond('phone') {
             --icon-size: 20px;
           }
 
+          &.o-collapse-item-expanded {
+            margin-top: var(--o-gap-4);
+            @include respond-to('<=laptop') {
+              margin-top: var(--o-gap-3);
+            }
+            @include respond-to('<=pad_v') {
+              margin-top: var(--o-gap-2);
+            }
+          }
+
           &:hover {
             .title-text {
               color: var(--o-color-primary1);
@@ -1289,6 +1300,9 @@ const cancelActions = computed<DialogActionT[]>(() => {
                 bottom: 0;
                 height: 1px;
                 background-color: var(--o-color-control4);
+                @include respond('phone') {
+                  left: 0;
+                }
               }
 
               .o-collapse-item-title {
@@ -1398,7 +1412,11 @@ const cancelActions = computed<DialogActionT[]>(() => {
                   }
 
                   .title-text {
+                    @include text2;
                     @include text-truncate(1);
+                    @include respond('phone') {
+                      @include h3;
+                    }
                   }
                 }
 
@@ -1493,7 +1511,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
               border-top: 1px solid var(--o-color-control4);
               margin-top: var(--o-gap-4);
               padding-top: var(--o-gap-4);
-              padding-bottom: calc(var(--o-gap-4) - var(--o-gap-2));
               display: flex;
               align-items: center;
               justify-content: flex-end;
@@ -1501,12 +1518,10 @@ const cancelActions = computed<DialogActionT[]>(() => {
               @include respond('pad_h') {
                 margin-top: var(--o-gap-3);
                 padding-top: var(--o-gap-3);
-                padding-bottom: calc(var(--o-gap-3) - var(--o-gap-2));
               }
               @include respond('<=pad_v') {
                 margin-top: var(--o-gap-2);
                 padding-top: var(--o-gap-2);
-                padding-bottom: 0;
               }
 
               .o-link {
@@ -1529,6 +1544,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
         @include tip1;
       }
     }
+
   }
 
   @include in-dark {

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

@@ -192,8 +192,8 @@ const computedList = computed<any[]>(() => {
         cycleType = t('meeting.cycleMonth', [getPointStr(cycle_type, cycle_point as unknown as number[])]);
       }
       timeRange = t('meeting.cycleMeetingText2', {
-        startDate: cycle_start_date,
-        endDate: cycle_end_date,
+        startDate: formatDate(cycle_start_date),
+        endDate: formatDate(cycle_end_date),
         startTime: cycle_start,
         endTime: cycle_end,
         cycleType,
@@ -385,7 +385,7 @@ const computedList = computed<any[]>(() => {
 
       &.o-collapse-item-expanded {
         .o-collapse-item-header {
-          padding-bottom: var(--o-gap-2);
+          padding-bottom: 0;
 
           .o-collapse-item-title {
             .copy-icon {
@@ -404,7 +404,7 @@ const computedList = computed<any[]>(() => {
 
     .o-collapse-item-header {
       align-items: center;
-      padding: var(--o-gap-4) var(--o-gap-4) var(--o-gap-3) var(--o-gap-4);
+      padding: var(--o-gap-4) var(--o-gap-5) var(--o-gap-4) var(--o-gap-5);
       position: relative;
 
       @include hover {
@@ -422,9 +422,12 @@ const computedList = computed<any[]>(() => {
           }
         }
       }
-      @include respond('<=pad_v') {
+      @include respond('pad_h') {
         padding: var(--o-gap-4) var(--o-gap-3) var(--o-gap-2) var(--o-gap-3);
       }
+      @include respond('<=pad_v') {
+        padding: var(--o-gap-3) var(--o-gap-4) var(--o-gap-1) var(--o-gap-4);
+      }
 
       .o-collapse-item-title {
         flex-grow: 1;
@@ -499,12 +502,11 @@ const computedList = computed<any[]>(() => {
         border-radius: var(--meeting-card-radius);
         @include tip1;
 
-        @include respond('<=pad_v') {
-          padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + 16px - 12px);
-
+        @include respond('pad_h') {
+          padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2));
         }
-        @include respond('phone') {
-          padding: 12px 16px;
+        @include respond('<=pad_v') {
+          padding: 16px 8px;
         }
 
         .info-item {

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

@@ -74,6 +74,12 @@ const getField = (key: string) => {
   if (key === 'register_end_date' && val) {
     return formatDate(val, 'YYYY/MM/DD HH:mm');
   }
+  if (key === 'date' && val) {
+    if (props.data.is_cycle) {
+      return '';
+    }
+    return formatDate(val);
+  }
   return val;
 };
 
@@ -152,8 +158,8 @@ defineExpose({ copyInfo });
         </OLink>
         <span v-else-if="info.key === 'platform'">{{ getPlatformLabel(getField(info.key)) }}</span>
         <span v-else class="value">
-          <i v-if="info.extra" class="extra">{{ getField(info.extra) }}</i>
-          {{ getField(info.key) || '-' }}
+          <i v-if="info.extra && getField(info.extra)" class="extra">{{ getField(info.extra) }}</i>
+          <span class="value-text">{{ getField(info.key) || '-' }}</span>
         </span>
       </template>
       <template v-if="info.isRecord && getField(info.key)?.length">
@@ -179,9 +185,13 @@ defineExpose({ copyInfo });
   row-gap: var(--o-gap-2);
   column-gap: var(--o-gap-4);
 
-  @include respond('<=pad_v') {
-    row-gap: var(--o-gap-1);
-    column-gap: var(--o-gap-1);
+  @include respond('pad_v') {
+    row-gap: var(--o-gap-2);
+    column-gap: var(--o-gap-2);
+  }
+  @include respond('phone') {
+    row-gap: var(--o-gap-2);
+    column-gap: var(--o-gap-4);
   }
 
   .label-item {
@@ -223,11 +233,6 @@ defineExpose({ copyInfo });
       display: none;
     }
 
-    .more-text-wrapper {
-      //position: relative;
-      //top: -2px;
-    }
-
     .o-link {
       font-size: 14px;
       line-height: 22px;
@@ -242,10 +247,8 @@ defineExpose({ copyInfo });
     }
 
     .value {
-      word-wrap: break-word;
-      display: flex !important;
-      align-items: center;
-      @include text-truncate(3);
+      display: flex;
+      align-items: flex-start;
 
       &.link {
         color: var(--o-color-primary1);

package/src/i18n/en.ts

@@ -40,7 +40,7 @@ export default {
   'meeting.meetingText': ' {1} at {0}.',
   'meeting.singleMeetingText': ' {1} at {0}.',
   'meeting.cycleMeetingText': ' scheduled at {startTime} to {endTime} {cycleType} from {startDate} to {endDate}.',
-  'meeting.cycleMeetingText2': '{startTime} to {endTime} (UTC+08:00)Beijing {cycleType} from {startDate} to {endDate}.',
+  'meeting.cycleMeetingText2': '{startTime} to {endTime} (UTC+08:00) Beijing {cycleType} from {startDate} to {endDate}.',
   'meeting.cycleDay': ' every day',
   'meeting.cycleWeek.one': 'on {0} every week',
   'meeting.cycleWeek.other': 'on {0} every {1} weeks',

package/src/i18n/zh.ts

@@ -40,7 +40,7 @@ export default {
   'meeting.meetingText': '{0} 的{1}',
   'meeting.singleMeetingText': '{0} 的{1}',
   'meeting.cycleMeetingText': '{startDate} 至 {endDate} {cycleType} {startTime} 到 {endTime}的周期会议',
-  'meeting.cycleMeetingText2': '{cycleType} {startTime} 到 {endTime} (UTC+08:00)Beijing 有效期从{startDate} 至 {endDate}',
+  'meeting.cycleMeetingText2': '{cycleType} {startTime} 到 {endTime} (UTC+08:00) Beijing 有效期从{startDate} 至 {endDate}',
   'meeting.cycleDay': '每天',
   'meeting.cycleWeek.one': '每周{0}',
   'meeting.cycleWeek.other': '每{1}周{0}',