@lionad/cx-comps-tanstack-charts 0.1.0-alpha.14 → 0.1.0-alpha.16

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);
 }
@@ -885,6 +901,15 @@ function hierarchyOptions(spec, idKey) {
 	};
 	throw new Error(`translateComposite: ${spec.type} 层级数据源必须声明 path 或 nodeId+parentId`);
 }
+/**
+* 层级布局节点的字段名通道（treemap/sunburst 的 color/z、tree 节点 dot 的 color/r）：
+* 库的 channelValues 在布局节点上平查 datum[field]，而 flatHierarchyNodeContext 把源行
+* 收纳在 data 下不展开——字段名物化为 data 取值 accessor，保持「字段名引用源数据」契约。
+* sankey 不在此列：其 marks 回调 channel 按设计锁定布局行字段（key/width 等 canonical）。
+*/
+function hierarchyFieldChannel(field) {
+	return (node) => node?.data?.[field];
+}
 /** sankey：固化 marks 回调 = link(布局连线) + rect(布局节点)，样式取自声明 */
 function translateSankey(spec, datasets) {
 	const nodes = resolveMarkData(spec.nodes, datasets);
@@ -935,8 +960,8 @@ function translateSunburst(spec, datasets) {
 		value: spec.value
 	};
 	if (spec.id !== void 0) options.id = spec.id;
-	if (spec.color !== void 0) options.color = spec.color;
-	if (spec.z !== void 0) options.z = spec.z;
+	if (spec.color !== void 0) options.color = hierarchyFieldChannel(spec.color);
+	if (spec.z !== void 0) options.z = hierarchyFieldChannel(spec.z);
 	if (spec.visibleDepth !== void 0) options.visibleDepth = spec.visibleDepth;
 	if (spec.ringPadding !== void 0) options.ringPadding = spec.ringPadding;
 	for (const key of [
@@ -966,7 +991,7 @@ function translateTreemap(spec, datasets) {
 		value: spec.value
 	};
 	if (spec.id !== void 0) options.id = spec.id;
-	if (spec.color !== void 0) options.color = spec.color;
+	if (spec.color !== void 0) options.color = hierarchyFieldChannel(spec.color);
 	if (spec.method !== void 0) options.method = spec.method;
 	if (spec.ratio !== void 0) options.ratio = spec.ratio;
 	if (spec.round !== void 0) options.round = spec.round;
@@ -1006,8 +1031,8 @@ function translateTree(spec, datasets) {
 		x: "x",
 		y: "y",
 		key: "id",
-		r: spec.r ?? 4.5,
-		color: spec.color ?? void 0,
+		r: typeof spec.r === "string" ? hierarchyFieldChannel(spec.r) : spec.r ?? 4.5,
+		color: spec.color === void 0 ? void 0 : hierarchyFieldChannel(spec.color),
 		strokeWidth: 1.5,
 		...nodeRScale !== void 0 ? { rScale: nodeRScale } : {}
 	})];
@@ -1081,7 +1106,7 @@ 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";
@@ -1089,7 +1114,10 @@ function translateGeoShape(spec, datasets) {
 	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;

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

@@ -235,7 +235,9 @@ export interface CxChartMarkSpec {
     orientation?: 'left' | 'right' | 'top' | 'bottom';
     nodeSize?: [number, number];
     projection?: 'mercator' | 'orthographic' | 'naturalEarth1' | 'albersUsa' | 'equalEarth' | 'identity';
-    fit?: 'data' | 'sphere';
+    fit?: 'data' | 'sphere' | {
+        data: string;
+    };
     by?: string;
     axes?: 'outer' | 'cell';
     minWidth?: number;
@@ -252,6 +254,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.14",
+  "version": "0.1.0-alpha.16",
   "description": "cx material components wrapping TanStack Charts (@tanstack/charts/vue)",
   "keywords": [
     "charts",