hrms-bangkok/hrms-edm
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'development'

Browse source
This commit is contained in:
Methapon2001 2023-12-12 17:34:51 +07:00
commit 753b3a2ea9
No known key found for this signature in database
GPG key ID: 849924FEF46BD132
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Services/client/src/stores/storage.ts
View file

@ -214,12 +214,7 @@ 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))
} }
}, },
@ -285,7 +280,7 @@ const useStorage = defineStore('storageStore', () => {
) )
} }
if (currentInfo.path.includes(arr[arr.length - 1])) { if (currentInfo.path !== path && currentInfo.path.startsWith(path)) {
error.title = 'ตำเเหน่งที่คุณอยู่ถูกลบ' error.title = 'ตำเเหน่งที่คุณอยู่ถูกลบ'
error.msg = '' error.msg = ''
error.show() error.show()