From 292e69a6d18af4ec9cc30e55a441a0ed1fbcc008 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 20 Jul 2026 02:24:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E7=BC=96=E8=BE=91/=E6=93=8D=E4=BD=9C=E5=88=97?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CameraFormDialog: 添加isPopulating标记防止watch清空已填充字段; 兼容row.server.id和row.server_id两种数据结构; 使用append-to-body避免z-index遮挡 OperationCellRenderer: 使用watch捕获row最新值解决slot scope引用失效; 简化buildFormProps参数传递 newcamara/index: 操作列改为直接渲染编辑/删除/预览按钮; 添加getRowById通过ID从listData查找完整行数据 camera/index: 添加isEditingMode标记防止编辑时watch清空字段; 使用formData.id判断创建/编辑模式; dialog添加z-index --- src/views/video/camera/index.vue | 36 ++++++++++-------- .../components/OperationCellRenderer.vue | 28 ++++++++------ .../video/newcamara/config/template-config.ts | 3 +- src/views/video/newcamara/index.vue | 38 +++++++++++-------- .../newcamara/pages/CameraFormDialog.vue | 38 ++++++++++++------- 5 files changed, 86 insertions(+), 57 deletions(-) diff --git a/src/views/video/camera/index.vue b/src/views/video/camera/index.vue index a1a307e5..91f96c37 100644 --- a/src/views/video/camera/index.vue +++ b/src/views/video/camera/index.vue @@ -65,9 +65,10 @@ @@ -269,6 +270,7 @@ const availableFields = [ const presetTree = ref([]) const loading = ref(false) const saving = ref(false) +const isEditingMode = ref(false) const tableData = ref([]) const serverOptions = ref([]) /** 服务器完整信息映射(用于连通通道拉取) */ @@ -540,16 +542,19 @@ function handleChannelSelect(value: number) { watch(() => formData.server_id, (newId, oldId) => { if (newId && newId !== oldId) { - formData.channel_id = undefined - formData.channel_name = '' - formData.ip = '' - formData.port = undefined - formData.model = '' - formData.serial_number = '' - formData.stream_type = '' - channelOptions.value = [] - selectedServerNeedsPassword.value = false - serverPassword.value = '' + // 编辑模式下不自动清空字段,由 openEdit 手动填充 + if (!isEditingMode.value) { + formData.channel_id = undefined + formData.channel_name = '' + formData.ip = '' + formData.port = undefined + formData.model = '' + formData.serial_number = '' + formData.stream_type = '' + channelOptions.value = [] + selectedServerNeedsPassword.value = false + serverPassword.value = '' + } fetchChannelList() } }) @@ -608,6 +613,8 @@ function openEdit(row: CameraRecord) { if (!row.id) return dialogMode.value = 'edit' dialogVisible.value = true + // 标记编辑模式,防止 watch 清空已填充的字段 + isEditingMode.value = true formData.id = row.id formData.server_id = row.server_id formData.channel_id = row.channel_id @@ -623,9 +630,8 @@ function openEdit(row: CameraRecord) { serverPassword.value = '' selectedServerNeedsPassword.value = false formRef.value?.clearValidate() - if (row.server_id) { - fetchChannelList() - } + // 延迟解除编辑标记,确保 watch 回调(pre-flush)执行完毕 + setTimeout(() => { isEditingMode.value = false }, 0) } async function submitForm() { @@ -635,7 +641,7 @@ async function submitForm() { saving.value = true try { - if (dialogMode.value === 'create') { + if (!formData.id) { const res: any = await create({ server_id: formData.server_id!, channel_id: formData.channel_id!, diff --git a/src/views/video/newcamara/components/OperationCellRenderer.vue b/src/views/video/newcamara/components/OperationCellRenderer.vue index a1190233..f0d7f92a 100644 --- a/src/views/video/newcamara/components/OperationCellRenderer.vue +++ b/src/views/video/newcamara/components/OperationCellRenderer.vue @@ -56,7 +56,7 @@