对初始relations的判断

This commit is contained in:
Xu Chang 2023-03-14 11:32:29 +08:00
parent ea3d5f1dd8
commit 55977ceabf
3 changed files with 17 additions and 5 deletions

View File

@ -3,7 +3,10 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps<
entity: StringConstructor;
entityId: StringConstructor;
userIds: ArrayConstructor;
relations: ArrayConstructor;
relations: {
type: ArrayConstructor;
value: undefined;
};
redirectToAfterConfirm: ObjectConstructor;
qrCodeType: StringConstructor;
}>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;

View File

@ -120,7 +120,10 @@ exports.default = OakComponent({
entity: String,
entityId: String,
userIds: Array,
relations: Array,
relations: {
type: Array,
value: undefined,
},
redirectToAfterConfirm: Object,
qrCodeType: String,
},
@ -177,7 +180,9 @@ exports.default = OakComponent({
else {
var userId = this.features.token.getUserId();
var legalRelations_2 = this.features.relation.getChildrenRelations(entity, userId, entityId);
var relationss = legalRelations_2 ? (relations ? relations.filter(function (ele) { return legalRelations_2.includes(ele); }) : legalRelations_2) : [];
var relationss = legalRelations_2 ? (
// 这里小程序肯定会传入空数组,很恶心
(relations && relations.length > 0) ? relations.filter(function (ele) { return legalRelations_2.includes(ele); }) : legalRelations_2) : [];
this.setState({
relationss: relationss,
});

View File

@ -117,7 +117,10 @@ export default OakComponent({
entity: String,
entityId: String,
userIds: Array,
relations: Array,
relations: {
type: Array,
value: undefined,
},
redirectToAfterConfirm: Object,
qrCodeType: String,
},
@ -179,7 +182,8 @@ export default OakComponent({
const userId = this.features.token.getUserId();
const legalRelations = this.features.relation.getChildrenRelations(entity as keyof EntityDict, userId!, entityId!);
const relationss = legalRelations ? (
relations ? relations.filter(
// 这里小程序肯定会传入空数组,很恶心
(relations && relations.length > 0 )? relations.filter(
ele => legalRelations.includes(ele)
) : legalRelations
) : [] as string[];