feat：【antd】【ele】统一 dataSourceConfig 的实现

2025-09-23 08:31:14 +08:00
parent af74cf6ad9
commit 3c67ecada0
5 changed files with 75 additions and 102 deletions
--- a/apps/web-antd/src/views/infra/dataSourceConfig/data.ts
+++ b/apps/web-antd/src/views/infra/dataSourceConfig/data.ts
@@ -55,26 +55,31 @@ export function useFormSchema(): VbenFormSchema[] {
 /** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions['columns'] {
  return [
-    { type: 'checkbox', width: 50 },
+    { type: 'checkbox', width: 40 },
    {
      field: 'id',
      title: '主键编号',
+      minWidth: 100,
    },
    {
      field: 'name',
      title: '数据源名称',
+      minWidth: 150,
    },
    {
      field: 'url',
      title: '数据源连接',
+      minWidth: 300,
    },
    {
      field: 'username',
      title: '用户名',
+      minWidth: 120,
    },
    {
      field: 'createTime',
      title: '创建时间',
+      minWidth: 180,
      formatter: 'formatDateTime',
    },
    {
--- a/apps/web-antd/src/views/infra/dataSourceConfig/index.vue
+++ b/apps/web-antd/src/views/infra/dataSourceConfig/index.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { InfraDataSourceConfigApi } from '#/api/infra/data-source-config';

-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';

 import { confirm, Page, useVbenModal } from '@vben/common-ui';
 import { isEmpty } from '@vben/utils';
@@ -25,6 +25,11 @@ const [FormModal, formModalApi] = useVbenModal({
  destroyOnClose: true,
 });

+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
 /** 创建数据源 */
 function handleCreate() {
  formModalApi.setData(null).open();
@@ -43,10 +48,8 @@ async function handleDelete(row: InfraDataSourceConfigApi.DataSourceConfig) {
  });
  try {
    await deleteDataSourceConfig(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    await handleLoadData();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
  } finally {
    hideLoading();
  }
@@ -63,7 +66,7 @@ async function handleDeleteBatch() {
    await deleteDataSourceConfigList(checkedIds.value);
    checkedIds.value = [];
    message.success($t('ui.actionMessage.deleteSuccess'));
-    await handleLoadData();
+    handleRefresh();
  } finally {
    hideLoading();
  }
@@ -101,21 +104,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
    checkboxChange: handleRowCheckboxChange,
  },
 });
-
-/** 加载数据 */
-async function handleLoadData() {
-  await gridApi.query();
-}
-
-/** 初始化 */
-onMounted(() => {
-  handleLoadData();
-});
 </script>

 <template>
  <Page auto-content-height>
-    <FormModal @success="handleLoadData" />
+    <FormModal @success="handleRefresh" />
    <Grid table-title="数据源列表">
      <template #toolbar-tools>
        <TableAction
--- a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue
+++ b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>

 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle">
    <Form class="mx-4" />
  </Modal>
 </template>
--- a/apps/web-ele/src/views/infra/dataSourceConfig/data.ts
+++ b/apps/web-ele/src/views/infra/dataSourceConfig/data.ts
@@ -1,10 +1,5 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { InfraDataSourceConfigApi } from '#/api/infra/data-source-config';
-
-import { useAccess } from '@vben/access';
-
-const { hasAccessByCodes } = useAccess();
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -58,9 +53,7 @@ export function useFormSchema(): VbenFormSchema[] {
 }

 /** 列表的字段 */
-export function useGridColumns<T = InfraDataSourceConfigApi.DataSourceConfig>(
-  onActionClick: OnActionClickFn<T>,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
  return [
    { type: 'checkbox', width: 40 },
    {
@@ -90,31 +83,10 @@ export function useGridColumns<T = InfraDataSourceConfigApi.DataSourceConfig>(
      formatter: 'formatDateTime',
    },
    {
-      field: 'operation',
      title: '操作',
-      minWidth: 130,
-      align: 'center',
+      width: 160,
      fixed: 'right',
-      cellRender: {
-        attrs: {
-          nameField: 'name',
-          nameTitle: '数据源',
-          onClick: onActionClick,
-        },
-        name: 'CellOperation',
-        options: [
-          {
-            code: 'edit',
-            show: hasAccessByCodes(['infra:data-source-config:update']),
-            disabled: (row: any) => row.id === 0,
-          },
-          {
-            code: 'delete',
-            show: hasAccessByCodes(['infra:data-source-config:delete']),
-            disabled: (row: any) => row.id === 0,
-          },
-        ],
-      },
+      slots: { default: 'actions' },
    },
  ];
 }
--- a/apps/web-ele/src/views/infra/dataSourceConfig/index.vue
+++ b/apps/web-ele/src/views/infra/dataSourceConfig/index.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import type {
-  OnActionClickParams,
-  VxeTableGridOptions,
-} from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { InfraDataSourceConfigApi } from '#/api/infra/data-source-config';

-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';

 import { confirm, Page, useVbenModal } from '@vben/common-ui';
 import { isEmpty } from '@vben/utils';
@@ -28,37 +25,49 @@ const [FormModal, formModalApi] = useVbenModal({
  destroyOnClose: true,
 });

+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
 /** 创建数据源 */
-function onCreate() {
+function handleCreate() {
  formModalApi.setData(null).open();
 }

 /** 编辑数据源 */
-function onEdit(row: InfraDataSourceConfigApi.DataSourceConfig) {
+function handleEdit(row: InfraDataSourceConfigApi.DataSourceConfig) {
  formModalApi.setData(row).open();
 }

 /** 删除数据源 */
-async function onDelete(row: InfraDataSourceConfigApi.DataSourceConfig) {
+async function handleDelete(row: InfraDataSourceConfigApi.DataSourceConfig) {
  const loadingInstance = ElLoading.service({
    text: $t('ui.actionMessage.deleting', [row.name]),
  });
  try {
    await deleteDataSourceConfig(row.id as number);
    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
  } finally {
    loadingInstance.close();
  }
 }

 /** 批量删除数据源 */
-async function onDeleteBatch() {
-  await confirm('确定要批量删除该数据源吗？');
-  await deleteDataSourceConfigList(checkedIds.value);
-  checkedIds.value = [];
-  ElMessage.success($t('ui.actionMessage.deleteSuccess'));
-  await onRefresh();
+async function handleDeleteBatch() {
+  await confirm($t('ui.actionMessage.deleteBatchConfirm'));
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deletingBatch'),
+  });
+  try {
+    await deleteDataSourceConfigList(checkedIds.value);
+    checkedIds.value = [];
+    ElMessage.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
 }

 const checkedIds = ref<number[]>([]);
@@ -70,30 +79,14 @@ function handleRowCheckboxChange({
  checkedIds.value = records.map((item) => item.id!);
 }

-/** 表格操作按钮的回调函数 */
-function onActionClick({
-  code,
-  row,
-}: OnActionClickParams<InfraDataSourceConfigApi.DataSourceConfig>) {
-  switch (code) {
-    case 'delete': {
-      onDelete(row);
-      break;
-    }
-    case 'edit': {
-      onEdit(row);
-      break;
-    }
-  }
-}
-
 const [Grid, gridApi] = useVbenVxeGrid({
  gridOptions: {
-    columns: useGridColumns(onActionClick),
+    columns: useGridColumns(),
    height: 'auto',
    keepSource: true,
    rowConfig: {
      keyField: 'id',
+      isHover: true,
    },
    pagerConfig: {
      enabled: false,
@@ -109,26 +102,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
    checkboxChange: handleRowCheckboxChange,
  },
 });
-
-/** 加载数据 */
-async function handleLoadData() {
-  await gridApi.query();
-}
-
-/** 刷新表格 */
-async function onRefresh() {
-  await handleLoadData();
-}
-
-/** 初始化 */
-onMounted(() => {
-  handleLoadData();
-});
 </script>

 <template>
  <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
    <Grid table-title="数据源列表">
      <template #toolbar-tools>
        <TableAction
@@ -138,7 +116,7 @@ onMounted(() => {
              type: 'primary',
              icon: ACTION_ICON.ADD,
              auth: ['infra:data-source-config:create'],
-              onClick: onCreate,
+              onClick: handleCreate,
            },
            {
              label: $t('ui.actionTitle.deleteBatch'),
@@ -146,7 +124,32 @@ onMounted(() => {
              icon: ACTION_ICON.DELETE,
              disabled: isEmpty(checkedIds),
              auth: ['infra:data-source-config:delete'],
-              onClick: onDeleteBatch,
+              onClick: handleDeleteBatch,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['infra:data-source-config:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['infra:data-source-config:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
            },
          ]"
        />