NewLife
/
Cube
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

v6.5 ItemType支持area/area3/area2/area1

This commit is contained in:
智能大石头 2025-05-26 21:37:08 +08:00
parent 6d724788a2
commit d3fab3a0fb
22 changed files with 32 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CubeDemo/CubeDemo.csproj
View File

@ -6,7 +6,7 @@
<Description>魔方前后端分离版本的后端WebApi</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

2
CubeDemoNC/CubeDemoNC.csproj
View File

@ -5,7 +5,7 @@
<AssemblyName>cube</AssemblyName>
<RootNamespace>CubeDemo</RootNamespace>
<AssemblyTitle>魔方演示平台</AssemblyTitle>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

2
CubeSSO/CubeSSO.csproj
View File

@ -6,7 +6,7 @@
<Description>SSO服务端，OAuth2.0服务端。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.4</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

2
NewLife.Cube.AdminLTE/NewLife.Cube.AdminLTE.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

2
NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

71
NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj.Backup.tmp
View File

@ -1,71 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>魔方快速开发平台Blazor版</AssemblyTitle>
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2024 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>NewLife.Cube.Blazor</PackageId>
<Authors>$(Company)</Authors>
<ProjectUrl>https://github.com/NewLifeX</ProjectUrl>
<PackageIcon>leaf.png</PackageIcon>
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NewLife.CubeNC\NewLife.CubeNC.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Areas\**" />
<Content Remove="Areas\**" />
<EmbeddedResource Remove="Areas\**" />
<None Remove="Areas\**" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Doc\leaf.png" Link="leaf.png" PackagePath="\" />
</ItemGroup>
</Project>

2
NewLife.Cube.ElementUI/NewLife.Cube.ElementUI.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

92
NewLife.Cube.ElementUI/NewLife.Cube.ElementUI.csproj.Backup.tmp
View File

@ -1,92 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>魔方快速开发平台ElementUI版</AssemblyTitle>
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2024 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>NewLife.Cube.ElementUI</PackageId>
<Authors>$(Company)</Authors>
<ProjectUrl>https://github.com/NewLifeX</ProjectUrl>
<PackageIcon>leaf.png</PackageIcon>
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NewLife.CubeNC\NewLife.CubeNC.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<Content Remove="wwwroot\Content\bootstrap\css\bootstrap-multiselect.css" />
<Content Remove="wwwroot\Content\bootstrap\css\bootstrap-responsive.min.css" />
<Content Remove="wwwroot\Content\bootstrap\css\bootstrap-theme.min.css" />
<Content Remove="wwwroot\Content\bootstrap\css\bootstrap.min.css" />
<Content Remove="wwwroot\Content\bootstrap\css\font-awesome.min.css" />
<Content Remove="wwwroot\Content\bootstrap\fonts\fontawesome-webfont.eot" />
<Content Remove="wwwroot\Content\bootstrap\fonts\fontawesome-webfont.svg" />
<Content Remove="wwwroot\Content\bootstrap\fonts\fontawesome-webfont.ttf" />
<Content Remove="wwwroot\Content\bootstrap\fonts\fontawesome-webfont.woff" />
<Content Remove="wwwroot\Content\bootstrap\fonts\FontAwesome.otf" />
<Content Remove="wwwroot\Content\bootstrap\fonts\glyphicons-halflings-regular.eot" />
<Content Remove="wwwroot\Content\bootstrap\fonts\glyphicons-halflings-regular.svg" />
<Content Remove="wwwroot\Content\bootstrap\fonts\glyphicons-halflings-regular.ttf" />
<Content Remove="wwwroot\Content\bootstrap\fonts\glyphicons-halflings-regular.woff" />
<Content Remove="wwwroot\Content\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
<Content Remove="wwwroot\Content\bootstrap\js\bootstrap-colorpicker.min.js" />
<Content Remove="wwwroot\Content\bootstrap\js\bootstrap-multiselect.min.js" />
<Content Remove="wwwroot\Content\bootstrap\js\bootstrap-tag.min.js" />
<Content Remove="wwwroot\Content\bootstrap\js\bootstrap-wysiwyg.min.js" />
<Content Remove="wwwroot\Content\bootstrap\js\bootstrap.min.js" />
<Content Remove="wwwroot\Content\elementui\css\fonts\layout.css" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Doc\leaf.png" Link="leaf.png" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<Content Update="Views\ElementUI\List.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

2
NewLife.Cube.LayuiAdmin/NewLife.Cube.LayuiAdmin.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

121
NewLife.Cube.LayuiAdmin/NewLife.Cube.LayuiAdmin.csproj.Backup.tmp
View File

@ -1,121 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>魔方快速开发平台LayuiAdmin版</AssemblyTitle>
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2024 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>NewLife.Cube.LayuiAdmin</PackageId>
<Authors>$(Company)</Authors>
<ProjectUrl>https://github.com/NewLifeX</ProjectUrl>
<PackageIcon>leaf.png</PackageIcon>
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NewLife.CubeNC\NewLife.CubeNC.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<Content Remove="Areas\Cube\Views\_Form_Body.cshtml" />
<Content Remove="wwwroot\assets\css\style.bundle.css" />
<Content Remove="wwwroot\assets\css\style.bundle.js" />
<Content Remove="wwwroot\assets\cube.js" />
<Content Remove="wwwroot\assets\favicon.ico" />
<Content Remove="wwwroot\assets\js\scripts.bundle.js" />
<Content Remove="wwwroot\assets\logo\logo.png" />
<Content Remove="wwwroot\assets\media\bg-4.jpg" />
<Content Remove="wwwroot\assets\media\verification.png" />
<Content Remove="wwwroot\assets\plugins\global\plugins.bundle.css" />
<Content Remove="wwwroot\assets\plugins\global\plugins.bundle.js" />
<Content Remove="wwwroot\layui\layui.js" />
<Content Remove="wwwroot\modules\cron.js" />
<Content Remove="wwwroot\modules\dataGrid.js" />
<Content Remove="wwwroot\modules\excel.js" />
<Content Remove="wwwroot\modules\excel.min.js" />
<Content Remove="wwwroot\modules\jquery.js" />
<Content Remove="wwwroot\modules\notice.js" />
<Content Remove="wwwroot\modules\notice\notice.css" />
<Content Remove="wwwroot\modules\soulTable.js" />
<Content Remove="wwwroot\modules\soulTable.slim.js" />
<Content Remove="wwwroot\modules\soulTable\soulTable.css" />
<Content Remove="wwwroot\modules\tableChild.js" />
<Content Remove="wwwroot\modules\tableFilter.js" />
<Content Remove="wwwroot\modules\tableMerge.js" />
<Content Remove="wwwroot\modules\tagsInput.js" />
<Content Remove="wwwroot\modules\tagsInput\tagsInput.css" />
<Content Remove="wwwroot\modules\treeTable.js" />
<Content Remove="wwwroot\modules\xmSelect.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="wwwroot\assets\css\style.bundle.css.map" />
<EmbeddedResource Remove="wwwroot\assets\css\style.bundle.js.map" />
<EmbeddedResource Remove="wwwroot\assets\css\style.bundle.rtl.css" />
<EmbeddedResource Remove="wwwroot\assets\js\scripts.bundle.js.map" />
<EmbeddedResource Remove="wwwroot\assets\plugins\global\plugins.bundle.css.map" />
<EmbeddedResource Remove="wwwroot\assets\plugins\global\plugins.bundle.js.map" />
<EmbeddedResource Remove="wwwroot\assets\plugins\global\plugins.bundle.rtl.css" />
</ItemGroup>
<ItemGroup>
<None Remove="Views\Shared\_Form_Item.cshtml.old" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Doc\leaf.png" Link="leaf.png">
<PackagePath>\</PackagePath>
</Content>
<Content Include="Views\Shared\_Form_Item.cshtml.old" />
</ItemGroup>
<ItemGroup>
<Folder Include="Areas\Admin\Views\Shared\" />
</ItemGroup>
<ItemGroup>
<None Include="Areas\Cube\Views\PrincipalAgent_LayuiAdmin\_Form_Body.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Update="Views\_ViewStart.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

2
NewLife.Cube.Metronic/NewLife.Cube.Metronic.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

76
NewLife.Cube.Metronic/NewLife.Cube.Metronic.csproj.Backup.tmp
View File

@ -1,76 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>魔方快速开发平台Metronic版</AssemblyTitle>
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2024 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>NewLife.Cube.Metronic</PackageId>
<Authors>$(Company)</Authors>
<ProjectUrl>https://github.com/NewLifeX</ProjectUrl>
<PackageIcon>leaf.png</PackageIcon>
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NewLife.CubeNC\NewLife.CubeNC.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Areas\Admin\Views\ModelTable_Metronic3\**" />
<Content Remove="Areas\Admin\Views\ModelTable_Metronic3\**" />
<EmbeddedResource Remove="Areas\Admin\Views\ModelTable_Metronic3\**" />
<None Remove="Areas\Admin\Views\ModelTable_Metronic3\**" />
</ItemGroup>
<ItemGroup>
<Content Remove="Views\Metronic3\_List_Data_Item_First.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Doc\leaf.png" Link="leaf.png" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\Content\" />
</ItemGroup>
</Project>

2
NewLife.Cube.Metronic8/NewLife.Cube.Metronic8.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

321
NewLife.Cube.Metronic8/NewLife.Cube.Metronic8.csproj.Backup.tmp
View File

@ -1,321 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>魔方快速开发平台Metronic8版</AssemblyTitle>
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2024 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>NewLife.Cube.Metronic8</PackageId>
<Authors>$(Company)</Authors>
<ProjectUrl>https://github.com/NewLifeX</ProjectUrl>
<PackageIcon>leaf.png</PackageIcon>
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Areas\Cube\Views\ModelColumn_Metronic8\**" />
<Compile Remove="Areas\Cube\Views\ModelTable_Metronic8\**" />
<Compile Remove="wwwroot\assets\js\custom\authentication\password-reset\**" />
<Compile Remove="wwwroot\assets\logo\**" />
<Compile Remove="wwwroot\assets\plugins\custom\ckeditor\**" />
<Content Remove="Areas\Cube\Views\ModelColumn_Metronic8\**" />
<Content Remove="Areas\Cube\Views\ModelTable_Metronic8\**" />
<Content Remove="wwwroot\assets\js\custom\authentication\password-reset\**" />
<Content Remove="wwwroot\assets\logo\**" />
<Content Remove="wwwroot\assets\plugins\custom\ckeditor\**" />
<EmbeddedResource Remove="Areas\Cube\Views\ModelColumn_Metronic8\**" />
<EmbeddedResource Remove="Areas\Cube\Views\ModelTable_Metronic8\**" />
<EmbeddedResource Remove="wwwroot\assets\js\custom\authentication\password-reset\**" />
<EmbeddedResource Remove="wwwroot\assets\logo\**" />
<EmbeddedResource Remove="wwwroot\assets\plugins\custom\ckeditor\**" />
<None Remove="Areas\Cube\Views\ModelColumn_Metronic8\**" />
<None Remove="Areas\Cube\Views\ModelTable_Metronic8\**" />
<None Remove="wwwroot\assets\js\custom\authentication\password-reset\**" />
<None Remove="wwwroot\assets\logo\**" />
<None Remove="wwwroot\assets\plugins\custom\ckeditor\**" />
</ItemGroup>
<ItemGroup>
<Content Remove="wwwroot\assets\css\style.bundle.css" />
<Content Remove="wwwroot\assets\css\style.bundle.js" />
<Content Remove="wwwroot\assets\cube.js" />
<Content Remove="wwwroot\assets\favicon.ico" />
<Content Remove="wwwroot\assets\js\custom\authentication\reset-password\new-password.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\reset-password\reset-password.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-in\general.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-in\i18n.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-in\two-factor.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-in\two-steps.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-up\coming-soon.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-up\free-trial.js" />
<Content Remove="wwwroot\assets\js\custom\authentication\sign-up\general.js" />
<Content Remove="wwwroot\assets\js\custom\intro.js" />
<Content Remove="wwwroot\assets\js\custom\landing.js" />
<Content Remove="wwwroot\assets\js\custom\layout-builder\layout-builder.js" />
<Content Remove="wwwroot\assets\js\custom\widgets.js" />
<Content Remove="wwwroot\assets\js\scripts.bundle.js" />
<Content Remove="wwwroot\assets\js\widgets.bundle.js" />
<Content Remove="wwwroot\assets\media\bg-4.jpg" />
<Content Remove="wwwroot\assets\media\logos\Logo.png" />
<Content Remove="wwwroot\assets\media\logos\NewLife.png" />
<Content Remove="wwwroot\assets\media\misc\bg-1.jpg" />
<Content Remove="wwwroot\assets\media\misc\bg-2.png" />
<Content Remove="wwwroot\assets\media\misc\bg-3.png" />
<Content Remove="wwwroot\assets\media\misc\bg-4.jpg" />
<Content Remove="wwwroot\assets\media\misc\bg-5.jpg" />
<Content Remove="wwwroot\assets\media\sketchy\1-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\1.png" />
<Content Remove="wwwroot\assets\media\sketchy\10-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\10.png" />
<Content Remove="wwwroot\assets\media\sketchy\11-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\11.png" />
<Content Remove="wwwroot\assets\media\sketchy\12-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\12.png" />
<Content Remove="wwwroot\assets\media\sketchy\13-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\13.png" />
<Content Remove="wwwroot\assets\media\sketchy\14-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\14.png" />
<Content Remove="wwwroot\assets\media\sketchy\15-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\15.png" />
<Content Remove="wwwroot\assets\media\sketchy\16-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\16.png" />
<Content Remove="wwwroot\assets\media\sketchy\17-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\17.png" />
<Content Remove="wwwroot\assets\media\sketchy\18-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\18.png" />
<Content Remove="wwwroot\assets\media\sketchy\19-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\19.png" />
<Content Remove="wwwroot\assets\media\sketchy\2-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\2.png" />
<Content Remove="wwwroot\assets\media\sketchy\20-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\20.png" />
<Content Remove="wwwroot\assets\media\sketchy\3-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\3.png" />
<Content Remove="wwwroot\assets\media\sketchy\4-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\4.png" />
<Content Remove="wwwroot\assets\media\sketchy\5-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\5.png" />
<Content Remove="wwwroot\assets\media\sketchy\6-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\6.png" />
<Content Remove="wwwroot\assets\media\sketchy\7-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\7.png" />
<Content Remove="wwwroot\assets\media\sketchy\8-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\8.png" />
<Content Remove="wwwroot\assets\media\sketchy\9-dark.png" />
<Content Remove="wwwroot\assets\media\sketchy\9.png" />
<Content Remove="wwwroot\assets\media\verification.png" />
<Content Remove="wwwroot\assets\plugins\custom\draggable\draggable.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\fslightbox\fslightbox.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\fullcalendar\fullcalendar.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\fullcalendar\fullcalendar.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\jkanban\jkanban.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\jkanban\jkanban.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\jstree\images\jstree\32px.png" />
<Content Remove="wwwroot\assets\plugins\custom\jstree\images\jstree\throbber.gif" />
<Content Remove="wwwroot\assets\plugins\custom\jstree\jstree.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\jstree\jstree.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\leaflet\leaflet.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\leaflet\leaflet.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\prismjs\prismjs.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\prismjs\prismjs.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\tiny-slider\tiny-slider.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\tiny-slider\tiny-slider.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\typedjs\typedjs.bundle.js" />
<Content Remove="wwwroot\assets\plugins\custom\vis-timeline\vis-timeline.bundle.css" />
<Content Remove="wwwroot\assets\plugins\custom\vis-timeline\vis-timeline.bundle.js" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-brands-400.ttf" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-brands-400.woff2" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-duotone-900.ttf" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-duotone-900.woff2" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-light-300.ttf" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-light-300.woff2" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-regular-400.ttf" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-regular-400.woff2" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-solid-900.ttf" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-solid-900.woff2" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-v4compatibility.ttf" />
<Content Remove="wwwroot\assets\plugins\global\fonts\%40fortawesome\fa-v4compatibility.woff2" />
<Content Remove="wwwroot\assets\plugins\global\fonts\bootstrap-icons\bootstrap-icons.woff" />
<Content Remove="wwwroot\assets\plugins\global\fonts\bootstrap-icons\bootstrap-icons.woff2" />
<Content Remove="wwwroot\assets\plugins\global\plugins.bundle.css" />
<Content Remove="wwwroot\assets\plugins\global\plugins.bundle.js" />
<Content Remove="wwwroot\favicon.ico" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\assets\css\style.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\cube.js" />
<EmbeddedResource Include="wwwroot\assets\favicon.ico" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\reset-password\new-password.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\reset-password\reset-password.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-in\general.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-in\i18n.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-in\two-factor.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-in\two-steps.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-up\coming-soon.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-up\free-trial.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\authentication\sign-up\general.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\intro.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\landing.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\layout-builder\layout-builder.js" />
<EmbeddedResource Include="wwwroot\assets\js\custom\widgets.js" />
<EmbeddedResource Include="wwwroot\assets\js\scripts.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\js\widgets.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\media\bg-4.jpg" />
<EmbeddedResource Include="wwwroot\assets\media\logos\Logo.png" />
<EmbeddedResource Include="wwwroot\assets\media\logos\NewLife.png" />
<EmbeddedResource Include="wwwroot\assets\media\misc\bg-1.jpg" />
<EmbeddedResource Include="wwwroot\assets\media\misc\bg-2.png" />
<EmbeddedResource Include="wwwroot\assets\media\misc\bg-3.png" />
<EmbeddedResource Include="wwwroot\assets\media\misc\bg-4.jpg" />
<EmbeddedResource Include="wwwroot\assets\media\misc\bg-5.jpg" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\1-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\1.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\10-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\10.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\11-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\11.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\12-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\12.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\13-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\13.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\14-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\14.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\15-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\15.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\16-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\16.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\17-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\17.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\18-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\18.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\19-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\19.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\2-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\2.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\20-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\20.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\3-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\3.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\4-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\4.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\5-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\5.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\6-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\6.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\7-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\7.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\8-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\8.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\9-dark.png" />
<EmbeddedResource Include="wwwroot\assets\media\sketchy\9.png" />
<EmbeddedResource Include="wwwroot\assets\media\verification.png" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\draggable\draggable.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\fslightbox\fslightbox.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\fullcalendar\fullcalendar.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\fullcalendar\fullcalendar.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\jkanban\jkanban.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\jkanban\jkanban.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\jstree\images\jstree\32px.png" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\jstree\images\jstree\throbber.gif" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\jstree\jstree.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\jstree\jstree.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\leaflet\leaflet.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\leaflet\leaflet.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\prismjs\prismjs.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\prismjs\prismjs.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\tiny-slider\tiny-slider.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\tiny-slider\tiny-slider.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\typedjs\typedjs.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\vis-timeline\vis-timeline.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\custom\vis-timeline\vis-timeline.bundle.js" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-brands-400.ttf" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-brands-400.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-duotone-900.ttf" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-duotone-900.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-light-300.ttf" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-light-300.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-regular-400.ttf" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-regular-400.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-solid-900.ttf" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-solid-900.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-v4compatibility.ttf" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\@fortawesome\fa-v4compatibility.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\bootstrap-icons\bootstrap-icons.woff" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\fonts\bootstrap-icons\bootstrap-icons.woff2" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\plugins.bundle.css" />
<EmbeddedResource Include="wwwroot\assets\plugins\global\plugins.bundle.js" />
<EmbeddedResource Include="wwwroot\favicon.ico" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Areas\Admin\Views\Shared\" />
<Folder Include="Views\Shared\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NewLife.CubeNC\NewLife.CubeNC.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="Views\Metronic8\ObjectForm.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\Metronic8\_Object_Config_Nav.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\_ViewStart.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\Doc\leaf.png" Link="leaf.png" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<UpToDateCheckInput Remove="Areas\Admin\Views\Index_Metronic8\Cache.cshtml" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="Areas\Admin\Views\Index_Metronic8\Cache.cshtml" />
</ItemGroup>
</Project>

2
NewLife.Cube.Swagger/NewLife.Cube.Swagger.csproj
View File

@ -7,7 +7,7 @@
<Description>Web快速开发平台，搭建管理后台，灵活可扩展！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.4</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

2
NewLife.Cube.Tabler/NewLife.Cube.Tabler.csproj
View File

@ -7,7 +7,7 @@
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

85
NewLife.Cube.Tabler/NewLife.Cube.Tabler.csproj.Backup.tmp
View File

@ -1,85 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>魔方快速开发平台Tabler版</AssemblyTitle>
<Description>魔方是一个快速Web开发平台，能够快速搭建系统原型，而又具有足够灵活的可扩展性！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，默认模板在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2024 NewLife</Copyright>
<VersionPrefix>6.2</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Doc\newlife.snk</AssemblyOriginatorKeyFile>
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>NewLife.Cube.Tabler</PackageId>
<Authors>$(Company)</Authors>
<ProjectUrl>https://github.com/NewLifeX</ProjectUrl>
<PackageIcon>leaf.png</PackageIcon>
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NewLife.CubeNC\NewLife.CubeNC.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<Content Remove="wwwroot\Content\tabler\css\apexcharts.css" />
<Content Remove="wwwroot\Content\tabler\css\nouislider.min.css" />
<Content Remove="wwwroot\Content\tabler\css\tabler-social.min.css" />
<Content Remove="wwwroot\Content\tabler\js\bootstrap.bundle.min.js.map" />
<Content Remove="wwwroot\Content\tabler\js\countUp.min.js" />
<Content Remove="wwwroot\Content\tabler\js\litepicker.amd.js" />
<Content Remove="wwwroot\Content\tabler\js\litepicker.commonjs2.js" />
<Content Remove="wwwroot\Content\tabler\js\litepicker.umd.js" />
<Content Remove="wwwroot\Content\tabler\js\nouislider.min.js" />
<Content Remove="wwwroot\Content\tabler\js\tom-select.base.min.js" />
<Content Remove="wwwroot\Content\tabler\js\tom-select.base.min.js.map" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Doc\leaf.png" Link="leaf.png" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<Content Update="Views\Tabler\_Layout_Menu.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\Tabler\_Layout_Menu_Item.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

2
NewLife.Cube/NewLife.Cube.csproj
View File

@ -7,7 +7,7 @@
<Description>Web快速开发平台，搭建管理后台，灵活可扩展！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.4</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

5
NewLife.CubeNC/Areas/Admin/Controllers/UserController.cs
View File

@ -93,11 +93,12 @@ public class UserController : EntityController<User, UserModel>
}
{
var ff = AddFormFields.GetField("AreaId") as FormField;
ff.ItemView = "_Area3";
ff.ItemView = "_Area3"; // 使用area3视图
}
{
var ff = EditFormFields.GetField("AreaId") as FormField;
ff.ItemView = "_Area3";
//ff.ItemView = "_Area3";
ff.ItemType = "area3"; // 使用area3组件
}
}

2
NewLife.CubeNC/NewLife.CubeNC.csproj
View File

@ -9,7 +9,7 @@
<Description>Web快速开发平台，搭建管理后台，灵活可扩展！内部集成了用户权限管理、模板继承、SSO登录、OAuth服务端、数据导出与分享等多个功能模块，在真实项目中经历过单表100亿数据添删改查的考验。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2025 NewLife</Copyright>
<VersionPrefix>6.4</VersionPrefix>
<VersionPrefix>6.5</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
<FileVersion>$(Version)</FileVersion>

14
NewLife.CubeNC/Views/Shared/_Form_Item.cshtml
View File

@ -104,7 +104,19 @@
}
else
{
if (!item.MapField.IsNullOrEmpty())
if (item.ItemType.EqualIgnoreCase("area3", "area"))
{
@await Html.PartialAsync("_Area3", Model)
}
else if (item.ItemType.EqualIgnoreCase("area2"))
{
@await Html.PartialAsync("_Area2", Model)
}
else if (item.ItemType.EqualIgnoreCase("area1"))
{
@await Html.PartialAsync("_Area1", Model)
}
else if (!item.MapField.IsNullOrEmpty())
{
@await Html.PartialAsync(itemView ?? "_Form_Map", Model)
}

6
NewLife.CubeNC/Views/Shared/_List_Search.cshtml
View File

@ -42,15 +42,15 @@
@Html.ForDropDownList(name, dic, page[name], "全部", true)
</div>
}
else if (field.Name.EqualIgnoreCase("DistrictId"))
else if (field.Name.EqualIgnoreCase("DistrictId") || field.ItemType.EqualIgnoreCase("area3", "area"))
{
@await Html.PartialAsync("_Area3", "")
}
else if (field.Name.EqualIgnoreCase("CityId"))
else if (field.Name.EqualIgnoreCase("CityId") || field.ItemType.EqualIgnoreCase("area2"))
{
@await Html.PartialAsync("_Area2", "")
}
else if (field.Name.EqualIgnoreCase("ProvinceId"))
else if (field.Name.EqualIgnoreCase("ProvinceId") || field.ItemType.EqualIgnoreCase("area1"))
{
@await Html.PartialAsync("_Area1", "")
}