Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

授权领取pc端简单适配及申明调整

This commit is contained in:
Wang Kejun 2023-11-13 21:38:36 +08:00
parent 5ab4a332b8
commit da6836469e
21 changed files with 371 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
es/components/userEntityGrant/claim/index.d.ts vendored
View File

@ -1,7 +1,7 @@
/// <reference types="react" />
import { EntityDict } from '../../../oak-app-domain';
declare const _default: (props: import("oak-frontend-base").ReactComponentProps<EntityDict, "userEntityGrant", false, {
picker: (props: {
picker: ((props: {
disabled?: boolean | undefined;
entity: keyof EntityDict;
entityFilter: object;
@ -13,9 +13,9 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps<
pickedRowIds?: string[] | undefined;
pickedRelationIds?: string[] | undefined;
oakPath: string;
}) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
}) => React.ReactElement) | undefined;
hideInfo: boolean;
hideTip: boolean;
afterClaim: (ueg: EntityDict['userEntityGrant']['OpSchema']) => void;
afterClaim: ((ueg: EntityDict['userEntityGrant']['OpSchema']) => void) | undefined;
}>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
export default _default;

6
es/components/userEntityGrant/claim/index.js
View File

@ -3,12 +3,10 @@ export default OakComponent({
entity: 'userEntityGrant',
isList: false,
properties: {
picker: (props) => {
return {};
},
picker: undefined,
hideInfo: false,
hideTip: false,
afterClaim: (ueg) => undefined,
afterClaim: undefined,
},
projection() {
const userId = this.features.token.getUserId();

3
es/components/userEntityGrant/claim/index.json
View File

@ -3,8 +3,7 @@
"usingComponents": {
"l-notice-bar": "@oak-frontend-base/miniprogram_npm/lin-ui/notice-bar/index",
"l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index",
"l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index",
"xxx": "./ubPicker/index"
"l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index"
},
"componentGenerics": {
"ueg-picker": {

2
es/components/userEntityGrant/claim/ubPicker/index.js
View File

@ -113,7 +113,7 @@ export default OakComponent({
else if (rule === 'single') {
if (next.relationIds?.length === 1 && (!pickedRelationIds || next.relationIds[0] !== pickedRelationIds[0])) {
// 只有一行relation，直接选中
onPickRelations(next.relationIds[0]);
onPickRelations(next.relationIds);
}
else if (pickedRelationIds && pickedRelationIds[0] && (!next.relationIds || !next.relationIds.includes(pickedRelationIds[0]))) {
// 新的relationIds中不包括已经pick的relationId，清空

18
es/components/userEntityGrant/claim/ubPicker/web.pc.d.ts vendored
View File

@ -1,5 +1,19 @@
import { WebComponentProps } from 'oak-frontend-base';
import { EntityDict } from '../../../../oak-app-domain';
export default function Render(props: WebComponentProps<EntityDict, 'userEntityGrant', false, {
userEntityGrant: EntityDict['userEntityGrant']['Schema'];
}>): import("react/jsx-runtime").JSX.Element;
relations: EntityDict['relation']['OpSchema'][];
rows: Array<{
id: string;
value: string;
}>;
rule: EntityDict['userEntityGrant']['OpSchema']['rule'];
onPickRelations: (ids: string[]) => void;
onPickRows: (ids: string[]) => void;
pickedRowIds?: string[];
pickedRelationIds?: string[];
entity: string;
disabled?: boolean;
disablePickRow?: boolean;
disablePickRelation?: boolean;
pickRelationRule: string;
}>): import("react/jsx-runtime").JSX.Element | null;

17
es/components/userEntityGrant/claim/ubPicker/web.pc.js
View File

@ -1,5 +1,16 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
import { Typography, Radio, Checkbox, List, Divider, Flex, Space } from 'antd';
import Styles from './web.pc.module.less';
export default function Render(props) {
const { userEntityGrant } = props.data;
return _jsx("div", { children: "\u5BBD\u5C4F\u672A\u5B9E\u73B0" });
const { relations, rows, rule, onPickRelations, onPickRows, pickedRowIds, pickedRelationIds, entity, disablePickRow, disablePickRelation, pickRelationRule, disabled, } = props.data;
const { t } = props.methods;
if (rows?.length > 0 && relations?.length > 0) {
const Row = rows.length === 1 ? (rows[0].value ? (_jsxs(_Fragment, { children: [_jsx(Divider, { orientation: "left", children: t(`${entity}:name`) }), _jsx(Space, { children: _jsx(Typography.Title, { children: rows[0].value }) })] })) : null) : (_jsxs(_Fragment, { children: [_jsx(Divider, { orientation: "left", children: t('pickRow', { entity: t(`${entity}:name`) }) }), _jsx(Checkbox.Group, { value: pickedRowIds || [], disabled: disablePickRow || disabled, onChange: (val) => onPickRows(val), children: rows.map((row) => (_jsx(Checkbox, { value: row.id, children: row.value }))) })] }));
const Relation = (_jsxs(_Fragment, { children: [_jsx(Divider, { orientation: "left", children: t(`pickRelation.${pickRelationRule}`) }), _jsx(List, { children: rule !== 'single' ? (_jsx(Checkbox.Group, { value: pickedRelationIds || [], disabled: disablePickRelation || disabled, onChange: (val) => onPickRelations(val), children: relations.map((relation) => (_jsx(Checkbox, { value: relation.id, children: t(`${entity}:r.${relation.name}`) }))) })) : (_jsx(Radio.Group, { onChange: (e) => {
const val = e.target.value;
onPickRelations([val]);
}, value: pickedRelationIds?.[0] || undefined, children: relations.map((relation) => (_jsx(Radio, { value: relation.id, children: t(`${entity}:r.${relation.name}`) }))) })) })] }));
return (_jsxs(Flex, { vertical: true, className: Styles.container, children: [Row, Relation] }));
}
return null;
}

3
es/components/userEntityGrant/claim/ubPicker/web.pc.module.less
View File

@ -0,0 +1,3 @@
.container {
margin-bottom: 16px;
}

27
es/components/userEntityGrant/claim/web.pc.d.ts vendored
View File

@ -1,7 +1,30 @@
/// <reference types="react" />
import { WebComponentProps } from 'oak-frontend-base';
import { EntityDict } from '../../../oak-app-domain';
export default function Render(props: WebComponentProps<EntityDict, 'userEntityGrant', false, {
userEntityGrant: EntityDict['userEntityGrant']['Schema'];
isGrantee: boolean;
isGranter: boolean;
hasClaimed: boolean;
}>): import("react/jsx-runtime").JSX.Element;
counterStr: string;
hideInfo: boolean;
hideTip: boolean;
pickedRowIds?: string[];
pickedRelationIds?: string[];
picker?: (props: {
disabled?: boolean;
entity: keyof EntityDict;
entityFilter: object;
relationIds: string[];
rule: EntityDict['userEntityGrant']['OpSchema']['rule'];
ruleOnRow: EntityDict['userEntityGrant']['OpSchema']['ruleOnRow'];
onPickRelations: (ids: string[]) => void;
onPickRows: (id: string[]) => void;
oakPath: string;
pickedRowIds?: string[];
pickedRelationIds?: string[];
}) => React.ReactElement;
}, {
onPickRelations: (ids: string[]) => void;
onPickRows: (ids: string[]) => void;
claim: () => void;
}>): import("react/jsx-runtime").JSX.Element | null;

31
es/components/userEntityGrant/claim/web.pc.js
View File

@ -1,5 +1,30 @@
import { jsx as _jsx } from "react/jsx-runtime";
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
import { Alert, Space, List, Button, Row, Col, Divider, Flex } from 'antd';
import UbPicker from './ubPicker';
import Styles from './web.pc.module.less';
export default function Render(props) {
const { userEntityGrant } = props.data;
return _jsx("div", { children: "\u5C1A\u672A\u5B9E\u73B0" });
const { userEntityGrant, picker: Picker, isGranter, hasClaimed, counterStr, hideInfo, pickedRowIds, pickedRelationIds, oakExecutable, hideTip, } = props.data;
const { t, onPickRelations, onPickRows, claim } = props.methods;
if (userEntityGrant) {
const { relationEntity, relationEntityFilter, rule, ruleOnRow, relationIds, expired, } = userEntityGrant;
const Picker2 = Picker || UbPicker;
return (_jsxs(Row, { children: [_jsx(Col, { span: 2 }), _jsx(Col, { span: 20, children: _jsxs(Flex, { vertical: true, className: Styles.container, children: [!hideTip && !isGranter && !hasClaimed && (_jsx(Alert, { message: t('tip'), type: "info", showIcon: true })), isGranter && (_jsx(Alert, { message: t('isGranter'), type: "error", showIcon: true })), hasClaimed && (_jsx(Alert, { message: t('hasClaimed'), type: "error", showIcon: true })), !hideInfo && (_jsxs("div", { className: Styles.info, children: [_jsx(Divider, { orientation: "left", children: t('source') }), _jsxs(List, { itemLayout: "horizontal", children: [_jsxs(List.Item, { children: [_jsx(List.Item.Meta, { title: t('granterName') }), userEntityGrant.granter.name ||
userEntityGrant.granter.nickname] }), _jsxs(List.Item, { children: [_jsx(List.Item.Meta, { title: expired
? t('isExpired')
: t('counter') }), expired ? t('expired') : counterStr] })] })] })), _jsx(Picker2, { disabled: !!expired || hasClaimed || isGranter, entity: relationEntity, entityFilter: relationEntityFilter, rule: rule, ruleOnRow: ruleOnRow, relationIds: relationIds, onPickRows: onPickRows, onPickRelations: onPickRelations, pickedRelationIds: pickedRelationIds, pickedRowIds: pickedRowIds, oakPath: "$uegClaim-content" }), _jsx(Space, { style: { justifyContent: 'center' }, children: _jsx(Button, { color: isGranter || hasClaimed
? 'danger'
: !expired
? 'primary'
: 'warning', disabled: oakExecutable !== true ||
!!expired ||
isGranter ||
hasClaimed, onClick: () => claim(), children: isGranter
? t('isGranter')
: hasClaimed
? t('hasClaimed')
: !expired
? t('userEntityGrant:action.claim')
: t('expired') }) })] }) }), _jsx(Col, { span: 2 })] }));
}
return null;
}

2
es/components/userEntityGrant/claim/web.pc.module.less
View File

@ -1,3 +1,3 @@
.container {
background: var(--oak-bg-color-container);
margin: 16px 0;
}

3
src/components/userEntityGrant/claim/index.json
View File

@ -3,8 +3,7 @@
"usingComponents": {
"l-notice-bar": "@oak-frontend-base/miniprogram_npm/lin-ui/notice-bar/index",
"l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index",
"l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index",
"xxx": "./ubPicker/index"
"l-list": "@oak-frontend-base/miniprogram_npm/lin-ui/list/index"
},
"componentGenerics": {
"ueg-picker": {

9
src/components/userEntityGrant/claim/index.ts
View File

@ -1,4 +1,3 @@
import dayjs from 'dayjs';
import { generateNewId } from 'oak-domain';
import { EntityDict } from '../../../oak-app-domain';
@ -6,7 +5,7 @@ export default OakComponent({
entity: 'userEntityGrant',
isList: false,
properties: {
picker: (props: {
picker: undefined as ((props: {
disabled?: boolean,
entity: keyof EntityDict,
entityFilter: object,
@ -18,12 +17,10 @@ export default OakComponent({
pickedRowIds?: string[],
pickedRelationIds?: string[],
oakPath: string,
}) => {
return {} as React.ReactElement;
},
}) => React.ReactElement) | undefined,
hideInfo: false,
hideTip: false,
afterClaim: (ueg: EntityDict['userEntityGrant']['OpSchema']) => undefined as void,
afterClaim: undefined as ((ueg: EntityDict['userEntityGrant']['OpSchema']) => void) | undefined,
},
projection() {
const userId = this.features.token.getUserId();

2
src/components/userEntityGrant/claim/ubPicker/index.ts
View File

@ -118,7 +118,7 @@ export default OakComponent({
else if (rule === 'single') {
if (next.relationIds?.length === 1 && (!pickedRelationIds || next.relationIds[0] !== pickedRelationIds[0])) {
// 只有一行relation，直接选中
onPickRelations!(next.relationIds[0]);
onPickRelations!(next.relationIds);
}
else if (pickedRelationIds && pickedRelationIds[0] && (!next.relationIds || !next.relationIds.includes(pickedRelationIds[0]))) {
// 新的relationIds中不包括已经pick的relationId，清空

3
src/components/userEntityGrant/claim/ubPicker/web.pc.module.less
View File

@ -0,0 +1,3 @@
.container {
margin-bottom: 16px;
}

110
src/components/userEntityGrant/claim/ubPicker/web.pc.tsx
View File

@ -1,5 +1,7 @@
import { WebComponentProps } from 'oak-frontend-base';
import { Typography, Radio, Checkbox, List, Divider, Flex, Space } from 'antd';
import { EntityDict } from '../../../../oak-app-domain';
import Styles from './web.pc.module.less';
export default function Render(
props: WebComponentProps<
@ -7,11 +9,111 @@ export default function Render(
'userEntityGrant',
false,
{
userEntityGrant: EntityDict['userEntityGrant']['Schema'];
relations: EntityDict['relation']['OpSchema'][];
rows: Array<{
id: string;
value: string;
}>;
rule: EntityDict['userEntityGrant']['OpSchema']['rule'];
onPickRelations: (ids: string[]) => void;
onPickRows: (ids: string[]) => void;
pickedRowIds?: string[];
pickedRelationIds?: string[];
entity: string;
disabled?: boolean;
disablePickRow?: boolean;
disablePickRelation?: boolean;
pickRelationRule: string;
}
>
) {
const { userEntityGrant } = props.data;
const {
relations,
rows,
rule,
onPickRelations,
onPickRows,
pickedRowIds,
pickedRelationIds,
entity,
disablePickRow,
disablePickRelation,
pickRelationRule,
disabled,
} = props.data;
const { t } = props.methods;
return <div>宽屏未实现</div>
}
if (rows?.length > 0 && relations?.length > 0) {
const Row =
rows.length === 1 ? (
rows[0].value ? (
<>
<Divider orientation="left">
{t(`${entity}:name`)}
</Divider>
<Space>
<Typography.Title>{rows[0].value}</Typography.Title>
</Space>
</>
) : null
) : (
<>
<Divider orientation="left">
{t('pickRow', { entity: t(`${entity}:name`) })}
</Divider>
<Checkbox.Group
value={pickedRowIds || []}
disabled={disablePickRow || disabled}
onChange={(val) => onPickRows(val as string[])}
>
{rows.map((row) => (
<Checkbox value={row.id}>{row.value}</Checkbox>
))}
</Checkbox.Group>
</>
);
const Relation = (
<>
<Divider orientation="left">
{t(`pickRelation.${pickRelationRule}`)}
</Divider>
<List>
{rule !== 'single' ? (
<Checkbox.Group
value={pickedRelationIds || []}
disabled={disablePickRelation || disabled}
onChange={(val) => onPickRelations(val as string[])}
>
{relations.map((relation) => (
<Checkbox value={relation.id}>
{t(`${entity}:r.${relation.name}`)}
</Checkbox>
))}
</Checkbox.Group>
) : (
<Radio.Group
onChange={(e) => {
const val = e.target.value;
onPickRelations([val]);
}}
value={pickedRelationIds?.[0] || undefined}
>
{relations.map((relation) => (
<Radio value={relation.id}>
{t(`${entity}:r.${relation.name}`)}
</Radio>
))}
</Radio.Group>
)}
</List>
</>
);
return (
<Flex vertical className={Styles.container}>
{Row}
{Relation}
</Flex>
);
}
return null;
}

2
src/components/userEntityGrant/claim/web.pc.module.less
View File

@ -1,3 +1,3 @@
.container {
background: var(--oak-bg-color-container);
margin: 16px 0;
}

152
src/components/userEntityGrant/claim/web.pc.tsx
View File

@ -1,5 +1,8 @@
import { WebComponentProps } from 'oak-frontend-base';
import { Alert, Space, List, Button, Row, Col, Divider, Flex } from 'antd';
import UbPicker from './ubPicker';
import { EntityDict } from '../../../oak-app-domain';
import Styles from './web.pc.module.less';
export default function Render(
props: WebComponentProps<
@ -8,12 +11,153 @@ export default function Render(
false,
{
userEntityGrant: EntityDict['userEntityGrant']['Schema'];
isGrantee: boolean;
isGranter: boolean;
hasClaimed: boolean;
counterStr: string;
hideInfo: boolean;
hideTip: boolean;
pickedRowIds?: string[];
pickedRelationIds?: string[];
picker?: (props: {
disabled?: boolean;
entity: keyof EntityDict;
entityFilter: object;
relationIds: string[];
rule: EntityDict['userEntityGrant']['OpSchema']['rule'];
ruleOnRow: EntityDict['userEntityGrant']['OpSchema']['ruleOnRow'];
onPickRelations: (ids: string[]) => void;
onPickRows: (id: string[]) => void;
oakPath: string;
pickedRowIds?: string[];
pickedRelationIds?: string[];
}) => React.ReactElement;
},
{
onPickRelations: (ids: string[]) => void;
onPickRows: (ids: string[]) => void;
claim: () => void;
}
>
) {
const { userEntityGrant } = props.data;
const {
userEntityGrant,
picker: Picker,
isGranter,
hasClaimed,
counterStr,
hideInfo,
pickedRowIds,
pickedRelationIds,
oakExecutable,
hideTip,
} = props.data;
const { t, onPickRelations, onPickRows, claim } = props.methods;
return <div>尚未实现</div>
}
if (userEntityGrant) {
const {
relationEntity,
relationEntityFilter,
rule,
ruleOnRow,
relationIds,
expired,
} = userEntityGrant;
const Picker2 = Picker || UbPicker;
return (
<Row>
<Col span={2} />
<Col span={20}>
<Flex vertical className={Styles.container}>
{!hideTip && !isGranter && !hasClaimed && (
<Alert message={t('tip')} type="info" showIcon />
)}
{isGranter && (
<Alert
message={t('isGranter')}
type="error"
showIcon
/>
)}
{hasClaimed && (
<Alert
message={t('hasClaimed')}
type="error"
showIcon
/>
)}
{!hideInfo && (
<div className={Styles.info}>
<Divider orientation="left">
{t('source')}
</Divider>
<List itemLayout="horizontal">
<List.Item>
<List.Item.Meta
title={t('granterName')}
></List.Item.Meta>
{userEntityGrant.granter.name ||
userEntityGrant.granter.nickname}
</List.Item>
<List.Item>
<List.Item.Meta
title={
expired
? t('isExpired')
: t('counter')
}
></List.Item.Meta>
{expired ? t('expired') : counterStr}
</List.Item>
</List>
</div>
)}
<Picker2
disabled={!!expired || hasClaimed || isGranter}
entity={relationEntity as keyof EntityDict}
entityFilter={relationEntityFilter}
rule={rule}
ruleOnRow={ruleOnRow}
relationIds={relationIds}
onPickRows={onPickRows}
onPickRelations={onPickRelations}
pickedRelationIds={pickedRelationIds}
pickedRowIds={pickedRowIds}
oakPath="$uegClaim-content"
/>
<Space style={{ justifyContent: 'center' }}>
<Button
color={
isGranter || hasClaimed
? 'danger'
: !expired
? 'primary'
: 'warning'
}
disabled={
oakExecutable !== true ||
!!expired ||
isGranter ||
hasClaimed
}
onClick={() => claim()}
>
{isGranter
? t('isGranter')
: hasClaimed
? t('hasClaimed')
: !expired
? t('userEntityGrant:action.claim')
: t('expired')}
</Button>
</Space>
</Flex>
</Col>
<Col span={2} />
</Row>
);
}
return null;
}

7
src/components/userEntityGrant/share/mobile.module.less
View File

@ -1,7 +0,0 @@
.container {
height: 100vh;
display: flex;
flex-direction: column;
}

5
src/components/userEntityGrant/share/web.module.less
View File

@ -1,5 +0,0 @@
.container {
background: var(--oak-bg-color-container);
}

19
src/components/userEntityGrant/share/web.pc.tsx
View File

@ -1,6 +1,4 @@
import React, { Component } from 'react';
import Style from './web.module.less';
import PageHeader from '../../common/pageHeader';
import React from 'react';
import QrCode from '../../common/qrCode';
import { WebComponentProps } from 'oak-frontend-base';
import { EntityDict } from '../../../oak-app-domain';
@ -10,7 +8,7 @@ export default function Render(
props: WebComponentProps<
EntityDict,
'userEntityGrant',
true,
false,
{
url: string;
expiresAt: number;
@ -18,15 +16,12 @@ export default function Render(
{}
>
) {
const {
url,
expiresAt,
oakLoading,
} = props.data;
const { url, expiresAt, oakLoading } = props.data;
if (oakLoading) {
return <Spin />;
}
if (url) {
return (
<QrCode url={url} expiresAt={expiresAt} />
);
return <QrCode url={url} expiresAt={expiresAt} />;
}
return null;
}

16
src/components/userEntityGrant/share/web.tsx
View File

@ -2,12 +2,13 @@ import React from 'react';
import QrCode from '../../common/qrCode';
import { WebComponentProps } from 'oak-frontend-base';
import { EntityDict } from '../../../oak-app-domain';
import { DotLoading } from 'antd-mobile';
export default function Render(
props: WebComponentProps<
EntityDict,
'userEntityGrant',
true,
false,
{
url: string;
expiresAt: number;
@ -15,15 +16,12 @@ export default function Render(
{}
>
) {
const {
url,
expiresAt,
oakLoading,
} = props.data;
const { url, expiresAt, oakLoading } = props.data;
if (oakLoading) {
return <DotLoading color="primary" />;
}
if (url) {
return (
<QrCode url={url} expiresAt={expiresAt} />
);
return <QrCode url={url} expiresAt={expiresAt} />;
}
return null;
}