@allbluecn/web-app 0.18.2 → 0.19.0

package/src/components/story/display/display-dropdown.tsx

@@ -15,30 +15,49 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import { useMemo, useState } from "react";
-import { ArrowDownNarrowWide, ArrowUpWideNarrow, ChartNoAxesGantt, Check, ChevronRight, ChevronDown, Lock, type LucideIcon } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Switch } from "@/components/ui/switch";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { useFeature } from "@/components/billing/use-feature";
+// story 显示选项桶导出 = 共享 createDisplayDropdown 的 story 实例（UI 对齐一期
+// PR-3 任务 13：原分区组件收拢至 shared-kit/list-kit/display 参数化工厂，此处
+// 仅装配 + story 布局派生逻辑；导出名与组件 props 签名对消费方完全不变，
+// 键集/文案/图标见 ./constants 与 ./types）。
+
+import { DISPLAY_ICON } from "@/components/shared-kit/list-kit/icon-semantics";
 import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-import { cn } from "@/lib/utils";
+  createDisplayDropdown,
+  type DisplayOptionsBodyProps as KitDisplayOptionsBodyProps,
+} from "@/components/shared-kit/list-kit/display/dropdown";
 import { ViewListSection } from "../views/view-list-section";
 import type { SavedView, ViewProjectInfo } from "../views/view-types";
 import type { StoryView } from "../views/view-switcher";
-import { DEFAULT_DISPLAY_OPTIONS, GROUP_KEYS, ORDER_KEYS, PAGE_SIZE_OPTIONS, type DisplayOptions, type DisplayProperty, type GroupKey, type OrderDirection, type OrderKey, type PageSize } from "./types";
-import { GROUP_LABELS, ORDER_LABELS, PROPERTY_LABELS, LAYOUT_SUPPORT, LAYOUT_PROPERTIES, GROUP_ICONS, ORDER_ICONS } from "./constants";
-import { implementedModules } from "@/plugins/modules.gen";
 import { m } from "@/paraglide/messages.js";
-
-/** 分组选项：布局不支持分组时返回空数组；选中特定项目时隐藏"项目"分组 */
+import type { GroupKey, OrderKey, DisplayProperty, DisplayOptions, PageSize } from "./types";
+import {
+  DEFAULT_DISPLAY_OPTIONS,
+  GROUP_KEYS,
+  ORDER_KEYS,
+  ALL_DISPLAY_PROPERTIES,
+  PAGE_SIZE_OPTIONS,
+} from "./types";
+import {
+  GROUP_LABELS,
+  ORDER_LABELS,
+  PROPERTY_LABELS,
+  LAYOUT_SUPPORT,
+  LAYOUT_PROPERTIES,
+  GROUP_ICONS,
+  ORDER_ICONS,
+  TIMELINE_GROUP_KEYS,
+} from "./constants";
+
+/** 分组选项的 per-layout 收敛：timeline 引用 TIMELINE_GROUP_KEYS（甘特 clamp
+ * 白名单单一事实源，见 constants.ts；SDD 2026-10-18 需求甘特图 WP-B R-9） */
+const LAYOUT_GROUP_KEYS: Partial<Record<StoryView, readonly GroupKey[]>> = {
+  timeline: TIMELINE_GROUP_KEYS,
+};
+
+/** 分组选项：布局不支持分组时返回空数组；per-layout 收敛优先；选中特定项目时隐藏"项目"分组 */
 export function getGroupOptions(layout: StoryView, projectId?: string): GroupKey[] {
   if (!LAYOUT_SUPPORT[layout].groupBy) return [];
-  let keys = [...GROUP_KEYS];
+  let keys: GroupKey[] = [...(LAYOUT_GROUP_KEYS[layout] ?? GROUP_KEYS)];
   if (projectId) keys = keys.filter((k) => k !== "project");
   return keys;
 }
@@ -85,6 +104,48 @@ function hasDefaultProperties(props: DisplayProperty[], layout?: StoryView): boo
   return filtered.length === supported.length && supported.every((p) => filtered.includes(p));
 }
 
+const storyDisplay = createDisplayDropdown<DisplayOptions, GroupKey, OrderKey, DisplayProperty>({
+  groupKeys: GROUP_KEYS,
+  orderKeys: ORDER_KEYS,
+  availableProperties: ALL_DISPLAY_PROPERTIES,
+  groupLabels: GROUP_LABELS,
+  orderLabels: ORDER_LABELS,
+  propertyLabels: PROPERTY_LABELS,
+  groupIcons: GROUP_ICONS,
+  orderIcons: ORDER_ICONS,
+  pageSizeOptions: PAGE_SIZE_OPTIONS,
+  noneGroupKey: "none",
+  support: ({ layout }) => {
+    const s = LAYOUT_SUPPORT[(layout ?? "list") as StoryView];
+    return {
+      properties: s.properties,
+      groupBy: s.groupBy,
+      subGroupBy: s.subGroupBy,
+      orderBy: s.orderBy,
+      options: s.options,
+      // 空分组开关行在 options 区恒显（原实现仅按 groupBy 支持钳制取值）
+      showEmptyGroupsRow: true,
+      showEmptyGroupsEnabled: s.options && s.groupBy,
+      showSubItems: layout === "list",
+    };
+  },
+  // config 回调的 layout 形参为 string | undefined（bug 等无布局模块），
+  // story 侧原样收窄回 StoryView | undefined（undefined = 无布局上下文）
+  hasChanges: (f, layout) => hasDisplayChanges(f, layout as StoryView | undefined),
+  resolveGroupKeys: ({ layout, projectId }) => getGroupOptions((layout ?? "list") as StoryView, projectId),
+  resolveSubGroupKeys: ({ layout, projectId, groupBy }) =>
+    getSubGroupOptions((layout ?? "list") as StoryView, groupBy, projectId),
+  resolveProperties: ({ layout }) => LAYOUT_PROPERTIES[(layout ?? "list") as StoryView],
+  // manual 的语义是「按 boardOrder 升序」，方向切换对 manual 不生效故隐藏
+  orderDirVisible: (f) => f.orderBy !== "manual",
+  triggerIcon: DISPLAY_ICON,
+  triggerAriaLabel: () => m.display_displayOptions(),
+  triggerTooltip: () => m.display_viewGrouping(),
+});
+
+export const DisplayOptionsBody = storyDisplay.DisplayOptionsBody;
+export type DisplayOptionsBodyProps = KitDisplayOptionsBodyProps<DisplayOptions>;
+
 export interface DisplayDropdownProps {
   filters: DisplayOptions;
   onChange: (patch: Partial<DisplayOptions>) => void;
@@ -101,387 +162,24 @@ export interface DisplayDropdownProps {
   onPageSizeChange?: (size: PageSize) => void;
 }
 
-export function DisplayDropdown({ filters, onChange, layout, projectId, projects, views, activeViewId, onApplyView, onEditView, onDeleteView, onAddView, pageSize, onPageSizeChange }: DisplayDropdownProps) {
-  const support = LAYOUT_SUPPORT[layout];
-  const changed = useMemo(() => hasDisplayChanges(filters, layout), [filters, layout]);
-
-  return (
-    <Popover>
-      <Tooltip>
-        <PopoverTrigger render={<TooltipTrigger render={<Button variant="outline"
-              size="sm"
-              aria-label={m.display_displayOptions()}
-              className={cn(
-                "relative h-8 gap-1.5 px-2.5 text-sm font-normal",
-                changed && "border-primary/50 bg-primary/5 text-primary",
-              )} />} />}>
-              <ChartNoAxesGantt className="size-4" />
-              {changed && (
-                <span
-                  className="absolute right-1 top-1 size-1.5 rounded-full bg-primary"
-                  aria-hidden
-                />
-              )}
-            </PopoverTrigger>
-        <TooltipContent side="bottom">{m.display_viewGrouping()}</TooltipContent>
-      </Tooltip>
-      <PopoverContent className="w-75 p-0" align="start">
-        <div className="max-h-[70vh] overflow-y-auto">
-          <DisplayOptionsBody
-            filters={filters}
-            onChange={onChange}
-            layout={layout}
-            projectId={projectId}
-            pageSize={pageSize}
-            onPageSizeChange={onPageSizeChange}
-            beforeOptions={
-              <ViewListSection
-                views={views}
-                activeViewId={activeViewId}
-                projects={projects}
-                onApplyView={onApplyView}
-                onEditView={onEditView}
-                onDeleteView={onDeleteView}
-                onAddView={onAddView}
-              />
-            }
-          />
-        </div>
-      </PopoverContent>
-    </Popover>
-  );
-}
-
-export interface DisplayOptionsBodyProps {
-  filters: DisplayOptions;
-  onChange: (patch: Partial<DisplayOptions>) => void;
-  layout: StoryView;
-  projectId?: string;
-  pageSize?: PageSize;
-  onPageSizeChange?: (size: PageSize) => void;
-  showSubItems?: boolean;
-  beforeOptions?: React.ReactNode;
-}
-
-export function DisplayOptionsBody({ filters, onChange, layout, projectId, pageSize, onPageSizeChange, showSubItems, beforeOptions }: DisplayOptionsBodyProps) {
-  const support = LAYOUT_SUPPORT[layout];
-  const showEmptyGroups = support.options && support.groupBy;
-  const showSubItemsEnabled = showSubItems ?? layout === "list";
-
+export function DisplayDropdown({ views, activeViewId, projects, onApplyView, onEditView, onDeleteView, onAddView, pageSize, onPageSizeChange, ...rest }: DisplayDropdownProps) {
   return (
-    <>
-      {support.properties && (
-        <PropertiesSection
-          selected={filters.properties}
-          onChange={(props) => onChange({ properties: props })}
-          layout={layout}
-        />
-      )}
-      {support.groupBy && (
-        <InlineRadioSection
-          dataSection="groupBy"
-          label={m.display_group()}
-          value={filters.groupBy}
-          optionKeys={getGroupOptions(layout, projectId)}
-          iconMap={GROUP_ICONS as Record<string, LucideIcon>}
-          labelMap={GROUP_LABELS}
-          onSelect={(v) => onChange({ groupBy: v as GroupKey })}
-        />
-      )}
-      {support.subGroupBy && (
-        <InlineRadioSection
-          dataSection="subGroupBy"
-          label={m.display_subGroup()}
-          value={filters.subGroupBy}
-          optionKeys={getSubGroupOptions(layout, filters.groupBy, projectId)}
-          iconMap={GROUP_ICONS as Record<string, LucideIcon>}
-          labelMap={GROUP_LABELS}
-          disabled={filters.groupBy === "none"}
-          onSelect={(v) => onChange({ subGroupBy: v as GroupKey })}
+    <storyDisplay.DisplayDropdown
+      {...rest}
+      onPageSizeChange={
+        onPageSizeChange ? (size) => onPageSizeChange(size as PageSize) : undefined
+      }
+      beforeOptions={
+        <ViewListSection
+          views={views}
+          activeViewId={activeViewId}
+          projects={projects}
+          onApplyView={onApplyView}
+          onEditView={onEditView}
+          onDeleteView={onDeleteView}
+          onAddView={onAddView}
         />
-      )}
-      {support.orderBy && (
-        <InlineRadioSection
-          dataSection="orderBy"
-          label={m.display_order()}
-          value={filters.orderBy}
-          optionKeys={getOrderOptions(layout)}
-          iconMap={ORDER_ICONS as Record<string, LucideIcon>}
-          labelMap={ORDER_LABELS}
-          onSelect={(v) => onChange({ orderBy: v as OrderKey })}
-          orderDir={filters.orderDir}
-          onOrderDirChange={(dir) => onChange({ orderDir: dir })}
-        />
-      )}
-      {beforeOptions}
-      {support.options && (
-        <OptionsSection
-          showEmptyGroups={showEmptyGroups ? filters.showEmptyGroups : false}
-          showSubItems={showSubItemsEnabled ? filters.showSubItems : false}
-          showSubItemsSupported={showSubItemsEnabled}
-          onShowEmptyChange={(v) => onChange({ showEmptyGroups: v })}
-          onShowSubChange={(v) => onChange({ showSubItems: v })}
-          pageSize={filters.pageSize}
-          onPageSizeChange={onPageSizeChange ?? ((v) => onChange({ pageSize: v }))}
-        />
-      )}
-    </>
+      }
+    />
   );
 }
-
-interface InlineRadioSectionProps {
-  dataSection: string;
-  label: string;
-  value: string;
-  optionKeys: string[];
-  iconMap: Record<string, LucideIcon>;
-  labelMap: Record<string, () => string>;
-  disabled?: boolean;
-  onSelect: (value: string) => void;
-  orderDir?: OrderDirection;
-  onOrderDirChange?: (dir: OrderDirection) => void;
-}
-
-function InlineRadioSection({
-  dataSection,
-  label,
-  value,
-  optionKeys,
-  iconMap,
-  labelMap,
-  disabled = false,
-  onSelect,
-  orderDir,
-  onOrderDirChange,
-}: InlineRadioSectionProps) {
-  const [collapsed, setCollapsed] = useState(false);
-  const options = optionKeys.map((k) => ({
-    value: k,
-    label: labelMap[k]?.() ?? k,
-    icon: iconMap[k],
-  }));
-
-  return (
-    <div data-section={dataSection} className="border-t px-3 py-2">
-      <div className="mb-1 flex items-center justify-between gap-1">
-        <button
-          type="button"
-          onClick={() => setCollapsed(!collapsed)}
-          className="flex w-full items-center gap-1 text-xs font-medium text-muted-foreground hover:text-foreground"
-        >
-          {collapsed ? <ChevronRight className="size-3" /> : <ChevronDown className="size-3" />}
-          {label}
-        </button>
-        {orderDir !== undefined && onOrderDirChange && (
-          <div className="flex items-center gap-0.5">
-            {/* <span className="mr-1 text-[10px] font-medium text-muted-foreground">方向</span> */}
-            <div className="flex items-center rounded ">
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                data-testid="order-dir-asc"
-                aria-label={m.display_asc()}
-                className={cn(
-                  "size-6  rounded p-0 text-xs text-muted-foreground hover:bg-muted hover:text-foreground",
-                  orderDir === "asc" && "bg-muted text-foreground",
-                )}
-                onClick={() => onOrderDirChange("asc")}
-              >
-                <ArrowDownNarrowWide className="size-3" />
-              </Button>
-              {/* <div className="w-px h-5 bg-border" /> */}
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                data-testid="order-dir-desc"
-                aria-label={m.display_desc()}
-                className={cn(
-                  "size-6  rounded p-0 text-xs text-muted-foreground hover:bg-muted hover:text-foreground",
-                  orderDir === "desc" && "bg-muted text-foreground",
-                )}
-                onClick={() => onOrderDirChange("desc")}
-              >
-                <ArrowUpWideNarrow className="size-3" />
-              </Button>
-            </div>
-          </div>
-        )}
-      </div>
-      {!collapsed && (
-        <div className="flex flex-col gap-0.5">
-          {options.map((o) => {
-            const Icon = o.icon;
-            const selected = o.value === value;
-            return (
-              <button
-                key={o.value}
-                type="button"
-                disabled={disabled}
-                onClick={() => onSelect(o.value)}
-                className={cn(
-                  "flex w-full items-center gap-2 rounded-sm px-1.5 py-1 text-xs text-left hover:bg-muted",
-                  disabled && "cursor-not-allowed opacity-50",
-                )}
-              >
-                <span
-                  className={cn(
-                    "grid size-3.5 shrink-0 place-items-center rounded-full border",
-                    selected
-                      ? "border-primary bg-primary text-primary-foreground"
-                      : "border-border",
-                  )}
-                >
-                  {selected && <Check className="size-2.5" strokeWidth={3} />}
-                </span>
-                {Icon && <Icon className="size-3.5 shrink-0 text-muted-foreground" />}
-                <span className="text-foreground">{o.label}</span>
-              </button>
-            );
-          })}
-        </div>
-      )}
-    </div>
-  );
-}
-
-interface PropertiesSectionProps {
-  selected: DisplayProperty[];
-  onChange: (props: DisplayProperty[]) => void;
-  layout: StoryView;
-}
-
-function PropertiesSection({ selected, onChange, layout }: PropertiesSectionProps) {
-  const [collapsed, setCollapsed] = useState(false);
-  const available = LAYOUT_PROPERTIES[layout];
-  const toggle = (prop: DisplayProperty) => {
-    onChange(
-      available.includes(prop)
-        ? selected.includes(prop)
-          ? selected.filter((p) => p !== prop)
-          : [...selected, prop]
-        : selected,
-    );
-  };
-
-  return (
-    <div data-section="properties" className=" px-3 py-2">
-      <button
-        type="button"
-        onClick={() => setCollapsed(!collapsed)}
-        className="mb-1.5 flex w-full items-center gap-1 text-xs font-medium text-muted-foreground hover:text-foreground"
-      >
-        {collapsed ? <ChevronRight className="size-3" /> : <ChevronDown className="size-3" />}
-        {m.display_showProperties()}
-      </button>
-      {!collapsed && (
-        <div className="flex flex-wrap gap-1.5">
-          {available.map((prop) => {
-            const checked = selected.includes(prop);
-            return (
-              <button
-                key={prop}
-                type="button"
-                onClick={() => toggle(prop)}
-                className={cn(
-                  "rounded border px-2 py-0.5 text-xs transition-all",
-                  checked
-                    ? "border-primary bg-primary text-primary-foreground"
-                    : "border-border text-muted-foreground hover:bg-muted hover:text-foreground",
-                )}
-              >
-                {PROPERTY_LABELS[prop]?.() ?? prop}
-              </button>
-            );
-          })}
-        </div>
-      )}
-    </div>
-  );
-}
-
-interface OptionsSectionProps {
-  showEmptyGroups: boolean;
-  showSubItems: boolean;
-  showSubItemsSupported: boolean;
-  onShowEmptyChange: (v: boolean) => void;
-  onShowSubChange: (v: boolean) => void;
-  pageSize: PageSize;
-  onPageSizeChange: (v: PageSize) => void;
-}
-
-function OptionsSection({
-  showEmptyGroups,
-  showSubItems,
-  showSubItemsSupported,
-  onShowEmptyChange,
-  onShowSubChange,
-  pageSize,
-  onPageSizeChange,
-}: OptionsSectionProps) {
-  // OSS 环境（billing 模块未实现）只显示 100/200；Pro 环境显示全部
-  const sizeOptions = implementedModules.billing
-    ? (PAGE_SIZE_OPTIONS as readonly PageSize[])
-    : ([100, 200] as readonly PageSize[]);
-  const { enabled: largePageSizeEnabled, loading: largePageSizeLoading } =
-    useFeature("largePageSize");
-
-  const isPageSizeLocked = (v: PageSize) =>
-    v > 200 && !largePageSizeEnabled && !largePageSizeLoading;
-
-  return (
-    <div data-section="options" className="border-t px-3 py-2">
-      <div className="flex items-center justify-between gap-2 py-0.5">
-        <span className="text-xs font-medium text-foreground">{m.display_extraOptions()}</span>
-      </div>
-      <div className="mt-1 flex flex-col gap-1">
-        <label className="flex cursor-pointer items-center justify-between py-1">
-          <span className="text-xs text-muted-foreground">{m.display_showEmptyGroups()}</span>
-          <Switch checked={showEmptyGroups} onCheckedChange={onShowEmptyChange} size="sm" />
-        </label>
-        {showSubItemsSupported && (
-          <label className="flex cursor-pointer items-center justify-between py-1">
-            <span className="text-xs text-muted-foreground">{m.display_showSubItems()}</span>
-            <Switch checked={showSubItems} onCheckedChange={onShowSubChange} size="sm" />
-          </label>
-        )}
-        <div className="flex items-center justify-between py-1">
-          <span className="text-xs text-muted-foreground">{m.display_pageSize()}</span>
-          <div className="flex items-center gap-0.5 rounded border border-border p-0.5">
-            {sizeOptions.map((v) => {
-              const locked = isPageSizeLocked(v);
-              const checked = v === pageSize && !locked;
-              return (
-                <button
-                  key={v}
-                  type="button"
-                  disabled={locked}
-                  onClick={() => onPageSizeChange(v)}
-                  className={cn(
-                    "inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-[10px] font-medium transition-all",
-                    checked
-                      ? "bg-primary text-primary-foreground"
-                      : locked
-                        ? "cursor-not-allowed text-muted-foreground/50 hover:bg-transparent"
-                        : "text-muted-foreground hover:bg-muted hover:text-foreground",
-                  )}
-                >
-                  {PAGE_SIZE_LABELS[v]}
-                  {locked && <Lock size={10} aria-hidden />}
-                </button>
-              );
-            })}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-const PAGE_SIZE_LABELS: Record<PageSize, string> = {
-  100: "100",
-  200: "200",
-  500: "500",
-  1000: "1000",
-};

package/src/components/story/display/flatten-story-groups.ts

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import type { StoryListItem } from "../types";
+
+/** 顶层/子层分组都只需 items 与 subGroups（GroupNode / PagedGroupNode 结构兼容） */
+type GroupLike = { items: StoryListItem[]; subGroups?: { items: StoryListItem[] }[] };
+
+/**
+ * 按视图展示顺序摊平分组：父组顺序 → 组内子组顺序 → 组内 items 顺序。
+ *
+ * 用于 peek 面板 prev/next 跟随「当前视图实际展示的顺序」——列表视图的数据源是
+ * 分组分页（pagedGroups）、看板是分组（groups），均与平坦的 stories.items 顺序不同。
+ */
+export function flattenStoryGroups(nodes: GroupLike[]): StoryListItem[] {
+  const out: StoryListItem[] = [];
+  for (const g of nodes) {
+    if (g.subGroups && g.subGroups.length > 0) {
+      for (const sg of g.subGroups) out.push(...sg.items);
+    } else {
+      out.push(...g.items);
+    }
+  }
+  return out;
+}

package/src/components/story/display/group-fields.ts

@@ -17,9 +17,12 @@
 
 import type { StoryState, StoryPriority } from "../constants";
 import type { GroupKey } from "./types";
+import type { StoryListItem, UserBrief } from "../types";
 
-/** 列表行可更新的字段（与 updateStoryFn 入参保持一致），消除动态字段拼接的 as never */
+/** 列表行可更新的字段（与 updateStoryFn 入参保持一致），消除动态字段拼接的 as never。
+ *  name 由详情面板（PeekPanel / 详情页）改动后回写视图，供列表/看板实时乐观更新。 */
 export type StoryPatch = Partial<{
+  name: string;
   state: StoryState;
   priority: StoryPriority;
   assigneeId: string | null;
@@ -29,6 +32,32 @@ export type StoryPatch = Partial<{
   labelIds: string[];
 }>;
 
+/** 把 StoryPatch 合并进 StoryListItem（供列表/看板乐观更新），并刷新 updatedAt。
+ *  assigneeId/labelIds 需借助 ctx 展开成完整对象。单一来源：hook 与详情面板块共用。 */
+export function applyStoryPatchToItem(
+  story: StoryListItem,
+  patch: StoryPatch,
+  ctx: { users: UserBrief[]; labels: { id: string; name: string; color: string }[] },
+): StoryListItem {
+  const next: StoryListItem = { ...story, updatedAt: new Date().toISOString() };
+  if (patch.name !== undefined) next.name = patch.name;
+  if (patch.state !== undefined) next.state = patch.state;
+  if (patch.priority !== undefined) next.priority = patch.priority;
+  if (patch.assigneeId !== undefined) {
+    next.assignee = patch.assigneeId
+      ? ctx.users.find((u) => u.id === patch.assigneeId) ?? story.assignee
+      : null;
+  }
+  if (patch.startDate !== undefined) next.startDate = patch.startDate;
+  if (patch.targetDate !== undefined) next.targetDate = patch.targetDate;
+  if (patch.labelIds !== undefined) {
+    next.labels = patch.labelIds
+      .map((id) => ctx.labels.find((l) => l.id === id))
+      .filter((l): l is { id: string; name: string; color: string } => l != null);
+  }
+  return next;
+}
+
 /** 分组维度可更新的字段（state/priority/assigneeId/projectId） */
 export type GroupField = "state" | "priority" | "assigneeId" | "projectId";
 
@@ -40,6 +69,8 @@ export const GROUP_FIELD = {
   project: "projectId",
   createdBy: null,
   labels: null,
+  // 甘特专属维度：不支持跨组移动（迭代归属走迭代编辑器，非列内拖拽）
+  iteration: null,
   none: null,
 } as const satisfies Partial<Record<GroupKey, GroupField | null>>;