fix: get device attribute by device profile id

@@ -3,7 +3,7 @@ class ConfigurationNodeApi {
     /**
     /**
      * @description 获取用户权限
      * @description 获取用户权限
      */
      */
-    static getUserPermissions(){
+    static getUserPermissions() {
         return defHttp.get('/yt/role/me/permissions')
         return defHttp.get('/yt/role/me/permissions')
     }
     }
 
 
@@ -171,4 +171,14 @@ class ConfigurationNodeApi {
     static getStreamingVideoPlayUrl(id) {
     static getStreamingVideoPlayUrl(id) {
         return defHttp.get(`/yt/video/url/${id}`)
         return defHttp.get(`/yt/video/url/${id}`)
     }
     }
+
+    /**
+     * @description 获取设备物模型属性
+     * @param {*} deviceProfileId 
+     * @param {*} dataType 
+     * @returns 
+     */
+    static getDeviceAttribute(deviceProfileId, dataType) {
+        return defHttp.get(`/yt/device/attributes/${deviceProfileId}`, { params: { dataType } })
+    }
 }
 }

@@ -7777,13 +7777,13 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
         /**
         /**
          * @description
          * @description
-         * @type {{id: string, deviceType: string, name: string}[]}
+         * @type {{id: string, deviceType: string, name: string, deviceProfileId: string}[]}
          */
          */
         let deviceList = []
         let deviceList = []
 
 
         /**
         /**
         * @description
         * @description
-        * @type {{id: string, deviceType: string, name: string}[]}
+        * @type {{id: string, deviceType: string, name: string, deviceProfileId: string}[]}
         */
         */
         let slaveDeviceList = []
         let slaveDeviceList = []
 
 
@@ -7850,10 +7850,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         /**
         /**
          * @description 根据设备ID获取属性
          * @description 根据设备ID获取属性
          */
          */
-        async function getAttrByDeviceId(tbDeviceId) {
-            if (tbDeviceId) {
-                const [err, res] = await to(ConfigurationNodeApi.getDeviceAttr(tbDeviceId))
-                $(`#${componentId} `).find(`select[name="${enumDataSourceConst.ATTR}"]`).html(UseLayUi.generateOptionTemplate({ dataSource: res }))
+        async function getAttrByDeviceId(deviceProfileId) {
+            if (deviceProfileId) {
+                const [err, res] = await to(ConfigurationNodeApi.getDeviceAttribute(deviceProfileId))
+                $(`#${componentId} `).find(`select[name="${enumDataSourceConst.ATTR}"]`).html(UseLayUi.generateOptionTemplate({ dataSource: Array.isArray(res) ? res : [], labelField: 'name', valueField: 'identifier' }))
                 form.render('select', componentFilter)
                 form.render('select', componentFilter)
             }
             }
         }
         }
@@ -7882,9 +7882,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     data: treeList,
                     data: treeList,
                     onlyIconControl: true,
                     onlyIconControl: true,
                     click(node) {
                     click(node) {
-                        currentCheckedOrgNode = node.data.id
+                        currentCheckedOrgNode = node?.data?.id
                         form.val(componentFilter, {
                         form.val(componentFilter, {
-                            [enumDataSourceConst.ORG_NAME]: node.data.title,
+                            [enumDataSourceConst.ORG_NAME]: node?.data?.title,
                             [enumDataSourceConst.DEVICE_ID]: null,
                             [enumDataSourceConst.DEVICE_ID]: null,
                             [enumDataSourceConst.SLAVE_DEVICE_ID]: null,
                             [enumDataSourceConst.SLAVE_DEVICE_ID]: null,
                             [enumDataSourceConst.ATTR]: null,
                             [enumDataSourceConst.ATTR]: null,
@@ -7913,7 +7913,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     const selected = deviceList.find(item => item.id === value)
                     const selected = deviceList.find(item => item.id === value)
                     if (!selected) return
                     if (!selected) return
                     form.val(componentFilter, {
                     form.val(componentFilter, {
-                        [enumDataSourceConst.DEVICE_NAME]: selected.name,
+                        [enumDataSourceConst.DEVICE_NAME]: selected?.name,
                         [enumDataSourceConst.SLAVE_DEVICE_ID]: null,
                         [enumDataSourceConst.SLAVE_DEVICE_ID]: null,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.SLAVE_DEVICE_NAME]: null,
                         [enumDataSourceConst.SLAVE_DEVICE_NAME]: null,
@@ -7928,7 +7928,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         $(`#${componentId}`).find(`select[name="${enumDataSourceConst.SLAVE_DEVICE_ID}"]`)
                         $(`#${componentId}`).find(`select[name="${enumDataSourceConst.SLAVE_DEVICE_ID}"]`)
                             .attr('lay-verify', '').attr('lay-verType', 'tips')
                             .attr('lay-verify', '').attr('lay-verType', 'tips')
                             .parentsUntil(`#${componentId}`).hide()
                             .parentsUntil(`#${componentId}`).hide()
-                        getAttrByDeviceId(selected.id)
+                        console.log(selected)
+                        getAttrByDeviceId(selected.deviceProfileId)
                     }
                     }
                 },
                 },
             })
             })
@@ -7948,11 +7949,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     const { value } = data
                     const { value } = data
                     const selected = slaveDeviceList.find(item => item.id === value)
                     const selected = slaveDeviceList.find(item => item.id === value)
                     form.val(componentFilter, {
                     form.val(componentFilter, {
-                        [enumDataSourceConst.SLAVE_DEVICE_NAME]: selected.name,
+                        [enumDataSourceConst.SLAVE_DEVICE_NAME]: selected?.name,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
                     })
                     })
-                    getAttrByDeviceId(value)
+                    getAttrByDeviceId(selected.deviceProfileId)
                 },
                 },
             })
             })
             $(component).append(slaveDeviceSelect)
             $(component).append(slaveDeviceSelect)
@@ -13448,7 +13449,7 @@ class DispatchCenter {
 
 
                 message && messageList.tsSubCmds.push(message)
                 message && messageList.tsSubCmds.push(message)
             })
             })
-            
+
             return messageList
             return messageList
         }
         }