修正分享功能turnstile邏輯

Author: alvin000009238

grades_dashboard.js

@@ -1111,6 +1111,27 @@ function setupShareFeature() {
         const shareLinkInput = document.getElementById('shareLinkInput');
         const copyLinkBtn = document.getElementById('copyLinkBtn');
         const shareStatus = document.getElementById('shareStatus');
+        const shareTurnstileContainer = document.getElementById('shareTurnstileContainer');
+
+        // 彈窗開啟時立即渲染 Turnstile Widget
+        if (typeof turnstile !== 'undefined' && shareTurnstileContainer) {
+            (async () => {
+                try {
+                    const siteKeyRes = await fetch('/api/turnstile-site-key');
+                    const siteKeyData = await siteKeyRes.json();
+                    const siteKey = siteKeyData.siteKey;
+                    if (siteKey) {
+                        const widgetId = turnstile.render(shareTurnstileContainer, {
+                            sitekey: siteKey,
+                            theme: 'dark',
+                        });
+                        shareTurnstileContainer.dataset.widgetId = widgetId;
+                    }
+                } catch (e) {
+                    console.warn('Failed to render share Turnstile:', e);
+                }
+            })();
+        }
 
         createLinkBtn.addEventListener('click', async () => {
             const gradesData = getStoredGrades();
@@ -1120,50 +1141,21 @@ function setupShareFeature() {
                 return;
             }
 
-            createLinkBtn.disabled = true;
-            createLinkBtn.textContent = '建立中...';
-            shareStatus.textContent = '';
-
             // 取得 Turnstile token
             let turnstileResponse = '';
-            if (typeof turnstile !== 'undefined') {
-                const shareTurnstileContainer = document.getElementById('shareTurnstileContainer');
-                if (shareTurnstileContainer) {
-                    // 渲染 widget (如果尚未渲染)
-                    if (!shareTurnstileContainer.dataset.widgetId) {
-                        try {
-                            const siteKeyRes = await fetch('/api/turnstile-site-key');
-                            const siteKeyData = await siteKeyRes.json();
-                            const siteKey = siteKeyData.siteKey;
-                            if (siteKey) {
-                                const widgetId = turnstile.render(shareTurnstileContainer, {
-                                    sitekey: siteKey,
-                                    theme: 'dark',
-                                });
-                                shareTurnstileContainer.dataset.widgetId = widgetId;
-                                // 等待用戶完成驗證
-                                createLinkBtn.disabled = false;
-                                createLinkBtn.textContent = '建立分享連結';
-                                shareStatus.textContent = '請先完成人機驗證';
-                                shareStatus.className = 'status-msg';
-                                return;
-                            }
-                        } catch (e) {
-                            console.warn('Failed to render share Turnstile:', e);
-                        }
-                    } else {
-                        turnstileResponse = turnstile.getResponse(shareTurnstileContainer.dataset.widgetId) || '';
-                        if (!turnstileResponse) {
-                            shareStatus.textContent = '請完成人機驗證';
-                            shareStatus.className = 'status-msg error';
-                            createLinkBtn.disabled = false;
-                            createLinkBtn.textContent = '建立分享連結';
-                            return;
-                        }
-                    }
+            if (typeof turnstile !== 'undefined' && shareTurnstileContainer && shareTurnstileContainer.dataset.widgetId) {
+                turnstileResponse = turnstile.getResponse(shareTurnstileContainer.dataset.widgetId) || '';
+                if (!turnstileResponse) {
+                    shareStatus.textContent = '請先完成人機驗證';
+                    shareStatus.className = 'status-msg error';
+                    return;
                 }
             }
 
+            createLinkBtn.disabled = true;
+            createLinkBtn.textContent = '建立中...';
+            shareStatus.textContent = '';
+
             try {
                 const payload = { ...gradesData, 'cf-turnstile-response': turnstileResponse };
                 const res = await fetch('/api/share', {
@@ -1178,6 +1170,8 @@ function setupShareFeature() {
                     shareLinkInput.value = link;
                     linkContainer.style.display = 'block';
                     createLinkBtn.style.display = 'none';
+                    // 隱藏 Turnstile
+                    if (shareTurnstileContainer) shareTurnstileContainer.style.display = 'none';
                     shareStatus.textContent = '連結建立成功！';
                     shareStatus.className = 'status-msg success';
                 } else {