From 90192dbed96154a7e1a2da3ad157d7a0d8ba7f80 Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Thu, 21 May 2026 16:58:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=AD=A3=E6=A9=9F?=
 =?UTF-8?q?=E5=8F=B0=E8=A8=AD=E5=AE=9A=E5=85=AC=E5=8F=B8=E7=AF=A9=E9=81=B8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=81=B8=E5=96=AE=E5=85=A9=E9=A0=85=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 選取公司後自動觸發 AJAX 篩選，無需手動按搜尋按鈕
2. 修正重設按鈕邏輯，透過 HSSelect.setValue() 正確清除 Preline 下拉選單 UI 顯示
3. 調整 fetchTabContent 的 Preline autoInit 與 Alpine initTree 初始化順序，以 requestAnimationFrame 確保 DOM 更新完畢後才執行 Alpine，解決 AJAX 後下拉選單選中狀態遺失的問題
---
 .../discord-notifications/index.blade.php     | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/resources/views/admin/basic-settings/discord-notifications/index.blade.php b/resources/views/admin/basic-settings/discord-notifications/index.blade.php
index d8317c7..7658f2b 100644
--- a/resources/views/admin/basic-settings/discord-notifications/index.blade.php
+++ b/resources/views/admin/basic-settings/discord-notifications/index.blade.php
@@ -230,7 +230,8 @@
 
                     <!-- 公司篩選下拉選單 (僅 System Admin 可見) -->
                     @if(auth()->user()->isSystemAdmin())
-                    <div class="w-full md:w-64 relative focus-within:z-[20]">
+                    <div class="w-full md:w-64 relative focus-within:z-[20]"
+                         @change="$el.closest('form').dispatchEvent(new Event('submit'))">
                         <x-searchable-select name="filter_company_id" :placeholder="__('All Companies')" :selected="request('filter_company_id')">
                             @foreach($allCompanies as $c)
                                 <option value="{{ $c->id }}" data-title="{{ $c->name }}">{{ $c->name }}</option>
@@ -244,7 +245,19 @@
                             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/></svg>
                         </button>
                         <button type="button"
-                            @click="$el.closest('form').querySelector('input[name=search_machine]').value=''; @if(auth()->user()->isSystemAdmin()) $el.closest('form').querySelector('select[name=filter_company_id]').value=''; @endif $el.closest('form').dispatchEvent(new Event('submit'));"
+                            @click="
+                                const form = $el.closest('form');
+                                form.querySelector('input[name=search_machine]').value = '';
+                                @if(auth()->user()->isSystemAdmin())
+                                const nativeSel = form.querySelector('select[name=filter_company_id]');
+                                if (nativeSel) {
+                                    nativeSel.value = ' ';
+                                    const inst = window.HSSelect?.getInstance(nativeSel);
+                                    if (inst) inst.setValue(' ');
+                                }
+                                @endif
+                                form.dispatchEvent(new Event('submit'));
+                            "
                             class="p-2.5 rounded-xl bg-slate-100 dark:bg-slate-800 text-slate-500 hover:bg-slate-200 dark:hover:bg-slate-700 transition-all" title="{{ __('Reset') }}">
                             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/></svg>
                         </button>
@@ -1265,8 +1278,11 @@
                     if (newContent && container) {
                         container.innerHTML = newContent.innerHTML;
                         window.history.pushState({}, '', url);
+                        // 先讓 Preline (HSSelect 等) 初始化完成，再由 Alpine 接管
                         if (window.HSStaticMethods?.autoInit) window.HSStaticMethods.autoInit();
-                        if (window.Alpine?.initTree) window.Alpine.initTree(container);
+                        requestAnimationFrame(() => {
+                            if (window.Alpine?.initTree) window.Alpine.initTree(container);
+                        });
                     }
                 } catch (e) { 
                     console.error('AJAX Load Failed:', e); 

From 18162dfa4c71ee6a5abfa008c16b6e994f4384de Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Thu, 21 May 2026 17:01:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[FIX]=20=E8=A3=9C=E5=BC=B7=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=AF=A9=E9=81=B8=E4=B8=8B=E6=8B=89=E9=81=B8=E5=96=AE?=
 =?UTF-8?q?=E7=9A=84=20AJAX=20=E5=BE=8C=E9=81=B8=E4=B8=AD=E7=8B=80?=
 =?UTF-8?q?=E6=85=8B=E9=A1=AF=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 為 option 元素補上 server-side selected 屬性，確保 Preline autoInit 重建時能正確讀取已選中的公司選項。
2. 在 fetchTabContent AJAX 完成後，主動呼叫 HSSelect.setValue() 強制同步下拉選單的顯示文字，消除選中狀態消失的視覺問題。
---
 .../basic-settings/discord-notifications/index.blade.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/views/admin/basic-settings/discord-notifications/index.blade.php b/resources/views/admin/basic-settings/discord-notifications/index.blade.php
index 7658f2b..3833d33 100644
--- a/resources/views/admin/basic-settings/discord-notifications/index.blade.php
+++ b/resources/views/admin/basic-settings/discord-notifications/index.blade.php
@@ -234,7 +234,7 @@
                          @change="$el.closest('form').dispatchEvent(new Event('submit'))">
                         <x-searchable-select name="filter_company_id" :placeholder="__('All Companies')" :selected="request('filter_company_id')">
                             @foreach($allCompanies as $c)
-                                <option value="{{ $c->id }}" data-title="{{ $c->name }}">{{ $c->name }}</option>
+                                <option value="{{ $c->id }}" data-title="{{ $c->name }}" {{ (string)request('filter_company_id') === (string)$c->id ? 'selected' : '' }}>{{ $c->name }}</option>
                             @endforeach
                         </x-searchable-select>
                     </div>
@@ -1280,6 +1280,13 @@
                         window.history.pushState({}, '', url);
                         // 先讓 Preline (HSSelect 等) 初始化完成，再由 Alpine 接管
                         if (window.HSStaticMethods?.autoInit) window.HSStaticMethods.autoInit();
+                        // Re-sync company filter HSSelect display after AJAX DOM replacement.
+                        const filterSelect = container.querySelector('select[name="filter_company_id"]');
+                        if (filterSelect) {
+                            const selectedValue = (filterSelect.value ?? '').trim();
+                            const hsSelect = window.HSSelect?.getInstance(filterSelect);
+                            if (hsSelect) hsSelect.setValue(selectedValue || ' ');
+                        }
                         requestAnimationFrame(() => {
                             if (window.Alpine?.initTree) window.Alpine.initTree(container);
                         });