stk-table-vue 1.0.2 → 1.0.3

package/lib/{Dropdown-iW-rY3I6.js → Dropdown-gzfyZN4Y.js}

@@ -6,7 +6,7 @@
  * homepage: https://ja-plus.github.io/stk-table-vue/
  * license: MIT
  */
-import { t as StkTable_default } from "./StkTable-Deyo4iqb.js";
+import { t as StkTable_default } from "./StkTable-CoLDxW4i.js";
 import { createElementBlock, createElementVNode, createVNode, defineComponent, h, nextTick, normalizeClass, normalizeStyle, onMounted, onUnmounted, openBlock, reactive, ref, withModifiers } from "vue";
 //#region src/StkTable/custom-cells/FilterCell/Dropdown/index.vue?vue&type=script&setup=true&lang.ts
 var DROPDOWN_DEFAULT_WIDTH = 300;

package/lib/{StkTable-Deyo4iqb.js → StkTable-CoLDxW4i.js}

@@ -3575,33 +3575,34 @@ function useWheeling(resetDelay = 500) {
 var _hoisted_1 = ["tabindex"];
 var _hoisted_2 = { class: "stk-table-scroll-container" };
 var _hoisted_3 = { key: 0 };
-var _hoisted_4 = ["onClick"];
-var _hoisted_5 = ["onMousedown"];
-var _hoisted_6 = { class: "table-header-title" };
-var _hoisted_7 = ["onMousedown"];
-var _hoisted_8 = ["colspan"];
-var _hoisted_9 = ["title"];
-var _hoisted_10 = { key: 0 };
-var _hoisted_11 = ["colspan"];
+var _hoisted_4 = { key: 1 };
+var _hoisted_5 = ["onClick"];
+var _hoisted_6 = ["onMousedown"];
+var _hoisted_7 = { class: "table-header-title" };
+var _hoisted_8 = ["onMousedown"];
+var _hoisted_9 = ["colspan"];
+var _hoisted_10 = ["title"];
+var _hoisted_11 = { key: 0 };
 var _hoisted_12 = ["colspan"];
-var _hoisted_13 = {
+var _hoisted_13 = ["colspan"];
+var _hoisted_14 = {
 	class: "table-cell-wrapper",
 	tabindex: "-1"
 };
-var _hoisted_14 = {
+var _hoisted_15 = {
 	key: 0,
 	class: "vt-x-left"
 };
-var _hoisted_15 = ["colspan"];
-var _hoisted_16 = ["title"];
-var _hoisted_17 = {
+var _hoisted_16 = ["colspan"];
+var _hoisted_17 = ["title"];
+var _hoisted_18 = {
 	key: 2,
 	class: "table-cell-wrapper",
 	tabindex: "-1"
 };
-var _hoisted_18 = ["title"];
-var _hoisted_19 = { key: 2 };
-var _hoisted_20 = {
+var _hoisted_19 = ["title"];
+var _hoisted_20 = { key: 2 };
+var _hoisted_21 = {
 	key: 1,
 	class: "vt-x-right"
 };
@@ -4075,6 +4076,15 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 				[TagType.TF]: tfMap
 			};
 		});
+		/**
+		* fixed 模式下 colgroup 中单个 col 的样式。
+		* 仅取叶子列的 width（与 cellStyleMap 中 --cw 保持一致）；未设置 width 的列不声明宽度，
+		* 由 table-layout:fixed 将剩余空间平分，符合“一列固定、其余列平分”的预期。
+		*/
+		function getColGroupColStyle(col) {
+			const width = transformWidthToStr(col.width);
+			return width ? `width:${width}` : null;
+		}
 		function getAbsoluteRowIndex(rowIndex) {
 			return rowIndex + virtualScroll.value.startIndex;
 		}
@@ -4692,7 +4702,13 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 					onContextmenu: onRowMenu,
 					onMouseover: onTrMouseOver
 				}, [
-					!__props.headless ? (openBlock(), createElementBlock("thead", _hoisted_3, [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(virtualX_on) ? unref(virtualX_tableHeaders) : unref(tableHeaders), (row, rowIndex) => {
+					props.fixedMode && !unref(virtualX_on) ? (openBlock(), createElementBlock("colgroup", _hoisted_3, [(openBlock(true), createElementBlock(Fragment, null, renderList(tableHeaderLast.value, (col) => {
+						return openBlock(), createElementBlock("col", {
+							key: colKeyGen.value(col),
+							style: normalizeStyle(getColGroupColStyle(col))
+						}, null, 4);
+					}), 128))])) : createCommentVNode("", true),
+					!__props.headless ? (openBlock(), createElementBlock("thead", _hoisted_4, [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(virtualX_on) ? unref(virtualX_tableHeaders) : unref(tableHeaders), (row, rowIndex) => {
 						return openBlock(), createElementBlock("tr", {
 							key: rowIndex,
 							onContextmenu: _cache[3] || (_cache[3] = ($event) => onHeaderMenu($event))
@@ -4713,7 +4729,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 										key: 0,
 										class: "table-header-resizer left",
 										onMousedown: ($event) => unref(onThResizeMouseDown)($event, col, true)
-									}, null, 40, _hoisted_5)) : createCommentVNode("", true),
+									}, null, 40, _hoisted_6)) : createCommentVNode("", true),
 									createElementVNode("div", {
 										class: "table-header-cell-wrapper",
 										style: normalizeStyle(col.__R_SP__ ? `--row-span:${col.__R_SP__}` : null)
@@ -4729,7 +4745,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 									])) : renderSlot(_ctx.$slots, "tableHeader", {
 										key: 1,
 										col
-									}, () => [createElementVNode("span", _hoisted_6, toDisplayString(col.title), 1)]), col.sorter ? (openBlock(), createBlock(SortIcon_default, {
+									}, () => [createElementVNode("span", _hoisted_7, toDisplayString(col.title), 1)]), col.sorter ? (openBlock(), createBlock(SortIcon_default, {
 										key: 2,
 										class: "table-header-sorter"
 									})) : createCommentVNode("", true)], 4),
@@ -4737,8 +4753,8 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 										key: 1,
 										class: "table-header-resizer right",
 										onMousedown: ($event) => unref(onThResizeMouseDown)($event, col)
-									}, null, 40, _hoisted_7)) : createCommentVNode("", true)
-								], 16, _hoisted_4);
+									}, null, 40, _hoisted_8)) : createCommentVNode("", true)
+								], 16, _hoisted_5);
 							}), 128)),
 							unref(virtualX_on) ? (openBlock(), createElementBlock("th", {
 								key: 1,
@@ -4748,7 +4764,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 						], 32);
 					}), 128))])) : createCommentVNode("", true),
 					__props.footerData && __props.footerData.length > 0 ? (openBlock(), createBlock(resolveDynamicComponent(footerTagName.value), {
-						key: 1,
+						key: 2,
 						class: "stk-footer",
 						style: normalizeStyle(isFooterTop.value ? `top:${unref(tableHeaderHeight)}px` : "")
 					}, {
@@ -4764,7 +4780,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 										key: 0,
 										class: "vt-x-spacer",
 										colspan: col.__VT_C_SP__
-									}, null, 8, _hoisted_8)) : (openBlock(), createElementBlock("td", mergeProps({
+									}, null, 8, _hoisted_9)) : (openBlock(), createElementBlock("td", mergeProps({
 										key: 1,
 										ref_for: true
 									}, getTFProps(col)), [col.customFooterCell ? (openBlock(), createBlock(resolveDynamicComponent(col.customFooterCell), {
@@ -4784,7 +4800,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 										class: "table-cell-wrapper",
 										tabindex: "-1",
 										title: footRow[col.dataIndex] || ""
-									}, [footRow[col.dataIndex] != null ? (openBlock(), createElementBlock("span", _hoisted_10, toDisplayString(footRow[col.dataIndex]), 1)) : createCommentVNode("", true)], 8, _hoisted_9)], 16))], 64);
+									}, [footRow[col.dataIndex] != null ? (openBlock(), createElementBlock("span", _hoisted_11, toDisplayString(footRow[col.dataIndex]), 1)) : createCommentVNode("", true)], 8, _hoisted_10)], 16))], 64);
 								}), 128)),
 								unref(virtualX_on) ? (openBlock(), createElementBlock("td", {
 									key: 1,
@@ -4819,7 +4835,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 									key: 0,
 									class: "vt-x-spacer",
 									colspan: col.__VT_C_SP__
-								}, null, 8, _hoisted_11)) : (openBlock(), createElementBlock("td", {
+								}, null, 8, _hoisted_12)) : (openBlock(), createElementBlock("td", {
 									key: 1,
 									style: normalizeStyle(cellStyleMap.value[unref(TagType).TD].get(colKeyGen.value(col)))
 								}, null, 4))], 64);
@@ -4839,17 +4855,17 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 							}, { ref_for: true }, getTRProps(row, rowIndex)), [row && row.__EXP_R__ ? (openBlock(), createElementBlock("td", {
 								key: 0,
 								colspan: unref(expandRowColspan)
-							}, [createElementVNode("div", _hoisted_13, [renderSlot(_ctx.$slots, "expand", {
+							}, [createElementVNode("div", _hoisted_14, [renderSlot(_ctx.$slots, "expand", {
 								row: row.__EXP_R__,
 								col: row.__EXP_C__
-							}, () => [createTextVNode(toDisplayString(row.__EXP_R__ && row.__EXP_C__ && row.__EXP_R__[row.__EXP_C__.dataIndex] || ""), 1)])])], 8, _hoisted_12)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-								unref(virtualX_on) ? (openBlock(), createElementBlock("td", _hoisted_14)) : createCommentVNode("", true),
+							}, () => [createTextVNode(toDisplayString(row.__EXP_R__ && row.__EXP_C__ && row.__EXP_R__[row.__EXP_C__.dataIndex] || ""), 1)])])], 8, _hoisted_13)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+								unref(virtualX_on) ? (openBlock(), createElementBlock("td", _hoisted_15)) : createCommentVNode("", true),
 								(openBlock(true), createElementBlock(Fragment, null, renderList(unref(virtualX_columnPart), (col, _colIdx) => {
 									return openBlock(), createElementBlock(Fragment, { key: col.__VT_C_SP__ ? `spacer-${_colIdx}` : colKeyGen.value(col) }, [col.__VT_C_SP__ ? (openBlock(), createElementBlock("td", {
 										key: 0,
 										class: "vt-x-spacer",
 										colspan: col.__VT_C_SP__
-									}, null, 8, _hoisted_15)) : !shouldHideCell(row, col) ? (openBlock(), createElementBlock("td", mergeProps({
+									}, null, 8, _hoisted_16)) : !shouldHideCell(row, col) ? (openBlock(), createElementBlock("td", mergeProps({
 										key: 1,
 										ref_for: true
 									}, getTDProps(row, col, rowIndex, col.__LF_S__ ?? 0)), [col.customCell ? (openBlock(), createBlock(resolveDynamicComponent(col.customCell), {
@@ -4880,7 +4896,7 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 										class: "table-cell-wrapper",
 										tabindex: "-1",
 										title: row[col.dataIndex] || ""
-									}, toDisplayString((row && row[col.dataIndex]) != null ? row && row[col.dataIndex] : getEmptyCellText.value(col, row)), 9, _hoisted_16)) : col.type === "seq" ? (openBlock(), createElementBlock("div", _hoisted_17, toDisplayString((props.seqConfig.startIndex || 0) + getAbsoluteRowIndex(rowIndex) + 1), 1)) : col.type === "tree-node" ? (openBlock(), createBlock(TreeNodeCell_default, {
+									}, toDisplayString((row && row[col.dataIndex]) != null ? row && row[col.dataIndex] : getEmptyCellText.value(col, row)), 9, _hoisted_17)) : col.type === "seq" ? (openBlock(), createElementBlock("div", _hoisted_18, toDisplayString((props.seqConfig.startIndex || 0) + getAbsoluteRowIndex(rowIndex) + 1), 1)) : col.type === "tree-node" ? (openBlock(), createBlock(TreeNodeCell_default, {
 										key: 3,
 										class: "table-cell-wrapper",
 										tabindex: "-1",
@@ -4894,9 +4910,9 @@ var StkTable_default = /* @__PURE__ */ defineComponent({
 									}, [col.type === "dragRow" ? (openBlock(), createBlock(DragHandle_default, {
 										key: 0,
 										onDragstart: ($event) => unref(onTrDragStart)($event, getAbsoluteRowIndex(rowIndex))
-									}, null, 8, ["onDragstart"])) : col.type === "expand" ? (openBlock(), createBlock(TriangleIcon_default, { key: 1 })) : createCommentVNode("", true), row[col.dataIndex] != null ? (openBlock(), createElementBlock("span", _hoisted_19, toDisplayString(row[col.dataIndex]), 1)) : createCommentVNode("", true)], 8, _hoisted_18))], 16)) : createCommentVNode("", true)], 64);
+									}, null, 8, ["onDragstart"])) : col.type === "expand" ? (openBlock(), createBlock(TriangleIcon_default, { key: 1 })) : createCommentVNode("", true), row[col.dataIndex] != null ? (openBlock(), createElementBlock("span", _hoisted_20, toDisplayString(row[col.dataIndex]), 1)) : createCommentVNode("", true)], 8, _hoisted_19))], 16)) : createCommentVNode("", true)], 64);
 								}), 128)),
-								unref(virtualX_on) ? (openBlock(), createElementBlock("td", _hoisted_20)) : createCommentVNode("", true)
+								unref(virtualX_on) ? (openBlock(), createElementBlock("td", _hoisted_21)) : createCommentVNode("", true)
 							], 64))], 16);
 						}), 128)),
 						!isExperimentalScrollY.value ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [unref(virtual_on) && !unref(isSRBRActive) ? (openBlock(), createElementBlock("tr", {

package/lib/stk-table-vue.js

@@ -6,7 +6,7 @@
  * homepage: https://ja-plus.github.io/stk-table-vue/
  * license: MIT
  */
-import { a as insertToOrderedArray, i as binarySearch, n as registerFeature, o as strCompare, r as useAreaSelection, s as tableSort, t as StkTable_default } from "./StkTable-Deyo4iqb.js";
+import { a as insertToOrderedArray, i as binarySearch, n as registerFeature, o as strCompare, r as useAreaSelection, s as tableSort, t as StkTable_default } from "./StkTable-CoLDxW4i.js";
 import { Fragment, computed, createApp, createBlock, createElementBlock, createElementVNode, createTextVNode, defineComponent, getCurrentInstance, h, markRaw, nextTick, normalizeClass, openBlock, ref, renderSlot, resolveDynamicComponent, toDisplayString, watch, withModifiers } from "vue";
 //#region src/StkTable/custom-cells/FilterCell/Dropdown/index.ts
 var DropdownIns = null;
@@ -15,7 +15,7 @@ async function getDropdownIns() {
 		const div = document.createElement("div");
 		div.classList.add("stk-filter-dropdown-wrapper");
 		document.body.appendChild(div);
-		DropdownIns = createApp(await import("./Dropdown-iW-rY3I6.js").then((module) => module.default)).mount(div);
+		DropdownIns = createApp(await import("./Dropdown-gzfyZN4Y.js").then((module) => module.default)).mount(div);
 	}
 	return DropdownIns;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stk-table-vue",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "High performance realtime virtual table for vue3 and vue2.7",
   "main": "./lib/stk-table-vue.js",
   "types": "./lib/src/StkTable/index.d.ts",

package/src/StkTable/StkTable.vue

@@ -61,6 +61,11 @@
                 @contextmenu="onRowMenu"
                 @mouseover="onTrMouseOver"
             >
+                <!-- table-layout:fixed 下浏览器仅依据首行/colgroup 决定列宽，多级表头时子列宽度位于非首行会被忽略。
+                     故固定模式下通过 colgroup 显式声明每个叶子列宽度，保证子列 width 生效。 -->
+                <colgroup v-if="props.fixedMode && !virtualX_on">
+                    <col v-for="col in tableHeaderLast" :key="colKeyGen(col)" :style="getColGroupColStyle(col)" />
+                </colgroup>
                 <thead v-if="!headless">
                     <tr
                         v-for="(row, rowIndex) in virtualX_on ? virtualX_tableHeaders : tableHeaders"
@@ -1199,6 +1204,16 @@ const cellStyleMap = computed(() => {
     };
 });
 
+/**
+ * fixed 模式下 colgroup 中单个 col 的样式。
+ * 仅取叶子列的 width（与 cellStyleMap 中 --cw 保持一致）；未设置 width 的列不声明宽度，
+ * 由 table-layout:fixed 将剩余空间平分，符合“一列固定、其余列平分”的预期。
+ */
+function getColGroupColStyle(col: PrivateStkTableColumn<DT>) {
+    const width = transformWidthToStr(col.width);
+    return width ? `width:${width}` : null;
+}
+
 function getAbsoluteRowIndex(rowIndex: number) {
     return rowIndex + virtualScroll.value.startIndex;
 }