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

fix: 修复根据选择设备的设备类型下发json或modbus指令

See merge request yunteng/thingskit-scada!120

@@ -7078,7 +7078,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
         /**
          * @description 所有设备选项
-         * @type {{id: string, name: string, deviceType: string}[]}
+         * @type {{id: string, name: string, deviceType: string, tbDeviceId: string, codeType: string}[]}
          */
         let allDeviceOptions = []
 
@@ -7128,6 +7128,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
              * @description 组织id
              */
             ORG_ID: 'orgId',
+
+            /**
+             * @description 命令下发类型
+             */
+            CODE_TYPE: 'codeType'
         }
 
         const sendInstructionWay = {
@@ -7135,6 +7140,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             TWO_WAY: 'twoway',
         }
 
+        const codeTypeEnum = {
+            JSON: 'json',
+            STRING: 'string'
+        }
+
         /**
          * @description 创建回显数据 查询出所有网关设备和直连设备
          */
@@ -7167,11 +7177,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 fontSize: 14, // 编辑器内字体大小
                 tabSize: 2, // 制表符设置为 4 个空格大小
             });
-            editor.session.setMode("ace/mode/json");
+            editor.session.setMode(datum?.codeType === codeTypeEnum.STRING ? 'ace/mode/text' : "ace/mode/json");
             editor.getSession().on('change', (event, editor) => {
                 $(`#${el}`).parent().find(`textarea[name="${enumConst.VALUE}"]`).val(editor.getValue())
             })
-            editor.setValue(datum[enumConst.VALUE] ? datum[enumConst.VALUE] : "{}")
+            editor.setValue(datum[enumConst.VALUE] ? datum[enumConst.VALUE] : datum?.codeType === codeTypeEnum.STRING ? "" : "{\n\n}")
         }
 
         /**
@@ -7210,6 +7220,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
               <tr class="layui-form" lay-filter="${getRowFilter(addRowNumber)}">
                 <td>
                   <select name="${enumConst.DEVICE}" lay-filter="${enumConst.DEVICE}" lay-verType="tips" lay-verify="required"></select>
+                  <input name="${enumConst.CODE_TYPE}" style="display: none;" />
                 </td>
                 <td>
                     <form action="" style="display: flex">
@@ -7289,6 +7300,25 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             })
         }
 
+        function createSelectChangeEvent() {
+            form.on(`select(${enumConst.DEVICE})`, event => {
+                const { value, elem } = event
+                const codeTypeInput = $(elem).parent().find(`input[name="${enumConst.CODE_TYPE}"]`).val(codeTypeEnum.JSON)
+                if (value) {
+                    const selected = allDeviceOptions.find(item => item.tbDeviceId == value)
+                    const codeType = selected?.codeType && selected.codeType == 'MODBUS_RTU' ? codeTypeEnum.STRING : codeTypeEnum.JSON
+                    codeTypeInput.val(codeType)
+                    if (codeType === codeTypeEnum.STRING) {
+                        const editorEl = $(elem).parent().parent().find(`.${enumActionEl.JSON}>div>div`)
+                        const id = editorEl.attr('id')
+                        const editor = ace.edit(id)
+                        editor?.session?.setMode?.('ace/mode/text')
+                        editor?.setValue('')
+                    }
+                }
+            })
+        }
+
         /**
          * @description 生成事件监听
          */
@@ -7296,6 +7326,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             createDeleteRowListenEvent()
             createAddRowListenEvent()
             createSelectOptionMountEvent()
+            createSelectChangeEvent()
         }
 
         /**
@@ -7339,6 +7370,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             return false
         }
 
+        function isString(string) {
+            if (typeof string === 'string' && string.trim() && /^\w+$/g.test(string)) return true
+            return false
+        }
+
         /**
          * @description 表单验证
          * @param tableData
@@ -7346,12 +7382,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          */
         function validate(tableData) {
             let validateFlag = true
-
             const formModel = form.val(enumActionEl.FORM_FILTER)
             if (!formModel[enumConst.ORG_ID]) return false
             for (let i = 0; i < tableData.length; i++) {
-                const { value } = tableData[i]
-                if (!isJson(value)) {
+                const { value, codeType } = tableData[i]
+                if (codeType === codeTypeEnum.JSON ? !isJson(value) : !isString(value)) {
                     validateFlag = false
                     layer.tips('下发值不正确', $(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr`).eq(i).find(`td.${enumActionEl.JSON}`), { tips: 1 })
                     break
@@ -7372,7 +7407,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const formModal = {
                 ...recordData,
                 configurationId,
-                // orgId,
                 contentId: currentPageId.id,
                 id: graphId,
                 content: {
@@ -15968,14 +16002,23 @@ class HandleDataInteraction {
                 UseLayUi.errorMsg('设备不在线!')
             }
         }
+
+        function parse(value, codeType = 'json') {
+            try {
+                return codeType === 'json' ? JSON.parse(value) : value
+            } catch (error) {
+                return value
+            }
+        }
+
         for (const item of list) {
-            const { deviceId, slaveDeviceId, value, way } = item
+            const { deviceId, codeType, value, way } = item
             if (!value || !deviceId) continue
             const data = {
                 method: "methodThingskit",
                 additionalInfo: { cmdType: 'API' },
                 persistent: true,
-                params: JSON.parse(value),
+                params: parse(value, codeType),
             }
             if (deviceId) {
                 queue.push(() => {