Merge pull request #14044 from abpframework/issue/11742

Issue/11742

npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts

@@ -1,9 +1,7 @@
 import { IdentityUserDto } from '@abp/ng.identity/proxy';
 import { getPasswordValidators } from '@abp/ng.theme.shared';
 import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
-import { Validators } from '@angular/forms'
-import { AbpValidators } from '@abp/ng.core';
-
+import { Validators } from '@angular/forms';
 
 export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserDto>([
   {
@@ -11,7 +9,7 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserD
     name: 'userName',
     displayName: 'AbpIdentity::UserName',
     id: 'user-name',
-    validators: () => [Validators.required, Validators.maxLength(256), AbpValidators.username()],
+    validators: () => [Validators.required, Validators.maxLength(256)],
   },
   {
     type: ePropType.Password,

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

@@ -160,8 +160,14 @@ export class PermissionManagementComponent
         }
 
         return per;
+      }).map((per,index,permissions) => {
+        const childrens = permissions
+          .filter(p => p.parentName === per.name);
+          if(childrens.length > 0 && childrens.every(x => !x.isGranted)){
+            return { ...per, isGranted: false };
+          }
+        return per
       });
-
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     }, 0);

npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html

@@ -6,13 +6,13 @@
   <div class="mb-3 form-group">
     <label class="form-label">{{
       'AbpSettingManagement::DefaultFromDisplayName' | abpLocalization
-      }}</label>
+      }}<span class="ms-1">*</span></label>
     <input type="text" class="form-control" formControlName="defaultFromDisplayName" />
   </div>
   <div class="mb-3 form-group">
     <label class="form-label">{{
       'AbpSettingManagement::DefaultFromAddress' | abpLocalization
-      }}</label>
+      }}<span class="ms-1">*</span></label>
     <input type="text" class="form-control" formControlName="defaultFromAddress" />
   </div>
   <div class="mb-3 form-group">
@@ -20,7 +20,7 @@
     <input type="text" class="form-control" formControlName="smtpHost" />
   </div>
   <div class="mb-3 form-group">
-    <label class="form-label">{{ 'AbpSettingManagement::SmtpPort' | abpLocalization }}</label>
+    <label class="form-label">{{ 'AbpSettingManagement::SmtpPort' | abpLocalization }}<span class="ms-1">*</span></label>
     <input type="number" class="form-control" formControlName="smtpPort" />
   </div>