@ledvance/base 1.3.33 → 1.3.34

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.3.33",
+  "version": "1.3.34",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/utils/common.ts

@@ -3,7 +3,7 @@ import I18n from '../i18n/index'
 import { formatNumber, openDownloadFile } from 'api/native'
 import dayjs from 'dayjs'
 import RNFetchBlob from 'rn-fetch-blob'
-import { isEqual } from 'lodash'
+import { cloneDeep, isEqual } from 'lodash'
 import { Dialog, Utils } from 'tuya-panel-kit'
 import {GlobalParams} from "../models/GlobalParams";
 
@@ -448,17 +448,26 @@ export function isConflictTask(task1, task2) {
   function checkOverlap(start1, end1, start2, end2) {
     return (start1 <= end2 && start2 <= end1);
   }
+  const cloneTask1 = cloneDeep(task1)
+  const cloneTask2 = cloneDeep(task2)
+  const weekDay = dayjs().day()
+  if (cloneTask1.weeks.every(w => Number(w) === 0)){
+    cloneTask1.weeks[weekDay] = 1
+  }
+  if (cloneTask2.weeks.every(w => Number(w) === 0)){
+    cloneTask2.weeks[weekDay] = 1
+  }
   // 检查一周的每一天
   for (let i = 0; i < 7; i++) {
     // 如果 task1 在该天执行
-    if (Number(task1.weeks[i]) === 1) {
-      const [start1, end1] = [task1.startTime, task1.endTime];
+    if (Number(cloneTask1.weeks[i]) === 1) {
+      const [start1, end1] = [cloneTask1.startTime, cloneTask1.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];
+        if (Number(cloneTask2.weeks[j]) === 1) {
+          const [start2, end2] = [cloneTask2.startTime, cloneTask2.endTime];
           const task2CrossDay = start2 > end2;
           // 检查当前天是否有重叠
           if (i === j && checkOverlap(start1, end1, start2, end2)) {