node-red-contrib-symi-mesh 1.6.5 → 1.6.7

package/nodes/symi-485-bridge.html

@@ -169,7 +169,7 @@
                             '</div>';
                     } else {
                         addrHtml = '<div class="addr-col normal-addr">' +
-                            '<input type="number" class="addr-input" value="' + (m.address || 1) + '" min="1" max="255" title="Modbus地址">' +
+                            '<input type="number" class="addr-input" value="' + (m.address !== undefined ? m.address : 1) + '" min="0" max="255" title="Modbus从机地址(0-255)">' +
                             '</div>';
                     }
                     row.html(
@@ -258,7 +258,9 @@
 
                 container.find('.addr-input').off('change').on('change', function() {
                     var idx = $(this).closest('.mapping-row').data('idx');
-                    mappings[idx].address = parseInt($(this).val()) || 1;
+                    var val = $(this).val();
+                    mappings[idx].address = (val !== '' && val !== undefined) ? parseInt(val) : 1;
+                    if (isNaN(mappings[idx].address)) mappings[idx].address = 1;
                 });
 
                 // 杜亚2字节地址输入
@@ -352,14 +354,24 @@
         oneditsave: function() {
             var mappings = [];
             $('#mapping-list .mapping-row').each(function() {
+                // 获取地址值，允许0（话语前湾空调地址是0）
+                var addrVal = $(this).find('.addr-input').val();
+                var address = (addrVal !== '' && addrVal !== undefined) ? parseInt(addrVal) : 1;
+                if (isNaN(address)) address = 1;
+                
                 var m = {
                     meshMac: $(this).find('.mesh-select').val() || '',
                     meshChannel: parseInt($(this).find('.mesh-channel').val()) || 1,
                     brand: $(this).find('.brand-select').val() || '',
                     device: $(this).find('.device-select').val() || '',
-                    address: parseInt($(this).find('.addr-input').val()) || 1,
+                    address: address,
                     rs485Channel: parseInt($(this).find('.rs485-channel').val()) || 1
                 };
+                // 保存杜亚窗帘2字节地址
+                if (m.brand === 'duya') {
+                    m.addrHigh = parseInt($(this).find('.addr-high').val()) || 1;
+                    m.addrLow = parseInt($(this).find('.addr-low').val()) || 1;
+                }
                 // 保存自定义码
                 if (m.brand === 'custom') {
                     m.customCodes = {};