From 7db04cf06679855672c57fcd3c4e3b4ee2761b92 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 15 Nov 2022 23:44:08 +0800
Subject: [PATCH] refactor: user

---
 .../src/api/system/user/index.ts              |  36 ++-
 .../src/api/system/user/types.ts              |  16 --
 .../src/views/system/user/index.vue           | 180 +++++++-------
 .../src/views/system/user/user.data.ts        | 223 ++++++------------
 4 files changed, 194 insertions(+), 261 deletions(-)
 delete mode 100644 yudao-ui-admin-vue3/src/api/system/user/types.ts

diff --git a/yudao-ui-admin-vue3/src/api/system/user/index.ts b/yudao-ui-admin-vue3/src/api/system/user/index.ts
index 3c989d881..f5324c98c 100644
--- a/yudao-ui-admin-vue3/src/api/system/user/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/user/index.ts
@@ -1,8 +1,38 @@
 import request from '@/config/axios'
-import type { UserVO } from './types'
+export type UserVO = {
+  id: number
+  username: string
+  nickname: string
+  deptId: number
+  postIds: string[]
+  email: string
+  mobile: string
+  sex: number
+  avatar: string
+  loginIp: string
+  status: number
+  remark: string
+  loginDate: string
+  createTime: string
+}
+
+export interface UserPageReqVO extends PageParam {
+  deptId?: number
+  username?: string
+  mobile?: string
+  status?: number
+  createTime?: string[]
+}
+
+export interface UserExportReqVO {
+  code?: string
+  name?: string
+  status?: number
+  createTime?: string[]
+}
 
 // 查询用户管理列表
-export const getUserPageApi = (params) => {
+export const getUserPageApi = (params: UserPageReqVO) => {
   return request.get({ url: '/system/user/page', params })
 }
 
@@ -27,7 +57,7 @@ export const deleteUserApi = (id: number) => {
 }
 
 // 导出用户
-export const exportUserApi = (params) => {
+export const exportUserApi = (params: UserExportReqVO) => {
   return request.download({ url: '/system/user/export', params })
 }
 
diff --git a/yudao-ui-admin-vue3/src/api/system/user/types.ts b/yudao-ui-admin-vue3/src/api/system/user/types.ts
deleted file mode 100644
index 2102bbe99..000000000
--- a/yudao-ui-admin-vue3/src/api/system/user/types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export type UserVO = {
-  id: number
-  username: string
-  nickname: string
-  deptId: number
-  postIds: string[]
-  email: string
-  mobile: string
-  sex: number
-  avatar: string
-  loginIp: string
-  status: number
-  remark: string
-  loginDate: string
-  createTime: string
-}
diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index 522a8efb9..cbdc68ddb 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -20,56 +20,38 @@
         @node-click="handleDeptNodeClick"
       />
     </el-card>
-    <!-- 搜索工作区 -->
     <el-card class="w-4/5 user" style="margin-left: 10px" :gutter="12" shadow="hover">
       <template #header>
         <div class="card-header">
           <span>{{ tableTitle }}</span>
         </div>
       </template>
-      <Search
-        :schema="allSchemas.searchSchema"
-        @search="setSearchParams"
-        @reset="setSearchParams"
-        ref="searchForm"
-      />
-      <!-- 操作工具栏 -->
-      <div class="mb-10px">
-        <XButton
-          type="primary"
-          preIcon="ep:zoom-in"
-          :title="t('action.add')"
-          v-hasPermi="['system:user:create']"
-          @click="handleCreate()"
-        />
-        <XButton
-          type="warning"
-          preIcon="ep:upload"
-          :title="t('action.import')"
-          v-hasPermi="['system:user:import']"
-          @click="importDialogVisible = true"
-        />
-        <XButton
-          type="warning"
-          preIcon="ep:download"
-          :title="t('action.export')"
-          v-hasPermi="['system:user:export']"
-          @click="exportList('用户数据.xls')"
-        />
-      </div>
       <!-- 列表 -->
-      <Table
-        :columns="allSchemas.tableColumns"
-        :selection="false"
-        :data="tableObject.tableList"
-        :loading="tableObject.loading"
-        :pagination="{
-          total: tableObject.total
-        }"
-        v-model:pageSize="tableObject.pageSize"
-        v-model:currentPage="tableObject.currentPage"
-        @register="register"
-      >
+      <vxe-grid ref="xGrid" v-bind="gridOptions" class="xtable-scrollbar">
+        <!-- 操作：新增 -->
+        <template #toolbar_buttons>
+          <XButton
+            type="primary"
+            preIcon="ep:zoom-in"
+            :title="t('action.add')"
+            v-hasPermi="['system:user:create']"
+            @click="handleCreate()"
+          />
+          <XButton
+            type="warning"
+            preIcon="ep:upload"
+            :title="t('action.import')"
+            v-hasPermi="['system:user:import']"
+            @click="importDialogVisible = true"
+          />
+          <XButton
+            type="warning"
+            preIcon="ep:download"
+            :title="t('action.export')"
+            v-hasPermi="['system:user:export']"
+            @click="exportList('用户数据.xls')"
+          />
+        </template>
         <template #status="{ row }">
           <el-switch
             v-model="row.status"
@@ -78,10 +60,7 @@
             @change="handleStatusChange(row)"
           />
         </template>
-        <template #loginDate="{ row }">
-          <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
-        </template>
-        <template #action="{ row }">
+        <template #actionbtns_default="{ row }">
           <XTextButton
             preIcon="ep:edit"
             :title="t('action.edit')"
@@ -112,10 +91,10 @@
             preIcon="ep:delete"
             :title="t('action.del')"
             v-hasPermi="['system:user:delete']"
-            @click="delList(row.id, false)"
+            @click="handleDelete(row.id)"
           />
         </template>
-      </Table>
+      </vxe-grid>
     </el-card>
   </div>
   <XModal v-model="dialogVisible" :title="dialogTitle">
@@ -150,7 +129,7 @@
     <Descriptions
       v-if="actionType === 'detail'"
       :schema="allSchemas.detailSchema"
-      :data="detailRef"
+      :data="detailData"
     >
       <template #deptId="{ row }">
         <span>{{ row.dept?.name }}</span>
@@ -200,10 +179,16 @@
     </el-form>
     <!-- 操作按钮 -->
     <template #footer>
-      <el-button type="primary" :loading="loading" @click="submitRole">
-        {{ t('action.save') }}
-      </el-button>
-      <el-button @click="roleDialogVisible = false">{{ t('dialog.close') }}</el-button>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="loading"
+        @click="submitRole()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :title="t('dialog.close')" @click="roleDialogVisible = false" />
     </template>
   </XModal>
   <!-- 导入 -->
@@ -244,17 +229,20 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button type="primary" @click="submitFileForm">
-        <Icon icon="ep:upload-filled" />
-        {{ t('action.save') }}
-      </el-button>
-      <el-button @click="importDialogVisible = false">{{ t('dialog.close') }}</el-button>
+      <!-- 按钮：保存 -->
+      <XButton
+        type="warning"
+        preIcon="ep:upload-filled"
+        :title="t('action.save')"
+        @click="submitFileForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :title="t('dialog.close')" @click="importDialogVisible = false" />
     </template>
   </XModal>
 </template>
 <script setup lang="ts">
-import { nextTick, onMounted, reactive, ref, unref, watch } from 'vue'
-import dayjs from 'dayjs'
+import { onMounted, reactive, ref, unref, watch } from 'vue'
 import {
   ElTag,
   ElInput,
@@ -274,9 +262,7 @@ import {
 } from 'element-plus'
 import { handleTree } from '@/utils/tree'
 import { useI18n } from '@/hooks/web/useI18n'
-import { useTable } from '@/hooks/web/useTable'
 import { FormExpose } from '@/components/Form'
-import type { UserVO } from '@/api/system/user/types'
 import type { PostVO } from '@/api/system/post'
 import type { PermissionAssignUserRoleReqVO } from '@/api/system/permission/types'
 import { listSimpleDeptApi } from '@/api/system/dept'
@@ -290,29 +276,31 @@ import { useRouter } from 'vue-router'
 import { CommonStatusEnum } from '@/utils/constants'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import { useMessage } from '@/hooks/web/useMessage'
+import { VxeGridInstance } from 'vxe-table'
+import { useVxeGrid } from '@/hooks/web/useVxeGrid'
 
-const message = useMessage()
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
 
 const defaultProps = {
   children: 'children',
   label: 'name',
   value: 'id'
 }
-const { t } = useI18n() // 国际化
 
 // ========== 列表相关 ==========
 const tableTitle = ref('用户列表')
-const { register, tableObject, methods } = useTable<UserVO>({
+// 列表相关的变量
+const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
+const { gridOptions, reloadList, delList, exportList, getSearchData } = useVxeGrid<UserApi.UserVO>({
+  allSchemas: allSchemas,
   getListApi: UserApi.getUserPageApi,
   delListApi: UserApi.deleteUserApi,
   exportListApi: UserApi.exportUserApi
 })
-const { getList, setSearchParams, delList, exportList } = methods
-
 // ========== 创建部门树结构 ==========
 const filterText = ref('')
 const deptOptions = ref<any[]>([]) // 树形结构
-const searchForm = ref<FormExpose>()
 const treeRef = ref<InstanceType<typeof ElTree>>()
 const getTree = async () => {
   const res = await listSimpleDeptApi()
@@ -322,12 +310,14 @@ const filterNode = (value: string, data: Tree) => {
   if (!value) return true
   return data.name.includes(value)
 }
-const handleDeptNodeClick = (data: { [key: string]: any }) => {
-  tableObject.params = {
-    deptId: data.id
-  }
-  tableTitle.value = data.name
-  methods.getList()
+const handleDeptNodeClick = async (row: { [key: string]: any }) => {
+  tableTitle.value = row.name
+  console.log(getSearchData(xGrid))
+  // gridOptions.formConfig?.data.push({
+  //   deptId: row.id
+  // })
+  // TODO 查询
+  await reloadList(xGrid)
 }
 const { push } = useRouter()
 const handleDeptEdit = () => {
@@ -366,8 +356,6 @@ const handleCreate = async () => {
   dialogVisible.value = true
   dialogTitle.value = t('action.create')
   actionType.value = 'create'
-  await nextTick()
-  unref(formRef)?.getElFormRef().resetFields()
 }
 
 // 修改操作
@@ -381,13 +369,24 @@ const handleUpdate = async (rowId: number) => {
   postIds.value = res.postIds
   unref(formRef)?.setValues(res)
 }
+const detailData = ref()
 
+// 详情操作
+const handleDetail = async (row: UserApi.UserVO) => {
+  // 设置数据
+  detailData.value = row
+  await setDialogTile('detail')
+}
+// 删除操作
+const handleDelete = async (rowId: number) => {
+  await delList(xGrid, rowId)
+}
 // 提交按钮
 const submitForm = async () => {
   loading.value = true
   // 提交请求
   try {
-    const data = unref(formRef)?.formModel as UserVO
+    const data = unref(formRef)?.formModel as UserApi.UserVO
     data.deptId = deptId.value
     data.postIds = postIds.value
     if (actionType.value === 'create') {
@@ -397,15 +396,15 @@ const submitForm = async () => {
       await UserApi.updateUserApi(data)
       message.success(t('common.updateSuccess'))
     }
-    // 操作成功，重新加载列表
     dialogVisible.value = false
-    await getList()
   } finally {
     loading.value = false
+    // 刷新列表
+    reloadList(xGrid)
   }
 }
 // 改变用户状态操作
-const handleStatusChange = async (row: UserVO) => {
+const handleStatusChange = async (row: UserApi.UserVO) => {
   const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
   message
     .confirm('确认要"' + text + '""' + row.username + '"用户吗?', t('common.reminder'))
@@ -414,7 +413,8 @@ const handleStatusChange = async (row: UserVO) => {
         row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.ENABLE : CommonStatusEnum.DISABLE
       await UserApi.updateUserStatusApi(row.id, row.status)
       message.success(text + '成功')
-      await getList()
+      // 刷新列表
+      reloadList(xGrid)
     })
     .catch(() => {
       row.status =
@@ -422,7 +422,7 @@ const handleStatusChange = async (row: UserVO) => {
     })
 }
 // 重置密码
-const handleResetPwd = (row: UserVO) => {
+const handleResetPwd = (row: UserApi.UserVO) => {
   message.prompt('请输入"' + row.username + '"的新密码', t('common.reminder')).then(({ value }) => {
     UserApi.resetUserPwdApi(row.id, value).then(() => {
       message.success('修改成功，新密码是：' + value)
@@ -438,7 +438,7 @@ const userRole = reactive({
   nickname: '',
   roleIds: []
 })
-const handleRole = async (row: UserVO) => {
+const handleRole = async (row: UserApi.UserVO) => {
   userRole.id = row.id
   userRole.username = row.username
   userRole.nickname = row.nickname
@@ -460,15 +460,6 @@ const submitRole = async () => {
   message.success(t('common.updateSuccess'))
   roleDialogVisible.value = false
 }
-// ========== 详情相关 ==========
-const detailRef = ref()
-
-// 详情操作
-const handleDetail = async (row: UserVO) => {
-  // 设置数据
-  detailRef.value = row
-  await setDialogTile('detail')
-}
 // ========== 导入相关 ==========
 const importDialogVisible = ref(false)
 const uploadDisabled = ref(false)
@@ -523,7 +514,7 @@ const handleFileSuccess = (response: any): void => {
     text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
   }
   message.alert(text)
-  getList()
+  reloadList(xGrid)
 }
 // 文件数超出提示
 const handleExceed = (): void => {
@@ -536,7 +527,6 @@ const excelUploadError = (): void => {
 // ========== 初始化 ==========
 onMounted(async () => {
   await getPostOptions()
-  await getList()
   await getTree()
 })
 </script>
diff --git a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
index 4d83c6f7b..9637b72fe 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
@@ -2,7 +2,7 @@ import { reactive } from 'vue'
 import { required } from '@/utils/formRules'
 import { useI18n } from '@/hooks/web/useI18n'
 import { DICT_TYPE } from '@/utils/dict'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
 // 国际化
 const { t } = useI18n()
 // 表单校验
@@ -21,157 +21,86 @@ export const rules = reactive({
   ]
 })
 // crudSchemas
-const crudSchemas = reactive<CrudSchema[]>([
-  {
-    label: t('common.index'),
-    field: 'id',
-    type: 'index',
-    form: {
-      show: false
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id',
+  primaryType: 'seq',
+  action: true,
+  actionWidth: '400px',
+  columns: [
+    {
+      title: '用户账号',
+      field: 'username',
+      isSearch: true
     },
-    detail: {
-      show: false
-    }
-  },
-  {
-    label: '用户账号',
-    field: 'username',
-    search: {
-      show: true
-    }
-  },
-  {
-    label: '用户密码',
-    field: 'password',
-    form: {
-      component: 'InputPassword'
+    {
+      title: '用户密码',
+      field: 'password',
+      form: {
+        component: 'InputPassword'
+      },
+      isDetail: false
     },
-    detail: {
-      show: false
-    }
-  },
-  {
-    label: '用户昵称',
-    field: 'nickname'
-  },
-  {
-    label: '用户邮箱',
-    field: 'email'
-  },
-  {
-    label: '手机号码',
-    field: 'mobile',
-    search: {
-      show: true
-    }
-  },
-  {
-    label: '部门',
-    field: 'deptId',
-    table: {
-      show: false
-    }
-  },
-  {
-    label: '岗位',
-    field: 'postIds',
-    table: {
-      show: false
-    }
-  },
-  {
-    label: t('common.status'),
-    field: 'status',
-    dictType: DICT_TYPE.COMMON_STATUS,
-    search: {
-      show: true
-    }
-  },
-  {
-    label: '最后登录时间',
-    field: 'loginDate',
-    form: {
-      show: false
-    }
-  },
-  {
-    label: '最后登录IP',
-    field: 'loginIp',
-    table: {
-      show: false
+    {
+      title: '用户昵称',
+      field: 'nickname'
     },
-    form: {
-      show: false
-    }
-  },
-  {
-    label: t('form.remark'),
-    field: 'remark',
-    table: {
-      show: false
-    }
-  },
-  {
-    label: t('common.createTime'),
-    field: 'createTime',
-    table: {
-      show: false
+    {
+      title: '用户邮箱',
+      field: 'email'
     },
-    form: {
-      show: false
+    {
+      title: '手机号码',
+      field: 'mobile',
+      isSearch: true
     },
-    detail: {
-      show: false
+    {
+      title: '部门',
+      field: 'deptId',
+      isTable: false,
+      search: {
+        visible: 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)],
-        shortcuts: [
-          {
-            text: '近一周',
-            value: () => {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              return [start, end]
-            }
-          },
-          {
-            text: '近一个月',
-            value: () => {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-              return [start, end]
-            }
-          },
-          {
-            text: '近三个月',
-            value: () => {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-              return [start, end]
-            }
-          }
-        ]
+    {
+      title: '岗位',
+      field: 'postIds',
+      isTable: false
+    },
+    {
+      title: t('common.status'),
+      field: 'status',
+      dictType: DICT_TYPE.COMMON_STATUS,
+      isSearch: true
+    },
+    {
+      title: '最后登录时间',
+      field: 'loginDate',
+      isForm: false
+    },
+    {
+      title: '最后登录IP',
+      field: 'loginIp',
+      isTable: false,
+      isForm: false
+    },
+    {
+      title: t('form.remark'),
+      field: 'remark',
+      isTable: false
+    },
+    {
+      title: t('common.createTime'),
+      field: 'createTime',
+      formatter: 'formatDate',
+      isTable: false,
+      isForm: false,
+      search: {
+        show: true,
+        itemRender: {
+          name: 'XDataTimePicker'
+        }
       }
     }
-  },
-  {
-    field: 'action',
-    width: '400px',
-    label: t('table.action'),
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
-    }
-  }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)