@ray-js/lamp-schedule-core 1.0.1-beta-5 → 1.0.1-beta-6

package/lib/hooks/useBaseLightDp.js

@@ -31,7 +31,7 @@ export function useBaseLightDp(dpCode, defaultDpValue) {
     if (+dpCode !== +dpCode) {
       dpId = getDpIdByDpCode(dpCode);
     }
-    if (dpData.deviceId === deviceId && dpId in dpData.dps) {
+    if (dpId in dpData.dps) {
       scheduleLogger.debug(`${dpCode} ==> emitter will changed:`, dpData);
       const _dpValue = dpData.dps[dpId];
       if (isEqual(preDpValue.current, _dpValue)) {
@@ -105,13 +105,18 @@ export const getDpDataByMesh = function () {
   if (dpCodes.length >= 5) {
     scheduleLogger.warn('getDpDataByMesh: 单次查询 dp 数过多，dp 可能响应不及时，请分次查询');
   }
-  scheduleLogger.debug('getDpDataByMesh 开始查询DP参数 dpCodes:', dpCodes);
   const deviceData = devIdOrGroupIdCache.get();
   const deviceId = deviceData === null || deviceData === void 0 ? void 0 : deviceData.devId;
+  const groupId = deviceData === null || deviceData === void 0 ? void 0 : deviceData.groupId;
+  if (groupId) {
+    scheduleLogger.error('getDpDataByMesh: 群组中不支持查询dp');
+    return;
+  }
   if (!deviceId) {
     scheduleLogger.error('getDpDataByMesh: 未能获取到deviceId');
     return;
   }
+  scheduleLogger.debug('getDpDataByMesh 开始查询DP参数 dpCodes:', dpCodes);
   const dpIds = dpCodes.map(item => getDpIdByDpCode(item)).filter(i => !!i).map(String); // 简化字符串转换
 
   if (dpIds.length === 0) {

package/lib/hooks/useCommonSupport.js

@@ -92,7 +92,7 @@ export const useScheduleInit = props => {
             }
             ScheduleLogger.info(`useScheduleInit ${DP_CHANGE_EVENT_KEY}`, res);
             emitter.emit(DP_CHANGE_EVENT_KEY, {
-              deviceId: res.devId || res.deviceId,
+              deviceId: res.devId || res.deviceId || res.groupId,
               dps: res === null || res === void 0 ? void 0 : res.dps
             });
           });

package/lib/utils/ScheduleSupport.js

@@ -103,7 +103,13 @@ export class Support {
           setScheduleCache(DEV_INFO_KEY, res);
           // 群组中为空
           groupId && (devIdOrGroupIdCache === null || devIdOrGroupIdCache === void 0 ? void 0 : devIdOrGroupIdCache.set('', groupId));
-          resolve(true);
+          const dpMap = {};
+          Object.keys(res.dps).forEach(dpId => {
+            const dpCode = getDpCodeByDpId(dpId);
+            dpCode && setDpState(dpCode, res.dps[dpId]);
+          });
+          Object.keys(dpMap).length && initDpState(dpMap);
+          resolve(res);
         },
         fail: err => {
           this.groupDevInfo = {};

package/package.json

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