Merge branch 'fe-settings'

apps/web/app/components/settings/account.tsx

@@ -189,7 +189,7 @@ export function AccountSection() {
   const session = useSession();
   const cookie = !!session.data?.expiresAt;
   return (
-    <div className="grid gap-8">
+    <div className="grid grid-cols-1 gap-8">
       <PasswordBlock disabled={!cookie} />
       <TotpBlock disabled={!cookie} />
       <PasskeyBlock disabled={!cookie} />

apps/web/app/components/settings/agent-tools.tsx

@@ -70,7 +70,7 @@ const percent = (n: number, d: number) => (d > 0 ? `${Math.round((n / d) * 100)}
 
 export function AgentToolsBlock() {
   return (
-    <div className="grid gap-8">
+    <div className="grid grid-cols-1 gap-8">
       <McpServerBlock />
       <CapabilitiesBlock />
     </div>

apps/web/app/components/settings/agent.tsx

@@ -211,7 +211,7 @@ const ADVANCED_CARD: CardSpec = {
 
 export function AgentSection() {
   return (
-    <div className="grid gap-8">
+    <div className="grid grid-cols-1 gap-8">
       <PiUpstreamsBlock />
       <SettingsGate>
         {(s) => (

apps/web/app/components/settings/automation.tsx

@@ -173,7 +173,7 @@ function Switches() {
 
 export function AutomationSection() {
   return (
-    <div className="grid gap-8">
+    <div className="grid grid-cols-1 gap-8">
       <Switches />
       <SettingsGate>
         {(s) => (

apps/web/app/components/settings/library.tsx

@@ -41,7 +41,7 @@ const ORGANIZE_CARD: CardSpec = {
 
 export function LibrarySection() {
   return (
-    <div className="grid gap-8">
+    <div className="grid grid-cols-1 gap-8">
       <SettingsBlock section="library" anchor="roots" title="库根" plain>
         <LibraryRootsTable />
       </SettingsBlock>

apps/web/app/components/settings/naming.tsx

@@ -12,7 +12,7 @@ import { Button } from "~/components/ui/button.tsx";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "~/components/ui/select.tsx";
 import { Switch } from "~/components/ui/switch.tsx";
 import { errorMessage } from "~/lib/api.ts";
-import { SettingsBlock } from "./settings-block.tsx";
+import { SaveBar, SettingsBlock } from "./settings-block.tsx";
 
 // 设置 → 媒体库与目录 → 命名模板:全局模板 + 库根覆盖(作品覆盖在作品详情)。
 
@@ -61,19 +61,7 @@ function GlobalNaming() {
   };
 
   return (
-    <SettingsBlock
-      section="library"
-      anchor="naming"
-      title="命名模板"
-      description={NAMING_NOTE}
-      dirty={dirty}
-      actions={
-        <Button size="sm" onClick={onSave} disabled={!dirty || save.isPending || !draft}>
-          <Save />
-          {save.isPending ? "保存中…" : "保存"}
-        </Button>
-      }
-    >
+    <SettingsBlock section="library" anchor="naming" title="命名模板" description={NAMING_NOTE} dirty={dirty}>
       {!q.data || !draft ? (
         q.isError ? (
           <ErrorState plain error={q.error} onRetry={() => q.refetch()} />
@@ -110,6 +98,12 @@ function GlobalNaming() {
               aria-label="已有目录的作品固定文件名"
             />
           </label>
+          <SaveBar dirty={dirty}>
+            <Button size="sm" onClick={onSave} disabled={!dirty || save.isPending || !draft}>
+              <Save />
+              {save.isPending ? "保存中…" : "保存"}
+            </Button>
+          </SaveBar>
         </div>
       )}
     </SettingsBlock>
@@ -199,22 +193,6 @@ function RootNamingEditor({ root }: { root: LibraryRoot }) {
             {NAMING_KIND_LABEL[k]}:{saved[k] ? "库根覆盖" : "沿用全局"}
           </StatusBadge>
         ))}
-        <div className="ml-auto flex items-center gap-2">
-          <Button
-            variant="ghost"
-            size="sm"
-            className="hover:text-destructive"
-            disabled={!hasOverride || save.isPending}
-            onClick={() => put(null)}
-          >
-            <Trash2 />
-            清除覆盖
-          </Button>
-          <Button size="sm" disabled={!dirty || save.isPending} onClick={() => put(overrideBody(draft))}>
-            <Save />
-            {save.isPending ? "保存中…" : "保存覆盖"}
-          </Button>
-        </div>
       </div>
       <NamingTemplateEditor
         kinds={KINDS}
@@ -229,6 +207,22 @@ function RootNamingEditor({ root }: { root: LibraryRoot }) {
         saveErrors={errors}
         dirtyKinds={dirtyKinds}
       />
+      <SaveBar dirty={dirty}>
+        <Button
+          variant="ghost"
+          size="sm"
+          className="hover:text-destructive"
+          disabled={!hasOverride || save.isPending}
+          onClick={() => put(null)}
+        >
+          <Trash2 />
+          清除覆盖
+        </Button>
+        <Button size="sm" disabled={!dirty || save.isPending} onClick={() => put(overrideBody(draft))}>
+          <Save />
+          {save.isPending ? "保存中…" : "保存覆盖"}
+        </Button>
+      </SaveBar>
     </div>
   );
 }

apps/web/app/components/settings/resource-section.tsx

@@ -15,6 +15,7 @@ import { Switch } from "~/components/ui/switch.tsx";
 import { Textarea } from "~/components/ui/textarea.tsx";
 import { errorMessage } from "~/lib/api.ts";
 import { revealFirstError } from "~/lib/form-errors.ts";
+import { cn } from "~/lib/utils.ts";
 
 // 设置页里"实例类"资源的通用段落:列表 + 新建/编辑抽屉 + 删除 + 行内动作。
 // 表单用 contracts 的 Create/Update schema 做 zod 校验;凭证字段只写,编辑时留空表示不变。
@@ -119,7 +120,7 @@ export function ResourceSection<Row extends { id: string }>({
         ) : (
           <span />
         )}
-        <Button size="sm" onClick={() => setEditing("new")}>
+        <Button size="sm" className="ml-auto" onClick={() => setEditing("new")}>
           <Plus />
           添加{config.noun}
         </Button>
@@ -275,11 +276,54 @@ export function FieldControl({
       </div>
     );
   }
-  let control: ReactNode;
+  return (
+    <FormField
+      label={spec.label}
+      htmlFor={id}
+      error={error}
+      hint={hint}
+      required={spec.required}
+      className={wide ? "sm:col-span-2" : undefined}
+    >
+      <FieldInput id={id} spec={spec} value={value} error={error} onChange={onChange} disabled={disabled} />
+    </FormField>
+  );
+}
+
+/** 字段的控件本体(不含标签与说明);开关也在这里 */
+export function FieldInput({
+  id,
+  spec,
+  value,
+  error,
+  onChange,
+  disabled,
+  className,
+}: {
+  id: string;
+  spec: FieldSpec;
+  value: FieldValue | undefined;
+  error?: string;
+  onChange: (v: FieldValue) => void;
+  disabled?: boolean;
+  className?: string;
+}) {
+  if (spec.kind === "switch") {
+    return (
+      <Switch
+        id={id}
+        checked={value === true}
+        onCheckedChange={onChange}
+        disabled={disabled}
+        className={className}
+        aria-invalid={!!error}
+      />
+    );
+  }
   if (spec.kind === "select") {
-    control = (
+    return (
       <Select value={String(value ?? "")} onValueChange={onChange} disabled={disabled}>
-        <SelectTrigger id={id} className="w-full" aria-invalid={!!error}>
+        <SelectTrigger id={id} className={cn("w-full", className)} aria-invalid={!!error}>
           <SelectValue placeholder={spec.placeholder ?? "选择"} />
         </SelectTrigger>
         <SelectContent position="popper">
@@ -291,8 +335,9 @@ export function FieldControl({
         </SelectContent>
       </Select>
     );
-  } else if (spec.kind === "textarea") {
-    control = (
+  }
+  if (spec.kind === "textarea") {
+    return (
       <Textarea
         id={id}
         value={String(value ?? "")}
@@ -301,41 +346,25 @@ export function FieldControl({
         disabled={disabled}
         aria-invalid={!!error}
         rows={3}
-      />
-    );
-  } else {
-    control = (
-      <Input
-        id={id}
-        type={
-          spec.kind === "password"
-            ? "password"
-            : spec.kind === "number"
-              ? "number"
-              : spec.kind === "url"
-                ? "url"
-                : "text"
-        }
-        autoComplete={spec.kind === "password" ? "new-password" : "off"}
-        value={String(value ?? "")}
-        onChange={(e) => onChange(e.target.value)}
-        placeholder={spec.placeholder}
-        disabled={disabled}
-        aria-invalid={!!error}
+        className={className}
       />
     );
   }
   return (
-    <FormField
-      label={spec.label}
-      htmlFor={id}
-      error={error}
-      hint={hint}
-      required={spec.required}
-      className={wide ? "sm:col-span-2" : undefined}
-    >
-      {control}
-    </FormField>
+    <Input
+      id={id}
+      type={
+        spec.kind === "password" ? "password" : spec.kind === "number" ? "number" : spec.kind === "url" ? "url" : "text"
+      }
+      inputMode={spec.kind === "number" ? "decimal" : undefined}
+      autoComplete={spec.kind === "password" ? "new-password" : "off"}
+      value={String(value ?? "")}
+      onChange={(e) => onChange(e.target.value)}
+      placeholder={spec.placeholder}
+      disabled={disabled}
+      aria-invalid={!!error}
+      className={className}
+    />
   );
 }
 

apps/web/app/components/settings/settings-block.tsx

@@ -5,7 +5,13 @@ import { cn } from "~/lib/utils.ts";
 /** 分区内锚点 id:`<分区>-<节>`,URL hash 写作 `#<分区>/<节>` */
 export const anchorId = (section: string, anchor: string) => `settings-${section}-${anchor}`;
 
-/** 设置分区里的一节:标题 + 一句说明 + 未保存提示 + 内容;带锚点 */
+/** 节卡片内边距;SaveBar 用同一组负边距贴满卡片底边 */
+const SLAB_PAD = "p-5 sm:p-6";
+
+/**
+ * 设置分区里的一节:标题(h3)+ 一句说明 + 未保存提示 + 内容;带锚点。
+ * 层级:页面 h1「设置」→ 分区 h2 → 节 h3。节内的保存放在节尾的 SaveBar,不放标题行。
+ */
 export function SettingsBlock({
   section,
   anchor,
@@ -21,6 +27,7 @@ export function SettingsBlock({
   title: string;
   description?: ReactNode;
   dirty?: boolean;
+  /** 标题行右侧:只放"添加 / 打开"这类入口,保存用 SaveBar */
   actions?: ReactNode;
   /** 不包卡片(内容自带 DataTable 卡片时用) */
   plain?: boolean;
@@ -28,18 +35,33 @@ export function SettingsBlock({
 }) {
   const id = anchorId(section, anchor);
   return (
-    <section id={id} aria-labelledby={`${id}-title`} className="scroll-mt-24">
-      <div className="mb-3 flex flex-wrap items-end justify-between gap-3">
+    <section id={id} aria-labelledby={`${id}-title`} className="scroll-mt-20">
+      <div className="mb-3 flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between sm:gap-4">
         <div className="min-w-0">
-          <h2 id={`${id}-title`} className="flex items-center gap-2 text-body font-semibold text-foreground">
+          <h3 id={`${id}-title`} className="flex items-center gap-2 text-lead font-semibold text-foreground">
             {title}
             {dirty ? <StatusBadge tone="warning">未保存</StatusBadge> : null}
-          </h2>
-          {description ? <p className="mt-0.5 max-w-2xl text-caption text-muted-foreground">{description}</p> : null}
+          </h3>
+          {description ? <p className="mt-1 max-w-2xl text-caption text-muted-foreground">{description}</p> : null}
         </div>
-        {actions ? <div className="flex shrink-0 items-center gap-2">{actions}</div> : null}
+        {actions ? <div className="flex shrink-0 flex-wrap items-center gap-2">{actions}</div> : null}
       </div>
-      <div className={cn(!plain && "pg-slab min-w-0 rounded-xl p-5")}>{children}</div>
+      <div className={cn(!plain && `pg-slab min-w-0 rounded-xl ${SLAB_PAD}`)}>{children}</div>
     </section>
   );
 }
+
+/** 节尾保存条:贴满卡片底边,左侧脏状态提示,右侧操作(主操作放最右) */
+export function SaveBar({ dirty, note, children }: { dirty?: boolean; note?: ReactNode; children: ReactNode }) {
+  return (
+    <div className="-mx-5 mt-5 -mb-5 flex flex-wrap items-center justify-end gap-2 rounded-b-xl border-t border-border/60 px-5 py-3 sm:-mx-6 sm:-mb-6 sm:px-6">
+      <p
+        className={cn("mr-auto min-w-0 text-meta", dirty ? "text-warning" : "text-muted-foreground")}
+        aria-live="polite"
+      >
+        {dirty ? "有未保存的修改" : (note ?? "")}
+      </p>
+      {children}
+    </div>
+  );
+}

apps/web/app/components/settings/settings-card.tsx

@@ -11,10 +11,12 @@ import { useSettings, useUpdateSettings } from "~/api/settings.ts";
 import { ErrorState, LoadingState } from "~/components/console/empty-state.tsx";
 import { zodFieldErrors } from "~/components/console/form-field.tsx";
 import { Button } from "~/components/ui/button.tsx";
+import { Label } from "~/components/ui/label.tsx";
 import { errorMessage } from "~/lib/api.ts";
 import { revealFirstError } from "~/lib/form-errors.ts";
-import { FieldControl, type FieldSpec, type FormValues } from "./resource-section.tsx";
-import { SettingsBlock } from "./settings-block.tsx";
+import { cn } from "~/lib/utils.ts";
+import { FieldInput, type FieldSpec, type FieldValue, type FormValues } from "./resource-section.tsx";
+import { SaveBar, SettingsBlock } from "./settings-block.tsx";
 
 // 全局设置的一节:一组字段,独立保存(PATCH 对应 key);
 // 校验 = 合并现值后用 contracts GlobalSettings 整体校验(含"恢复水位 < 硬阈值"等交叉规则)。
@@ -79,27 +81,22 @@ export function SettingsCard({
       dirty={dirty}
     >
       <form onSubmit={save} noValidate>
-        <div className="grid gap-x-4 gap-y-1 sm:grid-cols-2">
+        <div className="divide-y divide-border/60">
           {spec.fields
             .filter((f) => !f.visible || f.visible(values))
             .map((f) => (
-              <FieldControl
+              <SettingsField
                 key={f.name}
                 spec={f}
                 value={values[f.name]}
                 error={errors[f.name]}
-                hint={f.hint}
                 disabled={update.isPending}
                 onChange={(v) => setValues((s) => ({ ...s, [f.name]: v }))}
               />
             ))}
         </div>
-        {spec.extra?.(settings)}
-        <div className="mt-2 flex items-center gap-2">
-          <Button type="submit" size="sm" disabled={update.isPending || !dirty}>
-            {update.isPending ? <LoaderCircle className="animate-spin" /> : null}
-            保存
-          </Button>
+        {spec.extra ? <div className="mt-4">{spec.extra(settings)}</div> : null}
+        <SaveBar dirty={dirty}>
           {dirty ? (
             <Button
               type="button"
@@ -113,12 +110,78 @@ export function SettingsCard({
               还原
             </Button>
           ) : null}
-        </div>
+          <Button type="submit" size="sm" disabled={update.isPending || !dirty}>
+            {update.isPending ? <LoaderCircle className="animate-spin" /> : null}
+            保存
+          </Button>
+        </SaveBar>
       </form>
     </SettingsBlock>
   );
 }
 
+/** 控件宽度按类型固定:数字短、选择与单行文本中等、wide/多行占满 */
+function controlWidth(spec: FieldSpec): string {
+  if (spec.kind === "switch") return "";
+  if (spec.wide || spec.kind === "textarea") return "w-full";
+  if (spec.kind === "number") return "w-full sm:w-40";
+  if (spec.kind === "select") return "w-full sm:max-w-xs";
+  return "w-full sm:max-w-md";
+}
+
+/**
+ * 设置表单的一行:标签与说明在左,控件在右;md 以下上下堆叠(开关仍与标签同行)。
+ * 错误写在控件下方,说明留在标签下,行高不因出错跳动以外的原因变化。
+ */
+export function SettingsField({
+  spec,
+  value,
+  error,
+  onChange,
+  disabled,
+}: {
+  spec: FieldSpec;
+  value: FieldValue | undefined;
+  error?: string;
+  onChange: (v: FieldValue) => void;
+  disabled?: boolean;
+}) {
+  const id = `f-${spec.name}`;
+  const isSwitch = spec.kind === "switch";
+  return (
+    <div
+      className={cn(
+        "grid gap-x-6 gap-y-2 py-4 first:pt-0 last:pb-0 md:grid-cols-[minmax(0,15rem)_minmax(0,1fr)]",
+        isSwitch && "grid-cols-[minmax(0,1fr)_auto] items-start",
+      )}
+    >
+      <div className={cn("min-w-0", !isSwitch && "md:pt-2")}>
+        <Label htmlFor={id} className="text-caption font-medium text-foreground">
+          {spec.label}
+          {spec.required ? <span className="text-destructive">*</span> : null}
+        </Label>
+        {spec.hint ? <p className="mt-1 text-meta text-muted-foreground">{spec.hint}</p> : null}
+      </div>
+      <div className={cn("min-w-0", isSwitch && "pt-0.5 md:justify-self-start")}>
+        <FieldInput
+          id={id}
+          spec={spec}
+          value={value}
+          error={error}
+          onChange={onChange}
+          disabled={disabled}
+          className={controlWidth(spec)}
+        />
+        {error ? (
+          <p className="mt-1.5 text-meta text-destructive" role="alert">
+            {error}
+          </p>
+        ) : null}
+      </div>
+    </div>
+  );
+}
+
 /** 读取全局设置后再渲染(加载 / 出错占位) */
 export function SettingsGate({ children }: { children: (s: GlobalSettings) => ReactNode }) {
   const q = useSettings();

apps/web/app/components/settings/sites.tsx

@@ -105,7 +105,7 @@ const DEFAULTS_CARD: CardSpec = {
 
 export function SitesSection() {
   return (
-    <div className="space-y-6">
+    <div className="grid grid-cols-1 gap-8">
       <div className="pg-slab flex flex-wrap items-center justify-between gap-3 rounded-xl px-4 py-3">
         <p className="text-caption text-muted-foreground">
           站点和凭证在「站点」页管理；单个站点的限流、周期、代理在站点的"编辑"里改。