diff --git a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue index dcac73c0d..b09c1bf29 100644 --- a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue +++ b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue @@ -3,7 +3,7 @@ import type { InfraApiAccessLogApi } from '#/api/infra/api-access-log'; import { ref } from 'vue'; -import { useVbenModal } from '@vben/common-ui'; +import { JsonViewer, useVbenModal } from '@vben/common-ui'; import { formatDateTime } from '@vben/utils'; import { Descriptions } from 'ant-design-vue'; @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ {{ formData?.requestMethod }} {{ formData?.requestUrl }} - {{ formData?.requestParams }} + {{ formData?.responseBody }} diff --git a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue index 9b9257c34..ff5aba82e 100644 --- a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue +++ b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue @@ -3,10 +3,10 @@ import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log'; import { ref } from 'vue'; -import { useVbenModal } from '@vben/common-ui'; +import { JsonViewer, useVbenModal } from '@vben/common-ui'; import { formatDateTime } from '@vben/utils'; -import { Descriptions, Input } from 'ant-design-vue'; +import { Descriptions } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; import { DICT_TYPE } from '#/utils'; @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ {{ formData?.requestMethod }} {{ formData?.requestUrl }} - {{ formData?.requestParams }} + {{ formatDateTime(formData?.exceptionTime || '') }} @@ -80,11 +80,7 @@ const [Modal, modalApi] = useVbenModal({ {{ formData?.exceptionName }} - + diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts index b52b5bf26..9a05cc0cd 100644 --- a/apps/web-antd/src/views/pay/order/data.ts +++ b/apps/web-antd/src/views/pay/order/data.ts @@ -116,7 +116,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { title: '支付时间', field: 'successTime', - minWidth: 180, formatter: 'formatDateTime', }, { @@ -129,7 +128,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { }, { title: '操作', - width: 80, + width: 100, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-antd/src/views/pay/order/index.vue b/apps/web-antd/src/views/pay/order/index.vue index 47eac2349..96432d852 100644 --- a/apps/web-antd/src/views/pay/order/index.vue +++ b/apps/web-antd/src/views/pay/order/index.vue @@ -31,8 +31,12 @@ function handleDetail(row: PayOrderApi.Order) { const [Grid, gridApi] = useVbenVxeGrid({ formOptions: { schema: useGridFormSchema(), + collapsed: false, }, gridOptions: { + cellConfig: { + height: 80, + }, columns: useGridColumns(), height: 'auto', keepSource: true, @@ -49,6 +53,9 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isCurrent: true, + isHover: true, + resizable: true, }, toolbarConfig: { refresh: { code: 'query' }, @@ -90,16 +97,18 @@ const [Grid, gridApi] = useVbenVxeGrid({ /> diff --git a/apps/web-antd/src/views/pay/refund/data.ts b/apps/web-antd/src/views/pay/refund/data.ts index 010777464..835860a7a 100644 --- a/apps/web-antd/src/views/pay/refund/data.ts +++ b/apps/web-antd/src/views/pay/refund/data.ts @@ -80,76 +80,41 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '编号', - minWidth: 100, - }, - { - field: 'createTime', - title: '创建时间', - minWidth: 180, - formatter: 'formatDateTime', - }, - { - field: 'payPrice', - title: '支付金额', - minWidth: 120, - cellRender: { - name: 'CellTag', - props: { - type: 'success', - content: '¥{payPrice}', - formatter: (value: number) => (value / 100).toFixed(2), - }, - }, - }, - { - field: 'refundPrice', - title: '退款金额', - minWidth: 120, - cellRender: { - name: 'CellTag', - props: { - type: 'danger', - content: '¥{refundPrice}', - formatter: (value: number) => (value / 100).toFixed(2), - }, - }, }, { field: 'merchantRefundId', title: '退款订单号', - minWidth: 300, - cellRender: { - name: 'CellTag', - props: { - type: 'info', - content: '商户 {merchantRefundId}', - }, - }, }, { field: 'channelRefundNo', title: '渠道退款单号', - minWidth: 200, - cellRender: { - name: 'CellTag', - props: { - type: 'success', - content: '{channelRefundNo}', - }, - }, + }, + { + field: 'payPrice', + title: '支付金额', + formatter: 'formatFraction', + }, + { + field: 'refundPrice', + title: '退款金额', + formatter: 'formatFraction', }, { field: 'status', title: '退款状态', - minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.PAY_REFUND_STATUS }, }, }, + { + field: 'createTime', + title: '创建时间', + formatter: 'formatDateTime', + }, { title: '操作', - width: 80, + width: 100, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-antd/src/views/system/oauth2/client/modules/form.vue b/apps/web-antd/src/views/system/oauth2/client/modules/form.vue index 53415b618..d32ae3c68 100644 --- a/apps/web-antd/src/views/system/oauth2/client/modules/form.vue +++ b/apps/web-antd/src/views/system/oauth2/client/modules/form.vue @@ -31,7 +31,7 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, formItemClass: 'col-span-2', - labelWidth: 80, + labelWidth: 140, }, layout: 'horizontal', schema: useFormSchema(), @@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/system/sms/channel/data.ts b/apps/web-antd/src/views/system/sms/channel/data.ts index 2956cd236..18efe62f0 100644 --- a/apps/web-antd/src/views/system/sms/channel/data.ts +++ b/apps/web-antd/src/views/system/sms/channel/data.ts @@ -50,14 +50,6 @@ export function useFormSchema(): VbenFormSchema[] { }, rules: z.number().default(CommonStatusEnum.ENABLE), }, - { - fieldName: 'remark', - label: '备注', - component: 'Textarea', - componentProps: { - placeholder: '请输入备注', - }, - }, { fieldName: 'apiKey', label: '短信 API 的账号', @@ -83,6 +75,14 @@ export function useFormSchema(): VbenFormSchema[] { placeholder: '请输入短信发送回调 URL', }, }, + { + fieldName: 'remark', + label: '备注', + component: 'Textarea', + componentProps: { + placeholder: '请输入备注', + }, + }, ]; } @@ -135,17 +135,14 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '编号', - minWidth: 100, }, { field: 'signature', title: '短信签名', - minWidth: 120, }, { field: 'code', title: '渠道编码', - minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE }, @@ -154,38 +151,32 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'status', title: '启用状态', - minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, }, }, - { - field: 'remark', - title: '备注', - minWidth: 120, - }, { field: 'apiKey', title: '短信 API 的账号', - minWidth: 180, }, { field: 'apiSecret', title: '短信 API 的密钥', - minWidth: 180, }, { field: 'callbackUrl', title: '短信发送回调 URL', - minWidth: 180, }, { field: 'createTime', title: '创建时间', - minWidth: 180, formatter: 'formatDateTime', }, + { + field: 'remark', + title: '备注', + }, { title: '操作', width: 130, diff --git a/apps/web-antd/src/views/system/sms/channel/modules/form.vue b/apps/web-antd/src/views/system/sms/channel/modules/form.vue index d1efa610b..7c15b2a89 100644 --- a/apps/web-antd/src/views/system/sms/channel/modules/form.vue +++ b/apps/web-antd/src/views/system/sms/channel/modules/form.vue @@ -31,7 +31,7 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, formItemClass: 'col-span-2', - labelWidth: 80, + labelWidth: 120, }, layout: 'horizontal', schema: useFormSchema(), @@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/system/sms/log/data.ts b/apps/web-antd/src/views/system/sms/log/data.ts index b4f5de358..4b4d632b0 100644 --- a/apps/web-antd/src/views/system/sms/log/data.ts +++ b/apps/web-antd/src/views/system/sms/log/data.ts @@ -84,18 +84,10 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '编号', - minWidth: 100, - }, - { - field: 'createTime', - title: '创建时间', - minWidth: 180, - formatter: 'formatDateTime', }, { field: 'mobile', title: '手机号', - minWidth: 120, }, { field: 'templateContent', @@ -105,7 +97,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'sendStatus', title: '发送状态', - minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_SEND_STATUS }, @@ -114,13 +105,11 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'sendTime', title: '发送时间', - minWidth: 180, formatter: 'formatDateTime', }, { field: 'receiveStatus', title: '接收状态', - minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS }, @@ -129,13 +118,11 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'receiveTime', title: '接收时间', - minWidth: 180, formatter: 'formatDateTime', }, { field: 'channelCode', title: '短信渠道', - minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE }, @@ -144,17 +131,20 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'templateId', title: '模板编号', - minWidth: 100, }, { field: 'templateType', title: '短信类型', - minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE }, }, }, + { + field: 'createTime', + title: '创建时间', + formatter: 'formatDateTime', + }, { title: '操作', width: 80, diff --git a/apps/web-antd/src/views/system/sms/template/data.ts b/apps/web-antd/src/views/system/sms/template/data.ts index f24f7cfd2..f56273cdb 100644 --- a/apps/web-antd/src/views/system/sms/template/data.ts +++ b/apps/web-antd/src/views/system/sms/template/data.ts @@ -78,6 +78,7 @@ export function useFormSchema(): VbenFormSchema[] { component: 'Textarea', componentProps: { placeholder: '请输入模板内容', + rows: 4, }, rules: 'required', }, @@ -204,12 +205,10 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '编号', - minWidth: 100, }, { field: 'type', title: '短信类型', - minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE }, @@ -218,12 +217,10 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'name', title: '模板名称', - minWidth: 120, }, { field: 'code', title: '模板编码', - minWidth: 120, }, { field: 'content', @@ -233,26 +230,18 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'status', title: '开启状态', - minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, }, }, - { - field: 'remark', - title: '备注', - minWidth: 120, - }, { field: 'apiTemplateId', title: '短信 API 的模板编号', - minWidth: 180, }, { field: 'channelCode', title: '短信渠道', - minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE }, @@ -261,9 +250,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - minWidth: 180, formatter: 'formatDateTime', }, + { + field: 'remark', + title: '备注', + }, { title: '操作', width: 220, diff --git a/apps/web-antd/src/views/system/sms/template/modules/form.vue b/apps/web-antd/src/views/system/sms/template/modules/form.vue index 8edbc735c..2bca1fd5f 100644 --- a/apps/web-antd/src/views/system/sms/template/modules/form.vue +++ b/apps/web-antd/src/views/system/sms/template/modules/form.vue @@ -31,7 +31,7 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, formItemClass: 'col-span-2', - labelWidth: 80, + labelWidth: 120, }, layout: 'horizontal', schema: useFormSchema(), @@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue index ff495de5d..ae82a3b32 100644 --- a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue +++ b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue @@ -103,7 +103,7 @@ const buildFormSchema = () => {