diff --git a/apps/web-antd/src/views/system/tenant/data.ts b/apps/web-antd/src/views/system/tenant/data.ts
index 2ef061026..00589d421 100644
--- a/apps/web-antd/src/views/system/tenant/data.ts
+++ b/apps/web-antd/src/views/system/tenant/data.ts
@@ -8,6 +8,8 @@ import { z } from '#/adapter/form';
import { getTenantPackageList } from '#/api/system/tenant-package';
import { getRangePickerDefaultProps } from '#/utils';
+const tenantPackageList = await getTenantPackageList();
+
/** 新增/修改的表单 */
export function useFormSchema(): VbenFormSchema[] {
return [
@@ -163,9 +165,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
}
/** 列表的字段 */
-export function useGridColumns(
- getPackageName?: (packageId: number) => string | undefined,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'checkbox', width: 40 },
{
@@ -182,8 +182,10 @@ export function useGridColumns(
field: 'packageId',
title: '租户套餐',
minWidth: 180,
- formatter: (row: { cellValue: number }) => {
- return getPackageName?.(row.cellValue) || '-';
+ formatter: ({ cellValue }) => {
+ return cellValue === 0
+ ? '系统租户'
+ : tenantPackageList.find((pkg) => pkg.id === cellValue)?.name || '-';
},
},
{
diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue
index 8e4ec4cc5..ba35ef620 100644
--- a/apps/web-antd/src/views/system/tenant/index.vue
+++ b/apps/web-antd/src/views/system/tenant/index.vue
@@ -1,9 +1,8 @@
diff --git a/apps/web-ele/src/views/system/tenant/data.ts b/apps/web-ele/src/views/system/tenant/data.ts
index 060932c6e..38e15d2ec 100644
--- a/apps/web-ele/src/views/system/tenant/data.ts
+++ b/apps/web-ele/src/views/system/tenant/data.ts
@@ -8,6 +8,8 @@ import { z } from '#/adapter/form';
import { getTenantPackageList } from '#/api/system/tenant-package';
import { getRangePickerDefaultProps } from '#/utils';
+const tenantPackageList = await getTenantPackageList();
+
/** 新增/修改的表单 */
export function useFormSchema(): VbenFormSchema[] {
return [
@@ -164,9 +166,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
}
/** 列表的字段 */
-export function useGridColumns(
- getPackageName?: (packageId: number) => string | undefined,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'checkbox', width: 40 },
{
@@ -183,8 +183,10 @@ export function useGridColumns(
field: 'packageId',
title: '租户套餐',
minWidth: 180,
- formatter: (row: { cellValue: number }) => {
- return getPackageName?.(row.cellValue) || '-';
+ formatter: ({ cellValue }) => {
+ return cellValue === 0
+ ? '系统租户'
+ : tenantPackageList.find((pkg) => pkg.id === cellValue)?.name || '-';
},
},
{
diff --git a/apps/web-ele/src/views/system/tenant/index.vue b/apps/web-ele/src/views/system/tenant/index.vue
index 3c439b725..25a1be37c 100644
--- a/apps/web-ele/src/views/system/tenant/index.vue
+++ b/apps/web-ele/src/views/system/tenant/index.vue
@@ -1,9 +1,8 @@