From b013d3b55767e69c86bcbae9111a8f8363924819 Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Fri, 28 Aug 2026 16:38:20 +0800
Subject: [PATCH] fix table delete

---
 .../tiptap-editor/TiptapTableButton.vue       | 90 +++++++++++++++----
 .../tiptap-editor/TiptapToolbar.vue           | 33 ++++++-
 2 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/src/components/tiptap-editor/TiptapTableButton.vue b/src/components/tiptap-editor/TiptapTableButton.vue
index 6214bf4..07294b5 100644
--- a/src/components/tiptap-editor/TiptapTableButton.vue
+++ b/src/components/tiptap-editor/TiptapTableButton.vue
@@ -1,5 +1,36 @@
 <template>
-	<t-button v-popup="'插入表格'" :variant="active ? 'base' : 'text'" :theme="active ? 'light' : 'default'" @click="openPopup">
+	<t-popover
+		v-if="active"
+		v-model="actionVisible"
+		class="popover"
+		placement="bottom"
+		theme="light"
+		:show-arrow="false"
+	>
+		<t-button variant="base" theme="light">
+			<t-icon name="table" />
+		</t-button>
+		<template #content>
+			<div class="actions">
+				<t-button
+					class="action"
+					size="extra-small"
+					variant="text"
+					block
+					@click="onContinueInsert"
+				>继续插入</t-button>
+				<t-button
+					class="action"
+					size="extra-small"
+					variant="text"
+					theme="danger"
+					block
+					@click="onDeleteTable"
+				>删除表格</t-button>
+			</div>
+		</template>
+	</t-popover>
+	<t-button v-else v-popup="'插入表格'" variant="text" @click="openPopup">
 		<t-icon name="table" />
 	</t-button>
 	<bottom-popup
@@ -44,6 +75,7 @@ const props = defineProps<{
 }>();
 
 const visible = ref(false);
+const actionVisible = ref(false);
 const hoverRow = ref(1);
 const hoverCol = ref(1);
 
@@ -68,6 +100,16 @@ function openPopup() {
 	visible.value = true;
 }
 
+function onContinueInsert() {
+	actionVisible.value = false;
+	openPopup();
+}
+
+function onDeleteTable() {
+	actionVisible.value = false;
+	props.editor?.chain().focus().deleteTable().run();
+}
+
 function onReset() {
 	hoverRow.value = 1;
 	hoverCol.value = 1;
@@ -83,41 +125,59 @@ function onSelect(row: number, col: number) {
 		return;
 	}
 	props.editor.chain().focus().insertTable({ rows: row, cols: col, withHeaderRow: true }).run();
-	visible.value = false;
 }
+
+watch(() => props.active, (active) => {
+	if (!active) {
+		actionVisible.value = false;
+	}
+});
 </script>
 
 <style lang="less" scoped>
 .table-picker {
-	width: min(20rem, calc(100vw - 2rem));
-	padding: 1rem 1rem calc(1rem + env(safe-area-inset-bottom));
+	padding: 0 1rem calc(1rem + env(safe-area-inset-bottom));
+	display: flex;
 	box-sizing: border-box;
 	background: var(--td-bg-color-container, #fff);
+	justify-content: center;
+	flex-direction: column;
 
 	.tip {
 		height: 1.5rem;
 		color: var(--td-text-color-secondary, #666);
 		font-size: .75rem;
+		text-align: center;
 		line-height: 1.5rem;
 	}
 
 	.grid {
-		gap: .125rem;
+		gap: .5rem;
+		width: fit-content;
 		display: grid;
+		margin: 0 auto;
 		grid-template-columns: repeat(7, 1fr);
-	}
 
-	.cell {
-		width: 1.75rem;
-		height: 1.75rem;
-		padding: 0;
-		border: 1px solid var(--td-component-border, #dcdcdc);
-		background: var(--td-bg-color-container, #fff);
+		.cell {
+			width: 2rem;
+			height: 2rem;
+			border: 1px solid var(--td-component-border, #dcdcdc);
+			padding: 0;
+			background: var(--td-bg-color-container, #fff);
 
-		&.active {
-			border-color: var(--td-brand-color, #0052d9);
-			background: var(--td-brand-color-light, #e0edff);
+			&.active {
+				border-color: var(--td-brand-color, #0052d9);
+				background: var(--td-brand-color-light, #e0edff);
+			}
 		}
 	}
 }
+
+.actions {
+	padding: 0 1rem;
+
+	.action {
+		height: 2rem !important;
+	}
+}
 </style>
diff --git a/src/components/tiptap-editor/TiptapToolbar.vue b/src/components/tiptap-editor/TiptapToolbar.vue
index e3a29ce..62adc2b 100644
--- a/src/components/tiptap-editor/TiptapToolbar.vue
+++ b/src/components/tiptap-editor/TiptapToolbar.vue
@@ -71,7 +71,7 @@
 				<t-button v-popup="'有序列表'" :variant="isActive('orderedList') ? 'base' : 'text'" :theme="isActive('orderedList') ? 'light' : 'default'" @click="run('orderedList')">
 					<t-icon name="order-list" />
 				</t-button>
-				<tiptap-table-button :editor="editor" :active="isActive('table')" />
+				<tiptap-table-button :editor="editor" :active="tableActive" />
 				<t-button v-popup="'无序列表'" :variant="isActive('bulletList') ? 'base' : 'text'" :theme="isActive('bulletList') ? 'light' : 'default'" @click="run('bulletList')">
 					<t-icon name="bulletpoint" />
 				</t-button>
@@ -192,8 +192,14 @@ type RunType =
 	| "horizontalRule"
 	| "clear";
 
+type TiptapEditorEventApi = TiptapEditorInstance & {
+	on: (event: "selectionUpdate" | "transaction", callback: () => void) => void;
+	off: (event: "selectionUpdate" | "transaction", callback: () => void) => void;
+};
+
 const textColorDraft = ref("#000000");
 const bgColorDraft = ref("#ffff00");
+const tableActive = ref(false);
 const headingVisible = ref(false);
 const colorPickerVisible = ref(false);
 const colorPickerType = ref<"text" | "bg">("text");
@@ -251,6 +257,27 @@ function isActive(type: string) {
 	return props.editor.isActive(type);
 }
 
+function syncTableActive() {
+	tableActive.value = props.editor?.isActive("table") ?? false;
+}
+
+watch(() => props.editor, (editor, previousEditor) => {
+	const previousEventApi = previousEditor as TiptapEditorEventApi | undefined;
+	previousEventApi?.off("selectionUpdate", syncTableActive);
+	previousEventApi?.off("transaction", syncTableActive);
+
+	const eventApi = editor as TiptapEditorEventApi | undefined;
+	eventApi?.on("selectionUpdate", syncTableActive);
+	eventApi?.on("transaction", syncTableActive);
+	syncTableActive();
+}, { immediate: true });
+
+onBeforeUnmount(() => {
+	const eventApi = props.editor as TiptapEditorEventApi | undefined;
+	eventApi?.off("selectionUpdate", syncTableActive);
+	eventApi?.off("transaction", syncTableActive);
+});
+
 function isAlignActive(align: AlignType) {
 	if (!props.editor) {
 		return false;
@@ -375,6 +402,8 @@ function confirmColor() {
 
 <style lang="less" scoped>
 .toolbar {
+	--td-popover-padding: .25rem .5rem;
+
 	width: 100%;
 	position: relative;
 	display: flex;
@@ -394,7 +423,7 @@ function confirmColor() {
 	}
 
 	.toolbar-head {
-	width: 100%;
+		width: 100%;
 		display: flex;
 		gap: .5rem;
 		align-items: center;