Update xiaoshi-device-consumables-button.js

xiaoshi-device-consumables-button.js

@@ -291,9 +291,17 @@ class XiaoshiConsumablesButtonEditor extends LitElement {
         </div>
 
         <div class="form-group">
-          <label> </label>
+          <label>👇👇👇下方弹出的卡片可增加的其他卡片👇👇👇</label>
-          <label>👇👇👇下面是弹出卡片内容👇👇👇</label>
+          <textarea 
-          <label> </label>
+            @change=${this._entityChanged}
+            .value=${this.config.other_cards || ''}
+            name="other_cards"
+            placeholder='# 示例配置：添加button卡片
+- type: custom:button-card
+  template: 测试模板(最好引用模板，否则大概率会报错)
+- type: custom:button-card
+  template: 测试模板(最好引用模板，否则大概率会报错)'>
+          </textarea>
         </div>
 
         <div class="checkbox-group">
@@ -301,11 +309,19 @@ class XiaoshiConsumablesButtonEditor extends LitElement {
             type="checkbox" 
             class="checkbox-input"
             @change=${this._entityChanged}
-            .checked=${this.config.show_preview !== false}
+            .checked=${this.config.no_preview === true}
-            name="show_preview"
+            name="no_preview"
-            id="show_preview"
+            id="no_preview"
           />
-          <label for="show_preview" class="checkbox-label" style="color: red;"> 弹出卡片预览（正式使用时取消勾选）</label>
+          <label for="no_preview" class="checkbox-label" style="color: red;"> 
+            📻显示预览📻（ 请先勾选测试显示效果 ）
+          </label>
+        </div>
+
+        <div class="form-group">
+          <label> </label>
+          <label>👇👇👇下方是弹出的主卡配置项👇👇👇</label>
+          <label> </label>
         </div>
 
         <!-- button新元素 结束-->
@@ -532,14 +548,12 @@ class XiaoshiConsumablesButtonEditor extends LitElement {
           </div>
           <div class="help-text">
             搜索并选择要显示的设备耗材实体，支持多选。每个实体可以配置：<br>
-            • <strong>特殊实体显示：</strong>binary_sensor(off→正常,on→缺少), event(unknown→正常,其他→低电量)<br>
             • 属性名：留空使用实体状态，或输入属性名<br>
             • 名称重定义：勾选后可自定义显示名称<br>
             • 图标重定义：勾选后可自定义图标（如 mdi:phone）<br>
             • 单位重定义：勾选后可自定义单位（如 元、$、kWh 等）<br>
             • 预警条件：勾选后设置预警条件，支持 >10, >=10, <10, <=10, ==10, ==on, ==off, =="hello world" 等<br>
             • 换算：对数值进行数学运算，支持 +10, -10, *1.5, /2 等<br>
-            • 未勾选重定义时，将使用实体的原始属性值
             </div>
           </div>
         </div>
@@ -553,7 +567,6 @@ class XiaoshiConsumablesButtonEditor extends LitElement {
     const { name, value, type, checked } = e.target;
     
     let finalValue;
-    
     // 处理复选框
     if (type === 'checkbox') {
       finalValue = checked;
@@ -770,9 +783,11 @@ class XiaoshiConsumablesButtonEditor extends LitElement {
     this._showEntityList = false;
   }
     
+  /*button新按钮方法 开始*/
   setConfig(config) {
-    this.config = config;
+    this.config = config || {};
   }
+  /*button新按钮方法 结束*/
 } 
 customElements.define('xiaoshi-consumables-button-editor', XiaoshiConsumablesButtonEditor);
 
@@ -1290,19 +1305,52 @@ class XiaoshiConsumablesButton extends LitElement {
     const tapAction = this.config.tap_action;
     
     if (!tapAction || tapAction !== 'none') {
-      // 默认 tap_action 行为：弹出耗材卡片
+      // 默认 tap_action 行为：弹出垂直堆叠卡片
       const excludedParams = ['type', 'button_height', 'button_width', 'button_font_size', 'button_icon_size', 'show_preview', 'tap_action'];
-      const cardConfig = {};
       
+      // 构建垂直堆叠卡片的内容
+      const cards = [];
+      
+      // 1. 添加耗材卡片
+      const consumablesCardConfig = {};
       Object.keys(this.config).forEach(key => {
-        if (!excludedParams.includes(key)) {
+        if (!excludedParams.includes(key) && key !== 'other_cards' && key !== 'no_preview') {
-          cardConfig[key] = this.config[key];
+          consumablesCardConfig[key] = this.config[key];
         }
       });
       
-      const popupContent = {
+      cards.push({
         type: 'custom:xiaoshi-consumables-card',
-        ...cardConfig
+        ...consumablesCardConfig
+      });
+      
+      // 2. 添加附加卡片
+      if (this.config.other_cards && this.config.other_cards.trim()) {
+        try {
+          const additionalCardsConfig = this._parseYamlCards(this.config.other_cards);
+          
+          // 为每个附加卡片传递 theme 值
+          const cardsWithTheme = additionalCardsConfig.map(card => {
+            // 如果卡片没有 theme 配置，则从当前卡片配置中传递
+            if (!card.theme && this.config.theme) {
+              return {
+                ...card,
+                theme: this.config.theme
+              };
+            }
+            return card;
+          });
+          
+          cards.push(...cardsWithTheme);
+        } catch (error) {
+          console.error('解析附加卡片配置失败:', error);
+        }
+      }
+      
+      // 创建垂直堆叠卡片
+      const popupContent = {
+        type: 'vertical-stack',
+        cards: cards
       };
       
       const popupStyle = this.config.popup_style || `
@@ -1320,6 +1368,156 @@ class XiaoshiConsumablesButton extends LitElement {
     }
     this._handleClick();
   }
+
+  _parseYamlCards(yamlString) {
+    try {
+      const lines = yamlString.split('\n');
+      const cards = [];
+      let currentCard = null;
+      let indentStack = [];
+      let contextStack = [];
+      
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const trimmed = line.trim();
+        
+        if (!trimmed || trimmed.startsWith('#')) continue;
+        
+        const indentLevel = line.length - line.trimStart().length;
+        if (trimmed.startsWith('- type')) {
+          if (currentCard) {
+            cards.push(currentCard);
+            currentCard = null;
+            indentStack = [];
+            contextStack = [];
+          }
+          const content = trimmed.substring(1).trim();
+          if (content.includes(':')) {
+            const [key, ...valueParts] = content.split(':');
+            const value = valueParts.join(':').trim();
+            currentCard = {};
+            this._setNestedValue(currentCard, key.trim(), this._parseValue(value));
+          } else {
+            currentCard = { type: content };
+          }
+          
+          indentStack = [indentLevel];
+          contextStack = [currentCard];
+        } else if (currentCard && trimmed.startsWith('-')) {
+          while (indentStack.length > 1 && indentLevel <= indentStack[indentStack.length - 1]) {
+            indentStack.pop();
+            contextStack.pop();
+          }
+          
+          let currentContext = contextStack[contextStack.length - 1];
+          const itemValue = trimmed.substring(1).trim();
+          
+          if (!Array.isArray(currentContext)) {
+            if (contextStack.length > 1) {
+              const parentContext = contextStack[contextStack.length - 2];
+              for (let key in parentContext) {
+                if (parentContext[key] === currentContext) {
+                  parentContext[key] = [];
+                  contextStack[contextStack.length - 1] = parentContext[key];
+                  currentContext = parentContext[key];
+                  break;
+                }
+              }
+            }
+          }
+          if (Array.isArray(currentContext)) {
+            if (itemValue.includes(':')) {
+              const [key, ...valueParts] = itemValue.split(':');
+              const value = valueParts.join(':').trim();
+              const obj = {};
+              obj[key.trim()] = this._parseValue(value);
+              currentContext.push(obj);
+            } else {
+              currentContext.push(this._parseValue(itemValue));
+            }
+          }
+        } else if (currentCard && trimmed.includes(':')) {
+          const [key, ...valueParts] = trimmed.split(':');
+          const value = valueParts.join(':').trim();
+          const keyName = key.trim();
+          
+          while (indentStack.length > 1 && indentLevel <= indentStack[indentStack.length - 1]) {
+            indentStack.pop();
+            contextStack.pop();
+          }
+          
+          const currentContext = contextStack[contextStack.length - 1];
+          
+          if (value) {
+            this._setNestedValue(currentContext, keyName, this._parseValue(value));
+          } else {
+            let nextLine = null, nextIndent = null;
+            for (let j = i + 1; j < lines.length; j++) {
+              const nextTrimmed = lines[j].trim();
+              if (nextTrimmed && !nextTrimmed.startsWith('#')) {
+                nextLine = nextTrimmed;
+                nextIndent = lines[j].length - lines[j].trimStart().length;
+                break;
+              }
+            }
+            
+            currentContext[keyName] = (nextLine && nextLine.startsWith('-') && nextIndent > indentLevel) 
+              ? [] : (currentContext[keyName] || {});
+            
+            indentStack.push(indentLevel);
+            contextStack.push(currentContext[keyName]);
+          }
+        }
+      }
+      
+      if (currentCard) cards.push(currentCard);
+      
+      return cards;
+    } catch (error) {
+      console.error('YAML解析错误:', error);
+      return [];
+    }
+  }
+  
+  _parseValue(value) {
+    if (!value) return '';
+    
+    // 移除引号
+    if ((value.startsWith('"') && value.endsWith('"')) || 
+        (value.startsWith("'") && value.endsWith("'"))) {
+      return value.slice(1, -1);
+    }
+    
+    // 尝试解析为数字
+    if (!isNaN(value) && value.trim() !== '') {
+      return Number(value);
+    }
+    
+    // 尝试解析为布尔值
+    if (value === 'true') return true;
+    if (value === 'false') return false;
+    if (value === 'null') return null;
+    
+    // 返回字符串
+    return value;
+  }
+  
+  _setNestedValue(obj, path, value) {
+    // 支持嵌套路径，如 "styles.card"
+    const keys = path.split('.');
+    let current = obj;
+    
+    for (let i = 0; i < keys.length - 1; i++) {
+      const key = keys[i];
+      if (!current[key] || typeof current[key] !== 'object') {
+        current[key] = {};
+      }
+      current = current[key];
+    }
+    
+    current[keys[keys.length - 1]] = value;
+  }
+
   /*button新元素 结束*/
   
   _renderDeviceItem(consumablesData) {
@@ -1448,7 +1646,6 @@ class XiaoshiConsumablesButton extends LitElement {
     return false;
   }
 
-
   render() {
     if (!this.hass) {
       return html`<div class="loading">等待Home Assistant连接...</div>`;
@@ -1483,7 +1680,7 @@ class XiaoshiConsumablesButton extends LitElement {
     }).length;
 
     /*button新元素 前9行和最后1行开始*/
-    const showPreview = this.config.show_preview !== false;
+    const showPreview = this.config.no_preview === true;
     
     return html`
       <div class="consumables-status" style="--fg-color: ${fgColor}; --bg-color: ${bgColor};" @click=${this._handleButtonClick}>
@@ -1528,9 +1725,11 @@ class XiaoshiConsumablesButton extends LitElement {
   }
 
   setConfig(config) {
-    this.config = config;
-    
     /*button新元素 开始*/
+    // 不设置默认值，只有明确配置时才添加 no_preview
+    this.config = {
+      ...config
+    };
     if (config.button_width) {
       this.style.setProperty('--button-width', config.button_width);
     } else {
@@ -1578,3 +1777,4 @@ class XiaoshiConsumablesButton extends LitElement {
   }
 }
 customElements.define('xiaoshi-consumables-button', XiaoshiConsumablesButton);
+

xiaoshi-device-ha-info-card.js

@@ -766,6 +766,14 @@ export class XiaoshiHaInfoCard extends LitElement {
     if (entityId.startsWith('climate.')) return 'mdi:thermostat';
     if (entityId.startsWith('cover.')) return 'mdi:window-shutter';
     if (entityId.startsWith('weather.')) return 'mdi:weather-cloudy';
+    if (entityId.startsWith('input_select.')) return 'mdi:form-select';
+    if (entityId.startsWith('select.')) return 'mdi:form-select';
+    if (entityId.startsWith('input_text.')) return 'mdi:form-textbox';
+    if (entityId.startsWith('text.')) return 'mdi:form-textbox';
+    if (entityId.startsWith('button.')) return 'mdi:button-pointer';
+    if (entityId.startsWith('event.')) return 'mdi:gesture-tap-button';
+    if (entityId.startsWith('device_tracker.')) return 'mdi:lan-connect';
+    if (entityId.startsWith('notify.')) return 'mdi:message';
     return 'mdi:help-circle';
   }
 
@@ -918,6 +926,12 @@ export class XiaoshiHaInfoCard extends LitElement {
                 }
               }
               
+              // 新增规则：如果skipped_version为null情况下，当latest_version !== installed_version时，
+              // 且实体状态为off时，有可能是安装的版本比latest_version还高，这种不算更新的实体
+              if (attributes.skipped_version === null && entity.state === 'off') {
+                return; // 跳过此更新
+              }
+              
               const updateData = {
                 name: attributes.friendly_name || entity.entity_id.replace('update.', ''),
                 current_version: attributes.installed_version,
@@ -983,9 +997,9 @@ export class XiaoshiHaInfoCard extends LitElement {
   }
 
   _handleConfirmUpdate(update, event) {
-    this._handleClick();
     event.stopPropagation(); // 阻止事件冒泡
     event.preventDefault(); // 阻止默认行为
+    this._handleClick();
     
     // 弹出确认对话框
     const confirmed = confirm(`确认要更新 ${update.name} 吗？\n当前版本: ${update.current_version}\n最新版本: ${update.latest_version}`);
@@ -1261,7 +1275,7 @@ export class XiaoshiHaInfoCard extends LitElement {
                         <div class="device-name">${update.name}</div>
                         <div class="device-details">
                           当前版本: ${update.current_version} → 最新版本: ${update.latest_version}
-                          ${update.skipped_version ? html`<span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
+                          ${update.skipped_version ? html`<br><span style="color: #ff9800;">已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen-update" @click=${(e) => this._handleConfirmUpdate(update, e)}>
@@ -1286,7 +1300,7 @@ export class XiaoshiHaInfoCard extends LitElement {
                         <div class="device-name">${update.name}</div>
                         <div class="device-details">
                           当前版本: ${update.current_version} → 最新版本: ${update.latest_version}
-                          ${update.skipped_version ? html`<span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
+                          ${update.skipped_version ? html`<br><span style="color: #ff9800;">已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen-update" @click=${(e) => this._handleConfirmUpdate(update, e)}>

xiaoshi-device-todo-card.js

@@ -1120,7 +1120,10 @@ class XiaoshiTodoCard extends LitElement {
                                 <input 
                                   type="checkbox" 
                                   .checked=${item.status === 'completed'}
-                                  @change=${(e) => this._updateTodoItem(todoData.entity_id, item.summary || item.uid, e.target.checked ? 'completed' : 'needs_action')}
+                                  @change=${(e) => {
+                                    this._updateTodoItem(todoData.entity_id, item.summary || item.uid, e.target.checked ? 'completed' : 'needs_action'); 
+                                    this._handleClick();
+                                  }}
                                   style="margin-right: 8px; margin-top: 2px;"
                                 />
                                 ${isEditing ? html`
@@ -1153,6 +1156,7 @@ class XiaoshiTodoCard extends LitElement {
                                         @input=${(e) => {
                                           this._editingItem.due = e.target.value;
                                           this.requestUpdate();
+                                          this._handleClick();
                                         }}
                                       />
                                       <button 
@@ -1161,6 +1165,7 @@ class XiaoshiTodoCard extends LitElement {
                                           this._editTodoItem(todoData.entity_id, item.summary || item.uid, this._editingItem.summary, this._editingItem.description, this._editingItem.due);
                                           this._editingItem = null;
                                           this.requestUpdate();
+                                          this._handleClick();
                                         }}
                                       >
                                         保存
@@ -1170,6 +1175,7 @@ class XiaoshiTodoCard extends LitElement {
                                         @click=${() => {
                                           this._editingItem = null;
                                           this.requestUpdate();
+                                          this._handleClick();
                                         }}
                                       >
                                         取消
@@ -1197,6 +1203,7 @@ class XiaoshiTodoCard extends LitElement {
                                         due: this._formatDateForInput(item.due) || ''
                                       };
                                       this.requestUpdate();
+                                      this._handleClick();
                                     }}
                                     style="margin-left: 8px; margin-top: 2px;"
                                     title="修改"
@@ -1206,7 +1213,10 @@ class XiaoshiTodoCard extends LitElement {
                                 ` : ''}
                                 <button 
                                   class="remove-btn" 
-                                  @click=${() => this._removeTodoItem(todoData.entity_id, item.summary || item.uid)}
+                                  @click=${() => {
+                                    this._removeTodoItem(todoData.entity_id, item.summary || item.uid);
+                                    this._handleClick();
+                                  }}
                                   style="margin-left: 4px; margin-top: 2px;"
                                   title="删除"
                                 >
@@ -1227,6 +1237,7 @@ class XiaoshiTodoCard extends LitElement {
                               [todoData.entity_id]: !this._expandedAddForm[todoData.entity_id]
                             };
                             this.requestUpdate();
+                            this._handleClick();
                           }}
                         >
                           ${this._expandedAddForm[todoData.entity_id] ? '收起' : '添加新待办事项'}
@@ -1274,6 +1285,7 @@ class XiaoshiTodoCard extends LitElement {
                                     descInput.value = '';
                                     dateInput.value = '';
                                   }
+                                  this._handleClick();
                                 }}
                               >
                                 添加

xiaoshi-device-update-card.js

@@ -523,6 +523,11 @@ export class XiaoshiUpdateCard extends LitElement {
                   return; // 跳过此更新
                 }
               }
+              // 新增规则：如果skipped_version为null情况下，当latest_version !== installed_version时，
+              // 且实体状态为off时，有可能是安装的版本比latest_version还高，这种不算更新的实体
+              if (attributes.skipped_version === null && entity.state === 'off') {
+                return; // 跳过此更新
+              }
               
               const updateData = {
                 name: attributes.friendly_name || entity.entity_id.replace('update.', ''),
@@ -588,9 +593,9 @@ export class XiaoshiUpdateCard extends LitElement {
   }
 
   _handleConfirmUpdate(update, event) {
-    this._handleClick();
     event.stopPropagation(); // 阻止事件冒泡
     event.preventDefault(); // 阻止默认行为
+    this._handleClick();
     
     // 弹出确认对话框
     const confirmed = confirm(`确认要更新 ${update.name} 吗？\n当前版本: ${update.current_version}\n最新版本: ${update.latest_version}`);
@@ -865,7 +870,7 @@ export class XiaoshiUpdateCard extends LitElement {
                         <div class="device-name">${update.name}</div>
                         <div class="device-details">
                           当前版本: ${update.current_version} → 最新版本: ${update.latest_version}
-                          ${update.skipped_version ? html`<span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
+                          ${update.skipped_version ? html`<br><span style="color: #ff9800;">已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen" @click=${(e) => this._handleConfirmUpdate(update, e)}>
@@ -890,7 +895,7 @@ export class XiaoshiUpdateCard extends LitElement {
                         <div class="device-name">${update.name}</div>
                         <div class="device-details">
                           当前版本: ${update.current_version} → 最新版本: ${update.latest_version}
-                          ${update.skipped_version ? html`<span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
+                          ${update.skipped_version ? html`<br><span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen" @click=${(e) => this._handleConfirmUpdate(update, e)}>