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

userRelation的relations改成默认最高级别

This commit is contained in:
Xu Chang 2023-03-14 17:56:32 +08:00
parent e3098bcb9f
commit 5a0ce2996a
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/pages/userRelation/list/index.js
View File

@ -69,14 +69,10 @@ exports.default = OakComponent({
var relationEntity = "user".concat((0, string_1.firstLetterUpperCase)(entity));
var filter = (_a = {},
_a["".concat(entity, "Id")] = entityId,
_a.relation = {
$in: relationss,
},
_a);
if (relationss.length > 0) {
Object.assign(filter, {
relation: {
$in: relationss,
},
});
}
return {
id: {
$in: {
@ -166,23 +162,27 @@ exports.default = OakComponent({
methods: {
calcRelations: function () {
var _a = this.props, relations = _a.relations, entity = _a.entity, entityId = _a.entityId;
if (this.features.token.isRoot()) {
var schema = this.features.cache.getSchema();
var legalRelations_1 = schema[entity].relation;
var relationss = legalRelations_1 ? (relations ? relations.filter(function (ele) { return legalRelations_1.includes(ele); }) : legalRelations_1) : [];
if (relations && relations.length > 0) {
// 这里小程序肯定会传入空数组，很恶心
this.setState({
relationss: relationss,
relationss: relations,
});
}
else {
var userId = this.features.token.getUserId();
var legalRelations_2 = this.features.relation.getChildrenRelations(entity, userId, entityId);
var relationss = legalRelations_2 ? (
// 这里小程序肯定会传入空数组，很恶心
(relations && relations.length > 0) ? relations.filter(function (ele) { return legalRelations_2.includes(ele); }) : legalRelations_2) : [];
this.setState({
relationss: relationss,
});
if (this.features.token.isRoot()) {
var schema = this.features.cache.getSchema();
var legalRelations = schema[entity].relation;
this.setState({
relationss: legalRelations,
});
}
else {
var userId = this.features.token.getUserId();
var legalRelations = this.features.relation.getChildrenRelations(entity, userId, entityId);
this.setState({
relationss: legalRelations,
});
}
}
},
goUpsert: function () {

49
src/pages/userRelation/list/index.ts
View File

@ -64,14 +64,10 @@ export default OakComponent({
const relationEntity = `user${firstLetterUpperCase(entity!)}`;
const filter = {
[`${entity}Id`]: entityId,
relation: {
$in: relationss,
},
};
if (relationss.length > 0) {
Object.assign(filter, {
relation: {
$in: relationss,
},
});
}
return {
id: {
$in: {
@ -163,30 +159,29 @@ export default OakComponent({
methods: {
calcRelations() {
const { relations, entity, entityId } = this.props;
if (this.features.token.isRoot()) {
const schema = this.features.cache.getSchema();
const legalRelations = schema![entity as keyof EntityDict].relation!;
const relationss = legalRelations ? (
relations ? relations.filter(
ele => legalRelations.includes(ele)
) : legalRelations
) : [] as string[];
if (relations && relations.length > 0) {
// 这里小程序肯定会传入空数组，很恶心
this.setState({
relationss,
relationss: relations,
});
}
else {
const userId = this.features.token.getUserId();
const legalRelations = this.features.relation.getChildrenRelations(entity as keyof EntityDict, userId!, entityId!);
const relationss = legalRelations ? (
// 这里小程序肯定会传入空数组，很恶心
(relations && relations.length > 0 )? relations.filter(
ele => legalRelations.includes(ele)
) : legalRelations
) : [] as string[];
this.setState({
relationss,
});
if (this.features.token.isRoot()) {
const schema = this.features.cache.getSchema();
const legalRelations = schema![entity as keyof EntityDict].relation!;
this.setState({
relationss: legalRelations,
});
}
else {
const userId = this.features.token.getUserId();
const legalRelations = this.features.relation.getChildrenRelations(entity as keyof EntityDict, userId!, entityId!);
this.setState({
relationss: legalRelations as string[] | undefined,
});
}
}
},
goUpsert() {