Browse Source

feat(认证): access 认证支持设置租户

shizhongming 2 years ago
parent
commit
fc280cf0cf
  1. 2
      src/modules/smart-system/views/accessSecret/SysAuthAccessSecretListView.api.ts
  2. 42
      src/modules/smart-system/views/accessSecret/SysAuthAccessSecretListView.config.ts
  3. 11
      src/modules/smart-system/views/accessSecret/SysAuthAccessSecretListView.vue
  4. 3
      src/modules/smart-system/views/accessSecret/lang/zh_CN.ts

2
src/modules/smart-system/views/accessSecret/SysAuthAccessSecretListView.api.ts

@ -1,7 +1,7 @@
import { ApiServiceEnum, defHttp } from '@/utils/http/axios'; import { ApiServiceEnum, defHttp } from '@/utils/http/axios';
enum Api { enum Api {
list = '/sys/auth/accessSecret/list', list = '/sys/auth/accessSecret/listWithAll',
getById = '/sys/auth/accessSecret/getById', getById = '/sys/auth/accessSecret/getById',
saveUpdate = '/sys/auth/accessSecret/saveUpdate', saveUpdate = '/sys/auth/accessSecret/saveUpdate',
delete = '/sys/auth/accessSecret/batchDeleteById', delete = '/sys/auth/accessSecret/batchDeleteById',

42
src/modules/smart-system/views/accessSecret/SysAuthAccessSecretListView.config.ts

@ -14,6 +14,14 @@ export const getTableColumns = (): SmartColumn[] => {
align: 'center', align: 'center',
fixed: 'left', fixed: 'left',
}, },
{
field: 'tenantId',
title: '{system.views.auth.accessSecret.title.tenantId}',
width: 120,
formatter(params) {
return params.row.tenant?.tenantName;
},
},
{ {
field: 'seq', field: 'seq',
sortable: true, sortable: true,
@ -22,22 +30,22 @@ export const getTableColumns = (): SmartColumn[] => {
}, },
{ {
field: 'accessKey', field: 'accessKey',
title: '{system.views.auth.acccessSecret.title.accessKey}', title: '{system.views.auth.accessSecret.title.accessKey}',
width: 120, width: 120,
}, },
{ {
field: 'secretKey', field: 'secretKey',
title: '{system.views.auth.acccessSecret.title.secretKey}', title: '{system.views.auth.accessSecret.title.secretKey}',
width: 120, width: 120,
}, },
{ {
field: 'expireDate', field: 'expireDate',
title: '{system.views.auth.acccessSecret.title.expireDate}', title: '{system.views.auth.accessSecret.title.expireDate}',
width: 165, width: 165,
}, },
{ {
field: 'accessIp', field: 'accessIp',
title: '{system.views.auth.acccessSecret.title.accessIp}', title: '{system.views.auth.accessSecret.title.accessIp}',
width: 120, width: 120,
}, },
{ {
@ -92,23 +100,29 @@ export const getFormSchemas = (t: Function): FormSchema[] => {
component: 'Input', component: 'Input',
componentProps: {}, componentProps: {},
}, },
{
field: 'tenantId',
label: t('system.views.auth.accessSecret.title.tenantId'),
slot: 'addEdit-tenantId',
required: true,
},
{ {
field: 'accessKey', field: 'accessKey',
label: t('system.views.auth.acccessSecret.title.accessKey'), label: t('system.views.auth.accessSecret.title.accessKey'),
component: 'Input', component: 'Input',
componentProps: {}, componentProps: {},
dynamicDisabled: true, dynamicDisabled: true,
}, },
{ {
field: 'secretKey', field: 'secretKey',
label: t('system.views.auth.acccessSecret.title.secretKey'), label: t('system.views.auth.accessSecret.title.secretKey'),
component: 'Input', component: 'Input',
componentProps: {}, componentProps: {},
dynamicDisabled: true, dynamicDisabled: true,
}, },
{ {
field: 'expireDate', field: 'expireDate',
label: t('system.views.auth.acccessSecret.title.expireDate'), label: t('system.views.auth.accessSecret.title.expireDate'),
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
showTime: true, showTime: true,
@ -117,10 +131,10 @@ export const getFormSchemas = (t: Function): FormSchema[] => {
}, },
{ {
field: 'accessIp', field: 'accessIp',
label: t('system.views.auth.acccessSecret.title.accessIp'), label: t('system.views.auth.accessSecret.title.accessIp'),
component: 'InputTextArea', component: 'InputTextArea',
componentProps: { componentProps: {
placeholder: t('system.views.auth.acccessSecret.validate.accessIp'), placeholder: t('system.views.auth.accessSecret.validate.accessIp'),
}, },
}, },
{ {
@ -148,15 +162,21 @@ export const getFormSchemas = (t: Function): FormSchema[] => {
export const getSearchFormSchemas = (t: Function): SmartSearchFormSchema[] => { export const getSearchFormSchemas = (t: Function): SmartSearchFormSchema[] => {
return [ return [
{
field: 'tenantId',
label: t('system.views.auth.accessSecret.title.tenantId'),
slot: 'search-tenantId',
searchSymbol: '=',
},
{ {
field: 'accessKey', field: 'accessKey',
label: t('system.views.auth.acccessSecret.title.accessKey'), label: t('system.views.auth.accessSecret.title.accessKey'),
component: 'Input', component: 'Input',
searchSymbol: 'like', searchSymbol: 'like',
}, },
{ {
field: 'secretKey', field: 'secretKey',
label: t('system.views.auth.acccessSecret.title.secretKey'), label: t('system.views.auth.accessSecret.title.secretKey'),
component: 'Input', component: 'Input',
searchSymbol: 'like', searchSymbol: 'like',
}, },

11
src/modules/smart-system/views/accessSecret/SysAuthAccessSecretListView.vue

@ -4,6 +4,12 @@
<template #table-operation="{ row }"> <template #table-operation="{ row }">
<SmartVxeTableAction :actions="getActions(row)" /> <SmartVxeTableAction :actions="getActions(row)" />
</template> </template>
<template #search-tenantId="{ model, field }">
<SysTenantSelect allowClear style="width: 120px" v-model:value="model[field]" />
</template>
<template #addEdit-tenantId="{ model, field }">
<SysTenantSelect allowClear v-model:value="model[field]" />
</template>
</SmartTable> </SmartTable>
</div> </div>
</template> </template>
@ -25,6 +31,7 @@
getSearchFormSchemas, getSearchFormSchemas,
} from './SysAuthAccessSecretListView.config'; } from './SysAuthAccessSecretListView.config';
import { listApi, deleteApi, getByIdApi, saveUpdateApi } from './SysAuthAccessSecretListView.api'; import { listApi, deleteApi, getByIdApi, saveUpdateApi } from './SysAuthAccessSecretListView.api';
import { SysTenantSelect } from '@/modules/smart-system/components';
const { t } = useI18n(); const { t } = useI18n();
const { getTableSize } = useSizeSetting(); const { getTableSize } = useSizeSetting();
@ -50,6 +57,10 @@
rowConfig: { rowConfig: {
isHover: true, isHover: true,
}, },
stripe: true,
columnConfig: {
resizable: true,
},
showOverflow: 'tooltip', showOverflow: 'tooltip',
pagerConfig: true, pagerConfig: true,
useSearchForm: true, useSearchForm: true,

3
src/modules/smart-system/views/accessSecret/lang/zh_CN.ts

@ -3,7 +3,7 @@
*/ */
export default { export default {
trans: true, trans: true,
key: 'system.views.auth.acccessSecret', key: 'system.views.auth.accessSecret',
data: { data: {
title: { title: {
accessKey: 'Access key', accessKey: 'Access key',
@ -12,6 +12,7 @@ export default {
accessIp: '授权IP或域名', accessIp: '授权IP或域名',
createBy: 'createBy', createBy: 'createBy',
updateBy: 'updateBy', updateBy: 'updateBy',
tenantId: '所属租户',
}, },
validate: { validate: {
accessKey: '请输入Access key', accessKey: '请输入Access key',

Loading…
Cancel
Save