Merge pull request '选择数据集切换tab时页码更新问题' (#2200) from fix-2054 into V20220601

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2200
Reviewed-by: liuzx <liuzx@pcl.ac.cn>

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
         })
       },