feat: connect search and project settings

2026-07-21 17:16:45 +08:00
parent 2275d388a7
commit 000de4bcdb
14 changed files with 698 additions and 141 deletions
--- a/apps/web_v1/src/App.css
+++ b/apps/web_v1/src/App.css
@@ -267,6 +267,52 @@
  border-radius: 0;
 }

+.search-results-dropdown {
+  width: min(680px, calc(100vw - 32px));
+  max-height: 360px;
+  overflow-y: auto;
+  padding: var(--space-2);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-control);
+  background: var(--color-panel);
+  box-shadow: 0 12px 32px rgba(29, 33, 41, 0.18);
+}
+
+.search-result-item {
+  display: grid;
+  width: 100%;
+  gap: var(--space-1);
+  padding: var(--space-2) var(--space-3);
+  border: 0;
+  border-radius: var(--radius-control);
+  color: var(--color-text);
+  background: transparent;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search-result-item:hover,
+.search-result-item:focus-visible {
+  background: var(--color-soft-blue);
+  outline: none;
+}
+
+.search-result-heading {
+  display: flex;
+  justify-content: space-between;
+  gap: var(--space-3);
+}
+
+.search-result-type {
+  flex: 0 0 auto;
+}
+
+.search-result-snippet {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .topbar-actions {
  justify-content: flex-end;
 }
--- a/apps/web_v1/src/app/App.tsx
+++ b/apps/web_v1/src/app/App.tsx
@@ -11,15 +11,18 @@ import {
  createTask,
  fetchProjectWorkspace,
  fetchProjects,
+  updateProject,
  updateTask,
  uploadSource,
 } from '../api/projects'
+import type { SearchResultDTO } from '../api/search'
 import { LoginPage } from '../pages/login'
 import { ProjectActionModals, type CronDraft, type ProjectActionModal, type ProjectDraft, type SourceDraft, type TaskDraft } from '../pages/projects/project-action-modals'
 import type { ProjectSettingsUpdate } from '../pages/projects/project-sidebar'
 import { ProjectPage } from '../pages/workspace-home'
 import type { WorkspaceTaskUpdate } from '../pages/workspace-body'
 import type { ChannelKey, Project, ProjectWorkspace, Screen, Theme, WorkbenchView } from '../pages/projects/project-types'
+import { useWorkbenchSearch } from './use-workbench-search'

 function App() {
  const [screen, setScreen] = useState<Screen>('login')
@@ -34,6 +37,7 @@ function App() {
  const [loading, setLoading] = useState(false)
  const [actionLoading, setActionLoading] = useState(false)
  const [activeModal, setActiveModal] = useState<ProjectActionModal>(null)
+  const workspaceSearch = useWorkbenchSearch(session)

  const dark = theme === 'dark'
  const activeWorkspace = workspaces.find((workspace) => workspace.project.id === activeProjectID) ?? workspaces[0]
@@ -210,23 +214,35 @@ function App() {
    }, '任务已更新')
  }

-  function handleUpdateProject(update: ProjectSettingsUpdate) {
-    setWorkspaces((current) =>
-      current.map((workspace) => {
-        if (workspace.project.id !== update.projectId) return workspace
-        const nextProject = {
-          ...workspace.project,
-          name: update.name,
-          identifier: update.identifier,
-          icon: update.icon,
-          background: update.background,
-          description: update.description,
-          short: projectIconLabel(update.icon, update.identifier || update.name.slice(0, 2)),
-          color: projectColor(update.background, workspace.project.color),
-        }
-        return { ...workspace, project: nextProject }
-      }),
-    )
+  async function handleUpdateProject(update: ProjectSettingsUpdate) {
+    const currentSession = requireSession()
+    await updateProject(currentSession, update.projectId, {
+      name: update.name,
+      identifier: update.identifier,
+      icon: update.icon,
+      background: update.background,
+      description: update.description,
+    })
+    await loadWorkspaces(currentSession, update.projectId)
+    Message.success('项目设置已更新')
+  }
+
+  function handleSelectSearchResult(result: SearchResultDTO) {
+    const owningWorkspace = workspaces.find((workspace) => workspace.project.id === result.projectId)
+    if (!owningWorkspace) {
+      Message.warning('该搜索结果所在项目当前不可访问')
+      return
+    }
+    const target = searchResultTarget(result.type)
+    if (!target) {
+      Message.warning('该搜索结果暂不支持导航')
+      return
+    }
+    setActiveProjectID(owningWorkspace.project.id)
+    setActiveView('project')
+    setActiveChannel(target.channel)
+    setActiveTaskID(target.openTask ? result.id : null)
+    if (result.type === 'note') setSelectedItem(result.title)
  }

  return (
@@ -267,6 +283,13 @@ function App() {
            onUpdateWorkspaceTask={handleUpdateWorkspaceTask}
            onUpdateProject={handleUpdateProject}
            onCreateProjectTag={handleCreateProjectTag}
+            searchQuery={workspaceSearch.query}
+            searchLoading={workspaceSearch.loading}
+            searchSearched={workspaceSearch.searched}
+            searchResults={workspaceSearch.results}
+            onSearchQueryChange={workspaceSearch.onQueryChange}
+            onSearch={() => void workspaceSearch.onSearch()}
+            onSelectSearchResult={handleSelectSearchResult}
          />
        ) : (
          <Spin loading />
@@ -286,18 +309,11 @@ function App() {
  )
 }

-function projectIconLabel(icon: string, fallback: string) {
-  const trimmed = icon.trim()
-  if (!trimmed) return fallback
-  const chars = Array.from(trimmed)
-  if (chars.length <= 2) return trimmed
-  return chars.slice(0, 2).join('').toUpperCase()
-}
-
-function projectColor(background: string, fallback: string) {
-  const trimmed = background.trim()
-  if (trimmed.startsWith('#') || trimmed.startsWith('rgb') || trimmed.startsWith('hsl')) return trimmed
-  return fallback
+function searchResultTarget(type: string): { channel: ChannelKey; openTask: boolean } | null {
+  if (type === 'project') return { channel: 'overview', openTask: false }
+  if (type === 'task') return { channel: 'tasks', openTask: true }
+  if (type === 'note') return { channel: 'notes', openTask: false }
+  return null
 }

 export default App
--- a/apps/web_v1/src/app/use-workbench-search.ts
+++ b/apps/web_v1/src/app/use-workbench-search.ts
@@ -0,0 +1,58 @@
+import { useRef, useState } from 'react'
+import { Message } from '@arco-design/web-react'
+import type { ApiSession } from '../api/client'
+import { searchWorkspace, type SearchResultDTO } from '../api/search'
+
+export function useWorkbenchSearch(session: ApiSession | null) {
+  const [query, setQuery] = useState('')
+  const [results, setResults] = useState<SearchResultDTO[]>([])
+  const [loading, setLoading] = useState(false)
+  const [searched, setSearched] = useState(false)
+  const requestSequence = useRef(0)
+
+  function changeQuery(value: string) {
+    requestSequence.current += 1
+    setQuery(value)
+    setLoading(false)
+    setSearched(false)
+  }
+
+  async function submitSearch() {
+    const requestID = ++requestSequence.current
+    const trimmedQuery = query.trim()
+    if (!trimmedQuery) {
+      setResults([])
+      setSearched(false)
+      Message.warning('请输入搜索关键词')
+      return
+    }
+    if (!session) {
+      Message.error('未登录或登录已失效')
+      return
+    }
+
+    setLoading(true)
+    setSearched(false)
+    try {
+      const response = await searchWorkspace(session, trimmedQuery)
+      if (requestID !== requestSequence.current) return
+      setResults(response.items)
+      setSearched(true)
+    } catch (error) {
+      if (requestID !== requestSequence.current) return
+      setResults([])
+      Message.error(error instanceof Error ? error.message : '搜索失败，请稍后重试')
+    } finally {
+      if (requestID === requestSequence.current) setLoading(false)
+    }
+  }
+
+  return {
+    query,
+    results,
+    loading,
+    searched,
+    onQueryChange: changeQuery,
+    onSearch: submitSearch,
+  }
+}
--- a/apps/web_v1/src/pages/projects/project-sidebar.tsx
+++ b/apps/web_v1/src/pages/projects/project-sidebar.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { Badge, Button, Divider, Input, Layout, Modal, Space, Typography } from '@arco-design/web-react'
+import { Alert, Badge, Button, Divider, Input, Layout, Modal, Space, Typography } from '@arco-design/web-react'
 import { IconApps, IconDashboard, IconMore, IconPlus, IconSettings } from '@arco-design/web-react/icon'
 import type { ChannelKey, ProjectChannel, ProjectWorkspace, WorkbenchView } from './project-types'

@@ -29,11 +29,13 @@ export function ProjectSidebar({
  activeChannel: ChannelKey
  onSelectChannel: (key: ChannelKey) => void
  onSelectItem: (title: string) => void
-  onUpdateProject: (update: ProjectSettingsUpdate) => void
+  onUpdateProject: (update: ProjectSettingsUpdate) => Promise<void>
 }) {
  const workspaceMode = activeView === 'workspace'
  const channels = activeWorkspace.channels
  const [settingsOpen, setSettingsOpen] = useState(false)
+  const [settingsSaving, setSettingsSaving] = useState(false)
+  const [settingsError, setSettingsError] = useState('')
  const [draft, setDraft] = useState({
    name: activeWorkspace.project.name,
    identifier: activeWorkspace.project.identifier,
@@ -44,6 +46,7 @@ export function ProjectSidebar({

  useEffect(() => {
    if (!settingsOpen) return
+    setSettingsError('')
    setDraft({
      name: activeWorkspace.project.name,
      identifier: activeWorkspace.project.identifier,
@@ -61,7 +64,7 @@ export function ProjectSidebar({
          {workspaceMode ? <IconApps /> : <span className="project-title-icon">{projectIcon}</span>}
          <Title heading={5}>{workspaceMode ? '工作台' : activeWorkspace.project.name}</Title>
        </Space>
-        <Button icon={<IconSettings />} size="mini" onClick={() => setSettingsOpen(true)} />
+        <Button aria-label="编辑项目设置" icon={<IconSettings />} size="mini" onClick={() => setSettingsOpen(true)} />
      </div>

      <div className="channel-list">
@@ -113,20 +116,34 @@ export function ProjectSidebar({
        className="action-modal"
        title="编辑项目"
        visible={settingsOpen}
-        onCancel={() => setSettingsOpen(false)}
-        onOk={() => {
-          onUpdateProject({
-            projectId: activeWorkspace.project.id,
-            name: draft.name.trim() || activeWorkspace.project.name,
-            identifier: draft.identifier.trim(),
-            icon: draft.icon.trim(),
-            background: draft.background.trim(),
-            description: draft.description.trim(),
-          })
-          setSettingsOpen(false)
+        confirmLoading={settingsSaving}
+        maskClosable={!settingsSaving}
+        cancelButtonProps={{ disabled: settingsSaving }}
+        onCancel={() => {
+          if (!settingsSaving) setSettingsOpen(false)
+        }}
+        onOk={async () => {
+          setSettingsSaving(true)
+          setSettingsError('')
+          try {
+            await onUpdateProject({
+              projectId: activeWorkspace.project.id,
+              name: draft.name.trim() || activeWorkspace.project.name,
+              identifier: draft.identifier.trim(),
+              icon: draft.icon.trim(),
+              background: draft.background.trim(),
+              description: draft.description.trim(),
+            })
+            setSettingsOpen(false)
+          } catch (error) {
+            setSettingsError(error instanceof Error ? error.message : '项目设置保存失败，请稍后重试')
+          } finally {
+            setSettingsSaving(false)
+          }
        }}
      >
        <Space direction="vertical" size={12} className="action-form">
+          {settingsError && <Alert className="project-settings-error" type="error" content={settingsError} />}
          <label>
            <Text>名称</Text>
            <Input value={draft.name} onChange={(name) => setDraft((value) => ({ ...value, name }))} />
--- a/apps/web_v1/src/pages/projects/project-topbar.tsx
+++ b/apps/web_v1/src/pages/projects/project-topbar.tsx
@@ -1,23 +1,102 @@
-import { Button, Input, Layout, Space, Typography } from '@arco-design/web-react'
+import { useEffect, useState } from 'react'
+import { Button, Dropdown, Input, Layout, List, Space, Typography } from '@arco-design/web-react'
 import { IconApps, IconMoon, IconSearch, IconSun } from '@arco-design/web-react/icon'
+import type { SearchResultDTO } from '../../api/search'
 import type { Theme } from './project-types'

 const { Header } = Layout
 const { Text } = Typography

-export function ProjectTopbar({ theme, onToggleTheme }: { theme: Theme; onToggleTheme: () => void }) {
+export function ProjectTopbar({
+  theme,
+  onToggleTheme,
+  query,
+  loading,
+  searched,
+  results,
+  onQueryChange,
+  onSearch,
+  onSelectSearchResult,
+}: {
+  theme: Theme
+  onToggleTheme: () => void
+  query: string
+  loading: boolean
+  searched: boolean
+  results: SearchResultDTO[]
+  onQueryChange: (value: string) => void
+  onSearch: () => void
+  onSelectSearchResult: (result: SearchResultDTO) => void
+}) {
  const desktop = isDesktopRuntime()
+  const [popupVisible, setPopupVisible] = useState(false)
+
+  useEffect(() => {
+    if (!loading && searched) setPopupVisible(true)
+  }, [loading, results, searched])
+
+  const submitSearch = () => {
+    setPopupVisible(false)
+    onSearch()
+  }
+
+  const searchResults = (
+    <div className="search-results-dropdown" aria-label="搜索结果">
+      <List<SearchResultDTO>
+        size="small"
+        bordered={false}
+        dataSource={results}
+        noDataElement="未找到匹配结果"
+        render={(result) => (
+          <List.Item key={`${result.type}:${result.id}`}>
+            <button
+              type="button"
+              className="search-result-item"
+              onClick={() => {
+                setPopupVisible(false)
+                onSelectSearchResult(result)
+              }}
+            >
+              <span className="search-result-heading">
+                <Text>{result.title}</Text>
+                <Text className="search-result-type" type="secondary">{searchTypeLabel(result.type)}</Text>
+              </span>
+              {result.snippet && <Text className="search-result-snippet" type="secondary">{result.snippet}</Text>}
+            </button>
+          </List.Item>
+        )}
+      />
+    </div>
+  )

  return (
    <Header className="topbar">
      <div className="brand-lockup">
-        <img className="brand-icon" src="/senlinai-icon.svg" alt="" aria-hidden="true" />
+        <img className="brand-icon" src="/senlinai-icon.svg" alt="" />
        <Text className="brand-name">森林AI</Text>
      </div>
-      <div className="global-search" role="search">
-        <Input size="large" prefix={<IconSearch />} placeholder="搜索项目、频道、文档、任务、联系人..." />
-        <Button size="large" type="primary">搜索</Button>
-      </div>
+      <Dropdown
+        droplist={searchResults}
+        popupVisible={popupVisible && searched}
+        trigger="click"
+        position="bl"
+        onVisibleChange={(visible) => setPopupVisible(visible && searched)}
+      >
+        <div className="global-search" role="search">
+          <Input
+            size="large"
+            prefix={<IconSearch />}
+            placeholder="搜索项目、任务和笔记"
+            value={query}
+            onChange={(value) => {
+              setPopupVisible(false)
+              onQueryChange(value)
+            }}
+            onPressEnter={submitSearch}
+          />
+          <Button size="large" type="primary" loading={loading} onClick={submitSearch}>搜索</Button>
+        </div>
+      </Dropdown>
      <Space className="topbar-actions">
        <Button aria-label={theme === 'dark' ? '切换浅色模式' : '切换深色模式'} icon={theme === 'dark' ? <IconSun /> : <IconMoon />} onClick={onToggleTheme} />
        {desktop && (
@@ -32,6 +111,12 @@ export function ProjectTopbar({ theme, onToggleTheme }: { theme: Theme; onToggle
  )
 }

+function searchTypeLabel(type: SearchResultDTO['type']) {
+  if (type === 'project') return '项目'
+  if (type === 'task') return '任务'
+  return '笔记'
+}
+
 function isDesktopRuntime() {
  return typeof window !== 'undefined' && '__TAURI__' in window
 }
--- a/apps/web_v1/src/pages/workspace-home.tsx
+++ b/apps/web_v1/src/pages/workspace-home.tsx
@@ -7,6 +7,7 @@ import { ProjectRail } from './projects/project-rail'
 import { ProjectSidebar, type ProjectSettingsUpdate } from './projects/project-sidebar'
 import { ProjectStatusbar } from './projects/project-statusbar'
 import { ProjectTopbar } from './projects/project-topbar'
+import type { SearchResultDTO } from '../api/search'
 import type { ChannelKey, Project, ProjectWorkspace, Theme, WorkbenchView } from './projects/project-types'

 const { Content } = Layout
@@ -33,6 +34,13 @@ export function ProjectPage({
  onUpdateWorkspaceTask,
  onUpdateProject,
  onCreateProjectTag,
+  searchQuery,
+  searchLoading,
+  searchSearched,
+  searchResults,
+  onSearchQueryChange,
+  onSearch,
+  onSelectSearchResult,
 }: {
  activeView: WorkbenchView
  activeWorkspace: ProjectWorkspace
@@ -53,8 +61,15 @@ export function ProjectPage({
  onUploadSource: () => void
  onCreateCronPlan: () => void
  onUpdateWorkspaceTask: (update: WorkspaceTaskUpdate) => void
-  onUpdateProject: (update: ProjectSettingsUpdate) => void
+  onUpdateProject: (update: ProjectSettingsUpdate) => Promise<void>
  onCreateProjectTag: (name: string) => void
+  searchQuery: string
+  searchLoading: boolean
+  searchSearched: boolean
+  searchResults: SearchResultDTO[]
+  onSearchQueryChange: (value: string) => void
+  onSearch: () => void
+  onSelectSearchResult: (result: SearchResultDTO) => void
 }) {
  const isProject = activeView === 'project'
  const projects = workspaces.map((workspace) => workspace.project)
@@ -72,7 +87,17 @@ export function ProjectPage({

  return (
    <Layout className="workbench-shell">
-      <ProjectTopbar theme={theme} onToggleTheme={onToggleTheme} />
+      <ProjectTopbar
+        theme={theme}
+        onToggleTheme={onToggleTheme}
+        query={searchQuery}
+        loading={searchLoading}
+        searched={searchSearched}
+        results={searchResults}
+        onQueryChange={onSearchQueryChange}
+        onSearch={onSearch}
+        onSelectSearchResult={onSelectSearchResult}
+      />

      <Layout className="workbench-main" hasSider>
        <ProjectRail