From c17afb1d7ac6b7b42760eca46dd2d1b0bb8ab853 Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 13 Jan 2025 09:01:53 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20fix:=20=E4=BF=AE=E5=A4=8Dapi=E5=BC=95?= =?UTF-8?q?=E7=94=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/vben5/packages/@abp/identity/src/api/index.ts | 12 ++++++------ .../api/{useUserLookup.ts => useUserLookupApi.ts} | 2 +- .../packages/@abp/identity/src/api/useUsersApi.ts | 2 +- .../organization-units/OrganizationUnitUserTable.vue | 4 ++-- .../identity/src/components/users/UserClaimModal.vue | 4 ++-- .../identity/src/components/users/UserLockModal.vue | 4 ++-- .../@abp/identity/src/components/users/UserModal.vue | 4 ++-- .../src/components/users/UserPasswordModal.vue | 4 ++-- .../@abp/identity/src/components/users/UserTable.vue | 4 ++-- .../components/authorizations/AuthorizationModal.vue | 9 ++++----- .../openiddict/src/components/tokens/TokenModal.vue | 9 ++++----- 11 files changed, 28 insertions(+), 30 deletions(-) rename apps/vben5/packages/@abp/identity/src/api/{useUserLookup.ts => useUserLookupApi.ts} (97%) diff --git a/apps/vben5/packages/@abp/identity/src/api/index.ts b/apps/vben5/packages/@abp/identity/src/api/index.ts index a1d18a620..78cb73ef3 100644 --- a/apps/vben5/packages/@abp/identity/src/api/index.ts +++ b/apps/vben5/packages/@abp/identity/src/api/index.ts @@ -1,6 +1,6 @@ -export * as useClaimTypesApi from './useClaimTypesApi'; -export * as useOrganizationUnitsApi from './useOrganizationUnitsApi'; -export * as useRolesApi from './useRolesApi'; -export * as useSecurityLogsApi from './useSecurityLogsApi'; -export * as useUserLookup from './useUserLookup'; -export * as useUsersApi from './useUsersApi'; +export { useClaimTypesApi } from './useClaimTypesApi'; +export { useOrganizationUnitsApi } from './useOrganizationUnitsApi'; +export { useRolesApi } from './useRolesApi'; +export { useSecurityLogsApi } from './useSecurityLogsApi'; +export { useUserLookupApi } from './useUserLookupApi'; +export { useUsersApi } from './useUsersApi'; diff --git a/apps/vben5/packages/@abp/identity/src/api/useUserLookup.ts b/apps/vben5/packages/@abp/identity/src/api/useUserLookupApi.ts similarity index 97% rename from apps/vben5/packages/@abp/identity/src/api/useUserLookup.ts rename to apps/vben5/packages/@abp/identity/src/api/useUserLookupApi.ts index df1c698f7..327207caf 100644 --- a/apps/vben5/packages/@abp/identity/src/api/useUserLookup.ts +++ b/apps/vben5/packages/@abp/identity/src/api/useUserLookupApi.ts @@ -8,7 +8,7 @@ import type { import { useRequest } from '@abp/request'; -export function useUserLookup() { +export function useUserLookupApi() { const { cancel, request } = useRequest(); /** diff --git a/apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts b/apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts index 482cf167d..29f99633e 100644 --- a/apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts +++ b/apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts @@ -17,7 +17,7 @@ import type { import { useRequest } from '@abp/request'; -export function useUserApi() { +export function useUsersApi() { const { cancel, request } = useRequest(); /** diff --git a/apps/vben5/packages/@abp/identity/src/components/organization-units/OrganizationUnitUserTable.vue b/apps/vben5/packages/@abp/identity/src/components/organization-units/OrganizationUnitUserTable.vue index f304696a6..75e5c70bf 100644 --- a/apps/vben5/packages/@abp/identity/src/components/organization-units/OrganizationUnitUserTable.vue +++ b/apps/vben5/packages/@abp/identity/src/components/organization-units/OrganizationUnitUserTable.vue @@ -14,7 +14,7 @@ import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue'; import { Button, Modal } from 'ant-design-vue'; import { useOrganizationUnitsApi } from '../../api/useOrganizationUnitsApi'; -import { useUserApi } from '../../api/useUsersApi'; +import { useUsersApi } from '../../api/useUsersApi'; import { OrganizationUnitPermissions } from '../../constants/permissions'; defineOptions({ @@ -24,7 +24,7 @@ defineOptions({ const props = defineProps<{ selectedKey?: string; }>(); -const { cancel, removeOrganizationUnitApi } = useUserApi(); +const { cancel, removeOrganizationUnitApi } = useUsersApi(); const { addMembers, getUserListApi } = useOrganizationUnitsApi(); const SelectMemberModal = defineAsyncComponent( diff --git a/apps/vben5/packages/@abp/identity/src/components/users/UserClaimModal.vue b/apps/vben5/packages/@abp/identity/src/components/users/UserClaimModal.vue index 0b602428d..225128272 100644 --- a/apps/vben5/packages/@abp/identity/src/components/users/UserClaimModal.vue +++ b/apps/vben5/packages/@abp/identity/src/components/users/UserClaimModal.vue @@ -11,7 +11,7 @@ import { defineAsyncComponent } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; -import { useUserApi } from '../../api/useUsersApi'; +import { useUsersApi } from '../../api/useUsersApi'; import { IdentityUserPermissions } from '../../constants/permissions'; defineOptions({ @@ -23,7 +23,7 @@ const ClaimTable = defineAsyncComponent( ); const { cancel, createClaimApi, deleteClaimApi, getClaimsApi, updateClaimApi } = - useUserApi(); + useUsersApi(); const [Modal, modalApi] = useVbenModal({ draggable: true, fullscreenButton: false, diff --git a/apps/vben5/packages/@abp/identity/src/components/users/UserLockModal.vue b/apps/vben5/packages/@abp/identity/src/components/users/UserLockModal.vue index 2a5b778d1..0ce100a9c 100644 --- a/apps/vben5/packages/@abp/identity/src/components/users/UserLockModal.vue +++ b/apps/vben5/packages/@abp/identity/src/components/users/UserLockModal.vue @@ -5,7 +5,7 @@ import { $t } from '@vben/locales'; import { useVbenForm } from '@abp/ui'; -import { useUserApi } from '../../api/useUsersApi'; +import { useUsersApi } from '../../api/useUsersApi'; defineOptions({ name: 'UserLockModal', @@ -23,7 +23,7 @@ enum LockType { Years = 32_140_800, // 按31*12天计算 } -const { cancel, lockApi } = useUserApi(); +const { cancel, lockApi } = useUsersApi(); const [Form, formApi] = useVbenForm({ commonConfig: { // 所有表单项 diff --git a/apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue b/apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue index d56e643e7..cdae0967c 100644 --- a/apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue +++ b/apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue @@ -24,7 +24,7 @@ import { } from 'ant-design-vue'; import { useOrganizationUnitsApi } from '../../api/useOrganizationUnitsApi'; -import { useUserApi } from '../../api/useUsersApi'; +import { useUsersApi } from '../../api/useUsersApi'; defineOptions({ name: 'UserModal', @@ -63,7 +63,7 @@ const { getOrganizationUnitsApi, getRolesApi, updateApi, -} = useUserApi(); +} = useUsersApi(); const { getChildrenApi, getRootListApi } = useOrganizationUnitsApi(); const [Modal, modalApi] = useVbenModal({ draggable: true, diff --git a/apps/vben5/packages/@abp/identity/src/components/users/UserPasswordModal.vue b/apps/vben5/packages/@abp/identity/src/components/users/UserPasswordModal.vue index b516ee8f1..25eb9fd13 100644 --- a/apps/vben5/packages/@abp/identity/src/components/users/UserPasswordModal.vue +++ b/apps/vben5/packages/@abp/identity/src/components/users/UserPasswordModal.vue @@ -7,7 +7,7 @@ import { $t } from '@vben/locales'; import { Button, message } from 'ant-design-vue'; -import { useUserApi } from '../../api/useUsersApi'; +import { useUsersApi } from '../../api/useUsersApi'; import { useRandomPassword } from '../../hooks'; defineOptions({ @@ -18,7 +18,7 @@ const emits = defineEmits<{ }>(); const { generatePassword } = useRandomPassword(); -const { cancel, changePasswordApi } = useUserApi(); +const { cancel, changePasswordApi } = useUsersApi(); const [Form, formApi] = useVbenForm({ commonConfig: { diff --git a/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue b/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue index f4e579c6b..ff3059d12 100644 --- a/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue +++ b/apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue @@ -25,7 +25,7 @@ import { } from '@ant-design/icons-vue'; import { Button, Dropdown, Menu, message, Modal } from 'ant-design-vue'; -import { useUserApi } from '../../api/useUsersApi'; +import { useUsersApi } from '../../api/useUsersApi'; import { IdentityUserPermissions } from '../../constants/permissions'; defineOptions({ @@ -64,7 +64,7 @@ const getLockEnd = computed(() => { const abpStore = useAbpStore(); const { hasAccessByCodes } = useAccess(); -const { cancel, deleteApi, getPagedListApi, unLockApi } = useUserApi(); +const { cancel, deleteApi, getPagedListApi, unLockApi } = useUsersApi(); const formOptions: VbenFormProps = { // 默认展开 diff --git a/apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue b/apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue index cac36ece7..7057c3460 100644 --- a/apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue +++ b/apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue @@ -1,15 +1,13 @@