diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts index 537d61e79..68d450ea3 100644 --- a/apps/web-antd/src/views/system/dict/data.ts +++ b/apps/web-antd/src/views/system/dict/data.ts @@ -107,18 +107,22 @@ export function useTypeGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '字典编号', + minWidth: 100, }, { field: 'name', title: '字典名称', + minWidth: 200, }, { field: 'type', title: '字典类型', + minWidth: 220, }, { field: 'status', title: '状态', + minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -127,15 +131,17 @@ export function useTypeGridColumns(): VxeTableGridOptions['columns'] { { field: 'remark', title: '备注', + minWidth: 180, }, { field: 'createTime', title: '创建时间', + minWidth: 180, formatter: 'formatDateTime', }, { title: '操作', - width: 160, + minWidth: 120, fixed: 'right', slots: { default: 'actions' }, }, @@ -295,22 +301,27 @@ export function useDataGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '字典编码', + minWidth: 100, }, { field: 'label', title: '字典标签', + minWidth: 180, }, { field: 'value', title: '字典键值', + minWidth: 100, }, { field: 'sort', title: '字典排序', + minWidth: 100, }, { field: 'status', title: '状态', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -319,21 +330,24 @@ export function useDataGridColumns(): VxeTableGridOptions['columns'] { { field: 'colorType', title: '颜色类型', + minWidth: 120, slots: { default: 'colorType' }, }, { field: 'cssClass', title: 'CSS Class', + minWidth: 120, slots: { default: 'cssClass' }, }, { title: '创建时间', field: 'createTime', + minWidth: 180, formatter: 'formatDateTime', }, { title: '操作', - width: 160, + minWidth: 120, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-ele/src/views/infra/codegen/edit/index.vue b/apps/web-ele/src/views/infra/codegen/edit/index.vue index ec090172f..47523652d 100644 --- a/apps/web-ele/src/views/infra/codegen/edit/index.vue +++ b/apps/web-ele/src/views/infra/codegen/edit/index.vue @@ -61,7 +61,6 @@ const submitForm = async () => { // 提交表单 const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.updating'), - fullscreen: true, }); try { // 拼接相关信息 diff --git a/apps/web-ele/src/views/infra/codegen/index.vue b/apps/web-ele/src/views/infra/codegen/index.vue index 753d52e75..6338e3ca2 100644 --- a/apps/web-ele/src/views/infra/codegen/index.vue +++ b/apps/web-ele/src/views/infra/codegen/index.vue @@ -75,7 +75,6 @@ function onEdit(row: InfraCodegenApi.CodegenTable) { async function onDelete(row: InfraCodegenApi.CodegenTable) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.tableName]), - fullscreen: true, }); try { await deleteCodegenTable(row.id); @@ -107,7 +106,6 @@ async function onSync(row: InfraCodegenApi.CodegenTable) { async function onGenerate(row: InfraCodegenApi.CodegenTable) { const loadingInstance = ElLoading.service({ text: '正在生成代码...', - fullscreen: true, }); try { const res = await downloadCodegen(row.id); diff --git a/apps/web-ele/src/views/infra/codegen/modules/import-table.vue b/apps/web-ele/src/views/infra/codegen/modules/import-table.vue index aa4cd5814..f3d3d4b1c 100644 --- a/apps/web-ele/src/views/infra/codegen/modules/import-table.vue +++ b/apps/web-ele/src/views/infra/codegen/modules/import-table.vue @@ -96,7 +96,6 @@ const [Modal, modalApi] = useVbenModal({ // 2. 提交请求 const loadingInstance = ElLoading.service({ text: '导入中...', - fullscreen: true, }); try { await createCodegenList(formData); diff --git a/apps/web-ele/src/views/infra/config/index.vue b/apps/web-ele/src/views/infra/config/index.vue index 1d3be23f1..760512ab4 100644 --- a/apps/web-ele/src/views/infra/config/index.vue +++ b/apps/web-ele/src/views/infra/config/index.vue @@ -54,7 +54,6 @@ function onEdit(row: InfraConfigApi.Config) { async function onDelete(row: InfraConfigApi.Config) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteConfig(row.id as number); diff --git a/apps/web-ele/src/views/infra/dataSourceConfig/index.vue b/apps/web-ele/src/views/infra/dataSourceConfig/index.vue index 001cd8b6b..2f54433b7 100644 --- a/apps/web-ele/src/views/infra/dataSourceConfig/index.vue +++ b/apps/web-ele/src/views/infra/dataSourceConfig/index.vue @@ -42,7 +42,6 @@ function onEdit(row: InfraDataSourceConfigApi.DataSourceConfig) { async function onDelete(row: InfraDataSourceConfigApi.DataSourceConfig) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDataSourceConfig(row.id as number); diff --git a/apps/web-ele/src/views/infra/file/index.vue b/apps/web-ele/src/views/infra/file/index.vue index abbcd1349..bad64c647 100644 --- a/apps/web-ele/src/views/infra/file/index.vue +++ b/apps/web-ele/src/views/infra/file/index.vue @@ -62,7 +62,6 @@ function openUrl(url?: string) { async function onDelete(row: InfraFileApi.File) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name || row.path]), - fullscreen: true, }); try { await deleteFile(row.id as number); diff --git a/apps/web-ele/src/views/infra/fileConfig/index.vue b/apps/web-ele/src/views/infra/fileConfig/index.vue index 57e973c6f..6c3b24e26 100644 --- a/apps/web-ele/src/views/infra/fileConfig/index.vue +++ b/apps/web-ele/src/views/infra/fileConfig/index.vue @@ -49,7 +49,6 @@ function onEdit(row: InfraFileConfigApi.FileConfig) { async function onMaster(row: InfraFileConfigApi.FileConfig) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.updating', [row.name]), - fullscreen: true, }); try { await updateFileConfigMaster(row.id as number); @@ -64,7 +63,6 @@ async function onMaster(row: InfraFileConfigApi.FileConfig) { async function onTest(row: InfraFileConfigApi.FileConfig) { const loadingInstance = ElLoading.service({ text: '测试上传中...', - fullscreen: true, }); try { const response = await testFileConfig(row.id as number); @@ -87,7 +85,6 @@ async function onTest(row: InfraFileConfigApi.FileConfig) { async function onDelete(row: InfraFileConfigApi.FileConfig) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteFileConfig(row.id as number); diff --git a/apps/web-ele/src/views/infra/job/index.vue b/apps/web-ele/src/views/infra/job/index.vue index 444169f86..ae1400568 100644 --- a/apps/web-ele/src/views/infra/job/index.vue +++ b/apps/web-ele/src/views/infra/job/index.vue @@ -107,7 +107,6 @@ function onLog(row?: InfraJobApi.Job) { async function onDelete(row: InfraJobApi.Job) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteJob(row.id as number); diff --git a/apps/web-ele/src/views/mall/product/brand/index.vue b/apps/web-ele/src/views/mall/product/brand/index.vue index 709b2aeb9..0a93cefc6 100644 --- a/apps/web-ele/src/views/mall/product/brand/index.vue +++ b/apps/web-ele/src/views/mall/product/brand/index.vue @@ -37,7 +37,6 @@ function handleEdit(row: MallBrandApi.Brand) { async function handleDelete(row: MallBrandApi.Brand) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteBrand(row.id as number); diff --git a/apps/web-ele/src/views/mall/product/category/index.vue b/apps/web-ele/src/views/mall/product/category/index.vue index 859bb2e14..60ead3570 100644 --- a/apps/web-ele/src/views/mall/product/category/index.vue +++ b/apps/web-ele/src/views/mall/product/category/index.vue @@ -54,7 +54,6 @@ const handleViewSpu = (id: number) => { async function handleDelete(row: MallCategoryApi.Category) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteCategory(row.id as number); diff --git a/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue b/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue index 6aaea656e..196843e53 100644 --- a/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue +++ b/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue @@ -42,7 +42,6 @@ function handleEdit(row: any) { async function handleDelete(row: MallPropertyApi.Property) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteProperty(row.id as number); diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue b/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue index c17eb3a90..8ac978fa8 100644 --- a/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue +++ b/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue @@ -49,7 +49,6 @@ function handleEdit(row: MallPropertyApi.PropertyValue) { async function handleDelete(row: MallPropertyApi.PropertyValue) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deletePropertyValue(row.id as number); diff --git a/apps/web-ele/src/views/mall/product/spu/index.vue b/apps/web-ele/src/views/mall/product/spu/index.vue index 749c90d7e..95abca42e 100644 --- a/apps/web-ele/src/views/mall/product/spu/index.vue +++ b/apps/web-ele/src/views/mall/product/spu/index.vue @@ -100,7 +100,6 @@ function handleEdit(row: MallSpuApi.Spu) { async function handleDelete(row: MallSpuApi.Spu) { const hideLoading = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteSpu(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/article/category/index.vue b/apps/web-ele/src/views/mall/promotion/article/category/index.vue index 6c40d929e..c53a7ba1e 100644 --- a/apps/web-ele/src/views/mall/promotion/article/category/index.vue +++ b/apps/web-ele/src/views/mall/promotion/article/category/index.vue @@ -40,7 +40,6 @@ function handleEdit(row: MallArticleCategoryApi.ArticleCategory) { async function handleDelete(row: MallArticleCategoryApi.ArticleCategory) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteArticleCategory(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/article/index.vue b/apps/web-ele/src/views/mall/promotion/article/index.vue index b3f4ca8a6..fda7dffeb 100644 --- a/apps/web-ele/src/views/mall/promotion/article/index.vue +++ b/apps/web-ele/src/views/mall/promotion/article/index.vue @@ -37,7 +37,6 @@ function handleEdit(row: MallArticleApi.Article) { async function handleDelete(row: MallArticleApi.Article) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.title]), - fullscreen: true, }); try { await deleteArticle(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/banner/index.vue b/apps/web-ele/src/views/mall/promotion/banner/index.vue index cc6025d71..ce506f906 100644 --- a/apps/web-ele/src/views/mall/promotion/banner/index.vue +++ b/apps/web-ele/src/views/mall/promotion/banner/index.vue @@ -37,7 +37,6 @@ function handleEdit(row: MallBannerApi.Banner) { async function handleDelete(row: MallBannerApi.Banner) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.title]), - fullscreen: true, }); try { await deleteBanner(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/bargain/activity/index.vue b/apps/web-ele/src/views/mall/promotion/bargain/activity/index.vue index 23def9900..6c33e8885 100644 --- a/apps/web-ele/src/views/mall/promotion/bargain/activity/index.vue +++ b/apps/web-ele/src/views/mall/promotion/bargain/activity/index.vue @@ -51,7 +51,6 @@ async function handleClose(row: MallBargainActivityApi.BargainActivity) { async function handleDelete(row: MallBargainActivityApi.BargainActivity) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteBargainActivity(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/combination/activity/index.vue b/apps/web-ele/src/views/mall/promotion/combination/activity/index.vue index 4159858c3..15b4e3fb9 100644 --- a/apps/web-ele/src/views/mall/promotion/combination/activity/index.vue +++ b/apps/web-ele/src/views/mall/promotion/combination/activity/index.vue @@ -55,7 +55,6 @@ async function handleDelete( ) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteCombinationActivity(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/coupon/index.vue b/apps/web-ele/src/views/mall/promotion/coupon/index.vue index 9ee685694..7a7c4e238 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/index.vue +++ b/apps/web-ele/src/views/mall/promotion/coupon/index.vue @@ -26,7 +26,6 @@ const statusTabs = ref(getStatusTabs()); async function handleDelete(row: MallCouponApi.Coupon) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteCoupon(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue b/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue index a03590964..86072e0db 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue +++ b/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue @@ -46,7 +46,6 @@ function handleCreate() { async function handleDelete(row: MallCouponTemplateApi.CouponTemplate) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteCouponTemplate(row.id as number); @@ -71,7 +70,6 @@ async function handleStatusChange(row: MallCouponTemplateApi.CouponTemplate) { const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'; const loadingInstance = ElLoading.service({ text: `正在${text}优惠券模板...`, - fullscreen: true, }); try { await updateCouponTemplateStatus(row.id as number, row.status as 0 | 1); diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/index.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/index.vue index 7b8e09fc1..5bd86c2dc 100644 --- a/apps/web-ele/src/views/mall/promotion/discountActivity/index.vue +++ b/apps/web-ele/src/views/mall/promotion/discountActivity/index.vue @@ -51,7 +51,6 @@ async function handleClose(row: MallDiscountActivityApi.DiscountActivity) { async function handleDelete(row: MallDiscountActivityApi.DiscountActivity) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDiscountActivity(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/diy/page/index.vue b/apps/web-ele/src/views/mall/promotion/diy/page/index.vue index 92cc3bf60..531cfeecf 100644 --- a/apps/web-ele/src/views/mall/promotion/diy/page/index.vue +++ b/apps/web-ele/src/views/mall/promotion/diy/page/index.vue @@ -49,7 +49,6 @@ function handleDecorate(row: MallDiyPageApi.DiyPage) { async function handleDelete(row: MallDiyPageApi.DiyPage) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDiyPage(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/diy/template/index.vue b/apps/web-ele/src/views/mall/promotion/diy/template/index.vue index 2d43b97f5..38a84ddf8 100644 --- a/apps/web-ele/src/views/mall/promotion/diy/template/index.vue +++ b/apps/web-ele/src/views/mall/promotion/diy/template/index.vue @@ -62,7 +62,6 @@ async function handleUse(row: MallDiyTemplateApi.DiyTemplate) { async function handleDelete(row: MallDiyTemplateApi.DiyTemplate) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDiyTemplate(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/point/activity/index.vue b/apps/web-ele/src/views/mall/promotion/point/activity/index.vue index dd39fe345..d0d7f96a4 100644 --- a/apps/web-ele/src/views/mall/promotion/point/activity/index.vue +++ b/apps/web-ele/src/views/mall/promotion/point/activity/index.vue @@ -59,7 +59,6 @@ async function handleClose(row: MallPointActivityApi.PointActivity) { async function handleDelete(row: MallPointActivityApi.PointActivity) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.spuName]), - fullscreen: true, }); try { await deletePointActivity(row.id); diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue index a6a3d8172..c28424f73 100644 --- a/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue +++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue @@ -51,7 +51,6 @@ async function handleClose(row: MallRewardActivityApi.RewardActivity) { async function handleDelete(row: MallRewardActivityApi.RewardActivity) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteRewardActivity(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/seckill/activity/index.vue b/apps/web-ele/src/views/mall/promotion/seckill/activity/index.vue index 7ad535737..40b7f2214 100644 --- a/apps/web-ele/src/views/mall/promotion/seckill/activity/index.vue +++ b/apps/web-ele/src/views/mall/promotion/seckill/activity/index.vue @@ -55,7 +55,6 @@ async function handleClose(row: MallSeckillActivityApi.SeckillActivity) { async function handleDelete(row: MallSeckillActivityApi.SeckillActivity) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteSeckillActivity(row.id as number); diff --git a/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue b/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue index 934c1802f..77af48cfc 100644 --- a/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue +++ b/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue @@ -41,7 +41,6 @@ function handleEdit(row: MallSeckillConfigApi.SeckillConfig) { async function handleDelete(row: MallSeckillConfigApi.SeckillConfig) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteSeckillConfig(row.id as number); diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue index 003895c04..9554f2613 100644 --- a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue +++ b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue @@ -81,7 +81,6 @@ async function handleBrokerageEnabledChange( const text = row.brokerageEnabled ? '开通' : '关闭'; const loadingInstance = ElLoading.service({ text: `正在${text}"${row.nickname}"的推广资格...`, - fullscreen: true, }); try { await updateBrokerageEnabled({ diff --git a/apps/web-ele/src/views/mall/trade/delivery/express/index.vue b/apps/web-ele/src/views/mall/trade/delivery/express/index.vue index 550f5ede0..c39bd7ad0 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/express/index.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/express/index.vue @@ -48,7 +48,6 @@ function handleEdit(row: MallDeliveryExpressApi.DeliveryExpress) { async function handleDelete(row: MallDeliveryExpressApi.DeliveryExpress) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDeliveryExpress(row.id as number); diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue index c429b6c6c..1d2ced7c8 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue @@ -42,7 +42,6 @@ async function handleDelete( ) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDeliveryExpressTemplate(row.id as number); diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/index.vue b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/index.vue index ababd4766..70f97117d 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/index.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/index.vue @@ -51,7 +51,6 @@ function handleBind(row: MallDeliveryPickUpStoreApi.PickUpStore) { async function handleDelete(row: MallDeliveryPickUpStoreApi.PickUpStore) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDeliveryPickUpStore(row.id as number); diff --git a/apps/web-ele/src/views/member/group/index.vue b/apps/web-ele/src/views/member/group/index.vue index 69ae7a4e2..e87baf7f2 100644 --- a/apps/web-ele/src/views/member/group/index.vue +++ b/apps/web-ele/src/views/member/group/index.vue @@ -37,7 +37,6 @@ function handleEdit(row: MemberGroupApi.Group) { async function handleDelete(row: MemberGroupApi.Group) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteGroup(row.id as number); diff --git a/apps/web-ele/src/views/member/level/index.vue b/apps/web-ele/src/views/member/level/index.vue index ede8ea00e..4bd017921 100644 --- a/apps/web-ele/src/views/member/level/index.vue +++ b/apps/web-ele/src/views/member/level/index.vue @@ -37,7 +37,6 @@ function handleEdit(row: MemberLevelApi.Level) { async function handleDelete(row: MemberLevelApi.Level) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteLevel(row.id as number); diff --git a/apps/web-ele/src/views/member/signin/config/index.vue b/apps/web-ele/src/views/member/signin/config/index.vue index 92ccb83aa..3110f6505 100644 --- a/apps/web-ele/src/views/member/signin/config/index.vue +++ b/apps/web-ele/src/views/member/signin/config/index.vue @@ -40,7 +40,6 @@ function handleEdit(row: MemberSignInConfigApi.SignInConfig) { async function handleDelete(row: MemberSignInConfigApi.SignInConfig) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting'), - fullscreen: true, }); try { await deleteSignInConfig(row.id as number); diff --git a/apps/web-ele/src/views/member/tag/index.vue b/apps/web-ele/src/views/member/tag/index.vue index 08ed6c914..2457a3756 100644 --- a/apps/web-ele/src/views/member/tag/index.vue +++ b/apps/web-ele/src/views/member/tag/index.vue @@ -37,7 +37,6 @@ function handleEdit(row: MemberTagApi.Tag) { async function handleDelete(row: MemberTagApi.Tag) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteMemberTag(row.id as number); diff --git a/apps/web-ele/src/views/member/user/components/user-coupon-list.vue b/apps/web-ele/src/views/member/user/components/user-coupon-list.vue index 6b40c2ceb..0dec7d08c 100644 --- a/apps/web-ele/src/views/member/user/components/user-coupon-list.vue +++ b/apps/web-ele/src/views/member/user/components/user-coupon-list.vue @@ -27,7 +27,6 @@ const activeStatus = ref('all'); const handleDelete = async (row: MallCouponApi.Coupon) => { const hideLoading = ElLoading.service({ text: '回收将会收回会员领取的待使用的优惠券,已使用的将无法回收,确定要回收所选优惠券吗?', - fullscreen: true, }); try { await deleteCoupon(row.id as number); diff --git a/apps/web-ele/src/views/pay/app/index.vue b/apps/web-ele/src/views/pay/app/index.vue index a539d01a1..db4bd9980 100644 --- a/apps/web-ele/src/views/pay/app/index.vue +++ b/apps/web-ele/src/views/pay/app/index.vue @@ -41,7 +41,6 @@ function handleEdit(row: PayAppApi.App) { async function handleDelete(row: PayAppApi.App) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteApp(row.id as number); diff --git a/apps/web-ele/src/views/pay/demo/order/index.vue b/apps/web-ele/src/views/pay/demo/order/index.vue index 020a1d19a..31725cb57 100644 --- a/apps/web-ele/src/views/pay/demo/order/index.vue +++ b/apps/web-ele/src/views/pay/demo/order/index.vue @@ -48,7 +48,6 @@ function handlePay(row: DemoOrderApi.Order) { async function handleRefund(row: DemoOrderApi.Order) { const loadingInstance = ElLoading.service({ text: '退款中,请稍后...', - fullscreen: true, }); try { await refundDemoOrder(row.id as number); diff --git a/apps/web-ele/src/views/pay/demo/withdraw/index.vue b/apps/web-ele/src/views/pay/demo/withdraw/index.vue index 88e42d541..9173e1068 100644 --- a/apps/web-ele/src/views/pay/demo/withdraw/index.vue +++ b/apps/web-ele/src/views/pay/demo/withdraw/index.vue @@ -36,7 +36,6 @@ function handleCreate() { async function handleTransfer(row: DemoWithdrawApi.Withdraw) { const loadingInstance = ElLoading.service({ text: '转账中,请稍后...', - fullscreen: true, }); try { const payTransferId = await transferDemoWithdraw(row.id as number); diff --git a/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue b/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue index e4d9ed3fa..3f079aad9 100644 --- a/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue +++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue @@ -39,7 +39,6 @@ function handleEdit(row: any) { async function handleDelete(row: any) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deletePackage(row.id as number); diff --git a/apps/web-ele/src/views/system/dict/data.ts b/apps/web-ele/src/views/system/dict/data.ts index 4d08c00a2..4aa1cb596 100644 --- a/apps/web-ele/src/views/system/dict/data.ts +++ b/apps/web-ele/src/views/system/dict/data.ts @@ -1,17 +1,12 @@ import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { SystemDictDataApi } from '#/api/system/dict/data'; -import type { SystemDictTypeApi } from '#/api/system/dict/type'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { useAccess } from '@vben/access'; import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; import { getSimpleDictTypeList } from '#/api/system/dict/type'; -const { hasAccessByCodes } = useAccess(); - // ============================== 字典类型 ============================== /** 类型新增/修改的表单 */ @@ -83,6 +78,15 @@ export function useTypeGridFormSchema(): VbenFormSchema[] { clearable: true, }, }, + { + fieldName: 'type', + label: '字典类型', + component: 'Input', + componentProps: { + placeholder: '请输入字典类型', + clearable: true, + }, + }, { fieldName: 'status', label: '状态', @@ -97,9 +101,7 @@ export function useTypeGridFormSchema(): VbenFormSchema[] { } /** 类型列表的字段 */ -export function useTypeGridColumns( - onActionClick: OnActionClickFn, -): VxeTableGridOptions['columns'] { +export function useTypeGridColumns(): VxeTableGridOptions['columns'] { return [ { type: 'checkbox', width: 40 }, { @@ -138,29 +140,10 @@ export function useTypeGridColumns( formatter: 'formatDateTime', }, { - minWidth: 120, title: '操作', - field: 'operation', + minWidth: 120, fixed: 'right', - align: 'center', - cellRender: { - attrs: { - nameField: 'type', - nameTitle: '字典类型', - onClick: onActionClick, - }, - name: 'CellOperation', - options: [ - { - code: 'edit', - show: hasAccessByCodes(['system:dict:update']), - }, - { - code: 'delete', - show: hasAccessByCodes(['system:dict:delete']), - }, - ], - }, + slots: { default: 'actions' }, }, ]; } @@ -312,9 +295,7 @@ export function useDataGridFormSchema(): VbenFormSchema[] { /** * 字典数据表格列 */ -export function useDataGridColumns( - onActionClick: OnActionClickFn, -): VxeTableGridOptions['columns'] { +export function useDataGridColumns(): VxeTableGridOptions['columns'] { return [ { type: 'checkbox', width: 40 }, { @@ -363,29 +344,10 @@ export function useDataGridColumns( formatter: 'formatDateTime', }, { - minWidth: 120, title: '操作', - field: 'operation', + minWidth: 120, fixed: 'right', - align: 'center', - cellRender: { - attrs: { - nameField: 'label', - nameTitle: '字典数据', - onClick: onActionClick, - }, - name: 'CellOperation', - options: [ - { - code: 'edit', - show: hasAccessByCodes(['system:dict:update']), - }, - { - code: 'delete', - show: hasAccessByCodes(['system:dict:delete']), - }, - ], - }, + slots: { default: 'actions' }, }, ]; } diff --git a/apps/web-ele/src/views/system/dict/index.vue b/apps/web-ele/src/views/system/dict/index.vue index b3de5c5bb..8d824256d 100644 --- a/apps/web-ele/src/views/system/dict/index.vue +++ b/apps/web-ele/src/views/system/dict/index.vue @@ -8,7 +8,7 @@ import TypeGrid from './modules/type-grid.vue'; const searchDictType = ref(); // 搜索的字典类型 -function onDictTypeSelect(dictType: string) { +function handleDictTypeSelect(dictType: string) { searchDictType.value = dictType; } @@ -22,7 +22,7 @@ function onDictTypeSelect(dictType: string) {
- +
diff --git a/apps/web-ele/src/views/system/dict/modules/data-grid.vue b/apps/web-ele/src/views/system/dict/modules/data-grid.vue index b85c2cc5f..0f25a98fb 100644 --- a/apps/web-ele/src/views/system/dict/modules/data-grid.vue +++ b/apps/web-ele/src/views/system/dict/modules/data-grid.vue @@ -61,7 +61,6 @@ function onEdit(row: any) { async function onDelete(row: any) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDictData(row.id); diff --git a/apps/web-ele/src/views/system/dict/modules/type-grid.vue b/apps/web-ele/src/views/system/dict/modules/type-grid.vue index d90821d60..c664955b2 100644 --- a/apps/web-ele/src/views/system/dict/modules/type-grid.vue +++ b/apps/web-ele/src/views/system/dict/modules/type-grid.vue @@ -56,7 +56,6 @@ function onEdit(row: any) { async function onDelete(row: SystemDictTypeApi.DictType) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteDictType(row.id as number); diff --git a/apps/web-ele/src/views/system/mail/account/index.vue b/apps/web-ele/src/views/system/mail/account/index.vue index 77face99d..f4c2ec4e9 100644 --- a/apps/web-ele/src/views/system/mail/account/index.vue +++ b/apps/web-ele/src/views/system/mail/account/index.vue @@ -47,7 +47,6 @@ function onEdit(row: SystemMailAccountApi.MailAccount) { async function onDelete(row: SystemMailAccountApi.MailAccount) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.mail]), - fullscreen: true, }); try { await deleteMailAccount(row.id as number); diff --git a/apps/web-ele/src/views/system/mail/template/index.vue b/apps/web-ele/src/views/system/mail/template/index.vue index d80cbe3ba..7a33fc14f 100644 --- a/apps/web-ele/src/views/system/mail/template/index.vue +++ b/apps/web-ele/src/views/system/mail/template/index.vue @@ -67,7 +67,6 @@ function onSend(row: SystemMailTemplateApi.MailTemplate) { async function onDelete(row: SystemMailTemplateApi.MailTemplate) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteMailTemplate(row.id as number); diff --git a/apps/web-ele/src/views/system/menu/index.vue b/apps/web-ele/src/views/system/menu/index.vue index 5dbd1ce8f..d89914bc6 100644 --- a/apps/web-ele/src/views/system/menu/index.vue +++ b/apps/web-ele/src/views/system/menu/index.vue @@ -49,7 +49,6 @@ function onEdit(row: SystemMenuApi.Menu) { async function onDelete(row: SystemMenuApi.Menu) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteMenu(row.id as number); diff --git a/apps/web-ele/src/views/system/oauth2/client/index.vue b/apps/web-ele/src/views/system/oauth2/client/index.vue index 7888c4d3b..ca6f0c92f 100644 --- a/apps/web-ele/src/views/system/oauth2/client/index.vue +++ b/apps/web-ele/src/views/system/oauth2/client/index.vue @@ -47,7 +47,6 @@ function onEdit(row: SystemOAuth2ClientApi.OAuth2Client) { async function onDelete(row: SystemOAuth2ClientApi.OAuth2Client) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteOAuth2Client(row.id as number); diff --git a/apps/web-ele/src/views/system/oauth2/token/index.vue b/apps/web-ele/src/views/system/oauth2/token/index.vue index 32f69913e..e2028a37e 100644 --- a/apps/web-ele/src/views/system/oauth2/token/index.vue +++ b/apps/web-ele/src/views/system/oauth2/token/index.vue @@ -27,7 +27,6 @@ function onRefresh() { async function onDelete(row: SystemOAuth2TokenApi.OAuth2Token) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.accessToken]), - fullscreen: true, }); try { await deleteOAuth2Token(row.accessToken); diff --git a/apps/web-ele/src/views/system/post/index.vue b/apps/web-ele/src/views/system/post/index.vue index 45c185418..4305d71b8 100644 --- a/apps/web-ele/src/views/system/post/index.vue +++ b/apps/web-ele/src/views/system/post/index.vue @@ -54,7 +54,6 @@ function onEdit(row: SystemPostApi.Post) { async function onDelete(row: SystemPostApi.Post) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deletePost(row.id as number); diff --git a/apps/web-ele/src/views/system/role/index.vue b/apps/web-ele/src/views/system/role/index.vue index 3a874704c..98f238b05 100644 --- a/apps/web-ele/src/views/system/role/index.vue +++ b/apps/web-ele/src/views/system/role/index.vue @@ -68,7 +68,6 @@ function onCreate() { async function onDelete(row: SystemRoleApi.Role) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteRole(row.id as number); diff --git a/apps/web-ele/src/views/system/sms/channel/index.vue b/apps/web-ele/src/views/system/sms/channel/index.vue index 542f597ee..c22f2bfd6 100644 --- a/apps/web-ele/src/views/system/sms/channel/index.vue +++ b/apps/web-ele/src/views/system/sms/channel/index.vue @@ -54,7 +54,6 @@ function onEdit(row: SystemSmsChannelApi.SmsChannel) { async function onDelete(row: SystemSmsChannelApi.SmsChannel) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.signature]), - fullscreen: true, }); try { await deleteSmsChannel(row.id as number); diff --git a/apps/web-ele/src/views/system/sms/template/index.vue b/apps/web-ele/src/views/system/sms/template/index.vue index 9998d4cae..b462f7d5a 100644 --- a/apps/web-ele/src/views/system/sms/template/index.vue +++ b/apps/web-ele/src/views/system/sms/template/index.vue @@ -65,7 +65,6 @@ function onSend(row: SystemSmsTemplateApi.SmsTemplate) { async function onDelete(row: SystemSmsTemplateApi.SmsTemplate) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteSmsTemplate(row.id as number); diff --git a/apps/web-ele/src/views/system/social/client/index.vue b/apps/web-ele/src/views/system/social/client/index.vue index d43a2ed5d..15d303bca 100644 --- a/apps/web-ele/src/views/system/social/client/index.vue +++ b/apps/web-ele/src/views/system/social/client/index.vue @@ -47,7 +47,6 @@ function onEdit(row: SystemSocialClientApi.SocialClient) { async function onDelete(row: SystemSocialClientApi.SocialClient) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteSocialClient(row.id as number); diff --git a/apps/web-ele/src/views/system/tenant/index.vue b/apps/web-ele/src/views/system/tenant/index.vue index bc3678dc9..217badc4d 100644 --- a/apps/web-ele/src/views/system/tenant/index.vue +++ b/apps/web-ele/src/views/system/tenant/index.vue @@ -66,7 +66,6 @@ function onEdit(row: SystemTenantApi.Tenant) { async function onDelete(row: SystemTenantApi.Tenant) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteTenant(row.id as number); diff --git a/apps/web-ele/src/views/system/tenantPackage/index.vue b/apps/web-ele/src/views/system/tenantPackage/index.vue index 6dad43287..e4128036d 100644 --- a/apps/web-ele/src/views/system/tenantPackage/index.vue +++ b/apps/web-ele/src/views/system/tenantPackage/index.vue @@ -47,7 +47,6 @@ function onEdit(row: SystemTenantPackageApi.TenantPackage) { async function onDelete(row: SystemTenantPackageApi.TenantPackage) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.name]), - fullscreen: true, }); try { await deleteTenantPackage(row.id as number); diff --git a/apps/web-ele/src/views/system/user/index.vue b/apps/web-ele/src/views/system/user/index.vue index afefae2b7..2c395a05c 100644 --- a/apps/web-ele/src/views/system/user/index.vue +++ b/apps/web-ele/src/views/system/user/index.vue @@ -86,7 +86,6 @@ function onEdit(row: SystemUserApi.User) { async function onDelete(row: SystemUserApi.User) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.username]), - fullscreen: true, }); try { await deleteUser(row.id as number);