From cbe319be4f2c1d8417f85d1714b0e221008bc8e3 Mon Sep 17 00:00:00 2001 From: swz128 Date: Mon, 11 May 2026 19:41:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(edit=5Ftable):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=8D=95=E5=85=83=E6=A0=BC=E6=97=B6=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=9B=A0=E8=BE=B9=E6=A1=86=E6=8C=A4=E5=8E=8B=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 选中单元格使用 border_2 绘制高亮边框，边框会占用盒模型内部空间， 通过 content_box_inset 挤压内容区，导致文字位置跳动。改为在施加 选中边框后等量减少对应方向的 padding，保持内容区原点不变。 --- crates/one_ui/src/edit_table/state.rs | 39 +++++++++++++++++++-------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/crates/one_ui/src/edit_table/state.rs b/crates/one_ui/src/edit_table/state.rs index f8d1e3bda6..054aaeb19f 100644 --- a/crates/one_ui/src/edit_table/state.rs +++ b/crates/one_ui/src/edit_table/state.rs @@ -1936,6 +1936,9 @@ where let is_editing = row_ix.is_some() && self.editing_cell == Some((row_ix.unwrap(), col_ix)); let selection_border_color = cx.theme().table_active_border; + let is_single_select_active = + (is_active_cell || is_select_cell) && !is_editing && !is_multi_selection; + let mut cell = div() .id(cell_id) .w(col_width) @@ -1964,10 +1967,9 @@ where this.border_r_2().border_color(selection_border_color) }) // 活动单元格额外添加完整边框（仅在单选时显示） - .when( - (is_active_cell || is_select_cell) && !is_editing && !is_multi_selection, - |this| this.border_2().border_color(selection_border_color), - ) + .when(is_single_select_active, |this| { + this.border_2().border_color(selection_border_color) + }) // 编辑状态的单元格 .when(is_editing, |this| { this.bg(cx.theme().background) @@ -1984,14 +1986,29 @@ where } } else { cell = cell.table_cell_size(self.options.size); - cell = match col_padding { - Some(padding) => cell - .pl(padding.left) - .pr(padding.right) - .pt(padding.top) - .pb(padding.bottom), - None => cell, + + let size_pad = self.options.size.table_cell_padding(); + let (target_pt, target_pb, target_pl, target_pr) = match col_padding { + Some(p) => (p.top, p.bottom, p.left, p.right), + None => ( + size_pad.top, + size_pad.bottom, + size_pad.left, + size_pad.right, + ), }; + + // 选中时 border 占用内部空间会挤压内容区，减少等量 padding 补偿 + let has_t = border_top || is_single_select_active; + let has_b = border_bottom || is_single_select_active; + let has_l = border_left || is_single_select_active; + let has_r = border_right || is_single_select_active; + let b = px(2.); + cell = cell + .pt(if has_t { (target_pt - b).max(px(0.)) } else { target_pt }) + .pb(if has_b { (target_pb - b).max(px(0.)) } else { target_pb }) + .pl(if has_l { (target_pl - b).max(px(0.)) } else { target_pl }) + .pr(if has_r { (target_pr - b).max(px(0.)) } else { target_pr }); } cell