Merge pull request #14839 from abpframework/auto-merge/rel-7-0/1498

Merge branch dev with rel-7.0

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json

@@ -7,6 +7,9 @@
     "Permission:FeatureManagement": "Feature management",
     "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features",
     "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} feature value is not valid!",
-    "Menu:FeatureManagement": "Feature Management"
+    "Menu:FeatureManagement": "Feature Management",
+    "ResetToDefault": "Reset to default",
+    "ResetedToDefault": "Reseted to default",
+    "AreYouSureToResetToDefault": "Are you sure to reset to default?"
   }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json

@@ -1,12 +1,15 @@
 {
-	"culture": "zh-Hans",
-	"texts": {
-		"Features": "功能",
-		"NoFeatureFoundMessage": "没有可用的功能.",
-		"ManageHostFeatures": "管理Host功能",
-		"Permission:FeatureManagement": "功能管理",
-		"Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
-		"Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值无效!",
-		"Menu:FeatureManagement": "功能管理"
-	}
-}
+  "culture": "zh-Hans",
+  "texts": {
+    "Features": "功能",
+    "NoFeatureFoundMessage": "没有可用的功能.",
+    "ManageHostFeatures": "管理Host功能",
+    "Permission:FeatureManagement": "功能管理",
+    "Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0}功能的值无效!",
+    "Menu:FeatureManagement": "功能管理",
+    "ResetToDefault": "重置为默认值",
+    "ResetedToDefault": "已重置为默认值",
+    "AreYouSureToResetToDefault": "你确定要重置为默认值吗？"
+  }
+}

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json

@@ -1,12 +1,15 @@
 {
-	"culture": "zh-Hant",
-	"texts": {
-		"Features": "功能",
-		"NoFeatureFoundMessage": "沒有可用的功能.",
-		"ManageHostFeatures": "管理Host功能",
-		"Permission:FeatureManagement": "功能管理",
-		"Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
-		"Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值無效!",
-		"Menu:FeatureManagement": "功能管理"
-	}
-}
+  "culture": "zh-Hant",
+  "texts": {
+    "Features": "功能",
+    "NoFeatureFoundMessage": "沒有可用的功能.",
+    "ManageHostFeatures": "管理Host功能",
+    "Permission:FeatureManagement": "功能管理",
+    "Permission:FeatureManagement.ManageHostFeatures": "管理Host功能",
+    "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0}功能的值無效!",
+    "Menu:FeatureManagement": "功能管理",
+    "ResetToDefault": "重置為預設值",
+    "ResetedToDefault": "已重置為預設值",
+    "AreYouSureToResetToDefault": "是否確定重置為預設值？"
+  }
+}

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html

@@ -59,7 +59,7 @@
 </ng-template>
 
 <ng-template #defaultIconTemplate let-node let-origin="origin">
-  <i style="line-height: 28px" aria-hidden="true">
+  <i aria-hidden="true">
     <ng-container *ngTemplateOutlet="node.isExpanded ? minusIcon : plusIcon"></ng-container
   ></i>
 </ng-template>