Merge branch 'fix/DEFECT-1435' into 'main_dev'

Fix/defect 1435

See merge request yunteng/thingskit-scada!94

@@ -7750,7 +7750,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                             }
                             }
                         }
                         }
                     } else if (commandType === COMMAND_TYPE_ENUM.MODBUS) {
                     } else if (commandType === COMMAND_TYPE_ENUM.MODBUS) {
-                        const dataSource = currentNodeData?.dataSources?.[0]
+                        const dataSource = currentNodeData?.dataSources?.[0] || getDataSourceBindValue()
                         if (dataSource) {
                         if (dataSource) {
                             const additional = dataSource?.additional || {}
                             const additional = dataSource?.additional || {}
                             if (dataSource?.deviceType !== 'SENDOR' && !additional?.deviceCode) {
                             if (dataSource?.deviceType !== 'SENDOR' && !additional?.deviceCode) {
@@ -8004,7 +8004,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const stringValue = JSON.stringify(defaultValue, null, 2)
             const stringValue = JSON.stringify(defaultValue, null, 2)
             editor.insert(stringValue)
             editor.insert(stringValue)
             $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(stringValue)
             $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(stringValue)
-            console.log($(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val())
             editor.session.setMode("ace/mode/json");
             editor.session.setMode("ace/mode/json");
             editor.getSession().on('change', (event, editor) => {
             editor.getSession().on('change', (event, editor) => {
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(editor.getValue())
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(editor.getValue())
@@ -14702,6 +14701,7 @@ class DispatchCenter {
             const { devicesInfo, autoPlay, interval, startTime, endTime } = sourceOption || {}
             const { devicesInfo, autoPlay, interval, startTime, endTime } = sourceOption || {}
             const node = allCell.find(item => item.id === nodeId)
             const node = allCell.find(item => item.id === nodeId)
             const deviceIds = UseLayUi.parseStringToJSON(devicesInfo, []).map(item => item.deviceId)
             const deviceIds = UseLayUi.parseStringToJSON(devicesInfo, []).map(item => item.deviceId)
+            if (!node) continue
             const id = node.getAttribute(UUID)
             const id = node.getAttribute(UUID)
             const element = document.getElementById(id)
             const element = document.getElementById(id)
             if (element) {
             if (element) {
@@ -16132,14 +16132,15 @@ class HandleDataInteraction {
 
 
         const validateSwitchCommand = () => {
         const validateSwitchCommand = () => {
             const { commandType, transportType } = content
             const { commandType, transportType } = content
-            const isCustom = commandType === '0'
             const isTCP = transportType === 'TCP'
             const isTCP = transportType === 'TCP'
-            let { attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            let dataSource = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            const { attr } = dataSource
 
 
             let flag = false
             let flag = false
             let value
             let value
 
 
-            if (isCustom) {
+            // 自定义
+            if (commandType == '0') {
                 if (isTCP) {
                 if (isTCP) {
                     value = content.tcpCommand
                     value = content.tcpCommand
                     if (value) flag = true
                     if (value) flag = true
@@ -16149,7 +16150,7 @@ class HandleDataInteraction {
                     value = replaceAttrPlaceholder(value, attr, isNaN(replaceValue) ? 0 : Number(replaceValue))
                     value = replaceAttrPlaceholder(value, attr, isNaN(replaceValue) ? 0 : Number(replaceValue))
                     if (value) flag = true
                     if (value) flag = true
                 }
                 }
-            } else {
+            } else if (commandType == '1') {
                 if (isTCP) {
                 if (isTCP) {
                     value = content.serviceCommand
                     value = content.serviceCommand
                     if (value) flag = true
                     if (value) flag = true
@@ -16162,7 +16163,13 @@ class HandleDataInteraction {
                         flag = true
                         flag = true
                     }
                     }
                 }
                 }
+            } else {
+                const { additional = {} } = dataSource
+                const { deviceCode, registerAddress } = additional || {}
+                if (!deviceCode) UseLayUi.topErrorMsg('未找到设备地址码')
+                if (!registerAddress) UseLayUi.topErrorMsg('未找到寄存器地址')
             }
             }
+
             return { flag, value }
             return { flag, value }
         }
         }
 
 
@@ -16172,6 +16179,7 @@ class HandleDataInteraction {
                 return
                 return
             }
             }
             const { flag, value } = validateSwitchCommand()
             const { flag, value } = validateSwitchCommand()
+
             if (!flag) return
             if (!flag) return
 
 
             layer.confirm('是否确认下发命令？', async function (index) {
             layer.confirm('是否确认下发命令？', async function (index) {
@@ -16215,7 +16223,7 @@ class HandleDataInteraction {
 
 
             if (commandType == enumCommandType.MODBUS) {
             if (commandType == enumCommandType.MODBUS) {
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
-                const { method, deviceCode } = additional || {} 
+                const { method, deviceCode } = additional || {}
 
 
                 const validate = new Validate([
                 const validate = new Validate([
                     { value: deviceCode, required: true, message: '未找到设备地址码' },
                     { value: deviceCode, required: true, message: '未找到设备地址码' },