@ray-js/lamp-schedule-core 1.0.0 → 1.0.1-beta-1

package/lib/conflict/ConflictResolver.js

@@ -237,7 +237,7 @@ function mergeListByOtherId(list) {
   return Object.values(mergedData);
 }
 
-// 冲突检测核心函数（修改后的版本）
+// 冲突检测核心函数
 export function checkConflicts(scheduleList, currentSchedule) {
   let rule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultRule;
   const currentRanges = convertToTimeRanges([currentSchedule]);
@@ -260,6 +260,11 @@ export function checkConflicts(scheduleList, currentSchedule) {
         const currentPreId = current === null || current === void 0 || (_current$originalSche = current.originalSchedule) === null || _current$originalSche === void 0 ? void 0 : _current$originalSche.prevId;
         const currentId = current === null || current === void 0 || (_current$originalSche2 = current.originalSchedule) === null || _current$originalSche2 === void 0 ? void 0 : _current$originalSche2.id;
         const otherId = other.id;
+        // 针对定时，如果当前定时自身修改 且 与自身冲突  则忽略
+        if (currentPreId && currentId === currentPreId && current.type === 'timer') {
+          return;
+        }
+        // FIXME:还是存在bug
         // 如果当前定时自身修改 且 与自身冲突 并且其他定时不等于当前定时id 则忽略
         if (currentPreId && currentId === currentPreId && otherId !== currentId) {
           return;

package/lib/conflict/transform.js

@@ -23,10 +23,15 @@ export const timerDataToSchedule = data => {
     status: (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : false,
     weeks: data.loops.split('').map(item => Number(item)),
     startTime: data.time,
-    endTime: data.time
+    endTime: data.time,
+    dps: data.dps,
+    aliasName: data.aliasName || '',
+    isAppPush: data.isAppPush || false,
+    id: (data === null || data === void 0 ? void 0 : data.id) || data.timerId
   };
+  const timerId = `${EScheduleFunctionType.TIMER}_${_data.id}`;
   return {
-    id: objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
+    id: timerId || objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
     type: EScheduleFunctionType.TIMER,
     data: _data
   };

package/lib/index.d.ts

@@ -19,7 +19,7 @@ export { useWakeUpDp } from './hooks/useWakeUpDp';
 export { useRandomDp } from './hooks/useRandomDp';
 export { useCycleDp } from './hooks/useCycleDp';
 export { useWakeUpSupport } from './hooks/useWakeUpSupport';
-export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData } from './hooks/useBaseLightDp';
+export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData, } from './hooks/useBaseLightDp';
 export { useTimerReportDp, useTimerReportDpPull } from './hooks/useTimerReportDp';
 /** Conflict 冲突判断 */
 export { transScheduleListToConflictList } from './conflict/transform';

package/lib/utils/objectToId.js

@@ -24,7 +24,9 @@ export const objectToId = function (obj) {
   // 简单哈希算法
   let hash = 5381;
   for (let i = 0; i < str.length; i++) {
+    // eslint-disable-next-line no-bitwise
     hash = (hash << 5) + hash + str.charCodeAt(i);
+    // eslint-disable-next-line operator-assignment, no-bitwise
     hash = hash & hash; // 转换为32位整数
   }
 

package/package.json

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