From 119ddd3098968b6ceaf6d98a193ded36d4786046 Mon Sep 17 00:00:00 2001 From: avadesian Date: Wed, 17 Nov 2021 14:53:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=AF=94=E8=BE=83?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=97=B6=E5=BC=95=E5=85=A5=E7=9A=84tag?= =?UTF-8?q?=E6=B1=A1=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/git/repo_compare.go | 2 +- routers/repo/view.go | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index 5bc7f9ca5..8082a8400 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -32,7 +32,7 @@ func (repo *Repository) GetMergeBase(tmpRemote string, base, head string) (strin if tmpRemote != "origin" { tmpBaseName := "refs/remotes/" + tmpRemote + "/tmp_" + base // Fetch commit into a temporary branch in order to be able to handle commits and tags - _, err := NewCommand("fetch", tmpRemote, base+":"+tmpBaseName).RunInDir(repo.Path) + _, err := NewCommand("fetch", tmpRemote, base+":"+tmpBaseName,"--no-tags").RunInDir(repo.Path) if err == nil { base = tmpBaseName } diff --git a/routers/repo/view.go b/routers/repo/view.go index 8b9039087..50a53f68b 100755 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -824,24 +824,21 @@ func renderCode(ctx *context.Context) { */ baseGitRepo, err := git.OpenRepository(ctx.Repo.Repository.BaseRepo.RepoPath()) defer baseGitRepo.Close() + var compareInfo *git.CompareInfo if err != nil { log.Error("error open baseRepo:%s", ctx.Repo.Repository.BaseRepo.RepoPath()) ctx.Data["FetchUpstreamCnt"] = -1 // minus value indicates error } else { if _, error := baseGitRepo.GetBranch(ctx.Repo.BranchName); error == nil { //base repo has the same branch, then compare between current repo branch and base repo's branch - compareUrl := ctx.Repo.BranchName + "..." + ctx.Repo.Repository.BaseRepo.OwnerName + "/" + ctx.Repo.Repository.BaseRepo.Name + ":" + ctx.Repo.BranchName - ctx.SetParams("*", compareUrl) + compareInfo, err = baseGitRepo.GetCompareInfo(ctx.Repo.Repository.RepoPath(), ctx.Repo.BranchName, ctx.Repo.BranchName) ctx.Data["UpstreamSameBranchName"] = true } else { //else, compare between current repo branch and base repo's default branch - compareUrl := ctx.Repo.BranchName + "..." + ctx.Repo.Repository.BaseRepo.OwnerName + "/" + ctx.Repo.Repository.BaseRepo.Name + ":" + ctx.Repo.Repository.BaseRepo.DefaultBranch - ctx.SetParams("*", compareUrl) + compareInfo, err = baseGitRepo.GetCompareInfo(ctx.Repo.Repository.RepoPath(), ctx.Repo.BranchName, ctx.Repo.Repository.BaseRepo.DefaultBranch) ctx.Data["UpstreamSameBranchName"] = false } - _, _, headGitRepo, compareInfo, _, _ := ParseCompareInfo(ctx) - defer headGitRepo.Close() - if compareInfo != nil { + if err==nil && compareInfo != nil { if compareInfo.Commits != nil { log.Info("compareInfoCommits数量:%d", compareInfo.Commits.Len()) ctx.Data["FetchUpstreamCnt"] = compareInfo.Commits.Len() From ddba189ce34fca0038a25ad81ffece9e6a66b100 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 17 Nov 2021 15:08:06 +0800 Subject: [PATCH 2/2] modify code --- web_src/js/components/ProAnalysis.vue | 49 +++++++++++++++++----------------- web_src/js/components/UserAnalysis.vue | 4 +++ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue index 2a42f189c..eed722796 100755 --- a/web_src/js/components/ProAnalysis.vue +++ b/web_src/js/components/ProAnalysis.vue @@ -53,16 +53,6 @@ stripe > - - - - {{scope.row.name}} + + 任务完成比例 - {{tableDataIDTotal.issueClosedRatio * 100}}% + {{(tableDataIDTotal.issueClosedRatio * 100) | rounding}}% @@ -248,18 +245,18 @@
统计周期： - - - - - - - + + + + + + + td { + background-color:#D3D3D3!important; + opacity:1 + } .colorChange { background-color: #409effd6; color: #FFFF; diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue index 71e46bad5..2c1c81456 100755 --- a/web_src/js/components/UserAnalysis.vue +++ b/web_src/js/components/UserAnalysis.vue @@ -432,6 +432,10 @@ /deep/ .el-table { font-size: 12px; } + /deep/ .el-table tbody tr:hover>td { + background-color:#D3D3D3!important; + opacity:1 + } .colorChange { background-color: #409effd6;