Merge pull request 'V20220718.patch合入develop' (#2543) from V20220718.patch into develop

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2543

models/user_business_analysis.go

@@ -920,7 +920,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 		CountDate = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 1, 0, 0, currentTimeNow.Location())
 	}
 
-	DataDate := startTime.Format("2006-01-02")
+	DataDate := CountDate.Format("2006-01-02")
 	CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
 	CommitCountMap := queryCommitAction(start_unix, end_unix, 5)
 	IssueCountMap := queryCreateIssue(start_unix, end_unix)
@@ -1103,6 +1103,7 @@ func updateNewUserAcitivity(currentUserActivity map[int64]map[int64]int64, userA
 				",activate_regist_user=" + fmt.Sprint(useMetrics.ActivateRegistUser) +
 				",not_activate_regist_user=" + fmt.Sprint(useMetrics.CurrentDayRegistUser-useMetrics.ActivateRegistUser) +
 				",current_day_regist_user=" + fmt.Sprint(useMetrics.CurrentDayRegistUser) +
+				",data_date='" + time.Unix(key, 0).Format("2006-01-02") + "'" +
 				" where count_date=" + fmt.Sprint(key)
 
 			statictisSess.Exec(updateSql)

web_src/js/features/cloudbrainShow.js

@@ -168,8 +168,8 @@ export default async function initCloudrainSow() {
     let downloadFlag = $(this).data("download-flag") || "";
     let gpuFlag = $(this).data("gpu-flag") || "";
     let version_name = $(this).data("version");
-    let parents = $(this).data("parents") || "";
-    let filename = $(this).data("filename") || "";
+    let parents = $(this).data("parents");
+    let filename = $(this).data("filename");
     let init = $(this).data("init") || "";
     let path = $(this).data("path");
     let url = `/api/v1/repos${path}?version_name=${version_name}&parentDir=${parents}`;
@@ -189,7 +189,7 @@ export default async function initCloudrainSow() {
         htmlBread += "<div class='divider'> / </div>";
         $(`#file_breadcrumb${version_name}`).append(htmlBread);
       } else {
-        renderBrend(path, version_name, parents, filename, init);
+        renderBrend(path, version_name, parents, filename, init, downloadFlag);
       }
     }).fail(function (err) {
       console.log(err, version_name);
@@ -217,7 +217,14 @@ export default async function initCloudrainSow() {
     size = size.toFixed(0); //保留的小数位数
     return size + unitArr[index];
   }
-  function renderBrend(path, version_name, parents, filename, init) {
+  function renderBrend(
+    path,
+    version_name,
+    parents,
+    filename,
+    init,
+    downloadFlag
+  ) {
     if (init == "folder") {
       let htmlBrend = "";
       let sectionName = $(
@@ -227,11 +234,11 @@ export default async function initCloudrainSow() {
       let filename1 = $(`input[name=modelback${version_name}]`).val();
       if (parents1 === "") {
         $(`#file_breadcrumb${version_name} .active.section`).replaceWith(
-          `<a class='section load-model-file' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='' data-init='init'>${sectionName}</a>`
+          `<a class='section load-model-file' data-download-flag='${downloadFlag}' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='' data-init='init'>${sectionName}</a>`
         );
       } else {
         $(`#file_breadcrumb${version_name} .active.section`).replaceWith(
-          `<a class='section load-model-file' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='${filename1}'>${sectionName}</a>`
+          `<a class='section load-model-file' data-download-flag='${downloadFlag}' data-path='${path}' data-version='${version_name}' data-parents='${parents1}' data-filename='${filename1}'>${sectionName}</a>`
         );
       }
 
@@ -272,7 +279,7 @@ export default async function initCloudrainSow() {
       html += "<span class='octicon octicon-file-directory'>";
       html += "</span>";
       if (data.Dirs[i].IsDir) {
-        html += `<a  class='load-model-file' data-path='${path}' data-version='${version_name}' data-parents='${data.Dirs[i].ParenDir}' data-filename='${data.Dirs[i].FileName}' data-init='folder'>`;
+        html += `<a  class='load-model-file' data-download-flag='${downloadFlag}' data-path='${path}' data-version='${version_name}' data-parents='${data.Dirs[i].ParenDir}' data-filename='${data.Dirs[i].FileName}' data-init='folder'>`;
         html +=
           "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" +
           data.Dirs[i].FileName +