ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлена ошибка парсинга пути при переходе через WellTreeSelector

Browse Source
This commit is contained in:
goodmice 2022-10-06 15:21:25 +05:00
parent 61d71899db
commit 38004088a7
No known key found for this signature in database
GPG Key ID: 63EA771203189CF1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/selectors/WellTreeSelector.tsx
View File

@ -158,12 +158,13 @@ export const WellTreeSelector = memo<WellTreeSelectorProps>(({ show, expand, cur
}, [wellsTree]) }, [wellsTree])
const onSelect = useCallback((value: Key[]): void => { const onSelect = useCallback((value: Key[]): void => {
const newRoot = /\/(\w+)\/(\d+)/.exec(String(value)) const newRoot = /\/(\w+)\/\d+/.exec(String(value))
const oldRoot = /\/(\w+)\/(\d+)/.exec(location.pathname) const oldRoot = /\/(\w+)(?:\/\d+)?/.exec(location.pathname)
if (!newRoot || !oldRoot) return if (!newRoot || !oldRoot) return
let newPath = newRoot[0] let newPath = newRoot[0]
if (oldRoot[1] === newRoot[1]) { /// Если типы страниц одинаковые (deposit, cluster, well) if (oldRoot[1] === newRoot[1]) {
/// Если типы страницы одинаковые (deposit, cluster, well), добавляем остаток старого пути
const url = location.pathname.substring(oldRoot[0].length) const url = location.pathname.substring(oldRoot[0].length)
newPath = newPath + url newPath = newPath + url
} }