nayota-show-sdk 1.3.78 → 1.3.79

package/api/upload.js

@@ -1,5 +1,4 @@
-import urlcfg from '../config/urlcfg'
-import { requestShow, requestForm, requestIot } from '../utils'
+import { requestShow, requestForm } from '../utils'
 /**
  * @file 文件管理api
  * @module 文件管理接口
@@ -26,67 +25,6 @@ import { requestShow, requestForm, requestIot } from '../utils'
  * }
 */
 
-function getUploadPayload(response) {
-  if (response && typeof response === 'object') {
-    if (response.code === 0 && response.data) {
-      return response.data
-    }
-
-    if (typeof response.status === 'number' && response.data) {
-      return response.data
-    }
-  }
-
-  return response
-}
-
-function getUrlOrigin(baseUrl) {
-  if (!baseUrl) {
-    return typeof window !== 'undefined' && window.location ? window.location.origin : ''
-  }
-
-  if (/^https?:\/\//i.test(baseUrl)) {
-    try {
-      return new URL(baseUrl).origin
-    } catch (error) {
-      return ''
-    }
-  }
-
-  return typeof window !== 'undefined' && window.location ? window.location.origin : ''
-}
-
-function toAbsoluteConfigFileUrl(fileUrl) {
-  if (!fileUrl || /^https?:\/\//i.test(fileUrl)) {
-    return fileUrl
-  }
-
-  const origin = getUrlOrigin(urlcfg.getIotUrl())
-  if (!origin) {
-    return fileUrl
-  }
-
-  return `${origin}${fileUrl.startsWith('/') ? '' : '/'}${fileUrl}`
-}
-
-function normalizeV2UploadResponse(response) {
-  const payload = getUploadPayload(response) || {}
-  const id = payload.id || payload._id || payload.filename
-  const path = toAbsoluteConfigFileUrl(payload.path || payload.url)
-
-  return {
-    code: 0,
-    success: true,
-    data: {
-      ...payload,
-      _id: id,
-      id,
-      name: payload.name || payload.originalname || payload.filename,
-      path
-    }
-  }
-}
-
 /**
  * 获取文件列表
  * @param {Object} query - 请求对象
@@ -112,21 +50,6 @@ export function list(query) {
  * @returns {string} data - 新增成功的数据，见表结构upload定义
  */
 export function upload(data) {
-  if (urlcfg.isV2()) {
-    if (!urlcfg.getIotUrl()) {
-      throw new Error('[nayota-show-sdk][v2] iotServer is required for upload module.')
-    }
-
-    return requestIot({
-      url: '/files/upload',
-      method: 'post',
-      data,
-      headers: {
-        'Content-Type': 'multipart/form-data'
-      }
-    }).then(normalizeV2UploadResponse)
-  }
-
   return requestForm({
     url: '/uploads',
     method: 'post',
@@ -194,3 +117,4 @@ export default {
   deleteMany,
   getOne
 }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nayota-show-sdk",
-  "version": "1.3.78",
+  "version": "1.3.79",
   "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
   })

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

@@ -257,6 +257,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 +324,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 +334,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'
       })
     )