-
- {{.i18n.Tr "repo.issues.filter_sort"}}
-
-
@@ -24,9 +26,19 @@ import qs from 'qs';
import createDropzone from '../features/dropzone.js';
const {_AppSubUrl, _StaticUrlPrefix, csrf} = window.config;
-const CloudBrainType = 0;
+// const uploadtype = 0;
export default {
+ props:{
+ uploadtype:{
+ type:Number,
+ required:true
+ },
+ desc:{
+ type:String,
+ default:''
+ }
+ },
data() {
return {
dropzoneUploader: null,
@@ -36,7 +48,10 @@ export default {
progress: 0,
status: '',
dropzoneParams: {},
- file_status_text: ''
+ file_status_text: '',
+ file:{},
+ repoPath:'',
+ btnFlag:false
};
},
@@ -44,33 +59,45 @@ export default {
this.dropzoneParams = $('div#minioUploader-params');
this.file_status_text = this.dropzoneParams.data('file-status');
this.status = this.dropzoneParams.data('file-init-status');
-
- let previewTemplate = '';
- previewTemplate += '
\n ';
- previewTemplate += '
\n ';
- previewTemplate += '
';
- previewTemplate +=
- ' ';
- previewTemplate += '
\n ';
- previewTemplate += '
\n ';
- previewTemplate += '
\n ';
- previewTemplate += '
';
- previewTemplate +=
- '
\n ';
- previewTemplate += '
\n ';
- previewTemplate += '
';
- previewTemplate += ' 上传成功';
- previewTemplate += '
\n ';
- previewTemplate += '
';
- previewTemplate += ' 上传失败';
- previewTemplate += '
\n ';
- previewTemplate += '
';
- previewTemplate += ' ';
- previewTemplate += '
\n';
- previewTemplate += '
';
+ this.repoPath = this.dropzoneParams.data('repopath');
+ // let previewTemplate = '';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
';
+ // previewTemplate +=
+ // ' ';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
';
+ // previewTemplate +=
+ // '
\n ';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
';
+ // previewTemplate += ' 上传成功';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
';
+ // previewTemplate += ' 上传失败';
+ // previewTemplate += '
\n ';
+ // previewTemplate += '
';
+ // previewTemplate += ' ';
+ // previewTemplate += '
\n';
+ // previewTemplate += '
';
+ let previewTemplate = ''
+ previewTemplate += '
'
+ previewTemplate += '
'
+ previewTemplate += '
'
+ previewTemplate += '
'
+ previewTemplate += '
'
+ previewTemplate += '
![]()
'
+ previewTemplate += '
'
+
+ previewTemplate += '
✔
'
+ previewTemplate += '
✘
'
+ previewTemplate += '
'
+ previewTemplate += '
'
const $dropzone = $('div#dataset');
- console.log('createDropzone');
const dropzoneUploader = await createDropzone($dropzone[0], {
url: '/todouploader',
maxFiles: this.maxFiles,
@@ -84,10 +111,7 @@ export default {
previewTemplate
});
dropzoneUploader.on('addedfile', (file) => {
- setTimeout(() => {
- // eslint-disable-next-line no-unused-expressions
- file.accepted && this.onFileAdded(file);
- }, 200);
+ this.file = file
});
dropzoneUploader.on('maxfilesexceeded', function (file) {
if (this.files[0].status !== 'success') {
@@ -105,11 +129,15 @@ export default {
resetStatus() {
this.progress = 0;
this.status = '';
+ console.log(this.uploadtype)
},
updateProgress(file, progress) {
file.previewTemplate.querySelector(
'.dz-upload'
- ).style.width = `${progress}%`;
+ ).style.width = `${progress}%`
+ file.previewTemplate.querySelector(
+ '.dz-upload'
+ ).style.background = '#409eff';
},
emitDropzoneSuccess(file) {
file.status = 'success';
@@ -122,18 +150,19 @@ export default {
this.dropzoneUploader.emit('error', file);
// this.dropzoneUploader.emit('complete', file);
},
- onFileAdded(file) {
- file.datasetId = document
+ onFileAdded() {
+ this.btnFlag = true
+ this.file.datasetId = document
.getElementById('datasetId')
.getAttribute('datasetId');
this.resetStatus();
- this.computeMD5(file);
+ this.computeMD5(this.file);
},
finishUpload(file) {
this.emitDropzoneSuccess(file);
setTimeout(() => {
- window.location.reload();
+ window.location.href = this.repoPath
}, 1000);
},
@@ -249,7 +278,7 @@ export default {
file_name: file.name,
size: file.size,
dataset_id: file.datasetId,
- type: CloudBrainType,
+ type: this.uploadtype,
_csrf: csrf
})
);
@@ -288,7 +317,7 @@ export default {
md5: file.uniqueIdentifier,
size: file.size,
fileType: file.type,
- type: CloudBrainType,
+ type: this.uploadtype,
_csrf: csrf
}
});
@@ -329,7 +358,7 @@ export default {
uploadID: file.uploadID,
size: partSize,
chunkNumber: currentChunk + 1,
- type: CloudBrainType,
+ type: this.uploadtype,
_csrf: csrf
}
});
@@ -403,8 +432,9 @@ export default {
file_name: file.name,
size: file.size,
dataset_id: file.datasetId,
- type: CloudBrainType,
- _csrf: csrf
+ type: this.uploadtype,
+ _csrf: csrf,
+ description:this.desc
})
);
}
@@ -455,7 +485,7 @@ export default {
\ No newline at end of file
diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue
index b20594b86..7ceb91a27 100755
--- a/web_src/js/components/ObsUploader.vue
+++ b/web_src/js/components/ObsUploader.vue
@@ -460,7 +460,7 @@ export default {
\ No newline at end of file
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 902750c5b..0663cb3f2 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -2918,6 +2918,7 @@ $(document).ready(async () => {
initVueApp();
initVueUploader();
initObsUploader();
+ initVueDataset();
initVueEditAbout();
initVueEditTopic();
initVueContributors();
@@ -3658,6 +3659,101 @@ function initVueEditAbout() {
});
}
+function initVueDataset() {
+ const el = document.getElementById('dataset-base');
+ if (!el) {
+ return;
+ }
+ new Vue({
+ delimiters: ['${', '}'],
+ el,
+ data: {
+ suburl: AppSubUrl,
+ url:'',
+ type:0,
+ desc:'',
+ datasetType:'全部',
+ ruleForm:{
+ title:'',
+ description:'',
+ category:'',
+ task:'',
+ license:'',
+ _csrf:csrf
+ },
+ rules: {
+ title: [
+ { required: true, message: '请输入数据集名称', trigger: 'blur' },
+ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
+ // {required:true,message:'test',pattern:'/^[a-zA-Z0-9-_]{1,100}[^-]$/',trigger:'blur'},
+ { validator: (rule, value, callback) => {
+ if (/^[a-zA-Z0-9-_]{1,100}[^-]$/.test(value) == false) {
+ callback(new Error("输入不符合数据集名称规则"));
+ } else {
+ callback();
+ }
+ }, trigger: 'blur'}
+ ],
+ description: [
+ { required: true, message: '请输入数据集描述详情', trigger: 'blur' }
+ ],
+ category: [
+ { required: true, message: '请选择分类', trigger: 'change' }
+ ],
+ task: [
+ { required: true, message: '请选择研究方向/应用领域', trigger: 'change' }
+ ],
+ // license: [
+ // { required: true, message: '请选择活动区域', trigger: 'change' }
+ // ]
+ },
+ },
+ components: {
+ MinioUploader,
+ ObsUploader
+ },
+ mounted(){
+ if(document.getElementById('postPath')){
+ this.url = document.getElementById('postPath').value
+ }
+ },
+ methods:{
+ createDataset(formName){
+ let _this = this
+ this.$refs[formName].validate((valid)=>{
+ if(valid){
+ document.getElementById("mask").style.display = "block"
+ _this.$axios.post(_this.url,_this.qs.stringify(_this.ruleForm)).then((res)=>{
+ if(res.data.Code===0){
+ document.getElementById("mask").style.display = "none"
+ location.href = _this.url.split('/create')[0]+'?type=-1'
+ }else{
+ console.log(res.data.Message)
+ }
+ })
+ }
+ else{
+ return false
+ }
+ })
+ },
+ cancelDataset(){
+ location.href = this.url.split('/create')[0]+'?type=-1'
+ },
+ gotoUpload(datsetId){
+ location.href = `${AppSubUrl}/attachments/upload?datasetId=${datsetId}`
+ },
+ uploadGpu(){
+ this.type=0
+ },
+ uploadNpu(){
+ this.type=1
+ }
+
+ }
+ });
+
+}
function initVueEditTopic() {
const el = document.getElementById('topic_edit1');
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index 6598f5f40..c36bb2ce4 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -375,6 +375,10 @@ display: block;
font-size: 18px;
margin-bottom: 1rem;
}
+.bgtask-content-button{
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
.selectcloudbrain .active.item{
color: #0087f5 !important;