refactor: datasource vxe

yudao-ui-admin-vue3/src/api/infra/config/index.ts

@@ -11,6 +11,7 @@ export type ConfigVO = {
   remark: string
   createTime: string
 }
+
 export interface ConfigPageReqVO extends PageParam {
   name?: string
   type?: number

yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts

@@ -1,5 +1,13 @@
 import request from '@/config/axios'
-import type { DataSourceConfigVO } from './types'
+
+export type DataSourceConfigVO = {
+  id: number
+  name: string
+  url: string
+  username: string
+  password: string
+  createTime: string
+}
 
 // 查询数据源配置列表
 export const getDataSourceConfigListApi = () => {

yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts

@@ -1,7 +1,7 @@
 import { reactive } from 'vue'
 import { required } from '@/utils/formRules'
 import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
 // 国际化
 const { t } = useI18n()
 // 表单校验
@@ -12,24 +12,17 @@ export const rules = reactive({
   password: [required]
 })
 // 新增 + 修改
-const crudSchemas = reactive<CrudSchema[]>([
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id',
+  primaryType: 'seq',
+  action: true,
+  columns: [
     {
-    label: t('common.index'),
+      title: '数据源名称',
-    field: 'id',
-    type: 'index',
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
-    }
-  },
-  {
-    label: '数据源名称',
       field: 'name'
     },
     {
-    label: '数据源连接',
+      title: '数据源连接',
       field: 'url',
       form: {
         component: 'Input',
@@ -43,42 +36,20 @@ const crudSchemas = reactive<CrudSchema[]>([
       }
     },
     {
-    label: '用户名',
+      title: '用户名',
       field: 'username'
     },
     {
-    label: '密码',
+      title: '密码',
       field: 'password',
-    table: {
+      isTable: false
-      show: false
-    }
     },
     {
-    label: t('common.createTime'),
+      title: t('common.createTime'),
       field: 'createTime',
-    form: {
+      formatter: 'formatDate',
-      show: false
+      isForm: false
-    },
-    search: {
-      show: true,
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetimerange',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
     }
-    }
+  ]
-  },
+})
-  {
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
-    field: 'action',
-    width: '240px',
-    label: t('table.action'),
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
-    }
-  }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)

yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue

@@ -1,135 +1,40 @@
-<script setup lang="ts">
-import { onMounted, ref, unref } from 'vue'
-import dayjs from 'dayjs'
-import { ElMessage } from 'element-plus'
-import { FormExpose } from '@/components/Form'
-import { rules, allSchemas } from './dataSourceConfig.data'
-import type { DataSourceConfigVO } from '@/api/infra/dataSourceConfig/types'
-import * as DataSourceConfiggApi from '@/api/infra/dataSourceConfig'
-import { useI18n } from '@/hooks/web/useI18n'
-const { t } = useI18n() // 国际化
-const tableData = ref()
-const getList = async () => {
-  const res = await DataSourceConfiggApi.getDataSourceConfigListApi()
-  tableData.value = res
-}
-// ========== CRUD 相关 ==========
-const loading = ref(false) // 遮罩层
-const actionType = ref('') // 操作按钮的类型
-const dialogVisible = ref(false) // 是否显示弹出层
-const dialogTitle = ref('edit') // 弹出层标题
-const formRef = ref<FormExpose>() // 表单 Ref
-
-// 设置标题
-const setDialogTile = (type: string) => {
-  dialogTitle.value = t('action.' + type)
-  actionType.value = type
-  dialogVisible.value = true
-}
-
-// 新增操作
-const handleCreate = () => {
-  setDialogTile('create')
-}
-
-// 修改操作
-const handleUpdate = async (row: DataSourceConfigVO) => {
-  setDialogTile('update')
-  // 设置数据
-  const res = await DataSourceConfiggApi.getDataSourceConfigApi(row.id)
-  unref(formRef)?.setValues(res)
-}
-
-// 提交按钮
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  if (!elForm) return
-  elForm.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 提交请求
-      try {
-        const data = unref(formRef)?.formModel as DataSourceConfigVO
-        if (actionType.value === 'create') {
-          await DataSourceConfiggApi.createDataSourceConfigApi(data)
-          ElMessage.success(t('common.createSuccess'))
-        } else {
-          await DataSourceConfiggApi.updateDataSourceConfigApi(data)
-          ElMessage.success(t('common.updateSuccess'))
-        }
-        // 操作成功，重新加载列表
-        dialogVisible.value = false
-        await getList()
-      } finally {
-        loading.value = false
-      }
-    }
-  })
-}
-
-// 删除操作
-const handleDelete = async (row: DataSourceConfigVO) => {
-  await DataSourceConfiggApi.deleteDataSourceConfigApi(row.id)
-  ElMessage.success(t('common.delSuccess'))
-}
-
-// ========== 详情相关 ==========
-const detailRef = ref() // 详情 Ref
-
-// 详情操作
-const handleDetail = async (row: DataSourceConfigVO) => {
-  // 设置数据
-  detailRef.value = row
-  setDialogTile('detail')
-}
-onMounted(async () => {
-  await getList()
-})
-</script>
-
 <template>
   <ContentWrap>
-    <!-- 操作工具栏 -->
+    <!-- 列表 -->
-    <div class="mb-10px">
+    <vxe-grid ref="xGrid" v-bind="gridOptions" class="xtable-scrollbar">
-      <el-button
+      <template #toolbar_buttons>
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          :title="t('action.add')"
           v-hasPermi="['infra:data-source-config:create']"
-        type="primary"
+          @click="handleCreate()"
-        @click="handleCreate"
+        />
-      >
-        <Icon icon="ep:zoom-in" class="mr-5px" /> {{ t('action.add') }}
-      </el-button>
-    </div>
-    <Table :columns="allSchemas.tableColumns" :data="tableData">
-      <template #createTime="{ row }">
-        <span>{{ row.createTime ? dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
       </template>
-      <template #action="{ row }">
+      <template #actionbtns_default="{ row }">
-        <el-button
+        <!-- 操作：修改 -->
-          link
+        <XTextButton
-          type="primary"
+          preIcon="ep:edit"
+          :title="t('action.edit')"
           v-hasPermi="['infra:data-source-config:update']"
-          @click="handleUpdate(row)"
+          @click="handleUpdate(row.id)"
-        >
+        />
-          <Icon icon="ep:edit" class="mr-1px" /> {{ t('action.edit') }}
+        <!-- 操作：详情 -->
-        </el-button>
+        <XTextButton
-        <el-button
+          preIcon="ep:view"
-          link
+          :title="t('action.detail')"
-          type="primary"
+          v-hasPermi="['infra:data-source-config:query']"
-          v-hasPermi="['infra:data-source-config:update']"
+          @click="handleDetail(row.id)"
-          @click="handleDetail(row)"
+        />
-        >
+        <!-- 操作：删除 -->
-          <Icon icon="ep:view" class="mr-1px" /> {{ t('action.detail') }}
+        <XTextButton
-        </el-button>
+          preIcon="ep:delete"
-        <el-button
+          :title="t('action.del')"
-          link
-          type="primary"
           v-hasPermi="['infra:data-source-config:delete']"
-          @click="handleDelete(row)"
+          @click="handleDelete(row.id)"
-        >
+        />
-          <Icon icon="ep:delete" class="mr-1px" /> {{ t('action.del') }}
-        </el-button>
       </template>
-    </Table>
+    </vxe-grid>
   </ContentWrap>
   <XModal v-model="dialogVisible" :title="dialogTitle">
     <!-- 对话框(添加 / 修改) -->
@@ -143,7 +48,7 @@ onMounted(async () => {
     <Descriptions
       v-if="actionType === 'detail'"
       :schema="allSchemas.detailSchema"
-      :data="detailRef"
+      :data="detailData"
     />
     <!-- 操作按钮 -->
     <template #footer>
@@ -160,3 +65,93 @@ onMounted(async () => {
     </template>
   </XModal>
 </template>
+<script setup lang="ts">
+// 全局相关的 import
+import { ref, unref } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { useVxeGrid } from '@/hooks/web/useVxeGrid'
+import { VxeGridInstance } from 'vxe-table'
+import { FormExpose } from '@/components/Form'
+// 业务相关的 import
+import * as DataSourceConfiggApi from '@/api/infra/dataSourceConfig'
+import { rules, allSchemas } from './dataSourceConfig.data'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+// 列表相关的变量
+const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
+const { gridOptions, getList, deleteData } = useVxeGrid<DataSourceConfiggApi.DataSourceConfigVO>({
+  allSchemas: allSchemas,
+  isList: true,
+  getListApi: DataSourceConfiggApi.getDataSourceConfigListApi,
+  deleteApi: DataSourceConfiggApi.deleteDataSourceConfigApi
+})
+// ========== CRUD 相关 ==========
+const loading = ref(false) // 遮罩层
+const actionType = ref('') // 操作按钮的类型
+const dialogVisible = ref(false) // 是否显示弹出层
+const dialogTitle = ref('edit') // 弹出层标题
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  dialogTitle.value = t('action.' + type)
+  actionType.value = type
+  dialogVisible.value = true
+}
+
+// 新增操作
+const handleCreate = () => {
+  setDialogTile('create')
+}
+
+// 修改操作
+const handleUpdate = async (rowId: number) => {
+  setDialogTile('update')
+  // 设置数据
+  const res = await DataSourceConfiggApi.getDataSourceConfigApi(rowId)
+  unref(formRef)?.setValues(res)
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  // 设置数据
+  const res = await DataSourceConfiggApi.getDataSourceConfigApi(rowId)
+  detailData.value = res
+  setDialogTile('detail')
+}
+
+// 删除操作
+const handleDelete = async (rowId: number) => {
+  await deleteData(xGrid, rowId)
+}
+
+// 提交按钮
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as DataSourceConfiggApi.DataSourceConfigVO
+        if (actionType.value === 'create') {
+          await DataSourceConfiggApi.createDataSourceConfigApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await DataSourceConfiggApi.updateDataSourceConfigApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        dialogVisible.value = false
+      } finally {
+        loading.value = false
+        // 刷新列表
+        await getList(xGrid)
+      }
+    }
+  })
+}
+</script>