@vlian/router 1.0.9 → 1.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -12,7 +12,7 @@ export type RouterTransformOptions = {
|
|
|
12
12
|
fetchRoutes?: () => Promise<RouteItem[]>;
|
|
13
13
|
staticRoutes?: RouteItem[];
|
|
14
14
|
};
|
|
15
|
-
export declare const useRouterTransform: (config: RouterTransformConfig, rootRoutes
|
|
15
|
+
export declare const useRouterTransform: (config: RouterTransformConfig, rootRoutes?: string | undefined, options?: RouterTransformOptions) => {
|
|
16
16
|
routeObject: RouteObject[] | null;
|
|
17
17
|
dynamicRoutes: RouteItem[];
|
|
18
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/provider/transform.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,WAAW,EAEnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,YAAY,CAAA;CACtB,CAAA;AACD,MAAM,MAAM,sBAAsB,GAAG;IACjC,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;CAC9B,CAAA;AAGD,eAAO,MAAM,kBAAkB,GAAI,QAAQ,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/provider/transform.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,WAAW,EAEnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,YAAY,CAAA;CACtB,CAAA;AACD,MAAM,MAAM,sBAAsB,GAAG;IACjC,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;CAC9B,CAAA;AAGD,eAAO,MAAM,kBAAkB,GAAI,QAAQ,qBAAqB,EAAE,aAAY,MAAM,GAAG,SAAe,EAAE,UAAU,sBAAsB;;;CA4MvI,CAAA"}
|
|
@@ -239,7 +239,8 @@ function _ts_generator(thisArg, body) {
|
|
|
239
239
|
import { Navigate } from 'react-router-dom';
|
|
240
240
|
import React from "react";
|
|
241
241
|
import { useUpdateEffect } from "ahooks";
|
|
242
|
-
export var useRouterTransform = function(config
|
|
242
|
+
export var useRouterTransform = function(config) {
|
|
243
|
+
var rootRoutes = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '/', options = arguments.length > 2 ? arguments[2] : void 0;
|
|
243
244
|
var transformRouteToReactRoutes = /**
|
|
244
245
|
* 批量处理路由
|
|
245
246
|
* @param routes 路由组
|
|
@@ -541,15 +542,8 @@ export var useRouterTransform = function(config, rootRoutes, options) {
|
|
|
541
542
|
void initRouter();
|
|
542
543
|
}, deps);
|
|
543
544
|
useUpdateEffect(function() {
|
|
544
|
-
// const rootRoute: RouteItem = {
|
|
545
|
-
// ...rootRoutes
|
|
546
|
-
// }
|
|
547
|
-
// if (!rootRoute.children) {
|
|
548
|
-
// rootRoute.children = [];
|
|
549
|
-
// }
|
|
550
|
-
// rootRoute.children = [...(routes || []), ...(staticRoutes || [])];
|
|
551
545
|
var restansformatRoutes = transformRouteToReactRoutes(_to_consumable_array(routes || []).concat(_to_consumable_array(staticRoutes || [])));
|
|
552
|
-
var rootPath = rootRoutes
|
|
546
|
+
var rootPath = rootRoutes || '/';
|
|
553
547
|
setRoutesObject([
|
|
554
548
|
{
|
|
555
549
|
index: true,
|
package/dist/router/router.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ declare global {
|
|
|
10
10
|
export type RouterProviderProps = {
|
|
11
11
|
fetchRoutes: () => Promise<RouteItem[]>;
|
|
12
12
|
imports: Record<string, any>;
|
|
13
|
-
rootRoutes?:
|
|
13
|
+
rootRoutes?: string | undefined;
|
|
14
14
|
staticRoutes?: RouteItem[];
|
|
15
15
|
options?: DOMRouterOpts;
|
|
16
16
|
isSubApp?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAmE,MAAM,kBAAkB,CAAC;AACjH,OAAO,EAAqB,SAAS,EAAC,MAAM,aAAa,CAAC;AAC1D,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAI1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC;KACvC;CACF;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAmE,MAAM,kBAAkB,CAAC;AACjH,OAAO,EAAqB,SAAS,EAAC,MAAM,aAAa,CAAC;AAC1D,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAI1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC;KACvC;CACF;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAA;AAED,eAAO,MAAM,cAAc,EAAC,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAoDvD,CAAA"}
|
package/dist/router/router.js
CHANGED
|
@@ -47,10 +47,10 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
47
47
|
import { RouterProvider as Provider, createBrowserRouter } from 'react-router-dom';
|
|
48
48
|
import { useRouterTransform, navigator } from "../provider";
|
|
49
49
|
import React, { useState, useEffect } from 'react';
|
|
50
|
-
import { staticRoutes as defaultStaticRoutes
|
|
50
|
+
import { staticRoutes as defaultStaticRoutes } from './routes';
|
|
51
51
|
import { useSquareRotate2Styles } from '../styles/square-rotate';
|
|
52
52
|
export var RouterProvider = function(param) {
|
|
53
|
-
var fetchRoutes = param.fetchRoutes, imports = param.imports, _param_rootRoutes = param.rootRoutes, rootRoutes = _param_rootRoutes === void 0 ?
|
|
53
|
+
var fetchRoutes = param.fetchRoutes, imports = param.imports, _param_rootRoutes = param.rootRoutes, rootRoutes = _param_rootRoutes === void 0 ? '/' : _param_rootRoutes, _param_staticRoutes = param.staticRoutes, staticRoutes = _param_staticRoutes === void 0 ? defaultStaticRoutes : _param_staticRoutes, options = param.options, _param_isSubApp = param.isSubApp, isSubApp = _param_isSubApp === void 0 ? false : _param_isSubApp, loadingRender = param.loadingRender, _param_loadingSize = param.loadingSize, loadingSize = _param_loadingSize === void 0 ? '24px' : _param_loadingSize, _param_loadingColor = param.loadingColor, loadingColor = _param_loadingColor === void 0 ? 'currentColor' : _param_loadingColor, _param_loadingOpacity = param.loadingOpacity, loadingOpacity = _param_loadingOpacity === void 0 ? 0.25 : _param_loadingOpacity;
|
|
54
54
|
var _useState = _sliced_to_array(useState(), 2), dataRouter = _useState[0], setDataRouter = _useState[1];
|
|
55
55
|
var styles = useSquareRotate2Styles().styles;
|
|
56
56
|
var routeObject = useRouterTransform({
|