diff --git a/ui/src/views/application/ApplicationAccess.vue b/ui/src/views/application/ApplicationAccess.vue index 67967dca1..8c2290c86 100644 --- a/ui/src/views/application/ApplicationAccess.vue +++ b/ui/src/views/application/ApplicationAccess.vue @@ -90,7 +90,7 @@ const platforms = reactive([ exists: false, }, { - key: 'feishu', + key: 'lark', logoSrc: new URL(`../../assets/logo/logo_lark.svg`, import.meta.url).href, name: t('views.application.applicationAccess.lark'), description: t('views.application.applicationAccess.larkTip'), @@ -143,7 +143,7 @@ function changeStatus(type: string, value: boolean) { } onMounted(() => { - // getPlatformStatus() + getPlatformStatus() }) diff --git a/ui/src/views/application/component/AccessSettingDrawer.vue b/ui/src/views/application/component/AccessSettingDrawer.vue index 72206e219..379858eae 100644 --- a/ui/src/views/application/component/AccessSettingDrawer.vue +++ b/ui/src/views/application/component/AccessSettingDrawer.vue @@ -77,7 +77,7 @@ >{{ $t('views.application.applicationAccess.wecomPlatform') }}{{ $t('views.application.applicationAccess.wecomSetting.urlInfo') }} - + {{ $t('views.application.applicationAccess.copyUrl') }} {{ $t('views.application.applicationAccess.larkPlatform') @@ -107,7 +107,7 @@ import { MsgError, MsgSuccess } from '@/utils/message' import { copyClick } from '@/utils/clipboard' import { t } from '@/locales' -type PlatformType = 'wechat' | 'dingtalk' | 'wecom' | 'feishu' | 'slack' +type PlatformType = 'wechat' | 'dingtalk' | 'wecom' | 'lark' | 'slack' const formRef = ref() const visible = ref(false) @@ -138,7 +138,7 @@ const form = reactive({ encoding_aes_key: '', callback_url: '' }, - feishu: { app_id: '', app_secret: '', verification_token: '', callback_url: '' }, + lark: { app_id: '', app_secret: '', verification_token: '', callback_url: '' }, slack: { signing_secret: '', bot_user_token: '', callback_url: '' } }) @@ -226,7 +226,7 @@ const rules = reactive<{ [propName: string]: any }>({ } ] }, - feishu: { + lark: { app_id: [ { required: true, @@ -297,7 +297,7 @@ const configFields: { [propName: string]: { [propName: string]: any } } = { token: { label: 'Token', placeholder: '' }, encoding_aes_key: { label: 'EncodingAESKey', placeholder: '' } }, - feishu: { + lark: { app_id: { label: 'App ID', placeholder: '' }, app_secret: { label: 'App Secret', placeholder: '' }, verification_token: { label: 'Verification Token', placeholder: '' } @@ -322,7 +322,7 @@ const drawerTitle = computed( wechat: t('views.application.applicationAccess.wechatSetting.title'), dingtalk: t('views.application.applicationAccess.dingtalkSetting.title'), wecom: t('views.application.applicationAccess.wecomSetting.title'), - feishu: t('views.application.applicationAccess.larkSetting.title'), + lark: t('views.application.applicationAccess.larkSetting.title'), slack: t('views.application.applicationAccess.slackSetting.title') }[configType.value]) ) @@ -333,7 +333,7 @@ const infoTitle = computed( wechat: t('views.applicationOverview.appInfo.header'), dingtalk: t('views.applicationOverview.appInfo.header'), wecom: t('views.applicationOverview.appInfo.header'), - feishu: t('views.applicationOverview.appInfo.header'), + lark: t('views.applicationOverview.appInfo.header'), slack: t('views.applicationOverview.appInfo.header') }[configType.value]) ) diff --git a/ui/src/views/chat/user-login/index.vue b/ui/src/views/chat/user-login/index.vue index 513e11c22..c84087840 100644 --- a/ui/src/views/chat/user-login/index.vue +++ b/ui/src/views/chat/user-login/index.vue @@ -303,6 +303,9 @@ function changeMode(val: string) { onBeforeMount(() => { if (chatUser.chat_profile?.login_value) { modeList.value = chatUser.chat_profile.login_value + if (modeList.value.includes('LOCAL')) { + modeList.value = ['LOCAL', ...modeList.value.filter((item) => item !== 'LOCAL')] + } loginMode.value = modeList.value[0] || 'LOCAL' if (modeList.value.length == 1 && ['CAS', 'OIDC', 'OAuth2'].includes(modeList.value[0])) { redirectAuth(modeList.value[0]) diff --git a/ui/src/views/system-chat-user/group/component/CreateGroupUserDialog.vue b/ui/src/views/system-chat-user/group/component/CreateGroupUserDialog.vue index 1e1c581af..f19c1832e 100644 --- a/ui/src/views/system-chat-user/group/component/CreateGroupUserDialog.vue +++ b/ui/src/views/system-chat-user/group/component/CreateGroupUserDialog.vue @@ -7,7 +7,9 @@ + :loading="optionLoading" + :filter-method="filterUser" + > @@ -58,6 +60,16 @@ async function getChatUserList() { } } +const filterUser = (query: string, item: ChatUserItem) => { + if (!query) return true; + const q = query.toLowerCase(); + return ( + item.nick_name?.toLowerCase().includes(q) || + item.username?.toLowerCase().includes(q) || + false + ); +}; + onBeforeMount(() => { getChatUserList() }) diff --git a/ui/src/views/system-chat-user/group/index.vue b/ui/src/views/system-chat-user/group/index.vue index c7f864cd7..079c745eb 100644 --- a/ui/src/views/system-chat-user/group/index.vue +++ b/ui/src/views/system-chat-user/group/index.vue @@ -37,6 +37,7 @@ :placeholder="$t('common.search')" prefix-icon="Search" clearable + filterable /> diff --git a/ui/src/views/system/resource-authorization/component/PermissionSetting.vue b/ui/src/views/system/resource-authorization/component/PermissionSetting.vue index d686f82f8..a74587867 100644 --- a/ui/src/views/system/resource-authorization/component/PermissionSetting.vue +++ b/ui/src/views/system/resource-authorization/component/PermissionSetting.vue @@ -1,13 +1,15 @@