userRelation 申明

This commit is contained in:
Wang Kejun 2023-08-21 14:10:39 +08:00
parent 8d59718742
commit d8acccacd3
2 changed files with 34 additions and 7 deletions

View File

@ -1,6 +1,8 @@
import { generateNewId } from 'oak-domain/lib/utils/uuid';
import { isMobile } from 'oak-domain/lib/utils/validator';
import { EntityDict } from '../../../../oak-app-domain';
import { ReactComponentProps } from 'oak-frontend-base/lib/types/Page';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity';
export default OakComponent({
entity: 'mobile',
@ -129,4 +131,15 @@ export default OakComponent({
this.onReset();
}
},
});
}) as <ED2 extends EntityDict & BaseEntityDict, T2 extends keyof ED2>(
props: ReactComponentProps<
ED2,
T2,
true,
{
entity: keyof ED2;
entityId: string;
relations: EntityDict['relation']['OpSchema'][];
}
>
) => React.ReactElement;

View File

@ -1,7 +1,8 @@
import assert from 'assert';
import { WechatMpConfig } from '../../../../entities/Application';
import { EntityDict } from '../../../../oak-app-domain';
import { QrCodeType } from '../../../../types/Config';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity';
import { ReactComponentProps } from 'oak-frontend-base/lib/types/Page';
type Unit = 'minute' | 'hour' | 'day';
@ -168,14 +169,13 @@ export default OakComponent({
}
default: {
if (unit === 'minute') {
time = period * 60 * 1000;
}
else {
time = period * 60 * 1000;
} else {
this.setMessage({
type: 'error',
content: '请选择过期时长单位',
});
return;
return;
}
break;
}
@ -198,4 +198,18 @@ export default OakComponent({
}
},
},
});
}) as <ED2 extends EntityDict & BaseEntityDict, T2 extends keyof ED2>(
props: ReactComponentProps<
ED2,
T2,
true,
{
entity: keyof ED2;
entityId: string;
redirectToAfterConfirm: ED2['userEntityGrant']['Schema']['redirectTo'];
qrCodeType: QrCodeType;
type: EntityDict['userEntityGrant']['Schema']['type'];
relations: EntityDict['relation']['OpSchema'][];
}
>
) => React.ReactElement;