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

Убран сброс пути при выборе месторождения/куста/скважины

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

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

@ -99,6 +99,8 @@ export const WellTreeSelector = memo<WellTreeSelectorProps>(({ show, expand, cur
const navigate = useNavigate() const navigate = useNavigate()
const location = useLocation() const location = useLocation()
console.log(location.pathname)
useEffect(() => { useEffect(() => {
if (current) setSelected([current]) if (current) setSelected([current])
}, [current]) }, [current])
@ -156,7 +158,17 @@ export const WellTreeSelector = memo<WellTreeSelectorProps>(({ show, expand, cur
}, [wellsTree]) }, [wellsTree])
const onSelect = useCallback((value: Key[]): void => { const onSelect = useCallback((value: Key[]): void => {
navigate(String(value), { state: { from: location.pathname }}) const newRoot = /\/(\w+)\/(\d+)/.exec(String(value))
const oldRoot = /\/(\w+)\/(\d+)/.exec(location.pathname)
if (!newRoot || !oldRoot) return
let newPath = newRoot[0]
if (oldRoot[1] === newRoot[1]) { /// Если типы страниц одинаковые (deposit, cluster, well)
const url = location.pathname.substring(oldRoot[0].length)
newPath = newPath + url
}
navigate(newPath, { state: { from: location.pathname }})
}, [navigate, location]) }, [navigate, location])
useEffect(() => onChange(location.pathname), [onChange, location]) useEffect(() => onChange(location.pathname), [onChange, location])