From af7229df94880b6b06b0cccbc74665856a6a939a Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Tue, 25 Jul 2023 16:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/store/RelationAuth.js | 9 ++++----- src/store/RelationAuth.ts | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/store/RelationAuth.js b/lib/store/RelationAuth.js index cb13823..dc34d87 100644 --- a/lib/store/RelationAuth.js +++ b/lib/store/RelationAuth.js @@ -1367,10 +1367,6 @@ var RelationAuth = /** @class */ (function () { RelationAuth.prototype.getDeducedEntityFilters = function (entity, filter, actions, context) { var e_4, _a; var _this = this; - if (RelationAuth.SPECIAL_ENTITIES.includes(entity)) { - // 特殊对象直接返回 - return []; - } var entityFilters = [ { entity: entity, @@ -1410,7 +1406,10 @@ var RelationAuth = /** @class */ (function () { var getRecursiveDeducedFilters_1 = function (deduceEntity, deduceFilter) { var excludeActions = action_1.readOnlyActions.concat(['create', 'remove']); var updateActions = _this.schema[deduceEntity].actions.filter(function (a) { return !excludeActions.includes(a); }); - return _this.getDeducedEntityFilters(deduceEntity, deduceFilter, actions[0] === 'select' ? actions : updateActions, context); + if (!RelationAuth.SPECIAL_ENTITIES.includes(deduceEntity)) { + return _this.getDeducedEntityFilters(deduceEntity, deduceFilter, actions[0] === 'select' ? actions : updateActions, context); + } + return []; }; if (deduceEntity && deduceFilter) { var deducedSelections = getRecursiveDeducedFilters_1(deduceEntity, deduceFilter); diff --git a/src/store/RelationAuth.ts b/src/store/RelationAuth.ts index 1bb707f..c7e105c 100644 --- a/src/store/RelationAuth.ts +++ b/src/store/RelationAuth.ts @@ -1614,10 +1614,6 @@ export class RelationAuth{ filter: ED[keyof ED]['Selection']['filter']; actions: ED[T]['Action'][]; }>> { - if (RelationAuth.SPECIAL_ENTITIES.includes(entity as string)) { - // 特殊对象直接返回 - return []; - } const entityFilters: Array<{ entity: keyof ED; filter: ED[keyof ED]['Selection']['filter']; @@ -1656,7 +1652,10 @@ export class RelationAuth{ const updateActions = this.schema[deduceEntity].actions.filter( (a) => !excludeActions.includes(a) ); - return this.getDeducedEntityFilters(deduceEntity, deduceFilter, actions[0] === 'select' ? actions : updateActions, context); + if (!RelationAuth.SPECIAL_ENTITIES.includes(deduceEntity as string)) { + return this.getDeducedEntityFilters(deduceEntity, deduceFilter, actions[0] === 'select' ? actions : updateActions, context); + } + return []; }; if (deduceEntity && deduceFilter) {