@ray-js/lamp-schedule-core 1.0.4-beta-9 → 1.0.4-beta-11

package/lib/hooks/useTimerOperateLocal.js

@@ -17,6 +17,13 @@ import { LOCAL_TIMER_CATEGORY } from '../constant';
 import { getAll, useLocalTimerCloudProperty } from '../utils/ScheduleCloudProperty';
 import { getTimerState, getTimerReducer } from '../context/timer';
 import { timerReportParser } from '../dpParser';
+const sortDataList = dataList => {
+  return dataList.sort((a, b) => {
+    const aTime = a.time;
+    const bTime = b.time;
+    return aTime.localeCompare(bTime);
+  });
+};
 
 // 添加本地定时
 export const useLocalTimerAdd = isSupportLocalTimer => {
@@ -175,7 +182,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 +192,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
@@ -256,8 +268,9 @@ export const useLocalTimerList = isSupportLocalTimer => {
             isAppPush: false
           };
         });
+        const sortedLocalTimerList = sortDataList(_localTimerList);
         resolve({
-          timers: _localTimerList
+          timers: sortedLocalTimerList
         });
       }).catch(err => {
         ScheduleLogger.error('useLocalTimerList getAll error:', err);

package/package.json

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