Merge pull request '解决关于数据集相关的bug fix-1998 fix-1994 fix-1993 fix-1992' (#2003) from fix-1913 into V20220428

options/locale/locale_en-US.ini

@@ -2520,6 +2520,7 @@ datasets.name=name
 datasets.private=Private
 datasets.recommend=Set recommend
 datasets.unrecommend=Set unrecommend
+datasets.only_recommend = Only show platform recommendations
 
 cloudbrain.all_task_types=All Task Types
 cloudbrain.all_computing_resources=All Computing Resources

options/locale/locale_zh-CN.ini

@@ -2530,6 +2530,7 @@ datasets.name=名称
 datasets.private=私有
 datasets.recommend=设为推荐
 datasets.unrecommend=取消推荐
+datasets.only_recommend = 仅显示平台推荐
 
 cloudbrain.all_task_types=全部任务类型
 cloudbrain.all_computing_resources=全部计算资源

templates/admin/cloudbrain/imagecommit.tmpl

@@ -29,7 +29,7 @@
             <h4 class="ui top attached header">
                 {{.i18n.Tr "repo.submit_image"}}
             </h4>
-            <div class="submit-image-tmplvalue" style="display: none;" data-link="{{$.Link}}"></div>
+            <div class="submit-image-tmplvalue" style="display: none;" data-link="{{$.Link}}" data-edit-page="{{.PageIsAdminImages}}"></div>
             <div class="ui attached segment" style="padding: 2em 3em;padding-bottom: 7rem;">
                 <div class="ui form" id="form_image">
                     <input type="hidden" name="edit" value="edit">
@@ -125,5 +125,4 @@
             </div>
         </div>
     </div>
-{{template "base/footer" .}}
-    
+{{template "base/footer" .}}

templates/admin/dataset/list.tmpl

@@ -4,7 +4,6 @@
 	<div class="ui container">
 		{{template "base/alert" .}}
 		<div class="ui negative message" style="display: none;">
-			
 		</div>
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "admin.datasets.dataset_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
@@ -12,6 +11,15 @@
 		<div class="ui attached segment">
 			{{template "admin/dataset/search" .}}
 		</div>
+		<div class="ui attached segment">
+			<div class="ui ten wide column">
+				<div class="ui checkbox" id="dataset_check">
+					<input type="checkbox">
+					<label>{{.i18n.Tr "admin.datasets.only_recommend"}}</label>
+				</div>
+			</div>
+		</div>
+		
 		<div class="ui attached table segment">
 			<table class="ui very basic striped table">
 				<thead>
@@ -27,7 +35,7 @@
 					{{range .Datasets}}
 						<tr>
 							<td>{{.ID}}</td>
-							<td style="display: flex;align-items: center;"><a href="{{AppSubUrl}}/">{{.Title}}</a>{{if .Recommend}}<img src="/img/jian.svg" style="margin-left: 0.5rem;">{{end}}</td>
+							<td style="display: flex;align-items: center;"><a href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Alias}}/datasets">{{.Title}}</a>{{if .Recommend}}<img src="/img/jian.svg" style="margin-left: 0.5rem;">{{end}}</td>
 							<td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
 							<td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
 							<td>{{if .Recommend}}<span class="set_dataset"  style="color: rgb(250, 140, 22);cursor: pointer;" data-url="{{$.Link}}/{{.ID}}/action/unrecommend">{{$.i18n.Tr "admin.datasets.unrecommend"}}</span>{{else}}<span class="set_dataset"  style="color: rgb(19, 194, 141);cursor: pointer;" data-url="{{$.Link}}/{{.ID}}/action/recommend">{{$.i18n.Tr "admin.datasets.recommend"}}</span>{{end}}</td>
@@ -40,4 +48,4 @@
 		{{template "base/paginate" .}}
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}

templates/admin/dataset/search.tmpl

@@ -6,18 +6,18 @@
 				<i class="dropdown icon"></i>
 		</span>
 		<div class="menu">
-			<a class='{{if or (eq .SortType "oldest") (not .SortType)}}active{{end}} item' href='{{$.Link}}?sort=oldest&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
-			<a class='{{if eq .SortType "newest"}}active{{end}} item' href='{{$.Link}}?sort=newest&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
-			<a class='{{if eq .SortType "alphabetically"}}active{{end}} item' href='{{$.Link}}?sort=alphabetically&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
-			<a class='{{if eq .SortType "reversealphabetically"}}active{{end}} item' href='{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
-			<a class='{{if eq .SortType "recentupdate"}}active{{end}} item' href='{{$.Link}}?sort=recentupdate&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-			<a class='{{if eq .SortType "leastupdate"}}active{{end}} item' href='{{$.Link}}?sort=leastupdate&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
-			<a class='{{if eq .SortType "moststars"}}active{{end}} item' href='{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}'>{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
-			<a class='{{if eq .SortType "feweststars"}}active{{end}} item' href='{{$.Link}}?sort=feweststars&q={{$.Keyword}}&tab={{$.TabName}}'>{{.i18n.Tr "repo.issues.filter_sort.feweststars"}}</a>
-			<a class='{{if eq .SortType "mostforks"}}active{{end}} item' href='{{$.Link}}?sort=mostforks&q={{$.Keyword}}&tab={{$.TabName}}'>{{.i18n.Tr "repo.issues.filter_sort.mostforks"}}</a>
-			<a class='{{if eq .SortType "fewestforks"}}active{{end}} item' href='{{$.Link}}?sort=fewestforks&q={{$.Keyword}}&tab={{$.TabName}}'>{{.i18n.Tr "repo.issues.filter_sort.fewestforks"}}</a>
-			<a class='{{if eq .SortType "size"}}active{{end}} item' href='{{$.Link}}?sort=size&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.label.filter_sort.by_size"}}</a>
-			<a class='{{if eq .SortType "reversesize"}}active{{end}} item' href='{{$.Link}}?sort=reversesize&q={{$.Keyword}}'>{{.i18n.Tr "repo.issues.label.filter_sort.reverse_by_size"}}</a>
+			<a class='{{if or (eq .SortType "oldest") (not .SortType)}}active{{end}} item' href='{{$.Link}}?sort=oldest&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
+			<a class='{{if eq .SortType "newest"}}active{{end}} item' href='{{$.Link}}?sort=newest&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
+			<a class='{{if eq .SortType "alphabetically"}}active{{end}} item' href='{{$.Link}}?sort=alphabetically&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
+			<a class='{{if eq .SortType "reversealphabetically"}}active{{end}} item' href='{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
+			<a class='{{if eq .SortType "recentupdate"}}active{{end}} item' href='{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
+			<a class='{{if eq .SortType "leastupdate"}}active{{end}} item' href='{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+			<a class='{{if eq .SortType "moststars"}}active{{end}} item' href='{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
+			<a class='{{if eq .SortType "feweststars"}}active{{end}} item' href='{{$.Link}}?sort=feweststars&q={{$.Keyword}}&tab={{$.TabName}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.feweststars"}}</a>
+			<a class='{{if eq .SortType "mostforks"}}active{{end}} item' href='{{$.Link}}?sort=mostforks&q={{$.Keyword}}&tab={{$.TabName}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.mostforks"}}</a>
+			<a class='{{if eq .SortType "fewestforks"}}active{{end}} item' href='{{$.Link}}?sort=fewestforks&q={{$.Keyword}}&tab={{$.TabName}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.filter_sort.fewestforks"}}</a>
+			<a class='{{if eq .SortType "size"}}active{{end}} item' href='{{$.Link}}?sort=size&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.label.filter_sort.by_size"}}</a>
+			<a class='{{if eq .SortType "reversesize"}}active{{end}} item' href='{{$.Link}}?sort=reversesize&q={{$.Keyword}}&recommend={{$.Recommend}}'>{{.i18n.Tr "repo.issues.label.filter_sort.reverse_by_size"}}</a>
 		</div>
 	</div>
 </div>
@@ -26,4 +26,4 @@
 		<input name="q" value="{{.Keyword}}" placeholder='{{.i18n.Tr "explore.search"}}...' autofocus>
 		<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
 	</div>
-</form>
+</form>

templates/explore/datasets.tmpl

@@ -121,12 +121,12 @@
 								<i class="dropdown icon"></i>
 								</span>
 								<div class="menu">
-									<a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
-									<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
-									<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-									<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
-									<a class="{{if eq .SortType "downloadtimes"}}active{{end}} item" href="{{$.Link}}?sort=downloadtimes&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}</a>
-									<a class="{{if eq .SortType "moststars"}}active{{end}} item" href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
+									<a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
+									<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
+									<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
+									<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+									<a class="{{if eq .SortType "downloadtimes"}}active{{end}} item" href="{{$.Link}}?sort=downloadtimes&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}</a>
+									<a class="{{if eq .SortType "moststars"}}active{{end}} item" href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
 								</div>
 							</div>
 						</div>
@@ -140,13 +140,13 @@
 					{{end}}
 
 					<div class="ui row" style="clear: both;" id="dataset-base">
+						<el-checkbox v-model="checked" style="padding: 0.5rem 1rem;"  @change="handleCheckedChange" >仅显示平台推荐</el-checkbox>
 						<div class="ui two cards">
 							{{range $k, $v :=.Datasets}}
 							<div class="ui card" @click="gotoDataset('{{.Repo.Link}}/datasets')" style="cursor: pointer;box-shadow: 0px 4px 4px 0px rgba(232,232,232,0.6);border: 1px solid rgba(232, 232, 232, 1);">
 								<div class="content" style="border-bottom: none;">
 									<div class="repo_dataset_header" style="display: flex;align-items: center;justify-content: space-between;">
-										<a href="{{.Repo.Link}}/datasets" style="font-size: 12px;color: #3291F8;height: 24px;">{{.Repo.OwnerName}} / {{.Repo.Alias}}{{if .Recommend}}<img src="/img/jian.svg" style="margin-left: 0.5rem;">{{end}}</a>
-										
+										<a href="{{.Repo.Link}}/datasets" style="font-size: 12px;color: #3291F8;height: 24px;">{{.Repo.OwnerName}} / {{.Repo.Alias}}</a>
 										{{if $.IsSigned}}
 										<span style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;" @click.stop="postSquareStar({{.ID}},'{{.Repo.Link}}/datasets',{{$k}})">
 											<div style="line-height: 1;margin-right: 4px;margin-bottom: -2px;">
@@ -163,7 +163,7 @@
 										</span>
 										{{end}}
 									</div>
-									<div style="font-size: 16px;color:#0366D6;font-family: SourceHanSansSC-medium;height: 27px;font-weight: bold;">{{.Title}}</div>
+									<div  style="font-size: 16px;color:#0366D6;font-family: SourceHanSansSC-medium;height: 27px;font-weight: bold;display: flex;align-items: center"><span title="{{.Title}}" class="nowrap" style="display: inline-block;">{{.Title}}</span>{{if .Recommend}}<img src="/img/jian.svg" style="margin-left: 0.5rem;">{{end}}</div>
 									{{if or (.Category) (.Task) (.License)}}
 									<div style="font-size: 12px;margin-top: 5px;">
 										{{if .Category}}

web_src/js/components/images/adminImages.vue

@@ -27,7 +27,7 @@
                          </el-dropdown>
             </div>
             <div class="ui six wide column right aligned" style="margin: 1rem 0;">
-                    <a class="ui blue small button" href="/admin/images/commit_image?from=imageAdmin">创建云脑镜像</a>
+                    <a class="ui blue small button" href="/admin/images/commit_image">创建云脑镜像</a>
             </div>
             <div class="ui sixteen wide column" style="padding: 0;">
                 <el-table
@@ -117,12 +117,8 @@
                                         <svg width="1.4em" height="1.4em" viewBox="0 0 32 32" class="heart-stroke"><path d="M4.4 6.54c-1.761 1.643-2.6 3.793-2.36 6.056.24 2.263 1.507 4.521 3.663 6.534a29110.9 29110.9 0 0010.296 9.633l10.297-9.633c2.157-2.013 3.424-4.273 3.664-6.536.24-2.264-.599-4.412-2.36-6.056-1.73-1.613-3.84-2.29-6.097-1.955-1.689.25-3.454 1.078-5.105 2.394l-.4.319-.398-.319c-1.649-1.316-3.414-2.143-5.105-2.394a7.612 7.612 0 00-1.113-.081c-1.838 0-3.541.694-4.983 2.038z"></path></svg>    
                                         <span style="line-height: 2;margin-left:0.3rem;">{{scope.row.numStars}}</span>
                                     </div>
-                                    <template v-if="!scope.row.isPrivate">
                                             <span style="padding: 0 1rem;color: rgb(250, 140, 22);cursor:pointer;" v-if="scope.row.type==5" @click="unSetRecommend(scope.$index,scope.row.id)">取消推荐</span>
-                                            <span style="padding: 0 1rem;color: rgb(19, 194, 141);cursor:pointer;" v-else @click="setRecommend(scope.$index,scope.row.id)">设为推荐</span>
-                                    </template>
-                                    
-                                    
+                                            <span style="padding: 0 1rem;color: rgb(19, 194, 141);cursor:pointer;" v-if="scope.row.type!==5 && !scope.row.isPrivate" @click="setRecommend(scope.$index,scope.row.id)">设为推荐</span>
                                     <span style="padding: 0 1rem;color:#0366d6;cursor:pointer;" @click="copyUrl(scope.row.place)">复制地址</span>
                                     <div style="padding-left:1rem;cursor:pointer;">
                                         <el-dropdown size="medium">

web_src/js/features/images.js

@@ -165,12 +165,13 @@ export default async function initImage(){
         return false
     })
     $('#cancel_submit_image').click(()=>{
+        console.log(pageform)
         if(link.includes('cloudbrain')){
             let repoLink = link.split('cloudbrain')[0]
             location.href = `${window.config.AppSubUrl}${repoLink}debugjob?debugListType=all`
         }else if(pageform=='imageSquare'){
             location.href = `${window.config.AppSubUrl}/explore/images?type=myimage`
-        }else if(pageform=='imageAdmin'){
+        }else if(pageform){
             location.href = `${window.config.AppSubUrl}/admin/images`
         }
     })

web_src/js/index.js

@@ -3700,6 +3700,37 @@ function initVueEditAbout() {
 }
 
 function  initVueDataset() {
+  if($('#dataset_check').length){
+    if(location.search.indexOf('recommend=true')!==-1){
+      $('#dataset_check').checkbox('set checked')
+    }else{
+      $('#dataset_check').checkbox('set unchecked')
+    }
+    $('#dataset_check').checkbox({
+      onChecked: function() {
+        if(location.search){
+          const params = new URLSearchParams(location.search)
+          if(params.has('recommend')){
+            params.delete('recommend')
+            location.href = AppSubUrl + location.pathname + '?' + params.toString() + '&recommend=true'
+          }else{
+            location.href = `${window.config.AppSubUrl}/admin/datasets${location.search}&recommend=true`
+          }
+        }else{
+          location.href = `${window.config.AppSubUrl}/admin/datasets?recommend=true`
+        }
+      },
+      onUnchecked: function() {
+        if(location.search=='?recommend=true'){
+          location.href = AppSubUrl + location.pathname
+        }else{
+          const params = new URLSearchParams(location.search)
+          params.delete('recommend')
+          location.href = AppSubUrl + location.pathname + '?' + params.toString()
+        }
+      },
+    })
+  }
   $('.set_dataset').on('click', function(){
     const $this = $(this);
     let link = $this.data('url')
@@ -3783,24 +3814,13 @@ function  initVueDataset() {
   if(document.getElementById('dataset-file-desc')){
     dataset_file_desc = document.getElementById('dataset-file-desc').value
   }
-  
-  // getEditInit(){
-      //   if($('#dataset-edit-value')){
-      //     $this = $('#dataset-edit-value')
-      //     this.ruleForm.title = $this.data('edit-title') || ''
-      //     this.ruleForm.description = $this.data('edit-description') || ''
-      //     this.ruleForm.category = $this.data('edit-category') || ''
-      //     this.ruleForm.task = $this.data('edit-task') || ''
-      //     this.ruleForm.license = $this.data('edit-license') || ''
-      //     this.ruleForm.id = $this.data('edit-id')|| ''
-      //   }
-      // },
   new Vue({
     delimiters: ['${', '}'],
     el,
     data: {
       suburl: AppSubUrl,
       url:'',
+      checked:false,
       type:0,
       desc:'',
       descfile:'',
@@ -3897,6 +3917,12 @@ function  initVueDataset() {
         this.getCurrentRepoDataset(this.repolink,this.cloudbrainType)
       }
       
+      const params = new URLSearchParams(location.search)
+      if (params.has('recommend') && params.get('recommend')=='true'){
+        this.checked = true
+      }else{
+        this.checked = false
+      }
     },
     created(){
       if(document.getElementById('postPath')){
@@ -3937,6 +3963,30 @@ function  initVueDataset() {
         }                                                     
 
       },
+      handleCheckedChange(val){
+        if(val){
+          if(location.search){
+            const params = new URLSearchParams(location.search)
+            if(params.has('recommend')){
+              params.delete('recommend')
+              let search = params.toString()
+              location.href = `${AppSubUrl}/explore/datasets?${search}&recommend=${val}`
+            }else{  
+              location.href = `${AppSubUrl}/explore/datasets${location.search}&recommend=${val}`
+            }
+          }else{
+            location.href = `${AppSubUrl}/explore/datasets?recommend=${val}`
+          }
+        }else{
+          if(location.search=='?recommend=true'){
+            location.href = AppSubUrl + location.pathname
+          }else{
+            const params = new URLSearchParams(location.search)
+            params.delete('recommend')
+            location.href = AppSubUrl + location.pathname + '?' + params.toString()
+          }
+        }
+      },
       createDataset(formName){
         let _this = this
         this.$refs[formName].validate((valid)=>{