diff --git a/src/directives/draggable.js b/src/directives/draggable.js index 726d156..66522e9 100644 --- a/src/directives/draggable.js +++ b/src/directives/draggable.js @@ -4,13 +4,14 @@ const moveModal = (elmnt) => { pos2 = 0, pos3 = 0, pos4 = 0; - document.body.addEventListener("mousedown", dragMouseDown, { + elmnt.addEventListener("mousedown", dragMouseDown, { passive: false, }); function dragMouseDown(e) { console.log("dragMouseDown", e); e = e || window.event; + if (e.button !== 0) return; e.preventDefault(); // get the mouse cursor position at startup: pos3 = e.clientX; diff --git a/src/views/AssetManagement/components/AssetSubListAddModal.vue b/src/views/AssetManagement/components/AssetSubListAddModal.vue index b6aa834..4e78230 100644 --- a/src/views/AssetManagement/components/AssetSubListAddModal.vue +++ b/src/views/AssetManagement/components/AssetSubListAddModal.vue @@ -69,11 +69,11 @@ const onOk = async () => { formData.delete("file"); formData.append("id", props.formState.id); - if (props.formState.file[0]) { + if (Array.isArray(props.formState.file) && props.formState.file[0]) { formData.append("file", props.formState.file[0]); } - if (props.formState.Device_image) { - formData.append("Device_image", props.formState.Device_image); + if (props.formState.device_image && props.formState.file.length !== 0) { + formData.append("device_image", props.formState.device_image); } const res = await postAssetSubList(formData);