@ibiz-template/vue3-util 0.5.7-alpha.1 → 0.5.7-alpha.10

package/es/util/route/route.mjs

@@ -3,14 +3,19 @@ import { RuntimeError } from '@ibiz-template/core';
 import qs from 'qs';
 import { useRoute } from 'vue-router';
 import { watch } from 'vue';
-import { ViewType, getMatchResPath, calcDeCodeNameById, RouteConst } from '@ibiz-template/runtime';
+import { RouteConst, ViewType, getMatchResPath, calcDeCodeNameById } from '@ibiz-template/runtime';
 
 "use strict";
-function route2routePath(route) {
+function route2routePath(route, isRouteModal = false) {
   const depth = route.matched.length;
+  let path = route.path;
+  if (isRouteModal) {
+    path = path.replace(new RegExp("/".concat(RouteConst.ROUTE_MODAL_TAG), "g"), "");
+  }
+  const items = path.split("/");
   const pathNodes = [];
   for (let index = 1; index <= depth; index++) {
-    const viewName = route.path.split("/")[index * 2];
+    const viewName = items[index * 2];
     const paramsStr = route.params["params".concat(index)];
     let params;
     let context;
@@ -190,6 +195,12 @@ async function generateRoutePath(appView, route, context, params) {
 }
 async function generateRoutePathByModal(appView, route, context, params) {
   const routePath = route2routePath(route);
+  const findIndex = routePath.pathNodes.findIndex(
+    (item) => item.viewName === RouteConst.ROUTE_MODAL_TAG
+  );
+  if (findIndex !== -1) {
+    routePath.pathNodes = routePath.pathNodes.slice(0, findIndex);
+  }
   if (context.currentSrfNav) {
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
     currentNode.params = currentNode.params || {};
@@ -203,13 +214,16 @@ async function generateRoutePathByModal(appView, route, context, params) {
   });
   return { path: routePath2string(routePath) };
 }
-async function parseRouteViewData(route, depth) {
+async function parseRouteViewData(route, depth, isRouteModal = false) {
   var _a;
-  const routePath = route2routePath(route);
+  const routePath = route2routePath(route, isRouteModal);
   let viewCodeName = routePath.pathNodes[depth - 1].viewName;
   if (!viewCodeName) {
     throw new RuntimeError("\u7B2C".concat(depth, "\u7EA7\u8DEF\u7531\u4E0D\u5B58\u5728\u89C6\u56FE\u6807\u8BC6"));
   }
+  if (viewCodeName === RouteConst.ROUTE_MODAL_TAG) {
+    viewCodeName = routePath.pathNodes[depth].viewName;
+  }
   if (viewCodeName === "index") {
     viewCodeName = ibiz.hub.defaultAppIndexViewName;
   }

package/es/util/store/app-store/app-store.d.ts

@@ -1,89 +1,10 @@
-import { IPortalAsyncAction } from '@ibiz-template/core';
-import { Ref } from 'vue';
 export interface IAppStore {
-    allAsyncActions: Ref<IPortalAsyncAction[]>;
-    recentAsyncActions: IPortalAsyncAction[];
 }
 export declare const useAppStore: import("pinia").StoreDefinition<"appStore", import("pinia")._UnwrapAll<Pick<{
-    appStore: {
-        allAsyncActions: IPortalAsyncAction[];
-        recentAsyncActions: {
-            asyncacitonid: string;
-            asyncacitonname: string;
-            fulltopictag: string;
-            srfdcid: string;
-            dcsystemid: string;
-            actiontype: string;
-            actionstate: 10 | 20 | 30 | 40;
-            actionresult?: unknown;
-            stepinfo?: string | undefined;
-            completionrate?: number | undefined;
-            asyncresultdownloadurl?: string | undefined;
-            actionparam?: unknown;
-            actionparam2?: unknown;
-            actionparam3?: unknown;
-            actionparam4?: unknown;
-            begintime: string;
-            endtime: string;
-            createman: string;
-            createdate: string;
-            updateman: string;
-            updatedate: string;
-        }[];
-    };
+    appStore: IAppStore;
 }, "appStore">>, Pick<{
-    appStore: {
-        allAsyncActions: IPortalAsyncAction[];
-        recentAsyncActions: {
-            asyncacitonid: string;
-            asyncacitonname: string;
-            fulltopictag: string;
-            srfdcid: string;
-            dcsystemid: string;
-            actiontype: string;
-            actionstate: 10 | 20 | 30 | 40;
-            actionresult?: unknown;
-            stepinfo?: string | undefined;
-            completionrate?: number | undefined;
-            asyncresultdownloadurl?: string | undefined;
-            actionparam?: unknown;
-            actionparam2?: unknown;
-            actionparam3?: unknown;
-            actionparam4?: unknown;
-            begintime: string;
-            endtime: string;
-            createman: string;
-            createdate: string;
-            updateman: string;
-            updatedate: string;
-        }[];
-    };
+    appStore: IAppStore;
 }, never>, Pick<{
-    appStore: {
-        allAsyncActions: IPortalAsyncAction[];
-        recentAsyncActions: {
-            asyncacitonid: string;
-            asyncacitonname: string;
-            fulltopictag: string;
-            srfdcid: string;
-            dcsystemid: string;
-            actiontype: string;
-            actionstate: 10 | 20 | 30 | 40;
-            actionresult?: unknown;
-            stepinfo?: string | undefined;
-            completionrate?: number | undefined;
-            asyncresultdownloadurl?: string | undefined;
-            actionparam?: unknown;
-            actionparam2?: unknown;
-            actionparam3?: unknown;
-            actionparam4?: unknown;
-            begintime: string;
-            endtime: string;
-            createman: string;
-            createdate: string;
-            updateman: string;
-            updatedate: string;
-        }[];
-    };
+    appStore: IAppStore;
 }, never>>;
 //# sourceMappingURL=app-store.d.ts.map

package/es/util/store/app-store/app-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-store.d.ts","sourceRoot":"","sources":["../../../../src/util/store/app-store/app-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAY,GAAG,EAAE,MAAM,KAAK,CAAC;AAGpC,MAAM,WAAW,SAAS;IACxB,eAAe,EAAE,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3C,kBAAkB,EAAE,kBAAkB,EAAE,CAAC;CAC1C;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAUtB,CAAC"}
+{"version":3,"file":"app-store.d.ts","sourceRoot":"","sources":["../../../../src/util/store/app-store/app-store.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;CAAG;AAE7B,eAAO,MAAM,WAAW;;;;;;UAItB,CAAC"}

package/es/util/store/app-store/app-store.mjs

@@ -1,16 +1,9 @@
 import { defineStore } from 'pinia';
 import { reactive } from 'vue';
-import { useAsyncAction } from '../async-action/async-action.mjs';
 
 "use strict";
 const useAppStore = defineStore("appStore", () => {
-  const { allAsyncActions, recentAsyncActions } = useAsyncAction();
-  const appStore = reactive({
-    allAsyncActions,
-    get recentAsyncActions() {
-      return recentAsyncActions.value;
-    }
-  });
+  const appStore = reactive({});
   return { appStore };
 });
 

package/es/view/app-redirect-view/app-redirect-view.mjs

@@ -1,4 +1,4 @@
-import { onUnmounted, onMounted, createTextVNode, createVNode, defineComponent } from 'vue';
+import { defineComponent, onUnmounted, onMounted, createVNode, createTextVNode } from 'vue';
 import { IBizContext } from '@ibiz-template/core';
 import { toLocalOpenWFRedirectView } from '@ibiz-template/runtime';
 

package/es/view/common/index.d.ts

@@ -21,7 +21,6 @@ export declare const IBizView: import("../../util").TypeWithInstall<import("vue"
     c: import("@ibiz-template/runtime").ViewController<import("@ibiz/model-core").IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
     controls: import("@ibiz/model-core").IControl[];
     viewClassNames: import("vue").ComputedRef<(string | undefined)[]>;
-    container: import("vue").Ref<HTMLElement | null>;
     onLayoutPanelCreated: (controller: import("@ibiz-template/runtime").IViewLayoutPanelController) => void;
     renderViewMessage: (position: "TOP" | "BOTTOM" | "BODY") => JSX.Element | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/view/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/common/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAGnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/view/common/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAGnB,CAAC"}

package/es/view/common/view.d.ts

@@ -25,7 +25,6 @@ export declare const View: import("vue").DefineComponent<{
     c: ViewController<IAppView, import("@ibiz-template/runtime").IViewState, import("@ibiz-template/runtime").IViewEvent>;
     controls: import("@ibiz/model-core").IControl[];
     viewClassNames: import("vue").ComputedRef<(string | undefined)[]>;
-    container: import("vue").Ref<HTMLElement | null>;
     onLayoutPanelCreated: (controller: IViewLayoutPanelController) => void;
     renderViewMessage: (position: 'TOP' | 'BOTTOM' | 'BODY') => JSX.Element | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/view/common/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/common/view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,0BAA0B,EAC1B,aAAa,EACb,cAAc,EACf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAGL,QAAQ,EAOT,MAAM,KAAK,CAAC;AACb,OAAO,aAAa,CAAC;AAGrB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;uCA4BC,0BAA0B,KACrC,IAAI;kCAsB8B,KAAK,GAAG,QAAQ,GAAG,MAAM;;;;;;;;;;;;;;;;;;;;;;MAqGhE,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/common/view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,0BAA0B,EAC1B,aAAa,EACb,cAAc,EACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAGL,QAAQ,EAIT,MAAM,KAAK,CAAC;AACb,OAAO,aAAa,CAAC;AAGrB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;uCA4BC,0BAA0B,KACrC,IAAI;kCAI8B,KAAK,GAAG,QAAQ,GAAG,MAAM;;;;;;;;;;;;;;;;;;;;;;MAmGhE,CAAC"}

package/es/view/common/view.mjs

@@ -1,6 +1,5 @@
-import { computed, ref, onMounted, onUnmounted, resolveComponent, createVNode, h, createTextVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
+import { defineComponent, computed, createVNode, resolveComponent, h, createTextVNode, withDirectives, resolveDirective } from 'vue';
 import { ViewController, getControlsByView } from '@ibiz-template/runtime';
-import { createUUID } from 'qx-util';
 import './view.css';
 import '../../use/index.mjs';
 import { useNamespace } from '../../use/namespace/namespace.mjs';
@@ -44,19 +43,6 @@ const View = /* @__PURE__ */ defineComponent({
     const onLayoutPanelCreated = (controller) => {
       c.setLayoutPanel(controller);
     };
-    const container = ref(null);
-    const key = createUUID();
-    const devtool = window.devtool;
-    onMounted(() => {
-      if (devtool) {
-        devtool.registerView(key, c, container);
-      }
-    });
-    onUnmounted(() => {
-      if (devtool) {
-        devtool.unRegisterView(key);
-      }
-    });
     const renderViewMessage = (position) => {
       if (c.state.isCreated) {
         const viewMessages = c.state.viewMessages[position];
@@ -73,7 +59,6 @@ const View = /* @__PURE__ */ defineComponent({
       c,
       controls,
       viewClassNames,
-      container,
       onLayoutPanelCreated,
       renderViewMessage
     };
@@ -133,7 +118,6 @@ const View = /* @__PURE__ */ defineComponent({
       }
     }
     return withDirectives(createVNode("div", {
-      "ref": "container",
       "class": this.viewClassNames,
       "id": this.c.id
     }, [this.renderViewMessage("TOP"), layoutPanel, this.renderViewMessage("BOTTOM")]), [[resolveDirective("loading"), this.c.state.isLoading]]);

package/es/view/de-redirect-view/de-redirect-view.mjs

@@ -1,4 +1,4 @@
-import { ref, toRaw, resolveComponent, h, createVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
+import { defineComponent, ref, toRaw, h, resolveComponent, withDirectives, createVNode, resolveDirective } from 'vue';
 import { RuntimeError } from '@ibiz-template/core';
 import { ViewController, getDERedirectToView } from '@ibiz-template/runtime';
 import '../../use/index.mjs';

package/es/view/de-redirect-view/index.mjs

@@ -1,4 +1,4 @@
-import { ViewType, registerViewProvider } from '@ibiz-template/runtime';
+import { registerViewProvider, ViewType } from '@ibiz-template/runtime';
 import '../../util/index.mjs';
 import { DeRedirectView } from './de-redirect-view.mjs';
 import { DeRedirectViewProvider } from './de-redirect-view.provider.mjs';

package/es/view/portal-view/index.mjs

@@ -1,4 +1,4 @@
-import { ViewType, registerViewProvider } from '@ibiz-template/runtime';
+import { registerViewProvider, ViewType } from '@ibiz-template/runtime';
 import '../../util/index.mjs';
 import { PortalViewProvider } from './portal-view.provider.mjs';
 import { PortalView } from './portal-view.mjs';

package/es/view/portal-view/portal-view.mjs

@@ -1,4 +1,4 @@
-import { resolveComponent, h, createVNode, defineComponent } from 'vue';
+import { defineComponent, resolveComponent, h, createVNode } from 'vue';
 import { ViewController } from '@ibiz-template/runtime';
 import '../../use/index.mjs';
 import { useNamespace } from '../../use/namespace/namespace.mjs';

package/es/view/todo-redirect/todo-redirect.mjs

@@ -1,4 +1,4 @@
-import { createTextVNode, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, createTextVNode } from 'vue';
 import qs from 'qs';
 import { useRouter } from 'vue-router';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.5.7-alpha.1",
+  "version": "0.5.7-alpha.10",
   "description": "vue3 工具包",
   "type": "module",
   "module": "es/index.mjs",
@@ -32,10 +32,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.5.7-alpha.0",
-    "@ibiz-template/runtime": "^0.5.7-alpha.1",
+    "@ibiz-template/core": "^0.5.7-alpha.10",
+    "@ibiz-template/runtime": "^0.5.7-alpha.10",
     "@ibiz-template/theme": "^0.5.7-alpha.0",
-    "@ibiz/model-core": "^0.1.6",
+    "@ibiz/model-core": "^0.1.9",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -52,7 +52,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
     "@ibiz-template/runtime": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.6",
+    "@ibiz/model-core": "^0.1.9",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -62,5 +62,5 @@
     "vue": "^3.3.4",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "36ab25522342b07e88a7fc3eefcd0f1c8f938835"
+  "gitHead": "9ccf60215bd9d4c64c9102032c492a85ddbc591e"
 }

package/src/common/view-shell/view-shell.tsx

@@ -3,10 +3,10 @@
 import {
   getViewProvider,
   IViewProvider,
-  getMatchResPath,
+  calcDynaSysParams,
 } from '@ibiz-template/runtime';
 import { defineComponent, h, PropType, ref, resolveComponent } from 'vue';
-import { IAppDataEntity, IAppView } from '@ibiz/model-core';
+import { IAppView } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { createUUID } from 'qx-util';
 import { isEmpty, isNil } from 'ramda';
@@ -42,13 +42,7 @@ export const IBizViewShell = defineComponent({
       if (viewModel.dynaSysMode === 1) {
         //* 计算实体资源路径上下文参数
         const appDataEntityId = viewModel.appDataEntityId;
-        let appDe: IAppDataEntity | undefined;
-        if (appDataEntityId) {
-          appDe = await ibiz.hub.getAppDataEntity(
-            appDataEntityId,
-            viewModel.appId,
-          );
-        } else {
+        if (!appDataEntityId) {
           throw new RuntimeError(
             `${viewModel.codeName}无实体,暂不支持加载动态模型`,
           );
@@ -57,38 +51,20 @@ export const IBizViewShell = defineComponent({
         const params = props.params || {};
 
         /** 加载动态模型的请求参数 */
-        const loadModelParams: IParams = {};
-        if (params.srfkey) {
-          loadModelParams.srfkey = params.srfkey;
-        } else {
-          // * 计算资源路径上下文参数
-          // 主键
-          const srfkey = props.context[appDe.codeName!.toLowerCase()];
-          if (srfkey) {
-            loadModelParams.srfkey = srfkey;
-          }
-        }
+        const loadModelParams: IParams = await calcDynaSysParams(
+          appDataEntityId,
+          props.context,
+          { viewParams: params, appId: viewModel.appId },
+        );
 
-        // 如果视图参数同时存在 srfparentkey 与 srfparentdeanme 则直接使用视图参数
-        if (params.srfparentkey && params.srfparentdeanme) {
-          loadModelParams.srfparentkey = params.srfparentkey;
-          loadModelParams.srfparentdeanme = params.srfparentdeanme;
-        } else {
-          // 上层资源路径主实体名称和主键
-          const match = getMatchResPath(props.context, appDe);
-          if (match && match.keys.length > 1) {
-            const parentDeKey = match.keys[match.keys.length - 2];
-            loadModelParams.srfparentkey =
-              params.srfparentkey || props.context[parentDeKey];
-            loadModelParams.srfparentdeanme =
-              params.srfparentdeanme || parentDeKey;
-          }
+        if (params.srfdatatype) {
+          loadModelParams.srfdatatype = params.srfdatatype;
         }
 
         // 如果视图参数中存在 srfwftag 则直接使用视图参数
         if (params.srfwftag) {
           loadModelParams.srfwftag = params.srfwftag;
-        } else if (appDe && viewModel.enableWF) {
+        } else if (appDataEntityId && viewModel.enableWF) {
           // 处理数据请求的上下文
           const context: IContext = { ...props.context };
           // 存在主键则加载数据计算对应的参数

package/src/control/panel/panel/panel.tsx

@@ -74,12 +74,18 @@ function renderPanelItem(
     };
   }
 
+  // 直接样式
+  let tempStyle = '';
+  if (panelItem.cssStyle) {
+    tempStyle = panelItem.cssStyle;
+  }
   return h(
     component,
     {
       modelData: panelItem,
       controller: panelItems[panelItem.id!],
       key: panelItem.id,
+      style: tempStyle,
     },
     children,
   );

package/src/control/panel/view-layout-panel/view-layout-panel.tsx

@@ -128,12 +128,18 @@ export const ViewLayoutPanelControl = defineComponent({
         };
       }
 
+      // 直接样式
+      let tempStyle = '';
+      if (panelItem.cssStyle) {
+        tempStyle = panelItem.cssStyle;
+      }
       return h(
         component,
         {
           modelData: panelItem,
           controller: panelItems[panelItem.id!],
           key: panelItem.id,
+          style: tempStyle,
         },
         children,
       );

package/src/panel-component/panel-rawitem/panel-rawitem.tsx

@@ -1,5 +1,5 @@
 import { IPanelRawItem } from '@ibiz/model-core';
-import { computed, defineComponent, PropType } from 'vue';
+import { computed, defineComponent, PropType, ref } from 'vue';
 import { useNamespace } from '../../use';
 import { PanelRawItemController } from './panel-rawitem.controller';
 import './panel-rawitem.scss';
@@ -19,6 +19,14 @@ export const PanelRawItem = defineComponent({
   setup(props) {
     const ns = useNamespace('panel-rawitem');
 
+    const tempStyle = ref('');
+
+    const { rawItem } = props.modelData;
+
+    if (rawItem && rawItem.cssStyle) {
+      tempStyle.value = rawItem.cssStyle;
+    }
+
     // 类名控制
     const classArr = computed(() => {
       const { id } = props.modelData;
@@ -30,6 +38,7 @@ export const PanelRawItem = defineComponent({
     return {
       ns,
       classArr,
+      tempStyle,
     };
   },
   render() {
@@ -40,6 +49,7 @@ export const PanelRawItem = defineComponent({
     return (
       <div
         class={this.classArr}
+        style={this.tempStyle}
         onClick={() => {
           this.controller.onClick();
         }}

package/src/util/route/route.ts

@@ -19,16 +19,26 @@ import { IRoutePath, IRoutePathNode, IRouteViewData } from '../../interface';
  * @date 2022-08-18 11:08:08
  * @export
  * @param {string} pathStr 以/开头的路径，即router的path
+ * @param {boolean} [isRouteModal=false]
  * @returns {*}  {IRoutePath}
  */
-export function route2routePath(route: Route): IRoutePath {
+export function route2routePath(
+  route: Route,
+  isRouteModal: boolean = false,
+): IRoutePath {
   // 一共匹配了几级路由
   const depth = route.matched.length;
 
+  let path = route.path;
+  if (isRouteModal) {
+    path = path.replace(new RegExp(`/${RouteConst.ROUTE_MODAL_TAG}`, 'g'), '');
+  }
+  const items = path.split('/');
+
   // 解析路径节点
   const pathNodes: IRoutePathNode[] = [];
   for (let index = 1; index <= depth; index++) {
-    const viewName = route.path.split('/')[index * 2];
+    const viewName = items[index * 2];
     const paramsStr = route.params[`params${index}`] as string;
 
     /** 路由参数，默认是视图参数 */
@@ -341,6 +351,15 @@ export async function generateRoutePathByModal(
 ): Promise<{ path: string }> {
   const routePath = route2routePath(route);
 
+  // 特殊处理 RouteConst.ROUTE_MODAL_TAG，因为只能有一级避免多次或重复点击，导致路由计算错误。再次点击时把之前的modal路由删除
+  const findIndex = routePath.pathNodes.findIndex(
+    item => item.viewName === RouteConst.ROUTE_MODAL_TAG,
+  );
+
+  if (findIndex !== -1) {
+    routePath.pathNodes = routePath.pathNodes.slice(0, findIndex);
+  }
+
   // 导航视图的导航参数,加在目标层级之前的一个层级的视图参数里
   if (context.currentSrfNav) {
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
@@ -352,7 +371,9 @@ export async function generateRoutePathByModal(
 
   // 计算目标视图path路径
   routePath.pathNodes.push({
-    viewName: `${RouteConst.ROUTE_MODAL_TAG}/${appView.codeName!.toLowerCase()}`,
+    viewName: `${
+      RouteConst.ROUTE_MODAL_TAG
+    }/${appView.codeName!.toLowerCase()}`,
     context: getOwnRouteContext(context),
     params,
   });
@@ -366,23 +387,27 @@ export async function generateRoutePathByModal(
  * @author lxm
  * @date 2022-08-17 22:08:51
  * @export
- * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
  * @param {number} depth 层级
+ * @param {boolean} [isRouteModal=false]
  * @returns {*}  {IRouteViewData}
  */
 export async function parseRouteViewData(
   route: Route,
   depth: number,
+  isRouteModal: boolean = false,
 ): Promise<IRouteViewData> {
   // 解析路由的视图参数
-  const routePath = route2routePath(route);
+  const routePath = route2routePath(route, isRouteModal);
 
   // 获取对应层级的视图名称参数
   let viewCodeName = routePath.pathNodes[depth - 1].viewName;
   if (!viewCodeName) {
     throw new RuntimeError(`第${depth}级路由不存在视图标识`);
   }
+  if (viewCodeName === RouteConst.ROUTE_MODAL_TAG) {
+    viewCodeName = routePath.pathNodes[depth].viewName;
+  }
   if (viewCodeName === 'index') {
     viewCodeName = ibiz.hub.defaultAppIndexViewName;
   }

package/src/util/store/app-store/app-store.ts

@@ -1,21 +1,10 @@
-import { IPortalAsyncAction } from '@ibiz-template/core';
 import { defineStore } from 'pinia';
-import { reactive, Ref } from 'vue';
-import { useAsyncAction } from '../async-action/async-action';
+import { reactive } from 'vue';
 
-export interface IAppStore {
-  allAsyncActions: Ref<IPortalAsyncAction[]>;
-  recentAsyncActions: IPortalAsyncAction[];
-}
+export interface IAppStore {}
 
 export const useAppStore = defineStore('appStore', () => {
-  const { allAsyncActions, recentAsyncActions } = useAsyncAction();
-  const appStore = reactive<IAppStore>({
-    allAsyncActions,
-    get recentAsyncActions() {
-      return recentAsyncActions.value;
-    },
-  });
+  const appStore = reactive<IAppStore>({});
 
   return { appStore };
 });

package/src/view/common/view.tsx

@@ -5,7 +5,6 @@ import {
   IViewProvider,
   ViewController,
 } from '@ibiz-template/runtime';
-import { createUUID } from 'qx-util';
 import { IAppView } from '@ibiz/model-core';
 import {
   defineComponent,
@@ -13,10 +12,7 @@ import {
   PropType,
   resolveComponent,
   VNode,
-  ref,
   computed,
-  onMounted,
-  onUnmounted,
 } from 'vue';
 import './view.scss';
 import { useNamespace, useViewController } from '../../use';
@@ -54,24 +50,6 @@ export const View = defineComponent({
       c.setLayoutPanel(controller as IViewLayoutPanelController);
     };
 
-    const container = ref<HTMLElement | null>(null);
-    // todo devtool抽全局
-    const key = createUUID();
-
-    // 临时实现从window上取
-    const devtool = (window as IData).devtool;
-    onMounted(() => {
-      if (devtool) {
-        devtool.registerView(key, c, container);
-      }
-    });
-
-    onUnmounted(() => {
-      if (devtool) {
-        devtool.unRegisterView(key);
-      }
-    });
-
     const renderViewMessage = (position: 'TOP' | 'BOTTOM' | 'BODY') => {
       if (c.state.isCreated) {
         const viewMessages = c.state.viewMessages[position];
@@ -91,7 +69,6 @@ export const View = defineComponent({
       c,
       controls,
       viewClassNames,
-      container,
       onLayoutPanelCreated,
       renderViewMessage,
     };
@@ -162,7 +139,6 @@ export const View = defineComponent({
 
     return (
       <div
-        ref='container'
         class={this.viewClassNames}
         id={this.c.id}
         v-loading={this.c.state.isLoading}