Browse Source
Merge pull request #1073 from colinin/fix-api-ref
🐛 fix: 修复api引用.
pull/1076/head
yx lin
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with
28 additions and
30 deletions
-
apps/vben5/packages/@abp/identity/src/api/index.ts
-
apps/vben5/packages/@abp/identity/src/api/useUserLookupApi.ts
-
apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts
-
apps/vben5/packages/@abp/identity/src/components/organization-units/OrganizationUnitUserTable.vue
-
apps/vben5/packages/@abp/identity/src/components/users/UserClaimModal.vue
-
apps/vben5/packages/@abp/identity/src/components/users/UserLockModal.vue
-
apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue
-
apps/vben5/packages/@abp/identity/src/components/users/UserPasswordModal.vue
-
apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue
-
apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue
-
apps/vben5/packages/@abp/openiddict/src/components/tokens/TokenModal.vue
|
|
|
@ -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'; |
|
|
|
|
|
|
|
@ -8,7 +8,7 @@ import type { |
|
|
|
|
|
|
|
import { useRequest } from '@abp/request'; |
|
|
|
|
|
|
|
export function useUserLookup() { |
|
|
|
export function useUserLookupApi() { |
|
|
|
const { cancel, request } = useRequest(); |
|
|
|
|
|
|
|
/** |
|
|
|
@ -17,7 +17,7 @@ import type { |
|
|
|
|
|
|
|
import { useRequest } from '@abp/request'; |
|
|
|
|
|
|
|
export function useUserApi() { |
|
|
|
export function useUsersApi() { |
|
|
|
const { cancel, request } = useRequest(); |
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
@ -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( |
|
|
|
|
|
|
|
@ -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, |
|
|
|
|
|
|
|
@ -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: { |
|
|
|
// 所有表单项 |
|
|
|
|
|
|
|
@ -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, |
|
|
|
|
|
|
|
@ -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: { |
|
|
|
|
|
|
|
@ -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 = { |
|
|
|
// 默认展开 |
|
|
|
|
|
|
|
@ -1,15 +1,13 @@ |
|
|
|
<script setup lang="ts"> |
|
|
|
import type { IdentityUserDto } from '@abp/identity'; |
|
|
|
|
|
|
|
import type { OpenIddictAuthorizationDto } from '../../types'; |
|
|
|
|
|
|
|
import { useAccess } from '@vben/access'; |
|
|
|
import { useVbenForm, useVbenModal } from '@vben/common-ui'; |
|
|
|
import { $t } from '@vben/locales'; |
|
|
|
|
|
|
|
import { |
|
|
|
type IdentityUserDto, |
|
|
|
userLookupApi, |
|
|
|
UserLookupPermissions, |
|
|
|
} from '@abp/identity'; |
|
|
|
import { UserLookupPermissions, useUserLookupApi } from '@abp/identity'; |
|
|
|
import { CodeEditor } from '@abp/ui'; |
|
|
|
import { Select } from 'ant-design-vue'; |
|
|
|
|
|
|
|
@ -23,6 +21,7 @@ defineOptions({ |
|
|
|
const Option = Select.Option; |
|
|
|
|
|
|
|
const { hasAccessByCodes } = useAccess(); |
|
|
|
const userLookupApi = useUserLookupApi(); |
|
|
|
|
|
|
|
const [Form, formApi] = useVbenForm({ |
|
|
|
commonConfig: { |
|
|
|
|
|
|
|
@ -1,15 +1,13 @@ |
|
|
|
<script setup lang="ts"> |
|
|
|
import type { IdentityUserDto } from '@abp/identity'; |
|
|
|
|
|
|
|
import type { OpenIddictTokenDto } from '../../types/tokens'; |
|
|
|
|
|
|
|
import { useAccess } from '@vben/access'; |
|
|
|
import { useVbenForm, useVbenModal } from '@vben/common-ui'; |
|
|
|
import { $t } from '@vben/locales'; |
|
|
|
|
|
|
|
import { |
|
|
|
type IdentityUserDto, |
|
|
|
userLookupApi, |
|
|
|
UserLookupPermissions, |
|
|
|
} from '@abp/identity'; |
|
|
|
import { UserLookupPermissions, useUserLookupApi } from '@abp/identity'; |
|
|
|
import { CodeEditor } from '@abp/ui'; |
|
|
|
|
|
|
|
import { getApi as getApplication } from '../../api/applications'; |
|
|
|
@ -20,6 +18,7 @@ defineOptions({ |
|
|
|
}); |
|
|
|
|
|
|
|
const { hasAccessByCodes } = useAccess(); |
|
|
|
const userLookupApi = useUserLookupApi(); |
|
|
|
|
|
|
|
const [Form, formApi] = useVbenForm({ |
|
|
|
commonConfig: { |
|
|
|
|