Merge branch 'net' into development
This commit is contained in:
commit
02ed889065
1 changed files with 9 additions and 5 deletions
|
|
@ -214,6 +214,10 @@ const useStorage = defineStore('storageStore', () => {
|
||||||
createdAt: data.createdAt,
|
createdAt: data.createdAt,
|
||||||
createdBy: data.createdBy,
|
createdBy: data.createdBy,
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
error.title = 'ตั้งชื่อ Folder ซ้ำ'
|
||||||
|
error.msg = ''
|
||||||
|
error.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
folder.value[path].sort((a, b) => a.pathname.localeCompare(b.pathname))
|
folder.value[path].sort((a, b) => a.pathname.localeCompare(b.pathname))
|
||||||
|
|
@ -281,11 +285,11 @@ const useStorage = defineStore('storageStore', () => {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const idx = folder.value[path].findIndex(
|
if (currentInfo.path.includes(arr[arr.length - 1])) {
|
||||||
(v) => v.pathname === currentInfo.path,
|
error.title = 'ตำเเหน่งที่คุณอยู่ถูกลบ'
|
||||||
)
|
error.msg = ''
|
||||||
console.log(idx)
|
error.show()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
socket.on('FileUpload', (data: StorageFile) => {
|
socket.on('FileUpload', (data: StorageFile) => {
|
||||||
const arr = data.pathname.split('/').filter(Boolean)
|
const arr = data.pathname.split('/').filter(Boolean)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue