From 4a58eb8e035e77b02d526c85e67dcad33a31c640 Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Tue, 28 Feb 2023 14:13:45 +0800
Subject: [PATCH] =?UTF-8?q?types:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/table/types/table.ts           | 23 +++++++++++++----------
 src/views/table/element-plus/index.vue | 10 +++++-----
 src/views/table/vxe-table/index.vue    |  3 ++-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/api/table/types/table.ts b/src/api/table/types/table.ts
index e1dc6e7..e374819 100644
--- a/src/api/table/types/table.ts
+++ b/src/api/table/types/table.ts
@@ -14,20 +14,23 @@ export interface IGetTableRequestData {
   currentPage: number
   /** 查询条数 */
   size: number
-  /** 查询参数 */
+  /** 查询参数：用户名 */
   username?: string
+  /** 查询参数：手机号 */
   phone?: string
 }
 
+export interface IGetTableData {
+  createTime: string
+  email: string
+  id: string
+  phone: string
+  roles: string
+  status: boolean
+  username: string
+}
+
 export type GetTableResponseData = IApiResponseData<{
-  list: {
-    createTime: string
-    email: string
-    id: string
-    phone: string
-    roles: string
-    status: boolean
-    username: string
-  }[]
+  list: IGetTableData[]
   total: number
 }>
diff --git a/src/views/table/element-plus/index.vue b/src/views/table/element-plus/index.vue
index 1157516..3aac9ac 100644
--- a/src/views/table/element-plus/index.vue
+++ b/src/views/table/element-plus/index.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { reactive, ref, watch } from "vue"
 import { createTableDataApi, deleteTableDataApi, updateTableDataApi, getTableDataApi } from "@/api/table"
+import { type IGetTableData } from "@/api/table/types/table"
 import { type FormInstance, type FormRules, ElMessage, ElMessageBox } from "element-plus"
 import { Search, Refresh, CirclePlus, Delete, Download, RefreshRight } from "@element-plus/icons-vue"
 import { usePagination } from "@/hooks/usePagination"
@@ -58,7 +59,7 @@ const resetForm = () => {
 //#endregion
 
 //#region 删
-const handleDelete = (row: any) => {
+const handleDelete = (row: IGetTableData) => {
   ElMessageBox.confirm(`正在删除用户：${row.username}，确认删除？`, "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
@@ -74,16 +75,15 @@ const handleDelete = (row: any) => {
 
 //#region 改
 const currentUpdateId = ref<undefined | string>(undefined)
-const handleUpdate = (row: any) => {
+const handleUpdate = (row: IGetTableData) => {
   currentUpdateId.value = row.id
   formData.username = row.username
-  formData.password = row.password
   dialogVisible.value = true
 }
 //#endregion
 
 //#region 查
-const tableData = ref<any[]>([])
+const tableData = ref<IGetTableData[]>([])
 const searchFormRef = ref<FormInstance | null>(null)
 const searchData = reactive({
   username: "",
@@ -212,7 +212,7 @@ watch([() => paginationData.currentPage, () => paginationData.pageSize], getTabl
         <el-form-item prop="username" label="用户名">
           <el-input v-model="formData.username" placeholder="请输入" />
         </el-form-item>
-        <el-form-item prop="password" label="密码">
+        <el-form-item prop="password" label="密码" v-if="currentUpdateId === undefined">
           <el-input v-model="formData.password" placeholder="请输入" />
         </el-form-item>
       </el-form>
diff --git a/src/views/table/vxe-table/index.vue b/src/views/table/vxe-table/index.vue
index c54dd41..c80e90e 100644
--- a/src/views/table/vxe-table/index.vue
+++ b/src/views/table/vxe-table/index.vue
@@ -2,6 +2,7 @@
 import { nextTick, reactive, ref } from "vue"
 import { type ElMessageBoxOptions, ElMessageBox, ElMessage } from "element-plus"
 import { deleteTableDataApi, getTableDataApi } from "@/api/table"
+import { type GetTableResponseData } from "@/api/table/types/table"
 import RoleColumnSolts from "./tsx/RoleColumnSolts"
 import StatusColumnSolts from "./tsx/StatusColumnSolts"
 import {
@@ -142,7 +143,7 @@ const xGridOpt: VxeGridProps = reactive({
           let total = 0
           let result: IRowMeta[] = []
           /** 加载数据 */
-          const callback = (res: any) => {
+          const callback = (res: GetTableResponseData) => {
             if (res && res.data) {
               const resData = res.data
               // 总数