@opendesign-plus-test/components 0.0.1-rc.91 → 0.0.1-rc.93

package/dist/treeshaking/components/meeting/OMeetingCalendar.css

@@ -626,7 +626,7 @@
 .o-meeting-calendar .calendar-body .calender .el-calendar-day .out-box .day-box {
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
+  justify-content: flex-start;
   height: 100%;
 }
 .o-meeting-calendar .calendar-body .calender .el-calendar-day .out-box .icon-box {

package/dist/treeshaking/components/meeting/OMeetingCalendar.vue.mjs

@@ -155,6 +155,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       } catch {
         meetingData.value = [];
+      } finally {
+        getSummitData(params.date);
+        getActivityData(params.date);
       }
     };
     const renderData = computed(() => {
@@ -172,8 +175,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const getDateData = async (day) => {
       const date = dayjs(day).format("YYYY-MM-DD");
       currentDay.value = date;
-      getSummitData(date);
-      getActivityData(date);
       getDateList(date);
       paramGetDaysData({
         date,
@@ -184,9 +185,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!allDatesLoaded.value) {
         return [];
       }
-      console.log("dateList", dateList.value);
-      console.log("summitDates", dateList.value);
-      console.log("eventsDates", dateList.value);
       return [.../* @__PURE__ */ new Set([...dateList.value, ...summitDates.value, ...eventsDates.value])].flat().sort((a, b) => dayjs(a).isAfter(dayjs(b)) ? 1 : -1);
     });
     const latestDayLoaded = ref("");
@@ -194,7 +192,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (latestDayLoaded.value) {
         return latestDayLoaded.value;
       }
-      console.log(allDates.value);
       const dates = allDates.value;
       if (!dates.length) return null;
       const today = dayjs().format("YYYY-MM-DD");
@@ -227,10 +224,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (latestDay.value) {
           latestDayLoaded.value = latestDay.value;
           (_a = calendar.value) == null ? void 0 : _a.pickDay(dayjs(latestDay.value));
-          console.log("latestDay", 1, latestDay.value);
           changeMeetingDay(latestDay.value);
         } else {
-          console.log("latestDay", 2, latestDay.value);
           changeMeetingDay(formatDate());
         }
       },
@@ -245,16 +240,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       isLimit.value = false;
       calendar.value.selectDate(val);
-      console.log("selectDate", calendar.value.selectedDay);
       changeMeetingDay(formatDate(calendar.value.selectedDay));
     };
     const changeGroup = () => {
       nextTick(() => {
+        const date = formatDate(currentDay.value, "YYYY-MM-DD");
+        getDateList(date);
         paramGetDaysData({
-          date: currentDay.value,
+          date,
           type: tabType.value
         });
-        getDateList(currentDay.value);
       });
     };
     const removeLeadingZero = (str) => {

package/dist/treeshaking/components/meeting/OMeetingForm.vue.mjs

@@ -68,7 +68,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose, emit: __emit }) {
     const { t, locale, cycleTypeOptions0, intervalWeekOptions, getPlatformLabel } = useMeetingConfig();
     const props = __props;
-    console.log(props);
     const message = useMessage(null);
     const cycleTypeOptions = cycleTypeOptions0;
     const weekOptions = intervalWeekOptions;
@@ -98,6 +97,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const form = ref(Object.assign({}, initForm));
     const formRef = ref(null);
+    const privateVisible = ref(false);
     const loading = ref(false);
     const rules = computed(() => {
       return {
@@ -390,7 +390,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       (_d = (_c = formRef.value) == null ? void 0 : _c.resetFields) == null ? void 0 : _d.call(_c);
       emits("cancel");
     };
-    const privateVisible = ref(false);
     const changeIsPrivate = () => {
       if (form.value.is_private) {
         form.value.is_cycle = false;

package/dist/treeshaking/components/meeting/OMeetingMyCalendar.css

@@ -922,6 +922,9 @@
 .o-my-meeting-calendar .meeting-list .list-body .o-collapse .o-collapse-item.o-collapse-item-expanded {
   margin-top: var(--o-gap-4);
 }
+.o-my-meeting-calendar .meeting-list .list-body .o-collapse .o-collapse-item.o-collapse-item-expanded .title-text {
+  color: var(--o-color-info1);
+}
 @media (max-width: 1680px) {
 .o-my-meeting-calendar .meeting-list .list-body .o-collapse .o-collapse-item.o-collapse-item-expanded {
     margin-top: var(--o-gap-3);
@@ -1098,6 +1101,7 @@
   max-width: 100%;
 }
 .o-my-meeting-calendar .meeting-list .list-body .o-collapse .o-collapse-item-header .o-collapse-item-title .item-header-left .header-info .meeting-title .title-text {
+  font-weight: 600;
   font-size: 18px;
   line-height: 26px;
 }

package/dist/treeshaking/components/meeting/OMeetingSigCalendar.css

@@ -183,7 +183,7 @@
 .o-sig-meeting-calendar .list-content {
   min-width: 0;
   flex-grow: 1;
-  height: 360px;
+  height: calc(var(--height) * 1px);
 }
 @media (max-width: 840px) {
 .o-sig-meeting-calendar .list-content {

package/dist/treeshaking/components/meeting/OMeetingSigCalendar.vue.mjs

@@ -11,7 +11,10 @@ import _sfc_main$2 from "./components/OMeetingCalendarList.vue.mjs";
 import './components/OMeetingCalendarList.css';
 import { formatDate } from "./utils.mjs";
 import emptyDefaultImg from "../../assets/meeting/empty.png.mjs";
-const _hoisted_1 = { class: "o-sig-meeting-calendar" };
+const _hoisted_1 = {
+  class: "o-sig-meeting-calendar",
+  style: { "--height": 400 }
+};
 const _hoisted_2 = { class: "meeting-card-header" };
 const _hoisted_3 = {
   key: 0,
@@ -111,8 +114,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const getLatestDate = () => {
       let targetDate = dateList.value.find((date) => date === dayjs().format("YYYY-MM-DD"));
       if (!targetDate) {
-        targetDate = dateList.value.find((date) => dayjs(date).isAfter(dayjs())) || // 未来日期最近日期
-        [...dateList.value].reverse().find((date) => dayjs().isAfter(dayjs(date)));
+        targetDate = dateList.value.find((date) => !dayjs().isAfter(dayjs(date))) || // 未来日期最近日期
+        [...dateList.value].reverse().find((date) => !dayjs(date).isAfter(dayjs()));
       }
       latestDate.value = targetDate;
     };
@@ -126,71 +129,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const groupDateList = computed(() => {
       const obj = dateList.value.reduce((pre, cur) => {
-        var _a, _b;
+        var _a;
         const [month, day] = getMonthAndDay(cur);
         pre[month] = {
-          count: (((_a = pre[month]) == null ? void 0 : _a.count) || 0) + 1,
-          days: [...((_b = pre[month]) == null ? void 0 : _b.days) || [], day]
+          days: [...((_a = pre[month]) == null ? void 0 : _a.days) || [], day]
         };
         return pre;
       }, {});
-      const monthList = Object.keys(obj).map((month) => {
-        return {
-          ...obj[month],
-          month
-        };
-      });
-      const list2 = [];
-      let current = [];
-      monthList.forEach((t2) => {
-        while (t2.days.length) {
-          if (!current.length) {
-            t2.days.splice(0, 6).forEach((day) => {
-              current.push({
-                month: t2.month,
-                day
-              });
-            });
-            if (current.length >= 5) {
-              list2.push(current);
-              current = [];
-            }
-          } else {
-            let count = current.length;
-            if (count % 2 === 1) {
-              count += 1;
-            }
-            if (t2.days.length + current.length <= 6) {
-              t2.days.splice(0, 6).forEach((day) => {
-                current.push({
-                  month: t2.month,
-                  day
-                });
-              });
-              if (current.length >= 5) {
-                list2.push(current);
-                current = [];
-              }
-            } else {
-              t2.days.splice(0, 6 - count).forEach((day) => {
-                current.push({
-                  month: t2.month,
-                  day
-                });
-              });
-              if (current.length >= 5) {
-                list2.push(current);
-                current = [];
-              }
-            }
-          }
-        }
+      return Object.keys(obj).map((month) => {
+        var _a, _b;
+        let list2 = [];
+        (_b = (_a = obj[month]) == null ? void 0 : _a.days) == null ? void 0 : _b.map((day) => {
+          list2.push({ month, day });
+        });
+        return list2;
       });
-      if (current.length) {
-        list2.push(current);
-        current = [];
-      }
-      return list2;
     });
     const dateMapList = computed(() => {
       return groupDateList.value.map((group) => {

package/dist/treeshaking/components/meeting/components/OMeetingCalendarList.css

@@ -71,6 +71,9 @@
   opacity: 1;
   visibility: visible;
 }
+.o-meeting-calendar-list .o-collapse .o-collapse-item.is-expired .item-title-text {
+  color: var(--o-color-info4);
+}
 .o-meeting-calendar-list .o-collapse .o-collapse-item-icon {
   height: min-content;
 }
@@ -212,9 +215,11 @@
 .o-meeting-calendar-list .o-collapse .o-collapse-item-body .calendar-info .info-item:first-child {
   margin-top: 0;
 }
+.o-meeting-calendar-list .o-collapse .btn-wrapper {
+  margin-top: var(--o-gap-1);
+}
 .o-meeting-calendar-list .o-collapse .jump-detail-link {
   padding-left: calc(var(--icon-right) + var(--icon-size2));
-  margin-top: var(--o-gap-1);
   color: var(--o-color-info2);
   font-weight: 400;
   font-size: 14px;

package/dist/treeshaking/components/meeting/components/OMeetingCalendarList.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, nextTick, openBlock, createElementBlock, normalizeClass, renderSlot, createBlock, unref, withCtx, Fragment, renderList, createElementVNode, createVNode, normalizeStyle, resolveDynamicComponent, createTextVNode, toDisplayString, createCommentVNode, withModifiers } from "vue";
+import { defineComponent, ref, computed, watch, nextTick, openBlock, createElementBlock, normalizeClass, renderSlot, createBlock, unref, withCtx, Fragment, renderList, createElementVNode, createVNode, normalizeStyle, resolveDynamicComponent, toDisplayString, createTextVNode, createCommentVNode, withModifiers } from "vue";
 import { useMessage, isClient, OCollapse, OCollapseItem, OIcon, OTag, ODivider, OButton } from "@opensig/opendesign";
 import _sfc_main$1 from "./OMeetingDetail.vue.mjs";
 import './OMeetingDetail.css';
@@ -11,15 +11,18 @@ import { useMeetingConfig } from "../composables/useMeetingConfig.mjs";
 import { useActivityConfig } from "../../activity/composables/useActivityConfig.mjs";
 import _sfc_main$2 from "../../common/TooltipText.vue.mjs";
 import '../../common/TooltipText.css';
+import dayjs from "dayjs";
 const _hoisted_1 = { class: "meet-title-left" };
 const _hoisted_2 = ["title"];
 const _hoisted_3 = { class: "text" };
-const _hoisted_4 = {
+const _hoisted_4 = { class: "item-title-text" };
+const _hoisted_5 = {
   key: 0,
   class: "tag-wrapper"
 };
-const _hoisted_5 = { class: "start-time" };
-const _hoisted_6 = { class: "calendar-info" };
+const _hoisted_6 = { class: "start-time" };
+const _hoisted_7 = { class: "btn-wrapper" };
+const _hoisted_8 = { class: "calendar-info" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "OMeetingCalendarList",
   props: {
@@ -92,6 +95,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         let dateRange = "";
         let start_date_time = "";
         let end_date_time = "";
+        let isExpired = false;
         if (type !== CalendarDataType.MEETING) {
           let activity_type = (_a = activityTypeMap.value.get(v.activity_type)) == null ? void 0 : _a.label;
           const isSameDay = v.start_date && (v.start_date === v.end_date || !v.end_date);
@@ -128,12 +132,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (v.end) {
             end_date_time += `${end_date_time ? " " : ""}${v.end}`;
           }
+          const expiredTime = `${v.end_date || v.start_date} ${v.end || v.start}`;
+          if (dayjs(expiredTime).isValid()) {
+            isExpired = dayjs().isAfter(dayjs(expiredTime));
+          }
           return {
             ...v,
             activity_type,
             dateRange,
             start_date_time,
-            end_date_time
+            end_date_time,
+            isExpired
           };
         }
         const {
@@ -208,7 +217,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ...v,
           dateRange,
           timeRange,
-          replay_url
+          replay_url,
+          isExpired: dayjs().isAfter(dayjs(`${v.date} ${v.end || v.cycle_end}`))
         };
       });
     });
@@ -227,7 +237,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             (openBlock(true), createElementBlock(Fragment, null, renderList(computedList.value, (item, index) => {
               return openBlock(), createBlock(unref(OCollapseItem), {
                 key: item.id,
-                value: item.id
+                value: item.id,
+                class: normalizeClass({ "is-expired": item.isExpired })
               }, {
                 title: withCtx(() => [
                   createElementVNode("div", _hoisted_1, [
@@ -248,12 +259,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_3, [
                         createVNode(_sfc_main$2, null, {
                           default: withCtx(() => [
-                            createTextVNode(toDisplayString((item.topic || item.name || item.title).repeat(3)), 1)
+                            createElementVNode("span", _hoisted_4, toDisplayString((item.topic || item.name || item.title).repeat(3)), 1)
                           ]),
                           _: 2
                         }, 1024)
                       ]),
-                      item.is_cycle ? (openBlock(), createElementBlock("div", _hoisted_4, [
+                      item.is_cycle ? (openBlock(), createElementBlock("div", _hoisted_5, [
                         createVNode(unref(OTag), {
                           color: "primary",
                           variant: "outline"
@@ -271,7 +282,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ref_key: "meetInfoRef",
                       ref: meetInfoRef
                     }, [
-                      createElementVNode("span", _hoisted_5, [
+                      createElementVNode("span", _hoisted_6, [
                         createElementVNode("span", null, toDisplayString(item.dateRange), 1)
                       ]),
                       item.group_name || item.activity_type ? (openBlock(), createBlock(unref(ODivider), {
@@ -287,86 +298,88 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         ], 64)) : createCommentVNode("", true)
                       ])
                     ], 512),
-                    item.url ? (openBlock(), createBlock(unref(OButton), {
-                      key: 0,
-                      variant: "text",
-                      href: item.url,
-                      target: "_blank",
-                      class: "jump-detail-link"
-                    }, {
-                      suffix: withCtx(() => [
-                        createVNode(unref(OIcon), null, {
-                          default: withCtx(() => [
-                            createVNode(unref(IconChevronRight))
-                          ]),
-                          _: 1
-                        })
-                      ]),
-                      default: withCtx(() => [
-                        createElementVNode("span", null, toDisplayString(i18n.value.LEARN_MORE), 1)
-                      ]),
-                      _: 1
-                    }, 8, ["href"])) : createCommentVNode("", true),
-                    item.join_url ? (openBlock(), createBlock(unref(OButton), {
-                      key: 1,
-                      variant: "text",
-                      href: item.join_url,
-                      target: "_blank",
-                      class: "jump-detail-link"
-                    }, {
-                      suffix: withCtx(() => [
-                        createVNode(unref(OIcon), null, {
-                          default: withCtx(() => [
-                            createVNode(unref(IconChevronRight))
-                          ]),
-                          _: 1
-                        })
-                      ]),
-                      default: withCtx(() => [
-                        createElementVNode("span", null, toDisplayString(i18n.value.JOIN_MEETING), 1)
-                      ]),
-                      _: 1
-                    }, 8, ["href"])) : createCommentVNode("", true),
-                    item.content_url ? (openBlock(), createBlock(unref(OButton), {
-                      key: 2,
-                      variant: "text",
-                      href: item.content_url,
-                      target: "_blank",
-                      class: "jump-detail-link"
-                    }, {
-                      suffix: withCtx(() => [
-                        createVNode(unref(OIcon), null, {
-                          default: withCtx(() => [
-                            createVNode(unref(IconChevronRight))
-                          ]),
-                          _: 1
-                        })
-                      ]),
-                      default: withCtx(() => [
-                        createElementVNode("span", null, toDisplayString(i18n.value.DETAILS), 1)
-                      ]),
-                      _: 1
-                    }, 8, ["href"])) : createCommentVNode("", true),
-                    item.register_url ? (openBlock(), createBlock(unref(OButton), {
-                      key: 3,
-                      variant: "text",
-                      href: item.register_url,
-                      target: "_blank",
-                      class: "jump-detail-link"
-                    }, {
-                      suffix: withCtx(() => [
-                        createVNode(unref(OIcon), null, {
-                          default: withCtx(() => [
-                            createVNode(unref(IconChevronRight))
-                          ]),
-                          _: 1
-                        })
-                      ]),
-                      default: withCtx(() => [
-                        createElementVNode("span", null, toDisplayString(i18n.value.SIGN), 1)
-                      ]),
-                      _: 1
-                    }, 8, ["href"])) : createCommentVNode("", true)
+                    createElementVNode("div", _hoisted_7, [
+                      item.url ? (openBlock(), createBlock(unref(OButton), {
+                        key: 0,
+                        variant: "text",
+                        href: item.url,
+                        target: "_blank",
+                        class: "jump-detail-link"
+                      }, {
+                        suffix: withCtx(() => [
+                          createVNode(unref(OIcon), null, {
+                            default: withCtx(() => [
+                              createVNode(unref(IconChevronRight))
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        default: withCtx(() => [
+                          createElementVNode("span", null, toDisplayString(i18n.value.LEARN_MORE), 1)
+                        ]),
+                        _: 1
+                      }, 8, ["href"])) : createCommentVNode("", true),
+                      item.join_url && !item.isExpired ? (openBlock(), createBlock(unref(OButton), {
+                        key: 1,
+                        variant: "text",
+                        href: item.join_url,
+                        target: "_blank",
+                        class: "jump-detail-link"
+                      }, {
+                        suffix: withCtx(() => [
+                          createVNode(unref(OIcon), null, {
+                            default: withCtx(() => [
+                              createVNode(unref(IconChevronRight))
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        default: withCtx(() => [
+                          createElementVNode("span", null, toDisplayString(i18n.value.JOIN_MEETING), 1)
+                        ]),
+                        _: 1
+                      }, 8, ["href"])) : createCommentVNode("", true),
+                      item.content_url ? (openBlock(), createBlock(unref(OButton), {
+                        key: 2,
+                        variant: "text",
+                        href: item.content_url,
+                        target: "_blank",
+                        class: "jump-detail-link"
+                      }, {
+                        suffix: withCtx(() => [
+                          createVNode(unref(OIcon), null, {
+                            default: withCtx(() => [
+                              createVNode(unref(IconChevronRight))
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        default: withCtx(() => [
+                          createElementVNode("span", null, toDisplayString(i18n.value.DETAILS), 1)
+                        ]),
+                        _: 1
+                      }, 8, ["href"])) : createCommentVNode("", true),
+                      item.register_url && !item.isExpired ? (openBlock(), createBlock(unref(OButton), {
+                        key: 3,
+                        variant: "text",
+                        href: item.register_url,
+                        target: "_blank",
+                        class: "jump-detail-link"
+                      }, {
+                        suffix: withCtx(() => [
+                          createVNode(unref(OIcon), null, {
+                            default: withCtx(() => [
+                              createVNode(unref(IconChevronRight))
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        default: withCtx(() => [
+                          createElementVNode("span", null, toDisplayString(i18n.value.SIGN), 1)
+                        ]),
+                        _: 1
+                      }, 8, ["href"])) : createCommentVNode("", true)
+                    ])
                   ]),
                   createVNode(unref(OIcon), {
                     onClick: withModifiers(() => copyInfo(index), ["stop"]),
@@ -379,7 +392,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   }, 8, ["onClick"])
                 ]),
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_6, [
+                  createElementVNode("div", _hoisted_8, [
                     createVNode(_sfc_main$1, {
                       show: collapseNames.value.includes(item.id),
                       data: item,
@@ -390,7 +403,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ])
                 ]),
                 _: 2
-              }, 1032, ["value"]);
+              }, 1032, ["value", "class"]);
             }), 128))
           ]),
           _: 1

package/dist/treeshaking/components/meeting/components/OMeetingSigAside.css

@@ -13,6 +13,7 @@
   display: flex;
   flex-direction: column;
   border-right: 1px solid var(--o-color-control4);
+  justify-content: space-between;
 }
 @media (max-width: 1200px) {
 .o-sig-meeting-aside {
@@ -38,7 +39,7 @@
 }
 }
 .o-sig-meeting-aside .month-item {
-  margin-bottom: var(--o-gap-3);
+  height: calc(var(--height) * 1px - 24px - var(--o-gap-3));
 }
 .o-sig-meeting-aside .month-item .month {
   color: var(--o-color-info3);
@@ -152,6 +153,7 @@
   align-items: center;
   justify-content: space-between;
   color: var(--o-color-primary1);
+  margin-top: var(--o-gap-3);
 }
 .o-sig-meeting-aside .arrow-wrapper .o-icon {
   font-size: 24px;