fix: DEFECT-1118 修复控制组件绑定tcp设备时无法下发字符串命令

ww
1 parent 299f7534
Showing 1 changed file with 426 additions and 69 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @66892ba
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @66892ba
@@ -6895,11 +6895,26 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             TCP_COMMAND: 'tcpCommand',
             /**
+             * @description json命令
+             */
+            JSON_COMMAND: 'jsonCommand',
+
+            /**
              * @description 命令下发方式
              */
             COMMAND_TYPE: 'commandType',
             /**
+             * @description 服务命令
+             */
+            SERVICE_COMMAND: 'serviceCommand',
+
+            /**
+             * @description 服务原始配置
+             */
+            SERVICE_ORIGINAL_CONFIGURATION: 'serviceOriginalConfiguration',
+
+            /**
              * @description 服务
              */
             SERVICE: 'service',
@@ -7028,22 +7043,28 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          */
         function echoFormData(data) {
             const { content = {} } = data
+            console.log(data)
             const val = {
                 [enumConst.ACTION]: content.type,
                 [enumGetValue[content.type]]: content.value,
+
+                // 参数设置
+                [enumConst.JSON_COMMAND]: content[enumConst.JSON_COMMAND],
                 [enumConst.WAY]: content[enumConst.WAY],
                 [enumConst.COMMAND_TYPE]: content[enumConst.COMMAND_TYPE],
-                [enumConst.SERVICE]: content[enumConst.SERVICE],
-                [enumConst.COMMAND]: content[enumConst.COMMAND],
                 [enumConst.TCP_COMMAND]: content[enumConst.TCP_COMMAND],
+                [enumConst.TRANSPORTTYPE]: content[enumConst.TRANSPORTTYPE],
+                [enumConst.SERVICE]: content[enumConst.SERVICE],
+                [enumConst.SERVICE_COMMAND]: content[enumConst.SERVICE_COMMAND],
+                [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: content[enumConst.SERVICE_ORIGINAL_CONFIGURATION],
             }
-            const isTCPTransportType = !!content[enumConst.TCP_COMMAND]
+            const isTCPTransportType = content[enumConst.TRANSPORTTYPE] === 'TCP'
             const isCustom = content[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
             if (content[enumConst.SERVICE] && !isCustom) {
-                form.val(enumActionEl.INPUT_DATA_FORM_FILTER, content[enumConst.COMMAND])
+                form.val(enumActionEl.INPUT_DATA_FORM_FILTER, content[enumConst.SERVICE_COMMAND])
             }
             controlFormDisplay(content.type, isTCPTransportType, isCustom)
@@ -7111,31 +7132,29 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             if (isParamsSetting) {
                 const isTCPTransportType = formVal[enumConst.TRANSPORTTYPE] === 'TCP'
                 const isCustom = formVal[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
-                const inputData = form.val(enumActionEl.INPUT_DATA_FORM_FILTER)
+                let inputData = form.val(enumActionEl.INPUT_DATA_FORM_FILTER)
                 const validateParamsSetting = () => {
                     if (isCustom) {
-                        if (isTCPTransportType && !formVal[enumConst.TCP_COMMAND]) {
-                            UseLayUi.topErrorMsg('请输入自定义下发指令')
-                            return false
-                        }
-                        if (!isTCPTransportType && !isJson(formVal[enumConst.COMMAND])) {
-                            UseLayUi.topErrorMsg('命令配置存在错误')
-                            return false
+                        if (isTCPTransportType) {
+                            if (!formVal[enumConst.TCP_COMMAND]) {
+                                UseLayUi.topErrorMsg('请输入自定义下发指令')
+                                return false
+                            }
+                            if (!isJson(formVal[enumConst.JSON_COMMAND])) {
+                                UseLayUi.topErrorMsg('命令配置存在错误')
+                                return false
+                            }
                         }
                     } else {
                         if (!formVal[enumConst.SERVICE]) {
                             UseLayUi.topErrorMsg('请选择服务')
                             return false
+                        } else {
+                            const { flag, value } = UseLayUi.validateThingsModelInputDataForm(Utils.stringToJSON(formVal[enumConst.SERVICE_ORIGINAL_CONFIGURATION], []), inputData)
+                            inputData = value
+                            return flag
                         }
-                        // if ((!inputData && !isTCPTransportType) || (!formVal[enumConst.TCP_COMMAND] && isTCPTransportType)) {
-                        //     UseLayUi.topErrorMsg('请选择服务')
-                        //     return false
-                        // }
-                        // if (!inputData || !formVal[enumConst.TCP_COMMAND]) {
-                        //     UseLayUi.topErrorMsg('请选择服务')
-                        //     return false
-                        // }
                     }
                     return true
                 }
@@ -7143,8 +7162,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 if (!validateParamsSetting()) return
                 // 选择服务的方式下发命令
-                if (!isCustom && formVal[enumConst.SERVICE]) {
-                    formVal[enumConst.COMMAND] = inputData
+                if (!isCustom && formVal[enumConst.SERVICE] && !isTCPTransportType) {
+                    formVal[enumConst.SERVICE_COMMAND] = inputData
                 }
             }
@@ -7159,11 +7178,14 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     type: formVal[enumConst.ACTION],
                     value: formVal[enumGetValue[formVal[enumConst.ACTION]]],
                     ...(isParamsSetting ? {
-                        [enumConst.COMMAND]: formVal[enumConst.COMMAND],
+                        [enumConst.JSON_COMMAND]: formVal[enumConst.JSON_COMMAND],
                         [enumConst.WAY]: formVal[enumConst.WAY],
                         [enumConst.COMMAND_TYPE]: formVal[enumConst.COMMAND_TYPE],
-                        [enumConst.SERVICE]: formVal[enumConst.SERVICE],
                         [enumConst.TCP_COMMAND]: formVal[enumConst.TCP_COMMAND],
+                        [enumConst.TRANSPORTTYPE]: formVal[enumConst.TRANSPORTTYPE],
+                        [enumConst.SERVICE]: formVal[enumConst.SERVICE],
+                        [enumConst.SERVICE_COMMAND]: formVal[enumConst.SERVICE_COMMAND],
+                        [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: formVal[enumConst.SERVICE_ORIGINAL_CONFIGURATION],
                     } : {}),
                 },
             }
@@ -7195,8 +7217,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          */
         function generateCommandTypeOptions() {
             const options = [
-                { name: '自定义', id: COMMAND_TYPE_ENUM.CUSTOM },
-                { name: '服务', id: COMMAND_TYPE_ENUM.SERVICE },
+                { name: '自定义命令', id: COMMAND_TYPE_ENUM.CUSTOM },
+                { name: '服务调用', id: COMMAND_TYPE_ENUM.SERVICE },
             ]
             return UseLayUi.generateOptionTemplate({ dataSource: options, addPlaceholderOption: false })
         }
@@ -7216,6 +7238,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             let transportType
             let deviceProfileServices = []
+            /**
+             * @description 动作下拉 change event
+             */
             form.on(`select(${enumActionEl.ACTION_SELECT_FILTER})`, (data) => {
                 const { value } = data
                 if (value === enumActionType.PARAMS_SETTING && !dataSource.deviceProfileId) {
@@ -7228,6 +7253,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 controlFormDisplay(value, transportType, isCustom)
             })
+            /**
+             * @description 命令类型下拉 change event
+             */
             form.on(`select(${enumActionEl.COMMAND_TYPE_EL})`, (data) => {
                 const { value } = data
                 const flag = value === COMMAND_TYPE_ENUM.CUSTOM
@@ -7237,8 +7265,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: isTCPTransportType && flag ? 'block' : 'none' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCPTransportType && flag ? 'flex' : 'none' })
                 form.val(enumActionEl.FORM_FILTER, { [enumConst.TCP_COMMAND]: '', [enumConst.SERVICE]: '', [enumConst.COMMAND]: '' })
+                $(`#${enumActionEl.INPUT_DATA_FORM}`).html('')
             })
+            /**
+             * @description 服务下拉选择change event
+             */
             form.on(`select(${enumActionEl.SERVICE_EL})`, (data) => {
                 const { value } = data
                 const needRender = deviceProfileServices.find(item => item.identifier === value) || {}
@@ -7248,10 +7280,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     const template = UseLayUi.genThingsModelInputDataForm(needRender.functionJson?.inputData || [], 120)
                     $(`#${enumActionEl.INPUT_DATA_FORM}`).html(template)
                 } else {
-                    console.log(needRender)
-                    form.val(enumActionEl.FORM_FILTER, { [enumConst.TCP_COMMAND]: needRender.functionJson?.inputData?.[0]?.serviceCommand || '' })
-                    console.log(form.val(enumActionEl.FORM_FILTER))
+                    form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_COMMAND]: needRender.functionJson?.inputData?.[0]?.serviceCommand || '' })
                 }
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []) })
             })
             try {
@@ -7272,7 +7303,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     if (transportType !== 'TCP') {
                         const template = UseLayUi.genThingsModelInputDataForm(needRender.functionJson?.inputData || [], 120)
                         $(`#${enumActionEl.INPUT_DATA_FORM}`).html(template)
-                        form.val(enumActionEl.INPUT_DATA_FORM_FILTER, content[enumConst.COMMAND])
+                        form.val(enumActionEl.INPUT_DATA_FORM_FILTER, content[enumConst.SERVICE_COMMAND])
                     }
                 }
@@ -7318,13 +7349,13 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 fontSize: 14, // 编辑器内字体大小
                 tabSize: 2, // 制表符设置为 4 个空格大小
             });
-            if (record.content && record.content[enumConst.COMMAND]) defaultValue = jsonParse(record.content[enumConst.COMMAND])
+            if (record.content && record.content[enumConst.JSON_COMMAND]) defaultValue = jsonParse(record.content[enumConst.JSON_COMMAND])
             const stringValue = JSON.stringify(defaultValue, null, 2)
             editor.insert(stringValue)
-            $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.COMMAND}"]`).val(stringValue)
+            $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(stringValue)
             editor.session.setMode("ace/mode/json");
             editor.getSession().on('change', (event, editor) => {
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.COMMAND}"]`).val(editor.getValue())
+                $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(editor.getValue())
             })
         }
@@ -7387,10 +7418,16 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                             </select>
                         </div>
                     </div>
-                    <div id="${enumActionEl.EDITOR_CONTAINER}" style="display: none; margin-bottom: 15px;">
+                    <div style="display: none;">
+                        <input type="text" name="${enumConst.SERVICE_COMMAND}" placeholder="服务命令" />
+                    </div>
+                    <div style="display: none;">
+                        <input type="text" name="${enumConst.SERVICE_ORIGINAL_CONFIGURATION}" placeholder="服务命令" />
+                    </div>
+                    <div id="${enumActionEl.EDITOR_CONTAINER}" class="layui-form-item" style="display: none; margin-bottom: 15px;">
                         <div style="width: 120px; text-align: right; padding: 9px 15px;flex: 0 0 120px;">命令 ${createHelpMessage('用户预览模式下，点击参数设置后。输入的变量值将作为"attrPlaceholder"的值,并以JSON格式下发给服务器。', 'command')}</div>
                         <div id="${enumActionEl.EDITOR}" style="width: 100%; height: 100%;border: 2px solid #eee;"></div>
-                        <textarea name="${enumConst.COMMAND}" style="display: none;" />
+                        <textarea name="${enumConst.JSON_COMMAND}" class="layui-textarea" style="display: none;" />
                     </div>
                     <div id="${enumActionEl.TCP_COMMAND_INPUT}" style="display: none;">
                         <label class="layui-form-label" style="width: 120px;">命令 ${createHelpMessage('用户预览模式下，点击参数设置后。输入的变量值将作为"attrPlaceholder"的值,并以JSON格式下发给服务器。', 'command')}</label>
@@ -12486,6 +12523,19 @@ class UseLayUi {
     static dynamicAttr = (attr, value) => value ? `${attr}="${value}"` : ''
+
+    static createHelpMessage(message, className) {
+        return `
+        <div class="thingskit-help-message ${className}">
+            <img src="${Proxy_Prefix}/images/thingskit/question.svg"/>
+            <div class="thingskit-help-container">
+            <div class="thingskit-help-content">${message}</div>
+            <div class="thingskit-help-arrow"></div>
+            </div>
+        </div>
+        `
+    }
+
     /**
      * @description 生成输入框控件
      * @param {{label: string, value: string, labelWidth: number, numberInput: boolean}} params 
@@ -12536,6 +12586,67 @@ class UseLayUi {
             </form>`
         return template
     }
+    /**
+    * 
+    * @param {{
+    * accessMode: 'r' | 'w', 
+    * functionName: string,
+    * id: string, 
+    * identifier: string, 
+    * dataType: {
+    *      type: 'TEXT' | 'INT' | 'DOUBLE' | 'STRUCT', 
+    *      specs: { unit: {value: string, label: string}, 
+    *      unitName: string, 
+    *      valueRange: {min: number, max: number}, 
+    *      length: number
+    * }}}[]} inputData 
+    * @param {Record<string, any>} value = 80 
+    */
+    static validateThingsModelInputDataForm(inputData, value, needFormat = false) {
+        let flag = true
+        const error = (message) => {
+            UseLayUi.topErrorMsg(message)
+            return false
+        }
+
+        const validate = (item) => {
+            const { dataType, identifier, functionName } = item
+            const { type } = dataType || {}
+            const identifierValue = value[identifier]
+            switch (type) {
+                case UseLayUi.thingsModelType.INT:
+                    if (isNaN(identifierValue)) return error(`${functionName}字段需要一个数字`)
+                    needFormat && (value[identifier] = parseInt(identifierValue))
+                    break
+                case UseLayUi.thingsModelType.DOUBLE:
+                    if (isNaN(identifierValue)) return error(`${functionName}字段需要一个数字`)
+                    needFormat && (value[identifier] = Number(identifierValue))
+                    break
+                case UseLayUi.thingsModelType.STRUCT:
+                    if (!Utils.stringIsJSON(identifierValue)) return error(`${functionName}字段需要一个JSON对象`)
+                    needFormat && (value[identifier] = Utils.stringToJSON(identifierValue))
+                    break
+                default:
+                    break
+            }
+            return true
+        }
+
+        for (const item of inputData) {
+            if (!validate(item)) return { flag: false, value }
+
+        }
+
+        return { flag, value }
+
+    }
+
+    static thingsModelType = {
+        TEXT: 'TEXT',
+        INT: 'INT',
+        DOUBLE: 'DOUBLE',
+        STRUCT: 'STRUCT',
+    }
     /**
      * @description format data source to tree structure
@@ -12985,6 +13096,33 @@ class UseLayUi {
     }
 }
+class Utils {
+    /**
+     * @description 字符串是否能转换为对象
+     * @param {string} value 
+     */
+    static stringIsJSON(value) {
+        try {
+            JSON.parse(value)
+            return true
+        } catch (error) {
+            return false
+        }
+    }
+
+    /**
+     * @description 字符串转对象
+     * @param {string} value 
+     * @returns 
+     */
+    static stringToJSON(value, defaultValue = {}) {
+        try {
+            return JSON.parse(value)
+        } catch (error) {
+            return defaultValue
+        }
+    }
+}
 /**
  * @description use to function capture await throw error
@@ -14841,25 +14979,153 @@ class HandleDataInteraction {
         const enumActionEl = {
             CONTAINER: 'container',
             EDITOR: 'editor',
-            ISSUED_WAY_FILTER: 'wayFilter'
+            ISSUED_WAY_FILTER: 'wayFilter',
+
+            /**
+             * @description 表单filter
+             */
+            FORM_FILTER: 'formFilter',
+
+            /**
+             * @description 编辑器容器
+             */
+            EDITOR_CONTAINER: 'editorContainer',
+
+            /**
+             * @description 编辑器
+             */
+            EDITOR: 'editor',
+
+            /**
+             * @description 自定义TCP下发命令
+             */
+            CUSTOM_TCP_COMMAND: 'customTCPCommand',
+
+            /**
+             * @description 自定义JSON下发命令
+             */
+            CUSTOM_JSON_COMMAND: 'customJSONCommand',
+            /**
+             * @description 服务TCP命令
+             */
+            SERVICE_TCP_COMMAND: 'serviceTCPCommand',
+
+            /**
+             * @description 服务JSON命令
+             */
+            SERVICE_JSON_COMMAND: 'serviceTCPCommand',
         }
-        function createContent() {
-            const { command, tcpCommand,  } = content
+        function createCustomTCPParams() {
             return `
-            <div>
-                <div class="layui-form" lay-filter="${enumActionEl.ISSUED_WAY_FILTER}">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">下发值</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="${enumConst.VALUE}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input">
+                <div>
+                    <div class="layui-form" lay-filter="${enumActionEl.CUSTOM_TCP_COMMAND}">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 120px;">自定义下发值</label>
+                            <div class="layui-input-block" style="margin-left: 150px;">
+                                <input type="text" name="${enumActionEl.CUSTOM_TCP_COMMAND}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input">
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>`
+            `
         }
+        function createEditor() {
+            if (content.transportType === 'TCP' || content.commandType === '1') return
+            console.log('enter')
+            const jsonCommand = content.jsonCommand || ''
+            let defaultValue = { [enumConst.ATTR_PLACEHOLDER]: 0 }
+            const editor = ace.edit(enumActionEl.EDITOR, {
+                maxLines: 18, // 最大行数，超过会自动出现滚动条
+                minLines: 10, // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
+                fontSize: 14, // 编辑器内字体大小
+                tabSize: 2, // 制表符设置为 4 个空格大小
+            });
+            if (jsonCommand) defaultValue = jsonParse(jsonCommand)
+            const stringValue = JSON.stringify(defaultValue, null, 2)
+            editor.insert(stringValue)
+            $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumActionEl.CUSTOM_JSON_COMMAND}"]`).val(stringValue)
+            editor.session.setMode("ace/mode/json");
+            editor.getSession().on('change', (event, editor) => {
+                $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumActionEl.CUSTOM_JSON_COMMAND}"]`).val(editor.getValue())
+            })
+            console.log(editor)
+        }
+
+        function createCustomJSONParams() {
+            return `
+            <div id="${enumActionEl.EDITOR_CONTAINER}" class="layui-form-item" style="disable: flex;">
+                <div style="width: 120px; text-align: right; padding: 9px 15px;flex: 0 0 120px;text-align: left;">命令</div>
+                <div id="${enumActionEl.EDITOR}" style="width: 100%; height: 100%;border: 2px solid #eee;"></div>
+                <textarea name="${enumActionEl.CUSTOM_JSON_COMMAND}" class="layui-textarea" style="display: none;" />
+            </div>
+            `
+        }
+
+        function createServiceTCPParams() {
+            return `
+                <div>
+                    <div class="layui-form" lay-filter="${enumActionEl.SERVICE_TCP_COMMAND}">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 120px;">自定义下发值</label>
+                            <div class="layui-input-block" style="margin-left: 150px;">
+                                <input type="text" name="${enumActionEl.SERVICE_TCP_COMMAND}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `
+        }
+
+        function createServiceInputDataParams() {
+            const inputData = jsonParse(content.serviceOriginalConfiguration)
+            return UseLayUi.genThingsModelInputDataForm(inputData)
+        }
+
+        function createContent() {
+            const { commandType, tcpCommand, jsonCommand, serviceCommand, serviceOriginalConfiguration, transportType } = content
+            const isCustom = commandType === '0'
+            const isTCP = transportType === 'TCP'
+
+            let template
+            if (isCustom) {
+                if (isTCP) {
+                    template = createCustomTCPParams()
+                } else {
+                    template = createCustomJSONParams()
+                }
+            } else {
+                if (isTCP) {
+                    template = createServiceTCPParams()
+                } else {
+                    template = createServiceInputDataParams()
+                }
+            }
+            return `<form class="layui-form" lay-filter="${enumActionEl.FORM_FILTER}">${template}</form>`
+        }
+
+        function echoPresetValue() {
+            form.val(enumActionEl.FORM_FILTER, {
+                // 如果是自定义并且不是TCP设备 回显inputData
+                ...(content.commandType === '1' && content.transportType !== 'TCP' ? content.serviceCommand : {}),
+                [enumActionEl.CUSTOM_JSON_COMMAND]: content.jsonCommand,
+                [enumActionEl.CUSTOM_TCP_COMMAND]: content.tcpCommand,
+                [enumActionEl.SERVICE_TCP_COMMAND]: content.serviceCommand,
+            })
+        }
+
+        function isJson(value) {
+            try {
+                JSON.parse(value)
+                return true
+            } catch (error) {
+                return false
+            }
+        }
+
+
         function jsonParse(value) {
             try {
                 return JSON.parse(value)
@@ -14868,12 +15134,49 @@ class HandleDataInteraction {
             }
         }
+        const validateSwitchCommand = () => {
+            const { commandType, transportType } = content
+            const isCustom = commandType === '0'
+            const isTCP = transportType === 'TCP'
+            let { attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+
+            let flag = false
+            let value
+
+            if (isCustom) {
+                if (isTCP) {
+                    value = content.tcpCommand
+                    if (value) flag = true
+                } else {
+                    const replaceValue = currentNode.getAttribute(SWITCH_SEND_VALUE)
+                    value = jsonParse(content.jsonCommand)
+                    value = replaceAttrPlaceholder(value, attr, replaceValue)
+                    if (value) flag = true
+                }
+            } else {
+                if (isTCP) {
+                    value = content.serviceCommand
+                    if (value) flag = true
+                } else {
+                    value = content.serviceCommand
+                    const { flag: validateFlag, value: validateValue } = UseLayUi.validateThingsModelInputDataForm(Utils.stringToJSON(content.serviceOriginalConfiguration), value, true)
+                    if (validateFlag) {
+                        value = validateValue
+                        flag = true
+                    }
+                }
+            }
+            return { flag, value }
+        }
+
         function handleSwitchComponent() {
             const state = currentNode.getAttribute(SWITCH_STATE)
-            const value = currentNode.getAttribute(SWITCH_SEND_VALUE)
             if (state === SWITCH_STATE_NONE) {
                 return
             }
+            const { flag, value } = validateSwitchCommand()
+            if (!flag) return
+
             layer.confirm('是否确认下发命令？', async function (index) {
                 defaultHandler(value, () => layer.close(index))
             });
@@ -14886,7 +15189,7 @@ class HandleDataInteraction {
             for (const key of Object.keys(oldValue)) {
                 if (key === enumConst.ATTR_PLACEHOLDER) {
-                    newValue[replaceAttr] = replaceValue
+                    newValue[replaceAttr] = replaceValue ? replaceValue : oldValue[key]
                     continue
                 }
                 if (typeof oldValue[key] === 'object') {
@@ -14899,38 +15202,79 @@ class HandleDataInteraction {
             return newValue
         }
+        const validate = (data) => {
+            const { commandType, transportType } = content
+            let { attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            let flag = false
+            let value
+
+            const isCustom = commandType === '0'
+            const isTCP = transportType === 'TCP'
+
+            let template
+            if (isCustom) {
+                if (isTCP) {
+                    value = data[enumActionEl.CUSTOM_TCP_COMMAND]
+                    const validate = new Validate([
+                        { value, required: true, message: '下发值是必填项' },
+                    ])
+                    if (validate.begin()) flag = true
+                } else {
+                    value = data[enumActionEl.CUSTOM_JSON_COMMAND]
+                    const validate = new Validate([
+                        { value, required: true, message: '下发值是必填项' },
+                        { value, message: 'json格式校验不正确', validator: isJson },
+                    ])
+                    if (validate.begin()) {
+                        const replaceValue = currentNode.getAttribute(SWITCH_SEND_VALUE)
+                        flag = true
+                        value = jsonParse(value)
+                        value = replaceAttrPlaceholder(value, attr)
+                    }
+                    template = createCustomJSONParams()
+                }
+            } else {
+                if (isTCP) {
+                    value = data[enumActionEl.SERVICE_TCP_COMMAND]
+                    const validate = new Validate([
+                        { value, required: true, message: '下发值是必填项' },
+                    ])
+                    if (validate.begin()) flag = true
+                } else {
+                    value = data
+                    const { flag: validateFlag, value: validateValue } = UseLayUi.validateThingsModelInputDataForm(Utils.stringToJSON(content.serviceOriginalConfiguration), value, true)
+                    if (validateFlag) {
+                        flag = true
+                        value = validateValue
+                    }
+                }
+            }
+
+            return { flag, value }
+        }
+
         const submitThrottle = this.throttle(submit)
         async function submit(callback) {
-            const { value } = form.val(enumActionEl.ISSUED_WAY_FILTER)
-            defaultHandler(value, callback)
+            const value = form.val(enumActionEl.FORM_FILTER)
+            const { flag, value: result } = validate(value)
+            if (!flag) return
+            defaultHandler(result, callback)
         }
         async function defaultHandler(value, callback) {
             let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            console.log({ attr, value })
             /**
              * @type {command: string , commandType: string, service: string, wary: string, tcpCommand: string}
              */
             let { command, way, tcpCommand } = content
-            const validate = new Validate([
-                // { value, required: true, message: '下发值是必填项' },
-                // { value: deviceId, required: true, message: '未绑定设备' },
-                // { value: way, required: true, message: '未绑定指令下发方式(单向/双向)' },
-                // { value: command, required: true, message: '未设置下发命令' },
-                // { value: attr, required: true, message: '未绑定设备属性' },
-            ])
-
-            if (!validate.begin()) return
-            if (typeof command === 'string') command = jsonParse(command)
-            let data = replaceAttrPlaceholder(command, attr, value)
-            if (tcpCommand) {
-                data = tcpCommand
-            }
+
             const instructionData = {
                 method: "methodThingskit",
                 additionalInfo: { cmdType: 'API' },
                 persistent: true,
-                params: data,
+                params: value,
             }
             const [err, res = []] = way === 'twoway' ? await to(ConfigurationNodeApi.deviceIsOnLine(deviceId)) : [null, [{ value: true }]]
@@ -14941,13 +15285,15 @@ class HandleDataInteraction {
                     UseLayUi.topSuccessMsg('操作成功')
                     callback && typeof callback === 'function' && callback()
                 }
+                if (err) {
+                    UseLayUi.topErrorMsg(err?.response?.data || err)
+                }
             } else {
                 UseLayUi.topErrorMsg('设备不在线!')
             }
         }
         function createLayer() {
-
             layer.open({
                 title: '参数设置',
                 content: createContent(),
@@ -14961,7 +15307,9 @@ class HandleDataInteraction {
                 but2(index, layero) {
                 },
-                async success(layero, index) {
+                success(layero, index) {
+                    createEditor()
+                    echoPresetValue()
                     $('.layui-layer-setwin a').removeAttr('href')
                     form.render()
                 },
@@ -14977,10 +15325,9 @@ class HandleDataInteraction {
             }
             try {
-                // handle[componentType]()
-                handleSwitchComponent()
+                handle[componentType]()
             } catch (error) {
-
+                throw error
             }
         }
         startProcess()
@@ -15742,6 +16089,10 @@ class Validate {
         this.list = ruleList
     }
+    static isFunction(value) {
+        return Object.prototype.toString.call(value) === '[object Function]'
+    }
+
     /**
      * @description 设置规则
      * @param {{value: any, message: string, required?: boolean, validator?: any}} rule 
@@ -15757,6 +16108,12 @@ class Validate {
                 UseLayUi.topErrorMsg(message)
                 return false
             }
+
+            if (validator && Validate.isFunction(validator) && !validator(value)) {
+                UseLayUi.topErrorMsg(message)
+                return false
+            }
+
         }
         return true
     }