From 70b8dcb1741d362371d2d04b9009e98fc922a3c7 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Tue, 15 Nov 2022 17:05:05 +0800
Subject: [PATCH] refactor: Descriptions
---
.../src/hooks/web/useCrudSchemas.ts | 8 ++++++++
yudao-ui-admin-vue3/src/views/bpm/form/index.vue | 9 +--------
.../src/views/bpm/group/index.vue | 6 ------
.../src/views/bpm/model/index.vue | 6 +-----
.../src/views/bpm/processInstance/index.vue | 9 +--------
.../src/views/infra/apiAccessLog/index.vue | 6 ------
.../src/views/infra/apiErrorLog/index.vue | 12 +-----------
.../src/views/infra/config/index.vue | 6 ------
.../src/views/infra/dataSourceConfig/index.vue | 6 +-----
.../src/views/infra/fileConfig/index.vue | 12 +-----------
.../src/views/infra/fileList/index.vue | 3 ---
.../src/views/infra/job/JobLog.vue | 3 ---
.../src/views/infra/job/index.vue | 3 ---
yudao-ui-admin-vue3/src/views/pay/app/index.vue | 9 +--------
.../src/views/pay/merchant/index.vue | 9 +--------
.../src/views/pay/order/index.vue | 10 +---------
.../src/views/pay/refund/index.vue | 9 +--------
.../src/views/system/role/index.vue | 14 ++------------
.../src/views/system/sensitiveWord/index.vue | 9 +--------
.../src/views/system/sms/smsChannel/index.vue | 12 +-----------
.../src/views/system/sms/smsLog/index.vue | 12 +-----------
.../src/views/system/sms/smsTemplate/index.vue | 12 +-----------
.../src/views/system/tenant/index.vue | 9 ---------
.../src/views/system/user/index.vue | 16 ++--------------
24 files changed, 26 insertions(+), 184 deletions(-)
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
index 57d0f8131..5043097f1 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
@@ -183,6 +183,14 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
field: schemaItem.field,
label: schemaItem.detail?.label || schemaItem.label
}
+ if (schemaItem.dictType) {
+ descriptionsSchemaItem.dictType = schemaItem.dictType
+ }
+ if (schemaItem.detail?.dateFormat || schemaItem.formatter == 'formatDate') {
+ descriptionsSchemaItem.dateFormat = schemaItem.dateFormat
+ ? schemaItem?.detail?.dateFormat
+ : 'YYYY-MM-DD HH:mm:ss'
+ }
// 删除不必要的字段
delete descriptionsSchemaItem.show
diff --git a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue
index 812aa2133..7a4b8a00c 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue
@@ -149,14 +149,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/bpm/group/index.vue b/yudao-ui-admin-vue3/src/views/bpm/group/index.vue
index f02fc4262..83dc33b06 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/group/index.vue
@@ -205,12 +205,6 @@ onMounted(async () => {
{{ getUserNickName(userId) + ' ' }}
</span>
</template>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
</Descriptions>
<!-- 操作按钮 -->
<template #footer>
diff --git a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
index 9c67ea1b6..38569d867 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
@@ -199,11 +199,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
index 37d401b28..fe06428a9 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
@@ -105,14 +105,7 @@ getList()
<XModal v-model="dialogVisible" :title="t('action.detail')">
<!-- 对话框(详情) -->
- <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" />
<!-- 操作按钮 -->
<template #footer>
<el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
index 4b3268953..fa8317905 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
@@ -78,12 +78,6 @@ getList()
<XModal v-model="dialogVisible" :title="dialogTitle">
<!-- 对话框(详情) -->
<Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
- <template #userType="{ row }">
- <DictTag :type="DICT_TYPE.USER_TYPE" :value="row.userType" />
- </template>
- <template #beginTime="{ row }">
- <span>{{ dayjs(row.beginTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
<template #duration="{ row }">
<span>{{ row.duration + 'ms' }}</span>
</template>
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
index 35de38fd9..d5f14eb49 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
@@ -116,17 +116,7 @@ getList()
<XModal v-model="dialogVisible" :title="dialogTitle">
<!-- 对话框(详情) -->
- <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
- <template #userType="{ row }">
- <DictTag :type="DICT_TYPE.USER_TYPE" :value="row.userType" />
- </template>
- <template #processStatus="{ row }">
- <DictTag :type="DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS" :value="row.processStatus" />
- </template>
- <template #exceptionTime="{ row }">
- <span>{{ dayjs(row.exceptionTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" />
<!-- 操作按钮 -->
<template #footer>
<el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
diff --git a/yudao-ui-admin-vue3/src/views/infra/config/index.vue b/yudao-ui-admin-vue3/src/views/infra/config/index.vue
index 39cdb6300..23f0f80a4 100644
--- a/yudao-ui-admin-vue3/src/views/infra/config/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/config/index.vue
@@ -175,12 +175,6 @@ getList()
<template #visible="{ row }">
<span>{{ row.visible ? '是' : '否' }} </span>
</template>
- <template #type="{ row }">
- <DictTag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="row.type" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
</Descriptions>
<!-- 操作按钮 -->
<template #footer>
diff --git a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
index 61907b042..d93efb281 100644
--- a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
@@ -144,11 +144,7 @@ onMounted(async () => {
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #createTime="{ row }">
- <span>{{ row.createTime ? dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
index caf0e0cb8..8e93c9d2c 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
@@ -189,17 +189,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #storage="{ row }">
- <DictTag :type="DICT_TYPE.INFRA_FILE_STORAGE" :value="row.storage" />
- </template>
- <template #primary="{ row }">
- <DictTag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="row.master" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
index 07237dc66..e063fb24a 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
@@ -161,9 +161,6 @@ getList()
/>
<span>{{ row.url }}</span>
</template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
</Descriptions>
<!-- 操作按钮 -->
<template #footer>
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
index f4175be58..684dc4ab8 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
@@ -98,9 +98,6 @@ onMounted(() => {
<XModal v-model="dialogVisible" :title="dialogTitle">
<!-- 对话框(详情) -->
<Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.INFRA_JOB_LOG_STATUS" :value="row.status" />
- </template>
<template #retryInterval="{ row }">
<span>{{ row.retryInterval + '毫秒' }} </span>
</template>
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/index.vue b/yudao-ui-admin-vue3/src/views/infra/job/index.vue
index 075eed174..5c3e72ab9 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/job/index.vue
@@ -226,9 +226,6 @@ getList()
:schema="allSchemas.detailSchema"
:data="detailRef"
>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.INFRA_JOB_STATUS" :value="row.status" />
- </template>
<template #retryInterval="{ row }">
<span>{{ row.retryInterval + '毫秒' }} </span>
</template>
diff --git a/yudao-ui-admin-vue3/src/views/pay/app/index.vue b/yudao-ui-admin-vue3/src/views/pay/app/index.vue
index 87ca218e7..e5ec83383 100644
--- a/yudao-ui-admin-vue3/src/views/pay/app/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/app/index.vue
@@ -168,14 +168,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
index aaa3a12fd..e2e1ee728 100644
--- a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
@@ -168,14 +168,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/pay/order/index.vue b/yudao-ui-admin-vue3/src/views/pay/order/index.vue
index 2c3370fba..d0c49f8b1 100644
--- a/yudao-ui-admin-vue3/src/views/pay/order/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/order/index.vue
@@ -1,6 +1,5 @@
<script setup lang="ts">
import { ref, unref } from 'vue'
-import dayjs from 'dayjs'
import { ElMessage } from 'element-plus'
import { DICT_TYPE } from '@/utils/dict'
import { useTable } from '@/hooks/web/useTable'
@@ -153,14 +152,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/pay/refund/index.vue b/yudao-ui-admin-vue3/src/views/pay/refund/index.vue
index 01298de40..2eb32c3dc 100644
--- a/yudao-ui-admin-vue3/src/views/pay/refund/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/refund/index.vue
@@ -95,14 +95,7 @@ getList()
<XModal v-model="dialogVisible" :title="dialogTitle">
<!-- 对话框(详情) -->
- <Descriptions :schema="allSchemas.detailSchema" :data="detailRef">
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ <Descriptions :schema="allSchemas.detailSchema" :data="detailRef" />
<!-- 操作按钮 -->
<template #footer>
<el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
diff --git a/yudao-ui-admin-vue3/src/views/system/role/index.vue b/yudao-ui-admin-vue3/src/views/system/role/index.vue
index 014bf0c16..b46a00bda 100644
--- a/yudao-ui-admin-vue3/src/views/system/role/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/role/index.vue
@@ -276,17 +276,7 @@ onMounted(() => {
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #type="{ row }">
- <DictTag :type="DICT_TYPE.SYSTEM_ROLE_TYPE" :value="row.type" />
- </template>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
@@ -300,7 +290,7 @@ onMounted(() => {
<el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
</template>
</XModal>
- <XModal v-model="dialogScopeVisible" :title="dialogScopeTitle" max-height="600px">
+ <XModal v-model="dialogScopeVisible" :title="dialogScopeTitle">
<el-form :model="dataScopeForm">
<el-form-item label="角色名称">
<el-input v-model="dataScopeForm.name" :disabled="true" />
diff --git a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
index d6111d856..1a1902208 100644
--- a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
@@ -193,14 +193,7 @@ onMounted(async () => {
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
index 3c9b47317..42dd723bf 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
@@ -162,17 +162,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #code="{ row }">
- <DictTag :type="DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE" :value="row.code" />
- </template>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
index 5dd2db576..aadf84972 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
@@ -80,17 +80,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #code="{ row }">
- <DictTag :type="DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE" :value="row.code" />
- </template>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
index 9dc7cd9a5..61b7ec37d 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
@@ -210,17 +210,7 @@ getList()
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailRef"
- >
- <template #type="{ row }">
- <DictTag :type="DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE" :value="row.code" />
- </template>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- </Descriptions>
+ />
<!-- 操作按钮 -->
<template #footer>
<el-button
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
index 31cacdddb..4f3032ab3 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
@@ -218,19 +218,10 @@ onMounted(async () => {
:schema="allSchemas.detailSchema"
:data="detailRef"
>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
<template #packageId="{ row }">
<el-tag v-if="row.packageId === 0" type="danger">系统租户</el-tag>
<el-tag v-else type="success"> {{ getPackageName(row.packageId) }} </el-tag>
</template>
- <template #expireTime="{ row }">
- <span>{{ dayjs(row.expireTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
- <template #createTime="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
</Descriptions>
<!-- 操作按钮 -->
<template #footer>
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 c2bcb2604..f51de1184 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -19,7 +19,6 @@ import {
UploadRawFile
} from 'element-plus'
import { handleTree } from '@/utils/tree'
-import { DICT_TYPE } from '@/utils/dict'
import { useI18n } from '@/hooks/web/useI18n'
import { useTable } from '@/hooks/web/useTable'
import { FormExpose } from '@/components/Form'
@@ -457,12 +456,6 @@ onMounted(async () => {
</template>
</el-tag>
</template>
- <template #status="{ row }">
- <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
- </template>
- <template #loginDate="{ row }">
- <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
- </template>
</Descriptions>
<!-- 操作按钮 -->
<template #footer>
@@ -478,7 +471,7 @@ onMounted(async () => {
</template>
</XModal>
<!-- 分配用户角色 -->
- <XModal v-model="roleDialogVisible" title="分配角色" maxHeight="450px">
+ <XModal v-model="roleDialogVisible" title="分配角色">
<el-form :model="userRole" label-width="80px">
<el-form-item label="用户名称">
<el-input v-model="userRole.username" :disabled="true" />
@@ -507,12 +500,7 @@ onMounted(async () => {
</template>
</XModal>
<!-- 导入 -->
- <XModal
- v-model="importDialogVisible"
- :title="importDialogTitle"
- :destroy-on-close="true"
- maxHeight="350px"
- >
+ <XModal v-model="importDialogVisible" :title="importDialogTitle">
<el-form class="drawer-multiColumn-form" label-width="150px">
<el-form-item label="模板下载 :">
<el-button type="primary" @click="handleImportTemp">