fix: DEFECT-1118 修复命令下发，tcp设备命令下发为字符串，其他设备从物模型服务中取命令

ww
1 parent 278df047
Showing 2 changed files with 352 additions and 37 deletions
src/main/webapp/js/api/index.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/api/index.js
View file @299f753
+++ b/src/main/webapp/js/api/index.js
View file @299f753
@@ -209,4 +209,22 @@ class ConfigurationNodeApi {
     static getDictionaryValue(dictCode) {
         return defHttp.post('/yt/dict_item/find', {dictCode})
     }
+
+    /**
+     * @description 获取设备配置详情通过id
+     * @param {string} id 
+     * @returns 
+     */
+    static getDeviceProfileDetailById(id) {
+        return defHttp.get('/yt/device_profile/' + id)
+    }
+
+    /**
+     * @description 获取产品服务通过设备配置id
+     * @param {string} id 
+     * @returns 
+     */
+    static getThingsModelServiceByDeviceProfileId(id) {
+        return defHttp.get('/yt/things_model/get_services/' + id)
+    }
 }
--- a/src/main/webapp/js/grapheditor/Format.js
View file @299f753
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @299f753
@@ -6890,6 +6890,26 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             COMMAND: 'command',
             /**
+             * @description TCP命令
+             */
+            TCP_COMMAND: 'tcpCommand',
+
+            /**
+             * @description 命令下发方式
+             */
+            COMMAND_TYPE: 'commandType',
+
+            /**
+             * @description 服务
+             */
+            SERVICE: 'service',
+
+            /**
+             * @description 传输协议
+             */
+            TRANSPORTTYPE: 'transportType',
+
+            /**
              * @description 属性占位符
              */
             ATTR_PLACEHOLDER: 'attrPlaceholder',
@@ -6919,6 +6939,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             FORM_FILTER: 'formModelFilter',
             /**
+             * @description 表单
+             */
+            FORM_EL: 'formModelEl',
+
+            /**
              * @description 动作 lay-filter
              */
             ACTION_SELECT_FILTER: 'actionSelectFilter',
@@ -6948,7 +6973,47 @@ DataFormatPanel.prototype.addDataFont = function (container) {
              */
             EDITOR: 'EDITOR',
-            WAY_SELECT: 'dynamicWaySelectEl'
+            /**
+             * @description 命令类型选择器
+             */
+            COMMAND_TYPE_EL: 'commandTypeEl',
+
+            /**
+             * @description 服务选择器
+             */
+            SERVICE_EL: 'serviceEl',
+
+            /**
+             * @description 命令下发输入框
+             */
+            COMMAND_INPUT: 'commandInput',
+
+            /**
+             * @description TCP 命令下发输入框
+             */
+            TCP_COMMAND_INPUT: 'tcpCommandInput',
+
+            /**
+             * @description 输入参数表单
+             */
+            INPUT_DATA_FORM: 'inputDataForm',
+
+            /**
+             * @description 服务命令
+             */
+            SERVICE_COMMAND: 'serviceCommand',
+
+            WAY_SELECT: 'dynamicWaySelectEl',
+
+            /**
+             * @description 输入参数表单控件
+             */
+            INPUT_DATA_FORM_FILTER: 'inputDataFilter'
+        }
+
+        const COMMAND_TYPE_ENUM = {
+            CUSTOM: '0',
+            SERVICE: '1'
         }
         /**
@@ -6966,9 +7031,23 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const val = {
                 [enumConst.ACTION]: content.type,
                 [enumGetValue[content.type]]: content.value,
-                [enumConst.WAY]: content[enumConst.WAY]
+                [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],
+            }
+
+
+            const isTCPTransportType = !!content[enumConst.TCP_COMMAND]
+            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])
             }
-            controlFormDisplay(content.type)
+
+            controlFormDisplay(content.type, isTCPTransportType, isCustom)
+
             form.val(enumActionEl.FORM_FILTER, val)
         }
@@ -6976,22 +7055,40 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 控制form
          * @param {enumActionType} value 
          */
-        function controlFormDisplay(value) {
+        async function controlFormDisplay(value, isTCP, isCustom) {
             if (value === enumActionType.PAGE) {
                 $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'none' })
                 $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'block' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
                 $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'none' })
+                $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'none' })
+
+                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
+                $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
+                $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: 'none' })
+                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
             } else if (value === enumActionType.LINK) {
                 $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'none' })
                 $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'block' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
                 $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'none' })
+                $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'none' })
+
+                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
+                $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
+                $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: 'none' })
+                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
             } else if (value === enumActionType.PARAMS_SETTING) {
                 $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'none' })
                 $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'none' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'flex' })
+                // $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'flex' })
                 $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'block' })
+                $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'block' })
+
+                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: isCustom ? 'none' : 'block' })
+                $(`#${enumActionEl.SERVICE_EL}`).css({ display: isCustom ? 'none' : 'block' })
+                $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: isTCP && isCustom ? 'block' : 'none' })
+                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCP && isCustom ? 'flex' : 'none' })
             }
         }
@@ -7012,9 +7109,42 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             }
             if (isParamsSetting) {
-                if (!isJson(formVal[enumConst.COMMAND])) {
-                    UseLayUi.topErrorMsg('命令配置存在错误')
-                    return
+                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)
+
+                const validateParamsSetting = () => {
+                    if (isCustom) {
+                        if (isTCPTransportType && !formVal[enumConst.TCP_COMMAND]) {
+                            UseLayUi.topErrorMsg('请输入自定义下发指令')
+                            return false
+                        }
+                        if (!isTCPTransportType && !isJson(formVal[enumConst.COMMAND])) {
+                            UseLayUi.topErrorMsg('命令配置存在错误')
+                            return false
+                        }
+                    } else {
+                        if (!formVal[enumConst.SERVICE]) {
+                            UseLayUi.topErrorMsg('请选择服务')
+                            return false
+                        }
+                        // if ((!inputData && !isTCPTransportType) || (!formVal[enumConst.TCP_COMMAND] && isTCPTransportType)) {
+                        //     UseLayUi.topErrorMsg('请选择服务')
+                        //     return false
+                        // }
+                        // if (!inputData || !formVal[enumConst.TCP_COMMAND]) {
+                        //     UseLayUi.topErrorMsg('请选择服务')
+                        //     return false
+                        // }
+                    }
+                    return true
+                }
+
+                if (!validateParamsSetting()) return
+
+                // 选择服务的方式下发命令
+                if (!isCustom && formVal[enumConst.SERVICE]) {
+                    formVal[enumConst.COMMAND] = inputData
                 }
             }
@@ -7030,7 +7160,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     value: formVal[enumGetValue[formVal[enumConst.ACTION]]],
                     ...(isParamsSetting ? {
                         [enumConst.COMMAND]: formVal[enumConst.COMMAND],
-                        [enumConst.WAY]: formVal[enumConst.WAY]
+                        [enumConst.WAY]: formVal[enumConst.WAY],
+                        [enumConst.COMMAND_TYPE]: formVal[enumConst.COMMAND_TYPE],
+                        [enumConst.SERVICE]: formVal[enumConst.SERVICE],
+                        [enumConst.TCP_COMMAND]: formVal[enumConst.TCP_COMMAND],
                     } : {}),
                 },
             }
@@ -7057,6 +7190,18 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         }
         /**
+         * @description 生成命令类型选项
+         * @returns 
+         */
+        function generateCommandTypeOptions() {
+            const options = [
+                { name: '自定义', id: COMMAND_TYPE_ENUM.CUSTOM },
+                { name: '服务', id: COMMAND_TYPE_ENUM.SERVICE },
+            ]
+            return UseLayUi.generateOptionTemplate({ dataSource: options, addPlaceholderOption: false })
+        }
+
+        /**
          * @description 生产页面选项
          */
         function generatorPageOptions() {
@@ -7064,11 +7209,77 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             return UseLayUi.generateOptionTemplate({ dataSource: options, addPlaceholderOption: false })
         }
-        function generatorEventListen() {
+        async function generatorEventListen(data) {
+            const info = getLayerBindInfo('event', event.data.type) || {}
+            let originType = (info.content || {}).type
+            const dataSource = getDataSourceBindValue()
+            let transportType
+            let deviceProfileServices = []
+
             form.on(`select(${enumActionEl.ACTION_SELECT_FILTER})`, (data) => {
                 const { value } = data
-                controlFormDisplay(value)
+                if (value === enumActionType.PARAMS_SETTING && !dataSource.deviceProfileId) {
+                    UseLayUi.topErrorMsg('请先绑定数据源!')
+                    form.val(enumActionEl.FORM_FILTER, { [enumConst.ACTION]: originType })
+                    return
+                }
+                originType = value
+                const isCustom = form.val(enumActionEl.ACTION_SELECT_FILTER)[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
+                controlFormDisplay(value, transportType, isCustom)
+            })
+
+            form.on(`select(${enumActionEl.COMMAND_TYPE_EL})`, (data) => {
+                const { value } = data
+                const flag = value === COMMAND_TYPE_ENUM.CUSTOM
+                const isTCPTransportType = transportType === 'TCP'
+                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: flag ? 'none' : 'block' })
+                $(`#${enumActionEl.SERVICE_EL}`).css({ display: flag ? 'none' : 'block' })
+                $(`#${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]: '' })
+            })
+
+            form.on(`select(${enumActionEl.SERVICE_EL})`, (data) => {
+                const { value } = data
+                const needRender = deviceProfileServices.find(item => item.identifier === value) || {}
+                const isTCPTransportType = transportType === 'TCP'
+
+                if (!isTCPTransportType) {
+                    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))
+                }
             })
+
+            try {
+                if (!dataSource.deviceProfileId) return
+                const detail = await ConfigurationNodeApi.getDeviceProfileDetailById(dataSource.deviceProfileId)
+                transportType = detail.transportType
+                const { content = {} } = data
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.TRANSPORTTYPE]: transportType })
+                const service = await ConfigurationNodeApi.getThingsModelServiceByDeviceProfileId(dataSource.deviceProfileId)
+                deviceProfileServices = service || []
+                const template = UseLayUi.generateOptionTemplate({ dataSource: deviceProfileServices, labelField: 'functionName', valueField: 'identifier' })
+                $(`#${enumActionEl.SERVICE_EL} > .layui-input-block > select`).html(template)
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE]: content[enumConst.SERVICE] })
+
+                // 服务有值回显表单
+                if (content[enumConst.SERVICE]) {
+                    const needRender = deviceProfileServices.find(item => item.identifier === content[enumConst.SERVICE]) || {}
+                    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.render('select', enumActionEl.FORM_FILTER)
+            } catch (error) {
+                throw error
+            }
         }
         function isJson(string) {
@@ -7123,49 +7334,75 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function createLayerForm(type) {
             const content = `
-            <form class="layui-form" lay-filter="${enumActionEl.FORM_FILTER}">
+            <form id="${enumActionEl.FORM_EL}" class="layui-form" lay-filter="${enumActionEl.FORM_FILTER}">
                 <div style="width: 450px">
                     <div class="layui-form-item">
-                        <label class="layui-form-label">事件</label>
-                        <div class="layui-input-block">
+                        <label class="layui-form-label" style="width: 120px;">事件</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
                             <input type="text" name="${enumConst.EVENT}" disabled class="layui-input" value="${enumEventType[type]}">
                         </div>
                     </div>
                     <div class="layui-form-item">
-                        <label class="layui-form-label">动作</label>
-                        <div class="layui-input-block">
+                        <label class="layui-form-label" style="width: 120px;">动作</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
                             <select name="${enumConst.ACTION}" lay-verType="tips" lay-verify="required" lay-filter="${enumActionEl.ACTION_SELECT_FILTER}">
                                 ${generatorActionOptions()}
                             </select>
                         </div>
                     </div>
                     <div class="layui-form-item" id="${enumActionEl.LINK_EL_ID}">
-                        <label class="layui-form-label">链接</label>
-                        <div class="layui-input-block">
+                        <label class="layui-form-label" style="width: 120px;">链接</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
                             <input type="text" lay-verType="tips" name="${enumConst.LINK_VALUE}" class="layui-input">
                         </div>
                     </div>
                     <div class="layui-form-item" id="${enumActionEl.PAGE_EL_ID}" style="display:none">
-                        <label class="layui-form-label">页面</label>
-                        <div class="layui-input-block">
+                        <label class="layui-form-label" style="width: 120px;">页面</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
                             <select name="${enumConst.PAGE_VALUE}" lay-verType="tips" id="pageSelect">
                                 ${generatorPageOptions()}
                             </select>
                         </div>
                     </div>
-                    <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none">
-                        <label class="layui-form-label">单向/双向 ${createHelpMessage(`单向：服务器向网关设备、直连设备发送指令。发送指令后，设备不会返回任何信息。\n
+                    <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none;">
+                        <label class="layui-form-label" style="width: 120px;">单向/双向 ${createHelpMessage(`单向：服务器向网关设备、直连设备发送指令。发送指令后，设备不会返回任何信息。\n
                         双向：服务器向网关设备、直连设备发送指令。发送指令后，设备返回响应信息。`, 'way')}</label>
-                        <div class="layui-input-block">
+                        <div class="layui-input-block"  style="margin-left: 150px;"> 
                             <input type="radio" name="${enumConst.WAY}" value="${enumWayType.ONE_WAY}" title="单向" checked="">
                             <input type="radio" name="${enumConst.WAY}" value="${enumWayType.TWO_WAY}" title="双向">
                         </div>
                     </div>
-                    <div id="${enumActionEl.EDITOR_CONTAINER}" style="display: none;">
-                        <div style="width: 80px; text-align: right; padding: 9px 15px;flex: 0 0 80px;">命令 ${createHelpMessage('用户预览模式下，点击参数设置后。输入的变量值将作为"attrPlaceholder"的值,并以JSON格式下发给服务器。', 'command')}</div>
+                    <div id="${enumActionEl.COMMAND_TYPE_EL}" class="layui-form-item" style="display: none;">
+                        <label class="layui-form-label" style="width: 120px;">命令下发方式</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
+                            <select name="${enumConst.COMMAND_TYPE}" lay-verType="tips" required lay-filter="${enumActionEl.COMMAND_TYPE_EL}">
+                                ${generateCommandTypeOptions()}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" id="${enumActionEl.SERVICE_EL}" style="display: none;">
+                        <label class="layui-form-label" style="width: 120px;">服务</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
+                            <select name="${enumConst.SERVICE}" lay-verType="tips" lay-filter="${enumActionEl.SERVICE_EL}">
+                            </select>
+                        </div>
+                    </div>
+                    <div id="${enumActionEl.EDITOR_CONTAINER}" 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;" />
                     </div>
+                    <div id="${enumActionEl.TCP_COMMAND_INPUT}" style="display: none;">
+                        <label class="layui-form-label" style="width: 120px;">命令 ${createHelpMessage('用户预览模式下，点击参数设置后。输入的变量值将作为"attrPlaceholder"的值,并以JSON格式下发给服务器。', 'command')}</label>
+                        <div class="layui-input-block" style="margin-left: 150px;">
+                            <input type="text" lay-verType="tips" name="${enumConst.TCP_COMMAND}" placeholder="请输入自定义下发命令" class="layui-input">
+                        </div>
+                    </div>
+                    <div style="display: none;">
+                        <input type="text" lay-verType="tips" name="${enumConst.TRANSPORTTYPE}" placeholder="请输入自定义下发命令" class="layui-input">
+                    </div>
+                    <div id="${enumActionEl.INPUT_DATA_FORM}" class="layui-form" lay-filter="${enumActionEl.INPUT_DATA_FORM_FILTER}">
+                    </div>
                 </div>
             </form>
             `
@@ -7173,7 +7410,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             layer.open({
                 title: "创建交互",
                 content,
-                area: ["800px", "500px"],
+                area: ["800px", "650px"],
                 btn: ["保存", "取消"],
                 yes(index) {
                     form.on(`submit(${enumActionEl.LAYER_SUBMIT_FILTER})`, data => {
@@ -7191,8 +7428,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         'lay-submit': '',
                         'lay-filter': enumActionEl.LAYER_SUBMIT_FILTER,
                     })
-                    generatorEventListen()
                     const info = getLayerBindInfo('event', type)
+                    generatorEventListen(info)
                     Object.assign(recordData, { enabled: info.enabled })
                     createEditor(info)
                     form.render(null, enumActionEl.FORM_FILTER)
@@ -7823,7 +8060,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.DEVICE_ID]: null,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
-                        [enumDataSourceConst.ORG_ID]: null
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_TYPE] = value
@@ -12251,6 +12487,57 @@ class UseLayUi {
     static dynamicAttr = (attr, value) => value ? `${attr}="${value}"` : ''
     /**
+     * @description 生成输入框控件
+     * @param {{label: string, value: string, labelWidth: number, numberInput: boolean}} params 
+     * @returns 
+     */
+    static createInputTemplate({ label, value, labelWidth = 80, required = false, type = 'TEXT' }) {
+        return `
+        <div class="layui-form-item" >
+            <label class="layui-form-label" style="width: ${labelWidth}px">${label}</label>
+            <div class="layui-input-block" style="margin-left: ${labelWidth + 30}px">
+                <input type="text" name="${value}" value-type="${type}" ${required && 'required'}  lay-verType="tips" lay-verify="${required && 'required'}" placeholder="请输入${label}" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        `
+    }
+
+    static createJSONTemplate() {
+
+    }
+
+    /**
+     * 
+     * @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 {number} labelWidth = 80
+     * @param {}
+     */
+    static genThingsModelInputDataForm(inputData, labelWidth = 80, formFilter = 'inputDataFilter') {
+        const list = []
+        inputData.forEach(item => {
+            const { identifier, functionName, dataType = {} } = item
+            const { type } = dataType
+            list.push(UseLayUi.createInputTemplate({ label: functionName, value: identifier, labelWidth, type }))
+        })
+        const template = `
+            <form class="layui-form" action="" lay-filter="${formFilter}">
+                ${list.join('')}
+            </form>`
+        return template
+    }
+
+    /**
      * @description format data source to tree structure
      * @param {object[]} data - data source
      * @param {Function} [customSetValue = ((record) => ({ id: record.id, title: record.name }))] customSetValue - custom set value && need return value
@@ -14559,6 +14846,7 @@ class HandleDataInteraction {
         }
         function createContent() {
+            const { command, tcpCommand,  } = content
             return `
             <div>
                 <div class="layui-form" lay-filter="${enumActionEl.ISSUED_WAY_FILTER}">
@@ -14619,17 +14907,25 @@ class HandleDataInteraction {
         async function defaultHandler(value, callback) {
             let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
-            let { command, way } = content
+
+            /**
+             * @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: '未绑定设备属性' },
+                // { 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)
-            const data = replaceAttrPlaceholder(command, attr, value)
+            let data = replaceAttrPlaceholder(command, attr, value)
+            if (tcpCommand) {
+                data = tcpCommand
+            }
             const instructionData = {
                 method: "methodThingskit",
                 additionalInfo: { cmdType: 'API' },
@@ -14637,7 +14933,7 @@ class HandleDataInteraction {
                 params: data,
             }
-            const [err, res = []] = await to(ConfigurationNodeApi.deviceIsOnLine(deviceId))
+            const [err, res = []] = way === 'twoway' ? await to(ConfigurationNodeApi.deviceIsOnLine(deviceId)) : [null, [{ value: true }]]
             const { value: onlineFlag } = res[0] || {}
             if (onlineFlag) {
                 const [err, res] = await to(ConfigurationNodeApi.sendInstruction(way, deviceId, instructionData))
@@ -14681,7 +14977,8 @@ class HandleDataInteraction {
             }
             try {
-                handle[componentType]()
+                // handle[componentType]()
+                handleSwitchComponent()
             } catch (error) {
             }