@opendesign-plus-test/components 0.0.1-rc.65 → 0.0.1-rc.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.65",
+  "version": "0.0.1-rc.67",
   "type": "module",
   "publishConfig": {
     "access": "public",

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

@@ -7,6 +7,10 @@
   --el-input-placeholder-color: var(--el-text-color-placeholder);
   --el-input-hover-border-color: var(--el-border-color-hover);
   --el-input-clear-hover-color: var(--el-text-color-secondary);
+  --el-component-size-large: 36px;
+  @include respond('<=pad_v') {
+    --el-component-size-large: var(--o-control_size-l);
+  }
 
   .el-date-editor {
     &.el-date-editor--daterange {
@@ -208,6 +212,24 @@
       }
     }
   }
+
+  .el-input-number {
+    --el-component-size-large: 34px;
+    @include respond('<=pad_v') {
+      --el-component-size-large: calc(var(--o-control_size-l) - 2px);
+    }
+
+    .el-input-number__decrease,
+    .el-input-number__increase {
+      &:hover ~ .el-input:not(.is-disabled) .el-input__wrapper {
+        box-shadow: none;
+      }
+    }
+
+    &.el-input-number--large {
+      line-height: var(--el-component-size-large);
+    }
+  }
 }
 
 

package/src/components/meeting/OMeetingCalendar.vue

@@ -80,19 +80,9 @@ const getSummitData = async (date: string) => {
     summitData.value = [];
     const list = await props.getSummitListRequest(date);
     summitData.value = (list || []).map((v: SummitItemT) => {
-      const dates: string[] = [];
-      let cur = dayjs(v.start_date);
-      const end = dayjs(v.end_date);
-      while (!cur.isAfter(end)) {
-        dates.push(formatDate(cur));
-        cur = cur.add(1, 'day');
-      }
       return {
         ...v,
-        dates,
         type: CalendarDataType.SUMMIT,
-        start_date_time: `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start || '' }`,
-        end_date_time: `${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end || '' }`,
       };
     });
   } else {
@@ -104,19 +94,9 @@ const getActivityData = async (date: string) => {
     eventsData.value = [];
     const list = await props.getEventsListRequest(date);
     eventsData.value = (list || []).map((v: MeetingEventsItemT) => {
-      const dates: string[] = [];
-      let cur = dayjs(v.start_date);
-      const end = dayjs(v.end_date);
-      while (!cur.isAfter(end)) {
-        dates.push(formatDate(cur));
-        cur = cur.add(1, 'day');
-      }
       return {
         ...v,
-        dates,
         type: CalendarDataType.EVENTS,
-        start_date_time: `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start || '' }`,
-        end_date_time: `${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end || '' }`,
       };
     });
   } else {
@@ -170,8 +150,8 @@ const paramGetDaysData = async (params: { date: string; type: string }) => {
 const renderData = computed(() => {
   return [
     ...meetingData.value,
-    ...eventsData.value.filter(v => (!dayjs(v.start_date).isAfter(dayjs(currentDay.value)) && !dayjs(currentDay.value).isAfter(dayjs(v.end_date))) || v.dates?.includes(formatDate(currentDay.value))),
-    ...summitData.value.filter(v => v.dates?.includes(formatDate(currentDay.value))),
+    ...eventsData.value,
+    ...summitData.value,
   ].filter((v) => {
     if (tabType.value === CalendarDataType.ALL) {
       return true;

package/src/components/meeting/OMeetingForm.vue

@@ -935,7 +935,10 @@ defineExpose({
     border-radius: var(--meeting-card-radius);
     padding: 0 15px;
     background-color: var(--o-color-fill2);
-
+    --el-component-size-large: 34px;
+    @include respond('<=pad_v') {
+      --el-component-size-large: calc(var(--o-control_size-l) - 2px);
+    }
     & > span {
       padding: 0 var(--o-gap-2);
     }
@@ -959,8 +962,8 @@ defineExpose({
 
       .el-select__wrapper {
         box-shadow: none;
-        padding: calc((var(--o-control_size-l) - 24px) / 2) 0;
-        min-height: var(--o-control_size-l);
+        padding: calc((var(--el-component-size-large) - 24px) / 2) 0;
+        min-height: var(--el-component-size-large);
         gap: 0;
       }
 

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

@@ -91,6 +91,8 @@ const computedList = computed<any[]>(() => {
   return props.list.map((v: any) => {
     const type = v.type;
     let dateRange = '';
+    let start_date_time = '';
+    let end_date_time = '';
     if (type !== CalendarDataType.MEETING) {
       let activity_type = activityTypeMap.value.get(v.activity_type)?.label;
       if (v.start && v.end) {
@@ -106,11 +108,25 @@ const computedList = computed<any[]>(() => {
           dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
         }
       }
+      if (v.start_date) {
+        start_date_time = props.disableFormat ? v.start_date : formatDate(v.start_date);
+        if (v.start) {
+          start_date_time = `${ start_date_time } ${ v.start }`;
+        }
+      }
+      if (v.end_date) {
+        end_date_time = props.disableFormat ? v.end_date : formatDate(v.end_date);
+        if (v.end) {
+          end_date_time = `${ end_date_time } ${ v.end }`;
+        }
+      }
 
       return {
         ...v,
         activity_type,
         dateRange,
+        start_date_time,
+        end_date_time,
       };
     }
     const {