Compare commits

..

2 Commits

4 changed files with 424 additions and 12 deletions

View File

@@ -260,13 +260,19 @@ def init_db():
if cursor.fetchone()[0] == 0:
default_configs = [
('app_name', 'AI助手', '应用名称'),
('app_version', '3.5.1', '应用版本'),
('app_version', '3.10.0', '应用版本'),
('llm_provider', 'zhipu', '默认大模型提供商'),
('enable_search', 'true', '是否启用联网搜索'),
('guest_chat_sessions', '1', '游客每日对话会话限制'),
('guest_chat_messages', '20', '游客每日对话消息限制'),
('guest_agent_messages', '20', '游客每日智能体消息限制'),
('admin_password', 'admin123', '管理员密码'),
('app_developer', 'OpenClaw Team', '开发者'),
('app_update_date', '2026-04-27', '更新日期'),
('app_technology', '智谱 GLM-4.5-Air 大模型', '技术基础'),
('app_description', '提供智能对话、多种智能体服务', '应用简介'),
('privacy_policy_url', '', '隐私政策链接'),
('user_agreement_url', '', '用户协议链接'),
]
for key, value, desc in default_configs:
cursor.execute('INSERT INTO system_configs (key, value, description) VALUES (?, ?, ?)', (key, value, desc))
@@ -1326,6 +1332,10 @@ def get_frontend_config():
cursor.execute('SELECT * FROM tool_configs WHERE is_default=1 AND is_active=1')
tools = [dict(row) for row in cursor.fetchall()]
# 获取所有活跃的工具配置(供前端选择)
cursor.execute('SELECT tool_id, name, type, provider, is_active FROM tool_configs WHERE is_active=1')
allTools = [dict(row) for row in cursor.fetchall()]
# 获取所有智能体(上线且活跃)
cursor.execute('SELECT agent_id, name, avatar, category, description, system_prompt, heat, tags, enable_tools FROM agents WHERE is_online=1 AND is_active=1')
agents = [dict(row) for row in cursor.fetchall()]
@@ -1343,17 +1353,24 @@ def get_frontend_config():
config = {
'llm': dict(llm) if llm else None,
'tools': tools,
'allTools': allTools, # 所有活跃的工具(供前端选择)
'agents': agents,
'chat_config': dict(chat_config) if chat_config else None,
'system': {
'appName': system.get('app_name', 'AI助手'),
'version': system.get('app_version', '3.6.0'),
'version': system.get('app_version', '3.10.0'),
'enableSearch': system.get('enable_search', 'true') == 'true',
'guestLimits': {
'chatSessions': int(system.get('guest_chat_sessions', '1')),
'chatMessages': int(system.get('guest_chat_messages', '20')),
'agentMessages': int(system.get('guest_agent_messages', '20')),
}
},
'developer': system.get('app_developer', 'OpenClaw Team'),
'updateDate': system.get('app_update_date', '2026-04-27'),
'technology': system.get('app_technology', '智谱 GLM-4.5-Air 大模型'),
'description': system.get('app_description', '提供智能对话、多种智能体服务'),
'privacyPolicyUrl': system.get('privacy_policy_url', ''),
'userAgreementUrl': system.get('user_agreement_url', ''),
}
}

View File

@@ -1355,6 +1355,26 @@ async function loadSystemPage(content) {
<input type="text" class="form-input" id="appVersion" value="${systemConfigs.app_version?.value || ''}">
</div>
<div class="form-group">
<label class="form-label">应用简介</label>
<input type="text" class="form-input" id="appDescription" value="${systemConfigs.app_description?.value || ''}" placeholder="如:提供智能对话、多种智能体服务">
</div>
<div class="form-group">
<label class="form-label">技术基础</label>
<input type="text" class="form-input" id="appTechnology" value="${systemConfigs.app_technology?.value || ''}" placeholder="如:智谱 GLM-4.5-Air 大模型">
</div>
<div class="form-group">
<label class="form-label">开发者</label>
<input type="text" class="form-input" id="appDeveloper" value="${systemConfigs.app_developer?.value || ''}" placeholder="如OpenClaw Team">
</div>
<div class="form-group">
<label class="form-label">更新日期</label>
<input type="text" class="form-input" id="appUpdateDate" value="${systemConfigs.app_update_date?.value || ''}" placeholder="如2026-04-27">
</div>
<h3 style="margin: 24px 0 16px; padding-top: 16px; border-top: 1px solid #e2e8f0;">游客使用限制</h3>
<div class="form-group">
@@ -1379,6 +1399,18 @@ async function loadSystemPage(content) {
<input type="text" class="form-input" id="adminPassword" value="${systemConfigs.admin_password?.value || ''}" placeholder="修改管理员密码">
</div>
<h3 style="margin: 24px 0 16px; padding-top: 16px; border-top: 1px solid #e2e8f0;">链接配置</h3>
<div class="form-group">
<label class="form-label">隐私政策链接</label>
<input type="text" class="form-input" id="privacyPolicyUrl" value="${systemConfigs.privacy_policy_url?.value || ''}" placeholder="隐私政策页面URL">
</div>
<div class="form-group">
<label class="form-label">用户协议链接</label>
<input type="text" class="form-input" id="userAgreementUrl" value="${systemConfigs.user_agreement_url?.value || ''}" placeholder="用户协议页面URL">
</div>
<button class="form-submit" onclick="saveSystemConfig()">保存设置</button>
</div>
@@ -1394,10 +1426,16 @@ async function saveSystemConfig() {
const data = {
app_name: document.getElementById('appName').value,
app_version: document.getElementById('appVersion').value,
app_description: document.getElementById('appDescription').value,
app_technology: document.getElementById('appTechnology').value,
app_developer: document.getElementById('appDeveloper').value,
app_update_date: document.getElementById('appUpdateDate').value,
guest_chat_sessions: document.getElementById('guestChatSessions').value,
guest_chat_messages: document.getElementById('guestChatMessages').value,
guest_agent_messages: document.getElementById('guestAgentMessages').value,
admin_password: document.getElementById('adminPassword').value
admin_password: document.getElementById('adminPassword').value,
privacy_policy_url: document.getElementById('privacyPolicyUrl').value,
user_agreement_url: document.getElementById('userAgreementUrl').value,
};
await fetchAPI('/api/admin/system', 'POST', data);

View File

@@ -116,6 +116,16 @@ async function loadBackendConfig() {
};
}
// 加载工具列表
if (backendConfig.allTools) {
allTools = backendConfig.allTools;
}
// 加载默认启用的工具
if (backendConfig.tools) {
enabledTools = backendConfig.tools.map(t => t.tool_id);
}
updateAgentsDisplay();
console.log('后台配置已加载', backendConfig);
} catch (e) {
@@ -282,6 +292,8 @@ function getAgentConversationHistory(limit = 5) {
let enableThinking = false; // 深度思考
let enableSearch = false; // 联网搜索
let autoScrollEnabled = true; // 自动滚动(用户滚动后可关闭)
let enabledTools = []; // 启用的工具列表(多选)
let allTools = []; // 所有可用的工具列表
// DOM 元素(初始为 null在 openConversation 时重新获取)
let appContainer = null;
@@ -1602,8 +1614,8 @@ function renderProfilePage() {
</div>
<div class="profile-footer">
<p>AI助手 v3.6.0</p>
<p>基于智谱 GLM-4.5-Air</p>
<p>${CONFIG?.system?.appName || 'AI助手'} v${CONFIG?.system?.version || '3.10.0'}</p>
<p>基于 ${CONFIG?.system?.technology || '智谱 GLM-4.5-Air'}</p>
</div>
</div>
</div>
@@ -2524,6 +2536,13 @@ function showHelpPage() {
// ==================== 关于页面 ====================
function showAboutPage() {
const appName = CONFIG?.system?.appName || 'AI助手';
const version = CONFIG?.system?.version || '3.10.0';
const developer = CONFIG?.system?.developer || 'OpenClaw Team';
const updateDate = CONFIG?.system?.updateDate || '2026-04-27';
const technology = CONFIG?.system?.technology || '智谱 GLM-4.5-Air 大模型';
const description = CONFIG?.system?.description || '提供智能对话、多种智能体服务';
const aboutHtml = `
<div class="settings-page">
<header class="settings-header">
@@ -2535,22 +2554,22 @@ function showAboutPage() {
<div class="settings-content about-content">
<div class="about-logo">🤖</div>
<div class="about-name">AI助手</div>
<div class="about-version">v3.5.0</div>
<div class="about-name">${appName}</div>
<div class="about-version">v${version}</div>
<div class="about-info">
<p>基于智谱 GLM-4.5-Air 大模型</p>
<p>提供智能对话、多种智能体服务</p>
<p>基于 ${technology}</p>
<p>${description}</p>
</div>
<div class="about-section">
<div class="about-item">
<span class="about-label">开发者</span>
<span class="about-value">OpenClaw Team</span>
<span class="about-value">${developer}</span>
</div>
<div class="about-item">
<span class="about-label">更新日期</span>
<span class="about-value">2026-04-27</span>
<span class="about-value">${updateDate}</span>
</div>
</div>
@@ -3122,6 +3141,11 @@ function showAgentChatPage() {
<svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 7 9.5 7 14 9.01 14 9.5 11.99 14 9.5 14z"/></svg>
<span>联网搜索</span>
</button>
<button class="feature-btn tools-btn" id="moreToolsBtn">
<svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/></svg>
<span>更多工具</span>
${enabledTools.length > 0 ? `<span class="tools-count">${enabledTools.length}</span>` : ''}
</button>
</div>
<div class="feature-right">
<button class="feature-btn nav-btn" id="scrollTopBtn">
@@ -3213,6 +3237,14 @@ function showAgentChatPage() {
});
}
// 绑定更多工具按钮
const moreToolsBtn = document.getElementById('moreToolsBtn');
if (moreToolsBtn) {
moreToolsBtn.addEventListener('click', () => {
showToolsSelector();
});
}
// 绑定输入事件
userInput.addEventListener('keydown', handleKeyDown);
userInput.addEventListener('input', (e) => autoResize(e.target));
@@ -3608,6 +3640,11 @@ function openConversation(id) {
<svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 7 9.5 7 14 9.01 14 9.5 11.99 14 9.5 14z"/></svg>
<span>联网搜索</span>
</button>
<button class="feature-btn tools-btn" id="moreToolsBtn">
<svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/></svg>
<span>更多工具</span>
${enabledTools.length > 0 ? `<span class="tools-count">${enabledTools.length}</span>` : ''}
</button>
</div>
<div class="feature-right">
<button class="feature-btn nav-btn" id="scrollTopBtn" title="回到顶部">
@@ -3690,6 +3727,14 @@ function openConversation(id) {
});
}
// 绑定更多工具按钮
const moreToolsBtn = document.getElementById('moreToolsBtn');
if (moreToolsBtn) {
moreToolsBtn.addEventListener('click', () => {
showToolsSelector();
});
}
// 绑定置顶置底按钮事件
const scrollTopBtn = document.getElementById('scrollTopBtn');
const scrollBottomBtn = document.getElementById('scrollBottomBtn');
@@ -4084,6 +4129,131 @@ function logStatsToBackend(type, key, value = 1) {
}).catch(e => console.error('统计记录失败:', e));
}
// 显示工具选择弹窗
function showToolsSelector() {
if (allTools.length === 0) {
showToast('暂无可用工具');
return;
}
// 工具类型图标映射
const toolIcons = {
search: '🔍',
calculator: '🧮',
image: '🎨',
code: '💻',
weather: '🌤️',
custom: '🔧'
};
const toolsHtml = allTools.map(tool => `
<div class="tool-option ${enabledTools.includes(tool.tool_id) ? 'selected' : ''}" data-tool-id="${tool.tool_id}">
<div class="tool-checkbox">
<svg viewBox="0 0 24 24" width="20" height="20">
${enabledTools.includes(tool.tool_id)
? '<path fill="currentColor" d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 14l-5-5 1.41-1.41L12 14.17l4.59-4.58L18 10l-6 6z"/>'
: '<path fill="currentColor" d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>'
}
</svg>
</div>
<div class="tool-icon">${toolIcons[tool.type] || '🔧'}</div>
<div class="tool-info">
<div class="tool-name">${tool.name}</div>
<div class="tool-type">${tool.type}</div>
</div>
</div>
`).join('');
const popupHtml = `
<div class="tools-popup" id="toolsPopup">
<div class="tools-popup-content">
<div class="tools-popup-header">
<h3>选择工具</h3>
<button class="tools-popup-close" id="toolsPopupClose">×</button>
</div>
<div class="tools-popup-body">
<p class="tools-popup-tip">勾选要启用的工具(多选)</p>
<div class="tools-list">
${toolsHtml}
</div>
</div>
<div class="tools-popup-footer">
<button class="tools-popup-btn cancel" id="toolsCancelBtn">取消</button>
<button class="tools-popup-btn confirm" id="toolsConfirmBtn">确认</button>
</div>
</div>
</div>
`;
// 添加到页面
const existingPopup = document.getElementById('toolsPopup');
if (existingPopup) existingPopup.remove();
document.body.appendChild(document.createElement('div'));
document.body.lastElementChild.outerHTML = popupHtml;
// 绑定事件
document.querySelectorAll('.tool-option').forEach(option => {
option.addEventListener('click', () => {
option.classList.toggle('selected');
// 更新复选框图标
const checkbox = option.querySelector('.tool-checkbox svg');
const isSelected = option.classList.contains('selected');
checkbox.innerHTML = isSelected
? '<path fill="currentColor" d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 14l-5-5 1.41-1.41L12 14.17l4.59-4.58L18 10l-6 6z"/>'
: '<path fill="currentColor" d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>';
});
});
// 关闭按钮
document.getElementById('toolsPopupClose').addEventListener('click', closeToolsPopup);
document.getElementById('toolsCancelBtn').addEventListener('click', closeToolsPopup);
document.getElementById('toolsConfirmBtn').addEventListener('click', confirmToolsSelection);
// 点击背景关闭
document.getElementById('toolsPopup').addEventListener('click', (e) => {
if (e.target.id === 'toolsPopup') {
closeToolsPopup();
}
});
}
function closeToolsPopup() {
const popup = document.getElementById('toolsPopup');
if (popup) popup.remove();
}
function confirmToolsSelection() {
// 获取选中的工具
const selectedTools = [];
document.querySelectorAll('.tool-option.selected').forEach(option => {
selectedTools.push(option.getAttribute('data-tool-id'));
});
enabledTools = selectedTools;
// 更新按钮显示
const moreToolsBtn = document.getElementById('moreToolsBtn');
if (moreToolsBtn) {
const countSpan = moreToolsBtn.querySelector('.tools-count');
if (enabledTools.length > 0) {
if (countSpan) {
countSpan.textContent = enabledTools.length;
} else {
const span = document.createElement('span');
span.className = 'tools-count';
span.textContent = enabledTools.length;
moreToolsBtn.appendChild(span);
}
} else if (countSpan) {
countSpan.remove();
}
}
closeToolsPopup();
showToast(`已启用 ${enabledTools.length} 个工具`);
}
// 渲染头像(支持 emoji 和上传的图片)
function renderAvatar(avatar) {
if (!avatar) return '👤';

View File

@@ -2740,6 +2740,193 @@ body {
flex-shrink: 0;
}
/* 更多工具按钮 */
.tools-btn {
position: relative;
}
.tools-count {
position: absolute;
top: -4px;
right: -4px;
min-width: 16px;
height: 16px;
padding: 0 4px;
background: #ef4444;
color: white;
font-size: 11px;
font-weight: 600;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
}
/* 工具选择弹窗 */
.tools-popup {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
}
.tools-popup-content {
width: 90%;
max-width: 400px;
background: white;
border-radius: 16px;
overflow: hidden;
}
.tools-popup-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 16px 20px;
background: linear-gradient(135deg, var(--primary) 0%, #764ba2 100%);
color: white;
}
.tools-popup-header h3 {
margin: 0;
font-size: 18px;
}
.tools-popup-close {
width: 28px;
height: 28px;
display: flex;
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 0.2);
border: none;
border-radius: 14px;
color: white;
font-size: 20px;
cursor: pointer;
transition: background 0.2s;
}
.tools-popup-close:hover {
background: rgba(255, 255, 255, 0.3);
}
.tools-popup-body {
padding: 16px 20px;
}
.tools-popup-tip {
color: #718096;
font-size: 13px;
margin-bottom: 16px;
}
.tools-list {
display: flex;
flex-direction: column;
gap: 12px;
max-height: 300px;
overflow-y: auto;
}
.tool-option {
display: flex;
align-items: center;
gap: 12px;
padding: 12px 16px;
background: #f5f7fa;
border: 2px solid transparent;
border-radius: 12px;
cursor: pointer;
transition: all 0.2s;
}
.tool-option:hover {
background: #e8ecf1;
}
.tool-option.selected {
background: rgba(102, 126, 234, 0.1);
border-color: var(--primary);
}
.tool-checkbox {
flex-shrink: 0;
color: #718096;
}
.tool-option.selected .tool-checkbox {
color: var(--primary);
}
.tool-icon {
width: 40px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
background: white;
border-radius: 10px;
font-size: 20px;
}
.tool-info {
flex: 1;
}
.tool-name {
font-weight: 500;
color: #2d3748;
}
.tool-type {
font-size: 12px;
color: #718096;
margin-top: 2px;
}
.tools-popup-footer {
display: flex;
gap: 12px;
padding: 16px 20px;
background: #f5f7fa;
}
.tools-popup-btn {
flex: 1;
padding: 12px;
border: none;
border-radius: 10px;
font-size: 14px;
font-weight: 500;
cursor: pointer;
transition: all 0.2s;
}
.tools-popup-btn.cancel {
background: #e2e8f0;
color: #4a5568;
}
.tools-popup-btn.cancel:hover {
background: #cbd5e0;
}
.tools-popup-btn.confirm {
background: linear-gradient(135deg, var(--primary) 0%, #764ba2 100%);
color: white;
}
.tools-popup-btn.confirm:hover {
transform: scale(1.02);
}
/* 导航按钮样式 */
.nav-btn {
padding: 6px 8px;