feat(console): 媒体库统一（照片+视频，同库管理/切换/删除/滤镜，视频背景自动播放）；子菜单50/50行；数字输入去spinner加宽；照片模式网格线加强且开关生效

2026-09-01 21:13:58 +08:00
parent 48a866892e
commit a4afde9353
6 changed files with 115 additions and 67 deletions
@@ -3,7 +3,7 @@ import { css } from './styles'
 import { NS, zh, en, type WorktableKey } from './locales'
 import { isAbs, joinPath, parentPathOf, basenameOf } from './pathutil'
 import { splitStore, SplitWorkspace, setSplitT, setSplitEnv, type LayoutSpec, type SplitPane, type ConsoleCardData } from './split'
-import { photoStore } from './photoStore'
+import { photoStore, kindOf } from './photoStore'

 /**
 * dsh-worktable 客户端（v2）：侧边栏底部「工作台」区块。
@@ -1386,7 +1386,7 @@ function WorktableSection(props: any) {
          const stored = viewRef.current.consoleBgPhotoId ?? null
          const activeId = stored && records.some((r) => r.id === stored) ? stored : null
          return {
-            list: records.map((r) => ({ id: r.id, url: URL.createObjectURL(r.blob) })),
+            list: records.map((r) => ({ id: r.id, kind: r.kind, url: URL.createObjectURL(r.blob) })),
            activeId,
          }
        },
@@ -1394,7 +1394,7 @@ function WorktableSection(props: any) {
          const id = await photoStore.add(blob)
          persistView({ consoleBgPhotoId: id })
          try { localStorage.removeItem('dsh.worktable.consoleBgPhoto.v1') } catch {}
-          return { id, url: URL.createObjectURL(blob) }
+          return { id, kind: kindOf(blob), url: URL.createObjectURL(blob) }
        },
        setPhotoId: (id: string) => persistView({ consoleBgPhotoId: id }),
        removePhoto: async (id: string) => { await photoStore.remove(id) },
@@ -122,7 +122,7 @@ export const zh = {
  'console.bgLabel': '背景',
  'console.bgPlain': '纯色背景',
  'console.bgGlow': '流光背景',
-  'console.bgPhoto': '上传照片',
+  'console.bgPhoto': '上传媒体',
  'console.bgEdit': '背景设置',
  'console.bgEditPlain': '纯色背景设置',
  'console.bgEditGlow': '流光背景设置',
@@ -321,7 +321,7 @@ export const en = {
  'console.bgLabel': 'Background',
  'console.bgPlain': 'Plain',
  'console.bgGlow': 'Glow',
-  'console.bgPhoto': 'Photo',
+  'console.bgPhoto': 'Upload media',
  'console.bgEdit': 'Background settings',
  'console.bgEditPlain': 'Plain background',
  'console.bgEditGlow': 'Glow background',
@@ -6,7 +6,10 @@ const STORE = 'photoRecords'
 const LEGACY_STORE = 'consoleBgPhoto'
 const LEGACY_KEY = 'original'

-export type PhotoRecord = { id: string; createdAt: number; blob: Blob }
+export type MediaKind = 'photo' | 'video'
+export type PhotoRecord = { id: string; createdAt: number; kind: MediaKind; blob: Blob }
+
+export const kindOf = (blob: Blob): MediaKind => (blob.type && blob.type.indexOf('video/') === 0 ? 'video' : 'photo')

 function openDb(): Promise<IDBDatabase> {
  return new Promise((resolve, reject) => {
@@ -29,7 +32,7 @@ function getAll(db: IDBDatabase): Promise<PhotoRecord[]> {
      for (const v of req.result as unknown[]) {
        const r = v as PhotoRecord | null
        if (r && typeof r === 'object' && typeof (r as any).id === 'string' && (r as any).blob instanceof Blob) {
-          arr.push(r)
+          arr.push({ id: r.id, createdAt: r.createdAt, kind: kindOf(r.blob), blob: r.blob })
        }
      }
      arr.sort((a, b) => b.createdAt - a.createdAt)
@@ -56,7 +59,7 @@ export const photoStore = {
          req.onerror = () => reject(req.error)
        })
        if (blob) {
-          const rec: PhotoRecord = { id: 'legacy', createdAt: Date.now(), blob }
+          const rec: PhotoRecord = { id: 'legacy', createdAt: Date.now(), kind: kindOf(blob), blob }
          await new Promise<void>((resolve, reject) => {
            const tx = db.transaction(STORE, 'readwrite')
            tx.objectStore(STORE).put(rec, rec.id)
@@ -71,11 +74,11 @@ export const photoStore = {
    db.close()
    return []
  },
-  /** 新增一张原始照片，返回其 id（自动成为最新） */
+  /** 新增一条媒体（照片/视频），返回其 id（自动成为最新） */
  async add(blob: Blob): Promise<string> {
    const db = await openDb()
    const id = Date.now().toString(36) + Math.random().toString(36).slice(2, 7)
-    const rec: PhotoRecord = { id, createdAt: Date.now(), blob }
+    const rec: PhotoRecord = { id, createdAt: Date.now(), kind: kindOf(blob), blob }
    return new Promise((resolve, reject) => {
      const tx = db.transaction(STORE, 'readwrite')
      tx.objectStore(STORE).put(rec, rec.id)
@@ -247,8 +247,8 @@ type SplitEnv = {
    setShape: (s: 'square' | 'circle') => void
    getBg: () => 'plain' | 'glow' | 'photo'
    setBg: (m: 'plain' | 'glow' | 'photo') => void
-    getPhotoLib: () => Promise<{ list: { id: string; url: string }[]; activeId: string | null }>
-    addPhoto: (blob: Blob) => Promise<{ id: string; url: string }>
+    getPhotoLib: () => Promise<{ list: { id: string; kind: 'photo' | 'video'; url: string }[]; activeId: string | null }>
+    addPhoto: (blob: Blob) => Promise<{ id: string; kind: 'photo' | 'video'; url: string }>
    setPhotoId: (id: string) => void
    getPhotoHsl: (id: string) => { h: number; s: number; l: number }
    setPhotoHsl: (id: string, v: { h: number; s: number; l: number }) => void
@@ -1089,7 +1089,8 @@ function ConsolePane() {
  const [bg, setBgState] = useState<'plain' | 'glow' | 'photo'>(() => splitEnv?.console?.getBg?.() ?? 'glow')
  const [bgPhoto, setBgPhoto] = useState<string>('')
  const [photoId, setPhotoIdLocal] = useState<string>('')
-  const [photoList, setPhotoList] = useState<{ id: string; url: string }[]>([])
+  const [photoList, setPhotoList] = useState<{ id: string; kind: 'photo' | 'video'; url: string }[]>([])
+  const [bgVideo, setBgVideo] = useState<string>('')
  const [photoGrid, setPhotoGridState] = useState<boolean>(() => splitEnv?.console?.getPhotoGrid?.() ?? true)
  const photoUrlRef = useRef<string>('')
  const [openMenu, setOpenMenu] = useState<string | null>(null)
@@ -1121,7 +1122,7 @@ function ConsolePane() {
  const pickPhotoFile = () => {
    const input = document.createElement('input')
    input.type = 'file'
-    input.accept = 'image/*'
+    input.accept = 'image/*,video/*'
    input.onchange = () => {
      const file = input.files?.[0]
      if (!file) return
@@ -1129,23 +1130,24 @@ function ConsolePane() {
    }
    input.click()
  }
-  /** 新增照片：原始 Blob 存 IndexedDB（零压缩），显示用对象 URL；自动设为当前 */
+  /** 新增媒体（照片/视频）：原始 Blob 存 IndexedDB（零压缩），显示用对象 URL；自动设为当前 */
  const onFilePhoto = async (file: Blob) => {
    let id = ''
    let url = ''
+    let kind: 'photo' | 'video' = file.type && file.type.indexOf('video/') === 0 ? 'video' : 'photo'
    const rec = await (splitEnv?.console?.addPhoto?.(file) ?? Promise.resolve(null)).catch(() => null)
-    if (rec) { id = rec.id; url = rec.url } else {
+    if (rec) { id = rec.id; url = rec.url; kind = rec.kind } else {
      url = URL.createObjectURL(file)
    }
    photoUrlRef.current = url
    setPhotoIdLocal(id)
-    if (id) setPhotoList((prev) => [{ id, url }, ...prev])
-    setBgPhoto(url)
+    if (id) setPhotoList((prev) => [{ id, kind, url }, ...prev])
+    if (kind === 'video') { setBgPhoto(''); setBgVideo(url) } else { setBgVideo(''); setBgPhoto(url) }
    setBgState('photo')
    splitEnv?.console?.setBg?.('photo')
  }
-  /** 删除一张照片：当前使用的那张被删 → 切到最新一张；删光 → 回到流光背景 */
-  const removePhotoById = async (p: { id: string; url: string }) => {
+  /** 删除一条媒体：当前使用的那条被删 → 切到最新一条；删光 → 回到流光背景 */
+  const removePhotoById = async (p: { id: string; kind: 'photo' | 'video'; url: string }) => {
    try { await splitEnv?.console?.removePhoto?.(p.id) } catch {}
    try { URL.revokeObjectURL(p.url) } catch {}
    const nextList = photoList.filter((x) => x.id !== p.id)
@@ -1156,13 +1158,15 @@ function ConsolePane() {
        setPhotoIdLocal(next.id)
        splitEnv?.console?.setPhotoId?.(next.id)
        photoUrlRef.current = next.url
-        setBgPhoto(next.url)
+        setBgVideo(next.kind === 'video' ? next.url : '')
+        setBgPhoto(next.kind === 'video' ? '' : next.url)
        setBgState('photo')
        splitEnv?.console?.setBg?.('photo')
      } else {
        setPhotoIdLocal('')
        photoUrlRef.current = ''
        setBgPhoto('')
+        setBgVideo('')
        setBgState('glow')
        splitEnv?.console?.setBg?.('glow')
      }
@@ -1173,12 +1177,12 @@ function ConsolePane() {
    setPhotoGridState(next)
    splitEnv?.console?.setPhotoGrid?.(next)
  }
-  /** 在照片库中选中某张 */
-  const selectPhoto = (p: { id: string; url: string }) => {
+  /** 在媒体库中选中某条 */
+  const selectPhoto = (p: { id: string; kind: 'photo' | 'video'; url: string }) => {
    setPhotoIdLocal(p.id)
    splitEnv?.console?.setPhotoId?.(p.id)
    photoUrlRef.current = p.url
-    setBgPhoto(p.url)
+    if (p.kind === 'video') { setBgPhoto(''); setBgVideo(p.url) } else { setBgVideo(''); setBgPhoto(p.url) }
    setBgState('photo')
    splitEnv?.console?.setBg?.('photo')
  }
@@ -1271,7 +1275,8 @@ function ConsolePane() {
      if (active) {
        setPhotoIdLocal(active.id)
        photoUrlRef.current = active.url
-        setBgPhoto(active.url)
+        setBgVideo(active.kind === 'video' ? active.url : '')
+        setBgPhoto(active.kind === 'video' ? '' : active.url)
      }
    }).catch(() => {})
    return () => { alive = false }
@@ -1315,8 +1320,10 @@ function ConsolePane() {
    { mode: 'system', key: 'console.themeSystem' },
  ]
  return (
-    <div className="dsh-wt_console" data-wt-theme={resolvedTheme} data-wt-shape={shape} data-wt-grid={bg === 'photo' && !photoGrid ? 'off' : 'on'} style={bg === 'plain' ? { ['--wt-bg' as any]: 'hsl(' + plainHsl.h + ', ' + plainHsl.s + '%, ' + plainHsl.l + '%)' } : undefined}>
-      <span className="dsh-wt_consoleBg" aria-hidden style={bg === 'photo' && bgPhoto ? { backgroundImage: 'url("' + bgPhoto + '")', backgroundSize: 'cover', backgroundPosition: 'center', ...(photoHsl.h !== 0 || photoHsl.s !== 100 || photoHsl.l !== 100 ? { filter: 'hue-rotate(' + photoHsl.h + 'deg) saturate(' + photoHsl.s + '%) brightness(' + photoHsl.l + '%)' } : {}) } : bg === 'glow' && (glowHsl.h !== 0 || glowHsl.s !== 100 || glowHsl.l !== 100) ? { filter: 'hue-rotate(' + glowHsl.h + 'deg) saturate(' + glowHsl.s + '%) brightness(' + glowHsl.l + '%)' } : undefined}>{bg === 'glow' && (<><i className="dsh-wt_blob dsh-wt_blob1" /><i className="dsh-wt_blob dsh-wt_blob2" /><i className="dsh-wt_blob dsh-wt_blob3" /><i className="dsh-wt_blob dsh-wt_blob4" /></>)}</span>
+    <div className="dsh-wt_console" data-wt-theme={resolvedTheme} data-wt-shape={shape} data-wt-bg={bg} data-wt-grid={bg === 'photo' && !photoGrid ? 'off' : 'on'} style={bg === 'plain' ? { ['--wt-bg' as any]: 'hsl(' + plainHsl.h + ', ' + plainHsl.s + '%, ' + plainHsl.l + '%)' } : undefined}>
+      <span className="dsh-wt_consoleBg" aria-hidden style={bg === 'photo' && bgPhoto ? { backgroundImage: 'url("' + bgPhoto + '")', backgroundSize: 'cover', backgroundPosition: 'center', ...(photoHsl.h !== 0 || photoHsl.s !== 100 || photoHsl.l !== 100 ? { filter: 'hue-rotate(' + photoHsl.h + 'deg) saturate(' + photoHsl.s + '%) brightness(' + photoHsl.l + '%)' } : {}) } : bg === 'glow' && (glowHsl.h !== 0 || glowHsl.s !== 100 || glowHsl.l !== 100) ? { filter: 'hue-rotate(' + glowHsl.h + 'deg) saturate(' + glowHsl.s + '%) brightness(' + glowHsl.l + '%)' } : undefined}>
+        {bg === 'photo' && bgVideo && <video className="dsh-wt_consoleVid" src={bgVideo} autoPlay muted loop playsInline style={photoHsl.h !== 0 || photoHsl.s !== 100 || photoHsl.l !== 100 ? { filter: 'hue-rotate(' + photoHsl.h + 'deg) saturate(' + photoHsl.s + '%) brightness(' + photoHsl.l + '%)' } : undefined} />}
+        {bg === 'glow' && (<><i className="dsh-wt_blob dsh-wt_blob1" /><i className="dsh-wt_blob dsh-wt_blob2" /><i className="dsh-wt_blob dsh-wt_blob3" /><i className="dsh-wt_blob dsh-wt_blob4" /></>)}</span>
      {openMenu !== null && <div className="dsh-wt_dropMask" onClick={() => setOpenMenu(null)} />}
      <div className="dsh-wt_consoleScroll">
        <div ref={gridRef} className="dsh-wt_consoleGrid" style={{ ['--wt-cols' as any]: cols }}>
@@ -1410,15 +1417,19 @@ function ConsolePane() {
              </div>
              {bgEdit === 'photo' && (
                <>
-                  <button type="button" className="dsh-wt_dropItem" onClick={pickPhotoFile}><svg width="13" height="13" viewBox="0 0 16 16" aria-hidden><rect x="2.5" y="3.5" width="11" height="9" rx="1.5" fill="none" stroke="currentColor" strokeWidth="1.2" /><circle cx="5.8" cy="6.6" r="1.1" fill="currentColor" /><path d="M3.2 11.2l2.8-2.8 2.2 2.2 1.8-1.8 2.8 2.4" fill="none" stroke="currentColor" strokeWidth="1.2" /></svg>{T('console.bgPhoto')}</button>
                  <div className="dsh-wt_dropRow">
-                    <span className="dsh-wt_gridLabel">{T('console.bgGridLabel')}</span>
-                    <button type="button" className={'dsh-wt_switch' + (photoGrid ? ' dsh-wt_switchOn' : '')} aria-pressed={photoGrid} aria-label={T('console.bgGridLabel')} onClick={togglePhotoGrid}><span className="dsh-wt_switchKnob" /></button>
+                    <button type="button" className="dsh-wt_dropItem" onClick={pickPhotoFile}><svg width="13" height="13" viewBox="0 0 16 16" aria-hidden><rect x="2.5" y="3.5" width="11" height="9" rx="1.5" fill="none" stroke="currentColor" strokeWidth="1.2" /><circle cx="5.8" cy="6.6" r="1.1" fill="currentColor" /><path d="M3.2 11.2l2.8-2.8 2.2 2.2 1.8-1.8 2.8 2.4" fill="none" stroke="currentColor" strokeWidth="1.2" /></svg>{T('console.bgPhoto')}</button>
+                    <div className="dsh-wt_gridHalf">
+                      <span className="dsh-wt_gridLabel">{T('console.bgGridLabel')}</span>
+                      <button type="button" className={'dsh-wt_switch' + (photoGrid ? ' dsh-wt_switchOn' : '')} aria-pressed={photoGrid} aria-label={T('console.bgGridLabel')} onClick={togglePhotoGrid}><span className="dsh-wt_switchKnob" /></button>
+                    </div>
                  </div>
                  {photoList.length > 0 ? (
                    photoList.slice(0, 4).map((p) => (
                      <div key={p.id} className={'dsh-wt_dropRow dsh-wt_photoRow' + (photoId === p.id ? ' dsh-wt_photoRowOn' : '')} onClick={() => selectPhoto(p)}>
-                        <img className="dsh-wt_photoThumb" src={p.url} alt="" />
+                        {p.kind === 'video'
+                          ? <video className="dsh-wt_photoThumb" src={p.url} muted playsInline preload="metadata" />
+                          : <img className="dsh-wt_photoThumb" src={p.url} alt="" />}
                        <span className="dsh-wt_photoName">{photoId === p.id ? T('console.bgPhotoCurrent') : T('console.bgPhotoUse')}</span>
                        <button type="button" className="dsh-wt_dropTrash" title={T('console.bgPhotoDelete')} aria-label={T('console.bgPhotoDelete')} onClick={(e) => { e.stopPropagation(); removePhotoById(p) }}><svg width="11" height="11" viewBox="0 0 16 16" aria-hidden><path d="M2.5 4.2h11M6.5 4.2V2.9c0-.6.4-1 .9-1h1.2c.5 0 .9.4.9 1v1.3M4.2 4.2l.5 8.1c0 .7.5 1.2 1.2 1.2h4.2c.7 0 1.2-.5 1.2-1.2l.5-8.1" fill="none" stroke="currentColor" strokeWidth="1.1" strokeLinecap="round" /></svg></button>
                      </div>
@@ -441,7 +441,8 @@ export const css = xtermCss + '\n' + [
  '.dsh-wt_switchKnob{position:absolute;top:2px;left:2px;width:13px;height:13px;border-radius:50%;background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.4);transition:left .18s cubic-bezier(.22,.61,.36,1)}',
  '.dsh-wt_switchOn .dsh-wt_switchKnob{left:15px}',
  '.dsh-wt_console[data-wt-theme=light] .dsh-wt_switch{background:rgba(27,31,36,.15)}',
-  '.dsh-wt_console[data-wt-grid=off] .dsh-wt_consoleBg::after{display:none}',
+  '.dsh-wt_console[data-wt-bg=photo][data-wt-grid=on] .dsh-wt_consoleBg::after{background-image:linear-gradient(rgba(255,255,255,.16) 1px,transparent 1px),linear-gradient(90deg,rgba(255,255,255,.16) 1px,transparent 1px);background-size:30px 30px}',
+  '.dsh-wt_console[data-wt-bg=photo][data-wt-grid=off] .dsh-wt_consoleBg::after{display:none}',
  '.dsh-wt_hslHead{display:flex;align-items:center;gap:4px;padding:2px 4px 4px}',
  '.dsh-wt_hslBack{flex:none;width:20px;height:20px;padding:0;border:none;border-radius:6px;background:transparent;color:var(--wt-text3);cursor:pointer;font-size:14px;line-height:1;display:inline-flex;align-items:center;justify-content:center}',
  '.dsh-wt_hslBack:hover{background:var(--wt-chip);color:var(--wt-text)}',
@@ -449,7 +450,8 @@ export const css = xtermCss + '\n' + [
  '.dsh-wt_hslRow{display:flex;align-items:center;gap:4px;padding:2px 3px;width:100%;box-sizing:border-box}',
  '.dsh-wt_hslLabel{flex:none;width:10px;font-size:9px;font-weight:600;color:var(--wt-text3);text-align:center}',
  '.dsh-wt_hslSlider{flex:1;min-width:0;height:14px;accent-color:#4f8ef7;cursor:pointer}',
-  '.dsh-wt_hslInput{flex:none;width:36px;height:20px;padding:0 4px;border:1px solid var(--wt-border);border-radius:6px;background:var(--wt-chip);color:var(--wt-text2);font:inherit;font-size:10px;text-align:right;outline:none;box-sizing:border-box;font-variant-numeric:tabular-nums}',
+  '.dsh-wt_hslInput{flex:none;width:42px;height:20px;padding:0 4px;border:1px solid var(--wt-border);border-radius:6px;background:var(--wt-chip);color:var(--wt-text2);font:inherit;font-size:10px;text-align:right;outline:none;box-sizing:border-box;font-variant-numeric:tabular-nums;-moz-appearance:textfield;appearance:textfield}',
+  '.dsh-wt_hslInput::-webkit-outer-spin-button,.dsh-wt_hslInput::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}',
  '.dsh-wt_hslInput:focus{border-color:#4f8ef7;color:var(--wt-text)}',
  '.dsh-wt_hslReset{margin:4px 4px 2px;padding:5px 9px;border:none;border-radius:7px;background:var(--wt-chip);color:var(--wt-text2);font:inherit;font-size:12px;line-height:17px;cursor:pointer;text-align:center}',
  '.dsh-wt_hslReset:hover{background:rgba(79,142,247,.22);color:var(--wt-text)}',
@@ -460,6 +462,9 @@ export const css = xtermCss + '\n' + [
  '.dsh-wt_photoName{flex:1;min-width:0;font-size:11px;line-height:16px;color:var(--wt-text2);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}',
  '.dsh-wt_photoEmpty{padding:4px 4px 2px;font-size:11px;line-height:16px;color:var(--wt-text3)}',
  '.dsh-wt_hslDivider{height:1px;margin:5px 4px;background:var(--wt-border);opacity:.5}',
+  '.dsh-wt_consoleVid{position:absolute;inset:0;width:100%;height:100%;object-fit:cover}',
+  '.dsh-wt_gridHalf{flex:1;min-width:0;display:flex;align-items:center;justify-content:space-between;gap:4px;padding:0 4px;box-sizing:border-box}',
+  '.dsh-wt_photoThumb video,.dsh-wt_photoThumb{display:block}',
  '.dsh-wt_dropItemOn{background:var(--wt-chip);color:var(--wt-text);font-weight:600}',
  '.dsh-wt_hbar{position:relative;width:130px;height:26px;margin:4px auto;border-radius:999px;background:rgba(255,255,255,.08)}',
  '.dsh-wt_hbarFill{position:absolute;top:3px;bottom:3px;left:0;border-radius:999px;background:linear-gradient(90deg,#4f8ef7,#3b82f6);pointer-events:none;transition:width .25s cubic-bezier(.22,.61,.36,1)}',