From 55436006964ecd520f8a5de596380cded76f4b68 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 21 Nov 2023 21:46:24 +0800 Subject: [PATCH] chore: Optimize dict cache --- src/api/platform/system/controller/dictdata.ts | 6 +++++- src/views/core/loginmini/MiniLogin.vue | 4 ++-- src/views/system/ssoLogin/kics/index.vue | 4 ++-- src/views/system/user/user.data.ts | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/api/platform/system/controller/dictdata.ts b/src/api/platform/system/controller/dictdata.ts index 8cf4c55..d4de3ec 100644 --- a/src/api/platform/system/controller/dictdata.ts +++ b/src/api/platform/system/controller/dictdata.ts @@ -12,7 +12,8 @@ enum Api { get = '/system_proxy/system/dictData', edit = '/system_proxy/system/dictData/update', del = '/system_proxy/system/dictData/remove', - getByDictType = '/system_proxy/system/dictData/dictType' + getByDictType = '/system_proxy/system/dictData/dictType', + anonymousGetDictType = '/system_proxy/system/dictData/anonymousGetDictType' } /** 查询字典数据列表 */ @@ -32,3 +33,6 @@ export const delDictData = (ids: string) => defHttp.delete({ url: `${Api.del}/${ /** 根据字典类型查询字典数据 */ export const getDataByDictType = (params: Recordable) => defHttp.get({ url: Api.getByDictType, params }); + +/** 公开匿名查询字典数据 */ +export const anonymousGetDictType = (params: Recordable) => defHttp.get({ url: Api.anonymousGetDictType, params }); diff --git a/src/views/core/loginmini/MiniLogin.vue b/src/views/core/loginmini/MiniLogin.vue index 2a4e166..581bf00 100644 --- a/src/views/core/loginmini/MiniLogin.vue +++ b/src/views/core/loginmini/MiniLogin.vue @@ -235,7 +235,7 @@ import { Dropdown, DropMenu } from '/@/components/Dropdown'; import { Button } from '/@/components/Button'; import { loginTenantList } from '/@/api/platform/system/controller/tenant'; - import { getDataByDictType } from '/@/api/platform/system/controller/dictdata'; + import { anonymousGetDictType } from '/@/api/platform/system/controller/dictdata'; defineProps({ sessionTimeout: { @@ -493,7 +493,7 @@ options.tenantIdList[0] && (formData.tenantId = [options.tenantIdList[0].event]); if (getEnabledIdentityProvider.value) { - const identityProviderList = await getDataByDictType({ type: 'identityProvider', tenantId: formData.tenantId }); + const identityProviderList = await anonymousGetDictType({ type: 'identityProvider', tenantId: formData.tenantId }); options.identityProviderList = identityProviderList.map(item => ({ text: item.label, event: item.value, diff --git a/src/views/system/ssoLogin/kics/index.vue b/src/views/system/ssoLogin/kics/index.vue index cdca48d..e2efc8f 100644 --- a/src/views/system/ssoLogin/kics/index.vue +++ b/src/views/system/ssoLogin/kics/index.vue @@ -101,7 +101,7 @@ import { useDesign } from '/@/hooks/web/useDesign'; import { useAppInject } from '/@/hooks/web/useAppInject'; import { useRouter } from 'vue-router'; - import { getDataByDictType } from '/@/api/platform/system/controller/dictdata'; + import { anonymousGetDictType } from '/@/api/platform/system/controller/dictdata'; const { currentRoute, replace } = useRouter(); const { params, query } = unref(currentRoute); @@ -124,7 +124,7 @@ const { getIsMobile } = useAppInject(); onMounted(async () => { - formData.identityProviderDictData = await getDataByDictType({ type: 'identityProvider', tenantId: formData.tenantId }); + formData.identityProviderDictData = await anonymousGetDictType({ type: 'identityProvider', tenantId: formData.tenantId }); // 设置默认勾选 if(formData.identityProviderDictData[0]) { formData.identityProvider = formData.identityProviderDictData[0]?.value; diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts index 5dfc7ca..3f6db0d 100644 --- a/src/views/system/user/user.data.ts +++ b/src/views/system/user/user.data.ts @@ -15,6 +15,7 @@ import { useMessage } from '/@/hooks/web/useMessage'; import { getUserTypeList } from '/@/api/platform/system/controller/user'; import { SystemUserType } from '/@/enums/permissionEnum'; import { selectBindSsoUserList } from '/@/api/platform/system/controller/ssoUser'; +import {getDataByDictType} from '/@/api/platform/system/controller/dictdata'; /** 通用变量统一声明区域 */ const { createConfirm } = useMessage(); @@ -192,6 +193,20 @@ export const userFormSchema: FormSchema[] = [ span: 12 } }, + { + field: 'subscriber', + label: '订阅', + component: 'ApiSelect', + required: true, + componentProps: { + api: getDataByDictType, + params: { type: 'subscriber' }, + resultField: 'data' + }, + colProps: { + span: 12 + } + }, { field: 'mapCenter', label: '地图中心点',