Browse Source

Merge pull request #23378 from abpframework/auto-merge/rel-9-3/3894

Merge branch dev with rel-9.3
issue-23286
maliming 7 months ago
committed by GitHub
parent
commit
9ec00c3c15
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
  2. 16
      npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts

4
npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html

@ -29,8 +29,8 @@
@for (feature of features[group.name]; track feature.id || i; let i = $index) {
@let provider = feature.provider.name;
@let isFeatureDisabled =
provider !== providerName && provider !== defaultProviderName;
@let isFeatureDisabled = !feature.parentName ? isParentDisabled(feature.name, group.name, provider) :
(provider !== providerName && provider !== defaultProviderName);
<div class="mt-2" [ngStyle]="feature.style" (keyup.enter)="save()">
@switch (feature.valueType?.name) {

16
npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts

@ -184,6 +184,22 @@ export class FeatureManagementComponent
}
}
isParentDisabled(parentName: string, groupName: string, provider: string): boolean {
const children = this.features[groupName]?.filter(f => f.parentName === parentName);
if (children?.length) {
return children.some(child => {
const childProvider = child.provider?.name;
return (
(childProvider !== this.providerName && childProvider !== this.defaultProviderName) ||
(provider !== this.providerName && provider !== this.defaultProviderName)
);
});
} else {
return provider !== this.providerName && provider !== this.defaultProviderName;
}
}
private uncheckToggleDescendants(feature: FeatureDto) {
this.findAllDescendantsOfByType(feature, ValueTypes.ToggleStringValueType).forEach(node =>
this.setFeatureValue(node, false),

Loading…
Cancel
Save