chbim-time-axis-v2 0.0.194 → 0.0.196

package/dist/chbim-time-axis-v2.es.js

@@ -12346,25 +12346,27 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             return !(i.left < scrollLeft.value - 100 || i.left > scrollLeft.value + containerWidth.value + 100);
           });
         }
-        const shouldRender = isVisible || task.type === "instant" || task.type === "block" && task.allowInstant;
-        if (shouldRender) {
-          const barData = {
-            id: task.id,
-            top: index * 30,
-            left: hasMainBar ? startX : 0,
-            width: hasMainBar ? width : 0,
-            hasMainBar,
-            name: task.name,
-            color: task.type === "group" ? "#4a90e2" : "#50e3c2",
-            originalTask: task,
-            blocks: blocks.length > 0 ? blocks : void 0,
-            instants: instants.length > 0 ? instants : void 0
-          };
-          if (hasLimit) {
-            barData.limitLeft = limitLeft;
-            barData.limitWidth = limitWidth;
+        if (isVisible || task.type === "instant" || task.allowInstant) {
+          const shouldRender = isVisible || task.type === "instant" || task.allowInstant;
+          if (shouldRender) {
+            const barData = {
+              id: task.id,
+              top: index * 30,
+              left: hasMainBar ? startX : 0,
+              width: hasMainBar ? width : 0,
+              hasMainBar,
+              name: task.name,
+              color: task.type === "group" ? "#4a90e2" : "#50e3c2",
+              originalTask: task,
+              blocks: blocks.length > 0 ? blocks : void 0,
+              instants: instants.length > 0 ? instants : void 0
+            };
+            if (hasLimit) {
+              barData.limitLeft = limitLeft;
+              barData.limitWidth = limitWidth;
+            }
+            bars.push(barData);
           }
-          bars.push(barData);
         }
       });
       return bars;
@@ -12376,6 +12378,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       const minTickSpacing = 100;
       const targetInterval = props.scale * minTickSpacing;
       const steps = [
+        { unit: "minute", step: 1, format: "HH:mm" },
+        { unit: "minute", step: 5, format: "HH:mm" },
+        { unit: "minute", step: 15, format: "HH:mm" },
+        { unit: "minute", step: 30, format: "HH:mm" },
         { unit: "hour", step: 1, format: "HH:mm" },
         { unit: "hour", step: 6, format: "HH:mm" },
         { unit: "hour", step: 12, format: "HH:mm" },
@@ -12736,8 +12742,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TimelineChart_vue_vue_type_style_index_0_scoped_761ad497_lang = "";
-const TimelineChart = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-761ad497"]]);
+const TimelineChart_vue_vue_type_style_index_0_scoped_77875d0b_lang = "";
+const TimelineChart = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-77875d0b"]]);
 const _hoisted_1 = { class: "toolbar" };
 const _hoisted_2 = { style: { "flex": "1", "display": "flex", "align-items": "center", "height": "100%" } };
 const _hoisted_3 = { class: "left-controls" };
@@ -12784,9 +12790,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   props: {
     viewer: {},
     clock: {},
-    tasks: {}
+    tasks: {},
+    minZoomLevel: {}
   },
-  emits: ["taskUpdate", "update:tasks", "add", "delete", "task-enter", "task-leave", "blockUpdate"],
+  emits: ["taskUpdate", "update:tasks", "add", "delete", "task-enter", "task-leave", "blockUpdate", "instantUpdate"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const slots = useSlots();
     const props = __props;
@@ -12955,7 +12962,58 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       { immediate: true, deep: true }
     );
     const activeTaskIds = /* @__PURE__ */ new Set();
-    watch(currentTime, (newTime, oldTime) => {
+    const tasksWithComputedData = computed(() => {
+      const process = (list) => {
+        return list.map((task) => {
+          if (task.type === "group") {
+            const group = task;
+            const rawChildren = group.children || [];
+            const processedChildren = process(rawChildren);
+            let minTime = Number.MAX_SAFE_INTEGER;
+            let maxTime = Number.MIN_SAFE_INTEGER;
+            if (processedChildren.length > 0) {
+              processedChildren.forEach((child) => {
+                const start = new Date(child.startTime).getTime();
+                const end = new Date(child.endTime).getTime();
+                if (!isNaN(start)) {
+                  if (start < minTime)
+                    minTime = start;
+                }
+                if (!isNaN(end)) {
+                  if (end > maxTime)
+                    maxTime = end;
+                }
+              });
+            }
+            const calculatedStart = minTime !== Number.MAX_SAFE_INTEGER ? new Date(minTime).toISOString() : "";
+            const calculatedEnd = maxTime !== Number.MIN_SAFE_INTEGER ? new Date(maxTime).toISOString() : "";
+            const childrenWithWarnings = processedChildren.map((child) => {
+              let warning = void 0;
+              if (group.limitStartTime && dayjs(child.startTime).isBefore(dayjs(group.limitStartTime))) {
+                warning = "开始时间早于分组限制";
+              }
+              if (group.limitEndTime && dayjs(child.endTime).isAfter(dayjs(group.limitEndTime))) {
+                warning = warning ? warning + "; 结束时间晚于分组限制" : "结束时间晚于分组限制";
+              }
+              if (warning) {
+                return { ...child, warning };
+              }
+              return child;
+            });
+            return {
+              ...group,
+              startTime: calculatedStart,
+              endTime: calculatedEnd,
+              children: childrenWithWarnings,
+              collapsed: collapsedGroups.value.has(group.id)
+            };
+          }
+          return task;
+        });
+      };
+      return process(localTasks.value);
+    });
+    const checkActiveTasks = (newTime, oldTime) => {
       if (!newTime)
         return;
       const entered = [];
@@ -12979,14 +13037,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               const inside = newTime >= task.startTime && newTime <= task.endTime;
               if (inside && !activeTaskIds.has(task.id)) {
                 activeTaskIds.add(task.id);
-                entered.push({ task });
+                if (task.type === "group") {
+                  entered.push({ task, group: task });
+                } else {
+                  entered.push({ task });
+                }
               } else if (!inside && activeTaskIds.has(task.id)) {
                 activeTaskIds.delete(task.id);
-                left.push({ task });
+                if (task.type === "group") {
+                  left.push({ task, group: task });
+                } else {
+                  left.push({ task });
+                }
               }
             }
           }
-          if (oldTime && task.instants) {
+          if (oldTime && oldTime !== newTime && task.instants) {
             task.instants.forEach((inst) => {
               const t = inst.time;
               if (!t)
@@ -13001,12 +13067,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             check(task.children);
         });
       };
-      check(localTasks.value);
+      check(tasksWithComputedData.value);
       if (entered.length > 0)
         emit("task-enter", entered);
       if (left.length > 0)
         emit("task-leave", left);
+    };
+    watch(currentTime, (newTime, oldTime) => {
+      checkActiveTasks(newTime, oldTime);
     });
+    watch(
+      localTasks,
+      () => {
+        if (currentTime.value) {
+          checkActiveTasks(currentTime.value, currentTime.value);
+        }
+      },
+      { deep: true }
+    );
     const handleToggleGroup = (id) => {
       if (collapsedGroups.value.has(id)) {
         collapsedGroups.value.delete(id);
@@ -13015,58 +13093,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const processedTasks = computed(() => {
-      const process = (list) => {
+      const filterCollapsed = (list) => {
         return list.map((task) => {
           if (task.type === "group") {
             const group = task;
-            const rawChildren = group.children || [];
-            const processedChildren = process(rawChildren);
-            let minTime = Number.MAX_SAFE_INTEGER;
-            let maxTime = Number.MIN_SAFE_INTEGER;
-            if (processedChildren.length > 0) {
-              processedChildren.forEach((child) => {
-                const start = new Date(child.startTime).getTime();
-                const end = new Date(child.endTime).getTime();
-                if (!isNaN(start)) {
-                  if (start < minTime)
-                    minTime = start;
-                }
-                if (!isNaN(end)) {
-                  if (end > maxTime)
-                    maxTime = end;
-                }
-              });
-            }
-            const calculatedStart = minTime !== Number.MAX_SAFE_INTEGER ? new Date(minTime).toISOString() : "";
-            const calculatedEnd = maxTime !== Number.MIN_SAFE_INTEGER ? new Date(maxTime).toISOString() : "";
-            let displayChildren = processedChildren.map((child) => {
-              let warning = void 0;
-              if (group.limitStartTime && dayjs(child.startTime).isBefore(dayjs(group.limitStartTime))) {
-                warning = "开始时间早于分组限制";
-              }
-              if (group.limitEndTime && dayjs(child.endTime).isAfter(dayjs(group.limitEndTime))) {
-                warning = warning ? warning + "; 结束时间晚于分组限制" : "结束时间晚于分组限制";
-              }
-              if (warning) {
-                return { ...child, warning };
-              }
-              return child;
-            });
             const isCollapsed = collapsedGroups.value.has(group.id);
             return {
               ...group,
-              startTime: calculatedStart,
-              endTime: calculatedEnd,
-              children: isCollapsed ? [] : displayChildren,
-              // 如果折叠则隐藏子任务
-              collapsed: isCollapsed
-              // 传递折叠状态给 UI
+              children: isCollapsed ? [] : filterCollapsed(group.children || [])
             };
           }
           return task;
         });
       };
-      return process(localTasks.value);
+      return filterCollapsed(tasksWithComputedData.value);
     });
     const fitToTasks = (tasks) => {
       if (tasks.length === 0)
@@ -13219,7 +13259,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const handleZoom = (delta, zoomCenterPixels) => {
       const newScaleRaw = scale.value * (delta > 0 ? 1.1 : 0.9);
-      const MIN_SCALE = 1e3 * 60 * 60 / 100;
+      let minDuration = 1e3 * 60 * 60;
+      if (props.minZoomLevel === "minute") {
+        minDuration = 1e3 * 60;
+      } else if (props.minZoomLevel === "day") {
+        minDuration = 1e3 * 60 * 60 * 24;
+      }
+      const MIN_SCALE = minDuration / 100;
       const MAX_SCALE = 1e3 * 60 * 60 * 24 * 30;
       const newScale = Math.max(MIN_SCALE, Math.min(newScaleRaw, MAX_SCALE));
       const oldScale = scale.value;
@@ -13295,8 +13341,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         for (const t of list) {
           if (t.id === payload.taskId) {
             if (t.instants && t.instants[payload.instantIndex]) {
-              t.instants[payload.instantIndex].time = payload.time;
+              const oldTime = t.instants[payload.instantIndex].time;
+              const newTime = payload.time;
+              t.instants[payload.instantIndex].time = newTime;
+              emit("instantUpdate", {
+                task: JSON.parse(JSON.stringify(t)),
+                instant: JSON.parse(
+                  JSON.stringify(t.instants[payload.instantIndex])
+                ),
+                index: payload.instantIndex
+              });
               emit("taskUpdate", JSON.parse(JSON.stringify(t)));
+              if (currentTime.value && oldTime && newTime) {
+                const currentT = new Date(currentTime.value).getTime();
+                const t1 = new Date(oldTime).getTime();
+                const t2 = new Date(newTime).getTime();
+                const minT = Math.min(t1, t2);
+                const maxT = Math.max(t1, t2);
+                if (currentT >= minT && currentT <= maxT) {
+                  emit("task-enter", [
+                    { task: t, instant: t.instants[payload.instantIndex] }
+                  ]);
+                }
+              }
               return true;
             }
           }
@@ -13648,8 +13715,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CesiumGantt_vue_vue_type_style_index_0_scoped_87a98505_lang = "";
-const CesiumGantt = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-87a98505"]]);
+const CesiumGantt_vue_vue_type_style_index_0_scoped_1991ca92_lang = "";
+const CesiumGantt = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1991ca92"]]);
 class ViewportRoam {
   constructor(viewer, data, intervals) {
     __publicField(this, "viewer");