@ibiz-template/vue3-util 0.0.3-beta.4 → 0.0.3-beta.6

package/src/util/route/route.ts

@@ -1,4 +1,4 @@
-import { notNilEmpty } from 'qx-util';
+import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { IPSApplication, IPSAppView, IPSSubAppRef } from '@ibiz-template/model';
 import qs from 'qs';
@@ -6,6 +6,26 @@ import { RouteLocationNormalizedLoaded as Route } from 'vue-router';
 import { calcRouteContext } from '@ibiz-template/runtime';
 import { IRoutePath, IRoutePathNode, IRouteViewData } from '../../interface';
 
+/**
+ * 获取自身的路由上下文，排除了部分不需要路由携带的参数
+ *
+ * @author lxm
+ * @date 2023-03-14 02:07:41
+ * @export
+ * @param {IContext} context
+ * @returns {*}  {IParams}
+ */
+export function getOwnRouteContext(context: IContext): IParams {
+  const ownContext = context.getOwnContext();
+  const excludeKeys = ['srfsessionid'];
+  Object.keys(ownContext).forEach(key => {
+    if (excludeKeys.includes(key)) {
+      delete ownContext[key];
+    }
+  });
+  return ownContext;
+}
+
 /**
  * 生成route路径
  *
@@ -21,27 +41,32 @@ import { IRoutePath, IRoutePathNode, IRouteViewData } from '../../interface';
 export function generateRoutePath(
   appView: IPSAppView,
   route: Route,
-  context?: IBizContext | undefined,
+  context: IBizContext,
   params?: IParams | undefined,
-): { path: string; query: IParams | undefined } {
+): { path: string } {
   const routePath = route2routePath(route);
   // 如果上下文存在toRouteLevel时，使用上下文的层级，否则是第二级路由
   let level = 2;
-  if (context?.toRouteLevel) {
+  if (context.toRouteLevel) {
     level = context.toRouteLevel;
     // 使用完后删除，避免添加到首页上下文里
     delete context.toRouteLevel;
   }
+
   // 删除目标层级和之后的路由，保留之前层级的路由
   routePath.pathNodes.splice(level - 1, routePath.pathNodes.length - level + 1);
 
-  // 修改当前层级路由的附加上下文参数
-  if (context?.currentRouteContext) {
-    routePath.pathNodes[level - 2].context = context.currentRouteContext;
+  // 导航视图的导航参数,加在目标层级之前的一个层级的视图参数里
+  if (context.currentSrfNav) {
+    const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
+    currentNode.params = currentNode.params || {};
+    currentNode.params.srfnav = context.currentSrfNav;
+    // 使用完后删除，避免添加到首页上下文里
+    delete context.currentSrfNav;
   }
 
   // 重定向视图跳转的一级首页路由
-  if (routePath.pathNodes[0].viewName === 'appredirectview') {
+  if (routePath.pathNodes[0]?.viewName === 'appredirectview') {
     if (params?.srfindexname) {
       routePath.pathNodes[0].viewName = params.srfindexname;
       delete params.srfindexname;
@@ -51,22 +76,38 @@ export function generateRoutePath(
   }
 
   // 计算目标视图path路径
-  routePath.pathNodes.push({ viewName: appView.codeName.toLowerCase() });
-  const codeName = appView.getPSAppDataEntity()?.codeName;
+  routePath.pathNodes.push({
+    viewName: appView.codeName.toLowerCase(),
+    context: getOwnRouteContext(context),
+    params,
+  });
 
-  // 计算最新的上下文并更新到index后面
-  if (context && codeName) {
+  // 计算二级视图的资源路径加到index后面
+  const codeName = appView.getPSAppDataEntity()?.codeName;
+  if (level === 2 && codeName) {
     const app = ibiz.hub.getApp(appView.getPSModelService().app);
     const paths = app.resourcePathUtil.calcPaths(codeName);
-    const routeContext = calcRouteContext(context, paths);
-    routePath.pathNodes[0].context = routeContext;
-  } else {
-    routePath.pathNodes[0].context = {};
+    const resContext = calcRouteContext(context, paths);
+    if (!isNilOrEmpty(resContext)) {
+      // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
+      routePath.pathNodes[0].context = resContext;
+      Object.keys(resContext).forEach(key => {
+        const currentNode = routePath.pathNodes[level - 1];
+        if (
+          currentNode.context &&
+          Object.prototype.hasOwnProperty.call(currentNode.context, key)
+        ) {
+          delete currentNode.context[key];
+        }
+      });
+    } else {
+      routePath.pathNodes[0].context = undefined;
+    }
   }
 
   // 视图参数通过query传递
 
-  return { path: routePath2string(routePath), query: params };
+  return { path: routePath2string(routePath) };
 }
 
 /**
@@ -169,8 +210,8 @@ export function parseRouteViewData(
   const modelPath = viewModel.modelPath!;
   const { viewType } = viewModel.refM;
 
-  // 解析上下文参数,整合当前层级之前所有的上下文参数
-  const context: IContext = {};
+  // !解析上下文参数,整合当前层级之前所有的上下文参数
+  const context: IParams = {};
   // 合并appData里的应用上下文
   if (ibiz.appData?.context) {
     Object.assign(context, ibiz.appData.context);
@@ -181,28 +222,23 @@ export function parseRouteViewData(
   if (routePath.appContext) {
     Object.assign(context, routePath.appContext);
   }
-  // 合并视图上下文
+  // 逐层合并视图上下文
   for (let index = 0; index < level; index++) {
     const pathNode = routePath.pathNodes[index];
     if (notNilEmpty(pathNode.context)) {
-      if (index === 0) {
-        // 首页的context是对象直接合并
-        Object.assign(context, pathNode.context);
-      }
+      Object.assign(context, pathNode.context);
     }
   }
 
   // 最后一级路由对应的视图才会解析视图参数
-  let params;
-  if (route.matched.length === level) {
-    params = route.query as IParams;
-  }
+  const { params, srfnav } = routePath.pathNodes[level - 1];
 
   return {
     viewPath: modelPath,
     viewType,
     context,
     params,
+    srfnav,
   };
 }
 
@@ -223,17 +259,46 @@ export function route2routePath(route: Route): IRoutePath {
   const pathNodes: IRoutePathNode[] = [];
   for (let index = 1; index <= level; index++) {
     const viewName = route.params[`view${index}`] as string;
-    let context: string | undefined | IContext = route.params[
-      `params${index}`
-    ] as string;
-    // context为占位符时置空
-    if (!context || context === ibiz.env.routePlaceholder) {
-      context = undefined;
-    } else if (index === 1) {
+    const paramsStr = route.params[`params${index}`] as string;
+
+    /** 路由参数，默认是视图参数 */
+    let params: IParams | undefined;
+
+    /** 上下文参数 */
+    let context: IParams | undefined;
+    let srfnav: string | undefined;
+    // params为占位符时置空
+    if (!paramsStr || paramsStr === ibiz.env.routePlaceholder) {
+      params = undefined;
+    } else {
       // 首页上下文要解析
-      context = qs.parse(context, { delimiter: ';' });
+      params = qs.parse(paramsStr, {
+        strictNullHandling: true,
+        delimiter: ';',
+      });
+    }
+
+    // 路由参数存在的时候，解析里面的上下文。
+    if (params) {
+      if (index === 1) {
+        // 首页的时候，路由上的参数是资源路径，属于上下文
+        context = params;
+        params = undefined;
+      } else {
+        if (params.srfnavctx) {
+          // 解析额外上下文
+          context = JSON.parse(decodeURIComponent(params.srfnavctx));
+          delete params.srfnavctx;
+        }
+        if (params.srfnav) {
+          // 解析额外自身视图导航参数
+          srfnav = params.srfnav;
+          delete params.srfnav;
+        }
+      }
     }
-    pathNodes.push({ viewName, context });
+
+    pathNodes.push({ viewName, context, params, srfnav });
   }
 
   // 解析应用上下文
@@ -243,17 +308,12 @@ export function route2routePath(route: Route): IRoutePath {
     route.params.appContext !== ibiz.env.routePlaceholder
   ) {
     appContext = qs.parse(route.params.appContext as string, {
+      strictNullHandling: true,
       delimiter: ';',
     });
   }
 
-  // 解析视图参数
-  let params;
-  if (route.query) {
-    params = { ...route.query };
-  }
-
-  return { appContext, pathNodes, params };
+  return { appContext, pathNodes };
 }
 
 /**
@@ -269,35 +329,41 @@ export function routePath2string(routePath: IRoutePath): string {
   let pathStr = '';
   // 应用上下文
   if (routePath.appContext) {
-    pathStr += `/${qs.stringify(routePath.appContext, { delimiter: ';' })}`;
+    pathStr += `/${qs.stringify(routePath.appContext, {
+      delimiter: ';',
+      strictNullHandling: true,
+    })}`;
   } else {
     pathStr += `/${ibiz.env.routePlaceholder}`;
   }
 
   // 每一层级的视图
   routePath.pathNodes.forEach((pathNode: IRoutePathNode, index: number) => {
-    pathStr += `/${pathNode.viewName}`;
+    pathStr += `/${pathNode.viewName}/`;
+    let routeParams: IParams | undefined;
     // 首页路由
     if (index === 0) {
-      if (
-        notNilEmpty(pathNode.context) &&
-        Object.values(pathNode.context!).length
-      ) {
+      if (notNilEmpty(pathNode.context)) {
         // 对象转成a=11;b=222的格式，字符串直接附加在后面
-        pathStr += `/${qs.stringify(pathNode.context, { delimiter: ';' })}`;
-      } else {
-        pathStr += `/${ibiz.env.routePlaceholder}`;
+        routeParams = pathNode.context;
       }
     } else {
-      // 非首页路由
-      pathStr += `/${pathNode.context || ibiz.env.routePlaceholder}`;
+      // 非首页路由,视图参数直接放到路由参数上，上下文转换后放到路由参数的srfnavctx上
+      routeParams = notNilEmpty(pathNode.params) ? pathNode.params : {};
+      if (notNilEmpty(pathNode.context)) {
+        const objStr = JSON.stringify(pathNode.context);
+        // undefined 的vlaue会被JSON.stringify删除,可能会转成{}
+        if (objStr !== '{}') {
+          routeParams!.srfnavctx = encodeURIComponent(objStr);
+        }
+      }
     }
-  });
 
-  // 附加视图参数
-  if (notNilEmpty(routePath.params)) {
-    pathStr += qs.stringify(routePath.params, { addQueryPrefix: true });
-  }
+    // 把路由参数转换到路由路径上去
+    pathStr +=
+      qs.stringify(routeParams, { delimiter: ';', strictNullHandling: true }) ||
+      ibiz.env.routePlaceholder;
+  });
 
   return pathStr;
 }

package/out/use/widget/use-layout-panel-controller/use-layout-panel-controller.d.ts

@@ -1,14 +0,0 @@
-import { LayoutPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
-import { LayoutPanelModel } from '@ibiz-template/model';
-/**
- * 获取布局面板控制器
- *
- * @export
- * @param {LayoutPanelModel} model
- * @param {IBizContext} context
- * @param {IParams} [params={}]
- * @returns {*}  {LayoutPanelController}
- */
-export declare function useLayoutPanelController(model: LayoutPanelModel, context: IBizContext, params?: IParams): LayoutPanelController;
-//# sourceMappingURL=use-layout-panel-controller.d.ts.map

package/out/use/widget/use-layout-panel-controller/use-layout-panel-controller.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-layout-panel-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/widget/use-layout-panel-controller/use-layout-panel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,WAAW,EACpB,MAAM,GAAE,OAAY,GACnB,qBAAqB,CAOvB"}