修复国际化资源文件Resources.AdminLocalizer.en.json在开发和发布环境下不能输出到Resources目录的问题

zhontai · Oct 15, 2024 · 04e1335 · 04e1335
1 parent 9d6c922
commit 04e1335
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/templates/admin/content/src/MyApp.Api.Contracts/MyApp.Api.Contracts.csproj b/templates/admin/content/src/MyApp.Api.Contracts/MyApp.Api.Contracts.csproj
@@ -25,19 +25,21 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ZhonTai.Admin" Version="8.5.1">
-			<CopyToOutputDirectory>*\*\*.xml</CopyToOutputDirectory>
-		</PackageReference>
+		<PackageReference Include="ZhonTai.Admin" Version="8.5.1" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<Folder Include="Services\" />
 	</ItemGroup>
 
+
 	<Target Name="AfterTargetsBuild" AfterTargets="Build">
 		<ItemGroup>
-			<PackageReferenceFiles Condition="'%(PackageReference.CopyToOutputDirectory)' != ''" Include="$(NugetPackageRoot)\$([MSBuild]::Escape('%(PackageReference.Identity)').ToLower())\%(PackageReference.Version)\%(PackageReference.CopyToOutputDirectory)" />
+			<PackageReferenceXmlFiles Include="$(NugetPackageRoot)\$([MSBuild]::Escape('%(PackageReference.Identity)').ToLower())\%(PackageReference.Version)\**\*.xml" />
+			<PackageReferenceJsonFiles Include="$(NugetPackageRoot)\$([MSBuild]::Escape('%(PackageReference.Identity)').ToLower())\%(PackageReference.Version)\**\*.json" />
 		</ItemGroup>
-		<Copy Condition="'%(PackageReference.CopyToOutputDirectory)' != ''" SourceFiles="@(PackageReferenceFiles)" DestinationFolder="./../MyApp.Host/$(OutDir)" />
+
+		<Copy Condition="'%(PackageReferenceXmlFiles.Identity)' != ''" SourceFiles="@(PackageReferenceXmlFiles)" DestinationFolder="./../MyApp.Host/$(OutDir)" />
+		<Copy Condition="'%(PackageReferenceJsonFiles.Identity)' != ''" SourceFiles="@(PackageReferenceJsonFiles)" DestinationFolder="./../MyApp.Host/$(OutDir)Resources" />
 	</Target>
 </Project>
diff --git a/templates/admin/content/src/MyApp.Host/MyApp.Host.csproj b/templates/admin/content/src/MyApp.Host/MyApp.Host.csproj
@@ -87,8 +87,10 @@
 
 	<Target Name="AfterTargetsPublish" AfterTargets="Publish">
 		<ItemGroup>
-			<PackageReferenceFiles Include="*\*\*\*.xml" />
+			<PackageReferenceXmlFiles Include="*\*\*\*.xml" />
+			<PackageReferenceJsonFiles Include="*\*\*\Resources\*.json" />
 		</ItemGroup>
-		<Copy SourceFiles="@(PackageReferenceFiles)" DestinationFolder="$(PublishDir)" />
+		<Copy SourceFiles="@(PackageReferenceXmlFiles)" DestinationFolder="$(PublishDir)" />
+		<Copy SourceFiles="@(PackageReferenceJsonFiles)" DestinationFolder="$(PublishDir)Resources" />
 	</Target>
 </Project>
diff --git a/ui/zhontai.ui.admin.vue3/src/utils/other.ts b/ui/zhontai.ui.admin.vue3/src/utils/other.ts
@@ -43,7 +43,8 @@ export function useTitle() {
     } else {
       webTitle = setTagsViewNameI18n(router.currentRoute.value)
     }
-    document.title = `${webTitle} - ${globalTitle}` || globalTitle
+
+    document.title = webTitle ? `${webTitle} - ${globalTitle}` : globalTitle
   })
 }