From f77e731357a16e43645ba8cd51c20d3a7e92b793 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 10 Oct 2025 09:50:37 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BB=9F=E4=B8=80=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20useGridColumns<T=20=3D=20=E6=B3=9B=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/erp/finance/account/data.ts          | 5 +++--
 apps/web-antd/src/views/erp/stock/warehouse/data.ts          | 4 ++--
 apps/web-antd/src/views/mall/product/comment/data.ts         | 4 ++--
 apps/web-antd/src/views/mall/product/spu/data.ts             | 4 ++--
 .../web-antd/src/views/mall/promotion/seckill/config/data.ts | 4 ++--
 apps/web-antd/src/views/mall/trade/brokerage/user/data.ts    | 4 ++--
 apps/web-antd/src/views/pay/app/data.ts                      | 4 ++--
 apps/web-antd/src/views/system/user/data.ts                  | 4 ++--
 apps/web-ele/src/views/mall/product/comment/data.ts          | 4 ++--
 apps/web-ele/src/views/mall/product/spu/data.ts              | 4 ++--
 apps/web-ele/src/views/mall/promotion/seckill/config/data.ts | 4 ++--
 apps/web-ele/src/views/pay/app/data.ts                       | 4 ++--
 apps/web-ele/src/views/system/user/data.ts                   | 4 ++--
 13 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/apps/web-antd/src/views/erp/finance/account/data.ts b/apps/web-antd/src/views/erp/finance/account/data.ts
index a93b42b8f..0b4495b1a 100644
--- a/apps/web-antd/src/views/erp/finance/account/data.ts
+++ b/apps/web-antd/src/views/erp/finance/account/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpAccountApi } from '#/api/erp/finance/account';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -123,10 +124,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = ErpAccountApi.Account>(
+export function useGridColumns(
   onDefaultStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: ErpAccountApi.Account,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/data.ts b/apps/web-antd/src/views/erp/stock/warehouse/data.ts
index fead0d5ab..ff8045b83 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/data.ts
+++ b/apps/web-antd/src/views/erp/stock/warehouse/data.ts
@@ -121,10 +121,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = ErpWarehouseApi.Warehouse>(
+export function useGridColumns(
   onDefaultStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: ErpWarehouseApi.Warehouse,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/mall/product/comment/data.ts b/apps/web-antd/src/views/mall/product/comment/data.ts
index 2b37fab9e..b2a23a17f 100644
--- a/apps/web-antd/src/views/mall/product/comment/data.ts
+++ b/apps/web-antd/src/views/mall/product/comment/data.ts
@@ -151,10 +151,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallCommentApi.Comment>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: MallCommentApi.Comment,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/mall/product/spu/data.ts b/apps/web-antd/src/views/mall/product/spu/data.ts
index 6ceb265ea..138a2b53c 100644
--- a/apps/web-antd/src/views/mall/product/spu/data.ts
+++ b/apps/web-antd/src/views/mall/product/spu/data.ts
@@ -40,10 +40,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallSpuApi.Spu>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSpuApi.Spu,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
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 bce62ae0d..cd9ffa8b3 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
@@ -91,10 +91,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 表格列配置 */
-export function useGridColumns<T = MallSeckillConfigApi.SeckillConfig>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSeckillConfigApi.SeckillConfig,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
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 e3d30da08..1c9856e4d 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
@@ -47,10 +47,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallBrokerageUserApi.BrokerageUser>(
+export function useGridColumns(
   onBrokerageEnabledChange?: (
     newEnabled: boolean,
-    row: T,
+    row: MallBrokerageUserApi.BrokerageUser,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/pay/app/data.ts b/apps/web-antd/src/views/pay/app/data.ts
index 451faa62b..2de2057f2 100644
--- a/apps/web-antd/src/views/pay/app/data.ts
+++ b/apps/web-antd/src/views/pay/app/data.ts
@@ -46,10 +46,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = PayAppApi.App>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: PayAppApi.App,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/system/user/data.ts b/apps/web-antd/src/views/system/user/data.ts
index a568e23bf..fca5ddefd 100644
--- a/apps/web-antd/src/views/system/user/data.ts
+++ b/apps/web-antd/src/views/system/user/data.ts
@@ -281,10 +281,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = SystemUserApi.User>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: SystemUserApi.User,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/mall/product/comment/data.ts b/apps/web-ele/src/views/mall/product/comment/data.ts
index 0b079f6c3..f8a07a022 100644
--- a/apps/web-ele/src/views/mall/product/comment/data.ts
+++ b/apps/web-ele/src/views/mall/product/comment/data.ts
@@ -139,10 +139,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallCommentApi.Comment>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: MallCommentApi.Comment,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/mall/product/spu/data.ts b/apps/web-ele/src/views/mall/product/spu/data.ts
index 534dee2b7..1037fa4f3 100644
--- a/apps/web-ele/src/views/mall/product/spu/data.ts
+++ b/apps/web-ele/src/views/mall/product/spu/data.ts
@@ -44,10 +44,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallSpuApi.Spu>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSpuApi.Spu,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts b/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
index bce62ae0d..cd9ffa8b3 100644
--- a/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
@@ -91,10 +91,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 表格列配置 */
-export function useGridColumns<T = MallSeckillConfigApi.SeckillConfig>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSeckillConfigApi.SeckillConfig,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/pay/app/data.ts b/apps/web-ele/src/views/pay/app/data.ts
index b56df2b8b..063cd42ef 100644
--- a/apps/web-ele/src/views/pay/app/data.ts
+++ b/apps/web-ele/src/views/pay/app/data.ts
@@ -46,10 +46,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = PayAppApi.App>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: PayAppApi.App,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/system/user/data.ts b/apps/web-ele/src/views/system/user/data.ts
index c1283b47b..d1e669354 100644
--- a/apps/web-ele/src/views/system/user/data.ts
+++ b/apps/web-ele/src/views/system/user/data.ts
@@ -284,10 +284,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = SystemUserApi.User>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: SystemUserApi.User,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [