v3.5.9版本迭代列表优化

2026-08-25 12:38:21 +08:00
parent 282da24bc4
commit f4da71e952
62 changed files with 5027 additions and 4202 deletions
@@ -35,7 +35,11 @@ export function ListColumnPrefsProvider({
      `/admin/me/list-columns/${listKey}`,
      {
        method: 'PUT',
-        body: JSON.stringify(next ? { order: next.order, hidden: next.hidden } : { reset: true }),
+        body: JSON.stringify(
+          next
+            ? { order: next.order, hidden: next.hidden, widths: next.widths }
+            : { reset: true },
+        ),
      },
    );
    setPrefs(res.listColumnPrefs ?? {});
@@ -202,6 +202,7 @@ export type AdminOrderRow = {
  productName?: string;
  productSpec?: string;
  quantity?: number;
+  saleUnit?: string;
  receiverName: string;
  receiverPhone: string;
  receiverProvince?: string;
@@ -0,0 +1,67 @@
+import type { MouseEvent, ReactNode } from 'react';
+import type { ColumnType } from 'antd/es/table';
+
+export const MIN_COL_WIDTH = 48;
+export const MAX_COL_WIDTH = 960;
+
+export function clampColWidth(n: number): number {
+  return Math.min(MAX_COL_WIDTH, Math.max(MIN_COL_WIDTH, Math.round(n)));
+}
+
+export function beginColumnResize(
+  e: MouseEvent,
+  startWidth: number,
+  onMove: (width: number) => void,
+  onEnd: (width: number) => void,
+) {
+  e.preventDefault();
+  e.stopPropagation();
+  const startX = e.clientX;
+  let latest = clampColWidth(startWidth);
+  let moved = false;
+  document.body.classList.add('admin-col-resizing');
+
+  const onMouseMove = (ev: globalThis.MouseEvent) => {
+    moved = true;
+    latest = clampColWidth(startWidth + ev.clientX - startX);
+    onMove(latest);
+  };
+  const onMouseUp = () => {
+    document.removeEventListener('mousemove', onMouseMove);
+    document.removeEventListener('mouseup', onMouseUp);
+    document.body.classList.remove('admin-col-resizing');
+    if (moved) onEnd(latest);
+  };
+  document.addEventListener('mousemove', onMouseMove);
+  document.addEventListener('mouseup', onMouseUp);
+}
+
+export function withResizeTitle<T>(
+  title: ColumnType<T>['title'],
+  onMouseDown: (e: MouseEvent) => void,
+): ColumnType<T>['title'] {
+  const handle: ReactNode = (
+    <span
+      role="separator"
+      aria-orientation="vertical"
+      aria-label="拖动调整列宽"
+      className="admin-col-resize-handle"
+      onClick={(ev) => ev.stopPropagation()}
+      onMouseDown={onMouseDown}
+    />
+  );
+  if (typeof title === 'function') {
+    return (props) => (
+      <>
+        {title(props)}
+        {handle}
+      </>
+    );
+  }
+  return (
+    <>
+      {title}
+      {handle}
+    </>
+  );
+}
@@ -7,6 +7,12 @@ export const DELIVERY_PROVIDER_LABELS: Record<string, string> = {
  MANUAL: '手动',
 };

+export const DELIVERY_TYPE_LABELS: Record<string, string> = {
+  LOCAL: '同城',
+  CROSS_CITY: '跨城',
+  ON_SITE_PICKUP: '现场提货',
+};
+
 export const ORDER_STATUS_LABELS: Record<string, string> = {
  PENDING_PAY: '待付款',
  PENDING_SHIP: '待发货',
@@ -55,7 +55,20 @@ export function applyColumnPrefs<T>(
  const visible = new Set(visibleColumnKeys(defaultKeys, pref));
  const orderedKeys = mergeColumnOrder(defaultKeys, pref).filter((k) => visible.has(k));
  const byKey = new Map(configurable.map((c) => [c.key, c.col]));
-  return [...orderedKeys.map((k) => byKey.get(k)!).filter(Boolean), ...actions.map((c) => c.col)];
+  return [
+    ...orderedKeys
+      .map((k) => {
+        const col = byKey.get(k);
+        if (!col) return null;
+        const w = pref?.widths?.[k];
+        return w != null ? { ...col, width: w } : col;
+      })
+      .filter((c): c is ColumnType<T> => !!c),
+    ...actions.map((c) => {
+      const w = pref?.widths?.[c.key];
+      return w != null ? { ...c.col, width: w } : c.col;
+    }),
+  ];
 }

 export type ListColumnSettingItem = {
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 import { Button, message } from 'antd';
 import { SettingOutlined } from '@ant-design/icons';
 import type { ColumnsType, ColumnType } from 'antd/es/table';
@@ -9,9 +9,11 @@ import {
  ACTIONS_COLUMN_KEY,
  SERIAL_COLUMN_KEY,
  applyColumnPrefs,
+  columnKey,
  settingItems,
  type ListColumnSettingItem,
 } from './list-column-prefs';
+import { beginColumnResize, withResizeTitle } from './column-resize';

 type Options = {
  page?: number;
@@ -27,7 +29,13 @@ export function useAdminListColumns<T>(
  const { prefs, save } = useListColumnPrefs();
  const [open, setOpen] = useState(false);
  const [saving, setSaving] = useState(false);
+  const [localWidths, setLocalWidths] = useState<Record<string, number>>({});
  const pref = prefs[listKey];
+  const prefRef = useRef(pref);
+  prefRef.current = pref;
+  const localWidthsRef = useRef(localWidths);
+  localWidthsRef.current = localWidths;
+  const itemsRef = useRef<ListColumnSettingItem[]>([]);

  const configured = useMemo(
    () => applyColumnPrefs(allColumns as ColumnType<T>[], pref),
@@ -38,6 +46,7 @@ export function useAdminListColumns<T>(
    () => settingItems(allColumns as ColumnType<T>[], pref),
    [allColumns, pref],
  );
+  itemsRef.current = items;

  const serialCol: ColumnType<T> = useMemo(
    () => ({
@@ -50,37 +59,98 @@ export function useAdminListColumns<T>(
    [page, pageSize],
  );

-  const columns = useMemo<ColumnsType<T>>(
-    () => [
+  const persistPref = useCallback(
+    async (next: { order: string[]; hidden: string[]; widths?: Record<string, number> } | null) => {
+      if (!next) {
+        setLocalWidths({});
+        await save(listKey, null);
+        return;
+      }
+      await save(listKey, next);
+    },
+    [listKey, save],
+  );
+
+  const persist = useCallback(
+    async (next: ListColumnSettingItem[] | null) => {
+      setSaving(true);
+      try {
+        if (!next) {
+          await persistPref(null);
+        } else {
+          const widths = { ...(prefRef.current?.widths ?? {}), ...localWidthsRef.current };
+          await persistPref({
+            order: next.map((i) => i.key),
+            hidden: next.filter((i) => !i.visible).map((i) => i.key),
+            ...(Object.keys(widths).length ? { widths } : {}),
+          });
+        }
+        setOpen(false);
+        message.success(next ? '列设置已保存' : '已恢复默认列');
+      } catch (e) {
+        message.error(e instanceof Error ? e.message : '保存失败');
+      } finally {
+        setSaving(false);
+      }
+    },
+    [persistPref],
+  );
+
+  const persistWidth = useCallback(
+    async (key: string, width: number) => {
+      const current = prefRef.current;
+      const prevW = current?.widths?.[key];
+      if (prevW === width) return;
+      const order = current?.order?.length ? current.order : itemsRef.current.map((i) => i.key);
+      const hidden = current?.hidden ?? [];
+      const widths = { ...(current?.widths ?? {}), ...localWidthsRef.current, [key]: width };
+      try {
+        await persistPref({ order, hidden, widths });
+      } catch (e) {
+        message.error(e instanceof Error ? e.message : '列宽保存失败');
+      }
+    },
+    [persistPref],
+  );
+
+  const columns = useMemo<ColumnsType<T>>(() => {
+    const merged: ColumnType<T>[] = [
      serialCol,
      ...configured.map((col) =>
        col.title === '操作' || col.key === ACTIONS_COLUMN_KEY || col.key === 'actions'
          ? { ...col, key: col.key ?? ACTIONS_COLUMN_KEY }
          : col,
      ),
-    ],
-    [configured, serialCol],
-  );
-
-  async function persist(next: ListColumnSettingItem[] | null) {
-    setSaving(true);
-    try {
-      if (!next) {
-        await save(listKey, null);
-      } else {
-        await save(listKey, {
-          order: next.map((i) => i.key),
-          hidden: next.filter((i) => !i.visible).map((i) => i.key),
-        });
-      }
-      setOpen(false);
-      message.success(next ? '列设置已保存' : '已恢复默认列');
-    } catch (e) {
-      message.error(e instanceof Error ? e.message : '保存失败');
-    } finally {
-      setSaving(false);
-    }
-  }
+    ];
+    const widths = { ...(pref?.widths ?? {}), ...localWidths };
+    return merged.map((col, i) => {
+      const key = columnKey(col, i);
+      const width = widths[key] ?? (typeof col.width === 'number' ? col.width : undefined);
+      const prevHeader = col.onHeaderCell;
+      return {
+        ...col,
+        key,
+        width,
+        title: withResizeTitle(col.title, (e) => {
+          const th = (e.currentTarget as HTMLElement).closest('th');
+          const startWidth = width ?? th?.getBoundingClientRect().width ?? 120;
+          beginColumnResize(
+            e,
+            startWidth,
+            (next) => setLocalWidths((prev) => ({ ...prev, [key]: next })),
+            (next) => void persistWidth(key, next),
+          );
+        }),
+        onHeaderCell: (column) => {
+          const extra = typeof prevHeader === 'function' ? prevHeader(column) : {};
+          return {
+            ...extra,
+            className: [extra.className, 'admin-th-resizable'].filter(Boolean).join(' '),
+          };
+        },
+      };
+    });
+  }, [configured, serialCol, pref?.widths, localWidths, persistWidth]);

  const settingsButton = (
    <Button icon={<SettingOutlined />} onClick={() => setOpen(true)}>