@ibiz-template/vue3-util 0.7.34 → 0.7.37-alpha.3

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

@@ -11,7 +11,7 @@ export declare const IBizPanelItemRender: import("../../util").TypeWithInstall<i
     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<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelContainer>;
         required: true;

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

@@ -14,7 +14,7 @@ export declare const PanelItemRender: import("vue").DefineComponent<{
     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<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelContainer>;
         required: true;

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

@@ -13,7 +13,7 @@ export declare const IBizPanelRawItem: import("../../util").TypeWithInstall<impo
     classArr: import("vue").ComputedRef<(string | false)[]>;
     tempStyle: import("vue").Ref<string>;
     content: import("vue").Ref<string | number | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelRawItem>;
         required: true;

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

@@ -16,7 +16,7 @@ export declare const PanelRawItem: import("vue").DefineComponent<{
     classArr: import("vue").ComputedRef<(string | false)[]>;
     tempStyle: Ref<string>;
     content: Ref<string | number | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelRawItem>;
         required: true;

package/es/panel-component/panel-rawitem/panel-rawitem.mjs

@@ -77,8 +77,8 @@ const PanelRawItem = /* @__PURE__ */ defineComponent({
     return createVNode("div", {
       "class": this.classArr,
       "style": this.tempStyle,
-      "onClick": () => {
-        this.controller.onClick();
+      "onClick": (event) => {
+        this.controller.onClick(event);
       }
     }, [createVNode(resolveComponent("iBizRawItem"), {
       "rawItem": this.modelData,

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

@@ -10,7 +10,7 @@ export declare const IBizPanelTabPage: import("../../util").TypeWithInstall<impo
 }, {
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelContainer>;
         required: true;

package/es/panel-component/panel-tab-page/panel-tab-page.d.ts

@@ -13,7 +13,7 @@ export declare const PanelTabPage: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelContainer>;
         required: true;

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

@@ -12,7 +12,7 @@ export declare const IBizScrollContainer: import("../../util").TypeWithInstall<i
 }, {
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelContainer>;
         required: true;

package/es/panel-component/scroll-container/scroll-container/scroll-container.d.ts

@@ -14,7 +14,7 @@ export declare const ScrollContainer: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelContainer>;
         required: true;

package/es/panel-component/scroll-container/scroll-container-item/scroll-container-item.d.ts

@@ -14,7 +14,7 @@ export declare const ScrollContainerItem: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelContainer>;
         required: true;

package/es/panel-component/single-data-container/index.d.ts

@@ -23,7 +23,7 @@ export declare const IBizSingleDataContainer: import("../../util").TypeWithInsta
     } | undefined) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelContainer>;
         required: true;

package/es/panel-component/single-data-container/single-data-container.controller.d.ts

@@ -49,6 +49,15 @@ export declare class SingleDataContainerController extends PanelItemController<I
      * @protected
      */
     protected initPanelItemControllers(panelItems?: IPanelItem[] | undefined, panel?: IPanelController, parent?: IPanelItemContainerController | undefined): Promise<void>;
+    /**
+     * 计算导航参数
+     *
+     * @author tony001
+     * @date 2024-07-30 18:07:52
+     * @protected
+     * @return {*}  {IData}
+     */
+    protected computeNavParams(): IData;
     /**
      * 根据来源类型初始化容器数据
      * @author lxm

package/es/panel-component/single-data-container/single-data-container.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"single-data-container.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/single-data-container/single-data-container.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,gBAAgB,EAChB,6BAA6B,EAC7B,6BAA6B,EAC7B,oBAAoB,EACpB,kBAAkB,EAElB,eAAe,EAEf,mBAAmB,EACnB,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE;;;;;;GAMG;AACH,qBAAa,6BACX,SAAQ,mBAAmB,CAAC,eAAe,CAC3C,YAAW,6BAA6B;IAEhC,KAAK,EAAE,wBAAwB,CAAC;IAExC,QAAQ,CAAC,eAAe,QAAQ;IAEhC;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,WAAW,IAAI,wBAAwB;cAIjC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAiC,EAC5D,KAAK,GAAE,gBAA6B,EACpC,MAAM,GAAE,6BAA6B,GAAG,SAAgB,GACvD,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IA+EnC;;;;;OAKG;IACH,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMlD;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBzC;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAI9B;;;;;;OAMG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCjD;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAYzC;;;;;;OAMG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BlD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA2BrE;;;;;;OAMG;IACH,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAM5C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,OAAO,IAAI,IAAI;CAOhB"}
+{"version":3,"file":"single-data-container.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/single-data-container/single-data-container.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,gBAAgB,EAChB,6BAA6B,EAC7B,6BAA6B,EAC7B,oBAAoB,EACpB,kBAAkB,EAElB,eAAe,EAEf,mBAAmB,EACnB,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE;;;;;;GAMG;AACH,qBAAa,6BACX,SAAQ,mBAAmB,CAAC,eAAe,CAC3C,YAAW,6BAA6B;IAEhC,KAAK,EAAE,wBAAwB,CAAC;IAExC,QAAQ,CAAC,eAAe,QAAQ;IAEhC;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,WAAW,IAAI,wBAAwB;cAIjC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAiC,EAC5D,KAAK,GAAE,gBAA6B,EACpC,MAAM,GAAE,6BAA6B,GAAG,SAAgB,GACvD,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,IAAI,KAAK;IAgBnC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IA+EnC;;;;;OAKG;IACH,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMlD;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBzC;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAI9B;;;;;;OAMG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCjD;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAYzC;;;;;;OAMG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BlD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA2BrE;;;;;;OAMG;IACH,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAM5C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,OAAO,IAAI,IAAI;CAOhB"}

package/es/panel-component/single-data-container/single-data-container.controller.mjs

@@ -1,5 +1,5 @@
 import { ModelError, RuntimeModelError, RuntimeError } from '@ibiz-template/core';
-import { PanelItemController, getPanelItemProvider, isDataContainer, ScriptFactory, getAllPanelField, PanelData, PanelNotifyState, execDELogicById } from '@ibiz-template/runtime';
+import { PanelItemController, getPanelItemProvider, isDataContainer, convertNavData, ScriptFactory, getAllPanelField, PanelData, PanelNotifyState, execDELogicById } from '@ibiz-template/runtime';
 import { SingleDataContainerState } from './single-data-container.state.mjs';
 
 "use strict";
@@ -89,6 +89,29 @@ class SingleDataContainerController extends PanelItemController {
       })
     );
   }
+  /**
+   * 计算导航参数
+   *
+   * @author tony001
+   * @date 2024-07-30 18:07:52
+   * @protected
+   * @return {*}  {IData}
+   */
+  computeNavParams() {
+    const { navigateContexts, navigateParams } = this.model;
+    const context = this.panel.context.clone();
+    Object.assign(
+      context,
+      convertNavData(navigateContexts, this.panel.params, this.panel.context)
+    );
+    const params = convertNavData(
+      navigateParams,
+      this.panel.params,
+      this.panel.context
+    );
+    Object.assign(params, this.panel.params);
+    return { context, params };
+  }
   /**
    * 根据来源类型初始化容器数据
    * @author lxm
@@ -233,12 +256,13 @@ class SingleDataContainerController extends PanelItemController {
         ibiz.i18n.t("vue3Util.panelComponent.noConfiguredEntity")
       );
     }
+    const { context, params } = this.computeNavParams();
     const data = await execDELogicById(
       appDELogicId,
       appDataEntityId,
-      this.panel.context,
+      context,
       this.panel.data,
-      this.panel.params
+      params
     );
     if (!data) {
       throw new RuntimeError(
@@ -286,12 +310,13 @@ class SingleDataContainerController extends PanelItemController {
       );
     }
     const app = ibiz.hub.getApp(this.panel.context.srfappid);
+    const { context, params } = this.computeNavParams();
     const res = await app.deService.exec(
       appDataEntityId,
       appDEMethodId,
-      this.panel.context,
-      [],
-      this.panel.params
+      context,
+      void 0,
+      params
     );
     if (res.ok && res.data) {
       this.setData(res.data);

package/es/panel-component/single-data-container/single-data-container.d.ts

@@ -22,8 +22,8 @@ export declare const SingleDataContainer: import("vue").DefineComponent<{
         panelItems: {
             [key: string]: IPanelItemController;
         };
-    } | undefined) => VNode | null;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }) => VNode | null;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelContainer>;
         required: true;

package/es/panel-component/single-data-container/single-data-container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"single-data-container.d.ts","sourceRoot":"","sources":["../../../src/panel-component/single-data-container/single-data-container.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAIL,QAAQ,EAER,KAAK,EACN,MAAM,KAAK,CAAC;AAEb,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,8BAA8B,CAAC;AAEtC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;iCA0Bb,UAAU;;;;;;;sBASlB,KAAK,GAAG,IAAI;;;;;;;;;;YA0CrB,CAAC"}
+{"version":3,"file":"single-data-container.d.ts","sourceRoot":"","sources":["../../../src/panel-component/single-data-container/single-data-container.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAIL,QAAQ,EAER,KAAK,EACN,MAAM,KAAK,CAAC;AAEb,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,8BAA8B,CAAC;AAEtC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;iCA0Bb,UAAU,YACX;QACR,SAAS,EAAE;YACT,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAC;SACnC,CAAC;QACF,UAAU,EAAE;YACV,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAC;SACrC,CAAC;KACH,KACE,KAAK,GAAG,IAAI;;;;;;;;;;YA0CrB,CAAC"}

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

@@ -13,7 +13,7 @@ export declare const IBizTeleportPlaceholder: import("../../util").TypeWithInsta
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
     tempStyle: import("vue").Ref<string>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IPanelRawItem>;
         required: true;

package/es/panel-component/teleport-placeholder/teleport-placeholder.d.ts

@@ -15,7 +15,7 @@ export declare const TeleportPlaceholder: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     classArr: import("vue").ComputedRef<(string | false)[]>;
     tempStyle: import("vue").Ref<string>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IPanelRawItem>;
         required: true;

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

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/util/install.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAEvC,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;AAE5C,eAAO,MAAM,WAAW,6BAER,GAAG,KAAK,IAAI,uBAM3B,CAAC"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/util/install.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAEvC,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;AAE5C,eAAO,MAAM,WAAW,YAChB,CAAC,WACE,CAAC,EAAE,EAAE,GAAG,KAAK,IAAI,KACzB,gBAAgB,CAAC,CAKnB,CAAC"}

package/es/view/app-redirect-view/app-redirect-view.d.ts

@@ -1,2 +1,2 @@
-export declare const AppRedirectView: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export declare const AppRedirectView: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
 //# sourceMappingURL=app-redirect-view.d.ts.map

package/es/view/app-redirect-view/app-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/view/app-redirect-view/app-redirect-view.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,sSAqB1B,CAAC"}
+{"version":3,"file":"app-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/view/app-redirect-view/app-redirect-view.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,4NAqB1B,CAAC"}

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

@@ -30,7 +30,7 @@ export declare const IBizView: import("../../util").TypeWithInstall<import("vue"
     }>;
     getCtrlTeleportTag: (ctrl: import("@ibiz/model-core").IControl) => string | undefined;
     getControlStyle: () => {};
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: import("vue").PropType<IContext>;
     params: {
         type: import("vue").PropType<IParams>;

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

@@ -32,7 +32,7 @@ export declare const View: import("vue").DefineComponent<{
     renderControl: (ctrl: IControl) => VNode;
     getCtrlTeleportTag: (ctrl: IControl) => string | undefined;
     getControlStyle: () => {};
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: PropType<IContext>;
     params: {
         type: PropType<IParams>;

package/es/view/de-redirect-view/de-redirect-view.d.ts

@@ -19,7 +19,7 @@ export declare const DeRedirectView: import("vue").DefineComponent<{
     toViewId: import("vue").Ref<string | undefined>;
     toViewContext: import("vue").Ref<IContext | undefined>;
     toViewParams: import("vue").Ref<IParams | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: {
         type: PropType<IContext>;
         required: true;

package/es/view/de-redirect-view/index.d.ts

@@ -16,7 +16,7 @@ export declare const IBizDeRedirectView: import("../../util").TypeWithInstall<im
     toViewId: import("vue").Ref<string | undefined>;
     toViewContext: import("vue").Ref<IContext | undefined>;
     toViewParams: import("vue").Ref<IParams | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: {
         type: import("vue").PropType<IContext>;
         required: true;

package/es/view/portal-view/index.d.ts

@@ -19,7 +19,7 @@ export declare const IBizPortalView: import("../../util").TypeWithInstall<import
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[] | undefined;
     viewClassNames: (string | undefined)[];
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: import("vue").PropType<IContext>;
     params: {
         type: import("vue").PropType<IParams>;

package/es/view/portal-view/portal-view.d.ts

@@ -22,7 +22,7 @@ export declare const PortalView: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     controls: import("@ibiz/model-core").IControl[] | undefined;
     viewClassNames: (string | undefined)[];
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: PropType<IContext>;
     params: {
         type: PropType<IParams>;

package/es/view/todo-redirect/todo-redirect.d.ts

@@ -1,2 +1,2 @@
-export declare const TodoRedirect: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export declare const TodoRedirect: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
 //# sourceMappingURL=todo-redirect.d.ts.map

package/es/view/todo-redirect/todo-redirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"todo-redirect.d.ts","sourceRoot":"","sources":["../../../src/view/todo-redirect/todo-redirect.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,sSA8CvB,CAAC"}
+{"version":3,"file":"todo-redirect.d.ts","sourceRoot":"","sources":["../../../src/view/todo-redirect/todo-redirect.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,4NA8CvB,CAAC"}

package/lib/common/code-list/code-list.cjs

@@ -44,6 +44,13 @@ const IBizCodeList = /* @__PURE__ */ vue.defineComponent({
     const items = vue.ref([]);
     const textSeparator = ((_a = props.codeList) == null ? void 0 : _a.textSeparator) || "\u3001";
     const valueSeparator = ((_b = props.codeList) == null ? void 0 : _b.valueSeparator) || ",";
+    const currentMode = vue.computed(() => {
+      if (props.codeList && props.codeList.orMode) {
+        return props.codeList.orMode;
+      }
+      return "STR";
+    });
+    const calcOrMode = runtime.useCalcOrMode(currentMode.value);
     vue.watch(items, (newVal) => {
       let infoText = "";
       if (newVal.length > 0) {
@@ -78,7 +85,14 @@ const IBizCodeList = /* @__PURE__ */ vue.defineComponent({
       if (ramda.isNil(value) || value === "") {
         items.value = [];
       } else {
-        const values = typeof value === "string" ? value.split(valueSeparator) : [value];
+        let values = [];
+        const {
+          getSelectArray
+        } = calcOrMode;
+        const arr = getSelectArray(value, props.codeList, codeListItems, valueSeparator, props.codeList.codeItemValueNumber);
+        if (arr) {
+          values = arr;
+        }
         items.value = values.map((val) => {
           const findItem = findCodeListItem(codeListItems, val);
           let codeValue = val;

package/lib/common/view-shell/view-shell.cjs

@@ -34,12 +34,21 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
     const provider = vue.ref();
     const viewModelData = vue.ref();
     const hasAuthority = vue.ref(true);
-    const checkViewAuthority = async (viewModel) => {
+    const context = vue.ref(props.context);
+    const params = vue.ref(props.params || {});
+    vue.watch(() => ({
+      context: props.context,
+      params: props.params
+    }), (newVal) => {
+      context.value = newVal.context;
+      params.value = newVal.params ? newVal.params : {};
+    });
+    const checkViewAuthority = async (viewModel2) => {
       let checkResult = true;
       const {
         accUserMode,
         accessKey
-      } = viewModel;
+      } = viewModel2;
       const authInfo = ibiz.auth.getAuthInfo();
       if (accUserMode !== void 0) {
         switch (accUserMode) {
@@ -55,7 +64,7 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
             break;
           case 4:
             if (accessKey) {
-              const app = await ibiz.hub.getApp(props.context.srfappid);
+              const app = await ibiz.hub.getApp(context.value.srfappid);
               const permitted = app.authority.calcByResCode(accessKey);
               if (!permitted) {
                 checkResult = false;
@@ -68,13 +77,16 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
       }
       return checkResult;
     };
-    const init = async () => {
-      let viewModel;
+    let viewModel;
+    const initViewModel = async () => {
       if (props.modelData) {
         viewModel = props.modelData;
       } else {
         viewModel = await ibiz.hub.getAppView(props.viewId);
       }
+    };
+    const init = async () => {
+      await initViewModel();
       if (!viewModel) {
         throw new core.RuntimeError(ibiz.i18n.t("vue3Util.common.noFoundViewModel"));
       }
@@ -89,30 +101,26 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
             codeName: viewModel.codeName
           }));
         }
-        const params = props.params || {};
-        const loadModelParams = await runtime.calcDynaSysParams(appDataEntityId, props.context, {
+        const loadModelParams = await runtime.calcDynaSysParams(appDataEntityId, context.value, {
           viewParams: params,
           appId: viewModel.appId
         });
-        if (params.srfdatatype) {
-          loadModelParams.srfdatatype = params.srfdatatype;
+        if (params.value.srfdatatype) {
+          loadModelParams.srfdatatype = params.value.srfdatatype;
         }
-        if (params.srfwftag) {
-          loadModelParams.srfwftag = params.srfwftag;
+        if (params.value.srfwftag) {
+          loadModelParams.srfwftag = params.value.srfwftag;
         } else if (appDataEntityId && viewModel.enableWF) {
-          const context = {
-            ...props.context
-          };
           if (loadModelParams.srfkey) {
-            const noSrfSessionId = ramda.isNil(props.context.srfsessionid) || ramda.isEmpty(props.context.srfsessionid);
+            const noSrfSessionId = ramda.isNil(context.value.srfsessionid) || ramda.isEmpty(context.value.srfsessionid);
             const id = qxUtil.createUUID();
             if (noSrfSessionId) {
               const domain = ibiz.uiDomainManager.create(id);
-              context.srfsessionid = domain.id;
+              context.value.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 || {});
+            const service = await app.deService.getService(context.value, appDataEntityId);
+            const res = await service.get(context.value, params.value || {});
             if (res.ok && res.data) {
               const {
                 srfwftag,
@@ -123,12 +131,11 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
                 loadModelParams.srfwftag = srfwftag;
               }
               if (["DEWFDYNAEDITVIEW3", "DEWFDYNAEDITVIEW"].includes(viewModel.viewType)) {
-                const viewParams = props.params;
-                if (ramda.isNil(viewParams.processDefinitionKey)) {
-                  viewParams.processDefinitionKey = processdefinitionkey;
+                if (ramda.isNil(params.value.processDefinitionKey)) {
+                  params.value.processDefinitionKey = processdefinitionkey;
                 }
-                if (ramda.isNil(viewParams.taskDefinitionKey)) {
-                  viewParams.taskDefinitionKey = taskdefinitionkey;
+                if (ramda.isNil(params.value.taskDefinitionKey)) {
+                  params.value.taskDefinitionKey = taskdefinitionkey;
                 }
               }
             }
@@ -151,23 +158,45 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
       }
     };
     init();
+    const redrawView = async (event) => {
+      isComplete.value = false;
+      const {
+        redrawData
+      } = event;
+      const {
+        isReloadModel
+      } = redrawData;
+      Object.assign(context.value, redrawData.context);
+      Object.assign(params.value, redrawData.params);
+      if (isReloadModel) {
+        await init();
+      } else {
+        setTimeout(() => {
+          isComplete.value = true;
+        });
+      }
+    };
     return {
       ns,
-      isComplete,
       errMsg,
-      viewModelData,
+      provider,
+      isComplete,
       hasAuthority,
-      provider
+      viewModelData,
+      redrawView,
+      curContext: context,
+      curParams: params
     };
   },
   render() {
     if (this.isComplete && this.provider && this.hasAuthority) {
       return vue.h(vue.resolveComponent(this.provider.component), {
-        context: this.$props.context,
-        params: this.$props.params,
-        modelData: this.viewModelData,
+        context: this.curContext,
+        params: this.curParams,
+        modelData: ramda.clone(this.viewModelData),
         ...this.$attrs,
-        provider: this.provider
+        provider: this.provider,
+        onRedrawView: this.redrawView
       }, this.$slots);
     }
     if (!this.hasAuthority) {

package/lib/panel-component/multi-data-container/multi-data-container.controller.cjs

@@ -82,6 +82,29 @@ class MultiDataContainerController extends runtime.PanelItemController {
       })
     );
   }
+  /**
+   * 计算导航参数
+   *
+   * @author tony001
+   * @date 2024-07-30 18:07:36
+   * @protected
+   * @return {*}  {IData}
+   */
+  computeNavParams() {
+    const { navigateContexts, navigateParams } = this.model;
+    const context = this.panel.context.clone();
+    Object.assign(
+      context,
+      runtime.convertNavData(navigateContexts, this.panel.params, this.panel.context)
+    );
+    const params = runtime.convertNavData(
+      navigateParams,
+      this.panel.params,
+      this.panel.context
+    );
+    Object.assign(params, this.panel.params);
+    return { context, params };
+  }
   /**
    * 根据来源类型初始化容器数据
    * @author lxm
@@ -232,12 +255,13 @@ class MultiDataContainerController extends runtime.PanelItemController {
         ibiz.i18n.t("vue3Util.panelComponent.noConfiguredEntity")
       );
     }
+    const { context, params } = this.computeNavParams();
     const data = await runtime.execDELogicById(
       appDELogicId,
       appDataEntityId,
-      this.panel.context,
-      [],
-      this.panel.params
+      context,
+      this.panel.data,
+      params
     );
     if (!data) {
       throw new core.RuntimeError(
@@ -285,12 +309,13 @@ class MultiDataContainerController extends runtime.PanelItemController {
       );
     }
     const app = ibiz.hub.getApp(this.panel.context.srfappid);
+    const { context, params } = this.computeNavParams();
     const res = await app.deService.exec(
       appDataEntityId,
       appDEMethodId,
-      this.panel.context,
-      [],
-      this.panel.params
+      context,
+      void 0,
+      params
     );
     if (res.ok && res.data) {
       this.setData(res.data);

package/lib/panel-component/nav-pos/nav-pos.cjs

@@ -94,7 +94,7 @@ const NavPos = /* @__PURE__ */ vue.defineComponent({
         }
       });
     } else {
-      const view = currentKey ? vue.h(vue.resolveComponent("IBizViewShell"), {
+      const view = currentKey && navViewMsgs[currentKey] ? vue.h(vue.resolveComponent("IBizViewShell"), {
         context: navViewMsgs[currentKey].context,
         params: navViewMsgs[currentKey].params,
         key: !this.c.ignoreEmbedKey ? currentKey : void 0,

package/lib/panel-component/panel-rawitem/panel-rawitem.cjs

@@ -79,8 +79,8 @@ const PanelRawItem = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode("div", {
       "class": this.classArr,
       "style": this.tempStyle,
-      "onClick": () => {
-        this.controller.onClick();
+      "onClick": (event) => {
+        this.controller.onClick(event);
       }
     }, [vue.createVNode(vue.resolveComponent("iBizRawItem"), {
       "rawItem": this.modelData,