fix
This commit is contained in:
parent
d3b10014fd
commit
941e3d1e43
|
|
@ -17,6 +17,7 @@ import { updateConfig, updateApplicationConfig } from './config';
|
|||
import { mergeUser, getChangePasswordChannels } from './user';
|
||||
import { createWechatLogin } from './wechaLogin';
|
||||
import { unbindingWechat } from './wechatUser';
|
||||
import { getMpUnlimitWxaCode } from './wechatQrCode';
|
||||
|
||||
const aspectDict = {
|
||||
mergeUser,
|
||||
|
|
@ -40,6 +41,7 @@ const aspectDict = {
|
|||
loginByWechat,
|
||||
getInfoByUrl,
|
||||
getChangePasswordChannels,
|
||||
getMpUnlimitWxaCode,
|
||||
};
|
||||
|
||||
export default aspectDict;
|
||||
|
|
|
|||
|
|
@ -222,8 +222,8 @@ async function setUpTokenAndUser<
|
|||
);
|
||||
assert(
|
||||
schema[entity as keyof ED].attributes.hasOwnProperty('userId') &&
|
||||
(schema[entity as keyof ED].attributes as any).userId!.ref ===
|
||||
'user',
|
||||
(schema[entity as keyof ED].attributes as any).userId!.ref ===
|
||||
'user',
|
||||
`${entity}必须有指向user的userId属性`
|
||||
);
|
||||
if (currentToken) {
|
||||
|
|
@ -897,7 +897,7 @@ async function tryRefreshWechatPublicUserInfo<
|
|||
export async function refreshWechatPublicUserInfo<
|
||||
ED extends EntityDict,
|
||||
Cxt extends BackendRuntimeContext<ED>
|
||||
>({}, context: Cxt) {
|
||||
>({ }, context: Cxt) {
|
||||
const tokenValue = context.getTokenValue();
|
||||
const [token] = await context.select(
|
||||
'token',
|
||||
|
|
@ -1512,7 +1512,7 @@ export async function sendCaptcha<
|
|||
env,
|
||||
}: {
|
||||
mobile: string;
|
||||
env: WechatMpConfig | WebEnv;
|
||||
env: WechatMpEnv | WebEnv;
|
||||
},
|
||||
context: Cxt
|
||||
): Promise<string> {
|
||||
|
|
@ -1708,7 +1708,7 @@ export async function getWechatMpUserPhoneNumber<
|
|||
export async function logout<
|
||||
ED extends EntityDict,
|
||||
Cxt extends BackendRuntimeContext<ED>
|
||||
>({}, context: Cxt) {
|
||||
>({ }, context: Cxt) {
|
||||
const tokenId = context.getTokenValue();
|
||||
if (tokenId) {
|
||||
await context.operate(
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ export default OakComponent({
|
|||
methods: {
|
||||
redirectPage(
|
||||
redirectTo?: EntityDict['parasite']['Schema']['redirectTo'],
|
||||
nickname?: string
|
||||
nickname?: string | null
|
||||
) {
|
||||
if (!redirectTo) {
|
||||
this.setMessage({
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import * as React from 'react';
|
||||
import { Table, Button, Typography, Modal } from 'antd';
|
||||
import dayjs from 'dayjs';
|
||||
import { WebComponentProps } from 'oak-frontend-base';
|
||||
import { WebComponentProps, RowWithActions } from 'oak-frontend-base';
|
||||
import ActionBtnPanel from 'oak-frontend-base/lib/components/actionBtnPanel';
|
||||
import { EntityDict } from '../../../general-app-domain';
|
||||
import Style from './web.module.less';
|
||||
|
|
@ -15,7 +15,7 @@ export default function render(
|
|||
true,
|
||||
{
|
||||
searchValue: string;
|
||||
list: EntityDict['userEntityGrant']['Schema'][];
|
||||
list: RowWithActions<EntityDict, 'userEntityGrant'>[];
|
||||
showBack: boolean;
|
||||
variant?: 'inline' | 'alone' | 'dialog';
|
||||
qrCodeUrl: string;
|
||||
|
|
|
|||
Loading…
Reference in New Issue