From 5725d4862b4b7523f7efd47d133b9a3524443ea8 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 17 Nov 2022 23:05:39 +0800
Subject: [PATCH] perf: dept

---
 .../src/hooks/web/useVxeGrid.ts               |  1 -
 .../src/views/system/dept/dept.data.ts        |  7 ++++-
 .../src/views/system/dept/index.vue           | 29 ++++++++++---------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
index 54a023c19..ac7ad6c6d 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
@@ -42,7 +42,6 @@ export const useVxeGrid = <T = any>(config?: UseVxeGridConfig<T>) => {
   /**
    * grid options 初始化
    */
-  console.info(config?.allSchemas.tableSchema)
   const gridOptions = reactive<VxeGridProps>({
     loading: true,
     size: currentSize as any,
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
index 61e370839..f8898030c 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
@@ -42,7 +42,12 @@ const crudSchemas = reactive<VxeCrudSchema>({
     },
     {
       title: '负责人',
-      field: 'leaderUserId'
+      field: 'leaderUserId',
+      table: {
+        slots: {
+          default: 'leaderUserId_default'
+        }
+      }
     },
     {
       title: '联系电话',
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/index.vue b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
index c92dbb656..2c91c2c7b 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
@@ -14,6 +14,9 @@
         <XButton title="展开所有" @click="xGrid?.setAllTreeExpand(true)" />
         <XButton title="关闭所有" @click="xGrid?.clearTreeExpand()" />
       </template>
+      <template #leaderUserId_default="{ row }">
+        <span>{{ userNicknameFormat(row) }}</span>
+      </template>
       <template #actionbtns_default="{ row }">
         <!-- 操作：修改 -->
         <XTextButton
@@ -200,21 +203,21 @@ const handleDelete = async (rowId: number) => {
   await deleteData(xGrid, rowId)
 }
 
-//const userNicknameFormat = (row) => {
-//  if (!row && !row.row && !row.row.leaderUserId) {
-//    return '未设置'
-//  }
-//  for (const user of userOption.value) {
-//    if (row.row.leaderUserId === user.id) {
-//      return user.nickname
-//    }
-//  }
-//  return '未知【' + row.row.leaderUserId + '】'
-//}
-//
+const userNicknameFormat = (row) => {
+  if (!row || !row.leaderUserId || row.leaderUserId == null) {
+    return '未设置'
+  }
+  for (const user of userOption.value) {
+    if (row.leaderUserId === user.id) {
+      return user.nickname
+    }
+  }
+  return '未知【' + row.leaderUserId + '】'
+}
+
 // ========== 初始化 ==========
 onMounted(async () => {
-  await getTree()
   await getUserList()
+  await getTree()
 })
 </script>