fix: fix issues

masastack · Jul 26, 2023 · 4886ab7 · 4886ab7
1 parent 6ace630
commit 4886ab7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <MasaFrameworkPackageVersion>1.0.0-rc.4.3</MasaFrameworkPackageVersion>
+    <MasaFrameworkPackageVersion>1.0.0</MasaFrameworkPackageVersion>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/src/Services/Masa.Dcc.Service/Services/ProjectService.cs b/src/Services/Masa.Dcc.Service/Services/ProjectService.cs
@@ -53,9 +53,9 @@ public async Task<List<ProjectTypeModel>> GetProjectTypes()
         return result;
     }
 
-    public async Task<List<ProjectModel>> GetListByTeamIdsAsync([FromBody] List<Guid> teamIds)
+    public async Task<List<ProjectModel>> GetListByTeamIdsAsync([FromBody] List<Guid> teamIds, IMultiEnvironmentUserContext multiEnvironmentUserContext)
     {
-        var result = await _pmClient.ProjectService.GetListByTeamIdsAsync(teamIds);
+        var result = await _pmClient.ProjectService.GetListByTeamIdsAsync(teamIds, multiEnvironmentUserContext.Environment ?? "");
 
         return result;
     }

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Modal/RollbackModal.razor b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Modal/RollbackModal.razor
@@ -7,7 +7,7 @@
             @T("RollBackAlertMessage")
         </MAlert>
         <MTimeline Style="position:relative; left:-252px;">
-            <MTimelineItem Color="primary" Small Right>
+            <MTimelineItem Color="primary" Small Right FillDot>
                 <OppositeContent>
                     <div>
                         <div style="font-size:14px; font-weight: 500; color: #1B2559;">
@@ -22,9 +22,9 @@
                     </div>
                 </ChildContent>
             </MTimelineItem>
-            <MTimelineItem Color="primary" Small Right>
+            <MTimelineItem Color="primary" Small Right FillDot>
                 <OppositeContent>
-                    <div style="font-size:14px; font-weight: 500; color: #1B2559;">@T("Rollback to")</div>
+                    <div style="font-size:14px; font-weight: 500; color: #1B2559; width: 48px; float: right;">@T("Rollback to")</div>
                 </OppositeContent>
                 <ChildContent>
                     <div>

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Team.razor.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Team.razor.cs
@@ -16,7 +16,6 @@ public partial class Team : IDisposable
         private StringNumber _curTab = 0;
         private bool _teamDetailDisabled = true;
         private bool _configDisabled = true;
-        private readonly List<Model.AppModel> _apps = new();
         private string _projectName = "";
         private ConfigComponentModel _configModel = new();
         private AppComponentModel _appModel = new();

diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json
@@ -182,5 +182,6 @@
   "EmptyApp": "当前项目下还没有应用",
   "EmptyConfigObject": "当前环境集群下还没有配置对象",
   "Cancel Pin": "取消置顶",
-  "LatestReleaseConfig": "发布于"
+  "LatestReleaseConfig": "发布于",
+  "The label value Code and label value Name cannot be duplicate": "标签值Code和标签值Name不能重复"
 }