From 059c59b002dbeb2ff2294ec5042851cba8e9c146 Mon Sep 17 00:00:00 2001
From: sakurayinfei <970412446@qq.com>
Date: Thu, 6 Nov 2025 19:39:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(table):=20=E4=BD=BF=E7=94=A8=E5=AA=92?=
 =?UTF-8?q?=E4=BD=93=E6=9F=A5=E8=AF=A2=E5=88=87=E6=8D=A2=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/table/OTable.vue       | 11 +++++------
 packages/opendesign/src/table/style/style.scss | 12 +++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/opendesign/src/table/OTable.vue b/packages/opendesign/src/table/OTable.vue
index 217a20991..eeeca9b71 100644
--- a/packages/opendesign/src/table/OTable.vue
+++ b/packages/opendesign/src/table/OTable.vue
@@ -47,8 +47,7 @@ const highlightedDoms: Array<HTMLTableRowElement | HTMLTableCellElement> = [];
 let highlightTrigger: HTMLTableCellElement | null = null;
 const clearHighlight = () => {
   highlightedDoms.forEach((cell) => {
-    cell.classList.remove('o-table-hover');
-    cell.classList.remove('o-table-active');
+    cell.classList.remove('o-table-highlight');
   });
   highlightedDoms.length = 0;
   highlightTrigger = null;
@@ -57,7 +56,7 @@ const applyHighlight = (dom: HTMLTableRowElement | HTMLTableCellElement, classNa
   highlightedDoms.push(dom);
   dom.classList.add(className);
 };
-const highlightTable = (cell: HTMLTableCellElement, type: 'hover' | 'active') => {
+const highlightTable = (cell: HTMLTableCellElement) => {
   if (highlightTrigger === cell) {
     // 避免重复添加高亮样式
     return;
@@ -71,7 +70,7 @@ const highlightTable = (cell: HTMLTableCellElement, type: 'hover' | 'active') =>
   const section = cellMeta.section;
   const rowEl = section.rows[cellMeta.rowStart];
   const rowSpan = cellMeta.el.rowSpan;
-  const className = `o-table-${type}`;
+  const className = 'o-table-highlight';
   applyHighlight(rowEl, className);
   if (rowSpan === 1) {
     const rows = section.data[cellMeta.rowStart];
@@ -104,14 +103,14 @@ const handleMouseOver = (e: MouseEvent) => {
   if (!target || !isHoverDevice) {
     return;
   }
-  highlightTable(target, 'hover');
+  highlightTable(target);
 };
 const handleTouchStart = (e: TouchEvent) => {
   const target = getTdEl(e.target);
   if (!target) {
     return;
   }
-  highlightTable(target, 'active');
+  highlightTable(target);
 };
 </script>
 <template>
diff --git a/packages/opendesign/src/table/style/style.scss b/packages/opendesign/src/table/style/style.scss
index 6e32df41c..c14dd5d39 100644
--- a/packages/opendesign/src/table/style/style.scss
+++ b/packages/opendesign/src/table/style/style.scss
@@ -31,11 +31,13 @@
     height: var(--table-cell-height);
   }
 }
-.o-table-hover {
-  background-color: var(--table-row-hover);
-}
-.o-table-active {
-  background-color: var(--table-row-active);
+.o-table-highlight {
+  @media (hover: hover) {
+    background-color: var(--table-row-hover);
+  }
+  @media (hover: none) {
+    background-color: var(--table-row-active);
+  }
 }
 .o-table-wrap {
   border-radius: var(--table-radius);
-- 
Gitee


From a9f92dbe1f0cda7704aa10f51203a609ccf3b48b Mon Sep 17 00:00:00 2001
From: sakurayinfei <970412446@qq.com>
Date: Thu, 6 Nov 2025 19:41:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(table):=20=E4=BC=98=E5=8C=96=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E5=88=97=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8D=E5=80=BC=E7=9A=84=E5=8F=98=E9=87=8F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/table/OTable.vue      |  8 ++++----
 packages/opendesign/src/table/useTableMeta.ts | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/opendesign/src/table/OTable.vue b/packages/opendesign/src/table/OTable.vue
index eeeca9b71..0b45c4a69 100644
--- a/packages/opendesign/src/table/OTable.vue
+++ b/packages/opendesign/src/table/OTable.vue
@@ -5,7 +5,7 @@ import { computed, ref } from 'vue';
 import { IconLoading } from '../_utils/icons';
 import { isHoverDevice, isString } from '../_utils/is';
 import { useI18n } from '../locale';
-import { useTableMeta, DEFAULT_CELL_COL_MARKER, DEFAULT_ROW_MARKER } from './useTableMeta';
+import { useTableMeta, DEFAULT_CELL_LAST_COL_MARKER, DEFAULT_ROW_LAST_MARKER } from './useTableMeta';
 
 const props = defineProps(tableProps);
 
@@ -130,7 +130,7 @@ const handleTouchStart = (e: TouchEvent) => {
         <thead v-if="columnData.length > 1">
           <slot name="header" :columns="columnData">
             <tr>
-              <th v-for="(col, idx) in columnData" :key="col.key || idx" :class="{ [DEFAULT_CELL_COL_MARKER]: idx + 1 === columnData.length }">
+              <th v-for="(col, idx) in columnData" :key="col.key || idx" :class="{ [DEFAULT_CELL_LAST_COL_MARKER]: idx + 1 === columnData.length }">
                 <slot :name="`th_${col.key}`" :column="col">
                   {{ col.label }}
                 </slot>
@@ -140,11 +140,11 @@ const handleTouchStart = (e: TouchEvent) => {
         </thead>
         <tbody v-if="tableData.length > 0">
           <slot name="body" :body="tableData">
-            <tr v-for="(row, rIdx) in tableData" :key="row.key || rIdx" :class="{ [DEFAULT_ROW_MARKER]: rIdx + 1 === tableData.length }">
+            <tr v-for="(row, rIdx) in tableData" :key="row.key || rIdx" :class="{ [DEFAULT_ROW_LAST_MARKER]: rIdx + 1 === tableData.length }">
               <td
                 :rowspan="col.rowspan"
                 :colspan="col.colspan"
-                :class="{ [DEFAULT_CELL_COL_MARKER]: col.last }"
+                :class="{ [DEFAULT_CELL_LAST_COL_MARKER]: col.last }"
                 v-for="(col, idx) in row.data"
                 :key="col.key || idx"
               >
diff --git a/packages/opendesign/src/table/useTableMeta.ts b/packages/opendesign/src/table/useTableMeta.ts
index 5792e421f..2bad88c8f 100644
--- a/packages/opendesign/src/table/useTableMeta.ts
+++ b/packages/opendesign/src/table/useTableMeta.ts
@@ -36,9 +36,9 @@ type TableMetaOptions = {
   splitBySection?: boolean;
 };
 
-export const DEFAULT_CELL_COL_MARKER = 'o-cell-last-col';
-export const DEFAULT_CELL_ROW_MARKER = 'o-cell-last-row';
-export const DEFAULT_ROW_MARKER = 'o-row-last';
+export const DEFAULT_CELL_LAST_COL_MARKER = 'o-cell-last-col';
+export const DEFAULT_CELL_LAST_ROW_MARKER = 'o-cell-last-row';
+export const DEFAULT_ROW_LAST_MARKER = 'o-row-last';
 
 function fillGrid(grid: (CellT | null)[][], cellMeta: CellT) {
   for (let r = cellMeta.rowStart; r < cellMeta.rowEnd; r++) {
@@ -167,9 +167,9 @@ function markSection(
 function markTable(sections: Array<TableSection | undefined>, options: TableMetaOptions) {
   const { markCellLastCol, markCellLastRow, markRowLast, splitBySection } = options;
   const marker = {
-    cellColMarker: markCellLastCol === true ? DEFAULT_CELL_COL_MARKER : markCellLastCol,
-    cellRowMarker: markCellLastRow === true ? DEFAULT_CELL_ROW_MARKER : markCellLastRow,
-    rowMarker: markRowLast === true ? DEFAULT_ROW_MARKER : markRowLast,
+    cellColMarker: markCellLastCol === true ? DEFAULT_CELL_LAST_COL_MARKER : markCellLastCol,
+    cellRowMarker: markCellLastRow === true ? DEFAULT_CELL_LAST_ROW_MARKER : markCellLastRow,
+    rowMarker: markRowLast === true ? DEFAULT_ROW_LAST_MARKER : markRowLast,
   };
 
   const validSections = sections.filter(Boolean) as TableSection[];
-- 
Gitee


From 7a4e41e83d59fa7a75778d50f2231eba76ba6fd4 Mon Sep 17 00:00:00 2001
From: sakurayinfei <970412446@qq.com>
Date: Thu, 6 Nov 2025 19:55:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat(table):=20td=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Erow-index=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/table/OTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opendesign/src/table/OTable.vue b/packages/opendesign/src/table/OTable.vue
index 0b45c4a69..fed221a97 100644
--- a/packages/opendesign/src/table/OTable.vue
+++ b/packages/opendesign/src/table/OTable.vue
@@ -18,7 +18,7 @@ defineSlots<{
   empty(): any;
   loading(): any;
   [k: `th_${string}`]: (props: { column: TableColumnT }) => any;
-  [k: `td_${string}`]: (props: { row: TableRowT }) => any;
+  [k: `td_${string}`]: (props: { row: TableRowT; rowIndex: number }) => any;
 }>();
 
 const { t } = useI18n();
@@ -148,7 +148,7 @@ const handleTouchStart = (e: TouchEvent) => {
                 v-for="(col, idx) in row.data"
                 :key="col.key || idx"
               >
-                <slot :name="`td_${col.key}`" :row="props.data ? props.data[rIdx] : {}">
+                <slot :name="`td_${col.key}`" :row="props.data ? props.data[rIdx] : {}" :row-index="rIdx">
                   {{ col.value }}
                 </slot>
               </td>
-- 
Gitee


From 3f53264b5c5b06f0d25509c8aa52eede06c1d2c6 Mon Sep 17 00:00:00 2001
From: sakurayinfei <970412446@qq.com>
Date: Thu, 6 Nov 2025 20:02:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(table):=20=E8=A1=A8=E6=A0=BC=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/table/__demo__/TableSpan.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/opendesign/src/table/__demo__/TableSpan.vue b/packages/opendesign/src/table/__demo__/TableSpan.vue
index 24b68203b..945c71b99 100644
--- a/packages/opendesign/src/table/__demo__/TableSpan.vue
+++ b/packages/opendesign/src/table/__demo__/TableSpan.vue
@@ -47,10 +47,18 @@ function cellSpanFn(rowIdx: number, colIdx: number) {
 }
 </script>
 <template>
-  <h4>单元格合并</h4>
+  <h4>单元格合并及表格嵌套</h4>
   <div class="sec">
     <OTable border="all" :data="tableData" :columns="columns2" :cell-span="cellSpanFn">
-      <template #td_name="{ row }"><div>name: {{ row.name }}</div></template>
+      <template #td_name="{ row }">
+        <div>name: {{ row.name }}</div>
+      </template>
+      <template #td_address="{ row, rowIndex }">
+        <template v-if="rowIndex === 4">
+          <OTable border="all" :data="tableData" :columns="columns2" :cell-span="cellSpanFn" />
+        </template>
+        <template v-else>{{ row.address }}</template>
+      </template>
     </OTable>
   </div>
 </template>
-- 
Gitee