econtrol-tools-calendar 1.0.10 → 1.0.12

package/dist/calendar.js

@@ -200,11 +200,45 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const eventOrganizerId = ((_a = event.extendedProps) == null ? void 0 : _a.organizerId) || "";
       return eventOrganizerId === currentUserId.value;
     }
-    const events = ref([...props.events]);
+    function normalizeEventTime(time) {
+      if (!time) return void 0;
+      if (time instanceof Date) {
+        return time;
+      }
+      if (typeof time === "number") {
+        return new Date(time);
+      }
+      if (typeof time === "string") {
+        if (time.includes("T")) {
+          return time;
+        }
+        const dateOnlyPattern = /^\d{4}-\d{2}-\d{2}$/;
+        if (dateOnlyPattern.test(time)) {
+          const normalizedTime = `${time} 00:00:00`;
+          return formatToISO(normalizedTime);
+        }
+        const dateTimePattern = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+        if (dateTimePattern.test(time)) {
+          return formatToISO(time);
+        }
+        return time;
+      }
+      return time;
+    }
+    function normalizeEvent(event) {
+      return {
+        ...event,
+        start: normalizeEventTime(event.start),
+        end: normalizeEventTime(event.end)
+      };
+    }
+    const events = ref(
+      (props.events || []).map((event) => normalizeEvent(event))
+    );
     watch(
       () => props.events,
       (newEvents) => {
-        events.value = [...newEvents || []];
+        events.value = (newEvents || []).map((event) => normalizeEvent(event));
       },
       { deep: true, immediate: true }
     );
@@ -865,52 +899,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ElMessage.warning("不能选择今天之前的时间进行预约");
         return;
       }
-      if (checkTimeConflict(startStr, endStr)) {
-        ElMessage.error("该时间段与其他事件冲突，请选择其他时间");
-        return;
+      formData.start = startStr;
+      formData.end = endStr;
+      formData.title = props.quickAddTaskName;
+      formData.allDay = false;
+      formData.description = "";
+      formData.organizer = currentUser.value;
+      formData.username = currentUser.value;
+      formData.organizerId = currentUserId.value;
+      if (props.taskid) {
+        formData.taskid = props.taskid;
+      } else {
+        formData.taskid = "";
       }
-      const taskId = formData.taskid || props.taskid || "";
-      const tempEventId = taskId && taskId === props.taskid ? taskId : void 0;
-      const colorInfo = assignEventColor(
-        startStr,
-        endStr,
-        void 0,
-        currentUser.value,
-        tempEventId,
-        // 传入临时ID用于颜色分配（如果taskid匹配）
-        taskId
-        // 传入 taskid 用于颜色分配
-      );
-      const startISO = formatToISO(startStr);
-      const endISO = endStr ? formatToISO(endStr) : void 0;
-      const eventUsername = currentUser.value;
-      const eventOrganizerId = currentUserId.value;
-      const editable = !currentUserId.value || eventOrganizerId === currentUserId.value;
-      const newEvent = {
-        // 不设置 id，由外部 App.vue 的事件列表提供
-        title: props.quickAddTaskName,
-        start: startISO,
-        end: endISO,
-        allDay: false,
-        backgroundColor: colorInfo.bg,
-        borderColor: colorInfo.border,
-        editable,
-        extendedProps: {
-          description: "",
-          organizer: eventUsername,
-          // 保留用于兼容
-          username: eventUsername,
-          organizerId: eventOrganizerId,
-          colorIndex: colorInfo.index,
-          deviceId: props.deviceId || "",
-          taskid: props.taskid || ""
-          // 如果存在 taskid，保存到事件数据中
-        }
-      };
-      emit("quickAddSaved", newEvent);
-      emit("eventAdded", newEvent);
-      const newEventsList = [...events.value, newEvent];
-      emit("eventsChange", newEventsList);
+      formData.deviceId = props.deviceId || "";
+      formData.userid = currentUserId.value;
+      editingEvent.value = null;
+      dialogVisible.value = true;
     }
     function formatFromISO(isoStr, useBeijingTime = false) {
       if (!isoStr) return "";
@@ -1474,6 +1479,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       "value-format": "YYYY-MM-DD HH:mm:ss",
                       "disabled-date": disabledPastDate,
                       key: `start-${formData.start || "empty"}`,
+                      "append-to-body": "",
+                      "z-index": 3001,
                       style: { "width": "100%" }
                     }, null, 8, ["modelValue"]))
                   ]),
@@ -1490,6 +1497,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       "value-format": "YYYY-MM-DD HH:mm:ss",
                       "disabled-date": disabledPastDate,
                       key: `end-${formData.end || "empty"}`,
+                      "append-to-body": "",
+                      "z-index": 3001,
                       style: { "width": "100%" }
                     }, null, 8, ["modelValue"]))
                   ]),
@@ -1621,7 +1630,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const SCalendarComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7eba74c1"]]);
+const SCalendarComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3dbf0c7a"]]);
 function getHolidays(year) {
   const holidays = {};
   if (year === 2026) {