nayota-show-sdk 1.3.82 → 1.3.84

package/package.json

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

package/utils/iot-module-specs.js

@@ -74,11 +74,18 @@ function normalizeAreaCenterCoordinate(item = {}) {
 
 function mapAreaToIotQuery(query = {}) {
   const next = removeUndefinedFields({
-    ...omitKeys(query, ['_id', 'depart', 'visible', 'areaClass', 'sort']),
+    ...omitKeys(query, ['_id', 'depart', 'visible', 'areaClass', 'sort', 'select', 'fields']),
     ids: Array.isArray(query.ids) ? query.ids.join(',') : (query.ids || query._id || undefined),
     hierarchyId: query.hierarchyId || query.depart,
     isVisible: query.isVisible != null ? query.isVisible : query.visible,
     areaClassId: query.areaClassId || query.areaClass,
+    fields: mapLegacyFieldsParam(query.fields || query.select, {
+      _id: 'id',
+      depart: 'hierarchyId',
+      visible: 'isVisible',
+      areaSize: 'area',
+      areaClass: 'areaClassId'
+    }),
     ...parseLegacySort(query.sort, {
       areaSize: 'area',
       visible: 'isVisible',
@@ -102,6 +109,45 @@ function resolveOptionalLegacyReference(data, primaryKey, legacyKey) {
   return undefined
 }
 
+function mapLegacySelectFields(select, fieldMap = {}) {
+  if (typeof select !== 'string') {
+    return select
+  }
+
+  const fields = select
+    .split(/[\s,]+/)
+    .map(field => field.trim())
+    .filter(Boolean)
+
+  if (!fields.length) {
+    return select
+  }
+
+  return [...new Set(fields.map(field => fieldMap[field] || field))].join(' ')
+}
+
+function mapLegacyFieldsParam(select, fieldMap = {}) {
+  const fields = mapLegacySelectFields(select, fieldMap)
+  return typeof fields === 'string' ? fields.replace(/\s+/g, ',') : fields
+}
+
+function resolveAreaClassIdForWrite(data = {}, options = {}) {
+  const hasPrimary = hasOwn(data, 'areaClassId')
+  const hasLegacy = hasOwn(data, 'areaClass')
+
+  if (!hasPrimary && !hasLegacy) {
+    return undefined
+  }
+
+  const value = hasPrimary ? data.areaClassId : data.areaClass
+
+  if (options.partial === true && hasOwn(data, 'statisticsJson') && (value == null || value === '')) {
+    return undefined
+  }
+
+  return resolveLegacyReference(value)
+}
+
 function mapAreaToIotBody(data = {}, options = {}) {
   const isPartial = options.partial === true
   const metadata = mergeMetadata(data.metadata, {
@@ -126,7 +172,7 @@ function mapAreaToIotBody(data = {}, options = {}) {
     hierarchyId: data.hierarchyId || data.depart,
     isVisible: data.isVisible != null ? data.isVisible : data.visible,
     area: data.area != null ? data.area : data.areaSize,
-    areaClassId: resolveOptionalLegacyReference(data, 'areaClassId', 'areaClass'),
+    areaClassId: resolveAreaClassIdForWrite(data, options),
     targetHierarchyId: resolveOptionalLegacyReference(data, 'targetHierarchyId', 'targetDepartId'),
     centerPoint: normalizeAreaCenterPoint(data),
     floorPlan: normalizeAreaFloorPlan(data),
@@ -160,8 +206,11 @@ function mapIotAreaToLegacy(item = {}) {
 
 function mapAreaClassToIotQuery(query = {}) {
   return removeUndefinedFields({
-    ...omitKeys(query, ['_id', 'sort']),
+    ...omitKeys(query, ['_id', 'sort', 'select', 'fields']),
     ids: Array.isArray(query.ids) ? query.ids.join(',') : (query.ids || query._id || undefined),
+    fields: mapLegacyFieldsParam(query.fields || query.select, {
+      _id: 'id'
+    }),
     ...parseLegacySort(query.sort)
   })
 }
@@ -674,9 +723,13 @@ function getDigitalTwinTypeUiId(data = {}) {
 
 function mapDeviceClassToIotQuery(query = {}) {
   return removeUndefinedFields({
-    ...omitKeys(query, ['_id', 'code', 'sort']),
+    ...omitKeys(query, ['_id', 'code', 'sort', 'select', 'fields']),
     id: query.id || query._id,
     typeCode: query.typeCode || query.code,
+    fields: mapLegacyFieldsParam(query.fields || query.select, {
+      _id: 'id',
+      code: 'typeCode'
+    }),
     ...parseLegacySort(query.sort, {
       code: 'typeCode'
     })

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

@@ -202,6 +202,7 @@ describe('iotModuleSpecs departs hierarchy compatibility', () => {
 
 describe('iotModuleSpecs area space compatibility', () => {
   const area = iotModuleSpecs.area.operations
+  const areaClass = iotModuleSpecs.areaClass.operations
 
   test('maps legacy centerCoordinate to space centerPoint when creating areas', () => {
     const request = area.create.toRequest({
@@ -253,6 +254,17 @@ describe('iotModuleSpecs area space compatibility', () => {
     expect(request.data.spaceType).toBeUndefined()
   })
 
+  test('does not clear areaClassId when vuetify emits an empty type during statistics sync', () => {
+    const request = area.updateOne.toRequest({
+      _id: '4f168184-9ef0-4068-b494-2ee861db0c08',
+      areaClass: null,
+      statisticsJson: []
+    })
+
+    expect(request.data.areaClassId).toBeUndefined()
+    expect(request.data.statisticsJson).toEqual([])
+  })
+
   test('keeps explicit areaClass clear on area updates', () => {
     const request = area.updateOne.toRequest({
       _id: '4f168184-9ef0-4068-b494-2ee861db0c08',
@@ -261,6 +273,34 @@ describe('iotModuleSpecs area space compatibility', () => {
 
     expect(request.data.areaClassId).toBeNull()
   })
+
+  test('maps legacy areaClass select _id to v2 id and returns legacy _id', () => {
+    const request = areaClass.list.toRequest({
+      select: '_id name'
+    })
+
+    expect(request.params.fields).toBe('id,name')
+    expect(request.params.select).toBeUndefined()
+
+    const response = areaClass.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'space-class-1',
+            name: '会议室'
+          }
+        ]
+      }
+    })
+
+    expect(response.data.rows[0]).toMatchObject({
+      _id: 'space-class-1',
+      id: 'space-class-1',
+      name: '会议室'
+    })
+  })
 })
 
 describe('iotModuleSpecs devices write compatibility', () => {