econtrol-tools-calendar 1.0.5 → 1.0.6

package/README.md

@@ -340,9 +340,9 @@ function handleQuickAddSaved(event: EventInput) {
 <template>
   <div class="devices-container">
     <SCalendar
-      v-for="device in devices"
-      :key="device.id"
-      :device-id="device.id"
+        v-for="device in devices"
+        :key="device.id"
+        :device-id="device.id"
       :device-info="device"
       :events="deviceEvents[device.id] || []"
       :userid="currentUserId"
@@ -350,7 +350,7 @@ function handleQuickAddSaved(event: EventInput) {
       @event-updated="(event) => handleEventUpdated(device.id, event)"
       @event-deleted="(eventId) => handleEventDeleted(device.id, eventId)"
       @events-change="(events) => handleEventsChange(device.id, events)"
-    />
+      />
   </div>
 </template>
 
@@ -392,7 +392,7 @@ function handleEventDeleted(deviceId: string, eventId: string) {
     deviceEvents.value[deviceId] = deviceEvents.value[deviceId].filter(
       (e) => e.id !== eventId
     );
-  }
+}
 }
 
 function handleEventsChange(deviceId: string, events: EventInput[]) {

package/dist/calendar.js

@@ -5,7 +5,7 @@ import timeGridPlugin from "@fullcalendar/timegrid";
 import listPlugin from "@fullcalendar/list";
 import interactionPlugin from "@fullcalendar/interaction";
 import { ElMessage } from "element-plus";
-import { User, Clock, Calendar, Monitor, Document } from "@element-plus/icons-vue";
+import { Clock, Calendar, User, Monitor, Document } from "@element-plus/icons-vue";
 var l77 = {
   code: "zh-cn",
   week: {
@@ -72,13 +72,17 @@ const _hoisted_23 = {
 const _hoisted_24 = { class: "detail-label" };
 const _hoisted_25 = { class: "detail-value description-text" };
 const _hoisted_26 = { class: "event-content" };
-const _hoisted_27 = { class: "event-time" };
-const _hoisted_28 = { class: "event-title" };
-const _hoisted_29 = {
+const _hoisted_27 = {
   key: 0,
-  class: "device-detail-content"
+  class: "my-event-marker"
 };
+const _hoisted_28 = { class: "event-time" };
+const _hoisted_29 = { class: "event-title" };
 const _hoisted_30 = {
+  key: 0,
+  class: "device-detail-content"
+};
+const _hoisted_31 = {
   key: 1,
   class: "device-detail-loading"
 };
@@ -100,6 +104,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const emit = __emit;
     const props = __props;
+    const calendarRef = ref(null);
     const dialogVisible = ref(false);
     const editingEvent = ref(null);
     const deviceDialogVisible = ref(false);
@@ -691,12 +696,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             iconEl.className = "my-event-icon";
             iconEl.innerHTML = "★";
             iconEl.style.cssText = `
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
           position: absolute;
           left: 2px;
           top: 50%;
           transform: translateY(-50%);
           font-size: 8px;
           color: #fff;
+          background-color: #409eff;
+          border-radius: 2px;
+          width: 12px;
+          height: 12px;
           line-height: 1;
           z-index: 20;
           pointer-events: none;
@@ -813,6 +825,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const startStr = formatFromISO(props.quickAddTimeRange.start);
       const endStr = formatFromISO(props.quickAddTimeRange.end);
+      if (calendarRef.value) {
+        try {
+          const calendarApi = calendarRef.value.getApi();
+          const currentView = calendarApi.view;
+          const quickAddStartDate = new Date(props.quickAddTimeRange.start);
+          const viewStart = new Date(currentView.activeStart);
+          const viewEnd = new Date(currentView.activeEnd);
+          const isInView = quickAddStartDate >= viewStart && quickAddStartDate < viewEnd;
+          if (!isInView) {
+            calendarApi.gotoDate(quickAddStartDate);
+          }
+        } catch (error) {
+          console.warn("无法获取日历 API:", error);
+        }
+      }
       if (isPastDateTime(startStr)) {
         ElMessage.warning("不能选择今天之前的时间进行预约");
         return;
@@ -1201,6 +1228,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ])
         ]),
         createVNode(unref(FullCalendar), {
+          ref_key: "calendarRef",
+          ref: calendarRef,
           options: calendarOptions.value,
           class: "calendar"
         }, {
@@ -1298,17 +1327,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }),
               default: withCtx(() => [
                 createElementVNode("div", _hoisted_26, [
-                  isMyEvent(arg.event) ? (openBlock(), createBlock(_component_el_icon, {
-                    key: 0,
-                    class: "my-event-marker"
-                  }, {
-                    default: withCtx(() => [
-                      createVNode(unref(User))
-                    ]),
-                    _: 1
-                  })) : createCommentVNode("", true),
-                  createElementVNode("span", _hoisted_27, toDisplayString(arg.timeText), 1),
-                  createElementVNode("span", _hoisted_28, toDisplayString(truncateTitle(arg.event.title, 10)), 1)
+                  isMyEvent(arg.event) ? (openBlock(), createElementBlock("span", _hoisted_27, "★")) : createCommentVNode("", true),
+                  createElementVNode("span", _hoisted_28, toDisplayString(arg.timeText), 1),
+                  createElementVNode("span", _hoisted_29, toDisplayString(truncateTitle(arg.event.title, 10)), 1)
                 ])
               ]),
               _: 2
@@ -1467,7 +1488,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             })
           ]),
           default: withCtx(() => [
-            deviceInfo.value ? (openBlock(), createElementBlock("div", _hoisted_29, [
+            deviceInfo.value ? (openBlock(), createElementBlock("div", _hoisted_30, [
               createVNode(_component_el_descriptions, {
                 column: 1,
                 border: ""
@@ -1531,7 +1552,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               })
-            ])) : (openBlock(), createElementBlock("div", _hoisted_30, [
+            ])) : (openBlock(), createElementBlock("div", _hoisted_31, [
               createVNode(_component_el_empty, { description: "暂无设备信息" })
             ]))
           ]),
@@ -1548,7 +1569,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const SCalendarComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fb085ef2"]]);
+const SCalendarComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-03fbb1ab"]]);
 function getHolidays(year) {
   const holidays = {};
   if (year === 2026) {