diff --git a/apps/web-antd/src/views/ai/chat/manager/data.ts b/apps/web-antd/src/views/ai/chat/manager/data.ts index 2ac900354..8aeb48292 100644 --- a/apps/web-antd/src/views/ai/chat/manager/data.ts +++ b/apps/web-antd/src/views/ai/chat/manager/data.ts @@ -46,7 +46,7 @@ export function useGridColumnsConversation(): VxeTableGridOptions['columns'] { }, { title: '用户', - width: 180, + minWidth: 180, slots: { default: 'userId' }, }, { @@ -141,7 +141,7 @@ export function useGridColumnsMessage(): VxeTableGridOptions['columns'] { }, { title: '用户', - width: 180, + minWidth: 180, slots: { default: 'userId' }, }, { diff --git a/apps/web-antd/src/views/bpm/processInstance/manager/data.ts b/apps/web-antd/src/views/bpm/processInstance/manager/data.ts index e976ab255..c363e1067 100644 --- a/apps/web-antd/src/views/bpm/processInstance/manager/data.ts +++ b/apps/web-antd/src/views/bpm/processInstance/manager/data.ts @@ -88,6 +88,12 @@ export function useGridColumns( onTaskClick: (task: BpmProcessInstanceApi.Task) => void, ): VxeTableGridOptions['columns'] { return [ + { + field: 'id', + title: '流程编号', + minWidth: 320, + fixed: 'left', + }, { field: 'name', title: '流程名称', @@ -167,12 +173,6 @@ export function useGridColumns( }, }, }, - - { - field: 'id', - title: '流程编号', - minWidth: 320, - }, { title: '操作', width: 180, diff --git a/apps/web-antd/src/views/bpm/task/manager/data.ts b/apps/web-antd/src/views/bpm/task/manager/data.ts index 3de8320eb..070e1ded2 100644 --- a/apps/web-antd/src/views/bpm/task/manager/data.ts +++ b/apps/web-antd/src/views/bpm/task/manager/data.ts @@ -41,12 +41,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '发起人', minWidth: 120, }, - { - field: 'createTime', - title: '发起时间', - minWidth: 180, - formatter: 'formatDateTime', - }, { field: 'name', title: '当前任务', diff --git a/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts b/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts index 860427cd7..9bd74a66e 100644 --- a/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts +++ b/apps/web-antd/src/views/mall/promotion/bargain/record/data.ts @@ -102,7 +102,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'endTime', title: '结束时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts b/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts index 8ac9a0e6a..e08dfa662 100644 --- a/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts @@ -225,7 +225,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/combination/record/data.ts b/apps/web-antd/src/views/mall/promotion/combination/record/data.ts index 1388ff479..3a5082170 100644 --- a/apps/web-antd/src/views/mall/promotion/combination/record/data.ts +++ b/apps/web-antd/src/views/mall/promotion/combination/record/data.ts @@ -91,13 +91,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '参团时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { field: 'endTime', title: '结束时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { @@ -155,13 +155,13 @@ export function useUserGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '参团时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { field: 'endTime', title: '结束时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/coupon/data.ts b/apps/web-antd/src/views/mall/promotion/coupon/data.ts index a8efb9f5e..36c9fe714 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/data.ts +++ b/apps/web-antd/src/views/mall/promotion/coupon/data.ts @@ -89,13 +89,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '领取时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { field: 'useTime', title: '使用时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts b/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts index 08ea5b772..e2359f2d4 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts +++ b/apps/web-antd/src/views/mall/promotion/coupon/template/data.ts @@ -239,7 +239,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts b/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts index e0319d86f..dffafe32d 100644 --- a/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts @@ -146,7 +146,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/diy/page/data.ts b/apps/web-antd/src/views/mall/promotion/diy/page/data.ts index 77864186f..554f6829d 100644 --- a/apps/web-antd/src/views/mall/promotion/diy/page/data.ts +++ b/apps/web-antd/src/views/mall/promotion/diy/page/data.ts @@ -96,7 +96,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/diy/template/data.ts b/apps/web-antd/src/views/mall/promotion/diy/template/data.ts index 58bd4ba04..0c46faf7e 100644 --- a/apps/web-antd/src/views/mall/promotion/diy/template/data.ts +++ b/apps/web-antd/src/views/mall/promotion/diy/template/data.ts @@ -93,7 +93,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'used', title: '是否使用', - width: 100, + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING }, @@ -107,7 +107,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/point/activity/data.ts b/apps/web-antd/src/views/mall/promotion/point/activity/data.ts index 4e51fda0c..276254754 100644 --- a/apps/web-antd/src/views/mall/promotion/point/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/point/activity/data.ts @@ -102,7 +102,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'status', title: '活动状态', - width: 100, + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -111,23 +111,23 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'stock', title: '库存', - width: 80, + minWidth: 80, }, { field: 'totalStock', title: '总库存', - width: 80, + minWidth: 80, }, { field: 'redeemedQuantity', title: '已兑换数量', - width: 100, + minWidth: 100, slots: { default: 'redeemedQuantity' }, }, { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts index b3dab520d..c145669bf 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts @@ -132,13 +132,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'startTime', title: '活动开始时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { field: 'endTime', title: '活动结束时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { @@ -153,7 +153,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts b/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts index 5b7e1c28c..2d294e8e7 100644 --- a/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/seckill/activity/data.ts @@ -44,7 +44,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'configIds', title: '秒杀时段', - width: 220, + minWidth: 220, slots: { default: 'configIds' }, }, { @@ -112,7 +112,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { field: 'createTime', title: '创建时间', align: 'center', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts index 53d2ea44b..845169b6a 100644 --- a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts +++ b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts @@ -100,21 +100,22 @@ export function useGridColumns( { title: '秒杀时段名称', field: 'name', - width: 200, + minWidth: 200, }, { title: '开始时间点', field: 'startTime', - width: 120, + minWidth: 120, }, { title: '结束时间点', field: 'endTime', - width: 120, + minWidth: 120, }, { title: '秒杀轮播图', field: 'sliderPicUrls', + minWidth: 100, cellRender: { name: 'CellImages', }, @@ -122,7 +123,7 @@ export function useGridColumns( { title: '活动状态', field: 'status', - width: 100, + minWidth: 100, cellRender: { attrs: { beforeChange: onStatusChange }, name: 'CellSwitch', @@ -137,7 +138,7 @@ export function useGridColumns( { title: '创建时间', field: 'createTime', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts index 086bd3f00..c5e6ae686 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts +++ b/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts @@ -65,8 +65,15 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'userAvatar', title: '头像', - width: 70, - slots: { default: 'userAvatar' }, + minWidth: 70, + cellRender: { + name: 'CellImage', + props: { + height: 40, + width: 40, + shape: 'circle', + }, + }, }, { field: 'userNickname', @@ -115,7 +122,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'unfreezeTime', title: '解冻时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue index 80c064a7f..619cef760 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue +++ b/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue @@ -4,8 +4,6 @@ import type { MallBrokerageRecordApi } from '#/api/mall/trade/brokerage/record'; import { DocAlert, Page } from '@vben/common-ui'; -import { Avatar } from 'ant-design-vue'; - import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record'; @@ -54,10 +52,6 @@ const [Grid] = useVbenVxeGrid({ /> - - - + diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts index 86948da8b..8de25b5bf 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts +++ b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts @@ -53,7 +53,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'avatar', title: '头像', - width: 70, + minWidth: 70, cellRender: { name: 'CellImage', props: { @@ -71,7 +71,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'brokerageUserCount', title: '推广人数', - width: 80, + minWidth: 80, }, { field: 'brokerageOrderCount', @@ -116,18 +116,18 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'brokerageTime', title: '成为推广员时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { field: 'bindUserId', title: '上级推广员编号', - width: 150, + minWidth: 150, }, { field: 'bindUserTime', title: '推广员绑定时间', - width: 180, + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue index 80403aea1..8706aa32f 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue +++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue @@ -99,7 +99,7 @@ function useColumns(): VxeTableGridOptions['columns'] { { field: 'sourceUserAvatar', title: '头像', - width: 70, + minWidth: 70, cellRender: { name: 'CellImage', props: { diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue index b6d42606a..d69d6b352 100644 --- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue +++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue @@ -75,7 +75,7 @@ function useColumns(): VxeTableGridOptions['columns'] { { field: 'avatar', title: '头像', - width: 70, + minWidth: 70, cellRender: { name: 'CellImage', props: {