fix: fix bind data source can not select slave device

ww
1 parent e2460747
Showing 1 changed file with 26 additions and 6 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @337e695
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @337e695
@@ -5666,7 +5666,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     [enumDataSourceConst.ORG_ID]: field[enumDataSourceConst.ORG_ID],
                     [enumDataSourceConst.DEVICE_ID]: field[enumDataSourceConst.DEVICE_ID],
                     // ...(field[enumDataSourceConst.SLAVE_DEVICE_ID] && { [enumDataSourceConst.SLAVE_DEVICE_ID]: field[enumDataSourceConst.SLAVE_DEVICE_ID] }),
-                    [enumDataSourceConst.SLAVE_DEVICE_ID]: field[enumDataSourceConst.SLAVE_DEVICE_ID] ? [enumDataSourceConst.SLAVE_DEVICE_ID] : '',
+                    [enumDataSourceConst.SLAVE_DEVICE_ID]: field[enumDataSourceConst.SLAVE_DEVICE_ID] ? field[enumDataSourceConst.SLAVE_DEVICE_ID] : '',
                     [enumDataSourceConst.ATTR]: field[enumDataSourceConst.ATTR],
                     [enumDataSourceConst.ADDITIONAL]: field[additionalKey.DATA_TYPE] ? {
                         [additionalKey.AGG]: field[additionalKey.AGG],
@@ -6343,7 +6343,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         /**
          * @description 下拉选项挂载
          */
-        function createSelectOptionMountEvent(params) {
+        function createSelectOptionMountEvent() {
             $(`#${enumActionEl.DEVICE_DATA_BODY_EL}`).on('click', '.layui-form-select', event => {
                 const width = event.currentTarget.offsetWidth || 200
                 const height = event.currentTarget.offsetHeight || 38
@@ -6383,7 +6383,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function echoOrgTree(id) {
             orgId = id
             const node = UseLayUi.findTreeObjectByField(treeList, id)
-
             UseLayUi.nextTick(() => $(`#${enumActionEl.ORG_EL} input[name="${enumConst.ORG_ID}"]`).val(orgId).parent().find('span').html(node?.name))
         }
@@ -6527,8 +6526,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     })
                     createOrgTreeSelect()
                     const info = getLayerBindInfo('event', type)
-                    const { content: { data = [] } = {}, orgId } = info
-                    echoOrgTree(orgId)
+                    const { content: { data = [] } = {}, orgId: recordOrgId } = info
+                    orgId = recordOrgId
                     await getAllGatewayDeviceAndConnectionDevice()
                     if (!info || !data.length) {
                         addRecord()
@@ -6537,7 +6536,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     }
                     generatorEventListen()
                     form.render()
-                    echoOrgTree(orgId)
+                    echoOrgTree(recordOrgId)
                 },
             })
         }
@@ -6886,6 +6885,24 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 })
         }
+
+        /**
+         * @description 下拉选项挂载
+         */
+         function createSelectOptionMountEvent() {
+            $(`#${enumActionEl.TABLE_BODY_EL}`).on('click', '.layui-form-select', event => {
+                const width = event.currentTarget.offsetWidth || 200
+                const height = event.currentTarget.offsetHeight || 38
+                const offset = $(event.currentTarget).offset()
+                $(event.currentTarget).find('dl').css({
+                    position: 'fixed',
+                    'min-width': width + 'px', 
+                    top: offset.top + height + 'px',
+                    left: offset.left + 'px'
+                })
+            })
+        }
+
         /**
          * @description 创建事件监听
          */
@@ -6893,6 +6910,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             createInputListener()
             createAddRowListenEvent()
             createDeleteRowListenEvent()
+            createSelectOptionMountEvent()
         }
         /**
@@ -7136,6 +7154,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     data: treeList,
                     onlyIconControl: true,
                     click(node) {
+                        currentCheckedOrgNode = node.data.id
                         form.val(componentFilter, {
                             [enumDataSourceConst.DEVICE_ID]: null,
                             [enumDataSourceConst.SLAVE_DEVICE_ID]: null,
@@ -7248,6 +7267,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         }
         function getValue() {
+            console.log(form.val(componentFilter))
             return form.val(componentFilter)
         }