更新web

static/js/config.js

@@ -60,6 +60,7 @@ function populateConfigForm(config) {
   
   // DNS配置 - 使用函数安全设置值，避免 || 操作符可能的错误处理
   setElementValue('dns-port', getSafeValue(dnsServerConfig.Port, 53));
+  setElementValue('dns-run-mode', getSafeValue(dnsServerConfig.QueryMode, 'parallel'));
   setElementValue('dns-upstream-servers', getSafeArray(dnsServerConfig.UpstreamServers).join('\n'));
   setElementValue('dns-dnssec-upstream-servers', getSafeArray(dnsServerConfig.DNSSECUpstreamServers).join('\n'));
   //setElementValue('dns-stats-file', getSafeValue(dnsServerConfig.StatsFile, 'data/stats.json'));
@@ -69,7 +70,7 @@ function populateConfigForm(config) {
   setElementValue('dns-cache-size', getSafeValue(dnsServerConfig.CacheSize, 100));
   setElementValue('dns-max-cache-ttl', getSafeValue(dnsServerConfig.MaxCacheTTL, 120));
   setElementValue('dns-min-cache-ttl', getSafeValue(dnsServerConfig.MinCacheTTL, 5));
-  setElementValue('dns-enable-ipv6', getSafeValue(dnsServerConfig.EnableIPv6, false));
+  setElementValue('dns-enable-ipv6', getSafeValue(dnsServerConfig.enableIPv6, false));
   // HTTP配置
   setElementValue('http-port', getSafeValue(httpServerConfig.Port, 8080));
     // 屏蔽配置
@@ -96,6 +97,8 @@ function setElementValue(elementId, value) {
       }
     } else if (element.tagName === 'TEXTAREA') {
       element.value = value;
+    } else if (element.tagName === 'SELECT') {
+      element.value = value;
     } else if (element.tagName === 'BUTTON' && element.classList.contains('toggle-btn')) {
       const icon = element.querySelector('i');
       if (icon) {
@@ -220,6 +223,7 @@ function collectFormData() {
   return {
     dnsserver: {
       port: dnsPort,
+      queryMode: getElementValue('dns-run-mode') || 'parallel',
       upstreamServers: upstreamServers,
       dnssecUpstreamServers: dnssecUpstreamServers,
       timeout: timeout,
@@ -313,12 +317,12 @@ function showNotification(message, type = 'info') {
   
   // 创建新通知
   const notification = document.createElement('div');
-  notification.className = `notification fixed bottom-4 right-4 px-6 py-3 rounded-lg shadow-lg z-50 transform transition-transform duration-300 ease-in-out translate-y-0 opacity-0`;
+  notification.className = `notification fixed top-4 right-4 px-6 py-3 rounded-lg shadow-lg z-50 transform transition-transform duration-300 ease-in-out translate-y-0 opacity-0`;
   
   // 设置通知样式（兼容Tailwind和原生CSS）
   notification.style.cssText += `
     position: fixed;
-    bottom: 16px;
+    top: 16px;
     right: 16px;
     padding: 16px 24px;
     border-radius: 8px;
@@ -331,15 +335,17 @@ function showNotification(message, type = 'info') {
   if (type === 'success') {
     notification.style.backgroundColor = '#10b981';
     notification.style.color = 'white';
+    notification.innerHTML = `<i class="fa fa-check-circle mr-2"></i>${message}`;
   } else if (type === 'error') {
     notification.style.backgroundColor = '#ef4444';
     notification.style.color = 'white';
+    notification.innerHTML = `<i class="fa fa-exclamation-circle mr-2"></i>${message}`;
   } else {
     notification.style.backgroundColor = '#3b82f6';
     notification.style.color = 'white';
+    notification.innerHTML = `<i class="fa fa-info-circle mr-2"></i>${message}`;
   }
   
-  notification.textContent = message;
   document.body.appendChild(notification);
   
   // 显示通知
@@ -383,13 +389,28 @@ async function loadGFWListConfig() {
 // 填充GFWList配置表单
 function populateGFWListForm(config) {
   const gfwListConfig = config.gfwList || {};
+  const enabled = getSafeValue(gfwListConfig.enabled, false);
   
-  setElementValue('gfwlist-enabled', getSafeValue(gfwListConfig.enabled, false));
+  setElementValue('gfwlist-enabled', enabled);
   setElementValue('gfwlist-target-ip', getSafeValue(gfwListConfig.ip, ''));
   setElementValue('gfwlist-google', getSafeValue(config.allowGoogle, false));
   setElementValue('gfwlist-youtube', getSafeValue(config.allowYouTube, false));
   setElementValue('gfwlist-facebook', getSafeValue(config.allowFacebook, false));
   setElementValue('gfwlist-twitter', getSafeValue(config.allowTwitter, false));
+  setElementValue('gfwlist-amazon', getSafeValue(config.allowAmazon, false));
+  setElementValue('gfwlist-bbc', getSafeValue(config.allowBBC, false));
+  setElementValue('gfwlist-discord', getSafeValue(config.allowDiscord, false));
+  setElementValue('gfwlist-dropbox', getSafeValue(config.allowDropbox, false));
+  setElementValue('gfwlist-microsoft', getSafeValue(config.allowMicrosoft, false));
+  setElementValue('gfwlist-steam', getSafeValue(config.allowSteam, false));
+  setElementValue('gfwlist-telegram', getSafeValue(config.allowTelegram, false));
+  setElementValue('gfwlist-tiktok', getSafeValue(config.allowTikTok, false));
+  setElementValue('gfwlist-v2ex', getSafeValue(config.allowV2EX, false));
+  setElementValue('gfwlist-wikimedia', getSafeValue(config.allowWikimedia, false));
+  setElementValue('gfwlist-yahoo', getSafeValue(config.allowYahoo, false));
+  
+  // 更新通行网站部分的显示效果
+  updateAllowedSitesSection(enabled);
 }
 
 // 保存GFWList配置
@@ -424,10 +445,53 @@ function collectGFWListFormData() {
     allowGoogle: getElementValue('gfwlist-google'),
     allowYouTube: getElementValue('gfwlist-youtube'),
     allowFacebook: getElementValue('gfwlist-facebook'),
-    allowTwitter: getElementValue('gfwlist-twitter')
+    allowTwitter: getElementValue('gfwlist-twitter'),
+    allowAmazon: getElementValue('gfwlist-amazon'),
+    allowBBC: getElementValue('gfwlist-bbc'),
+    allowDiscord: getElementValue('gfwlist-discord'),
+    allowDropbox: getElementValue('gfwlist-dropbox'),
+    allowMicrosoft: getElementValue('gfwlist-microsoft'),
+    allowSteam: getElementValue('gfwlist-steam'),
+    allowTelegram: getElementValue('gfwlist-telegram'),
+    allowTikTok: getElementValue('gfwlist-tiktok'),
+    allowV2EX: getElementValue('gfwlist-v2ex'),
+    allowWikimedia: getElementValue('gfwlist-wikimedia'),
+    allowYahoo: getElementValue('gfwlist-yahoo')
   };
 }
 
+// 更新通行网站部分的显示效果
+function updateAllowedSitesSection(enabled) {
+  const section = document.getElementById('allowed-sites-section');
+  if (!section) return;
+  
+  const siteCards = section.querySelectorAll('.bg-gray-50');
+  const siteLabels = section.querySelectorAll('.text-gray-700');
+  const siteToggles = section.querySelectorAll('.toggle-btn');
+  
+  if (enabled) {
+    // GFWList已启用，显示彩色且可点击
+    section.classList.remove('opacity-50');
+    siteCards.forEach(card => {
+      card.style.filter = 'grayscale(0%)';
+    });
+    siteToggles.forEach(toggle => {
+      toggle.disabled = false;
+      toggle.classList.remove('cursor-not-allowed');
+    });
+  } else {
+    // GFWList已禁用，显示灰色且不可点击
+    section.classList.add('opacity-50');
+    siteCards.forEach(card => {
+      card.style.filter = 'grayscale(100%)';
+    });
+    siteToggles.forEach(toggle => {
+      toggle.disabled = true;
+      toggle.classList.add('cursor-not-allowed');
+    });
+  }
+}
+
 // 重启GFWList服务
 async function handleRestartGFWListService() {
   if (!confirm('确定要重启DNS服务吗？重启期间服务可能会短暂不可用。')) return;
@@ -460,6 +524,11 @@ function setupGFWListEventListeners() {
       // 切换按钮状态
       const currentState = this.classList.contains('bg-success');
       setElementValue(this.id, !currentState);
+      
+      // 如果是GFWList启用开关，更新通行网站部分的显示效果
+      if (this.id === 'gfwlist-enabled') {
+        updateAllowedSitesSection(!currentState);
+      }
     });
   });
 }