@ibiz-template/vue3-util 0.2.12 → 0.2.13

package/src/panel-component/multi-data-container/index.ts

@@ -6,11 +6,7 @@ import { MultiDataContainerProvider } from './multi-data-container.provider';
 import { MultiDataContainerState } from './multi-data-container.state';
 import { MultiDataContainerController } from './multi-data-container.controller';
 
-export {
-  MultiDataContainerProvider,
-  MultiDataContainerState,
-  MultiDataContainerController,
-};
+export { MultiDataContainerState, MultiDataContainerController };
 
 export const IBizMultiDataContainer = withInstall(
   MultiDataContainer,

package/src/panel-component/nav-pos/index.ts

@@ -6,7 +6,7 @@ import { NavPosProvider } from './nav-pos.provider';
 import { NavPosState } from './nav-pos.state';
 import { NavPosController } from './nav-pos.controller';
 
-export { NavPosProvider, NavPosState, NavPosController };
+export { NavPosState, NavPosController };
 
 export const IBizNavPos = withInstall(NavPos, function (v: App) {
   v.component(NavPos.name, NavPos);

package/src/panel-component/nav-pos/nav-pos.controller.ts

@@ -14,6 +14,10 @@ import { RouteLocationNormalizedLoaded, Router } from 'vue-router';
 import { notNilEmpty } from 'qx-util';
 import { mergeLeft } from 'ramda';
 import { NavPosState } from './nav-pos.state';
+import { getNestedRoutePath } from '../../util';
+
+const excludeKeys = ['is404', 'isRoutePushed'] as const;
+
 /**
  * 导航占位控制器
  *
@@ -208,9 +212,16 @@ export class NavPosController
    * @memberof NavPosController
    */
   setNavViewMsgs(navViewMsg: INavViewMsg): void {
-    // 已经存在的更新数据
+    // isRoutePushed没传的时候给false
+    navViewMsg.isRoutePushed = navViewMsg.isRoutePushed === true;
     if (this.state.navViewMsgs[navViewMsg.key]) {
       mergeLeft(this.state.navViewMsgs[navViewMsg.key], navViewMsg);
+      // 部分属性这次没传就是undefined
+      excludeKeys.forEach(key => {
+        if (Object.prototype.hasOwnProperty.call(navViewMsg, key)) {
+          this.state.navViewMsgs[navViewMsg.key][key] = undefined;
+        }
+      });
     } else {
       // 不存在的走新建流程
       this.state.navViewMsgs[navViewMsg.key] = navViewMsg;
@@ -252,6 +263,11 @@ export class NavPosController
     ibiz.log.debug(this.constructor.name, 'onViewCreated', event);
   }
 
+  toBlankRoute(): void {
+    const blankRoute = getNestedRoutePath(this.route, this.routeDepth!);
+    this.router.push(blankRoute);
+  }
+
   /**
    * 打开视图
    *
@@ -262,6 +278,10 @@ export class NavPosController
     // 当key为空时，直接切换currentKey，绘制null
     if (!openViewMsg.key) {
       this.state.currentKey = openViewMsg.key;
+      if (this.routeDepth && this.state.routeOpen) {
+        this.toBlankRoute();
+      }
+
       return;
     }
 
@@ -280,8 +300,7 @@ export class NavPosController
    */
   openViewByPath(openViewMsg: INavViewMsg): void {
     this.setNavViewMsgs(openViewMsg);
-    const isRoutePushed =
-      this.state.navViewMsgs[this.curNavViewMsg.key].isRoutePushed === true;
+    const isRoutePushed = openViewMsg.isRoutePushed === true;
     // * 外部跳转过了的场景不需要这边跳转路由了，直接处理后续内容。
     if (isRoutePushed) {
       this.state.currentKey = openViewMsg.key;
@@ -291,8 +310,11 @@ export class NavPosController
     }
 
     // * 路由跳转
-    // 如果启用缓存并且有之前存过的fullPath则push回fullPath。
-    if (
+    if (openViewMsg.is404) {
+      const selfPath = getNestedRoutePath(this.route, this.routeDepth!, false);
+      this.router.push(`${selfPath}/404`);
+    } else if (
+      // 如果启用缓存并且有之前存过的fullPath则push回fullPath。
       this.state.navViewMsgs[openViewMsg.key].fullPath &&
       this.getExpItemIsCache(openViewMsg)
     ) {

package/src/panel-component/panel-container/index.ts

@@ -6,11 +6,7 @@ import { PanelContainerProvider } from './panel-container.provider';
 import { PanelContainerState } from './panel-container.state';
 import { PanelContainerController } from './panel-container.controller';
 
-export {
-  PanelContainerProvider,
-  PanelContainerState,
-  PanelContainerController,
-};
+export { PanelContainerState, PanelContainerController };
 
 export const IBizPanelContainer = withInstall(
   PanelContainer,

package/src/panel-component/panel-ctrl-pos/index.ts

@@ -5,7 +5,7 @@ import { PanelCtrlPos } from './panel-ctrl-pos';
 import { PanelCtrlPosProvider } from './panel-ctrl-pos.provider';
 import { PanelCtrlPosController } from './panel-ctrl-pos.controller';
 
-export { PanelCtrlPosProvider, PanelCtrlPosController };
+export { PanelCtrlPosController };
 export const IBizPanelCtrlPos = withInstall(PanelCtrlPos, function (v: App) {
   v.component(PanelCtrlPos.name, PanelCtrlPos);
   registerPanelItemProvider('CTRLPOS', () => new PanelCtrlPosProvider());

package/src/panel-component/panel-field/index.ts

@@ -4,7 +4,6 @@ import { withInstall } from '../../util';
 import { PanelField } from './panel-field';
 import { PanelFieldProvider } from './panel-field.provider';
 
-export * from './panel-field.provider';
 export * from './panel-field.controller';
 
 export const IBizPanelField = withInstall(PanelField, function (v: App) {

package/src/panel-component/panel-rawitem/index.ts

@@ -4,7 +4,6 @@ import { withInstall } from '../../util';
 import { PanelRawItem } from './panel-rawitem';
 import { PanelRawItemProvider } from './panel-rawitem.provider';
 
-export * from './panel-rawitem.provider';
 export * from './panel-rawitem.controller';
 
 export const IBizPanelRawItem = withInstall(PanelRawItem, function (v: App) {

package/src/panel-component/scroll-container/scroll-container/index.ts

@@ -1,3 +1,2 @@
-export * from './scroll-container.provider';
 export * from './scroll-container.controller';
 export * from './scroll-container';

package/src/panel-component/scroll-container/scroll-container-item/index.ts

@@ -1,3 +1,2 @@
-export * from './scroll-container-item.provider';
 export * from './scroll-container-item.controller';
 export * from './scroll-container-item';

package/src/panel-component/single-data-container/index.ts

@@ -6,11 +6,7 @@ import { SingleDataContainerProvider } from './single-data-container.provider';
 import { SingleDataContainerState } from './single-data-container.state';
 import { SingleDataContainerController } from './single-data-container.controller';
 
-export {
-  SingleDataContainerProvider,
-  SingleDataContainerState,
-  SingleDataContainerController,
-};
+export { SingleDataContainerState, SingleDataContainerController };
 
 export const IBizSingleDataContainer = withInstall(
   SingleDataContainer,

package/src/util/route/route.ts

@@ -397,8 +397,8 @@ export function getNestedRoutePath(
     return '';
   }
 
-  // 有名称的路由返回空，如login，404等
-  if (route.name) {
+  // 只有当前层级的路由的代名称的路由如login，404等直接返回path
+  if (route.matched.length === depth && route.name) {
     return route.path;
   }
   const routePath = route2routePath(route);

package/src/view/common/index.ts

@@ -4,8 +4,6 @@ import { withInstall } from '../../util';
 import { ViewProvider } from './view.provider';
 import { View } from './view';
 
-export { ViewProvider };
-
 export const IBizView = withInstall(View, function (v: App) {
   v.component(View.name, View);
   registerViewProvider('DEFAULT', () => new ViewProvider());

package/src/view/portal-view/index.ts

@@ -4,8 +4,6 @@ import { withInstall } from '../../util';
 import { PortalViewProvider } from './portal-view.provider';
 import { PortalView } from './portal-view';
 
-export { PortalViewProvider };
-
 export const IBizPortalView = withInstall(PortalView, function (v: App) {
   v.component(PortalView.name, PortalView);
   registerViewProvider(