@veltra/sheet 2.2.0 → 2.3.1

package/dist/components/report/designer/rule-row.js

@@ -1,25 +1,20 @@
 import { RULE_SCOPE_OPTIONS, coerceValueForOperator, isNumericFieldType, operatorsForFieldType, readBetweenValue, resolveEvalFieldType, ruleEvalFieldOptions, writeBetweenValue } from "./conditional-rules/helpers.js";
 import _sfc_main$1 from "./rule-preview.js";
-import { Fragment, computed, createBlock, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, openBlock, unref, withCtx } from "vue";
-import { UButton, UInput, UNumberInput, UPalette, USelect } from "@veltra/desktop";
+import { Fragment, computed, createBlock, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, normalizeClass, openBlock, renderList, toDisplayString, unref, withCtx } from "vue";
+import { UButton, UButtonGroup, UInput, UNumberInput, UPalette, USelect } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
 //#region src/components/report/designer/rule-row.vue
+const _hoisted_1 = { title: "背景" };
+const _hoisted_2 = { title: "文字" };
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "UReportRuleRow",
 	__name: "rule-row",
 	props: {
 		rule: {},
 		bindingField: {},
-		datasetFields: {},
-		index: {},
-		total: {}
+		datasetFields: {}
 	},
-	emits: [
-		"update:rule",
-		"remove",
-		"move-up",
-		"move-down"
-	],
+	emits: ["update:rule", "remove"],
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
@@ -28,10 +23,6 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const operatorOptions = computed(() => operatorsForFieldType(evalFieldType.value));
 		const numericField = computed(() => isNumericFieldType(evalFieldType.value));
 		const fieldOptions = computed(() => ruleEvalFieldOptions(props.bindingField, props.datasetFields));
-		const scopeOptions = computed(() => RULE_SCOPE_OPTIONS.map((option) => ({
-			value: option.value,
-			label: option.label
-		})));
 		const betweenStart = computed(() => readBetweenValue(props.rule.value, 0, evalFieldType.value));
 		const betweenEnd = computed(() => readBetweenValue(props.rule.value, 1, evalFieldType.value));
 		const scalarNumber = computed(() => {
@@ -48,7 +39,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		}
 		function onEvalField(field) {
 			const next = {};
-			if (field === void 0) next.field = void 0;
+			if (!field) next.field = void 0;
 			else next.field = field;
 			const nextType = resolveEvalFieldType({
 				...props.rule,
@@ -114,153 +105,146 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				createElementVNode("span", {
 					class: normalizeClass(unref(cls).e("handle")),
 					title: "拖拽排序"
-				}, "≡", 2),
-				createElementVNode("div", { class: normalizeClass(unref(cls).e("main")) }, [
-					createElementVNode("div", { class: normalizeClass(unref(cls).e("meta")) }, [createVNode(unref(USelect), {
+				}, "⋮⋮", 2),
+				createElementVNode("div", { class: normalizeClass(unref(cls).e("main")) }, [createElementVNode("div", { class: normalizeClass(unref(cls).e("when")) }, [
+					createElementVNode("span", { class: normalizeClass(unref(cls).e("lead")) }, "当", 2),
+					createVNode(unref(USelect), {
 						size: "small",
 						class: normalizeClass(unref(cls).e("field-select")),
-						"model-value": __props.rule.field,
+						"model-value": __props.rule.field ?? unref(""),
 						options: fieldOptions.value,
-						placeholder: "求值字段",
 						"onUpdate:modelValue": onEvalField
 					}, null, 8, [
 						"class",
 						"model-value",
 						"options"
-					]), createVNode(unref(USelect), {
+					]),
+					createVNode(unref(USelect), {
 						size: "small",
-						class: normalizeClass(unref(cls).e("scope-select")),
-						"model-value": __props.rule.scope ?? "cell",
-						options: scopeOptions.value,
-						"onUpdate:modelValue": onScope
+						class: normalizeClass(unref(cls).e("operator")),
+						"model-value": __props.rule.operator,
+						options: operatorOptions.value,
+						"onUpdate:modelValue": onOperator
 					}, null, 8, [
 						"class",
 						"model-value",
 						"options"
-					])], 2),
-					createElementVNode("div", { class: normalizeClass(unref(cls).e("condition")) }, [
-						createVNode(unref(USelect), {
+					]),
+					createElementVNode("div", { class: normalizeClass(unref(cls).e("value")) }, [__props.rule.operator === "between" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+						numericField.value ? (openBlock(), createBlock(unref(UNumberInput), {
+							key: 0,
 							size: "small",
-							class: normalizeClass(unref(cls).e("operator")),
-							"model-value": __props.rule.operator,
-							options: operatorOptions.value,
-							"onUpdate:modelValue": onOperator
-						}, null, 8, [
-							"class",
-							"model-value",
-							"options"
-						]),
-						createElementVNode("div", { class: normalizeClass(unref(cls).e("value")) }, [__props.rule.operator === "between" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-							numericField.value ? (openBlock(), createBlock(unref(UNumberInput), {
-								key: 0,
-								size: "small",
-								class: normalizeClass(unref(cls).e("between-input")),
-								"model-value": betweenStart.value,
-								"onUpdate:modelValue": _cache[0] || (_cache[0] = (v) => patchBetween(0, v ?? 0))
-							}, null, 8, ["class", "model-value"])) : (openBlock(), createBlock(unref(UInput), {
-								key: 1,
-								size: "small",
-								class: normalizeClass(unref(cls).e("between-input")),
-								"model-value": String(betweenStart.value),
-								"onUpdate:modelValue": _cache[1] || (_cache[1] = (v) => patchBetween(0, String(v ?? "")))
-							}, null, 8, ["class", "model-value"])),
-							createElementVNode("span", { class: normalizeClass(unref(cls).e("between-sep")) }, "至", 2),
-							numericField.value ? (openBlock(), createBlock(unref(UNumberInput), {
-								key: 2,
-								size: "small",
-								class: normalizeClass(unref(cls).e("between-input")),
-								"model-value": betweenEnd.value,
-								"onUpdate:modelValue": _cache[2] || (_cache[2] = (v) => patchBetween(1, v ?? 0))
-							}, null, 8, ["class", "model-value"])) : (openBlock(), createBlock(unref(UInput), {
-								key: 3,
-								size: "small",
-								class: normalizeClass(unref(cls).e("between-input")),
-								"model-value": String(betweenEnd.value),
-								"onUpdate:modelValue": _cache[3] || (_cache[3] = (v) => patchBetween(1, String(v ?? "")))
-							}, null, 8, ["class", "model-value"]))
-						], 64)) : __props.rule.operator === "contains" || !numericField.value && __props.rule.operator === "eq" ? (openBlock(), createBlock(unref(UInput), {
+							class: normalizeClass(unref(cls).e("between-input")),
+							"model-value": betweenStart.value,
+							"onUpdate:modelValue": _cache[0] || (_cache[0] = (v) => patchBetween(0, v ?? 0))
+						}, null, 8, ["class", "model-value"])) : (openBlock(), createBlock(unref(UInput), {
 							key: 1,
 							size: "small",
-							class: normalizeClass(unref(cls).e("scalar-input")),
-							"model-value": String(__props.rule.value ?? ""),
-							placeholder: "比较值",
-							"onUpdate:modelValue": _cache[4] || (_cache[4] = (v) => patchValue(String(v ?? "")))
-						}, null, 8, ["class", "model-value"])) : (openBlock(), createBlock(unref(UNumberInput), {
+							class: normalizeClass(unref(cls).e("between-input")),
+							"model-value": String(betweenStart.value),
+							"onUpdate:modelValue": _cache[1] || (_cache[1] = (v) => patchBetween(0, String(v ?? "")))
+						}, null, 8, ["class", "model-value"])),
+						createElementVNode("span", { class: normalizeClass(unref(cls).e("between-sep")) }, "至", 2),
+						numericField.value ? (openBlock(), createBlock(unref(UNumberInput), {
 							key: 2,
 							size: "small",
-							class: normalizeClass(unref(cls).e("scalar-input")),
-							"model-value": scalarNumber.value,
-							"onUpdate:modelValue": _cache[5] || (_cache[5] = (v) => patchValue(v ?? 0))
-						}, null, 8, ["class", "model-value"]))], 2),
-						createVNode(_sfc_main$1, {
-							class: normalizeClass(unref(cls).e("preview")),
-							rule: __props.rule
-						}, null, 8, ["class", "rule"])
-					], 2),
-					createElementVNode("div", { class: normalizeClass(unref(cls).e("style")) }, [
-						createElementVNode("span", { class: normalizeClass(unref(cls).e("style-label")) }, "背景", 2),
-						createVNode(unref(UPalette), {
+							class: normalizeClass(unref(cls).e("between-input")),
+							"model-value": betweenEnd.value,
+							"onUpdate:modelValue": _cache[2] || (_cache[2] = (v) => patchBetween(1, v ?? 0))
+						}, null, 8, ["class", "model-value"])) : (openBlock(), createBlock(unref(UInput), {
+							key: 3,
 							size: "small",
-							"model-value": __props.rule.style.fill?.color ?? "",
-							"onUpdate:modelValue": patchFillColor
-						}, null, 8, ["model-value"]),
-						createElementVNode("span", { class: normalizeClass(unref(cls).e("style-label")) }, "字体", 2),
-						createVNode(unref(UPalette), {
-							size: "small",
-							"model-value": __props.rule.style.font?.color ?? "",
-							"onUpdate:modelValue": patchFontColor
-						}, null, 8, ["model-value"]),
-						createVNode(unref(UButton), {
+							class: normalizeClass(unref(cls).e("between-input")),
+							"model-value": String(betweenEnd.value),
+							"onUpdate:modelValue": _cache[3] || (_cache[3] = (v) => patchBetween(1, String(v ?? "")))
+						}, null, 8, ["class", "model-value"]))
+					], 64)) : __props.rule.operator === "contains" || !numericField.value && __props.rule.operator === "eq" ? (openBlock(), createBlock(unref(UInput), {
+						key: 1,
+						size: "small",
+						class: normalizeClass(unref(cls).e("scalar-input")),
+						"model-value": String(__props.rule.value ?? ""),
+						placeholder: "比较值",
+						"onUpdate:modelValue": _cache[4] || (_cache[4] = (v) => patchValue(String(v ?? "")))
+					}, null, 8, ["class", "model-value"])) : (openBlock(), createBlock(unref(UNumberInput), {
+						key: 2,
+						size: "small",
+						class: normalizeClass(unref(cls).e("scalar-input")),
+						"model-value": scalarNumber.value,
+						"onUpdate:modelValue": _cache[5] || (_cache[5] = (v) => patchValue(v ?? 0))
+					}, null, 8, ["class", "model-value"]))], 2),
+					createElementVNode("span", { class: normalizeClass(unref(cls).e("lead")) }, "时", 2)
+				], 2), createElementVNode("div", { class: normalizeClass(unref(cls).e("then")) }, [
+					createElementVNode("span", { class: normalizeClass(unref(cls).e("lead")) }, "样式", 2),
+					createElementVNode("span", _hoisted_1, [createVNode(unref(UPalette), {
+						size: "small",
+						"model-value": __props.rule.style.fill?.color ?? "",
+						"onUpdate:modelValue": patchFillColor
+					}, null, 8, ["model-value"])]),
+					createElementVNode("span", _hoisted_2, [createVNode(unref(UPalette), {
+						size: "small",
+						"model-value": __props.rule.style.font?.color ?? "",
+						"onUpdate:modelValue": patchFontColor
+					}, null, 8, ["model-value"])]),
+					createVNode(unref(UButtonGroup), null, {
+						default: withCtx(() => [createVNode(unref(UButton), {
 							size: "small",
 							class: normalizeClass(unref(cls).e("toggle")),
 							type: __props.rule.style.font?.bold ? "primary" : void 0,
 							plain: "",
+							title: "加粗",
 							onClick: toggleBold
 						}, {
-							default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode(" B ", -1)])]),
+							default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode(" B ", -1)])]),
 							_: 1
-						}, 8, ["class", "type"]),
-						createVNode(unref(UButton), {
+						}, 8, ["class", "type"]), createVNode(unref(UButton), {
 							size: "small",
 							class: normalizeClass(unref(cls).e("toggle")),
 							type: __props.rule.style.font?.italic ? "primary" : void 0,
 							plain: "",
+							title: "斜体",
 							onClick: toggleItalic
 						}, {
-							default: withCtx(() => [..._cache[10] || (_cache[10] = [createTextVNode(" I ", -1)])]),
+							default: withCtx(() => [..._cache[8] || (_cache[8] = [createTextVNode(" I ", -1)])]),
 							_: 1
-						}, 8, ["class", "type"])
-					], 2)
-				], 2),
-				createElementVNode("div", { class: normalizeClass(unref(cls).e("actions")) }, [
-					createVNode(unref(UButton), {
-						size: "small",
-						text: "",
-						disabled: __props.index === 0,
-						onClick: _cache[6] || (_cache[6] = ($event) => emit("move-up"))
-					}, {
-						default: withCtx(() => [..._cache[11] || (_cache[11] = [createTextVNode("↑", -1)])]),
+						}, 8, ["class", "type"])]),
 						_: 1
-					}, 8, ["disabled"]),
-					createVNode(unref(UButton), {
-						size: "small",
-						text: "",
-						disabled: __props.index >= __props.total - 1,
-						onClick: _cache[7] || (_cache[7] = ($event) => emit("move-down"))
-					}, {
-						default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode(" ↓ ", -1)])]),
-						_: 1
-					}, 8, ["disabled"]),
-					createVNode(unref(UButton), {
-						size: "small",
-						text: "",
-						type: "danger",
-						onClick: _cache[8] || (_cache[8] = ($event) => emit("remove"))
-					}, {
-						default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode("删除", -1)])]),
+					}),
+					createVNode(_sfc_main$1, {
+						class: normalizeClass(unref(cls).e("preview")),
+						rule: __props.rule
+					}, null, 8, ["class", "rule"]),
+					createElementVNode("span", { class: normalizeClass(unref(cls).e("lead")) }, "应用到", 2),
+					createVNode(unref(UButtonGroup), null, {
+						default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(RULE_SCOPE_OPTIONS), (option) => {
+							return openBlock(), createBlock(unref(UButton), {
+								key: option.value,
+								size: "small",
+								plain: "",
+								type: (__props.rule.scope ?? "cell") === option.value ? "primary" : void 0,
+								title: option.value === "row" ? "染满物理输出行（交叉表会盖住同行所有列）" : "只改本格",
+								onClick: ($event) => onScope(option.value)
+							}, {
+								default: withCtx(() => [createTextVNode(toDisplayString(option.label), 1)]),
+								_: 2
+							}, 1032, [
+								"type",
+								"title",
+								"onClick"
+							]);
+						}), 128))]),
 						_: 1
 					})
-				], 2)
+				], 2)], 2),
+				createVNode(unref(UButton), {
+					size: "small",
+					text: "",
+					type: "danger",
+					class: normalizeClass(unref(cls).e("remove")),
+					onClick: _cache[6] || (_cache[6] = ($event) => emit("remove"))
+				}, {
+					default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode(" 删除 ", -1)])]),
+					_: 1
+				}, 8, ["class"])
 			], 2);
 		};
 	}

package/dist/components/report/designer/rules-dialog.js

@@ -40,15 +40,6 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		function removeRule(index) {
 			draftItems.value = draftItems.value.filter((_, i) => i !== index);
 		}
-		function moveRule(index, delta) {
-			const target = index + delta;
-			if (target < 0 || target >= draftItems.value.length) return;
-			const next = [...draftItems.value];
-			const [item] = next.splice(index, 1);
-			if (!item) return;
-			next.splice(target, 0, item);
-			draftItems.value = next;
-		}
 		function confirm() {
 			emit("save", cloneRulesFromDraft(draftItems.value));
 			visible.value = false;
@@ -62,7 +53,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => visible.value = $event),
 				title: "条件样式",
 				style: {
-					"width": "min(960px, 92vw)",
+					"width": "min(600px, 92vw)",
 					"max-height": "85vh"
 				},
 				onClose
@@ -82,7 +73,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					_: 1
 				})]),
 				default: withCtx(() => [createElementVNode("div", { class: normalizeClass(unref(cls).b) }, [
-					createElementVNode("p", { class: normalizeClass(unref(cls).e("hint")) }, " 按列表顺序依次求值并合并样式。可指定求值字段（默认同绑定格字段）；作用范围为「整行」时染满物理输出行（含横向展开列与静态格）。交叉表下整行高亮会覆盖同行所有列，明细行报表更合适。 ", 2),
+					createElementVNode("p", { class: normalizeClass(unref(cls).e("hint")) }, "规则按顺序叠加。整行高亮适合明细表，交叉表会染满整行。", 2),
 					draftItems.value.length ? (openBlock(), createElementBlock("ul", {
 						key: 0,
 						ref_key: "parentRef",
@@ -96,27 +87,19 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							rule: item.rule,
 							"binding-field": __props.bindingField,
 							"dataset-fields": __props.datasetFields,
-							index,
-							total: draftItems.value.length,
 							"onUpdate:rule": ($event) => item.rule = $event,
-							onRemove: ($event) => removeRule(index),
-							onMoveUp: ($event) => moveRule(index, -1),
-							onMoveDown: ($event) => moveRule(index, 1)
+							onRemove: ($event) => removeRule(index)
 						}, null, 8, [
 							"rule",
 							"binding-field",
 							"dataset-fields",
-							"index",
-							"total",
 							"onUpdate:rule",
-							"onRemove",
-							"onMoveUp",
-							"onMoveDown"
+							"onRemove"
 						])], 2);
 					}), 128))], 2)) : (openBlock(), createElementBlock("p", {
 						key: 1,
 						class: normalizeClass(unref(cls).e("empty"))
-					}, "暂无规则，点击下方按钮添加。", 2)),
+					}, "还没有规则。", 2)),
 					createVNode(unref(UButton), {
 						size: "small",
 						plain: "",

package/dist/components/report/hub-dataset-editor.js

@@ -66,11 +66,25 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			resetPreview();
 			runDescribe();
 		}, { immediate: true });
+		/** 立即把草稿 SQL 落入数据集（v-model 实时、change 失焦才发且提交有 debounce），供预览同步拿到最新 SQL */
+		function flushSqlDraft(datasetId) {
+			if (sqlTimer) {
+				clearTimeout(sqlTimer);
+				sqlTimer = void 0;
+			}
+			const current = dataset.value;
+			if (!current || current.sql === sqlDraft.value) return;
+			props.hub.updateDataset(datasetId, { sql: sqlDraft.value });
+			runDescribe();
+		}
 		function onSqlChange(value) {
 			sqlDraft.value = value;
+			const datasetId = props.datasetId;
 			if (sqlTimer) clearTimeout(sqlTimer);
 			sqlTimer = setTimeout(() => {
-				props.hub.updateDataset(props.datasetId, { sql: value });
+				sqlTimer = void 0;
+				if (props.datasetId !== datasetId) return;
+				props.hub.updateDataset(datasetId, { sql: value });
 				runDescribe();
 			}, 280);
 		}
@@ -104,6 +118,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			}));
 		});
 		async function runPreview() {
+			flushSqlDraft(props.datasetId);
 			previewing.value = true;
 			previewError.value = "";
 			const result = await props.hub.previewDataset(props.datasetId);

package/dist/components/report/preview-grid-size.js

@@ -0,0 +1,32 @@
+//#region src/components/report/preview-grid-size.ts
+/**
+* 报表预览网格尺寸：只铺到实际内容，不用设计态 canvas / 50×10 下限。
+*
+* - `template`：取数前的静态结构，按 cells/merges/meta 包围盒（忽略 snapshot.rows/cols，
+*   那是设计网格声明尺寸，会带出空白格）
+* - `filled`：行保留展开布局的 `snapshot.rows`（可能含无存值的空扩展行）；列按包围盒收敛
+*   （Filled Report 的 `cols` 常被 `max(layout, template.cols)` 撑到设计态列数）
+*/
+function previewGridSize(snapshot, mode) {
+	let maxRow = -1;
+	let maxCol = -1;
+	const grow = (row, col) => {
+		if (row > maxRow) maxRow = row;
+		if (col > maxCol) maxCol = col;
+	};
+	for (const cell of snapshot.cells) grow(cell.row, cell.col);
+	for (const merge of snapshot.merges) grow(merge.end.row, merge.end.col);
+	for (const item of snapshot.meta ?? []) grow(item.row, item.col);
+	const boundRows = maxRow + 1;
+	const boundCols = maxCol + 1;
+	if (mode === "filled") return {
+		rows: Math.max(boundRows, snapshot.rows, 1),
+		cols: Math.max(boundCols, 1)
+	};
+	return {
+		rows: Math.max(boundRows, 1),
+		cols: Math.max(boundCols, 1)
+	};
+}
+//#endregion
+export { previewGridSize };