diff --git a/src/modules/smart-system/views/dataDict/DataDictGroup.vue b/src/modules/smart-system/views/dataDict/DataDictGroup.vue index 5e436fe57..980f54e9b 100644 --- a/src/modules/smart-system/views/dataDict/DataDictGroup.vue +++ b/src/modules/smart-system/views/dataDict/DataDictGroup.vue @@ -29,12 +29,17 @@ }; const [registerTable] = useSmartTable({ - columns: getDataDictGroupColumns(t), + id: 'system-dataDict', + columns: getDataDictGroupColumns(), border: true, height: 'auto', - highlightHoverRow: true, - highlightCurrentRow: true, stripe: true, + customConfig: { storage: true }, + showOverflow: 'tooltip', + rowConfig: { + isHover: true, + isCurrent: true, + }, pagerConfig: true, useSearchForm: true, searchFormConfig: { @@ -85,7 +90,8 @@ toolbarConfig: { refresh: true, zoom: true, - custom: true, + sizeSetting: true, + column: { columnOrder: true }, buttons: [{ code: 'ModalAdd' }, { code: 'ModalEdit' }, { code: 'delete' }], }, }); diff --git a/src/modules/smart-system/views/dataDict/DataDictListView.api.ts b/src/modules/smart-system/views/dataDict/DataDictListView.api.ts index eb540f236..ebb907668 100644 --- a/src/modules/smart-system/views/dataDict/DataDictListView.api.ts +++ b/src/modules/smart-system/views/dataDict/DataDictListView.api.ts @@ -1,7 +1,7 @@ import { ApiServiceEnum, defHttp } from '@/utils/http/axios'; enum Api { - listDict = 'sys/dict/list', + listDict = 'sys/dict/listFilterTenant', getByIdDict = 'sys/dict/getById', batchSaveUpdateDict = 'sys/dict/batchSaveUpdate', deleteDict = 'sys/dict/batchDeleteById', diff --git a/src/modules/smart-system/views/dataDict/DataDictListView.config.ts b/src/modules/smart-system/views/dataDict/DataDictListView.config.ts index 252678f0c..859748af2 100644 --- a/src/modules/smart-system/views/dataDict/DataDictListView.config.ts +++ b/src/modules/smart-system/views/dataDict/DataDictListView.config.ts @@ -29,6 +29,14 @@ export const getDataDictGroupColumns = (): SmartColumn[] => { // filter: 'dictName-filter', // }, }, + { + title: '{system.views.dictGroup.title.tenant}', + field: 'tenantId', + width: 140, + formatter: ({ row }) => { + return row.tenant?.tenantShortName || row.tenant?.tenantName; + }, + }, { title: '{common.table.seq}', field: 'seq', diff --git a/src/modules/smart-system/views/dataDict/lang/zh_CN.ts b/src/modules/smart-system/views/dataDict/lang/zh_CN.ts index ada3e3fa5..3a637b5c4 100644 --- a/src/modules/smart-system/views/dataDict/lang/zh_CN.ts +++ b/src/modules/smart-system/views/dataDict/lang/zh_CN.ts @@ -6,6 +6,7 @@ export default { title: { dictCode: '字典编码', dictName: '字典名称', + tenant: '租户', }, validate: { dictCode: '请输入字典编码',