@ray-js/lamp-schedule-core 1.0.4-beta-6 → 1.0.4-beta-7

package/lib/hooks/useBaseLightDp.d.ts

@@ -22,9 +22,15 @@ export declare const useFetchDpDataByMesh: (dpCodes: string[]) => {
 /**
  * 主动拉取 dp 数据, 不限制协议
  * @param dpCodes dpCode 数组
+ * @param options 拉取配置
+ * @param options.initFetch 是否初始化拉取
+ * @param options.offsetTime 延迟时间 ms
  * @returns refresh 刷新 dp 数据
  */
-export declare const useFetchDpData: (dpCodes: string[]) => {
+export declare const useFetchDpData: (dpCodes: string[], options?: {
+    initFetch: boolean;
+    offsetTime: number;
+}) => {
     refresh: () => void;
 };
 export {};

package/lib/hooks/useBaseLightDp.js

@@ -2,7 +2,7 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.map.js";
 /* eslint-disable no-console */
-import { useState, useEffect, useCallback, useRef } from 'react';
+import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
 import { isEqual } from 'lodash-es';
 import { queryDps } from '@ray-js/ray';
 import { scheduleLogger } from '../utils/ScheduleLogger';
@@ -212,17 +212,44 @@ export const useFetchDpDataByMesh = dpCodes => {
 /**
  * 主动拉取 dp 数据, 不限制协议
  * @param dpCodes dpCode 数组
+ * @param options 拉取配置
+ * @param options.initFetch 是否初始化拉取
+ * @param options.offsetTime 延迟时间 ms
  * @returns refresh 刷新 dp 数据
  */
-export const useFetchDpData = dpCodes => {
-  const getDpDataFn = () => {
-    scheduleLogger.debug('getDpDataFn get:', dpCodes);
-    fetchDpData(dpCodes);
+export const useFetchDpData = function (dpCodes) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    initFetch: true,
+    offsetTime: 0
   };
+  // 使用 useMemo 稳定 dpCodes 的字符串表示，避免因数组引用变化导致重复执行
+  // 注意：这里依赖 dpCodes 数组本身，但由于调用方已使用 useMemo 稳定引用，所以是安全的
+  const dpCodesKey = useMemo(() => dpCodes.join(','), [dpCodes]);
+  const getDpDataFn = useCallback(() => {
+    scheduleLogger.debug('useFetchDpData getDpDataFn get1:', dpCodes);
+    fetchDpData(dpCodes);
+  }, [dpCodes]);
+
+  // 使用 useRef 跟踪上一次的 dpCodesKey，避免重复执行
+  const prevDpCodesKeyRef = useRef(null);
   useEffect(() => {
-    scheduleLogger.debug('useFetchDpData get:', dpCodes);
-    getDpDataFn();
-  }, [dpCodes.join(',')]);
+    if (!options.initFetch) {
+      return () => null;
+    }
+    // 只有当 dpCodesKey 真正变化时才执行
+    if (prevDpCodesKeyRef.current === dpCodesKey) {
+      scheduleLogger.debug('useFetchDpData useEffect: dpCodesKey unchanged', dpCodesKey);
+      return () => null;
+    }
+    prevDpCodesKeyRef.current = dpCodesKey;
+    const timer = setTimeout(() => {
+      scheduleLogger.debug('useFetchDpData useEffect get:', dpCodes);
+      getDpDataFn();
+    }, options.offsetTime || 0);
+    return () => {
+      clearTimeout(timer);
+    };
+  }, [dpCodesKey, getDpDataFn, dpCodes, options.initFetch, options.offsetTime]);
   return {
     refresh: getDpDataFn
   };

package/lib/hooks/useCountdownDp.d.ts

@@ -6,8 +6,14 @@ export declare function useCountdownDp(dpCode?: "countdown"): {
 /**
  * 主动拉取倒计时dp数据
  * @param countdownCode 倒计时dpCode
+ * @param options 拉取配置
+ * @param options.initFetch 是否初始化拉取
+ * @param options.offsetTime 延迟时间 ms
  * @returns refresh 函数 刷新dp数据
  */
-export declare const useCountdownDpPull: (countdownCode?: "countdown") => {
+export declare const useCountdownDpPull: (countdownCode?: "countdown", options?: {
+    initFetch: boolean;
+    offsetTime: number;
+}) => {
     refresh: () => void;
 };

package/lib/hooks/useCountdownDp.js

@@ -1,3 +1,4 @@
+import { useMemo } from 'react';
 import { useBaseLightDp, useFetchDpData } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 export function useCountdownDp() {
@@ -15,13 +16,19 @@ export function useCountdownDp() {
 /**
  * 主动拉取倒计时dp数据
  * @param countdownCode 倒计时dpCode
+ * @param options 拉取配置
+ * @param options.initFetch 是否初始化拉取
+ * @param options.offsetTime 延迟时间 ms
  * @returns refresh 函数 刷新dp数据
  */
 export const useCountdownDpPull = function () {
   let countdownCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.COUNTDOWN;
+  let options = arguments.length > 1 ? arguments[1] : undefined;
+  // 使用 useMemo 稳定数组引用，避免每次渲染都创建新数组导致重复执行
+  const dpCodes = useMemo(() => [countdownCode], [countdownCode]);
   const {
     refresh
-  } = useFetchDpData([countdownCode]);
+  } = useFetchDpData(dpCodes, options);
   return {
     refresh
   };

package/lib/hooks/useTimerReportDp.d.ts

@@ -8,8 +8,14 @@ export declare function useTimerReportDp(dpCode?: "timer_report"): {
  *  主动拉取定时 timer_report dp 数据
  *  由于本地定时数据不会主动上报，所以需要主动拉取用来同步定时数据
  *  @param timerReport 定时上报 dpCode
+ *  @param options 拉取配置
+ *  @param options.initFetch 是否初始化拉取
+ *  @param options.offsetTime 延迟时间 ms
  *  @returns refresh 刷新 dp 数据
  */
-export declare const useTimerReportDpPull: (timerReport?: "timer_report") => {
+export declare const useTimerReportDpPull: (timerReport?: "timer_report", options?: {
+    initFetch: boolean;
+    offsetTime: number;
+}) => {
     refresh: () => void;
 };

package/lib/hooks/useTimerReportDp.js

@@ -34,14 +34,20 @@ export function useTimerReportDp() {
  *  主动拉取定时 timer_report dp 数据
  *  由于本地定时数据不会主动上报，所以需要主动拉取用来同步定时数据
  *  @param timerReport 定时上报 dpCode
+ *  @param options 拉取配置
+ *  @param options.initFetch 是否初始化拉取
+ *  @param options.offsetTime 延迟时间 ms
  *  @returns refresh 刷新 dp 数据
  */
 export const useTimerReportDpPull = function () {
   let timerReport = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.TIMER_REPORT;
+  let options = arguments.length > 1 ? arguments[1] : undefined;
   ScheduleLogger.debug('useTimerReportDpPull 执行');
+  // 使用 useMemo 稳定数组引用，避免每次渲染都创建新数组导致重复执行
+  const dpCodes = useMemo(() => [timerReport], [timerReport]);
   const {
     refresh
-  } = useFetchDpData([timerReport]);
+  } = useFetchDpData(dpCodes, options);
   return {
     refresh
   };

package/package.json

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