yystopf
/
inula
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

!72 [inulax] history哈希值和search计算 

Merge pull request !72 from wangxinrong/test4
This commit is contained in:
openInula-robot 2023-11-02 01:13:48 +00:00 committed by Gitee
parent a6797335f9 d6e105e9c4
commit 3ea7d067e2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/inula-router/src/history/utils.ts
View File

@ -28,31 +28,32 @@ export function createPath(path: Partial<Path>): string {
} }
export function parsePath(url: string): Partial<Path> { export function parsePath(url: string): Partial<Path> {
if (!url) { const parsedPath: Partial<Path> = {
return {}; pathname: url || '/',
} search: '',
let parsedPath: Partial<Path> = {}; hash: '',
};
let hashIdx = url.indexOf('#'); const hashIdx = url.indexOf('#');
if (hashIdx > -1) { if (hashIdx > -1) {
parsedPath.hash = url.substring(hashIdx); const hash = url.substring(hashIdx);
parsedPath.hash = hash === '#' ? '' : hash;
url = url.substring(0, hashIdx); url = url.substring(0, hashIdx);
} }
let searchIdx = url.indexOf('?'); const searchIdx = url.indexOf('?');
if (searchIdx > -1) { if (searchIdx > -1) {
parsedPath.search = url.substring(searchIdx); const search = url.substring(searchIdx);
parsedPath.search = search === '?' ? '' : search;
url = url.substring(0, searchIdx); url = url.substring(0, searchIdx);
} }
if (url) {
parsedPath.pathname = url; parsedPath.pathname = url;
}
return parsedPath; return parsedPath;
} }
export function createLocation<S>(current: string | Location, to: To, state?: S, key?: string): Readonly<Location<S>> { export function createLocation<S>(current: string | Location, to: To, state?: S, key?: string): Readonly<Location<S>> {
let pathname = typeof current === 'string' ? current : current.pathname; const pathname = typeof current === 'string' ? current : current.pathname;
let urlObj = typeof to === 'string' ? parsePath(to) : to; const urlObj = typeof to === 'string' ? parsePath(to) : to;
// 随机key长度取6 // 随机key长度取6
const getRandKey = genRandomKey(6); const getRandKey = genRandomKey(6);
const location = { const location = {
@ -64,7 +65,13 @@ export function createLocation<S>(current: string | Location, to: To, state?: S,
...urlObj, ...urlObj,
}; };
if (!location.pathname) { if (!location.pathname) {
location.pathname = '/'; location.pathname = pathname ? pathname : '/';
}
if (location.search && location.search[0] !== '?') {
location.search = '?' + location.search;
}
if (location.hash && location.hash[0] !== '#') {
location.hash = '#' + location.hash;
} }
return location; return location;
} }
@ -95,7 +102,7 @@ export function normalizeSlash(path: string): string {
return tempPath; return tempPath;
} }
export function hasBasename(path: string, prefix: string): Boolean { export function hasBasename(path: string, prefix: string): boolean {
return ( return (
path.toLowerCase().indexOf(prefix.toLowerCase()) === 0 && ['/', '?', '#', ''].includes(path.charAt(prefix.length)) path.toLowerCase().indexOf(prefix.toLowerCase()) === 0 && ['/', '?', '#', ''].includes(path.charAt(prefix.length))
); );
@ -109,12 +116,12 @@ export function stripBasename(path: string, prefix: string): string {
export function createMemoryRecord<T, S>(initVal: S, fn: (arg: S) => T) { export function createMemoryRecord<T, S>(initVal: S, fn: (arg: S) => T) {
let visitedRecord: T[] = [fn(initVal)]; let visitedRecord: T[] = [fn(initVal)];
function getDelta(toKey: S, fromKey: S): number { function getDelta(to: S, form: S): number {
let toIdx = visitedRecord.lastIndexOf(fn(toKey)); let toIdx = visitedRecord.lastIndexOf(fn(to));
if (toIdx === -1) { if (toIdx === -1) {
toIdx = 0; toIdx = 0;
} }
let fromIdx = visitedRecord.lastIndexOf(fn(fromKey)); let fromIdx = visitedRecord.lastIndexOf(fn(form));
if (fromIdx === -1) { if (fromIdx === -1) {
fromIdx = 0; fromIdx = 0;
} }