diff --git a/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue b/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue index 2be1527d1..05035cb51 100644 --- a/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue +++ b/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue @@ -48,7 +48,7 @@ async function handleOauthToken() { //登录成功 userStore.onLoginSuccess(res); //跳转到首页 - router.replace("/"); + router.replace("/index"); return; } if (res.bindRequired) { diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/iconsets.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/iconsets.ts new file mode 100644 index 000000000..4b062c8e8 --- /dev/null +++ b/packages/ui/certd-server/src/plugins/plugin-oauth/iconsets.ts @@ -0,0 +1,13 @@ +export const IconSets = [ + "streamline-logos", + "logos", + "fa-brands", + "fa-solid", + "fa-regular", + "carbon", + "ion", + "ant-design", + "mdi", + "twemoji", + "svg-spinners" +] \ No newline at end of file diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts index d9c77b6ce..62e245b46 100644 --- a/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts +++ b/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts @@ -1,5 +1,6 @@ import { AddonInput, BaseAddon, IsAddon } from "@certd/lib-server"; import { BuildLoginUrlReq, BuildLogoutUrlReq, IOauthProvider, OnCallbackReq } from "../api.js"; +import { IconSets } from "../iconsets.js"; @IsAddon({ addonType: "oauth", @@ -47,7 +48,8 @@ export class CloginOauthProvider extends BaseAddon implements IOauthProvider { title: "自定义图标", component: { name:"fs-icon-selector", - vModel:"modelValue" + vModel:"modelValue", + iconSets: IconSets, }, required: false, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts index 3c8770a7a..d42b61403 100644 --- a/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts +++ b/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts @@ -1,5 +1,6 @@ import { AddonInput, BaseAddon, IsAddon } from "@certd/lib-server"; import { BuildLoginUrlReq, BuildLogoutUrlReq, IOauthProvider, OnCallbackReq } from "../api.js"; +import { IconSets } from "../iconsets.js"; @IsAddon({ addonType: "oauth", @@ -15,7 +16,8 @@ export class OidcOauthProvider extends BaseAddon implements IOauthProvider { title: "自定义图标", component: { name:"fs-icon-selector", - vModel:"modelValue" + vModel:"modelValue", + iconSets: IconSets, }, required: false, })