@@ -17,7 +17,6 @@ import mergeWith from '@/utils/toolkit/mergeWith';
 import Logger from '@/Logger';
 import { getExternal } from '@/utils/external';
 import { isBrowser } from '@/utils/env';
-import defaultLocale from '@/locales/zh_CN';
 
 // 主题与常量集中管理
 const THEME = {
@@ -88,7 +87,7 @@ export default class EChartsTableEngine {
     // 保存Cherry配置，用于获取地图数据源URL
     this.cherryOptions = cherryOptions;
     // 保存Cherry实例，用于事件监听及i18n
-    this.cherry = cherry || { locale: defaultLocale };
+    this.cherry = cherry;
     // 统一管理实例
     this.instances = new Set();
     // 主题监听器
@@ -806,50 +805,6 @@ export default class EChartsTableEngine {
     return htmlContent;
   }
 
-  /**
-   * Mount a table chart into a caller-owned container.
-   *
-   * Unlike render(), this entry does not depend on Cherry Previewer's DOM or
-   * delayed global lookup. It lets integrations reuse Cherry's complete chart
-   * semantics while retaining ownership of their own node lifecycle.
-   */
-  renderInto(container, type, options, tableObject, signal) {
-    if (!container || !this.echartsRef) return () => {};
-    const lifecycleController = new AbortController();
-    const abortLifecycle = () => lifecycleController.abort();
-    signal?.addEventListener('abort', abortLifecycle, { once: true });
-    const chartId = container.id || `chart-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
-    const chartOptions = { ...(options || {}), chartId, signal: lifecycleController.signal };
-    const serializableOptions = { ...(options || {}), chartId };
-    container.id = chartId;
-    container.classList.add('cherry-echarts-wrapper');
-    container.dataset.chartType = type;
-    container.dataset.tableData = JSON.stringify(tableObject);
-    container.dataset.chartOptions = JSON.stringify(serializableOptions);
-    if (!container.style.width) container.style.width = '100%';
-    if (!container.style.height) container.style.height = `${this.options.height}px`;
-    this.$buildEchartsThemeFromCss(container);
-    const chart = this.createChart(container, this.$generateChartOptions(type, tableObject, chartOptions), type);
-    const observer = typeof ResizeObserver === 'undefined' ? null : new ResizeObserver(() => chart?.resize?.());
-    observer?.observe(container);
-    let disposed = false;
-    const cleanup = () => {
-      if (disposed) return;
-      disposed = true;
-      signal?.removeEventListener('abort', abortLifecycle);
-      lifecycleController.abort();
-      observer?.disconnect();
-      this.destroyChart(chart);
-      if (this.instances.size === 0) {
-        this.themeObservers.forEach((themeObserver) => themeObserver.disconnect());
-        this.themeObservers.clear();
-        this.exportObservers.forEach((handler) => window.removeEventListener('cherry:export:done', handler));
-        this.exportObservers.clear();
-      }
-    };
-    return cleanup;
-  }
-
   // 添加点击高亮效果
   addClickHighlightEffect(chartInstance, chartType) {
     let selectedDataIndex = null;
@@ -1663,6 +1618,9 @@ const MapChartFailureOptionsHandler = {
   },
 };
 
+// Preserve optional cancellation when a map is rebuilt from its container data.
+const mapRequestSignals = new WeakMap();
+
 const MapChartOptionsHandler = {
   options(tableObject, options) {
     // 获取当前用户指定的地图数据源
@@ -1745,18 +1703,22 @@ const MapChartOptionsHandler = {
     }
 
     const url = paths[index];
+    const container = document.querySelector(`[id="${options.chartId}"][data-chart-type="map"]`);
+    const signal = options.signal ?? (container ? mapRequestSignals.get(container) : undefined);
+    if (container && signal) mapRequestSignals.set(container, signal);
+    if (signal?.aborted) return;
     // console.log(`尝试加载地图数据: ${url}`);
 
-    this.$fetchMapData(url, options.signal)
+    this.$fetchMapData(url, signal)
       .then((geoJson) => {
-        if (options.signal?.aborted) return geoJson;
+        if (signal?.aborted) return geoJson;
         options.engine.echartsRef?.registerMap?.(url, geoJson);
         // console.log(`地图数据加载成功！来源: ${url}`);
         this.$refreshMapChart(options.chartId, url, options.engine);
         return geoJson;
       })
       .catch((error) => {
-        if (error?.name === 'AbortError' || options.signal?.aborted) return;
+        if (error?.name === 'AbortError' || signal?.aborted) return;
         Logger.warn(`Map data loading failed (${url}):`, error.message);
         this.$handleMapLoadFailure(options);
       });
@@ -1790,7 +1752,7 @@ const MapChartOptionsHandler = {
     }
   },
   async $fetchMapData(url, signal) {
-    const response = await fetch(url, { referrerPolicy: 'no-referrer', signal });
+    const response = await fetch(url, { referrerPolicy: 'no-referrer', ...(signal ? { signal } : {}) });
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status} for ${url}`);
     }
 
@@ -95,31 +95,6 @@ describe('addons/EChartsTableEngine', () => {
     expect(renderer.instances.size).toBe(0);
   });
 
-  it('mounts into a caller-owned container and releases all retained resources', () => {
-    const environment = createEnvironment();
-    const renderer = new EChartsTableEngine({ echarts: environment.echarts, cherry: environment.cherry });
-    const container = document.createElement('div');
-    environment.root.appendChild(container);
-    const controller = new AbortController();
-
-    const cleanup = renderer.renderInto(
-      container,
-      'line',
-      { title: 'Mounted' },
-      { header: ['', 'Q1'], rows: [['Sales', '1']] },
-      controller.signal,
-    );
-
-    expect(environment.echarts.init).toHaveBeenCalledWith(container, null, renderer.options);
-    expect(container.dataset.chartType).toBe('line');
-    expect(container.dataset.tableData).toContain('Sales');
-    expect(renderer.instances.size).toBe(1);
-    cleanup();
-    cleanup();
-    expect(environment.chart.dispose).toHaveBeenCalledOnce();
-    expect(renderer.instances.size).toBe(0);
-  });
-
   it('provides chart palettes, axes, zoom controls, and numeric normalization', () => {
     const environment = createEnvironment();
     const renderer = new EChartsTableEngine({ echarts: environment.echarts, cherry: environment.cherry });
@@ -578,6 +553,134 @@ describe('addons/EChartsTableEngine', () => {
     expect(inferredGroup.series[0].name).toBe('系列1');
   });
 
+  it.each(['global', 'injected', 'both'])('uses the selected ECharts instance for maps (%s)', (mode) => {
+    const environment = createEnvironment();
+    const globalEcharts = { getMap: vi.fn(), registerMap: vi.fn() };
+    environment.echarts.getMap.mockReturnValue({});
+    if (mode === 'global') Object.assign(window, { echarts: environment.echarts });
+    else if (mode === 'both') window.echarts = globalEcharts as unknown as typeof window.echarts;
+    const fetchMock = vi.fn();
+    vi.stubGlobal('fetch', fetchMock);
+    const renderer = new EChartsTableEngine({
+      ...(mode === 'global' ? {} : { echarts: environment.echarts }),
+      cherry: environment.cherry,
+    });
+    renderer.$buildEchartsThemeFromCss(environment.root);
+
+    const option = renderer.$generateChartOptions(
+      'map',
+      { header: ['Province', 'Value'], rows: [['北京', '10']] },
+      { mapDataSource: 'china' },
+    );
+
+    expect(option.series[0]).toMatchObject({ type: 'map', map: 'china' });
+    expect(environment.echarts.getMap).toHaveBeenCalledWith('china');
+    expect(globalEcharts.getMap).not.toHaveBeenCalled();
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
+  it('registers fetched maps on the injected instance, not a different global instance', async () => {
+    const environment = createEnvironment();
+    const globalEcharts = { getMap: vi.fn(), registerMap: vi.fn() };
+    window.echarts = globalEcharts as unknown as typeof window.echarts;
+    const geoJson = { type: 'FeatureCollection', features: [] };
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => geoJson }));
+    const renderer = new EChartsTableEngine({ echarts: environment.echarts, cherry: environment.cherry });
+    renderer.$buildEchartsThemeFromCss(environment.root);
+    const tableData = { header: ['Province', 'Value'], rows: [['北京', '10']] };
+    const container = environment.previewerDom.appendChild(document.createElement('div'));
+    container.id = 'map-chart';
+    container.dataset.chartType = 'map';
+    container.dataset.tableData = JSON.stringify(tableData);
+    container.dataset.chartOptions = JSON.stringify({ mapDataSource: 'china' });
+
+    renderer.$generateChartOptions('map', tableData, { mapDataSource: 'china', chartId: container.id });
+
+    await vi.waitFor(() => expect(container.dataset.mapStatus).toBe('success'));
+    expect(environment.echarts.registerMap).toHaveBeenCalledWith('china', geoJson);
+    expect(globalEcharts.getMap).not.toHaveBeenCalled();
+    expect(globalEcharts.registerMap).not.toHaveBeenCalled();
+    renderer.onDestroy();
+  });
+
+  it.each(['request', 'rebuild'])('ignores late map responses after optional %s cancellation', async (scope) => {
+    const environment = createEnvironment();
+    const controller = new AbortController();
+    const pending: Array<(value: Response) => void> = [];
+    const fetchMock = vi.fn(() => new Promise<Response>((resolve) => pending.push(resolve)));
+    vi.stubGlobal('fetch', fetchMock);
+    const renderer = new EChartsTableEngine({
+      echarts: environment.echarts,
+      cherry: environment.cherry,
+    });
+    renderer.$buildEchartsThemeFromCss(environment.root);
+    const container = environment.previewerDom.appendChild(document.createElement('div'));
+    container.id = 'cancelled-map';
+    container.dataset.chartType = 'map';
+    const tableData = { header: ['Province', 'Value'], rows: [['北京', '10']] };
+    container.dataset.tableData = JSON.stringify(tableData);
+    container.dataset.chartOptions = JSON.stringify({ mapDataSource: 'china' });
+    renderer.$generateChartOptions('map', tableData, {
+      mapDataSource: 'china',
+      chartId: container.id,
+      signal: controller.signal,
+    });
+    if (scope === 'rebuild') renderer.$chartOptionsFromDataset(container);
+    expect(fetchMock).toHaveBeenCalledTimes(scope === 'rebuild' ? 2 : 1);
+    expect(fetchMock).toHaveBeenCalledWith('china', {
+      referrerPolicy: 'no-referrer',
+      signal: controller.signal,
+    });
+
+    controller.abort();
+    pending.forEach((finish) => finish(new Response(JSON.stringify({ type: 'FeatureCollection', features: [] }))));
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(environment.echarts.registerMap).not.toHaveBeenCalled();
+    expect(environment.echarts.init).not.toHaveBeenCalled();
+    expect(container.dataset.mapStatus).toBe('loading');
+  });
+
+  it('does not inherit an engine-level cancellation signal for an ordinary map request', () => {
+    const environment = createEnvironment();
+    const controller = new AbortController();
+    controller.abort();
+    const fetchMock = vi.fn(() => new Promise(() => {}));
+    vi.stubGlobal('fetch', fetchMock);
+    const renderer = new EChartsTableEngine({
+      echarts: environment.echarts,
+      cherry: environment.cherry,
+      signal: controller.signal,
+    });
+    renderer.$buildEchartsThemeFromCss(environment.root);
+
+    renderer.$generateChartOptions(
+      'map',
+      { header: ['Province', 'Value'], rows: [['北京', '10']] },
+      { mapDataSource: 'china' },
+    );
+
+    expect(fetchMock).toHaveBeenCalledWith('china', { referrerPolicy: 'no-referrer' });
+  });
+
+  it('does not start a map request for an already cancelled signal', () => {
+    const environment = createEnvironment();
+    const controller = new AbortController();
+    controller.abort();
+    const fetchMock = vi.fn();
+    vi.stubGlobal('fetch', fetchMock);
+    const renderer = new EChartsTableEngine({ echarts: environment.echarts, cherry: environment.cherry });
+    renderer.$buildEchartsThemeFromCss(environment.root);
+
+    renderer.$generateChartOptions(
+      'map',
+      { header: ['Province', 'Value'], rows: [['北京', '10']] },
+      { mapDataSource: 'china', signal: controller.signal },
+    );
+
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
   it('generates a registered map with normalized province names', () => {
     const environment = createEnvironment();
     environment.echarts.getMap.mockReturnValue({});
 
@@ -5,7 +5,7 @@
 - `editor.ts` owns the Milkdown lifecycle and public instance API.
 - `CherryEngine.makeHtml(markdown)` renders Cherry-owned native syntax; registered visual renderers handle Mermaid, ECharts, and custom fenced blocks.
 - Cherry dist imports are isolated behind `cherry-engine.ts`, `cherry-echarts.ts`, and `cherry-codeblock-echarts.ts`; these are the package-upgrade checkpoints. The published Cherry stylesheet remains an explicit CSS dependency.
-- The table-chart adapter prefers Cherry's `renderInto()` when present. The declared minimum (0.11.10) instead supplies the existing chart option generator and lifecycle methods; the adapter owns only its mount/cleanup, not chart conversion or Previewer DOM. Consumer checks exercise both the published minimum and the workspace tarball.
+- Table and fenced charts share one Milkdown-owned mount/cleanup path. It uses Cherry's existing option generator and chart lifecycle, including the declared minimum (0.11.10), without adding a Cherry mounting API or depending on Previewer DOM. Charts in one editor share a reference-counted engine, matching Cherry's root-scoped export/theme observers; each mount owns its request-cancellation scope. Cleanup and resize resolve the current chart after export rebuilds, and the final mount releases the engine. Consumer checks exercise both the published minimum and the workspace tarball.
 - Its legacy locale context is generated from Cherry's chart messages during build (`sync-chart-locale.mjs`), not an independently maintained translation table. It does not import Cherry's editor/toolbar runtime to obtain translations.
 - Markdown source reconciliation accepts a formatting-preserving edit only after parser/serializer validation. Ambiguous matches fall back to canonical serialization rather than changing the wrong occurrence. Nested renderer results share an abort-owned cleanup scope, including late results after sibling failures.
 - `table-focus.ts` isolates Table Block's pointer/word selection integration. Table editing and controls remain Milkdown-owned; selection updates use ProseMirror transactions, never replacement of component DOM.
 
@@ -1,4 +1,4 @@
-import { test, expect, markdown, setMarkdown } from './fixtures';
+import { test, expect, markdown, replaceTableCell, setMarkdown } from './fixtures';
 import type { Page } from '@playwright/test';
 
 async function placeCaretAtTextOffset(page: Page, text: string, offset: number) {
@@ -87,6 +87,51 @@ test('theme changes refresh charts without replacing table/code chart DOM or the
   expect(await markdown(page)).toBe(value);
 });
 
+test('export rebuilds preserve chart content, editing and deletion for both chart kinds', async ({ page }) => {
+  const codeSource =
+    '{animation:false,title:{text:"Code chart"},xAxis:{data:["Jan","Feb"]},yAxis:{},series:[{type:"line",data:[1,2]}]}';
+  await setMarkdown(
+    page,
+    '| :line:{"title":"Table chart"} | Jan | Feb |\n| --- | --- | --- |\n| Sales | 1 | 2 |\n\n' +
+      `\`\`\`echarts\n${codeSource}\n\`\`\``,
+  );
+  const table = page.locator('.cherry-table-chart');
+  const code = page.locator('.cherry-embed--cherry_diagram:not([data-type="mermaid"])');
+  await expect(table.locator('svg')).toContainText('Table chart');
+  await expect(code.locator('svg')).toContainText('Code chart');
+  for (let revision = 0; revision < 3; revision += 1) {
+    await page.evaluate(() => window.dispatchEvent(new Event('cherry:export:done')));
+    await expect(table.locator('svg')).toContainText('Table chart');
+    await expect(code.locator('svg')).toContainText('Code chart');
+  }
+
+  await replaceTableCell(page, page.locator('.milkdown-table-block td p').nth(1), '7');
+  await expect(table.locator('.cherry-echarts-wrapper')).toHaveAttribute('data-table-data', /"Sales","7","2"/);
+  await code.getByRole('button', { name: '在节点内编辑源码' }).click();
+  const source = code.locator('.cherry-embed__source code');
+  await source.click();
+  await page.keyboard.press('ControlOrMeta+a');
+  await page.keyboard.type(codeSource.replace('Code chart', 'Code updated'));
+  await expect(code.locator('svg')).toContainText('Code updated');
+  await page.evaluate(() => window.dispatchEvent(new Event('cherry:export:done')));
+  await expect(code.locator('svg')).toContainText('Code updated');
+  await expect(table.locator('.cherry-echarts-wrapper')).toHaveAttribute('data-table-data', /"Sales","7","2"/);
+
+  await setMarkdown(page, '| :line:{"title":"Table chart"} | Jan | Feb |\n| --- | --- | --- |\n| Sales | 7 | 2 |');
+  await expect(code).toHaveCount(0);
+  await expect(table.locator('svg')).toContainText('Table chart');
+  await replaceTableCell(page, page.locator('.milkdown-table-block td p').nth(1), '9');
+  await expect(table.locator('.cherry-echarts-wrapper')).toHaveAttribute('data-table-data', /"Sales","9","2"/);
+  await page.evaluate(() => window.dispatchEvent(new Event('cherry:export:done')));
+  await expect(table.locator('svg')).toContainText('Table chart');
+
+  await setMarkdown(page, 'Charts removed');
+  await expect(page.locator('.cherry-echarts-wrapper')).toHaveCount(0);
+  await page.evaluate(() => window.dispatchEvent(new Event('cherry:export:done')));
+  await expect(page.locator('.cherry-echarts-wrapper')).toHaveCount(0);
+  expect(await markdown(page)).toBe('Charts removed');
+});
+
 test('native Chromium composition commits Chinese without duplicate text and supports undo', async ({
   page,
   browserName,
 
@@ -16,20 +16,14 @@ declare module 'cherry-markdown/dist/addons/advance/cherry-table-echarts-plugin.
   }
 
   const EChartsTableEngine: new (options: Record<string, unknown>) => {
-    renderInto?(
-      container: HTMLElement,
-      type: string,
-      options: Record<string, unknown>,
-      table: TableChartData,
-      signal?: AbortSignal,
-    ): () => void;
     $buildEchartsThemeFromCss(container: HTMLElement): void;
     $generateChartOptions(
       type: string,
       table: TableChartData,
       options: Record<string, unknown>,
     ): Record<string, unknown>;
     createChart(container: HTMLElement, options: Record<string, unknown>, type: string): { resize(): void } | null;
+    destroyChart(container: HTMLElement): void;
     $applyThemeOnly(instance: { resize(): void } | null): void;
     onDestroy(): void;
   };