nayota-show-sdk 1.3.78 → 1.3.80

package/package.json

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

package/utils/iot-module-specs.js

@@ -497,6 +497,28 @@ function normalizeLegacyStatus(status, props = []) {
 function normalizeLegacyEasyListProp(source = {}, row = {}) {
   const prop = withLegacyId(source.prop || {})
   const propId = source.propId || source.devicePropertyId || prop._id || source._id || source.id
+  const thresholdRules = prop.thresholdRules !== undefined
+    ? prop.thresholdRules
+    : source.thresholdRules !== undefined
+      ? source.thresholdRules
+      : getNestedValue(prop, 'typeProperty.thresholdRules') !== undefined
+        ? getNestedValue(prop, 'typeProperty.thresholdRules')
+        : getNestedValue(source, 'typeProperty.thresholdRules') !== undefined
+          ? getNestedValue(source, 'typeProperty.thresholdRules')
+          : getNestedValue(prop, 'metadata.thresholdRules') !== undefined
+            ? getNestedValue(prop, 'metadata.thresholdRules')
+            : getNestedValue(source, 'metadata.thresholdRules')
+  const isThresholdEnabled = prop.isThresholdEnabled !== undefined
+    ? prop.isThresholdEnabled
+    : source.isThresholdEnabled !== undefined
+      ? source.isThresholdEnabled
+      : getNestedValue(prop, 'typeProperty.isThresholdEnabled') !== undefined
+        ? getNestedValue(prop, 'typeProperty.isThresholdEnabled')
+        : getNestedValue(source, 'typeProperty.isThresholdEnabled') !== undefined
+          ? getNestedValue(source, 'typeProperty.isThresholdEnabled')
+          : getNestedValue(prop, 'metadata.isThresholdEnabled') !== undefined
+            ? getNestedValue(prop, 'metadata.isThresholdEnabled')
+            : getNestedValue(source, 'metadata.isThresholdEnabled')
   const value = prop.value !== undefined
     ? prop.value
     : source.value !== undefined
@@ -528,7 +550,8 @@ function normalizeLegacyEasyListProp(source = {}, row = {}) {
     company: prop.company || source.company,
     valueMap: prop.valueMap !== undefined ? prop.valueMap : source.valueMap,
     interval,
-    thresholdRules: prop.thresholdRules !== undefined ? prop.thresholdRules : source.thresholdRules,
+    thresholdRules,
+    isThresholdEnabled,
     valueAt,
     sort: prop.sort !== undefined ? prop.sort : source.sort,
     parent: prop.parent !== undefined ? prop.parent : source.parent,
@@ -550,6 +573,8 @@ function normalizeLegacyEasyListProp(source = {}, row = {}) {
     value,
     valueStr,
     interval,
+    thresholdRules,
+    isThresholdEnabled,
     valueAt,
     prop: legacyProp
   })
@@ -710,7 +735,7 @@ function mapIotDeviceClassToLegacy(item = {}) {
     departTag: bms.departTag || entity.departTag,
     isSimulation: bms.isSimulation != null ? bms.isSimulation : entity.isSimulation,
     isIpDevice: bms.isIpDevice != null ? bms.isIpDevice : entity.isIpDevice,
-    icon: bms.deviceClassIcon || display.icon || entity.icon
+    icon: entity.icon || display.icon || bms.deviceClassIcon
   })
 }
 

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

@@ -92,6 +92,33 @@ describe('iotModuleSpecs deviceClass UI compatibility', () => {
       }
     ])
   })
+
+  test('prefers current digital twin type icon over legacy metadata icon', () => {
+    const response = deviceClass.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'type-1',
+            typeCode: 'PANEL',
+            name: '开关面板',
+            icon: 'tabler-current-panel',
+            metadata: {
+              display: {
+                icon: 'tabler-display-legacy'
+              },
+              bms: {
+                deviceClassIcon: 'tabler-bms-legacy'
+              }
+            }
+          }
+        ]
+      }
+    })
+
+    expect(response.data.rows[0].icon).toBe('tabler-current-panel')
+  })
 })
 
 describe('iotModuleSpecs departs hierarchy compatibility', () => {
@@ -257,6 +284,8 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
                 line: true,
                 value: 0.043,
                 company: 'A',
+                isThresholdEnabled: true,
+                thresholdRules: [{ level: 'warn', min: 0, max: 10 }],
                 valueAt: '2026-04-25T06:31:00.000Z',
                 prop: {
                   id: 'device-prop-electric'
@@ -322,6 +351,8 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
         isImport: true,
         line: true,
         value: 0.043,
+        isThresholdEnabled: true,
+        thresholdRules: [{ level: 'warn', min: 0, max: 10 }],
         valueAt: '2026-04-25T06:31:00.000Z'
       })
     )
@@ -330,6 +361,8 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
         line: true,
         value: 0.043,
         company: 'A',
+        isThresholdEnabled: true,
+        thresholdRules: [{ level: 'warn', min: 0, max: 10 }],
         valueAt: '2026-04-25T06:31:00.000Z'
       })
     )