nayota-show-sdk 1.3.71 → 1.3.73

package/api/devices.js

@@ -369,6 +369,10 @@ export function easyList(data) {
 }
  */
 export function getPropHistoryData(data) {
+  if (shouldUseIot('getPropHistoryData')) {
+    return executeIotModuleAction(MODULE_NAME, 'getPropHistoryData', data)
+  }
+
   return requestShow({
     url: '/devices/getPropHistoryData',
     method: 'post',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nayota-show-sdk",
-  "version": "1.3.71",
+  "version": "1.3.73",
   "description": "nayota-show-server rest-api",
   "type": "module",
   "main": "index.js",

package/utils/iot-module-specs.js

@@ -360,6 +360,28 @@ function normalizeLegacyPropLine(source = {}, prop = {}, row = {}) {
   return null
 }
 
+function normalizeLegacyNumber(value) {
+  if (value === undefined || value === null || value === '') {
+    return null
+  }
+
+  const raw = normalizeLegacyCurrentValue(value)
+  const num = Number(raw)
+  return Number.isFinite(num) ? num : null
+}
+
+function getLegacyStatusCounts(props = []) {
+  const statusProps = props.filter(prop => prop && prop.isStatus)
+  return {
+    total: statusProps.length,
+    open: statusProps.filter(prop =>
+      normalizeLegacyNumber(prop.rawValue) === 1 ||
+      normalizeLegacyNumber(prop.value) === 1 ||
+      normalizeLegacyNumber(prop.prop?.value) === 1
+    ).length
+  }
+}
+
 function normalizeLegacyEasyListProp(source = {}, row = {}) {
   const prop = withLegacyId(source.prop || {})
   const propId = source.propId || source.devicePropertyId || prop._id || source._id || source.id
@@ -426,10 +448,18 @@ function normalizeLegacyEasyListRow(item = {}) {
   const props = Array.isArray(row.props)
     ? row.props.map(prop => normalizeLegacyEasyListProp(prop, row))
     : []
+  const statusCounts = getLegacyStatusCounts(props)
 
   return removeUndefinedFields({
     ...row,
     props,
+    status: row.status
+      ? {
+          ...row.status,
+          total: row.status.total ?? statusCounts.total,
+          open: row.status.open ?? statusCounts.open
+        }
+      : undefined,
     lineTime: row.lineTime || props.find(prop => prop.isImport && prop.valueAt)?.valueAt || row.updatedAt || null
   })
 }
@@ -738,6 +768,29 @@ export const iotModuleSpecs = {
             }
           }
         }
+      },
+      getPropHistoryData: {
+        toRequest(data = {}) {
+          return {
+            url: '/devices/getPropHistoryData',
+            method: 'post',
+            data
+          }
+        },
+        fromResponse(response) {
+          const payload = response && response.data && response.status ? response.data : response
+          const data = payload?.data !== undefined ? payload.data : payload
+          const rows = Array.isArray(data?.rows)
+            ? data.rows
+            : Array.isArray(payload?.rows)
+              ? payload.rows
+              : []
+          return removeUndefinedFields({
+            code: Number(data?.code ?? payload?.code ?? 0),
+            rows,
+            message: data?.message ?? payload?.message
+          })
+        }
       }
     }
   },

package/utils/iot-module-specs.test.js

@@ -140,6 +140,11 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
             id: 'twin-1',
             name: '会议室空调',
             line: false,
+            status: {
+              value: 1,
+              label: '制热',
+              valueStr: '制热'
+            },
             props: [
               {
                 id: 'twin-prop-mode',
@@ -182,6 +187,13 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
     const electricProp = row.props[1]
 
     expect(row._id).toBe('twin-1')
+    expect(row.status).toEqual({
+      value: 1,
+      label: '制热',
+      valueStr: '制热',
+      total: 1,
+      open: 1
+    })
     expect(modeProp).toEqual(
       expect.objectContaining({
         _id: 'twin-prop-mode',
@@ -225,3 +237,47 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
     )
   })
 })
+
+describe('iotModuleSpecs devices getPropHistoryData legacy compatibility', () => {
+  const getPropHistoryData = iotModuleSpecs.devices.operations.getPropHistoryData
+
+  test('posts to the legacy-compatible iot endpoint and keeps rows at top level', () => {
+    const request = getPropHistoryData.toRequest({
+      date: '2026-04-25T15:59:59.000Z',
+      deviceClasses: ['type-1']
+    })
+
+    expect(request).toEqual({
+      url: '/devices/getPropHistoryData',
+      method: 'post',
+      data: {
+        date: '2026-04-25T15:59:59.000Z',
+        deviceClasses: ['type-1']
+      }
+    })
+
+    const response = getPropHistoryData.fromResponse({
+      code: 0,
+      rows: [
+        {
+          _id: 'status-prop',
+          value: 1,
+          valueStr: '制热',
+          recordTime: '2026-04-25T08:00:00.000Z'
+        }
+      ]
+    })
+
+    expect(response).toEqual({
+      code: 0,
+      rows: [
+        {
+          _id: 'status-prop',
+          value: 1,
+          valueStr: '制热',
+          recordTime: '2026-04-25T08:00:00.000Z'
+        }
+      ]
+    })
+  })
+})