@canvas-components/list-table 0.3.21 → 0.3.23

package/dist/index.cjs

@@ -951,15 +951,23 @@ function setColumnFixed(columns, targetKey, direction, initialColumns) {
   }
   updateColumnFixed(columns, targetKey, direction, initialColumns);
 }
-function setNestedColumnWidth(columns, targetKey, newWidth) {
+function setNestedColumnWidth(columns, targetKey, newWidth, expandMaxWidth = false) {
   ensureColumnKeysInPlace(columns);
   for (const column of columns) {
     if (column.key === targetKey) {
       column.width = newWidth;
+      if (expandMaxWidth && newWidth > (column.maxWidth ?? DEFAULT_MAX_WIDTH)) {
+        column.maxWidth = newWidth;
+      }
       return;
     }
     if (column.children?.length) {
-      setNestedColumnWidth(column.children, targetKey, newWidth);
+      setNestedColumnWidth(
+        column.children,
+        targetKey,
+        newWidth,
+        expandMaxWidth
+      );
     }
   }
 }
@@ -1104,16 +1112,149 @@ function applyInitialColumnVisibility(columns) {
 function replaceColumns(target, source) {
   target.splice(0, target.length, ...cloneColumns(source));
 }
+function preserveUserAddedColumns(params) {
+  const keys = /* @__PURE__ */ new Set();
+  const collect = (columns) => {
+    columns.forEach((column) => {
+      keys.add(resolveColumnKey(column));
+      if (column.children?.length) collect(column.children);
+    });
+  };
+  collect(params.nextColumns);
+  const preserve = (source, target) => {
+    source.forEach((column) => {
+      const key = resolveColumnKey(column);
+      if (column.userDefined && !keys.has(key)) {
+        target.push({ ...column });
+        keys.add(key);
+      } else if (column.children?.length) {
+        const matching = findColumnNode(params.nextColumns, key);
+        if (matching?.children) preserve(column.children, matching.children);
+      }
+    });
+  };
+  preserve(params.runtimeColumns, params.nextColumns);
+}
 function buildHeaderSettingsItems(columns) {
   ensureColumnKeysInPlace(columns);
   const totalVisibleLeafCount = countVisibleLeafColumns(columns);
-  return columns.flatMap((column) => {
+  return columns.flatMap((column, index) => {
     if (column.hideInSetting) {
       return [];
     }
-    return [buildHeaderSettingsItem(column, totalVisibleLeafCount, false)];
+    return [
+      buildHeaderSettingsItem(
+        column,
+        totalVisibleLeafCount,
+        false,
+        index + 1,
+        columns.length
+      )
+    ];
   });
 }
+function saveHeaderSettingsColumn(columns, draft) {
+  const title = draft.title.trim();
+  if (!title) return "\u8BF7\u8F93\u5165\u5217\u540D\u79F0";
+  const existing = draft.key ? findColumnNode(columns, draft.key) : null;
+  if (draft.key && !existing) return "\u5217\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u5217\u663E\u793A\u83DC\u5355";
+  const parent = !existing && draft.parentKey ? findColumnNode(columns, draft.parentKey) : null;
+  if (draft.parentKey && !existing && !parent?.children?.length) {
+    return "\u6240\u5C5E\u591A\u7EA7\u8868\u5934\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u5217\u663E\u793A\u83DC\u5355";
+  }
+  const siblings = existing ? findSiblingColumnsByKey(columns, draft.key) : parent?.children ?? columns;
+  if (!siblings) return "\u5217\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u5217\u663E\u793A\u83DC\u5355";
+  const maxOrder = siblings.length + (existing ? 0 : 1);
+  if (draft.order != null && (!Number.isInteger(draft.order) || draft.order < 1 || draft.order > maxOrder)) {
+    return `\u5217\u987A\u5E8F\u987B\u4ECB\u4E8E 1 \u548C ${maxOrder} \u4E4B\u95F4`;
+  }
+  const minWidth = draft.minWidth ?? 40;
+  const maxWidth = draft.maxWidth ?? 2e3;
+  const width = draft.width ?? 160;
+  if (![minWidth, maxWidth, width].every(
+    (value) => Number.isFinite(value) && value > 0
+  ) || minWidth > maxWidth || width < minWidth || width > maxWidth) {
+    return "\u5BBD\u5EA6\u987B\u4ECB\u4E8E\u6700\u5C0F\u5BBD\u5EA6\u548C\u6700\u5927\u5BBD\u5EA6\u4E4B\u95F4";
+  }
+  if (existing && !existing.userDefined) {
+    existing.title = title;
+    existing.settingTitle = title;
+    existing.userTitle = title;
+    existing.width = width;
+    existing.minWidth = minWidth;
+    existing.maxWidth = maxWidth;
+    if (draft.order != null) moveColumnToOrder(siblings, existing, draft.order);
+    return null;
+  }
+  const dataIndex = draft.dataIndex?.trim();
+  if (!dataIndex || dataIndex.split(".").some((part) => !part.trim())) {
+    return "dataIndex \u4E3A\u5FC5\u586B\u9879";
+  }
+  if (isHeaderDataIndexUsed(columns, dataIndex, draft.key)) {
+    return "\u8BE5 dataIndex \u5DF2\u88AB\u5176\u4ED6\u5217\u4F7F\u7528";
+  }
+  const column = existing ?? { key: createUserColumnKey(columns) };
+  column.title = title;
+  column.settingTitle = title;
+  column.dataIndex = dataIndex.split(".");
+  column.width = width;
+  column.minWidth = minWidth;
+  column.maxWidth = maxWidth;
+  column.fixed = draft.fixed;
+  column.userDefined = true;
+  column.allowSort = true;
+  column.sorter = true;
+  if (existing && draft.order != null) {
+    moveColumnToOrder(siblings, existing, draft.order);
+  } else if (!existing) {
+    siblings.splice((draft.order ?? maxOrder) - 1, 0, column);
+  }
+  return null;
+}
+function findSiblingColumnsByKey(columns, key) {
+  if (columns.some((column) => resolveColumnKey(column) === key))
+    return columns;
+  for (const column of columns) {
+    if (!column.children?.length) continue;
+    const siblings = findSiblingColumnsByKey(column.children, key);
+    if (siblings) return siblings;
+  }
+  return null;
+}
+function moveColumnToOrder(siblings, column, order) {
+  const currentIndex = siblings.indexOf(column);
+  if (currentIndex < 0 || currentIndex === order - 1) return;
+  siblings.splice(currentIndex, 1);
+  siblings.splice(order - 1, 0, column);
+}
+function deleteHeaderSettingsColumn(columns, columnKey) {
+  const target = findColumnNode(columns, columnKey);
+  if (!target?.userDefined || countVisibleLeafColumns(columns) <= countVisibleLeafColumns([target]))
+    return false;
+  const remove = (items) => {
+    const index = items.findIndex(
+      (column) => resolveColumnKey(column) === columnKey
+    );
+    if (index >= 0) {
+      items.splice(index, 1);
+      return true;
+    }
+    return items.some(
+      (column) => column.children?.length && remove(column.children)
+    );
+  };
+  return remove(columns);
+}
+function createUserColumnKey(columns) {
+  let index = 1;
+  while (findColumnNode(columns, `user-column-${index}`)) index += 1;
+  return `user-column-${index}`;
+}
+function isHeaderDataIndexUsed(columns, dataIndex, excludeKey) {
+  return columns.some(
+    (column) => resolveColumnKey(column) !== excludeKey && column.dataIndex != null && utils.stringifyDataIndex(column.dataIndex) === dataIndex || column.children?.length && isHeaderDataIndexUsed(column.children, dataIndex, excludeKey)
+  );
+}
 function setHeaderColumnVisible(columns, columnKey, visible) {
   if (!visible) {
     const targetLeafCount = getColumnLeafCount(columns, columnKey);
@@ -1312,10 +1453,18 @@ function findColumnNode(columns, columnKey) {
   }
   return null;
 }
-function buildHeaderSettingsItem(column, totalVisibleLeafCount, parentHidden) {
+function buildHeaderSettingsItem(column, totalVisibleLeafCount, parentHidden, order, siblingCount) {
   const hidden = parentHidden || !!column.hidden;
-  const children = column.children?.filter((child) => !child.hideInSetting).map(
-    (child) => buildHeaderSettingsItem(child, totalVisibleLeafCount, hidden)
+  const children = column.children?.flatMap(
+    (child, index) => child.hideInSetting ? [] : [
+      buildHeaderSettingsItem(
+        child,
+        totalVisibleLeafCount,
+        hidden,
+        index + 1,
+        column.children.length
+      )
+    ]
   );
   const leafCount = countLeafColumns([column]);
   const visibleLeafCount = hidden ? 0 : countVisibleLeafColumns([column]);
@@ -1327,6 +1476,14 @@ function buildHeaderSettingsItem(column, totalVisibleLeafCount, parentHidden) {
     title: String(
       column.settingTitle ?? column.title ?? resolveColumnKey(column)
     ),
+    dataIndex: column.dataIndex == null ? void 0 : utils.stringifyDataIndex(column.dataIndex),
+    userDefined: column.userDefined === true,
+    width: column.width,
+    minWidth: column.minWidth,
+    maxWidth: column.maxWidth,
+    fixed: column.fixed,
+    order,
+    siblingCount,
     checked,
     indeterminate,
     disabled,
@@ -1506,6 +1663,7 @@ var ListTableDomHost = class {
     wrapper.style.display = "flex";
     wrapper.style.flexDirection = "column";
     wrapper.style.minWidth = "0";
+    wrapper.style.maxWidth = "100%";
     wrapper.style.boxSizing = "border-box";
     wrapper.style.overflow = "visible";
     const contentLayer = document.createElement("div");
@@ -6502,12 +6660,12 @@ function queryFilterWorkerEntrypoint() {
   let filters = [];
   const matchedIndices = [];
   const now2 = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
-  const escapeRegExp2 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const escapeRegExp3 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const wildcardToRegExp2 = (value) => {
     const pattern = Array.from(value).map((char) => {
       if (char === "%") return ".*";
       if (char === "_") return ".";
-      return escapeRegExp2(char);
+      return escapeRegExp3(char);
     }).join("");
     return new RegExp(`^${pattern}$`, "i");
   };
@@ -9135,7 +9293,7 @@ function drawSummaryCell(ctx, rect, column, theme, summaryValues, selectedHeader
   const fontSize = style?.fontSize ?? theme.fontSize;
   const paddingInline = style?.paddingInline ?? 12;
   const paddingBlock = style?.paddingBlock ?? 0;
-  const textY = style?.verticalAlign === "top" ? rect.y + paddingBlock + fontSize / 2 : style?.verticalAlign === "bottom" ? rect.y + rect.height - paddingBlock - fontSize / 2 : rect.y + rect.height / 2;
+  const centerY = style?.verticalAlign === "top" ? rect.y + paddingBlock + fontSize / 2 : style?.verticalAlign === "bottom" ? rect.y + rect.height - paddingBlock - fontSize / 2 : rect.y + rect.height / 2;
   if (!cellClip) {
     ctx.restore();
     return;
@@ -9160,7 +9318,7 @@ function drawSummaryCell(ctx, rect, column, theme, summaryValues, selectedHeader
     ctx.clip();
     ctx.fillStyle = style?.color ?? theme.headerTextColor;
     ctx.font = `${style?.fontWeight ?? "600"} ${fontSize}px ${style?.fontFamily ?? theme.fontFamily}`;
-    ctx.textBaseline = "middle";
+    ctx.textBaseline = "alphabetic";
     const align = style?.textAlign ?? column.align ?? "left";
     ctx.textAlign = align;
     const contentInsetStart = column.key === inlineContentInset?.columnKey ? inlineContentInset.width : 0;
@@ -9181,9 +9339,15 @@ function drawSummaryCell(ctx, rect, column, theme, summaryValues, selectedHeader
       visibleRect,
       padding: paddingInline
     });
-    const textWidth = ctx.measureText(displayText).width;
+    const bounds = measureTextBounds(ctx, displayText);
+    const textY = resolveCenteredTextBaselineY({
+      centerY,
+      ascent: bounds.ascent,
+      descent: bounds.descent
+    });
+    const textWidth = bounds.width;
     const textOriginX = textX - (align === "right" ? textWidth : align === "center" ? textWidth / 2 : 0);
-    const textTop = textY - fontSize / 2;
+    const textTop = textY - bounds.ascent;
     const fragmentKey = `summary:${column.key}`;
     drawSelectableTextSelectionBackground({
       ctx,
@@ -9191,7 +9355,7 @@ function drawSummaryCell(ctx, rect, column, theme, summaryValues, selectedHeader
       textSelection,
       textOriginX,
       textTop,
-      textHeight: fontSize,
+      textHeight: bounds.height,
       rowIndex: Number.MAX_SAFE_INTEGER,
       columnKey: column.key,
       contentIndex: 0,
@@ -9211,7 +9375,7 @@ function drawSummaryCell(ctx, rect, column, theme, summaryValues, selectedHeader
           x: textOriginX,
           y: textTop,
           width: textWidth,
-          height: fontSize
+          height: bounds.height
         },
         cellClip
       ) ?? void 0,
@@ -11218,7 +11382,6 @@ function roundRectPath3(ctx, x, y, width, height, radius) {
 var TAG_HORIZONTAL_PADDING = 8;
 var TAG_HEIGHT = 22;
 var TAG_RADIUS = 4;
-var TAG_TEXT_OPTICAL_OFFSET_Y = 1;
 var ANT_TAG_PRESET_MAP = {
   default: {
     backgroundColor: "#fafafa",
@@ -11325,12 +11488,24 @@ function drawBodyTagContent(params) {
   const textColor = resolveTagTextColor(content, palette.textColor);
   const textIndent = resolveContentTextIndent(content);
   const paddingInline = content.paddingInline ?? TAG_HORIZONTAL_PADDING;
+  const drawLeft = Math.round(cursorX);
+  const drawTop = Math.round(top);
+  const drawWidth = Math.max(Math.round(cursorX + width) - drawLeft, 1);
+  const drawHeight = Math.max(Math.round(top + height) - drawTop, 1);
   ctx.save();
   ctx.globalAlpha *= resolveContentOpacity(content);
-  drawRoundedRectPath2(ctx, cursorX, top, width, height, radius);
+  drawRoundedRectPath2(ctx, drawLeft, drawTop, drawWidth, drawHeight, radius);
   ctx.fillStyle = content.style?.backgroundColor ?? palette.backgroundColor;
   ctx.fill();
   if (bordered) {
+    drawRoundedRectPath2(
+      ctx,
+      drawLeft + 0.5,
+      drawTop + 0.5,
+      Math.max(drawWidth - 1, 0),
+      Math.max(drawHeight - 1, 0),
+      Math.max(radius - 0.5, 0)
+    );
     ctx.strokeStyle = palette.borderColor;
     ctx.lineWidth = 1;
     ctx.stroke();
@@ -11352,7 +11527,7 @@ function drawBodyTagContent(params) {
     textIndent,
     textAlign: resolveContentTextAlign(content, "center")
   });
-  const centerY = top + height / 2 + TAG_TEXT_OPTICAL_OFFSET_Y;
+  const centerY = rect.y + rect.height / 2;
   const textY = resolveCenteredTextBaselineY({
     centerY,
     ascent: bounds.ascent,
@@ -11561,7 +11736,7 @@ function drawBodyTextContent(params) {
     textHeight: bounds.height,
     color: theme.textSelectionBackgroundColor ?? "#99c2ff"
   });
-  if (searchMatch && searchMatch.rowIndex === rowIndex && searchMatch.columnKey === column.key && searchMatch.keyword) {
+  if (searchMatch && searchMatch.rowIndex === rowIndex && searchMatch.columnKey === column.key && (searchMatch.contentIndex == null || searchMatch.contentIndex === contentIndex) && searchMatch.keyword) {
     const start = Math.max(0, Math.min(searchMatch.start, content.text.length));
     const end = Math.max(start, Math.min(searchMatch.end, content.text.length));
     const prefixWidth = ctx.measureText(content.text.slice(0, start)).width;
@@ -12317,6 +12492,12 @@ function resolveRawBodyCellContents(params) {
       }
     ];
   }
+  if (column.cellType === "emoji") {
+    return normalizeCellContents({
+      type: "emoji",
+      emoji: formattedText ?? String(value ?? "")
+    });
+  }
   if (column.cellType === "money") {
     return [
       {
@@ -12374,6 +12555,21 @@ function normalizeDrawableCellContents(contents) {
   ).map(normalizeCellContentItem);
 }
 function normalizeCellContentItem(content) {
+  if (content.type === "emoji") {
+    const { emoji, size, ...rest } = content;
+    return {
+      ...rest,
+      type: "text",
+      text: emoji,
+      fontSize: size ?? 20,
+      style: {
+        ...content.style,
+        fontSize: content.style?.fontSize ?? size ?? 20,
+        fontWeight: content.style?.fontWeight ?? "normal",
+        fontFamily: content.style?.fontFamily ?? '"Segoe UI Emoji", "Apple Color Emoji", "Noto Color Emoji", "Segoe UI Symbol", sans-serif'
+      }
+    };
+  }
   if (content.type === "timeline") {
     return { ...content, style: { ...content.style, display: "block" } };
   }
@@ -13835,6 +14031,9 @@ function buildBodyContentsPlainText(contents) {
     if (content.type === "icon") {
       return content.icon;
     }
+    if (content.type === "emoji") {
+      return content.emoji;
+    }
     if (content.type === "text" || content.type === "link" || content.type === "tag") {
       return content.text;
     }
@@ -14172,6 +14371,9 @@ function isCellContentDisabled(content) {
   if (content.type === "tag") {
     return false;
   }
+  if (content.type === "emoji") {
+    return false;
+  }
   if (content.type === "money") {
     return false;
   }
@@ -18772,7 +18974,7 @@ function openCellEditingSession(params) {
   }
   const editorConfig = resolveEditorConfig(editConfig);
   const editingValue = initialValue === void 0 ? currentValue : initialValue;
-  const selectOnFocus = !(initialValue !== void 0 && (currentValue == null || currentValue === ""));
+  const selectOnFocus = initialValue === void 0;
   const hostRect = toHostRect ? toHostRect(descriptor.rect) : descriptor.rect;
   const zoom = typeof theme.contentZoom === "number" && Number.isFinite(theme.contentZoom) && theme.contentZoom > 0 ? theme.contentZoom : 1;
   const paddingInline = (column.cellStyle?.paddingInline ?? DEFAULT_EDITOR_PADDING_INLINE) * zoom;
@@ -26080,18 +26282,58 @@ function autoFitListTableColumnWidths(params) {
       );
     }
     const nextWidth = Math.ceil(
-      utils.clamp(measuredWidth, column.minWidth, column.maxWidth)
+      params.fillContainerWidth == null ? utils.clamp(measuredWidth, column.minWidth, column.maxWidth) : Math.max(measuredWidth, column.minWidth)
     );
     column.width = nextWidth;
-    setNestedColumnWidth(options.columns, column.key, nextWidth);
+    if (params.fillContainerWidth != null) {
+      column.maxWidth = Math.max(column.maxWidth, nextWidth);
+    }
+    setNestedColumnWidth(
+      options.columns,
+      column.key,
+      nextWidth,
+      params.fillContainerWidth != null
+    );
     fitted = true;
   });
+  if (fitted && params.fillContainerWidth != null) {
+    const hostWidth = params.hostWidth;
+    const measuredTotalWidth = leafColumns.reduce(
+      (sum, column) => sum + column.width,
+      0
+    );
+    const shouldPreserveOverflow = hostWidth != null && measuredTotalWidth > params.fillContainerWidth && measuredTotalWidth <= hostWidth;
+    fillAutoFitColumnWidths(leafColumns, params.fillContainerWidth);
+    if (shouldPreserveOverflow && hostWidth != null) {
+      fillAutoFitColumnWidths(leafColumns, Math.ceil(hostWidth) + 1);
+    }
+    leafColumns.forEach((column) => {
+      if (!isSystemColumnKey(column.key)) {
+        setNestedColumnWidth(options.columns, column.key, column.width, true);
+      }
+    });
+  }
   ctx.restore();
   if (fitted) {
     options.stretchColumns = false;
   }
   return fitted;
 }
+function fillAutoFitColumnWidths(columns, containerWidth) {
+  let remaining = Math.max(
+    Math.round(
+      containerWidth - columns.reduce((sum, column) => sum + column.width, 0)
+    ),
+    0
+  );
+  const candidates = columns.filter((column) => !isSystemColumnKey(column.key));
+  candidates.forEach((column, index) => {
+    const extra = Math.ceil(remaining / (candidates.length - index));
+    column.width += extra;
+    column.maxWidth = Math.max(column.maxWidth, column.width);
+    remaining -= extra;
+  });
+}
 function resolveAutoFitMeasureRows(rows, range = {}) {
   if (rows.length === 0) {
     return [];
@@ -26158,6 +26400,134 @@ function measureHeaderWidth(ctx, column, theme) {
   return Math.ceil(contentWidth + HEADER_PADDING_INLINE * 2 + actionWidth);
 }
 
+// src/features/search/search-matcher.ts
+function createListTableSearchMatcher(keyword, options) {
+  const pattern = options.mode === "regex" ? keyword : keyword.trim();
+  if (!pattern) {
+    return { findMatches: () => [], error: null, active: false };
+  }
+  if (options.mode === "fuzzy") {
+    const needle = options.caseSensitive ? pattern : pattern.toLocaleLowerCase();
+    return {
+      error: null,
+      active: true,
+      findMatches: (text) => {
+        const source = options.caseSensitive ? text : text.toLocaleLowerCase();
+        const matches = [];
+        let start = source.indexOf(needle);
+        while (start >= 0) {
+          matches.push({ start, end: start + pattern.length });
+          start = source.indexOf(needle, start + needle.length);
+        }
+        return matches;
+      }
+    };
+  }
+  if (options.mode === "exact") {
+    const needle = options.caseSensitive ? pattern : pattern.toLocaleLowerCase();
+    return {
+      error: null,
+      active: true,
+      findMatches: (text) => {
+        const source = options.caseSensitive ? text : text.toLocaleLowerCase();
+        return source === needle ? [{ start: 0, end: text.length }] : [];
+      }
+    };
+  }
+  try {
+    const source = options.mode === "wildcard" ? wildcardToRegExpSource(pattern) : pattern;
+    const expression = new RegExp(source, options.caseSensitive ? "g" : "gi");
+    return {
+      error: null,
+      active: true,
+      findMatches: (text) => {
+        const matches = [];
+        expression.lastIndex = 0;
+        let result;
+        while ((result = expression.exec(text)) !== null) {
+          if (result[0].length > 0) {
+            matches.push({ start: result.index, end: expression.lastIndex });
+          } else {
+            expression.lastIndex += 1;
+          }
+        }
+        return matches;
+      }
+    };
+  } catch {
+    return { findMatches: () => [], error: "\u6B63\u5219\u8868\u8FBE\u5F0F\u65E0\u6548", active: false };
+  }
+}
+function wildcardToRegExpSource(pattern) {
+  let source = "";
+  for (let index = 0; index < pattern.length; index += 1) {
+    const char = pattern[index];
+    if (char === "\\" && index + 1 < pattern.length) {
+      source += escapeRegExp2(pattern[++index]);
+    } else if (char === "*") {
+      source += ".*";
+    } else if (char === "?") {
+      source += ".";
+    } else {
+      source += escapeRegExp2(char);
+    }
+  }
+  return source;
+}
+function escapeRegExp2(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function resolveListTableSearchCellTexts(params) {
+  const { record, rowIndex, column } = params;
+  if (!column.render && !column.dataFormat && !column.cellType) {
+    return [
+      {
+        contentIndex: 0,
+        text: String(utils.getValueByDataIndex(record, column.dataIndex) ?? "")
+      }
+    ];
+  }
+  return resolveBodyCellContents({ record, rowIndex, column }).flatMap(
+    (content, contentIndex) => content.type === "text" ? [{ contentIndex, text: content.text }] : []
+  );
+}
+function buildHeaderDataIndexOptions(rows, columns) {
+  const paths = /* @__PURE__ */ new Set();
+  const used = /* @__PURE__ */ new Map();
+  const visitColumns = (items) => {
+    items.forEach((column) => {
+      if (column.dataIndex != null) {
+        const path = utils.stringifyDataIndex(column.dataIndex);
+        if (!used.has(path)) {
+          used.set(
+            path,
+            String(column.settingTitle ?? column.title ?? column.key ?? path)
+          );
+        }
+      }
+      if (column.children?.length) visitColumns(column.children);
+    });
+  };
+  visitColumns(columns);
+  const visitValue = (value, prefix, depth) => {
+    if (!value || typeof value !== "object" || Array.isArray(value) || value instanceof Date)
+      return;
+    Object.entries(value).forEach(([key, child]) => {
+      if (paths.size >= 200) return;
+      const path = prefix ? `${prefix}.${key}` : key;
+      paths.add(path);
+      if (depth < 3) visitValue(child, path, depth + 1);
+    });
+  };
+  rows.slice(0, 50).forEach((row) => visitValue(row, "", 0));
+  used.forEach((_label, path) => paths.add(path));
+  return [...paths].map((value) => ({
+    value,
+    disabled: used.has(value),
+    ...used.has(value) ? { label: used.get(value) } : null
+  }));
+}
+
 // src/features/overlay/context-menu-builder.ts
 function createListTableContextMenuActions(params) {
   return {
@@ -26308,6 +26678,10 @@ function createListTableContextMenuActions(params) {
       params.hideMenu();
       params.onAutoFitAllColumns?.();
     } : void 0,
+    onAutoFitFillContainer: params.onAutoFitFillContainer ? () => {
+      params.hideMenu();
+      params.onAutoFitFillContainer?.();
+    } : void 0,
     onToggleGroupingBar: params.onToggleGroupingBar ? () => {
       params.hideMenu();
       params.onToggleGroupingBar?.();
@@ -26316,6 +26690,8 @@ function createListTableContextMenuActions(params) {
     onChangeZoom: params.onChangeZoom,
     onToggleCurrentColumn: params.onToggleCurrentColumn ?? params.onToggleColumn,
     onToggleColumn: params.onToggleColumn,
+    onSaveColumn: params.onSaveColumn,
+    onDeleteColumn: params.onDeleteColumn,
     onChangeCachePreference: params.onChangeCachePreference ? (category, enabled) => {
       params.hideMenu();
       params.onChangeCachePreference?.(category, enabled);
@@ -26384,6 +26760,7 @@ function buildListTableContextMenuConfig(params) {
     x,
     y,
     columns,
+    dataSource,
     columnKey,
     isHeaderArea,
     isSummaryArea = false,
@@ -26408,6 +26785,7 @@ function buildListTableContextMenuConfig(params) {
   const isBodyArea = bodyRowIndex != null;
   const isSelectionColumn = columnKey === ROW_SELECTION_COLUMN_KEY || columnKey === ROW_SELECTOR_COLUMN_KEY;
   const enableCopy = enabledFeatures.has("copy");
+  const enableChart = enabledFeatures.has("chart");
   const enableSearch = enabledFeatures.has("search");
   const enableExport = enabledFeatures.has("export");
   const enableDownloadContent = enabledFeatures.has("downloadContent");
@@ -26455,6 +26833,7 @@ function buildListTableContextMenuConfig(params) {
   return {
     x,
     y,
+    onCreateChart: enableChart && (isBodyArea || isExpandedArea || isHeaderArea && columnKey !== ROW_SELECTION_COLUMN_KEY) ? params.onCreateChart : void 0,
     columns: enableColumnVisibility ? headerItems : void 0,
     density: enableDensity ? density : void 0,
     zoom: enableZoom ? normalizeContextMenuZoom(zoom) : void 0,
@@ -26537,11 +26916,15 @@ function buildListTableContextMenuConfig(params) {
     onResetDataFormat: enableReset && isTableSettingsArea ? actions.onResetDataFormat : void 0,
     onAutoFitCurrentColumn: enableColumnWidth && isHeaderArea && !isSelectionColumn && actions.onAutoFitCurrentColumn ? () => actions.onAutoFitCurrentColumn?.(columnKey) : void 0,
     onAutoFitAllColumns: enableColumnWidth && isTableSettingsArea && !isSelectionColumn && actions.onAutoFitAllColumns ? actions.onAutoFitAllColumns : void 0,
+    onAutoFitFillContainer: enableColumnWidth && isTableSettingsArea && !isSelectionColumn && actions.onAutoFitFillContainer ? actions.onAutoFitFillContainer : void 0,
     groupingBarVisible,
     onToggleGroupingBar: enableGrouping && (isTableSettingsArea || groupingBarArea) ? actions.onToggleGroupingBar : void 0,
     onChangeDensity: enableDensity ? actions.onChangeDensity : void 0,
     onChangeZoom: enableZoom ? actions.onChangeZoom : void 0,
     onToggleColumn: enableColumnVisibility && isTableSettingsArea ? actions.onToggleColumn : void 0,
+    dataIndexOptions: enableColumnVisibility && isTableSettingsArea ? buildHeaderDataIndexOptions(dataSource ?? [], columns) : void 0,
+    onSaveColumn: enableColumnVisibility && isTableSettingsArea ? actions.onSaveColumn : void 0,
+    onDeleteColumn: enableColumnVisibility && isTableSettingsArea ? actions.onDeleteColumn : void 0,
     columnSettingsCacheAvailable: Boolean(params.storageKey),
     cachePreferences: params.cachePreferences,
     onChangeCachePreference: enabledFeatures.has("cache") ? actions.onChangeCachePreference : void 0,
@@ -26597,6 +26980,7 @@ function findSummaryColumn(columns, columnKey) {
 }
 var DEFAULT_CONTEXT_MENU_FEATURES = [
   "copy",
+  "chart",
   "search",
   "export",
   "downloadContent",
@@ -26745,6 +27129,7 @@ function showHeaderContextMenu(params) {
     onResetDataFormat,
     onAutoFitCurrentColumn,
     onAutoFitAllColumns,
+    onAutoFitFillContainer,
     groupingBarVisible,
     groupingBarArea,
     onToggleGroupingBar,
@@ -26752,6 +27137,8 @@ function showHeaderContextMenu(params) {
     onChangeZoom,
     onToggleCurrentColumn,
     onToggleColumn,
+    onSaveColumn,
+    onDeleteColumn,
     onExpandAllCollapsedColumns,
     onClose,
     onToggleSummary,
@@ -26779,7 +27166,8 @@ function showHeaderContextMenu(params) {
   const isSummaryArea = result.area === "summary";
   const isExpandedArea = result.area === "expanded-row" || result.columnKey === "__expanded_row__";
   const isSelectionColumn = result.columnKey === ROW_SELECTION_COLUMN_KEY || result.columnKey === ROW_SELECTOR_COLUMN_KEY;
-  if (!isHeaderArea && !isBodyArea && !groupingBarArea && !isExpandedArea || !result.columnKey && !groupingBarArea && !isExpandedArea || isHeaderArea && isSelectionColumn) {
+  const isChartCorner = isHeaderArea && result.columnKey === ROW_SELECTOR_COLUMN_KEY && resolveEnabledContextMenuFeatures(options.contextMenu).has("chart");
+  if (!isHeaderArea && !isBodyArea && !groupingBarArea && !isExpandedArea || !result.columnKey && !groupingBarArea && !isExpandedArea || isHeaderArea && isSelectionColumn && !isChartCorner) {
     headerContextMenu.hide();
     return false;
   }
@@ -26792,7 +27180,7 @@ function showHeaderContextMenu(params) {
   fixedPopup.hide();
   hideBodyTooltip();
   const contextColumnKey = result.columnKey ?? "";
-  if (isHeaderArea) {
+  if (isHeaderArea && !isChartCorner) {
     onSelectHeader(contextColumnKey, result.rect);
   }
   const bodyRowIndex = isBodyArea && !isSummaryArea && !isExpandedArea && typeof result.rowIndex === "number" ? result.rowIndex : null;
@@ -26808,11 +27196,13 @@ function showHeaderContextMenu(params) {
       x: event.clientX,
       y: event.clientY,
       columns: options.columns,
+      dataSource: options.dataSource,
       columnKey: result.columnKey ?? "",
       isHeaderArea,
       isSummaryArea,
       isExpandedArea,
       onCopySummaryRowText: params.onCopySummaryRowText,
+      onCreateChart: params.onCreateChart,
       onCopyImage: params.onCopyImage,
       onExportImage: params.onExportImage,
       canCopySelectionImage: params.canCopySelectionImage,
@@ -26858,11 +27248,14 @@ function showHeaderContextMenu(params) {
         onResetDataFormat,
         onAutoFitCurrentColumn,
         onAutoFitAllColumns,
+        onAutoFitFillContainer,
         onToggleGroupingBar,
         onChangeDensity,
         onChangeZoom,
         onToggleCurrentColumn,
         onToggleColumn,
+        onSaveColumn,
+        onDeleteColumn,
         onExpandAllCollapsedColumns,
         onClose,
         onToggleSummary,
@@ -26902,6 +27295,77 @@ function resolveContextMenuDensity(rowHeight) {
   return rowHeight === 48 ? "middle" : "compact";
 }
 
+// src/features/overlay/chart-data.ts
+function createListTableChartData(params) {
+  const {
+    rows,
+    columns,
+    columnKey,
+    rowIndex,
+    selectionRange,
+    selectedRowRange,
+    selectedColumnRange
+  } = params;
+  const startRow = Math.max(
+    selectionRange?.startRowIndex ?? selectedRowRange?.start ?? Math.max((rowIndex ?? 0) - 10, 0),
+    0
+  );
+  const endRow = Math.min(
+    selectionRange?.endRowIndex ?? selectedRowRange?.end ?? startRow + 199,
+    rows.length - 1
+  );
+  const selectedColumns = selectionRange ? columns.slice(
+    Math.max(selectionRange.startColumnIndex, 0),
+    selectionRange.endColumnIndex + 1
+  ) : selectedRowRange ? columns : selectedColumnRange ? columns.slice(
+    Math.max(selectedColumnRange.start, 0),
+    selectedColumnRange.end + 1
+  ) : columns.filter((column) => column.key === columnKey);
+  const chartColumns = selectedColumns.filter(
+    (column) => column.key !== ROW_SELECTION_COLUMN_KEY && column.key !== ROW_SELECTOR_COLUMN_KEY && column.key !== EXPAND_COLUMN_KEY
+  ).slice(0, 12);
+  if (startRow > endRow || chartColumns.length === 0) return null;
+  const sampledRows = rows.slice(
+    startRow,
+    Math.min(endRow + 1, startRow + 200)
+  );
+  const values = chartColumns.map(
+    (column) => sampledRows.map(
+      (record, offset) => getCellClipboardText(record, startRow + offset, column)
+    )
+  );
+  const numericColumns = chartColumns.flatMap((column, index) => {
+    const numbers = values[index]?.map(parseChartNumber) ?? [];
+    return numbers.some((value) => value !== null) ? [{ name: column.title, data: numbers.map((value) => value ?? 0) }] : [];
+  });
+  if (numericColumns.length === 0) return null;
+  const labelIndex = chartColumns.findIndex(
+    (_, index) => values[index]?.every((value) => parseChartNumber(value) === null)
+  );
+  if (sampledRows.length === 1 && chartColumns.length > 1) {
+    return {
+      labels: numericColumns.map((series) => series.name),
+      series: [
+        {
+          name: values[labelIndex]?.[0] || String(startRow + 1),
+          data: numericColumns.map((series) => series.data[0] ?? 0)
+        }
+      ]
+    };
+  }
+  const labels = sampledRows.map(
+    (_, index) => labelIndex >= 0 ? values[labelIndex]?.[index] || String(startRow + index + 1) : String(startRow + index + 1)
+  );
+  return { labels, series: numericColumns };
+}
+function parseChartNumber(value) {
+  const normalized = value.trim().replace(/[,，\s￥¥$]/g, "");
+  if (!normalized) return null;
+  const percentage = normalized.endsWith("%");
+  const parsed = Number(percentage ? normalized.slice(0, -1) : normalized);
+  return Number.isFinite(parsed) ? parsed : null;
+}
+
 // src/features/tooltip/tooltip-feature.ts
 function getHeaderActionTooltipText(result, sortState) {
   const area = result.area;
@@ -27923,6 +28387,11 @@ var EDITABLE_CELL_ROW_SELECTION_DELAY = 300;
 var ListTableEventController = class {
   constructor(host) {
     __publicField(this, "searchKeyword", "");
+    __publicField(this, "searchOptions", {
+      mode: "fuzzy",
+      caseSensitive: false
+    });
+    __publicField(this, "searchError", null);
     __publicField(this, "searchMatches", []);
     __publicField(this, "searchCurrentIndex", -1);
     __publicField(this, "textSelectionDrag", null);
@@ -28485,6 +28954,15 @@ var ListTableEventController = class {
         getAllRows: () => this.host.options.dataSource,
         getExportSummaryEnabled: () => Boolean(this.host.currentRenderSnapshot?.hasSummary),
         onCopyImage: (scope) => this.copyImage(scope, event),
+        onCreateChart: () => createListTableChartData({
+          rows: this.host.getDisplayData(),
+          columns: this.host.leafColumns,
+          columnKey: contextResult.columnKey ?? "",
+          rowIndex: typeof contextResult.rowIndex === "number" ? contextResult.rowIndex : null,
+          selectionRange: this.host.rangeHighlight.selectedCellRange,
+          selectedRowRange: this.host.rangeHighlight.selectedRowRange,
+          selectedColumnRange: this.host.rangeHighlight.selectedColumnRange
+        }),
         onExportImage: (scope) => this.copyImage(scope, event, true),
         canCopySelectionImage: resolveImageSelection(this.host) != null,
         onCopySummaryRowText: () => {
@@ -28517,15 +28995,21 @@ var ListTableEventController = class {
           this.host.selectHeader(columnKey, rect);
         },
         onSelectBodyRow: (rowIndex, columnKey) => {
+          const selectedCellRange = this.host.rangeHighlight.selectedCellRange;
+          const columnIndex = this.host.leafColumns.findIndex(
+            (column) => column.key === columnKey
+          );
           this.host.selection = {
             rowIndex,
             columnKey
           };
           this.host.clearSelectedHeader();
-          this.host.rangeHighlight = resolveNextRowHighlightForContextMenu({
-            current: this.host.rangeHighlight,
-            rowIndex
-          });
+          if (!selectedCellRange || rowIndex < selectedCellRange.startRowIndex || rowIndex > selectedCellRange.endRowIndex || columnIndex < selectedCellRange.startColumnIndex || columnIndex > selectedCellRange.endColumnIndex) {
+            this.host.rangeHighlight = resolveNextRowHighlightForContextMenu({
+              current: this.host.rangeHighlight,
+              rowIndex
+            });
+          }
           this.host.summarySelected = false;
         },
         getSelectionRange: () => this.host.rangeHighlight.selectedCellRange ?? null,
@@ -28635,6 +29119,9 @@ var ListTableEventController = class {
         onAutoFitAllColumns: () => {
           this.autoFitColumnWidths();
         },
+        onAutoFitFillContainer: () => {
+          this.autoFitColumnWidths(void 0, true);
+        },
         groupingBarVisible: this.host.groupBarVisible,
         groupingBarArea,
         onToggleGroupingBar: () => {
@@ -28653,6 +29140,8 @@ var ListTableEventController = class {
         onToggleColumn: (columnKey, visible) => {
           this.host.toggleHeaderColumnVisible(columnKey, visible);
         },
+        onSaveColumn: (draft) => this.host.saveHeaderColumn(draft),
+        onDeleteColumn: (columnKey) => this.host.deleteHeaderColumn(columnKey),
         onExpandAllCollapsedColumns: () => {
           this.host.expandAllCollapsedColumns();
         },
@@ -29453,11 +29942,17 @@ var ListTableEventController = class {
   publishSearchRequest() {
     const request = {
       keyword: this.searchKeyword,
+      mode: this.searchOptions.mode,
+      caseSensitive: this.searchOptions.caseSensitive,
+      error: this.searchError,
       matchCount: this.searchMatches.length,
       currentIndex: this.searchCurrentIndex,
-      onSubmit: (keyword) => {
+      onSubmit: (keyword, options) => {
         this.searchKeyword = keyword;
-        this.searchMatches = this.resolveSearchMatches(keyword);
+        this.searchOptions = options;
+        const matcher = createListTableSearchMatcher(keyword, options);
+        this.searchError = matcher.error;
+        this.searchMatches = matcher.active ? this.resolveSearchMatches(matcher.findMatches) : [];
         this.searchCurrentIndex = this.searchMatches.length > 0 ? 0 : -1;
         this.applyCurrentSearchMatch();
         this.publishSearchRequest();
@@ -29471,6 +29966,7 @@ var ListTableEventController = class {
       },
       onClose: () => {
         this.searchKeyword = "";
+        this.searchError = null;
         this.searchMatches = [];
         this.searchCurrentIndex = -1;
         this.host.rangeHighlight = {
@@ -29483,30 +29979,24 @@ var ListTableEventController = class {
     };
     this.host.options.ui?.onSearchRequest?.(request);
   }
-  resolveSearchMatches(keyword) {
-    const normalizedKeyword = keyword.trim().toLocaleLowerCase();
-    if (!normalizedKeyword) return [];
+  resolveSearchMatches(findMatches) {
     const matches = [];
     this.host.getDisplayData().forEach((record, rowIndex) => {
       this.host.leafColumns.forEach((column) => {
         if (isSystemColumnKey(column.key)) return;
-        const text = String(
-          utils.getValueByDataIndex(record, column.dataIndex) ?? ""
+        resolveListTableSearchCellTexts({ record, rowIndex, column }).forEach(
+          ({ text, contentIndex }) => {
+            findMatches(text).forEach(({ start, end }) => {
+              matches.push({
+                rowIndex,
+                columnKey: column.key,
+                contentIndex,
+                start,
+                end
+              });
+            });
+          }
         );
-        const source = text.toLocaleLowerCase();
-        let start = source.indexOf(normalizedKeyword);
-        while (start >= 0) {
-          matches.push({
-            rowIndex,
-            columnKey: column.key,
-            start,
-            end: start + normalizedKeyword.length
-          });
-          start = source.indexOf(
-            normalizedKeyword,
-            start + normalizedKeyword.length
-          );
-        }
       });
     });
     return matches;
@@ -29855,7 +30345,7 @@ var ListTableEventController = class {
     } catch {
     }
   }
-  async autoFitColumnWidths(columnKey) {
+  async autoFitColumnWidths(columnKey, fillContainer = false) {
     const ctx = this.host.canvasElement?.getContext("2d");
     if (!ctx) {
       return;
@@ -29894,7 +30384,9 @@ var ListTableEventController = class {
       columnKeys,
       rowStartIndex: startIndex,
       rowEndIndex: endIndex,
-      summaryValues
+      summaryValues,
+      fillContainerWidth: fillContainer ? snapshot?.viewport.width ?? this.host.canvasElement?.clientWidth : void 0,
+      hostWidth: fillContainer ? this.host.canvasElement?.clientWidth || snapshot?.viewport.width : void 0
     });
     if (!changed) {
       return;
@@ -31043,6 +31535,8 @@ function createListTableEventHost(core) {
     changeTableDensity: (density) => core.headerActionController.changeTableDensity(density),
     changeTableZoom: (zoom) => core.headerActionController.changeTableZoom(zoom),
     toggleHeaderColumnVisible: (columnKey, visible) => core.headerActionController.toggleHeaderColumnVisible(columnKey, visible),
+    saveHeaderColumn: (draft) => core.headerActionController.saveHeaderColumn(draft),
+    deleteHeaderColumn: (columnKey) => core.headerActionController.deleteHeaderColumn(columnKey),
     toggleHighlightedHeaderColumns: (columnKey, visible) => core.headerActionController.toggleHighlightedHeaderColumns(
       columnKey,
       visible
@@ -31394,6 +31888,34 @@ var ListTableHeaderActionController = class {
     });
     this.options.headerContextMenu.updateColumns(resolved.menuItems);
   }
+  saveHeaderColumn(draft) {
+    const columns = this.options.getOptions().columns;
+    const error = saveHeaderSettingsColumn(columns, draft);
+    if (error) return error;
+    this.options.refreshRuntimeColumns();
+    this.options.resetSummaryValues();
+    this.options.persistColumnConfig();
+    this.options.headerContextMenu.updateColumns(
+      buildHeaderSettingsItems(columns)
+    );
+    this.options.requestRender();
+    return null;
+  }
+  deleteHeaderColumn(columnKey) {
+    const columns = this.options.getOptions().columns;
+    if (!deleteHeaderSettingsColumn(columns, columnKey)) return false;
+    this.options.setSortState(
+      this.options.getSortState().filter((entry) => entry.key !== columnKey)
+    );
+    this.options.refreshRuntimeColumns();
+    this.options.resetSummaryValues();
+    this.options.persistColumnConfig();
+    this.options.headerContextMenu.updateColumns(
+      buildHeaderSettingsItems(columns)
+    );
+    this.options.requestRender();
+    return true;
+  }
   toggleHighlightedHeaderColumns(columnKey, visible) {
     if (visible) {
       this.toggleHeaderColumnVisible(columnKey, true);
@@ -31718,20 +32240,74 @@ function applyStoredColumnConfig(columns, storedColumns, cacheColumnSettings = t
     return false;
   }
   let columnWidthsChanged = false;
+  if (cacheColumnSettings) {
+    const existingKeys = /* @__PURE__ */ new Set();
+    const collectKeys = (items) => {
+      items.forEach((column) => {
+        if (column.key) existingKeys.add(column.key);
+        if (column.children?.length) collectKeys(column.children);
+      });
+    };
+    collectKeys(columns);
+    const findChildren = (items, parentKey) => {
+      for (const column of items) {
+        if (column.key === parentKey) return column.children ?? null;
+        if (column.children?.length) {
+          const children = findChildren(column.children, parentKey);
+          if (children) return children;
+        }
+      }
+      return null;
+    };
+    Object.entries(storedColumns).forEach(([key, stored]) => {
+      if (!stored.userDefined || existingKeys.has(key) || !stored.dataIndex)
+        return;
+      const target = stored.parentKey ? findChildren(columns, stored.parentKey) : columns;
+      (target ?? columns).push({
+        key,
+        title: stored.title ?? key,
+        settingTitle: stored.title ?? key,
+        dataIndex: stored.dataIndex,
+        width: stored.width,
+        minWidth: stored.minWidth,
+        maxWidth: stored.maxWidth,
+        fixed: stored.fixed,
+        hidden: stored.hidden,
+        userDefined: true,
+        allowSort: true,
+        sorter: true
+      });
+      existingKeys.add(key);
+    });
+  }
   const applyToColumns = (cols) => {
     if (cacheColumnSettings && columnOrder?.length) {
-      const rank = new Map(columnOrder.map((key, index) => [key, index]));
-      cols.sort(
-        (a, b) => (rank.get(a.key ?? "") ?? Infinity) - (rank.get(b.key ?? "") ?? Infinity)
-      );
+      const rank = new Map(columnOrder.map((key, index2) => [key, index2]));
+      const ranked = cols.filter((column) => rank.has(column.key ?? "")).sort((a, b) => rank.get(a.key ?? "") - rank.get(b.key ?? ""));
+      let index = 0;
+      cols.forEach((column, position) => {
+        if (rank.has(column.key ?? "")) cols[position] = ranked[index++];
+      });
     }
     for (const col of cols) {
       if (!col.key) {
         continue;
       }
       const stored = storedColumns[col.key];
-      if (stored) {
+      if (stored && (!stored.userDefined || col.userDefined)) {
+        if (cacheColumnSettings && stored.userTitle != null) {
+          col.title = stored.userTitle;
+          col.settingTitle = stored.userTitle;
+          col.userTitle = stored.userTitle;
+        }
         if (cacheColumnSettings) {
+          if (col.userDefined && stored.userDefined) {
+            col.title = stored.title ?? col.title;
+            col.settingTitle = stored.title ?? col.settingTitle;
+            col.dataIndex = stored.dataIndex ?? col.dataIndex;
+          }
+          if ("minWidth" in stored) col.minWidth = stored.minWidth;
+          if ("maxWidth" in stored) col.maxWidth = stored.maxWidth;
           if (stored.width != null) {
             if ((col.width ?? 160) !== stored.width) columnWidthsChanged = true;
             col.width = stored.width;
@@ -31794,7 +32370,7 @@ function applyStoredColumnConfig(columns, storedColumns, cacheColumnSettings = t
 function buildStoredColumnConfig(columns, sortState, filterState, zoom, summaryRowHeight, density, cacheColumnSettings = true, cachePreferences) {
   const result = {};
   const columnOrder = [];
-  const collectColumns = (cols) => {
+  const collectColumns = (cols, parentKey) => {
     for (const col of cols) {
       if (!col.key) {
         continue;
@@ -31803,8 +32379,19 @@ function buildStoredColumnConfig(columns, sortState, filterState, zoom, summaryR
       result[col.key] = {
         ...cacheColumnSettings ? {
           width: col.width ?? 160,
+          minWidth: col.minWidth,
+          maxWidth: col.maxWidth,
           fixed: col.fixed,
-          hidden: !!col.hidden
+          hidden: !!col.hidden,
+          ...col.userTitle ? { userTitle: col.userTitle } : null,
+          ...col.userDefined && col.dataIndex != null ? {
+            userDefined: true,
+            ...parentKey ? { parentKey } : null,
+            title: String(col.settingTitle ?? col.title ?? col.key),
+            dataIndex: col.dataIndex,
+            minWidth: col.minWidth,
+            maxWidth: col.maxWidth
+          } : null
         } : null,
         // IndexedDB 保留 undefined 属性；字段存在即表示显式恢复/清除，避免默认配置回弹。
         align: col.align,
@@ -31828,7 +32415,7 @@ function buildStoredColumnConfig(columns, sortState, filterState, zoom, summaryR
         } : false
       };
       if (col.children?.length) {
-        collectColumns(col.children);
+        collectColumns(col.children, col.key);
       }
     }
   };
@@ -35216,6 +35803,12 @@ var ListTableCore = class {
     const incomingColumnsAreRuntimeColumns = options.columns === this.options.columns;
     const nextInitialColumns = incomingColumnsAreRuntimeColumns ? cloneColumns(host.initialColumns) : cloneColumns(options.columns);
     const nextInitialStretchColumns = incomingColumnsAreRuntimeColumns ? host.initialStretchColumns : options.stretchColumns;
+    if (!shouldResetColumnConfig && !incomingColumnsAreRuntimeColumns && this.options.storageKey === options.storageKey) {
+      preserveUserAddedColumns({
+        nextColumns: options.columns,
+        runtimeColumns: this.options.columns
+      });
+    }
     const shouldPreserveRuntimeWidths = !shouldResetColumnConfig && this.options.stretchColumns === false && options.stretchColumns === host.initialStretchColumns;
     if (shouldPreserveRuntimeWidths) {
       preserveRuntimeColumnWidths({