Merge branch 'main' into ft_local_dev

@@ -228,8 +228,10 @@ export const commandIssuanceApi = (type, tbDeviceId, data) => {
   );
 };
 
-export const getDeviceAttrs = (profileId: string, id: string) => {
+export const getDeviceAttrs = (params: { deviceProfileId: string; dataType?: string }) => {
+  const { deviceProfileId, dataType } = params;
   return defHttp.get<DeviceModelOfMatterAttrs[]>({
-    url: `${DeviceManagerApi.DEVICE_ATTR}/${profileId}/${id}`,
+    url: `${DeviceManagerApi.DEVICE_ATTR}/${deviceProfileId}`,
+    params: { dataType },
   });
 };

@@ -17,7 +17,7 @@
   import { DeviceModelOfMatterAttrs } from '/@/api/device/model/deviceModel';
   import { computed } from '@vue/reactivity';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
-  import { isObject } from '/@/utils/is';
+  import { isArray, isObject } from '/@/utils/is';
 
   interface ReceiveMessage {
     data: {
@@ -137,9 +137,9 @@
 
   const { send, close, data } = useWebSocket(socketInfo.origin, {
     async onConnected() {
-      const { id, deviceProfileId } = props.deviceDetail;
-      const value = await getDeviceAttrs(deviceProfileId, id);
-      socketInfo.attrKeys = value;
+      const { deviceProfileId } = props.deviceDetail;
+      const value = await getDeviceAttrs({ deviceProfileId });
+      socketInfo.attrKeys = isArray(value) ? value : [];
       send(JSON.stringify(unref(getSendValue)));
     },
     async onMessage() {