Merge branch 'V20220601' of git.openi.org.cn:OpenI/aiforge into grampus

models/cloudbrain.go

@@ -1663,6 +1663,14 @@ func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) {
 	return int(count), err
 }
 
+func GetCloudbrainRunCountByRepoID(repoID int64) (int, error) {
+	count, err := x.In("status", JobWaiting, JobRunning, ModelArtsCreateQueue, ModelArtsCreating, ModelArtsStarting,
+		ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsRestarting, ModelArtsTrainJobInit,
+		ModelArtsTrainJobImageCreating, ModelArtsTrainJobSubmitTrying, ModelArtsTrainJobWaiting, ModelArtsTrainJobRunning,
+		ModelArtsTrainJobScaling, ModelArtsTrainJobCheckInit, ModelArtsTrainJobCheckRunning, ModelArtsTrainJobCheckRunningCompleted).And("repo_id = ?", repoID).Count(new(Cloudbrain))
+	return int(count), err
+}
+
 func GetBenchmarkCountByUserID(userID int64) (int, error) {
 	count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain))
 	return int(count), err

modules/auth/wechat/access_token.go

@@ -9,7 +9,7 @@ import (
 
 const EMPTY_REDIS_VAL = "Nil"
 
-var accessTokenLock = redis_lock.NewDistributeLock()
+var accessTokenLock = redis_lock.NewDistributeLock(redis_key.AccessTokenLockKey())
 
 func GetWechatAccessToken() string {
 	token, _ := redis_client.Get(redis_key.WechatAccessTokenKey())
@@ -28,15 +28,15 @@ func GetWechatAccessToken() string {
 }
 
 func refreshAccessToken() {
-	if ok := accessTokenLock.Lock(redis_key.AccessTokenLockKey(), 3*time.Second); ok {
-		defer accessTokenLock.UnLock(redis_key.AccessTokenLockKey())
+	if ok := accessTokenLock.Lock(3 * time.Second); ok {
+		defer accessTokenLock.UnLock()
 		callAccessTokenAndUpdateCache()
 	}
 }
 
 func refreshAndGetAccessToken() string {
-	if ok := accessTokenLock.LockWithWait(redis_key.AccessTokenLockKey(), 3*time.Second, 3*time.Second); ok {
-		defer accessTokenLock.UnLock(redis_key.AccessTokenLockKey())
+	if ok := accessTokenLock.LockWithWait(3*time.Second, 3*time.Second); ok {
+		defer accessTokenLock.UnLock()
 		token, _ := redis_client.Get(redis_key.WechatAccessTokenKey())
 		if token != "" {
 			if token == EMPTY_REDIS_VAL {

modules/redis/redis_lock/lock.go

@@ -6,22 +6,23 @@ import (
 )
 
 type DistributeLock struct {
+	lockKey string
 }
 
-func NewDistributeLock() *DistributeLock {
-	return &DistributeLock{}
+func NewDistributeLock(lockKey string) *DistributeLock {
+	return &DistributeLock{lockKey: lockKey}
 }
 
-func (lock *DistributeLock) Lock(lockKey string, expireTime time.Duration) bool {
-	isOk, _ := redis_client.Setnx(lockKey, "", expireTime)
+func (lock *DistributeLock) Lock(expireTime time.Duration) bool {
+	isOk, _ := redis_client.Setnx(lock.lockKey, "", expireTime)
 	return isOk
 }
 
-func (lock *DistributeLock) LockWithWait(lockKey string, expireTime time.Duration, waitTime time.Duration) bool {
+func (lock *DistributeLock) LockWithWait(expireTime time.Duration, waitTime time.Duration) bool {
 	start := time.Now().Unix() * 1000
 	duration := waitTime.Milliseconds()
 	for {
-		isOk, _ := redis_client.Setnx(lockKey, "", expireTime)
+		isOk, _ := redis_client.Setnx(lock.lockKey, "", expireTime)
 		if isOk {
 			return true
 		}
@@ -34,7 +35,7 @@ func (lock *DistributeLock) LockWithWait(lockKey string, expireTime time.Duratio
 	return false
 }
 
-func (lock *DistributeLock) UnLock(lockKey string) error {
-	_, err := redis_client.Del(lockKey)
+func (lock *DistributeLock) UnLock() error {
+	_, err := redis_client.Del(lock.lockKey)
 	return err
 }

options/locale/locale_en-US.ini

@@ -817,6 +817,7 @@ settings.delete_notices_1= - This operation <strong>CANNOT</strong> be undone.
 settings.delete_notices_2= - This operation will permanently delete the <strong>%s</strong> dataset.
 settings.delete_notices_fork_1= - Forks of this dataset will become independent after deletion.
 settings.deletion_success= The dataset has been deleted.
+settings.deletion_notice_cloudbrain = you need to stop the cloudbrain task under the project before remove the project!
 task.machine_translation= machine translation
 task.question_answering_system= question answering system
 task.information_retrieval= information retrieval

options/locale/locale_zh-CN.ini

@@ -1931,6 +1931,7 @@ settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滚。
 settings.delete_notices_2=- 此操作将永久删除项目 <strong>%s</strong>，包括 Git 数据、 任务、评论、百科和协作者的操作权限。
 settings.delete_notices_fork_1=- 在此项目删除后，它的派生项目将变成独立项目。
 settings.deletion_success=项目已被删除。
+settings.deletion_notice_cloudbrain=请先停止项目内正在运行的云脑任务，然后再删除项目。
 settings.update_settings_success=项目设置已更新。
 settings.transfer_owner=新拥有者
 settings.make_transfer=开始转移

routers/repo/setting.go

@@ -6,7 +6,6 @@
 package repo
 
 import (
-	"code.gitea.io/gitea/modules/notification"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -15,6 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/notification"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
@@ -477,16 +478,25 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil)
 			return
 		}
-
-		if err := repo_service.DeleteRepository(ctx.User, ctx.Repo.Repository); err != nil {
-			ctx.ServerError("DeleteRepository", err)
+		count, err := models.GetCloudbrainRunCountByRepoID(repo.ID)
+		if err != nil {
+			ctx.ServerError("GetCloudbrainCountByRepoID failed", err)
 			return
-		}
-		log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, repo.Name)
-		go StopJobsByRepoID(repo.ID)
+		} else {
+			if count >= 1 {
+				ctx.RenderWithErr(ctx.Tr("repo.settings.deletion_notice_cloudbrain"), tplSettingsOptions, nil)
+				return
+			}
+			if err := repo_service.DeleteRepository(ctx.User, ctx.Repo.Repository); err != nil {
+				ctx.ServerError("DeleteRepository", err)
+				return
+			}
+			log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, repo.Name)
+			go StopJobsByRepoID(repo.ID)
 
-		ctx.Flash.Success(ctx.Tr("repo.settings.deletion_success"))
-		ctx.Redirect(ctx.Repo.Owner.DashboardLink())
+			ctx.Flash.Success(ctx.Tr("repo.settings.deletion_success"))
+			ctx.Redirect(ctx.Repo.Owner.DashboardLink())
+		}
 
 	case "delete-wiki":
 		if !ctx.Repo.IsOwner() {

templates/custom/select_dataset.tmpl

@@ -1,138 +1,171 @@
-
-<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}" data-cloudranin-type="{{.cloudbraintype}}"></div>
+<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}"
+    data-cloudranin-type="{{.cloudbraintype}}"></div>
 <div class="inline {{if eq .cloudbraintype 0}} required {{end}} field" id="dataset-base">
     <label>{{.i18n.Tr "dataset.dataset"}}</label>
     <input type="hidden" name="attachment" :value="dataset_uuid">
     {{if eq .cloudbraintype 0}}
-    <input class="disabled" type="text" :value="dataset_name" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}" required onfocus="this.blur();">
+    <input class="disabled" type="text" :value="dataset_name" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}"
+        required onfocus="this.blur();">
     {{else}}
     <input class="disabled" type="text" :value="dataset_name" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}">
     {{end}}
-    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;"> {{.i18n.Tr "dataset.select_dataset"}}</el-button>
-    <el-dialog
-    title="{{.i18n.Tr "dataset.select_dataset"}}"
-    :visible.sync="dialogVisible"
-    width="50%"
-    >
-    <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
-        <i class="search icon"></i>
-        <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
-    </div>
-    
-    <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
-        <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in currentRepoDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name} </span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
-                    </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
+    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;">
+        {{.i18n.Tr "dataset.select_dataset"}}</el-button>
+    <el-dialog title="{{.i18n.Tr "dataset.select_dataset"}}" :visible.sync="dialogVisible" width="50%">
+        <div v-loading="loadingDataIndex" style="position: relative;">
+            <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
+                <i class="search icon"></i>
+                <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
             </div>
-            
-            
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+
+            <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
+                <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in currentRepoDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name} </span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
+                    </div>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in publicDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in publicDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myFavoriteDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myFavoriteDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-    </el-tabs>
-    <div class="center">
-        <el-pagination
-        background
-        @current-change="handleCurrentChange"
-        :current-page="page"
-        :page-size="5"
-        layout="total,prev, pager, next"
-        :total="totalnums">
-        </el-pagination>
-    </div>
+                </el-tab-pane>
+            </el-tabs>
+            <div class="center">
+                <el-pagination background @current-change="handleCurrentChange" :current-page="page" :page-size="5"
+                    layout="total,prev, pager, next" :total="totalnums">
+                </el-pagination>
+            </div>
+        </div>
     </el-dialog>
 
 
-</div>
+</div>

templates/custom/select_dataset_train.tmpl

@@ -1,142 +1,179 @@
-
-<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}" data-cloudranin-type="{{.cloudbraintype}}"></div>
+<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}"
+    data-cloudranin-type="{{.cloudbraintype}}"></div>
 <div class="inline required unite min_title field" id="dataset-base" style="margin-bottom: 0 !important;">
     {{if or (.benchmarkMode) (.newInference)}}
-    <label style="font-weight: normal;">{{if .benchmarkMode}}{{.i18n.Tr "repo.model_manager"}}</label><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{{else}}{{.i18n.Tr "dataset.dataset"}}</label>&nbsp;&nbsp;&nbsp;&nbsp;{{end}}
+    <label
+        style="font-weight: normal;">{{if .benchmarkMode}}{{.i18n.Tr "repo.model_manager"}}</label><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{{else}}{{.i18n.Tr "dataset.dataset"}}</label>&nbsp;&nbsp;&nbsp;&nbsp;{{end}}
     {{else}}
     <label style="font-weight: normal;">{{.i18n.Tr "dataset.dataset"}}</label>&nbsp;&nbsp;&nbsp;
     {{end}}
     <input type="hidden" name="attachment" :value="dataset_uuid">
     <input class="disabled" type="text" :value="dataset_name" required onfocus="this.blur();" style="width: 48.5%;">
-    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;"> {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}}</el-button>
+    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;">
+        {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}}
+    </el-button>
     {{if .benchmarkMode}}
     <span class="tooltips" style="display: block;padding-left: 0.5rem;">说明：先使用数据集功能上传模型，然后从数据集列表选模型。</span>
     {{end}}
-    <el-dialog
-    title="{{.i18n.Tr "dataset.select_dataset"}}"
-    :visible.sync="dialogVisible"
-    width="50%"
-    >
-    <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
-        <i class="search icon"></i>
-        <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
-    </div>
-    
-    <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
-        <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in currentRepoDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias} </span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name} </span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
-                    </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
+    <el-dialog title="{{.i18n.Tr "dataset.select_dataset"}}" :visible.sync="dialogVisible" width="50%">
+        <div v-loading="loadingDataIndex" style="position: relative;">
+            <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
+                <i class="search icon"></i>
+                <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
             </div>
-            
-        {{if not .benchmarkMode}}   
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+
+            <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
+                <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in currentRepoDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}
+                                </span><img v-if="dataset.Recommend" src="/img/jian.svg"
+                                    style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}
+                                </span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in publicDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                    {{if not .benchmarkMode}}
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myFavoriteDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in publicDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
+                    </div>
+
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myFavoriteDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        {{end}}
-    </el-tabs>
-    <div class="center">
-        <el-pagination
-        background
-        @current-change="handleCurrentChange"
-        :current-page="page"
-        :page-size="5"
-        layout="total,prev, pager, next"
-        :total="totalnums">
-        </el-pagination>
-    </div>
+                </el-tab-pane>
+                {{end}}
+            </el-tabs>
+            <div class="center">
+                <el-pagination background @current-change="handleCurrentChange" :current-page="page" :page-size="5"
+                    layout="total,prev, pager, next" :total="totalnums">
+                </el-pagination>
+            </div>
+        </div>
     </el-dialog>
 
 
-</div>
+</div>

web_src/js/index.js

@@ -3867,7 +3867,7 @@ function initVueDataset() {
       cloudbrainType: 0,
       dataset_uuid: '',
       dataset_name: '',
-      loadingDataIndex: true,
+      loadingDataIndex: false,
       timer: null,
       ruleForm: {
         title: '',
@@ -4338,6 +4338,7 @@ function initVueDataset() {
         }
       },
       getCurrentRepoDataset(repoLink, type) {
+
         clearInterval(this.timer)
         this.loadingDataIndex = true
         let url = repoLink + '/datasets/current_repo'
@@ -4348,12 +4349,17 @@ function initVueDataset() {
             q: this.searchDataItem
           }
         }).then((res) => {
-          this.currentRepoDataset = JSON.parse(res.data.data)
-          const checkStatuDataset = this.currentRepoDataset.filter(item => item.DecompressState === 2)
-          if (checkStatuDataset.length > 0) {
-            this.polling(checkStatuDataset, repoLink)
+          if (res.result_code == '0') {
+            this.currentRepoDataset = JSON.parse(res.data.data)
+            const checkStatuDataset = this.currentRepoDataset.filter(item => item.DecompressState === 2)
+            if (checkStatuDataset.length > 0) {
+              this.polling(checkStatuDataset, repoLink)
+            }
+            this.totalnums = parseInt(res.data.count)
+          } else {
+            this.totalnums = 0
           }
-          this.totalnums = parseInt(res.data.count)
+
           this.loadingDataIndex = false
         })
       },