@ledvance/base 1.3.27 → 1.3.28

package/src/models/modules/NativePropsSlice.tsx

@@ -436,7 +436,7 @@ export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(
   valueMapToDpValue?: (v: T) => any,
   getExtraDps?: (v: T) => any,
   getExtraConfig?: (v: T) => any,
-): [T, (value: T) => Promise<Result<any>>] {
+): [T, (value: T, extraDps?: any, extraConfig?: any) => Promise<Result<any>>] {
   const [featureHook, setFH] = useGroupConfigFeature<GC, T>(featureKey)
   const setFeatureHook = useCallback(async (value: T, extraDps?: any, extraConfig?: any) => {
     const dpValue = valueMapToDpValue ? valueMapToDpValue(value) : value

package/src/utils/common.ts

@@ -396,3 +396,41 @@ export function withErrorHandling<T extends any[], R>(
     }
   }
 }
+
+export function isConflictTask(task1, task2) {
+  // 检查两个时间段是否有重叠
+  function checkOverlap(start1, end1, start2, end2) {
+    return (start1 <= end2 && start2 <= end1);
+  }
+  // 检查一周的每一天
+  for (let i = 0; i < 7; i++) {
+    // 如果 task1 在该天执行
+    if (Number(task1.weeks[i]) === 1) {
+      const [start1, end1] = [task1.startTime, task1.endTime];
+      const task1CrossDay = start1 > end1;
+
+      // 如果 task2 在该天或跨天执行
+      for (let j = 0; j < 7; j++) {
+        if (Number(task2.weeks[j]) === 1) {
+          const [start2, end2] = [task2.startTime, task2.endTime];
+          const task2CrossDay = start2 > end2;
+          // 检查当前天是否有重叠
+          if (i === j && checkOverlap(start1, end1, start2, end2)) {
+            return true;
+          }
+
+          // 检查 task1 跨天并延伸到次日的情况
+          if (task1CrossDay && ((i + 1) % 7 === j) && checkOverlap(0, end1, start2, end2)) {
+            return true;
+          }
+
+          // 检查 task2 跨天并延伸到次日的情况
+          if (task2CrossDay && ((j + 1) % 7 === i) && checkOverlap(0, end2, start1, end1)) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+  return false;
+}