scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-09 22:55:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix file drag and drop on step [SCI-9508]

Browse source
This commit is contained in:
Anton 2023-10-18 12:03:12 +02:00
parent 88102673fe
commit 820d8294b9
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/vue/protocol/container.vue
View file

@ -171,6 +171,7 @@
@reorder="startStepReorder"
:inRepository="inRepository"
:stepToReload="stepToReload"
:activeDragStep="activeDragStep"
@step:delete="updateStepsPosition"
@step:update="updateStep"
@stepUpdated="refreshProtocolStatus"
@ -179,6 +180,7 @@
@step:move_element="reloadStep"
@step:attachemnts:loaded="stepToReload = null"
@step:move_attachment="reloadStep"
@step:drag_enter="dragEnter"
:reorderStepUrl="steps.length > 1 ? urls.reorder_steps_url : null"
:assignableMyModuleId="protocol.attributes.assignable_my_module_id"
/>
@ -256,6 +258,7 @@
reordering: false,
publishing: false,
stepToReload: null,
activeDragStep: null
}
},
mounted() {
@ -433,6 +436,9 @@
$('.my_module-name .view-mode').trigger('click');
$('.my_module-name .input-field').focus();
}, 300)
},
dragEnter(id) {
this.activeDragStep = id;
}
}
}

10
app/javascript/vue/protocol/step.vue
View file

@ -194,6 +194,10 @@
type: Number,
required: false
},
activeDragStep: {
type: Number,
required: false
}
},
data() {
return {
@ -242,6 +246,11 @@
this.loadElements();
this.loadAttachments();
}
},
activeDragStep() {
if (this.activeDragStep != this.step.id && this.dragingFile) {
this.dragingFile = false;
}
}
},
mounted() {
@ -349,6 +358,7 @@
let dt = e.dataTransfer;
if (dt.types && (dt.types.indexOf ? dt.types.indexOf('Files') != -1 : dt.types.contains('Files'))) {
this.dragingFile = true;
this.$emit('step:drag_enter', this.step.id);
}
},
loadAttachments() {