@veltra/sheet 2.2.0 → 2.3.0

package/dist/components/report/binding-badge.js

@@ -1,33 +1,34 @@
-import { formatBindingPlaceholder, inferReportPreset } from "../../report/binding.js";
+import { formatBindingPlaceholderParts, inferReportPreset } from "../../report/binding.js";
 import { CustomLayout } from "@veltra/sheet-core";
 //#region src/components/report/binding-badge.ts
-/** 绑定徽章预设配色（设计态富渲染徽章；canvas 绘制需具体色值，无法消费 CSS 变量） */
 const REPORT_PRESET_BADGE_COLORS = {
 	groupHeader: {
-		bg: "#dbeafe",
-		fg: "#1d4ed8"
+		cell: "#eef4ff",
+		fg: "#2f54eb"
 	},
 	detail: {
-		bg: "#d1fae5",
-		fg: "#047857"
+		cell: "#effaf3",
+		fg: "#1f9254"
 	},
 	subtotal: {
-		bg: "#fef3c7",
-		fg: "#b45309"
+		cell: "#fff7e6",
+		fg: "#d46b08"
 	},
 	grandTotal: {
-		bg: "#ffe4e6",
-		fg: "#be123c"
+		cell: "#fff1f0",
+		fg: "#cf1322"
 	},
 	cross: {
-		bg: "#ede9fe",
-		fg: "#6d28d9"
+		cell: "#f8f5ff",
+		fg: "#5f3dc4"
 	}
 };
 const CUSTOM_PRESET_BADGE_COLOR = {
-	bg: "#f3f4f6",
-	fg: "#374151"
+	cell: "#f7f8fa",
+	fg: "#495057"
 };
+/** 徽章字段标签文字色（中性深灰，与强调色形成层次） */
+const BADGE_LABEL_COLOR = "#343a40";
 function resolveBadgeColor(binding) {
 	const preset = inferReportPreset(binding);
 	return preset ? REPORT_PRESET_BADGE_COLORS[preset] : CUSTOM_PRESET_BADGE_COLOR;
@@ -37,16 +38,16 @@ function createBindingBadgeStyleResolver(getBindingAt) {
 	return (addr, base) => {
 		const binding = getBindingAt(addr);
 		if (!binding) return base;
-		const { bg } = resolveBadgeColor(binding);
+		const { cell } = resolveBadgeColor(binding);
 		return {
 			...base,
-			fill: { color: bg }
+			fill: { color: cell }
 		};
 	};
 }
 /**
 * 绑定格富渲染徽章（ADR-0004 `resolveCellRenderer` 首个消费者）：
-* 绑定单元格由纯文本占位符升级为带预设色彩的徽章（底色 + 占位文案），
+* 绑定单元格渲染为左对齐徽章（强调色聚合标签 + 中性色字段标签），
 * 未绑定格返回 `undefined` 回落默认渲染。
 */
 function createBindingBadgeRenderer(getBindingAt, resolveLabel) {
@@ -54,17 +55,40 @@ function createBindingBadgeRenderer(getBindingAt, resolveLabel) {
 		const binding = getBindingAt(addr);
 		if (!binding) return void 0;
 		const { fg } = resolveBadgeColor(binding);
+		const { tag, label } = formatBindingPlaceholderParts(binding, resolveLabel);
 		const rootContainer = new CustomLayout.Container({
 			display: "flex",
 			flexDirection: "row",
-			justifyContent: "center",
+			justifyContent: "flex-start",
 			alignItems: "center"
 		});
+		const tagEl = new CustomLayout.Tag({
+			text: tag,
+			textStyle: {
+				fontSize: 10,
+				fontWeight: 600,
+				fill: "#ffffff"
+			},
+			panel: {
+				visible: true,
+				fill: fg,
+				cornerRadius: 3
+			},
+			padding: [
+				1,
+				4,
+				1,
+				4
+			],
+			marginLeft: 6,
+			marginRight: 5
+		});
+		rootContainer.add(tagEl);
 		rootContainer.add(new CustomLayout.Text({
-			text: formatBindingPlaceholder(binding, resolveLabel),
+			text: label,
 			fontSize: 11,
-			fontWeight: 600,
-			fill: fg
+			fontWeight: 500,
+			fill: BADGE_LABEL_COLOR
 		}));
 		return {
 			rootContainer,

package/dist/components/report/designer/col-widths.js

@@ -1,15 +1,29 @@
 //#region src/components/report/designer/col-widths.ts
-/** 经 SheetGrid → VTable 写入指定列宽 */
+/** 行号列数（隐藏行头时为 0；与 GridCoords 探测一致） */
+function seriesNumberColCount(table) {
+	const rowOffset = table.columnHeaderLevelCount;
+	let col = 0;
+	while (col < table.colCount && table.isSeriesNumber(col, rowOffset)) col++;
+	return col;
+}
+/** 将模型列宽写入 VTable（模型 → grid 同步辅助） */
 function applyGridColWidths(grid, widths) {
 	if (!grid) return;
 	const table = grid.getTable();
-	for (const [sheetCol, width] of widths) table.setColWidth(sheetCol + 1, width);
+	const colOffset = seriesNumberColCount(table);
+	for (const [sheetCol, width] of widths) table.setColWidth(sheetCol + colOffset, width);
+}
+/** 把列宽条目写入 Sheet 模型（不进 undo，对称 setColWidth） */
+function applySheetColWidths(sheet, widths) {
+	if (!sheet) return;
+	for (const [col, width] of widths) sheet.setColWidth(col, width);
 }
 /** 从当前网格读取指定模型列宽度；网格未就绪时返回 null */
 function readGridColWidths(grid, cols) {
 	if (!grid) return null;
 	const table = grid.getTable();
-	return cols.map((sheetCol) => [sheetCol, table.getColWidth(sheetCol + 1)]);
+	const colOffset = seriesNumberColCount(table);
+	return cols.map((sheetCol) => [sheetCol, table.getColWidth(sheetCol + colOffset)]);
 }
 //#endregion
-export { applyGridColWidths, readGridColWidths };
+export { applyGridColWidths, applySheetColWidths, readGridColWidths };

package/dist/components/report/designer/conditional-rules/helpers.js

@@ -18,7 +18,7 @@ const RULE_SCOPE_OPTIONS = [{
 /** 求值字段下拉：缺省项表示本格绑定字段 */
 function ruleEvalFieldOptions(bindingField, datasetFields) {
 	return [{
-		value: void 0,
+		value: "",
 		label: "本格字段"
 	}, ...datasetFields.filter((field) => field.name !== bindingField).map((field) => ({
 		value: field.name,
@@ -61,8 +61,8 @@ function defaultRuleValue(operator, fieldType) {
 }
 function defaultRuleStyle() {
 	return {
-		fill: { color: "#FEE2E2" },
-		font: { color: "#DC2626" }
+		fill: { color: "#FEF3C7" },
+		font: { color: "#B45309" }
 	};
 }
 function createDraftItem(rule, fieldType = "number", _bindingField) {

package/dist/components/report/designer/float-panel.js

@@ -1,5 +1,5 @@
+import { formatBindingPlaceholder, formatCellAddress, formatParentCandidateLabel, inferReportPreset, isReductionAggregate } from "../../../report/binding.js";
 import { resolveGridOverlayLayout } from "./cell-coords.js";
-import { formatBindingPlaceholder, formatCellAddress, inferReportPreset } from "../../../report/binding.js";
 import { readCellOverlayRect, resolveBindingFloatPanelPosition, useGridOverlaySync } from "./use-grid-overlay.js";
 import { REPORT_PRESET_OPTIONS, presetBindingDefaults } from "./role.js";
 import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, nextTick, normalizeClass, normalizeStyle, openBlock, ref, toDisplayString, toRef, unref, vShow, watch, withCtx, withDirectives, withModifiers } from "vue";
@@ -20,6 +20,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		rowParentCandidates: {},
 		colParentCandidates: {},
 		resolveFieldLabel: { type: Function },
+		getBindingAt: { type: Function },
 		hostEl: {},
 		getGrid: { type: Function }
 	},
@@ -47,7 +48,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			});
 			return options;
 		});
-		const aggregateOptions = [
+		const ALL_AGGREGATE_OPTIONS = [
 			{
 				value: "list",
 				label: "明细"
@@ -77,6 +78,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				label: "最小"
 			}
 		];
+		const REDUCTION_AGGREGATE_OPTIONS = ALL_AGGREGATE_OPTIONS.filter((item) => isReductionAggregate(item.value));
 		const expandOptions = [
 			{
 				value: "down",
@@ -112,18 +114,40 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			if (!props.binding) return "detail";
 			return inferReportPreset(props.binding) ?? CUSTOM_PRESET_VALUE;
 		});
+		const showAggregateSelect = computed(() => {
+			const preset = currentPresetValue.value;
+			return preset === CUSTOM_PRESET_VALUE || preset === "subtotal" || preset === "grandTotal" || preset === "cross";
+		});
+		const showExpandSelect = computed(() => {
+			const preset = currentPresetValue.value;
+			return preset === CUSTOM_PRESET_VALUE || preset === "groupHeader" || preset === "detail";
+		});
+		const aggregateOptions = computed(() => currentPresetValue.value === CUSTOM_PRESET_VALUE ? ALL_AGGREGATE_OPTIONS : REDUCTION_AGGREGATE_OPTIONS);
 		const summaryText = computed(() => {
 			if (!props.binding) return "";
-			return formatBindingPlaceholder(props.binding, props.resolveFieldLabel);
+			const parts = [formatBindingPlaceholder(props.binding, props.resolveFieldLabel)];
+			if (props.binding.rowParent && props.resolvedRowParentLabel !== "—") {
+				const parent = props.getBindingAt?.(props.binding.rowParent);
+				const name = parent ? props.resolveFieldLabel?.(parent.dataset, parent.field) ?? parent.field : props.resolvedRowParentLabel;
+				parts.push(`行父格 ${name} ${props.resolvedRowParentLabel}`);
+			}
+			if (props.binding.colParent && props.resolvedColParentLabel !== "—") {
+				const parent = props.getBindingAt?.(props.binding.colParent);
+				const name = parent ? props.resolveFieldLabel?.(parent.dataset, parent.field) ?? parent.field : props.resolvedColParentLabel;
+				parts.push(`列父格 ${name} ${props.resolvedColParentLabel}`);
+			}
+			return parts.join(" · ");
 		});
-		const rowParentOptions = computed(() => props.rowParentCandidates.map((addr) => ({
-			value: formatCellAddress(addr),
-			label: formatCellAddress(addr)
-		})));
-		const colParentOptions = computed(() => props.colParentCandidates.map((addr) => ({
-			value: formatCellAddress(addr),
-			label: formatCellAddress(addr)
-		})));
+		function candidateOption(addr) {
+			const value = formatCellAddress(addr);
+			const binding = props.getBindingAt?.(addr);
+			return {
+				value,
+				label: binding ? formatParentCandidateLabel(addr, binding, props.resolveFieldLabel) : value
+			};
+		}
+		const rowParentOptions = computed(() => props.rowParentCandidates.map(candidateOption));
+		const colParentOptions = computed(() => props.colParentCandidates.map(candidateOption));
 		const rowParentSelectValue = computed(() => props.binding?.rowParent ? formatCellAddress(props.binding.rowParent) : void 0);
 		const colParentSelectValue = computed(() => props.binding?.colParent ? formatCellAddress(props.binding.colParent) : void 0);
 		const visible = computed(() => !!props.binding && !!props.cell && inView.value);
@@ -132,8 +156,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			top: `${panelTop.value}px`
 		}));
 		watch(() => [props.cell?.row, props.cell?.col], () => {
+			if (props.parentPickMode) return;
 			expanded.value = false;
 		});
+		watch(() => props.parentPickMode, (mode) => {
+			if (mode) expanded.value = true;
+		});
 		watch(expanded, () => {
 			nextTick(() => updatePosition());
 		});
@@ -146,7 +174,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			emit("patch", presetBindingDefaults(preset));
 		}
 		function aggregateDefaultExpand(aggregate) {
-			return aggregate === "sum" || aggregate === "avg" || aggregate === "count" || aggregate === "max" || aggregate === "min" ? "none" : "down";
+			return isReductionAggregate(aggregate) ? "none" : "down";
 		}
 		function onAggregate(aggregate) {
 			emit("patch", {
@@ -236,20 +264,26 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					"model-value",
 					"options"
 				]),
-				createVNode(unref(USelect), {
+				showAggregateSelect.value ? (openBlock(), createBlock(unref(USelect), {
+					key: 0,
 					size: "small",
 					class: normalizeClass([unref(cls).e("select"), unref(cls).em("select", "aggregate")]),
 					"model-value": __props.binding.aggregate,
-					options: aggregateOptions,
+					options: aggregateOptions.value,
 					"onUpdate:modelValue": onAggregate
-				}, null, 8, ["class", "model-value"]),
-				createVNode(unref(USelect), {
+				}, null, 8, [
+					"class",
+					"model-value",
+					"options"
+				])) : createCommentVNode("v-if", true),
+				showExpandSelect.value ? (openBlock(), createBlock(unref(USelect), {
+					key: 1,
 					size: "small",
 					class: normalizeClass([unref(cls).e("select"), unref(cls).em("select", "expand")]),
 					"model-value": __props.binding.expand,
 					options: expandOptions,
 					"onUpdate:modelValue": onExpand
-				}, null, 8, ["class", "model-value"]),
+				}, null, 8, ["class", "model-value"])) : createCommentVNode("v-if", true),
 				createVNode(unref(UButton), {
 					size: "small",
 					plain: "",
@@ -258,12 +292,21 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					default: withCtx(() => [..._cache[10] || (_cache[10] = [createTextVNode("条件样式", -1)])]),
 					_: 1
 				}),
+				createVNode(unref(UButton), {
+					size: "small",
+					text: "",
+					type: "danger",
+					onClick: _cache[1] || (_cache[1] = ($event) => emit("remove"))
+				}, {
+					default: withCtx(() => [..._cache[11] || (_cache[11] = [createTextVNode("删除绑定", -1)])]),
+					_: 1
+				}),
 				createVNode(unref(UButton), {
 					size: "small",
 					text: "",
 					class: normalizeClass(unref(cls).e("expand")),
 					title: expanded.value ? "收起" : "展开更多",
-					onClick: _cache[1] || (_cache[1] = ($event) => expanded.value = !expanded.value)
+					onClick: _cache[2] || (_cache[2] = ($event) => expanded.value = !expanded.value)
 				}, {
 					default: withCtx(() => [createTextVNode(toDisplayString(expanded.value ? "收起" : "展开"), 1)]),
 					_: 1
@@ -292,7 +335,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							size: "small",
 							plain: "",
 							type: __props.parentPickMode === "row" ? "primary" : void 0,
-							onClick: _cache[2] || (_cache[2] = ($event) => emit("start-parent-pick", "row"))
+							onClick: _cache[3] || (_cache[3] = ($event) => emit("start-parent-pick", "row"))
 						}, {
 							default: withCtx(() => [createTextVNode(toDisplayString(__props.parentPickMode === "row" ? "点选目标格…" : "设置行方向父格"), 1)]),
 							_: 1
@@ -315,9 +358,9 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							size: "small",
 							text: "",
 							type: "danger",
-							onClick: _cache[3] || (_cache[3] = ($event) => emit("clear-parent", "row"))
+							onClick: _cache[4] || (_cache[4] = ($event) => emit("clear-parent", "row"))
 						}, {
-							default: withCtx(() => [..._cache[11] || (_cache[11] = [createTextVNode(" 清除 ", -1)])]),
+							default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode(" 清除 ", -1)])]),
 							_: 1
 						})) : createCommentVNode("v-if", true)
 					], 2)
@@ -330,7 +373,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							size: "small",
 							plain: "",
 							type: __props.parentPickMode === "col" ? "primary" : void 0,
-							onClick: _cache[4] || (_cache[4] = ($event) => emit("start-parent-pick", "col"))
+							onClick: _cache[5] || (_cache[5] = ($event) => emit("start-parent-pick", "col"))
 						}, {
 							default: withCtx(() => [createTextVNode(toDisplayString(__props.parentPickMode === "col" ? "点选目标格…" : "设置列方向父格"), 1)]),
 							_: 1
@@ -353,30 +396,24 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							size: "small",
 							text: "",
 							type: "danger",
-							onClick: _cache[5] || (_cache[5] = ($event) => emit("clear-parent", "col"))
+							onClick: _cache[6] || (_cache[6] = ($event) => emit("clear-parent", "col"))
 						}, {
-							default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode(" 清除 ", -1)])]),
+							default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode(" 清除 ", -1)])]),
 							_: 1
 						})) : createCommentVNode("v-if", true)
 					], 2)
 				], 2),
-				createElementVNode("footer", { class: normalizeClass(unref(cls).e("footer")) }, [__props.parentPickMode ? (openBlock(), createBlock(unref(UButton), {
+				__props.parentPickMode ? (openBlock(), createElementBlock("footer", {
 					key: 0,
+					class: normalizeClass(unref(cls).e("footer"))
+				}, [createVNode(unref(UButton), {
 					size: "small",
 					plain: "",
-					onClick: _cache[6] || (_cache[6] = ($event) => emit("cancel-parent-pick"))
-				}, {
-					default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode(" 取消点选 ", -1)])]),
-					_: 1
-				})) : createCommentVNode("v-if", true), createVNode(unref(UButton), {
-					size: "small",
-					type: "danger",
-					plain: "",
-					onClick: _cache[7] || (_cache[7] = ($event) => emit("remove"))
+					onClick: _cache[7] || (_cache[7] = ($event) => emit("cancel-parent-pick"))
 				}, {
-					default: withCtx(() => [..._cache[14] || (_cache[14] = [createTextVNode("删除绑定", -1)])]),
+					default: withCtx(() => [..._cache[14] || (_cache[14] = [createTextVNode("取消点选", -1)])]),
 					_: 1
-				})], 2)
+				})], 2)) : createCommentVNode("v-if", true)
 			], 2)) : createCommentVNode("v-if", true)], 38)), [[vShow, visible.value]]) : createCommentVNode("v-if", true);
 		};
 	}