node-red-contrib-symi-mesh 1.7.1 → 1.7.3

package/nodes/symi-485-bridge.html

@@ -10,13 +10,14 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: 'bridge.png',
+        icon: 'font-awesome/fa-exchange',
+        align: 'left',
         paletteLabel: 'RS485桥接',
         label: function() {
             if (this.name) return this.name;
             try {
                 var m = JSON.parse(this.mappings || '[]');
-                if (m.length > 0) return 'RS485桥接 (' + m.length + '组)';
+                if (m.length > 0) return 'RS485桥接(' + m.length + '组)';
             } catch(e) {}
             return 'RS485桥接';
         },
@@ -83,8 +84,10 @@
             // 构建Mesh设备选项（不包含按键，按键单独选择）
             function getMeshOptions(selectedMac) {
                 var html = '<option value="">-- 选择 --</option>';
+                var selMacNorm = (selectedMac || '').toLowerCase().replace(/:/g, '');
                 meshDevices.forEach(function(d) {
-                    var selected = (d.mac === selectedMac) ? ' selected' : '';
+                    var devMacNorm = (d.mac || '').toLowerCase().replace(/:/g, '');
+                    var selected = (devMacNorm === selMacNorm && selMacNorm !== '') ? ' selected' : '';
                     html += '<option value="' + d.mac + '" data-channels="' + (d.channels || 1) + '"' + selected + '>' + d.name + '</option>';
                 });
                 return html;
@@ -92,7 +95,10 @@
 
             // 构建Mesh按键选项（仅当开关设备时显示）
             function getMeshChannelOptions(mac, selectedChannel) {
-                var device = meshDevices.find(function(d) { return d.mac === mac; });
+                var macNorm = (mac || '').toLowerCase().replace(/:/g, '');
+                var device = meshDevices.find(function(d) { 
+                    return (d.mac || '').toLowerCase().replace(/:/g, '') === macNorm; 
+                });
                 var channels = device ? (device.channels || 1) : 0;
                 if (channels <= 1) return '';
                 var html = '<select class="mesh-channel">';
@@ -106,7 +112,10 @@
 
             // 获取Mesh设备的按键数
             function getMeshDeviceChannels(mac) {
-                var device = meshDevices.find(function(d) { return d.mac === mac; });
+                var macNorm = (mac || '').toLowerCase().replace(/:/g, '');
+                var device = meshDevices.find(function(d) { 
+                    return (d.mac || '').toLowerCase().replace(/:/g, '') === macNorm; 
+                });
                 return device ? (device.channels || 1) : 1;
             }
 
@@ -159,7 +168,7 @@
                 }
 
                 mappings.forEach(function(m, idx) {
-                    var row = $('<div class="mapping-row" data-idx="' + idx + '" style="flex-wrap:wrap;"></div>');
+                    var row = $('<div class="mapping-row" data-idx="' + idx + '"></div>');
                     // 地址输入框：杜亚2字节地址，自定义模式隐藏，其他显示
                     var addrHtml = '';
                     if (m.brand === 'custom') {
@@ -174,7 +183,29 @@
                             '<input type="number" class="addr-input" value="' + (m.address !== undefined ? m.address : 1) + '" min="0" max="255" title="Modbus从机地址(0-255)">' +
                             '</div>';
                     }
+                    // 生成自定义码摘要信息
+                    var codeSummary = '';
+                    if (m.brand === 'custom' && m.customCodes) {
+                        var codes = m.customCodes;
+                        if (m.device === 'custom_switch') {
+                            codeSummary = (codes.sendOn || codes.recvOn || codes.sendOff || codes.recvOff) ? '已配置' : '未配置';
+                        } else if (m.device === 'custom_curtain') {
+                            codeSummary = (codes.sendOpen || codes.sendClose || codes.recvOpen || codes.recvClose) ? '已配置' : '未配置';
+                        } else if (m.device === 'custom_climate') {
+                            codeSummary = (codes.acSendOn || codes.fanSendHigh || codes.modeSendCool) ? '已配置' : '未配置';
+                        } else {
+                            codeSummary = codes.trigger ? '已配置' : '未配置';
+                        }
+                    }
+                    // 自定义码折叠按钮和反馈选项（放在同一行）
+                    var toggleBtn = '';
+                    if (m.brand === 'custom' && m.device) {
+                        var feedbackChecked = (m.feedback !== false) ? ' checked' : '';
+                        toggleBtn = '<label class="feedback-label" title="勾选：RS485收码后Mesh执行并反馈发码；不勾选：RS485收码后Mesh执行但不反馈" style="font-size:10px;cursor:pointer;white-space:nowrap;"><input type="checkbox" class="feedback-checkbox"' + feedbackChecked + ' style="margin-right:1px;vertical-align:middle;">反馈</label>';
+                        toggleBtn += '<button type="button" class="red-ui-button red-ui-button-small btn-toggle-codes" title="展开/收起自定义码" style="margin-left:2px;background:#fff8e1;border-color:#ffa726;color:#f57c00;padding:2px 4px;"><i class="fa fa-code"></i>' + codeSummary + '</button>';
+                    }
                     row.html(
+                        '<div class="mapping-main">' +
                         '<div class="mesh-col">' +
                         '  <select class="mesh-select">' + getMeshOptions(m.meshMac) + '</select>' +
                         '  <span class="mesh-ch-wrap">' + getMeshChannelOptions(m.meshMac, m.meshChannel || 1) + '</span>' +
@@ -188,16 +219,22 @@
                         '  <span class="rs485-ch-wrap">' + getRS485ChannelOptions(m.brand, m.device, m.rs485Channel || 1) + '</span>' +
                         '</div>' +
                         addrHtml +
-                        '<div class="del-col"><button type="button" class="red-ui-button red-ui-button-small btn-remove" title="删除"><i class="fa fa-times"></i></button></div>'
+                        '<div class="del-col">' + toggleBtn + '<button type="button" class="red-ui-button red-ui-button-small btn-remove" title="删除" style="padding:2px 6px;"><i class="fa fa-times"></i></button></div>' +
+                        '</div>'
                     );
                     container.append(row);
                     // 如果是自定义协议，显示自定义码输入框
                     if (m.brand === 'custom' && m.device) {
                         updateCustomCodesVisibility(row, m.brand, m.device, idx);
                     }
+                    // 如果是SYMI或中弘协议，显示桥接配置
+                    if ((m.brand === 'symi' || m.brand === 'zhonghong') && m.device) {
+                        updateCustomCodesVisibility(row, m.brand, m.device, idx);
+                    }
                 });
 
                 bindEvents();
+                bindToggleEvents();
             }
 
             // 绑定事件
@@ -224,17 +261,13 @@
                 });
 
                 container.find('.device-select').off('change').on('change', function() {
-                    var row = $(this).closest('.mapping-row');
-                    var idx = row.data('idx');
+                    var idx = $(this).closest('.mapping-row').data('idx');
                     var deviceId = $(this).val();
-                    var brandId = row.find('.brand-select').val();
+                    var brandId = $(this).closest('.mapping-row').find('.brand-select').val();
                     mappings[idx].device = deviceId;
-                    // 更新RS485按键选择
-                    row.find('.rs485-ch-wrap').html(getRS485ChannelOptions(brandId, deviceId, 1));
                     mappings[idx].rs485Channel = 1;
-                    // 显示/隐藏自定义码输入区域
-                    updateCustomCodesVisibility(row, brandId, deviceId, idx);
-                    bindEvents(); // 重新绑定新添加的元素事件
+                    // 重新渲染以更新反馈/折叠按钮和录码区域
+                    renderMappings();
                 });
 
                 container.find('.rs485-channel').off('change').on('change', function() {
@@ -281,37 +314,43 @@
                     renderMappings();
                 });
 
+                // 反馈选项
+                container.find('.feedback-checkbox').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].feedback = $(this).is(':checked');
+                });
+
                 // 自定义码输入事件 - 开关
-                container.find('.custom-send-on').off('change').on('change', function() {
+                container.find('.custom-code-send-on').off('change').on('change', function() {
                     var idx = $(this).closest('.mapping-row').data('idx');
                     mappings[idx].customCodes = mappings[idx].customCodes || {};
                     mappings[idx].customCodes.sendOn = $(this).val();
                 });
-                container.find('.custom-send-off').off('change').on('change', function() {
+                container.find('.custom-code-send-off').off('change').on('change', function() {
                     var idx = $(this).closest('.mapping-row').data('idx');
                     mappings[idx].customCodes = mappings[idx].customCodes || {};
                     mappings[idx].customCodes.sendOff = $(this).val();
                 });
-                container.find('.custom-recv-on').off('change').on('change', function() {
+                container.find('.custom-code-recv-on').off('change').on('change', function() {
                     var idx = $(this).closest('.mapping-row').data('idx');
                     mappings[idx].customCodes = mappings[idx].customCodes || {};
                     mappings[idx].customCodes.recvOn = $(this).val();
                 });
-                container.find('.custom-recv-off').off('change').on('change', function() {
+                container.find('.custom-code-recv-off').off('change').on('change', function() {
                     var idx = $(this).closest('.mapping-row').data('idx');
                     mappings[idx].customCodes = mappings[idx].customCodes || {};
                     mappings[idx].customCodes.recvOff = $(this).val();
                 });
                 // 窗帘码
-                container.find('.custom-send-open, .custom-send-close, .custom-send-stop, .custom-recv-open, .custom-recv-close, .custom-recv-stop').off('change').on('change', function() {
+                container.find('.custom-code-send-open, .custom-code-send-close, .custom-code-send-stop, .custom-code-recv-open, .custom-code-recv-close, .custom-code-recv-stop').off('change').on('change', function() {
                     var idx = $(this).closest('.mapping-row').data('idx');
                     mappings[idx].customCodes = mappings[idx].customCodes || {};
-                    if ($(this).hasClass('custom-send-open')) mappings[idx].customCodes.sendOpen = $(this).val();
-                    if ($(this).hasClass('custom-send-close')) mappings[idx].customCodes.sendClose = $(this).val();
-                    if ($(this).hasClass('custom-send-stop')) mappings[idx].customCodes.sendStop = $(this).val();
-                    if ($(this).hasClass('custom-recv-open')) mappings[idx].customCodes.recvOpen = $(this).val();
-                    if ($(this).hasClass('custom-recv-close')) mappings[idx].customCodes.recvClose = $(this).val();
-                    if ($(this).hasClass('custom-recv-stop')) mappings[idx].customCodes.recvStop = $(this).val();
+                    if ($(this).hasClass('custom-code-send-open')) mappings[idx].customCodes.sendOpen = $(this).val();
+                    if ($(this).hasClass('custom-code-send-close')) mappings[idx].customCodes.sendClose = $(this).val();
+                    if ($(this).hasClass('custom-code-send-stop')) mappings[idx].customCodes.sendStop = $(this).val();
+                    if ($(this).hasClass('custom-code-recv-open')) mappings[idx].customCodes.recvOpen = $(this).val();
+                    if ($(this).hasClass('custom-code-recv-close')) mappings[idx].customCodes.recvClose = $(this).val();
+                    if ($(this).hasClass('custom-code-recv-stop')) mappings[idx].customCodes.recvStop = $(this).val();
                 });
                 // 空调码
                 container.find('[class^="custom-ac-"], [class^="custom-fan-"], [class^="custom-mode-"], [class^="custom-temp-"]').off('change').on('change', function() {
@@ -327,9 +366,11 @@
                     else if (cls.includes('fan-send-high')) mappings[idx].customCodes.fanSendHigh = $(this).val();
                     else if (cls.includes('fan-send-mid')) mappings[idx].customCodes.fanSendMid = $(this).val();
                     else if (cls.includes('fan-send-low')) mappings[idx].customCodes.fanSendLow = $(this).val();
+                    else if (cls.includes('fan-send-auto')) mappings[idx].customCodes.fanSendAuto = $(this).val();
                     else if (cls.includes('fan-recv-high')) mappings[idx].customCodes.fanRecvHigh = $(this).val();
                     else if (cls.includes('fan-recv-mid')) mappings[idx].customCodes.fanRecvMid = $(this).val();
                     else if (cls.includes('fan-recv-low')) mappings[idx].customCodes.fanRecvLow = $(this).val();
+                    else if (cls.includes('fan-recv-auto')) mappings[idx].customCodes.fanRecvAuto = $(this).val();
                     else if (cls.includes('mode-send-cool')) mappings[idx].customCodes.modeSendCool = $(this).val();
                     else if (cls.includes('mode-send-heat')) mappings[idx].customCodes.modeSendHeat = $(this).val();
                     else if (cls.includes('mode-send-dry')) mappings[idx].customCodes.modeSendDry = $(this).val();
@@ -369,14 +410,112 @@
                 });
             }
 
+            // 绑定SYMI/Zhonghong桥接配置事件
+            function bindBridgeEvents() {
+                var container = $('#mapping-list');
+                
+                // SYMI配置
+                container.find('.symi-local-addr').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].symiLocalAddr = parseInt($(this).val()) || 1;
+                });
+                container.find('.symi-device-addr').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].symiDeviceAddr = parseInt($(this).val()) || 1;
+                });
+                container.find('.symi-device-channel').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].symiDeviceChannel = parseInt($(this).val()) || 0;
+                });
+                container.find('.symi-brand-id').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].symiBrandId = parseInt($(this).val()) || 0;
+                });
+                
+                // Zhonghong配置
+                container.find('.zh-slave-addr').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].zhSlaveAddr = parseInt($(this).val()) || 1;
+                });
+                container.find('.zh-outdoor-addr').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].zhOutdoorAddr = parseInt($(this).val()) || 1;
+                });
+                container.find('.zh-indoor-addr').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].zhIndoorAddr = parseInt($(this).val()) || 1;
+                });
+                
+                // 桥接启用
+                container.find('.zh-bridge-target').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].zhBridgeTarget = $(this).is(':checked');
+                });
+                container.find('.symi-bridge-target').off('change').on('change', function() {
+                    var idx = $(this).closest('.mapping-row').data('idx');
+                    mappings[idx].symiBridgeTarget = $(this).is(':checked');
+                });
+            }
+
             // 更新自定义码输入区域的显示
             function updateCustomCodesVisibility(row, brandId, deviceId, idx) {
                 row.find('.custom-codes-row').remove();
+                row.find('.bridge-config-row').remove();
+                
+                // SYMI空调面板配置
+                if (brandId === 'symi' && deviceId === 'climate') {
+                    var m = mappings[idx];
+                    var html = '<div class="bridge-config-row" style="width:100%;padding:8px;margin-top:6px;background:#e3f2fd;border:1px dashed #2196f3;border-radius:4px;">';
+                    html += '<div style="font-size:11px;color:#1976d2;margin-bottom:6px;"><i class="fa fa-cog"></i> SYMI面板配置</div>';
+                    html += '<div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;gap:6px;">';
+                    html += '<label style="font-size:10px;">本机地址: <input type="number" class="symi-local-addr" value="' + (m.symiLocalAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">设备地址: <input type="number" class="symi-device-addr" value="' + (m.symiDeviceAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">设备通道: <input type="number" class="symi-device-channel" value="' + (m.symiDeviceChannel || 0) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">品牌ID: <input type="number" class="symi-brand-id" value="' + (m.symiBrandId || 0) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '</div>';
+                    html += '<div style="font-size:11px;color:#1976d2;margin:8px 0 6px 0;"><i class="fa fa-link"></i> 桥接到中弘VRF</div>';
+                    html += '<div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;gap:6px;">';
+                    html += '<label style="font-size:10px;"><input type="checkbox" class="zh-bridge-target" ' + (m.zhBridgeTarget ? 'checked' : '') + '> 启用桥接</label>';
+                    html += '<label style="font-size:10px;">从机地址: <input type="number" class="zh-slave-addr" value="' + (m.zhSlaveAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">外机地址: <input type="number" class="zh-outdoor-addr" value="' + (m.zhOutdoorAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">内机地址: <input type="number" class="zh-indoor-addr" value="' + (m.zhIndoorAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #64b5f6;border-radius:2px;font-size:10px;"></label>';
+                    html += '</div>';
+                    html += '</div>';
+                    row.append(html);
+                    bindBridgeEvents();
+                    return;
+                }
+                
+                // 中弘VRF配置
+                if (brandId === 'zhonghong' && deviceId === 'climate') {
+                    var m = mappings[idx];
+                    var html = '<div class="bridge-config-row" style="width:100%;padding:8px;margin-top:6px;background:#fff3e0;border:1px dashed #ff9800;border-radius:4px;">';
+                    html += '<div style="font-size:11px;color:#e65100;margin-bottom:6px;"><i class="fa fa-cog"></i> 中弘VRF配置</div>';
+                    html += '<div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:6px;">';
+                    html += '<label style="font-size:10px;">从机地址: <input type="number" class="zh-slave-addr" value="' + (m.zhSlaveAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">外机地址: <input type="number" class="zh-outdoor-addr" value="' + (m.zhOutdoorAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">内机地址: <input type="number" class="zh-indoor-addr" value="' + (m.zhIndoorAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '</div>';
+                    html += '<div style="font-size:11px;color:#e65100;margin:8px 0 6px 0;"><i class="fa fa-link"></i> 桥接到SYMI面板</div>';
+                    html += '<div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr 1fr;gap:6px;">';
+                    html += '<label style="font-size:10px;"><input type="checkbox" class="symi-bridge-target" ' + (m.symiBridgeTarget ? 'checked' : '') + '> 启用桥接</label>';
+                    html += '<label style="font-size:10px;">本机地址: <input type="number" class="symi-local-addr" value="' + (m.symiLocalAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">设备地址: <input type="number" class="symi-device-addr" value="' + (m.symiDeviceAddr || 1) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">设备通道: <input type="number" class="symi-device-channel" value="' + (m.symiDeviceChannel || 0) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '<label style="font-size:10px;">品牌ID: <input type="number" class="symi-brand-id" value="' + (m.symiBrandId || 0) + '" min="0" max="255" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:10px;"></label>';
+                    html += '</div>';
+                    html += '</div>';
+                    row.append(html);
+                    bindBridgeEvents();
+                    return;
+                }
+                
                 if (brandId !== 'custom') return;
                 
                 var codes = mappings[idx].customCodes || {};
-                var html = '<div class="custom-codes-row" style="width:100%;padding:8px;margin-top:6px;background:#fff8e1;border:1px dashed #ffa726;border-radius:4px;">';
-                html += '<div style="font-size:11px;color:#f57c00;margin-bottom:6px;"><i class="fa fa-code"></i> 自定义RS485码（十六进制，如: 55 01 01 03 01 B9 00）</div>';
+                // 内容区域（默认折叠）
+                var html = '<div class="custom-codes-row" style="width:100%;">';
+                html += '<div class="custom-codes-content" style="display:none;padding:8px;background:#fff8e1;border:1px dashed #ffa726;border-radius:4px;margin-top:4px;">';
                 
                 if (deviceId === 'custom_switch') {
                     html += '<div style="display:grid;grid-template-columns:1fr 1fr;gap:6px;">';
@@ -405,13 +544,15 @@
                     html += '</div>';
                     
                     html += '<div style="font-size:10px;color:#f57c00;margin-bottom:4px;">风速控制</div>';
-                    html += '<div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:4px;margin-bottom:6px;">';
+                    html += '<div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;gap:4px;margin-bottom:6px;">';
                     html += '<label style="font-size:10px;">发高风: <input type="text" class="custom-fan-send-high" value="' + (codes.fanSendHigh || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
                     html += '<label style="font-size:10px;">发中风: <input type="text" class="custom-fan-send-mid" value="' + (codes.fanSendMid || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
                     html += '<label style="font-size:10px;">发低风: <input type="text" class="custom-fan-send-low" value="' + (codes.fanSendLow || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
+                    html += '<label style="font-size:10px;">发自动: <input type="text" class="custom-fan-send-auto" value="' + (codes.fanSendAuto || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
                     html += '<label style="font-size:10px;">收高风: <input type="text" class="custom-fan-recv-high" value="' + (codes.fanRecvHigh || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
                     html += '<label style="font-size:10px;">收中风: <input type="text" class="custom-fan-recv-mid" value="' + (codes.fanRecvMid || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
                     html += '<label style="font-size:10px;">收低风: <input type="text" class="custom-fan-recv-low" value="' + (codes.fanRecvLow || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
+                    html += '<label style="font-size:10px;">收自动: <input type="text" class="custom-fan-recv-auto" value="' + (codes.fanRecvAuto || '') + '" placeholder="" maxlength="128" style="width:100%;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:9px;font-family:monospace;"></label>';
                     html += '</div>';
                     
                     html += '<div style="font-size:10px;color:#f57c00;margin-bottom:4px;">模式控制</div>';
@@ -458,9 +599,44 @@
                     html += '<label style="font-size:11px;">触发码: <input type="text" class="custom-code-trigger" value="' + (codes.trigger || '') + '" placeholder="55 01 01..." style="width:200px;padding:2px 4px;border:1px solid #ffb74d;border-radius:2px;font-size:11px;font-family:monospace;"></label>';
                     html += '</div>';
                 }
+                html += '</div>'; // 关闭 custom-codes-content
                 html += '</div>';
                 row.append(html);
+                
                 bindEvents();
+                bindToggleEvents();
+            }
+            
+            // 绑定折叠按钮事件
+            function bindToggleEvents() {
+                $('#mapping-list').find('.btn-toggle-codes').off('click').on('click', function(e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    var row = $(this).closest('.mapping-row');
+                    var content = row.find('.custom-codes-content');
+                    var btn = $(this);
+                    if (content.is(':visible')) {
+                        content.slideUp(200);
+                        // 更新按钮文字
+                        var idx = row.data('idx');
+                        var m = mappings[idx];
+                        var codes = m.customCodes || {};
+                        var summary = '未配置';
+                        if (m.device === 'custom_switch') {
+                            summary = (codes.sendOn || codes.recvOn || codes.sendOff || codes.recvOff) ? '已配置' : '未配置';
+                        } else if (m.device === 'custom_curtain') {
+                            summary = (codes.sendOpen || codes.sendClose || codes.recvOpen || codes.recvClose) ? '已配置' : '未配置';
+                        } else if (m.device === 'custom_climate') {
+                            summary = (codes.acSendOn || codes.fanSendHigh || codes.modeSendCool) ? '已配置' : '未配置';
+                        } else {
+                            summary = codes.trigger ? '已配置' : '未配置';
+                        }
+                        btn.html('<i class="fa fa-code"></i> ' + summary);
+                    } else {
+                        content.slideDown(200);
+                        btn.html('<i class="fa fa-code"></i> 收起');
+                    }
+                });
             }
 
             // 添加新映射
@@ -493,6 +669,30 @@
                     m.addrHigh = parseInt($(this).find('.addr-high').val()) || 1;
                     m.addrLow = parseInt($(this).find('.addr-low').val()) || 1;
                 }
+                // 保存SYMI空调面板配置
+                if (m.brand === 'symi') {
+                    var row = $(this);
+                    m.symiLocalAddr = parseInt(row.find('.symi-local-addr').val()) || 1;
+                    m.symiDeviceAddr = parseInt(row.find('.symi-device-addr').val()) || 1;
+                    m.symiDeviceChannel = parseInt(row.find('.symi-device-channel').val()) || 0;
+                    m.symiBrandId = parseInt(row.find('.symi-brand-id').val()) || 0;
+                    m.zhBridgeTarget = row.find('.zh-bridge-target').is(':checked');
+                    m.zhSlaveAddr = parseInt(row.find('.zh-slave-addr').val()) || 1;
+                    m.zhOutdoorAddr = parseInt(row.find('.zh-outdoor-addr').val()) || 1;
+                    m.zhIndoorAddr = parseInt(row.find('.zh-indoor-addr').val()) || 1;
+                }
+                // 保存中弘VRF配置
+                if (m.brand === 'zhonghong') {
+                    var row = $(this);
+                    m.zhSlaveAddr = parseInt(row.find('.zh-slave-addr').val()) || 1;
+                    m.zhOutdoorAddr = parseInt(row.find('.zh-outdoor-addr').val()) || 1;
+                    m.zhIndoorAddr = parseInt(row.find('.zh-indoor-addr').val()) || 1;
+                    m.symiBridgeTarget = row.find('.symi-bridge-target').is(':checked');
+                    m.symiLocalAddr = parseInt(row.find('.symi-local-addr').val()) || 1;
+                    m.symiDeviceAddr = parseInt(row.find('.symi-device-addr').val()) || 1;
+                    m.symiDeviceChannel = parseInt(row.find('.symi-device-channel').val()) || 0;
+                    m.symiBrandId = parseInt(row.find('.symi-brand-id').val()) || 0;
+                }
                 // 保存自定义码
                 if (m.brand === 'custom') {
                     var row = $(this);
@@ -577,8 +777,9 @@
         
         #mapping-list { max-height: calc(100vh - 380px); min-height: 200px; overflow-y: auto; }
         .mapping-empty { padding: 15px; text-align: center; color: #999; font-size: 12px; }
-        .mapping-row { display: flex; align-items: center; padding: 6px 8px; margin-bottom: 6px; background: #fff; border: 1px solid #e0e0e0; border-radius: 4px; gap: 6px; }
-        .mesh-col { flex: 0 0 25%; display: flex; gap: 4px; }
+        .mapping-row { display: flex; flex-direction: column; padding: 6px 8px; margin-bottom: 6px; background: #fff; border: 1px solid #e0e0e0; border-radius: 4px; gap: 6px; }
+        .mapping-main { display: flex; align-items: center; width: 100%; gap: 6px; min-width: 0; }
+        .mesh-col { flex: 1 1 20%; min-width: 0; display: flex; gap: 4px; }
         .mesh-col .mesh-select { flex: 1; padding: 4px; border: 1px solid #81c784; border-radius: 3px; background: #e8f5e9; font-size: 12px; }
         .mesh-col .mesh-channel { width: 58px; padding: 4px; border: 1px solid #81c784; border-radius: 3px; background: #c8e6c9; font-size: 11px; font-weight: bold; }
         .arrow-col { flex: 0 0 20px; text-align: center; color: #999; }
@@ -590,7 +791,7 @@
         .device-col .rs485-channel { width: 58px; background: #bbdefb; font-size: 11px; font-weight: bold; }
         .addr-col { flex: 0 0 50px; }
         .addr-col input { width: 100%; padding: 4px; border: 1px solid #ccc; border-radius: 3px; text-align: center; font-size: 12px; }
-        .del-col { flex: 0 0 32px; text-align: center; }
+        .del-col { flex: 0 0 auto; display: flex; align-items: center; gap: 4px; margin-left: auto; white-space: nowrap; }
         .btn-remove { color: #d32f2f !important; padding: 2px 6px !important; }
         .form-tips { font-size: 11px; }
         .form-tips p { margin: 3px 0; }