From a1292fbf0ab3f212e533b32c44f974c94680d958 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 11 Mar 2023 17:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E5=BE=AE=E8=B0=83?=
 =?UTF-8?q?=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90=E8=8F=9C=E5=8D=95=E3=80=91?=
 =?UTF-8?q?=E7=9A=84=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/infra/config/index.ts              | 9 +--------
 src/views/infra/dataSourceConfig/form.vue  | 6 ++----
 src/views/infra/dataSourceConfig/index.vue | 8 ++++++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts
index c6d3772e..07fb52fd 100644
--- a/src/api/infra/config/index.ts
+++ b/src/api/infra/config/index.ts
@@ -12,13 +12,6 @@ export interface ConfigVO {
   createTime: Date
 }
 
-export interface ConfigExportReqVO {
-  name?: string
-  key?: string
-  type?: number
-  createTime?: Date[]
-}
-
 // 查询参数列表
 export const getConfigPage = (params: PageParam) => {
   return request.get({ url: '/infra/config/page', params })
@@ -50,6 +43,6 @@ export const deleteConfig = (id: number) => {
 }
 
 // 导出参数
-export const exportConfigApi = (params: ConfigExportReqVO) => {
+export const exportConfigApi = (params) => {
   return request.download({ url: '/infra/config/export', params })
 }
diff --git a/src/views/infra/dataSourceConfig/form.vue b/src/views/infra/dataSourceConfig/form.vue
index e0cac78b..b050a1c8 100644
--- a/src/views/infra/dataSourceConfig/form.vue
+++ b/src/views/infra/dataSourceConfig/form.vue
@@ -31,8 +31,6 @@
 <script setup lang="ts">
 import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
 import { DataSourceConfigVO } from '@/api/infra/dataSourceConfig'
-import { isNullOrUnDef } from '@/utils/is'
-import { omit } from 'lodash-es'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -63,7 +61,7 @@ const openModal = async (type: string, id?: number) => {
   formType.value = type
   resetForm()
   // 修改时，设置数据
-  if (!isNullOrUnDef(id)) {
+  if (id) {
     formLoading.value = true
     try {
       formData.value = await DataSourceConfigApi.getDataSourceConfig(id)
@@ -84,7 +82,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = omit(unref(formData), 'createTime')
+    const data = formData.value as DataSourceConfigApi.DataSourceConfigVO
     if (formType.value === 'create') {
       await DataSourceConfigApi.createDataSourceConfig(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue
index 2138033e..ff44cdd5 100644
--- a/src/views/infra/dataSourceConfig/index.vue
+++ b/src/views/infra/dataSourceConfig/index.vue
@@ -1,7 +1,7 @@
 <template>
   <content-wrap>
     <!-- 搜索工作栏 -->
-    <el-form :inline="true" label-width="68px">
+    <el-form class="-mb-15px" :inline="true">
       <el-form-item>
         <el-button
           type="primary"
@@ -12,8 +12,10 @@
         </el-button>
       </el-form-item>
     </el-form>
+  </content-wrap>
 
-    <!-- 列表 -->
+  <!-- 列表 -->
+  <content-wrap>
     <el-table v-loading="loading" :data="list" align="center">
       <el-table-column label="主键编号" align="center" prop="id" />
       <el-table-column label="数据源名称" align="center" prop="name" />
@@ -33,6 +35,7 @@
             type="primary"
             @click="openModal('update', scope.row.id)"
             v-hasPermi="['infra:data-source-config:update']"
+            :disabled="scope.row.id === 0"
           >
             编辑
           </el-button>
@@ -41,6 +44,7 @@
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['infra:data-source-config:delete']"
+            :disabled="scope.row.id === 0"
           >
             删除
           </el-button>