diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 934b9b94e..c716f5782 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -82,7 +82,7 @@ - + #foreach($column in $columns) #set($javaField=$column.javaField) @@ -275,6 +275,7 @@ const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']); const queryFormRef = ref(); const ${businessName}FormRef = ref(); +const ${businessName}TableRef = ref(); const dialog = reactive({ visible: false, @@ -439,11 +440,33 @@ const submitForm = () => { /** 删除按钮操作 */ const handleDelete = async (row?: ${BusinessName}VO) => { - const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value; - await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项?').finally(() => loading.value = false); - await del${BusinessName}(_${pkColumn.javaField}s); - proxy?.#[[$modal]]#.msgSuccess("删除成功"); - await getList(); + // 获取表格的数据列的首列 + const columns = (${businessName}TableRef.value?.columns || []) as any[]; + const dataColumns = columns.filter((col) => col.type !== 'selection' && col.type !== 'index'); + if (dataColumns.length <= 0) { + return; + } + const label = dataColumns[0].label; + const fieldName = dataColumns[0].property; + + let rowsData: string; + let num = 1; + if (row) { + rowsData = row[fieldName]; + } else { + rowsData = ${businessName}TableRef.value + .getSelectionRows() + .map((item: ${BusinessName}VO) => item[fieldName]) + .join(','); + num = ${businessName}TableRef.value.getSelectionRows().length; + } + + await proxy?.#[[$modal]]#.confirm('是否确认删除【' + label + '】为【' + rowsData + '】的【' + num + '】条数据项?').finally(() => (loading.value = false)); + + const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value; + await del${BusinessName}(_${pkColumn.javaField}s); + proxy?.#[[$modal]]#.msgSuccess('删除成功'); + await getList(); } /** 导出按钮操作 */