@ledvance/base 1.3.27 → 1.3.29

package/src/models/modules/NativePropsSlice.tsx

@@ -176,7 +176,7 @@ const nativePropsSlice = createSlice({
     setTimeZone(state, action: PayloadAction<any>) {
       state.timeZone = action.payload
     },
-    setGestrueControlValues(state, action: PayloadAction<any>) {
+    setGestureControlValues(state, action: PayloadAction<any>) {
       const keys = Object.keys(action.payload)
       keys.forEach(key => {
         state.gestureControlValues[key] = action.payload[key]
@@ -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
@@ -488,7 +488,7 @@ export const {
   setSystemTimeFormat,
   setTimeZone,
   setEnergieverbrauch,
-  setGestrueControlValues,
+  setGestureControlValues,
 } = nativePropsSlice.actions
 
 export {

package/src/utils/common.ts

@@ -259,6 +259,7 @@ interface DialogProps {
   confirmText?: string
   subTitle?: string
   onConfirm: (data: any, args: { close: () => void }) => void
+  onCancel: () => void
 }
 
 export function showDialog(props: DialogProps) {
@@ -271,6 +272,7 @@ export function showDialog(props: DialogProps) {
     confirmText,
     subTitle,
     onConfirm,
+    onCancel
   } = props
   return (
     method === 'confirm' ?
@@ -280,6 +282,7 @@ export function showDialog(props: DialogProps) {
         confirmText: showConfirmText && (confirmText || I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_yes_text')) || '',
         subTitle,
         onConfirm,
+        onCancel,
         motionConfig: {
           hideDuration: 0,
           showDuration: 100
@@ -396,3 +399,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;
+}