@ray-js/lamp-schedule-core 1.0.4-beta-8 → 1.0.4-beta-10

package/lib/conflict/index.js

@@ -6,6 +6,7 @@ import { scheduleLogger } from '../utils/ScheduleLogger';
 import { checkConflicts } from './ConflictResolver';
 import { ScheduleDataManager } from './scheduleDataManager';
 import { transScheduleListToConflictList } from './transform';
+import { EScheduleFunctionType } from '../types';
 
 /**
  * 冲突检测
@@ -58,7 +59,27 @@ export class Conflict {
   static remove(current) {
     const [cur] = transScheduleListToConflictList([current]);
     scheduleLogger.debug('Conflict.remove cur, current:', cur, current);
-    cur && ScheduleDataManager.getInstance().deleteData(cur);
+
+    // 如果转换后为空（例如倒计时为0时，status为false会被过滤），需要特殊处理
+    if (!cur) {
+      // 对于倒计时类型，即使status为false，也需要删除冲突数据（因为倒计时的id是固定的）
+      if (current.type === EScheduleFunctionType.COUNTDOWN) {
+        const countdownSchedule = {
+          id: `${EScheduleFunctionType.COUNTDOWN}`,
+          type: EScheduleFunctionType.COUNTDOWN,
+          data: {
+            status: false,
+            weeks: [0, 0, 0, 0, 0, 0, 0],
+            startTime: '',
+            endTime: ''
+          }
+        };
+        scheduleLogger.debug('Conflict.remove: 倒计时为0，使用固定id删除', countdownSchedule);
+        ScheduleDataManager.getInstance().deleteData(countdownSchedule);
+      }
+      return;
+    }
+    ScheduleDataManager.getInstance().deleteData(cur);
   }
 
   /**

package/lib/hooks/useTimerOperateLocal.js

@@ -175,7 +175,8 @@ export const getTimerListWithFlush = (dispatch, actions) => {
 const onDpChangeFn = data => {
   var _data$dps;
   // 专门处理 timer_report dp 变化
-  if (data !== null && data !== void 0 && (_data$dps = data.dps) !== null && _data$dps !== void 0 && _data$dps[38]) {
+  const timerReportId = 38;
+  if (data !== null && data !== void 0 && (_data$dps = data.dps) !== null && _data$dps !== void 0 && _data$dps[timerReportId]) {
     var _data$dps2;
     const {
       rtcTimerList = []
@@ -184,9 +185,13 @@ const onDpChangeFn = data => {
       actions,
       dispatch
     } = getTimerReducer();
-    const dpValue = data === null || data === void 0 || (_data$dps2 = data.dps) === null || _data$dps2 === void 0 ? void 0 : _data$dps2[38];
+    const dpValue = data === null || data === void 0 || (_data$dps2 = data.dps) === null || _data$dps2 === void 0 ? void 0 : _data$dps2[timerReportId];
     const dpParsedValue = timerReportParser.parser(dpValue);
-    const timerList = rtcTimerList.map(item => {
+    // 如果 timerReport 有删除id，需要同步删除对应的 rtcTimerList
+    const rtcTimerListFiltered = rtcTimerList.filter(item => {
+      return dpParsedValue === null || dpParsedValue === void 0 ? void 0 : dpParsedValue.find(i => +i.id === +item.timerId);
+    });
+    const timerList = rtcTimerListFiltered.map(item => {
       var _dpParsedValue$find$s, _dpParsedValue$find;
       return _objectSpread(_objectSpread({}, item), {}, {
         status: (_dpParsedValue$find$s = dpParsedValue === null || dpParsedValue === void 0 || (_dpParsedValue$find = dpParsedValue.find(i => +i.id === +item.timerId)) === null || _dpParsedValue$find === void 0 ? void 0 : _dpParsedValue$find.status) !== null && _dpParsedValue$find$s !== void 0 ? _dpParsedValue$find$s : false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lamp-schedule-core",
-  "version": "1.0.4-beta-8",
+  "version": "1.0.4-beta-10",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [