@lionad/cx-comps-tanstack-charts 0.1.0-alpha.15 → 0.1.0-alpha.17

package/dist/index.mjs

@@ -785,7 +785,23 @@ function translatePolarGuide(spec) {
 		"shape",
 		"labels",
 		"labelAngle",
-		"labelOffset"
+		"labelOffset",
+		"id",
+		"className",
+		"labelClassName",
+		"stroke",
+		"strokeOpacity",
+		"strokeWidth",
+		"strokeDasharray",
+		"fill",
+		"fillOpacity",
+		"labelFill",
+		"labelFontSize",
+		"labelAnchor",
+		"labelBaseline",
+		"labelDx",
+		"labelDy",
+		"labelRotate"
 	]) if (spec[key] !== void 0) options[key] = spec[key];
 	return factory(options);
 }
@@ -1090,15 +1106,19 @@ const GEO_PROJECTION_FACTORIES = {
 	equalEarth: geoEqualEarth,
 	identity: geoIdentity
 };
-/** geoShape：projection 名称枚举 → descriptor {type, fit, inset}；fit:'data' 由库拟合数据本体 */
+/** geoShape：projection 名称枚举 → descriptor {type, fit, inset}；fit:'data' 由库拟合数据本体，{data:'<name>'} 拟合另一命名数据集 */
 function translateGeoShape(spec, datasets) {
 	const rows = resolveMarkData(spec.data, datasets);
 	const projectionName = spec.projection ?? "mercator";
+	if (typeof projectionName === "object") throw new Error("translateGeoShape: projection {$by} 仅允许出现在 facet chart 子模板内");
 	const factory = GEO_PROJECTION_FACTORIES[projectionName];
 	if (!factory) throw new Error(`translateGeoShape: 未知投影 "${String(projectionName)}"`);
 	const options = { projection: {
 		type: factory,
-		fit: spec.fit ?? "data",
+		fit: typeof spec.fit === "object" && spec.fit !== null ? {
+			type: "FeatureCollection",
+			features: resolveMarkData(spec.fit.data, datasets)
+		} : spec.fit ?? "data",
 		...spec.inset !== void 0 ? { inset: spec.inset } : {}
 	} };
 	if (spec.id !== void 0) options.id = spec.id;
@@ -1119,6 +1139,25 @@ function translateGeoShape(spec, datasets) {
 	return geoShape(rows, options);
 }
 /**
+* facet 子模板按组实例化:深度遍历,把 {$by:{组名:值}} 形态字段替换为当前组映射值。
+* 未声明 $by 的字段原样保留;$by 表未命中当前组时抛错(静默回退会让分面悄悄同参)。
+*/
+function instantiateFacetTemplate(node, groupKey) {
+	if (Array.isArray(node)) return node.map((item) => instantiateFacetTemplate(item, groupKey));
+	if (node && typeof node === "object") {
+		const record = node;
+		const keys = Object.keys(record);
+		if (keys.length === 1 && keys[0] === "$by") {
+			const table = record.$by;
+			const hit = table[String(groupKey)];
+			if (hit === void 0) throw new Error(`instantiateFacetTemplate: $by 映射未命中分组 "${String(groupKey)}"(可用键: ${Object.keys(table).join(", ")})`);
+			return hit;
+		}
+		return Object.fromEntries(Object.entries(record).map(([k, v]) => [k, instantiateFacetTemplate(v, groupKey)]));
+	}
+	return node;
+}
+/**
 * facet：chart 回调固化为递归子 spec 翻译——translateChild 由 definition.ts 注入
 * （子 spec 翻译与顶层同路径，仅数据集换为 facet 分组行；规避 composite ↔ definition 循环 import）。
 * label 语义：true 显示分组 key 标签（库的函数形态不可 JSON，布尔即可覆盖声明式场景）。
@@ -1128,9 +1167,10 @@ function translateFacet(spec, datasets, translateChild) {
 	if (!spec.by) throw new Error("translateFacet: facet 必须声明 by 分组字段");
 	if (!spec.chart) throw new Error("translateFacet: facet 必须声明 chart 子 spec 模板");
 	const childTemplate = spec.chart;
+	const byField = spec.by;
 	const options = {
-		by: spec.by,
-		chart: (facetRows) => translateChild(childTemplate, facetRows)
+		by: byField,
+		chart: (facetRows) => translateChild(instantiateFacetTemplate(childTemplate, facetRows[0]?.[byField]), facetRows)
 	};
 	if (spec.id !== void 0) options.id = spec.id;
 	if (spec.columns !== void 0) options.columns = spec.columns;

package/dist/shared/translate/types.d.ts

@@ -234,8 +234,12 @@ export interface CxChartMarkSpec {
     labelFontWeight?: number;
     orientation?: 'left' | 'right' | 'top' | 'bottom';
     nodeSize?: [number, number];
-    projection?: 'mercator' | 'orthographic' | 'naturalEarth1' | 'albersUsa' | 'equalEarth' | 'identity';
-    fit?: 'data' | 'sphere';
+    projection?: 'mercator' | 'orthographic' | 'naturalEarth1' | 'albersUsa' | 'equalEarth' | 'identity' | {
+        $by: Record<string, 'mercator' | 'orthographic' | 'naturalEarth1' | 'albersUsa' | 'equalEarth' | 'identity'>;
+    };
+    fit?: 'data' | 'sphere' | {
+        data: string;
+    };
     by?: string;
     axes?: 'outer' | 'cell';
     minWidth?: number;
@@ -252,6 +256,22 @@ export interface CxChartPolarGuideSpec {
     labels?: boolean;
     labelAngle?: number;
     labelOffset?: number;
+    id?: string;
+    className?: string;
+    labelClassName?: string;
+    stroke?: string;
+    strokeOpacity?: number;
+    strokeWidth?: number;
+    strokeDasharray?: string;
+    fill?: string;
+    fillOpacity?: number;
+    labelFill?: string;
+    labelFontSize?: number;
+    labelAnchor?: 'start' | 'middle' | 'end';
+    labelBaseline?: 'auto' | 'middle' | 'hanging';
+    labelDx?: number;
+    labelDy?: number;
+    labelRotate?: number;
 }
 /**
  * forceGraph 力集声明式：库 ForceDescriptor 的 JSON 子集。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lionad/cx-comps-tanstack-charts",
-  "version": "0.1.0-alpha.15",
+  "version": "0.1.0-alpha.17",
   "description": "cx material components wrapping TanStack Charts (@tanstack/charts/vue)",
   "keywords": [
     "charts",