From 18ddf125be203269316e967a679dc085509843cd Mon Sep 17 00:00:00 2001 From: que01 Date: Mon, 12 Oct 2026 12:00:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=93=81=E7=89=8C?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=B8=B2=E6=9F=93=E5=BE=AA=E7=8E=AF=E4=B8=8E?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=82=B9=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/components/ImageUrlField.tsx | 4 +- .../brand/ComponentTemplatePreview.css | 17 +- .../brand/ComponentTemplatePreview.tsx | 146 ++++++++++-------- .../brand/presentation-editor-state.ts | 12 +- 4 files changed, 107 insertions(+), 72 deletions(-) diff --git a/apps/admin/src/components/ImageUrlField.tsx b/apps/admin/src/components/ImageUrlField.tsx index 0d0e998..f3e3fc4 100644 --- a/apps/admin/src/components/ImageUrlField.tsx +++ b/apps/admin/src/components/ImageUrlField.tsx @@ -1,6 +1,6 @@ import { CloudUploadOutlined, DeleteOutlined, PictureOutlined } from "@ant-design/icons"; import { Alert, Button, Image, Popconfirm, Space, Spin, Upload, message } from "antd"; -import { useEffect, useState } from "react"; +import { useEffect, useMemo, useState } from "react"; import { createApiClient } from "../lib/api.js"; interface ImageUrlFieldProps { @@ -17,7 +17,7 @@ export function ImageUrlField({ id, value, onChange, placeholder, scope }: Image const [storageStatus, setStorageStatus] = useState< "loading" | "ok" | "unavailable" | "unconfigured" >("loading"); - const client = createApiClient(); + const client = useMemo(() => createApiClient(), []); useEffect(() => { let active = true; diff --git a/apps/admin/src/features/brand/ComponentTemplatePreview.css b/apps/admin/src/features/brand/ComponentTemplatePreview.css index 8d48e6b..b293e17 100644 --- a/apps/admin/src/features/brand/ComponentTemplatePreview.css +++ b/apps/admin/src/features/brand/ComponentTemplatePreview.css @@ -107,7 +107,7 @@ .component-template-preview__composite-select { position: absolute; z-index: 7; - width: auto !important; + width: max-content !important; padding: 2px 8px !important; border: 1px solid #1677ff !important; border-radius: 4px !important; @@ -142,3 +142,18 @@ .component-template-preview { height: 100%; } +.component-template-preview__overlay-host { + position: absolute; + inset: 0; + z-index: 5; + pointer-events: none; + display: none; +} + +.component-template-preview__overlay-host.is-visible { + display: block; +} + +.component-template-preview__overlay-host > * { + pointer-events: auto; +} diff --git a/apps/admin/src/features/brand/ComponentTemplatePreview.tsx b/apps/admin/src/features/brand/ComponentTemplatePreview.tsx index d008e74..68af637 100644 --- a/apps/admin/src/features/brand/ComponentTemplatePreview.tsx +++ b/apps/admin/src/features/brand/ComponentTemplatePreview.tsx @@ -15,6 +15,7 @@ type PreviewProps = { }; type Outline = { top: number; left: number; width: number; height: number; label: string }; +type CompositeOutline = Outline & { key: string }; export function ComponentTemplatePreview({ workspace, @@ -26,11 +27,10 @@ export function ComponentTemplatePreview({ }: PreviewProps) { const Renderer = resolveTemplateRenderer(workspace); const root = useRef(null); + const canvas = useRef(null); const [mode, setMode] = useState<"edit" | "browse">("edit"); const [hovered, setHovered] = useState(null); - const [hoverOutline, setHoverOutline] = useState(null); - const [selectedOutline, setSelectedOutline] = useState(null); - const [compositeOutlines, setCompositeOutlines] = useState>([]); + const overlay = useRef(null); const targetFor = useCallback( (element: Element | null): HTMLElement | null => { let candidate = element?.closest("[data-editor-target]"); @@ -56,17 +56,64 @@ export function ComponentTemplatePreview({ ) ?? null ); }, [selection]); + const renderOutlines = useCallback( + ( + host: HTMLDivElement, + outlines: { + hover: Outline | null; + selected: Outline | null; + composite: CompositeOutline[]; + }, + ) => { + host.replaceChildren(); + const position = (node: HTMLElement, outline: Outline) => { + node.style.top = `${outline.top}px`; + node.style.left = `${outline.left}px`; + node.style.width = `${outline.width}px`; + node.style.height = `${outline.height}px`; + }; + if (outlines.hover) { + const node = document.createElement("div"); + node.className = "component-template-preview__outline is-hovered"; + position(node, outlines.hover); + host.append(node); + } + if (outlines.selected) { + const node = document.createElement("div"); + node.className = "component-template-preview__outline is-selected"; + node.dataset.selectedTarget = selection?.targetKey ?? ""; + node.dataset.selectedRecordId = selection?.recordId ?? ""; + const label = document.createElement("span"); + label.textContent = outlines.selected.label; + node.append(label); + position(node, outlines.selected); + host.append(node); + } + for (const outline of outlines.composite) { + const node = document.createElement("button"); + node.type = "button"; + node.className = "component-template-preview__composite-select"; + node.textContent = `选择${outline.label}`; + node.setAttribute("aria-label", node.textContent); + node.onclick = () => onTargetSelected({ targetKey: outline.key }); + node.style.top = `${outline.top + 4}px`; + node.style.left = `${outline.left + 4}px`; + host.append(node); + } + }, + [onTargetSelected, selection?.recordId, selection?.targetKey], + ); const measure = useCallback( (element: HTMLElement | null): Outline | null => { - const viewport = root.current; - if (!element || !viewport || !viewport.contains(element)) return null; + const host = canvas.current; + if (!element || !host || !host.contains(element)) return null; const box = element.getBoundingClientRect(); - const parent = viewport.getBoundingClientRect(); + const parent = host.getBoundingClientRect(); const target = targets.find((item) => item.key === element.dataset.editorTarget); if (!target || !box.width || !box.height) return null; return { - top: box.top - parent.top + viewport.scrollTop, - left: box.left - parent.left + viewport.scrollLeft, + top: box.top - parent.top, + left: box.left - parent.left, width: box.width, height: box.height, label: target.label, @@ -76,30 +123,35 @@ export function ComponentTemplatePreview({ ); useLayoutEffect(() => { const viewport = root.current; - if (!viewport) return; + const outlineHost = overlay.current; + const host = canvas.current; + if (!viewport || !outlineHost || !host) return; let frame = 0; const update = () => { cancelAnimationFrame(frame); frame = requestAnimationFrame(() => { - setSelectedOutline(measure(selectedElement())); - setHoverOutline(measure(hovered)); - setCompositeOutlines( - targets - .filter((target) => target.composite) - .flatMap((target) => { - const element = viewport.querySelector( - `[data-editor-target="${CSS.escape(target.key)}"]`, - ); - const outline = measure(element); - return outline ? [{ ...outline, key: target.key }] : []; - }), - ); + const nextHover = measure(hovered); + const nextSelected = measure(selectedElement()); + const nextComposite = targets + .filter((target) => target.composite) + .flatMap((target) => { + const element = host.querySelector( + `[data-editor-target="${CSS.escape(target.key)}"]`, + ); + const outline = measure(element); + return outline ? [{ ...outline, key: target.key }] : []; + }); + renderOutlines(outlineHost, { + hover: nextHover, + selected: nextSelected, + composite: nextComposite, + }); }); }; update(); const resize = new ResizeObserver(update); resize.observe(viewport); - viewport + host .querySelectorAll("[data-editor-target]") .forEach((node) => resize.observe(node)); window.addEventListener("resize", update); @@ -174,50 +226,16 @@ export function ComponentTemplatePreview({ ); }} > -
+
-
- {mode === "edit" - ? compositeOutlines.map((outline) => ( - - )) - : null} - {mode === "edit" && hoverOutline ? (
); diff --git a/apps/admin/src/features/brand/presentation-editor-state.ts b/apps/admin/src/features/brand/presentation-editor-state.ts index dee7a9a..d316797 100644 --- a/apps/admin/src/features/brand/presentation-editor-state.ts +++ b/apps/admin/src/features/brand/presentation-editor-state.ts @@ -1,7 +1,7 @@ import { Form, message } from "antd"; import { useMutation, useQuery } from "@tanstack/react-query"; import type { QueryClient } from "@tanstack/react-query"; -import { useEffect, useMemo, useState } from "react"; +import { useCallback, useEffect, useMemo, useState } from "react"; import type { FormInstance } from "antd"; import type { AdminTemplateContent, @@ -191,13 +191,15 @@ export function useBrandPreviewDraft({ [brand, previewBrandValues, previewConfig], ); + const resetPreview = useCallback(() => { + setPreviewConfig(config ?? {}); + setPreviewBrandValues({}); + }, [config]); + return { previewBrand, handleValuesChange, - resetPreview: () => { - setPreviewConfig(config ?? {}); - setPreviewBrandValues({}); - }, + resetPreview, }; }