@opendesign-plus/components 0.0.1-rc.39 → 0.0.1-rc.40

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

@@ -1,5 +1,5 @@
-import { defineComponent, computed, ref, watch, onMounted, nextTick, openBlock, createElementBlock, createElementVNode, createVNode, unref, withCtx, normalizeClass, toDisplayString, createBlock, normalizeStyle, createCommentVNode, Fragment, renderList, createTextVNode, resolveDynamicComponent, renderSlot } from "vue";
-import { isClient, OIcon, OIconChevronLeft, OIconChevronRight, OSelect, OOption, OTab, OTabPane, OScroller, OResult, OFigure } from "@opensig/opendesign";
+import { defineComponent, computed, ref, watch, onMounted, nextTick, openBlock, createElementBlock, createElementVNode, toDisplayString, unref, createVNode, withCtx, createTextVNode, createCommentVNode, normalizeClass, createBlock, normalizeStyle, Fragment, renderList, resolveDynamicComponent, renderSlot } from "vue";
+import { isClient, OButton, OIcon, OIconChevronLeft, OIconChevronRight, OSelect, OOption, OTab, OTabPane, OScroller, OResult, OFigure } from "@opensig/opendesign";
 import dayjs from "dayjs";
 import { ElCalendar } from "element-plus";
 import "element-plus/es/components/calendar/style/css";
@@ -15,18 +15,22 @@ import { MeetingGroupType, CalendarDataType } from "./types.mjs";
 import { formatDate } from "./utils.mjs";
 import { useDebounceFn } from "@vueuse/core";
 const _hoisted_1 = { class: "o-meeting-calendar" };
-const _hoisted_2 = { class: "calendar-body" };
-const _hoisted_3 = { class: "calender-header-left" };
-const _hoisted_4 = { class: "left-title" };
-const _hoisted_5 = { class: "month-date" };
-const _hoisted_6 = { class: "right-title" };
-const _hoisted_7 = ["onClick"];
-const _hoisted_8 = { class: "day-box" };
-const _hoisted_9 = { class: "icon-box" };
-const _hoisted_10 = { class: "detail-list" };
-const _hoisted_11 = { class: "current-day" };
-const _hoisted_12 = { class: "right-title" };
-const _hoisted_13 = { class: "title-list" };
+const _hoisted_2 = {
+  key: 0,
+  class: "o-meeting-calendar-desc"
+};
+const _hoisted_3 = { class: "calendar-body" };
+const _hoisted_4 = { class: "calender-header-left" };
+const _hoisted_5 = { class: "left-title" };
+const _hoisted_6 = { class: "month-date" };
+const _hoisted_7 = { class: "right-title" };
+const _hoisted_8 = ["onClick"];
+const _hoisted_9 = { class: "day-box" };
+const _hoisted_10 = { class: "icon-box" };
+const _hoisted_11 = { class: "detail-list" };
+const _hoisted_12 = { class: "current-day" };
+const _hoisted_13 = { class: "right-title" };
+const _hoisted_14 = { class: "title-list" };
 const limitTime = "2021-01-01";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "OMeetingCalendar",
@@ -43,9 +47,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     groups: { default: () => [] },
     disableFormat: { type: Boolean },
     emptyImg: {},
-    emptyText: {}
+    emptyText: {},
+    showDesc: { type: Boolean, default: false }
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["create"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const { t, locale, meetingTabs, getConfig } = useMeetingConfig();
     const isEn = computed(() => locale.value === Locales.EN);
@@ -140,7 +146,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       try {
-        meetingData.value = [];
         const res = await props.getMeetingListRequest(params.date, group.value, "");
         meetingData.value = res.map((v) => {
           return {
@@ -155,6 +160,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       } catch {
         meetingData.value = [];
+      } finally {
+        getSummitData(params.date);
+        getActivityData(params.date);
       }
     };
     const renderData = computed(() => {
@@ -172,8 +180,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,
@@ -243,11 +249,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     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) => {
@@ -307,12 +314,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return false;
     };
+    const emits = __emit;
     __expose({
       refresh: getDateData
     });
+    const create = () => {
+      emits("create");
+    };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
-        createElementVNode("div", _hoisted_2, [
+        __props.showDesc ? (openBlock(), createElementBlock("div", _hoisted_2, [
+          createElementVNode("span", null, toDisplayString(__props.groupType === unref(MeetingGroupType).GROUP ? unref(t)("meeting.meetingDescGroup") : unref(t)("meeting.meetingDesc")), 1),
+          createVNode(unref(OButton), {
+            color: "primary",
+            variant: "solid",
+            round: "pill",
+            onClick: create
+          }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString(unref(t)("meeting.meetingCreate")), 1)
+            ]),
+            _: 1
+          })
+        ])) : createCommentVNode("", true),
+        createElementVNode("div", _hoisted_3, [
           createVNode(unref(ElCalendar), {
             ref_key: "calendar",
             ref: calendar,
@@ -321,8 +346,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             header: withCtx(({ date }) => {
               var _a;
               return [
-                createElementVNode("div", _hoisted_3, [
-                  createElementVNode("div", _hoisted_4, [
+                createElementVNode("div", _hoisted_4, [
+                  createElementVNode("div", _hoisted_5, [
                     createVNode(unref(OIcon), {
                       onClick: ($event) => selectDate("prev-month", date)
                     }, {
@@ -333,7 +358,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }, 8, ["onClick"]),
-                    createElementVNode("span", _hoisted_5, toDisplayString(formatYearMonth(date)), 1),
+                    createElementVNode("span", _hoisted_6, toDisplayString(formatYearMonth(date)), 1),
                     createVNode(unref(OIcon), {
                       onClick: ($event) => selectDate("next-month", date)
                     }, {
@@ -367,7 +392,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     _: 1
                   }, 8, ["modelValue", "placeholder"])) : createCommentVNode("", true)
                 ]),
-                createElementVNode("div", _hoisted_6, [
+                createElementVNode("div", _hoisted_7, [
                   createElementVNode("span", null, toDisplayString(unref(t)("meeting.latestMeeting")) + " ", 1),
                   createElementVNode("span", null, toDisplayString(unref(formatDate)(unref(dayjs)(latestDay.value))), 1)
                 ])
@@ -378,11 +403,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 class: normalizeClass(["out-box", { "has-calender": allDates.value.includes(data.day) }]),
                 onClick: ($event) => unref(changeMeetingDay)(data.day, $event)
               }, [
-                createElementVNode("div", _hoisted_8, [
+                createElementVNode("div", _hoisted_9, [
                   createElementVNode("p", {
                     class: normalizeClass([data.isSelected ? "is-selected" : "", "date-calender"])
                   }, toDisplayString(removeLeadingZero(data.day.split("-").at(-1) || "")), 3),
-                  createElementVNode("div", _hoisted_9, [
+                  createElementVNode("div", _hoisted_10, [
                     checkSelectedDay(unref(CalendarDataType).MEETING, data.day) ? (openBlock(), createBlock(unref(OIcon), {
                       key: 0,
                       class: "meeting",
@@ -424,17 +449,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, 8, ["style"])) : createCommentVNode("", true)
                   ])
                 ])
-              ], 10, _hoisted_7)
+              ], 10, _hoisted_8)
             ]),
             _: 1
           }, 512),
-          createElementVNode("div", _hoisted_10, [
-            createElementVNode("div", _hoisted_11, [
+          createElementVNode("div", _hoisted_11, [
+            createElementVNode("div", _hoisted_12, [
               createTextVNode(toDisplayString(unref(t)("meeting.latestMeeting")) + "  ", 1),
               createElementVNode("span", null, toDisplayString(unref(formatDate)(unref(dayjs)(latestDay.value))), 1)
             ]),
-            createElementVNode("div", _hoisted_12, [
-              createElementVNode("div", _hoisted_13, [
+            createElementVNode("div", _hoisted_13, [
+              createElementVNode("div", _hoisted_14, [
                 createVNode(unref(OSelect), {
                   modelValue: group.value,
                   "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => group.value = $event),

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

@@ -411,7 +411,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { lePadV } = useScreen();
     const confirm = async () => {
       var _a;
-      let type = isEdit.value ? t("meeting.editSuccess") : t("meeting.booSuccess");
+      let type = isEdit.value ? t("meeting.editSuccess") : t("meeting.createSuccess");
       try {
         loading.value = true;
         const valid = await formRef.value.validate();
@@ -1051,7 +1051,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             loading: loading.value
           }, {
             default: withCtx(() => [
-              createTextVNode(toDisplayString(isEdit.value ? unref(t)("common.save") : __props.confirmText || unref(t)("meeting.book")), 1)
+              createTextVNode(toDisplayString(isEdit.value ? unref(t)("common.save") : __props.confirmText || unref(t)("meeting.create")), 1)
             ]),
             _: 1
           }, 8, ["loading"]),

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

@@ -69,7 +69,7 @@
   font-weight: 500;
   display: flex;
   align-items: center;
-  padding: var(--o-gap-3) var(--o-gap-5) 0;
+  padding: var(--o-gap-3) 0 0;
   font-size: 16px;
   line-height: 24px;
 }
@@ -99,12 +99,7 @@
 }
 @media (max-width: 1200px) {
 .o-sig-meeting-calendar .meeting-card-header {
-    padding: var(--o-gap-3) var(--o-gap-4) 0;
-}
-}
-@media (max-width: 840px) {
-.o-sig-meeting-calendar .meeting-card-header {
-    display: none;
+    padding: var(--o-gap-3) 0 0;
 }
 }
 .o-sig-meeting-calendar .meeting-card-header .date-meeting {
@@ -113,6 +108,7 @@
 }
 .o-sig-meeting-calendar .meeting-card-header .header-left {
   width: 35%;
+  padding-left: var(--o-gap-5);
   padding-bottom: var(--o-gap-3);
   color: var(--o-color-info1);
   font-size: 16px;
@@ -142,19 +138,17 @@
     line-height: 18px;
 }
 }
+@media (max-width: 1200px) {
+.o-sig-meeting-calendar .meeting-card-header .header-left {
+    padding-left: var(--o-gap-4);
+}
+}
 .o-sig-meeting-calendar .meeting-card-header .o-tab {
-  display: flex;
-  align-items: center;
-  flex-grow: 1;
-  justify-content: center;
-  position: relative;
+  width: 65%;
 }
 .o-sig-meeting-calendar .meeting-card-header .o-tab .o-tab-nav {
   padding-bottom: var(--o-gap-3);
 }
-.o-sig-meeting-calendar .meeting-card-header .o-tab .o-tab-nav svg path {
-  fill: currentColor;
-}
 .o-sig-meeting-calendar .el-input__prefix {
   display: none;
 }
@@ -183,7 +177,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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, nextTick, onMounted, openBlock, createElementBlock, createElementVNode, toDisplayString, unref, createVNode, withCtx, createCommentVNode, Fragment, renderList, createBlock, resolveDynamicComponent, createTextVNode, renderSlot } from "vue";
+import { defineComponent, ref, computed, watch, nextTick, onMounted, openBlock, createElementBlock, unref, createElementVNode, toDisplayString, createVNode, withCtx, createCommentVNode, Fragment, renderList, createBlock, resolveDynamicComponent, createTextVNode, renderSlot } from "vue";
 import { OPopover, OIcon, OTab, OTabPane, OSelect, OOption, ODivider, OScroller, OResult, OFigure } from "@opensig/opendesign";
 import dayjs from "dayjs";
 import IconTips from "../../_virtual/icon-tips.mjs";
@@ -11,14 +11,20 @@ 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_2 = { class: "meeting-card-header" };
+const _hoisted_1 = {
+  class: "o-sig-meeting-calendar",
+  style: { "--height": 400 }
+};
+const _hoisted_2 = {
+  key: 0,
+  class: "meeting-card-header"
+};
 const _hoisted_3 = {
   key: 0,
   class: "header-left"
 };
 const _hoisted_4 = {
-  key: 0,
+  key: 1,
   class: "phone-filter-wrapper"
 };
 const _hoisted_5 = { class: "date-select" };
@@ -111,8 +117,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 +132,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) => {
@@ -245,7 +201,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
-        createElementVNode("div", _hoisted_2, [
+        !unref(lePadV) ? (openBlock(), createElementBlock("div", _hoisted_2, [
           latestDate.value ? (openBlock(), createElementBlock("div", _hoisted_3, [
             createElementVNode("span", null, toDisplayString(unref(t)("meeting.latestMeeting")), 1),
             createElementVNode("span", null, toDisplayString(unref(dayjs)(latestDate.value).format("YYYY/MM/DD")), 1),
@@ -294,8 +250,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 8, ["modelValue"])
-        ]),
-        unref(lePadV) && dateList.value.length ? (openBlock(), createElementBlock("div", _hoisted_4, [
+        ])) : createCommentVNode("", true),
+        unref(lePadV) ? (openBlock(), createElementBlock("div", _hoisted_4, [
           createElementVNode("div", _hoisted_5, [
             createVNode(unref(OSelect), {
               modelValue: selectDate.value,
@@ -339,10 +295,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, 8, ["modelValue"])
           ])
         ])) : createCommentVNode("", true),
-        !unref(lePadV) || unref(lePadV) && dateList.value.length ? (openBlock(), createBlock(unref(ODivider), {
-          key: 1,
-          class: "meeting-divider"
-        })) : createCommentVNode("", true),
+        createVNode(unref(ODivider), { class: "meeting-divider" }),
         createElementVNode("div", _hoisted_6, [
           !unref(lePadV) && monthIdx.value !== -1 ? (openBlock(), createBlock(_sfc_main$1, {
             key: 0,

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;