Browse Source

Merge pull request #1073 from colinin/fix-api-ref

🐛 fix: 修复api引用.
pull/1076/head
yx lin 1 year ago
committed by GitHub
parent
commit
a63d8a8afd
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 12
      apps/vben5/packages/@abp/identity/src/api/index.ts
  2. 2
      apps/vben5/packages/@abp/identity/src/api/useUserLookupApi.ts
  3. 2
      apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts
  4. 4
      apps/vben5/packages/@abp/identity/src/components/organization-units/OrganizationUnitUserTable.vue
  5. 4
      apps/vben5/packages/@abp/identity/src/components/users/UserClaimModal.vue
  6. 4
      apps/vben5/packages/@abp/identity/src/components/users/UserLockModal.vue
  7. 4
      apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue
  8. 4
      apps/vben5/packages/@abp/identity/src/components/users/UserPasswordModal.vue
  9. 4
      apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue
  10. 9
      apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue
  11. 9
      apps/vben5/packages/@abp/openiddict/src/components/tokens/TokenModal.vue

12
apps/vben5/packages/@abp/identity/src/api/index.ts

@ -1,6 +1,6 @@
export * as useClaimTypesApi from './useClaimTypesApi'; export { useClaimTypesApi } from './useClaimTypesApi';
export * as useOrganizationUnitsApi from './useOrganizationUnitsApi'; export { useOrganizationUnitsApi } from './useOrganizationUnitsApi';
export * as useRolesApi from './useRolesApi'; export { useRolesApi } from './useRolesApi';
export * as useSecurityLogsApi from './useSecurityLogsApi'; export { useSecurityLogsApi } from './useSecurityLogsApi';
export * as useUserLookup from './useUserLookup'; export { useUserLookupApi } from './useUserLookupApi';
export * as useUsersApi from './useUsersApi'; export { useUsersApi } from './useUsersApi';

2
apps/vben5/packages/@abp/identity/src/api/useUserLookup.ts → apps/vben5/packages/@abp/identity/src/api/useUserLookupApi.ts

@ -8,7 +8,7 @@ import type {
import { useRequest } from '@abp/request'; import { useRequest } from '@abp/request';
export function useUserLookup() { export function useUserLookupApi() {
const { cancel, request } = useRequest(); const { cancel, request } = useRequest();
/** /**

2
apps/vben5/packages/@abp/identity/src/api/useUsersApi.ts

@ -17,7 +17,7 @@ import type {
import { useRequest } from '@abp/request'; import { useRequest } from '@abp/request';
export function useUserApi() { export function useUsersApi() {
const { cancel, request } = useRequest(); const { cancel, request } = useRequest();
/** /**

4
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 { Button, Modal } from 'ant-design-vue';
import { useOrganizationUnitsApi } from '../../api/useOrganizationUnitsApi'; import { useOrganizationUnitsApi } from '../../api/useOrganizationUnitsApi';
import { useUserApi } from '../../api/useUsersApi'; import { useUsersApi } from '../../api/useUsersApi';
import { OrganizationUnitPermissions } from '../../constants/permissions'; import { OrganizationUnitPermissions } from '../../constants/permissions';
defineOptions({ defineOptions({
@ -24,7 +24,7 @@ defineOptions({
const props = defineProps<{ const props = defineProps<{
selectedKey?: string; selectedKey?: string;
}>(); }>();
const { cancel, removeOrganizationUnitApi } = useUserApi(); const { cancel, removeOrganizationUnitApi } = useUsersApi();
const { addMembers, getUserListApi } = useOrganizationUnitsApi(); const { addMembers, getUserListApi } = useOrganizationUnitsApi();
const SelectMemberModal = defineAsyncComponent( const SelectMemberModal = defineAsyncComponent(

4
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 { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales'; import { $t } from '@vben/locales';
import { useUserApi } from '../../api/useUsersApi'; import { useUsersApi } from '../../api/useUsersApi';
import { IdentityUserPermissions } from '../../constants/permissions'; import { IdentityUserPermissions } from '../../constants/permissions';
defineOptions({ defineOptions({
@ -23,7 +23,7 @@ const ClaimTable = defineAsyncComponent(
); );
const { cancel, createClaimApi, deleteClaimApi, getClaimsApi, updateClaimApi } = const { cancel, createClaimApi, deleteClaimApi, getClaimsApi, updateClaimApi } =
useUserApi(); useUsersApi();
const [Modal, modalApi] = useVbenModal({ const [Modal, modalApi] = useVbenModal({
draggable: true, draggable: true,
fullscreenButton: false, fullscreenButton: false,

4
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 { useVbenForm } from '@abp/ui';
import { useUserApi } from '../../api/useUsersApi'; import { useUsersApi } from '../../api/useUsersApi';
defineOptions({ defineOptions({
name: 'UserLockModal', name: 'UserLockModal',
@ -23,7 +23,7 @@ enum LockType {
Years = 32_140_800, // 31*12 Years = 32_140_800, // 31*12
} }
const { cancel, lockApi } = useUserApi(); const { cancel, lockApi } = useUsersApi();
const [Form, formApi] = useVbenForm({ const [Form, formApi] = useVbenForm({
commonConfig: { commonConfig: {
// //

4
apps/vben5/packages/@abp/identity/src/components/users/UserModal.vue

@ -24,7 +24,7 @@ import {
} from 'ant-design-vue'; } from 'ant-design-vue';
import { useOrganizationUnitsApi } from '../../api/useOrganizationUnitsApi'; import { useOrganizationUnitsApi } from '../../api/useOrganizationUnitsApi';
import { useUserApi } from '../../api/useUsersApi'; import { useUsersApi } from '../../api/useUsersApi';
defineOptions({ defineOptions({
name: 'UserModal', name: 'UserModal',
@ -63,7 +63,7 @@ const {
getOrganizationUnitsApi, getOrganizationUnitsApi,
getRolesApi, getRolesApi,
updateApi, updateApi,
} = useUserApi(); } = useUsersApi();
const { getChildrenApi, getRootListApi } = useOrganizationUnitsApi(); const { getChildrenApi, getRootListApi } = useOrganizationUnitsApi();
const [Modal, modalApi] = useVbenModal({ const [Modal, modalApi] = useVbenModal({
draggable: true, draggable: true,

4
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 { Button, message } from 'ant-design-vue';
import { useUserApi } from '../../api/useUsersApi'; import { useUsersApi } from '../../api/useUsersApi';
import { useRandomPassword } from '../../hooks'; import { useRandomPassword } from '../../hooks';
defineOptions({ defineOptions({
@ -18,7 +18,7 @@ const emits = defineEmits<{
}>(); }>();
const { generatePassword } = useRandomPassword(); const { generatePassword } = useRandomPassword();
const { cancel, changePasswordApi } = useUserApi(); const { cancel, changePasswordApi } = useUsersApi();
const [Form, formApi] = useVbenForm({ const [Form, formApi] = useVbenForm({
commonConfig: { commonConfig: {

4
apps/vben5/packages/@abp/identity/src/components/users/UserTable.vue

@ -25,7 +25,7 @@ import {
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
import { Button, Dropdown, Menu, message, Modal } from 'ant-design-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'; import { IdentityUserPermissions } from '../../constants/permissions';
defineOptions({ defineOptions({
@ -64,7 +64,7 @@ const getLockEnd = computed(() => {
const abpStore = useAbpStore(); const abpStore = useAbpStore();
const { hasAccessByCodes } = useAccess(); const { hasAccessByCodes } = useAccess();
const { cancel, deleteApi, getPagedListApi, unLockApi } = useUserApi(); const { cancel, deleteApi, getPagedListApi, unLockApi } = useUsersApi();
const formOptions: VbenFormProps = { const formOptions: VbenFormProps = {
// //

9
apps/vben5/packages/@abp/openiddict/src/components/authorizations/AuthorizationModal.vue

@ -1,15 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import type { IdentityUserDto } from '@abp/identity';
import type { OpenIddictAuthorizationDto } from '../../types'; import type { OpenIddictAuthorizationDto } from '../../types';
import { useAccess } from '@vben/access'; import { useAccess } from '@vben/access';
import { useVbenForm, useVbenModal } from '@vben/common-ui'; import { useVbenForm, useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales'; import { $t } from '@vben/locales';
import { import { UserLookupPermissions, useUserLookupApi } from '@abp/identity';
type IdentityUserDto,
userLookupApi,
UserLookupPermissions,
} from '@abp/identity';
import { CodeEditor } from '@abp/ui'; import { CodeEditor } from '@abp/ui';
import { Select } from 'ant-design-vue'; import { Select } from 'ant-design-vue';
@ -23,6 +21,7 @@ defineOptions({
const Option = Select.Option; const Option = Select.Option;
const { hasAccessByCodes } = useAccess(); const { hasAccessByCodes } = useAccess();
const userLookupApi = useUserLookupApi();
const [Form, formApi] = useVbenForm({ const [Form, formApi] = useVbenForm({
commonConfig: { commonConfig: {

9
apps/vben5/packages/@abp/openiddict/src/components/tokens/TokenModal.vue

@ -1,15 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import type { IdentityUserDto } from '@abp/identity';
import type { OpenIddictTokenDto } from '../../types/tokens'; import type { OpenIddictTokenDto } from '../../types/tokens';
import { useAccess } from '@vben/access'; import { useAccess } from '@vben/access';
import { useVbenForm, useVbenModal } from '@vben/common-ui'; import { useVbenForm, useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales'; import { $t } from '@vben/locales';
import { import { UserLookupPermissions, useUserLookupApi } from '@abp/identity';
type IdentityUserDto,
userLookupApi,
UserLookupPermissions,
} from '@abp/identity';
import { CodeEditor } from '@abp/ui'; import { CodeEditor } from '@abp/ui';
import { getApi as getApplication } from '../../api/applications'; import { getApi as getApplication } from '../../api/applications';
@ -20,6 +18,7 @@ defineOptions({
}); });
const { hasAccessByCodes } = useAccess(); const { hasAccessByCodes } = useAccess();
const userLookupApi = useUserLookupApi();
const [Form, formApi] = useVbenForm({ const [Form, formApi] = useVbenForm({
commonConfig: { commonConfig: {

Loading…
Cancel
Save