refactor: Descriptions

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

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

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>

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

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">
+    <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>
     <!-- 操作按钮 -->
     <template #footer>
       <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>

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>

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">
+    <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>
     <!-- 操作按钮 -->
     <template #footer>
       <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>

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>

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

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

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>

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>

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>

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

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

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

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">
+    <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>
     <!-- 操作按钮 -->
     <template #footer>
       <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>

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" />

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

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

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>

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

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>

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
+  <XModal v-model="importDialogVisible" :title="importDialogTitle">
-    v-model="importDialogVisible"
-    :title="importDialogTitle"
-    :destroy-on-close="true"
-    maxHeight="350px"
-  >
     <el-form class="drawer-multiColumn-form" label-width="150px">
       <el-form-item label="模板下载 :">
         <el-button type="primary" @click="handleImportTemp">