diff --git a/src/components/AnTable/components/column.tsx b/src/components/AnTable/components/column.tsx index 1fa1c2f..385d070 100644 --- a/src/components/AnTable/components/column.tsx +++ b/src/components/AnTable/components/column.tsx @@ -1,16 +1,19 @@ import { dayjs } from '@/libs/dayjs'; import { TableColumn } from '../hooks/useTableColumn'; +import { Avatar } from '@arco-design/web-vue'; export function useUpdateColumn(extra: TableColumn = {}): TableColumn { return { - title: '更新', + title: '修改', dataIndex: 'createdAt', width: 180, render: ({ record }) => ( -
- {record.updatedBy ?? '无'} - - 更新于 {dayjs(record.updatedAt).fromNow()} +
+ + {record.updatedBy?.[0] ?? '无'} + + + {dayjs(record.updatedAt).fromNow()}
), @@ -24,10 +27,12 @@ export function useCreateColumn(extra: TableColumn = {}): TableColumn { dataIndex: 'createdAt', width: 180, render: ({ record }) => ( -
- {record.createdBy ?? '无'} +
+ + {record.createdBy?.[0] ?? '无'} + - 创建于 {dayjs(record.createdAt).fromNow()} + {dayjs(record.createdAt).fromNow()}
), diff --git a/src/pages/setting/common/index.vue b/src/pages/setting/common/index.vue index 5a8d301..977d6b4 100644 --- a/src/pages/setting/common/index.vue +++ b/src/pages/setting/common/index.vue @@ -2,9 +2,9 @@

常规设置

-

首次为你的帐户添加密码时,你需要前往密码重置页面,以便我们验证你的身份。

+

首次为你的帐户添加密码时,你需要前往密码重置页面,以便我们验证你的身份。

- + @@ -14,7 +14,7 @@ - + - + - + - + 保存修改 diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue index 3e0fecd..4e63259 100644 --- a/src/pages/setting/index.vue +++ b/src/pages/setting/index.vue @@ -5,7 +5,7 @@ { "redirect": "/setting/common", - "component": null, + // "component": null, "meta": { "sort": 30401, "title": "系统设置", diff --git a/src/pages/setting/mail/index.vue b/src/pages/setting/mail/index.vue index 71a0ea5..467ca51 100644 --- a/src/pages/setting/mail/index.vue +++ b/src/pages/setting/mail/index.vue @@ -1,12 +1,30 @@ diff --git a/src/pages/system/user/index.vue b/src/pages/system/user/index.vue index a334707..9bc4e53 100644 --- a/src/pages/system/user/index.vue +++ b/src/pages/system/user/index.vue @@ -37,19 +37,9 @@ const usernameRender: TableColumnRender = ({ record }) => (
- {record.nickname} - @{record.username} -
-
- - - contact@juetan.cn - - - - 1591234568 - + {record.nickname}
+
); @@ -62,11 +52,15 @@ const { component: UserTable } = useTable({ render: usernameRender, }, { - ...useCreateColumn(), - }, - { - ...useUpdateColumn(), + title: '创建', + render: () => '3 天前' }, + // { + // ...useCreateColumn(), + // }, + // { + // ...useUpdateColumn(), + // }, { title: '操作', type: 'button', diff --git a/src/styles/css-arco.less b/src/styles/css-arco.less index 61faa7b..c93ac3a 100644 --- a/src/styles/css-arco.less +++ b/src/styles/css-arco.less @@ -163,7 +163,7 @@ body { .col-form { .arco-form-item-wrapper-col { - flex-direction: row; + // flex-direction: row; } .arco-form-item-content-wrapper { width: 450px;