@ibiz-template/vue3-util 0.5.3-beta.1 → 0.5.3-beta.11

package/es/common/view-shell/view-shell.mjs

@@ -1,7 +1,7 @@
 import { ref, resolveComponent, h, createVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
-import { convertNavData, getControl, calcDeCodeNameById, getViewProvider } from '@ibiz-template/runtime';
+import { getMatchResPath, getViewProvider } from '@ibiz-template/runtime';
 import { RuntimeError } from '@ibiz-template/core';
-import { notNilEmpty, createUUID } from 'qx-util';
+import { createUUID } from 'qx-util';
 import { isNil, isEmpty } from 'ramda';
 import '../../use/index.mjs';
 import './view-shell.css';
@@ -42,57 +42,63 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
         throw new RuntimeError("\u672A\u627E\u5230\u89C6\u56FE\u6A21\u578B");
       }
       if (viewModel.dynaSysMode === 1) {
-        const navContexts = viewModel.appViewNavContexts;
-        let context = {};
-        if (notNilEmpty(navContexts)) {
-          context = convertNavData(navContexts, props.params || {}, props.context);
+        const appDataEntityId = viewModel.appDataEntityId;
+        let appDe;
+        if (appDataEntityId) {
+          appDe = await ibiz.hub.getAppDataEntity(appDataEntityId, viewModel.appId);
+        } else {
+          throw new RuntimeError("".concat(viewModel.codeName, "\u65E0\u5B9E\u4F53,\u6682\u4E0D\u652F\u6301\u52A0\u8F7D\u52A8\u6001\u6A21\u578B"));
         }
-        const navParams = viewModel.appViewNavParams;
-        let params = {};
-        if (notNilEmpty(navParams)) {
-          params = convertNavData(navParams, props.params || {}, props.context);
+        const loadModelParams = {};
+        const srfkey = props.context[appDe.codeName.toLowerCase()];
+        if (srfkey) {
+          loadModelParams.srfkey = srfkey;
         }
-        const {
-          xdataControlName
-        } = viewModel;
-        if (xdataControlName) {
-          const ctrl = getControl(viewModel, xdataControlName);
-          if (ctrl) {
-            const deCodeName = calcDeCodeNameById(ctrl.appDataEntityId);
-            if (context[deCodeName]) {
-              const id = createUUID();
-              if (isNil(props.context.srfsessionid) || isEmpty(props.context.srfsessionid)) {
-                const domain = ibiz.uiDomainManager.create(id);
-                context.srfsessionid = domain.id;
+        const match = getMatchResPath(props.context, appDe);
+        if (match && match.keys.length > 1) {
+          const parentDeKey = match.keys[match.keys.length - 2];
+          loadModelParams.srfparentkey = props.context[parentDeKey];
+          loadModelParams.srfparentdeanme = parentDeKey;
+        }
+        if (appDe && viewModel.enableWF) {
+          const context = {
+            ...props.context
+          };
+          if (loadModelParams.srfkey) {
+            const noSrfSessionId = isNil(props.context.srfsessionid) || isEmpty(props.context.srfsessionid);
+            const id = createUUID();
+            if (noSrfSessionId) {
+              const domain = ibiz.uiDomainManager.create(id);
+              context.srfsessionid = domain.id;
+            }
+            const app = ibiz.hub.getApp(viewModel.appId);
+            const service = await app.deService.getService(props.context, appDataEntityId);
+            const res = await service.get(context, props.params || {});
+            if (res.ok && res.data) {
+              const {
+                srfwftag,
+                processdefinitionkey,
+                taskdefinitionkey
+              } = res.data;
+              if (srfwftag) {
+                loadModelParams.srfwftag = srfwftag;
               }
-              const app = ibiz.hub.getApp(ctrl.appId);
-              const service = await app.deService.getService(props.context, ctrl.appDataEntityId);
-              const res = await service.get({
-                ...props.context,
-                srfsessionid: id
-              }, props.params || {});
-              if (res.ok && res.data) {
-                const {
-                  data
-                } = res;
-                const {
-                  srfwftag
-                } = data;
-                if (srfwftag) {
-                  params.srfwftag = srfwftag;
+              if (["DEWFDYNAEDITVIEW3", "DEWFDYNAEDITVIEW"].includes(viewModel.viewType)) {
+                const viewParams = props.params;
+                if (isNil(viewParams.processDefinitionKey)) {
+                  viewParams.processDefinitionKey = processdefinitionkey;
+                }
+                if (isNil(viewParams.taskDefinitionKey)) {
+                  viewParams.taskDefinitionKey = taskdefinitionkey;
                 }
               }
+            }
+            if (noSrfSessionId) {
               ibiz.uiDomainManager.destroy(id);
             }
-          } else {
-            throw new RuntimeError("\u672A\u627E\u5230\u6570\u636E\u63A7\u4EF6");
           }
         }
-        viewModelData.value = await ibiz.hub.loadAppView(viewModel.appId, viewModel.id, {
-          ...props.context,
-          ...context,
-          ...params
-        });
+        viewModelData.value = await ibiz.hub.loadAppView(viewModel.appId, viewModel.id, loadModelParams);
       } else {
         viewModelData.value = viewModel;
       }

package/es/index.mjs

@@ -14,6 +14,7 @@ export { IBizControlShell } from './common/control-shell/control-shell.mjs';
 export { IBizViewShell } from './common/view-shell/view-shell.mjs';
 export { IBizCodeList } from './common/code-list/code-list.mjs';
 export { ControlLoadingPlaceholder } from './common/control-loading-placeholder/control-loading-placeholder.mjs';
+export { IBizBadge } from './common/badge/badge.mjs';
 export { PanelContainerState } from './panel-component/panel-container/panel-container.state.mjs';
 export { PanelContainerController } from './panel-component/panel-container/panel-container.controller.mjs';
 export { IBizPanelContainer } from './panel-component/panel-container/index.mjs';
@@ -47,6 +48,7 @@ export { PanelContainerGroupState } from './panel-component/panel-container-grou
 export { PanelContainerGroupController } from './panel-component/panel-container-group/panel-container-group.controller.mjs';
 export { IBizPanelContainerGroup } from './panel-component/panel-container-group/index.mjs';
 export { IBizPanelTabPage } from './panel-component/panel-tab-page/index.mjs';
+export { IBizPanelItemRender } from './panel-component/panel-item-render/index.mjs';
 export { AppRedirectView } from './view/app-redirect-view/app-redirect-view.mjs';
 export { IBizView } from './view/common/index.mjs';
 export { TodoRedirect } from './view/todo-redirect/todo-redirect.mjs';

package/es/panel-component/index.d.ts

@@ -10,4 +10,5 @@ export * from './grid-container';
 export * from './panel-container-image';
 export * from './panel-container-group';
 export * from './panel-tab-page';
+export * from './panel-item-render';
 //# sourceMappingURL=index.d.ts.map

package/es/panel-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/panel-component/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/panel-component/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC"}

package/es/panel-component/index.mjs

@@ -10,6 +10,7 @@ export { IBizGridContainer } from './grid-container/index.mjs';
 export { IBizPanelContainerImage } from './panel-container-image/index.mjs';
 export { IBizPanelContainerGroup } from './panel-container-group/index.mjs';
 export { IBizPanelTabPage } from './panel-tab-page/index.mjs';
+export { IBizPanelItemRender } from './panel-item-render/index.mjs';
 export { PanelContainerState } from './panel-container/panel-container.state.mjs';
 export { PanelContainerController } from './panel-container/panel-container.controller.mjs';
 export { PanelCtrlPosController } from './panel-ctrl-pos/panel-ctrl-pos.controller.mjs';

package/es/panel-component/nav-pos/nav-pos.mjs

@@ -84,7 +84,7 @@ const NavPos = /* @__PURE__ */ defineComponent({
       const view = currentKey ? h(resolveComponent("IBizViewShell"), {
         context: navViewMsgs[currentKey].context,
         params: navViewMsgs[currentKey].params,
-        key: navViewMsgs[currentKey].key,
+        key: currentKey,
         viewId: navViewMsgs[currentKey].viewId,
         onCreated: this.onViewCreated
       }) : null;

package/es/panel-component/panel-item-render/index.d.ts

@@ -0,0 +1,25 @@
+export declare const IBizPanelItemRender: import("../../util").TypeWithInstall<import("vue").DefineComponent<{
+    modelData: {
+        type: import("vue").PropType<import("@ibiz/model-core").IPanelContainer>;
+        required: true;
+    };
+    controller: {
+        type: typeof import("./panel-item-render.controller").PanelItemRenderController;
+        required: true;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+    classArr: import("vue").ComputedRef<(string | false)[]>;
+    htmlCode: import("vue").ComputedRef<string | undefined>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: import("vue").PropType<import("@ibiz/model-core").IPanelContainer>;
+        required: true;
+    };
+    controller: {
+        type: typeof import("./panel-item-render.controller").PanelItemRenderController;
+        required: true;
+    };
+}>>, {}, {}>>;
+export default IBizPanelItemRender;
+//# sourceMappingURL=index.d.ts.map

package/es/panel-component/panel-item-render/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-item-render/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;aAS/B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/es/panel-component/panel-item-render/index.mjs

@@ -0,0 +1,19 @@
+import { registerPanelItemProvider } from '@ibiz-template/runtime';
+import '../../util/index.mjs';
+import { PanelItemRender } from './panel-item-render.mjs';
+import { PanelItemRenderProvider } from './panel-item-render.provider.mjs';
+import { withInstall } from '../../util/install.mjs';
+
+"use strict";
+const IBizPanelItemRender = withInstall(
+  PanelItemRender,
+  function(v) {
+    v.component(PanelItemRender.name, PanelItemRender);
+    registerPanelItemProvider(
+      "PREDEFINE_RENDER",
+      () => new PanelItemRenderProvider()
+    );
+  }
+);
+
+export { IBizPanelItemRender, IBizPanelItemRender as default };

package/es/panel-component/panel-item-render/panel-item-render.controller.d.ts

@@ -0,0 +1,32 @@
+import { IControlRender, IPanelContainer } from '@ibiz/model-core';
+import { PanelItemController, ViewLayoutPanelController } from '@ibiz-template/runtime';
+/**
+ * 面板绘制器控制器
+ *
+ * @author zk
+ * @date 2024-01-15 06:01:08
+ * @export
+ * @class PanelItemRenderController
+ * @extends {PanelItemController<IPanelContainer>}
+ */
+export declare class PanelItemRenderController extends PanelItemController<IPanelContainer> {
+    /**
+     * 面板控制器
+     *
+     * @author lxm
+     * @date 2022-08-24 22:08:59
+     * @type {PanelController}
+     */
+    panel: ViewLayoutPanelController;
+    /**
+     * 获取面板绘制器自定义html
+     *
+     * @author zk
+     * @date 2024-01-15 01:01:11
+     * @export
+     * @param {IControlRender[]} controlRenders
+     * @return {*}  {(string | undefined)}
+     */
+    getPanelItemCustomHtml(controlRenders: IControlRender[], data: IData | undefined): string | undefined;
+}
+//# sourceMappingURL=panel-item-render.controller.d.ts.map

package/es/panel-component/panel-item-render/panel-item-render.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-item-render.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-item-render/panel-item-render.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,mBAAmB,EAEnB,yBAAyB,EAC1B,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IACjF;;;;;;OAMG;IACK,KAAK,EAAE,yBAAyB,CAAC;IAEzC;;;;;;;;OAQG;IACH,sBAAsB,CACpB,cAAc,EAAE,cAAc,EAAE,EAChC,IAAI,EAAE,KAAK,GAAG,SAAS,GACtB,MAAM,GAAG,SAAS;CAatB"}

package/es/panel-component/panel-item-render/panel-item-render.controller.mjs

@@ -0,0 +1,29 @@
+import { PanelItemController, ScriptFactory } from '@ibiz-template/runtime';
+
+"use strict";
+class PanelItemRenderController extends PanelItemController {
+  /**
+   * 获取面板绘制器自定义html
+   *
+   * @author zk
+   * @date 2024-01-15 01:01:11
+   * @export
+   * @param {IControlRender[]} controlRenders
+   * @return {*}  {(string | undefined)}
+   */
+  getPanelItemCustomHtml(controlRenders, data) {
+    if (controlRenders.length === 0) {
+      return void 0;
+    }
+    const controlRender = controlRenders[0];
+    if (controlRender.layoutPanelModel) {
+      return ScriptFactory.execScriptFn(
+        { data: data || {} },
+        controlRender.layoutPanelModel,
+        { singleRowReturn: true, isAsync: false }
+      );
+    }
+  }
+}
+
+export { PanelItemRenderController };

package/es/panel-component/panel-item-render/panel-item-render.d.ts

@@ -0,0 +1,27 @@
+import { IPanelContainer } from '@ibiz/model-core';
+import { PropType } from 'vue';
+import { PanelItemRenderController } from './panel-item-render.controller';
+export declare const PanelItemRender: import("vue").DefineComponent<{
+    modelData: {
+        type: PropType<IPanelContainer>;
+        required: true;
+    };
+    controller: {
+        type: typeof PanelItemRenderController;
+        required: true;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+    classArr: import("vue").ComputedRef<(string | false)[]>;
+    htmlCode: import("vue").ComputedRef<string | undefined>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: PropType<IPanelContainer>;
+        required: true;
+    };
+    controller: {
+        type: typeof PanelItemRenderController;
+        required: true;
+    };
+}>>, {}, {}>;
+//# sourceMappingURL=panel-item-render.d.ts.map

package/es/panel-component/panel-item-render/panel-item-render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-item-render.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-item-render/panel-item-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAA6B,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;YA4C1B,CAAC"}

package/es/panel-component/panel-item-render/panel-item-render.mjs

@@ -0,0 +1,47 @@
+import { computed, createVNode, defineComponent } from 'vue';
+import '../../use/index.mjs';
+import { PanelItemRenderController } from './panel-item-render.controller.mjs';
+import { useNamespace } from '../../use/namespace/namespace.mjs';
+
+"use strict";
+const PanelItemRender = /* @__PURE__ */ defineComponent({
+  name: "IBizPanelItemRender",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: PanelItemRenderController,
+      required: true
+    }
+  },
+  setup(props) {
+    var _a;
+    const ns = useNamespace("panel-item-render");
+    const nsType = useNamespace("panel-".concat((_a = props.modelData.itemType) == null ? void 0 : _a.toLowerCase()));
+    const {
+      id
+    } = props.modelData;
+    const classArr = computed(() => {
+      const result = [ns.b(), ns.m(id), nsType.b(), ns.is("hidden", !props.controller.state.visible)];
+      return result;
+    });
+    const htmlCode = computed(() => {
+      return props.controller.getPanelItemCustomHtml(props.modelData.controlRenders, props.controller.data);
+    });
+    return {
+      ns,
+      classArr,
+      htmlCode
+    };
+  },
+  render() {
+    return createVNode("div", {
+      "class": this.classArr,
+      "innerHTML": this.htmlCode
+    }, null);
+  }
+});
+
+export { PanelItemRender };

package/es/panel-component/panel-item-render/panel-item-render.provider.d.ts

@@ -0,0 +1,17 @@
+import { IPanelItemProvider, PanelController, PanelItemController } from '@ibiz-template/runtime';
+import { IPanelContainer } from '@ibiz/model-core';
+import { PanelItemRenderController } from './panel-item-render.controller';
+/**
+ * 面板绘制器适配器
+ *
+ * @author zk
+ * @date 2024-01-15 06:01:32
+ * @export
+ * @class PanelItemRenderProvider
+ * @implements {IPanelItemProvider}
+ */
+export declare class PanelItemRenderProvider implements IPanelItemProvider {
+    component: string;
+    createController(panelItem: IPanelContainer, panel: PanelController, parent: PanelItemController | undefined): Promise<PanelItemRenderController>;
+}
+//# sourceMappingURL=panel-item-render.provider.d.ts.map

package/es/panel-component/panel-item-render/panel-item-render.provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-item-render.provider.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-item-render/panel-item-render.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,YAAW,kBAAkB;IAChE,SAAS,EAAE,MAAM,CAAyB;IAEpC,gBAAgB,CACpB,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,mBAAmB,GAAG,SAAS,GACtC,OAAO,CAAC,yBAAyB,CAAC;CAKtC"}

package/es/panel-component/panel-item-render/panel-item-render.provider.mjs

@@ -0,0 +1,15 @@
+import { PanelItemRenderController } from './panel-item-render.controller.mjs';
+
+"use strict";
+class PanelItemRenderProvider {
+  constructor() {
+    this.component = "IBizPanelItemRender";
+  }
+  async createController(panelItem, panel, parent) {
+    const c = new PanelItemRenderController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}
+
+export { PanelItemRenderProvider };

package/es/plugin/plugin-factory/plugin-factory.d.ts

@@ -1,4 +1,4 @@
-import { IPluginFactory, IPluginItem, RemotePluginItem } from '@ibiz-template/runtime';
+import { IPluginFactory, IPluginItem, ISystemImportMap, RemotePluginItem } from '@ibiz-template/runtime';
 import { ISysPFPlugin } from '@ibiz/model-core';
 import { App, Plugin } from 'vue';
 /**
@@ -156,11 +156,22 @@ export declare class PluginFactory implements IPluginFactory {
      * 编译请求文件地址
      *
      * @author chitanda
-     * @date 2022-10-31 14:10:19
+     * @date 2024-01-11 16:01:19
      * @protected
-     * @param {string} script
+     * @param {string} pathUrl
+     * @param {string} [baseUrl=ibiz.env.pluginBaseUrl]
      * @return {*}  {string}
      */
-    protected parseUrl(script: string): string;
+    protected parseUrl(pathUrl: string, baseUrl?: string): string;
+    /**
+     * 处理 systemjs importmap 配置
+     *
+     * @author chitanda
+     * @date 2024-01-11 20:01:07
+     * @protected
+     * @param {ISystemImportMap} importMap
+     * @return {*}  {IParams}
+     */
+    protected handleSystemImportMap(importMap: ISystemImportMap): ISystemImportMap | null;
 }
 //# sourceMappingURL=plugin-factory.d.ts.map

package/es/plugin/plugin-factory/plugin-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-factory.d.ts","sourceRoot":"","sources":["../../../src/plugin/plugin-factory/plugin-factory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,WAAW,EAEX,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,SAA0B;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAElD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAElE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAEhD;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAa;IAE/D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAS/C;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIzC;;;;;;OAMG;IACH,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO3C;;;;;;;OAOG;IACG,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCxD;;;;;;;OAOG;IACG,aAAa,CACjB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;IAwCnB;;;;;;;;OAQG;cACa,UAAU,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCzE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAuB3C"}
+{"version":3,"file":"plugin-factory.d.ts","sourceRoot":"","sources":["../../../src/plugin/plugin-factory/plugin-factory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAEhB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,cAAc;IAClD;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,SAA0B;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAElD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAElE;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAEhD;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAa;IAE/D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAS/C;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIzC;;;;;;OAMG;IACH,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAInD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO3C;;;;;;;OAOG;IACG,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCxD;;;;;;;OAOG;IACG,aAAa,CACjB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;IAgDnB;;;;;;;;OAQG;cACa,UAAU,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCzE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAA+B,GACvC,MAAM;IAwBT;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,CAC7B,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,GAAG,IAAI;CAgC3B"}

package/es/plugin/plugin-factory/plugin-factory.mjs

@@ -228,6 +228,14 @@ class PluginFactory {
       configData
     );
     if (remotePlugin) {
+      if (remotePlugin.config["systemjs-importmap"]) {
+        const importMap = this.handleSystemImportMap(
+          remotePlugin.config["systemjs-importmap"]
+        );
+        if (importMap) {
+          System.addImportMap(importMap);
+        }
+      }
       try {
         await this.loadScript(remotePlugin);
         this.pluginCache.set(rtObjectName, remotePlugin);
@@ -291,24 +299,25 @@ class PluginFactory {
    * 编译请求文件地址
    *
    * @author chitanda
-   * @date 2022-10-31 14:10:19
+   * @date 2024-01-11 16:01:19
    * @protected
-   * @param {string} script
+   * @param {string} pathUrl
+   * @param {string} [baseUrl=ibiz.env.pluginBaseUrl]
    * @return {*}  {string}
    */
-  parseUrl(script) {
-    if (this.urlReg.test(script)) {
-      return script;
+  parseUrl(pathUrl, baseUrl = ibiz.env.pluginBaseUrl) {
+    if (this.urlReg.test(pathUrl)) {
+      return pathUrl;
     }
     let url = "";
-    if (this.urlReg.test(ibiz.env.pluginBaseUrl)) {
-      if (script.startsWith("/")) {
-        url = ibiz.env.pluginBaseUrl + script;
+    if (this.urlReg.test(baseUrl)) {
+      if (pathUrl.startsWith("/")) {
+        url = baseUrl + pathUrl;
       } else {
-        url = "".concat(ibiz.env.pluginBaseUrl, "/").concat(script);
+        url = "".concat(baseUrl, "/").concat(pathUrl);
       }
     } else {
-      url = "".concat(pathBrowserify.join(ibiz.env.pluginBaseUrl, script));
+      url = "".concat(pathBrowserify.join(baseUrl, pathUrl));
     }
     const { origin, pathname } = window.location;
     if (pathname.endsWith("/") && url.startsWith("/")) {
@@ -319,6 +328,45 @@ class PluginFactory {
     }
     return url;
   }
+  /**
+   * 处理 systemjs importmap 配置
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:07
+   * @protected
+   * @param {ISystemImportMap} importMap
+   * @return {*}  {IParams}
+   */
+  handleSystemImportMap(importMap) {
+    if (importMap) {
+      if (importMap.imports) {
+        const imps = importMap.imports;
+        for (const key in imps) {
+          if (Object.prototype.hasOwnProperty.call(imps, key)) {
+            const url = imps[key];
+            imps[key] = this.parseUrl(url, importMap.baseUrl);
+          }
+        }
+      }
+      if (importMap.styles) {
+        const styles = importMap.styles;
+        for (const key in styles) {
+          if (Object.prototype.hasOwnProperty.call(styles, key)) {
+            const urls = styles[key];
+            if (typeof urls === "string") {
+              styles[key] = this.parseUrl(urls, importMap.baseUrl);
+            } else {
+              styles[key] = urls.map(
+                (url) => this.parseUrl(url, importMap.baseUrl)
+              );
+            }
+          }
+        }
+      }
+      return importMap;
+    }
+    return null;
+  }
 }
 
 export { PluginFactory };

package/es/use/view/use-view-controller/use-view-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-view-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/view/use-view-controller/use-view-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAEf,cAAc,EACf,MAAM,wBAAwB,CAAC;AAmEhC;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,EACzD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,cAAc,CAAC,KAAK,CAAC,GAC/D,CAAC,CAuDH"}
+{"version":3,"file":"use-view-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/view/use-view-controller/use-view-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAEf,cAAc,EACf,MAAM,wBAAwB,CAAC;AAmEhC;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,EACzD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,cAAc,CAAC,KAAK,CAAC,GAC/D,CAAC,CAkEH"}

package/es/use/view/use-view-controller/use-view-controller.mjs

@@ -51,6 +51,7 @@ function useViewController(fn) {
   } else {
     c = fn(props.modelData, props.context, props.params, ctx);
   }
+  ibiz.util.viewStack.add(c.id, c);
   watchAndUpdateContextParams(props, c);
   watchAndUpdateState(props, c);
   provide("ctx", c.ctx);
@@ -59,15 +60,24 @@ function useViewController(fn) {
   if (props.modal) {
     c.modal = props.modal;
   }
-  onActivated(() => c.onActivated());
-  onDeactivated(() => c.onDeactivated());
+  onActivated(() => {
+    c.onActivated();
+    ibiz.util.viewStack.active(c.id);
+  });
+  onDeactivated(() => {
+    c.onDeactivated();
+    ibiz.util.viewStack.deactivate(c.id);
+  });
   c.force = useForce();
   const vue = getCurrentInstance().proxy;
   c.evt.onAll((eventName, event) => {
     vue.$emit(eventName.slice(2), event);
   });
   c.created();
-  onBeforeUnmount(() => c.destroyed());
+  onBeforeUnmount(() => {
+    c.destroyed();
+    ibiz.util.viewStack.remove(c.id);
+  });
   return c;
 }
 

package/es/util/route/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/util/route/route.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,6BAA6B,IAAI,KAAK,EAAY,MAAM,YAAY,CAAC;AAE9E,OAAO,EAGL,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CA+DxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAuD9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAS7D;AAED;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAYpC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,QAAQ,EACjB,eAAe,CAAC,EAAE,MAAM,EACxB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CA6D3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAqDzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,OAAc,GACvB,MAAM,CAwBR;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,EAClE,KAAK,EAAE,MAAM,GACZ,IAAI,CAaN"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/util/route/route.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,6BAA6B,IAAI,KAAK,EAAY,MAAM,YAAY,CAAC;AAE9E,OAAO,EAGL,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CA+DxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAuD9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAc7D;AAED;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAYpC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,QAAQ,EACjB,eAAe,CAAC,EAAE,MAAM,EACxB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CA6D3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAqDzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,OAAc,GACvB,MAAM,CAwBR;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,EAClE,KAAK,EAAE,MAAM,GACZ,IAAI,CAaN"}

package/es/util/route/route.mjs

@@ -93,7 +93,12 @@ function routePath2string(routePath) {
 }
 function getOwnRouteContext(context) {
   const ownContext = context.getOwnContext();
-  const excludeKeys = ["srfsessionid", "srfappid"];
+  const excludeKeys = [
+    "srfsessionid",
+    "srfappid",
+    "currentSrfNav",
+    "toRouteDepth"
+  ];
   Object.keys(ownContext).forEach((key) => {
     if (excludeKeys.includes(key)) {
       delete ownContext[key];
@@ -143,7 +148,7 @@ async function generateRoutePath(appView, route, context, params) {
   let depth = context.srfdefaulttoroutedepth || 2;
   if (context.toRouteDepth) {
     depth = context.toRouteDepth;
-    delete context.toRouteDepth;
+    context.toRouteDepth = void 0;
   } else if (ibiz.env.isMob) {
     routePath.pathNodes[0] = {
       viewName: "home"
@@ -154,7 +159,7 @@ async function generateRoutePath(appView, route, context, params) {
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
     currentNode.params = currentNode.params || {};
     currentNode.srfnav = context.currentSrfNav;
-    delete context.currentSrfNav;
+    context.currentSrfNav = void 0;
   }
   if (route.fullPath.startsWith("/appredirectview")) {
     if (params == null ? void 0 : params.srfindexname) {

package/es/util/store/async-action/async-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async-action.d.ts","sourceRoot":"","sources":["../../../../src/util/store/async-action/async-action.ts"],"names":[],"mappings":"AA8BA;;;;;;GAMG;AACH,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2D7B"}
+{"version":3,"file":"async-action.d.ts","sourceRoot":"","sources":["../../../../src/util/store/async-action/async-action.ts"],"names":[],"mappings":"AAwCA;;;;;;GAMG;AACH,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6D7B"}