diff --git a/src/components/SmartTable/src/utils/TableCommon.tsx b/src/components/SmartTable/src/utils/TableCommon.tsx index 20aa55cbf..3149b3562 100644 --- a/src/components/SmartTable/src/utils/TableCommon.tsx +++ b/src/components/SmartTable/src/utils/TableCommon.tsx @@ -111,22 +111,22 @@ const tableUseYn = (t: Function) => { }; }; -const tableUseYnClass = (): SmartColumn => { +const tableUseYnClass = (field = 'useYn'): SmartColumn => { const { t } = useI18n(); return { title: '{common.table.useYn}', - field: 'useYn', + field, width: 100, formatter: ({ row }) => { - const useYn = row.useYn as boolean | null; + const useYn = row[field] as boolean | null; if (useYn === null) { return ''; } return useYn ? t('common.form.use') : t('common.form.noUse'); }, dynamicClass: ({ row }) => { - const useYn = row.useYn as boolean | null; + const useYn = row[field] as boolean | null; if (useYn === null) { return ''; } @@ -135,4 +135,26 @@ const tableUseYnClass = (): SmartColumn => { }; }; -export { tableUseYn, tableDeleteYn, tableUseYnClass }; +const tableBooleanClass = (field: string): SmartColumn => { + const { t } = useI18n(); + return { + width: 100, + field, + formatter({ row }) { + const value = row[field] as boolean | null; + if (value === null) { + return ''; + } + return value ? t('common.form.yes') : t('common.form.no'); + }, + dynamicClass: ({ row }) => { + const value = row[field] as boolean | null; + if (value === null) { + return ''; + } + return value ? 'text-color--success-bold' : 'text-color--danger-bold'; + }, + }; +}; + +export { tableUseYn, tableDeleteYn, tableUseYnClass, tableBooleanClass }; diff --git a/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.config.ts b/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.config.ts index 0692789b0..68ea1705c 100644 --- a/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.config.ts +++ b/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.config.ts @@ -1,6 +1,6 @@ import type { SmartColumn, SmartSearchFormSchema } from '@/components/SmartTable'; import type { FormSchema } from '@/components/Form'; -import { tableUseYnClass } from '@/components/SmartTable'; +import { tableUseYnClass, tableBooleanClass } from '@/components/SmartTable'; import { Ref, unref } from 'vue'; import { listNoBindPackageByTenantIdApi } from './SysTenantListView.api'; @@ -55,6 +55,10 @@ export const getTableColumns = (): SmartColumn[] => { default: 'table-type', }, }, + { + ...tableBooleanClass('platformYn'), + title: '{system.views.tenant.manager.title.platformYn}', + }, { field: 'contacts', title: '{system.views.tenant.manager.title.contacts}', diff --git a/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.vue b/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.vue index 46a13f6de..02a8ca7fa 100644 --- a/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.vue +++ b/src/modules/smart-system/views/tenant/tenantManager/SysTenantListView.vue @@ -90,6 +90,10 @@ border: true, sortConfig: { remote: true, + defaultSort: { + field: 'seq', + order: 'asc', + }, }, customConfig: { storage: true }, showOverflow: 'tooltip', @@ -146,6 +150,7 @@ column: { columnOrder: true, }, + sizeSetting: true, buttons: [ { code: 'ModalAdd', diff --git a/src/modules/smart-system/views/tenant/tenantManager/lang/zh_CN.ts b/src/modules/smart-system/views/tenant/tenantManager/lang/zh_CN.ts index c8db8379b..8a32039b9 100644 --- a/src/modules/smart-system/views/tenant/tenantManager/lang/zh_CN.ts +++ b/src/modules/smart-system/views/tenant/tenantManager/lang/zh_CN.ts @@ -25,6 +25,7 @@ export default { setPackage: '设置套餐', tabUser: '绑定用户', tabSubscribe: '订阅套餐', + platformYn: '平台管理', user: { username: '用户名', fullName: '姓名',