From 33f7fc700b55d4f9e3658790d33b0f39a2c281a5 Mon Sep 17 00:00:00 2001
From: "gary.fu" <xuebaiyouling@gmail.com>
Date: Thu, 4 Jan 2024 11:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=B7=B3=E8=BD=AC=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common-table/common-table-column.vue      |  2 +-
 src/services/user/UserService.js              | 13 +++++++--
 src/vendors/axios.js                          | 12 +++++++++
 src/views/tools/TableEdit.vue                 | 27 +++++++++++++++++--
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/components/common-table/common-table-column.vue b/src/components/common-table/common-table-column.vue
index bffed62..58436c8 100644
--- a/src/components/common-table/common-table-column.vue
+++ b/src/components/common-table/common-table-column.vue
@@ -55,7 +55,7 @@ const props = defineProps({
         v-bind="column.linkAttrs"
         @click="column.click(scope.row, scope)"
       >
-        {{ scope.row[column.property] }}
+        {{ column.formatter?column.formatter(scope.row, scope):scope.row[column.property] }}
       </el-link>
       <slot
         v-bind="scope"
diff --git a/src/services/user/UserService.js b/src/services/user/UserService.js
index a34b27d..0a17d7f 100644
--- a/src/services/user/UserService.js
+++ b/src/services/user/UserService.js
@@ -7,14 +7,23 @@
  * @property {string} gender
  * @property {Date} birthday
  */
-import { $httpPost } from '@/vendors/axios'
+import { $httpGet, $httpPost } from '@/vendors/axios'
 
 /**
  * 加载用户数据
- * @return {{success:boolean, message:string,userList: [UserDto]}}
+ * @return {{success:boolean, message:string, resultData: {userList:[UserDto]}}}
  */
 export const loadUsersResult = async (data, config) => {
   const usersResult = await $httpPost('/api/users', data, config)
   console.info('==================', usersResult)
   return usersResult
 }
+/**
+ * 加载用户
+ * @return {{success:boolean, message:string, resultData: {user:UserDto}}}
+ */
+export const loadUserResult = async (id, config) => {
+  const usersResult = await $httpGet(`/api/users/${id}`, config)
+  console.info('==================', usersResult)
+  return usersResult
+}
diff --git a/src/vendors/axios.js b/src/vendors/axios.js
index 71709b7..fefa2ee 100644
--- a/src/vendors/axios.js
+++ b/src/vendors/axios.js
@@ -51,3 +51,15 @@ export const $httpPost = (url, data, config) => {
     }, reject)
   })
 }
+
+export const $httpGet = (url, data, config) => {
+  return new Promise((resolve, reject) => {
+    $http.get(url, config).then(response => {
+      if (response.data) {
+        resolve(response.data) // 只要有数据就认为成功，内容再解析
+      } else {
+        reject(new Error('No response data'))
+      }
+    }, reject)
+  })
+}
diff --git a/src/views/tools/TableEdit.vue b/src/views/tools/TableEdit.vue
index 2d21543..1668c36 100644
--- a/src/views/tools/TableEdit.vue
+++ b/src/views/tools/TableEdit.vue
@@ -1,7 +1,13 @@
 <script setup>
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { loadUserResult } from '@/services/user/UserService'
 
-const userDto = ref({})
+const route = useRoute()
+
+const userDto = ref({
+  id: route.params.id
+})
 /**
  * @type {[CommonFormOption]}
  */
@@ -46,6 +52,23 @@ const userFormOptions = [{
     type: 'textarea'
   }
 }]
+
+const loadUser = async () => {
+  console.info('============', route)
+  const id = route.params.id
+  if (id) {
+    const userResult = await loadUserResult(id)
+    if (userResult.success && userResult.resultData) {
+      const resultData = userResult.resultData
+      userDto.value = resultData.user
+    }
+  }
+}
+
+onMounted(() => {
+  loadUser()
+})
+
 const submitForm = form => {
   form.validate(valid => {
     if (valid) {