fix: swtich component send command not send negation value

@@ -260,9 +260,15 @@
 		SWITCH_VALUE: 'switchValue',
 		SWITCH_VALUE: 'switchValue',
 
 
 		/**
 		/**
+		 * @description 开关组件 下发值
+		 */
+		SWITCH_SEND_VALUE: 'switchSendValue',
+
+		/**
 		 * @description 开关组件状态 {true | false | null}
 		 * @description 开关组件状态 {true | false | null}
 		 */
 		 */
-		SWITCH_STATE: 'switchState'
+		SWITCH_STATE: 'switchState',
+		
 	}
 	}
 
 
 	Sidebar.prototype.enumComponentTypeValue = {
 	Sidebar.prototype.enumComponentTypeValue = {

@@ -13431,17 +13431,23 @@ class HandleDataSource {
         const { condition = [] } = switchConfig || {}
         const { condition = [] } = switchConfig || {}
         let reg = /image=[^;]+/g
         let reg = /image=[^;]+/g
         let flag = false
         let flag = false
-        const { SWITCH_STATE, SWITCH_VALUE } = Sidebar.prototype.enumComponentType
+        const { SWITCH_STATE, SWITCH_VALUE, SWITCH_SEND_VALUE } = Sidebar.prototype.enumComponentType
         const { SWITCH_STATE_NONE } = Sidebar.prototype.enumComponentTypeValue
         const { SWITCH_STATE_NONE } = Sidebar.prototype.enumComponentTypeValue
+
+        const getSendValue = (type) => {
+            return (condition.find(item => item.type !== type) || {}).value
+        }
         for (const item of condition) {
         for (const item of condition) {
             const { value, imagePath, type } = item || {}
             const { value, imagePath, type } = item || {}
             if (Number(receiveValue) === Number(value)) {
             if (Number(receiveValue) === Number(value)) {
                 flag = true
                 flag = true
                 this.updatePage(() => {
                 this.updatePage(() => {
                     const style = node.getStyle()
                     const style = node.getStyle()
+                    const sendValue = getSendValue(type)
                     node.setStyle(style.replace(reg, `image=${imagePath}`))
                     node.setStyle(style.replace(reg, `image=${imagePath}`))
                     node.setAttribute('label', '')
                     node.setAttribute('label', '')
                     node.setAttribute(SWITCH_VALUE, receiveValue)
                     node.setAttribute(SWITCH_VALUE, receiveValue)
+                    node.setAttribute(SWITCH_SEND_VALUE, sendValue)
                     node.setAttribute(SWITCH_STATE, type)
                     node.setAttribute(SWITCH_STATE, type)
                 }, node)
                 }, node)
                 break
                 break
@@ -13456,6 +13462,7 @@ class HandleDataSource {
                 node.setAttribute(SWITCH_STATE, SWITCH_STATE_NONE)
                 node.setAttribute(SWITCH_STATE, SWITCH_STATE_NONE)
             }, node)
             }, node)
         }
         }
+
     }
     }
 
 
     handleParamSettingButton(message) {
     handleParamSettingButton(message) {
@@ -14159,8 +14166,8 @@ class HandleDataInteraction {
      */
      */
     paramsSetting(nodeId, content) {
     paramsSetting(nodeId, content) {
         const { layer, jquery: $, form } = layui
         const { layer, jquery: $, form } = layui
-        const { SWITCH_STATE, SWITCH_VALUE, SWITCH, PARAMS_SETTING_BUTTON } = Sidebar.prototype.enumComponentType
-        const { SWITCH_STATE_ENABLED, SWITCH_STATE_NONE, SWITCH_STATE_CLOSE } = Sidebar.prototype.enumComponentTypeValue
+        const { SWITCH_STATE, SWITCH_VALUE, SWITCH_SEND_VALUE, SWITCH, PARAMS_SETTING_BUTTON } = Sidebar.prototype.enumComponentType
+        const { SWITCH_STATE_NONE } = Sidebar.prototype.enumComponentTypeValue
         const { COMPONENT_TYPE } = Sidebar.prototype.enumCellBasicAttribute
         const { COMPONENT_TYPE } = Sidebar.prototype.enumCellBasicAttribute
         const contentData = this.contentData
         const contentData = this.contentData
         const currentNode = this.contentAllCell.find(item => item.id === nodeId)
         const currentNode = this.contentAllCell.find(item => item.id === nodeId)
@@ -14204,39 +14211,12 @@ class HandleDataInteraction {
 
 
         function handleSwitchComponent() {
         function handleSwitchComponent() {
             const state = currentNode.getAttribute(SWITCH_STATE)
             const state = currentNode.getAttribute(SWITCH_STATE)
-            const value = currentNode.getAttribute(SWITCH_VALUE)
+            const value = currentNode.getAttribute(SWITCH_SEND_VALUE)
             if (state === SWITCH_STATE_NONE) {
             if (state === SWITCH_STATE_NONE) {
                 return
                 return
             }
             }
             layer.confirm('是否确认下发命令？', async function (index) {
             layer.confirm('是否确认下发命令？', async function (index) {
-                let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
-                let { command, way } = 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)
-                const data = replaceAttrPlaceholder(command, attr, value)
-                const instructionData = {
-                    method: "methodThingskit",
-                    params: data,
-                }
-
-                const [err, res = []] = await to(ConfigurationNodeApi.deviceIsOnLine(deviceId))
-                const { value: onlineFlag } = res[0] || {}
-                if (onlineFlag) {
-                    const [err, res] = await to(ConfigurationNodeApi.sendInstruction(way, deviceId, instructionData))
-                    if (!err) {
-                        UseLayUi.topSuccessMsg('操作成功')
-                        layer.close(index);
-                    }
-                } else {
-                    UseLayUi.topErrorMsg('设备不在线!')
-                }
+                defaultHandler(value, () => layer.close(index))
             });
             });
 
 
 
 
@@ -14263,6 +14243,10 @@ class HandleDataInteraction {
         const submitThrottle = this.throttle(submit)
         const submitThrottle = this.throttle(submit)
         async function submit(callback) {
         async function submit(callback) {
             const { value } = form.val(enumActionEl.ISSUED_WAY_FILTER)
             const { value } = form.val(enumActionEl.ISSUED_WAY_FILTER)
+            defaultHandler(value, callback)
+        }
+
+        async function defaultHandler(value, callback) {
             let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
             let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
             let { command, way } = content
             let { command, way } = content
             const validate = new Validate([
             const validate = new Validate([
@@ -14286,7 +14270,7 @@ class HandleDataInteraction {
                 const [err, res] = await to(ConfigurationNodeApi.sendInstruction(way, deviceId, instructionData))
                 const [err, res] = await to(ConfigurationNodeApi.sendInstruction(way, deviceId, instructionData))
                 if (!err) {
                 if (!err) {
                     UseLayUi.topSuccessMsg('操作成功')
                     UseLayUi.topSuccessMsg('操作成功')
-                    callback()
+                    callback && typeof callback === 'function' && callback()
                 }
                 }
             } else {
             } else {
                 UseLayUi.topErrorMsg('设备不在线!')
                 UseLayUi.topErrorMsg('设备不在线!')
@@ -14329,7 +14313,6 @@ class HandleDataInteraction {
 
 
             }
             }
         }
         }
-        console.log('enter')
         startProcess()
         startProcess()
     }
     }
 }
 }