@ibiz-template/vue3-util 0.7.34 → 0.7.38-alpha.12

package/es/common/code-list/code-list.mjs

@@ -1,5 +1,5 @@
-import { defineComponent, ref, watch, createVNode, resolveComponent } from 'vue';
-import { calcThresholdRange } from '@ibiz-template/runtime';
+import { defineComponent, ref, computed, watch, createVNode, resolveComponent } from 'vue';
+import { useCalcOrMode, calcThresholdRange } from '@ibiz-template/runtime';
 import { isNil } from 'ramda';
 import { isNumber } from 'lodash-es';
 import './code-list.css';
@@ -29,6 +29,10 @@ const IBizCodeList = /* @__PURE__ */ defineComponent({
     },
     unitName: {
       type: String
+    },
+    showMode: {
+      type: String,
+      default: "DEFAULT"
     }
   },
   emits: {
@@ -42,6 +46,13 @@ const IBizCodeList = /* @__PURE__ */ defineComponent({
     const items = ref([]);
     const textSeparator = ((_a = props.codeList) == null ? void 0 : _a.textSeparator) || "\u3001";
     const valueSeparator = ((_b = props.codeList) == null ? void 0 : _b.valueSeparator) || ",";
+    const currentMode = computed(() => {
+      if (props.codeList && props.codeList.orMode) {
+        return props.codeList.orMode;
+      }
+      return "STR";
+    });
+    const calcOrMode = useCalcOrMode(currentMode.value);
     watch(items, (newVal) => {
       let infoText = "";
       if (newVal.length > 0) {
@@ -76,7 +87,14 @@ const IBizCodeList = /* @__PURE__ */ defineComponent({
       if (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;
@@ -122,9 +140,9 @@ const IBizCodeList = /* @__PURE__ */ defineComponent({
         "style": item.color ? this.ns.cssVarBlock({
           "item-color": "".concat(item.color)
         }) : null
-      }, [item.sysImage && createVNode(resolveComponent("iBizIcon"), {
+      }, [this.showMode !== "TEXT" && item.sysImage && createVNode(resolveComponent("iBizIcon"), {
         "icon": item.sysImage
-      }, null), item.text])];
+      }, null), this.showMode !== "ICON" && item.text])];
     })]);
   }
 });

package/es/common/control-loading-placeholder/control-loading-placeholder.d.ts

@@ -12,7 +12,7 @@ export declare const ControlLoadingPlaceholder: import("vue").DefineComponent<{
         type: PropType<IParams>;
         default: () => {};
     };
-}, {}, 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<IData>;
         required: true;

package/es/common/control-shell/control-shell.d.ts

@@ -12,7 +12,7 @@ export declare const IBizControlShell: import("vue").DefineComponent<{
     isComplete: import("vue").Ref<boolean>;
     errMsg: import("vue").Ref<string>;
     provider: import("vue").Ref<IControlProvider | 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<IControl>;
         required: true;

package/es/common/icon/icon.d.ts

@@ -13,7 +13,7 @@ export declare const IBizIcon: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-}, () => 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<{
     icon: {
         type: PropType<ISysImage | IIcon>;
     };

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

@@ -1,5 +1,4 @@
 import { PropType, VNode } from 'vue';
-import { RouteLocationNormalizedLoaded } from 'vue-router';
 /**
  * 只会第一次绘制的时候绘制路由相关的内容，后面路由导致的router-view的回调都屏蔽了。
  * 通过变更manualKey,来强制刷新router-view的slot回调。并且吧manualKey传给Component的key，搭配AppKeepAlive可以缓存组件
@@ -9,18 +8,18 @@ export declare const IBizRouterView: import("vue").DefineComponent<{
         type: PropType<string>;
         default: string;
     };
-    route: PropType<RouteLocationNormalizedLoaded>;
+    route: PropType<import("vue-router").RouteLocationNormalizedLoadedGeneric>;
     manualKey: {
         type: StringConstructor;
     };
 }, {
     renderComp: (Component: VNode, _route: any) => VNode | 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<{
     name: {
         type: PropType<string>;
         default: string;
     };
-    route: PropType<RouteLocationNormalizedLoaded>;
+    route: PropType<import("vue-router").RouteLocationNormalizedLoadedGeneric>;
     manualKey: {
         type: StringConstructor;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"router-view.d.ts","sourceRoot":"","sources":["../../../src/common/router-view/router-view.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAsB,QAAQ,EAAE,KAAK,EAAS,MAAM,KAAK,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAE3D;;;GAGG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;4BA2BQ,KAAK,UAAU,GAAG,KAAG,KAAK,GAAG,SAAS;;;;;;;;;;;;MAoCvE,CAAC"}
+{"version":3,"file":"router-view.d.ts","sourceRoot":"","sources":["../../../src/common/router-view/router-view.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAsB,QAAQ,EAAE,KAAK,EAAS,MAAM,KAAK,CAAC;AAGjE;;;GAGG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;4BA2BQ,KAAK,UAAU,GAAG,KAAG,KAAK,GAAG,SAAS;;;;;;;;;;;;MAoCvE,CAAC"}

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

@@ -1,5 +1,5 @@
-import { IViewProvider } from '@ibiz-template/runtime';
-import { PropType } from 'vue';
+import { IViewProvider, RedrawViewEvent } from '@ibiz-template/runtime';
+import { PropType, Ref } from 'vue';
 import { IAppView } from '@ibiz/model-core';
 import './view-shell.scss';
 export declare const IBizViewShell: import("vue").DefineComponent<{
@@ -18,12 +18,15 @@ export declare const IBizViewShell: import("vue").DefineComponent<{
     };
 }, {
     ns: import("@ibiz-template/core").Namespace;
-    isComplete: import("vue").Ref<boolean>;
-    errMsg: import("vue").Ref<string>;
-    viewModelData: import("vue").Ref<IAppView | undefined>;
-    hasAuthority: import("vue").Ref<boolean>;
-    provider: import("vue").Ref<IViewProvider | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    errMsg: Ref<string>;
+    provider: Ref<IViewProvider | undefined>;
+    isComplete: Ref<boolean>;
+    hasAuthority: Ref<boolean>;
+    viewModelData: Ref<IAppView | undefined>;
+    redrawView: (event: RedrawViewEvent) => Promise<void>;
+    curContext: Ref<IContext>;
+    curParams: Ref<IParams>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     context: {
         type: PropType<IContext>;
         required: true;

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

@@ -1 +1 @@
-{"version":3,"file":"view-shell.d.ts","sourceRoot":"","sources":["../../../src/common/view-shell/view-shell.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,aAAa,EAGd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAsB,QAAQ,EAAyB,MAAM,KAAK,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAK5C,OAAO,mBAAmB,CAAC;AAE3B,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAyMxB,CAAC"}
+{"version":3,"file":"view-shell.d.ts","sourceRoot":"","sources":["../../../src/common/view-shell/view-shell.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,aAAa,EAGb,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,QAAQ,EACR,GAAG,EAIJ,MAAM,KAAK,CAAC;AACb,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAK5C,OAAO,mBAAmB,CAAC;AAE3B,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;wBAyLW,eAAe,KAAG,QAAQ,IAAI,CAAC;;;;;;;;;;;;;;;;;YA2DlE,CAAC"}

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

@@ -1,8 +1,8 @@
-import { defineComponent, ref, h, resolveComponent, withDirectives, createVNode, resolveDirective } from 'vue';
+import { defineComponent, ref, watch, h, resolveComponent, withDirectives, createVNode, resolveDirective } from 'vue';
 import { calcDynaSysParams, getViewProvider, getErrorViewProvider } from '@ibiz-template/runtime';
 import { RuntimeError } from '@ibiz-template/core';
 import { createUUID } from 'qx-util';
-import { isNil, isEmpty } from 'ramda';
+import { isNil, isEmpty, clone } from 'ramda';
 import '../../use/index.mjs';
 import './view-shell.css';
 import { useNamespace } from '../../use/namespace/namespace.mjs';
@@ -32,12 +32,21 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
     const provider = ref();
     const viewModelData = ref();
     const hasAuthority = ref(true);
-    const checkViewAuthority = async (viewModel) => {
+    const context = ref(props.context);
+    const params = ref(props.params || {});
+    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) {
@@ -53,7 +62,7 @@ const IBizViewShell = /* @__PURE__ */ 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;
@@ -66,13 +75,16 @@ const IBizViewShell = /* @__PURE__ */ 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 RuntimeError(ibiz.i18n.t("vue3Util.common.noFoundViewModel"));
       }
@@ -87,30 +99,26 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
             codeName: viewModel.codeName
           }));
         }
-        const params = props.params || {};
-        const loadModelParams = await calcDynaSysParams(appDataEntityId, props.context, {
+        const loadModelParams = await 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 = isNil(props.context.srfsessionid) || isEmpty(props.context.srfsessionid);
+            const noSrfSessionId = isNil(context.value.srfsessionid) || isEmpty(context.value.srfsessionid);
             const id = 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,
@@ -121,12 +129,11 @@ const IBizViewShell = /* @__PURE__ */ defineComponent({
                 loadModelParams.srfwftag = srfwftag;
               }
               if (["DEWFDYNAEDITVIEW3", "DEWFDYNAEDITVIEW"].includes(viewModel.viewType)) {
-                const viewParams = props.params;
-                if (isNil(viewParams.processDefinitionKey)) {
-                  viewParams.processDefinitionKey = processdefinitionkey;
+                if (isNil(params.value.processDefinitionKey)) {
+                  params.value.processDefinitionKey = processdefinitionkey;
                 }
-                if (isNil(viewParams.taskDefinitionKey)) {
-                  viewParams.taskDefinitionKey = taskdefinitionkey;
+                if (isNil(params.value.taskDefinitionKey)) {
+                  params.value.taskDefinitionKey = taskdefinitionkey;
                 }
               }
             }
@@ -149,23 +156,45 @@ const IBizViewShell = /* @__PURE__ */ 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 h(resolveComponent(this.provider.component), {
-        context: this.$props.context,
-        params: this.$props.params,
-        modelData: this.viewModelData,
+        context: this.curContext,
+        params: this.curParams,
+        modelData: clone(this.viewModelData),
         ...this.$attrs,
-        provider: this.provider
+        provider: this.provider,
+        onRedrawView: this.redrawView
       }, this.$slots);
     }
     if (!this.hasAuthority) {

package/es/control/panel/panel/index.d.ts

@@ -25,7 +25,7 @@ export declare const IBizPanelControl: import("../../../util").TypeWithInstall<i
 }, {
     c: import("@ibiz-template/runtime").PanelController<import("@ibiz/model-core").IPanel, import("@ibiz-template/runtime").IPanelState, import("@ibiz-template/runtime").IPanelEvent>;
     ns: import("@ibiz-template/core").Namespace;
-}, 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").IPanel>;
         required: true;

package/es/control/panel/panel/panel.d.ts

@@ -32,7 +32,7 @@ export declare const PanelControl: import("vue").DefineComponent<{
 }, {
     c: PanelController<IPanel, import("@ibiz-template/runtime").IPanelState, import("@ibiz-template/runtime").IPanelEvent>;
     ns: import("@ibiz-template/core").Namespace;
-}, 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<IPanel>;
         required: true;

package/es/control/panel/view-layout-panel/index.d.ts

@@ -31,7 +31,7 @@ export declare const IBizViewLayoutPanelControl: import("../../../util").TypeWit
     } | 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").IViewLayoutPanel>;
         required: true;

package/es/control/panel/view-layout-panel/view-layout-panel.d.ts

@@ -35,8 +35,8 @@ export declare const ViewLayoutPanelControl: 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<IViewLayoutPanel>;
         required: true;

package/es/control/panel/view-layout-panel/view-layout-panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-layout-panel.d.ts","sourceRoot":"","sources":["../../../../src/control/panel/view-layout-panel/view-layout-panel.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,KAAK,EAKN,MAAM,KAAK,CAAC;AACb,OAAO,EAGL,UAAU,EAEV,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,0BAA0B,CAAC;AAClC,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAGlB,yBAAyB,EAC1B,MAAM,wBAAwB,CAAC;AA0BhC;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;iCAiDlB,UAAU;;;;;;;sBASpB,KAAK,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;MAqGjB,CAAC"}
+{"version":3,"file":"view-layout-panel.d.ts","sourceRoot":"","sources":["../../../../src/control/panel/view-layout-panel/view-layout-panel.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,KAAK,EAKN,MAAM,KAAK,CAAC;AACb,OAAO,EAGL,UAAU,EAEV,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,0BAA0B,CAAC;AAClC,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAIlB,yBAAyB,EAC1B,MAAM,wBAAwB,CAAC;AA0BhC;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;iCAiDlB,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,KACA,KAAK,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;MAgHjB,CAAC"}

package/es/control/panel/view-layout-panel/view-layout-panel.mjs

@@ -1,6 +1,6 @@
 import { isVNode, defineComponent, watch, reactive, createVNode, renderSlot, resolveComponent, h, provide } from 'vue';
 import './view-layout-panel.css';
-import { ScriptFactory, ViewLayoutPanelController, isDataContainer } from '@ibiz-template/runtime';
+import { ScriptFactory, ViewLayoutPanelController, isSimpleDataContainer, isDataContainer } from '@ibiz-template/runtime';
 import '../../../use/index.mjs';
 import { useControlController } from '../../../use/control/use-control-controller/use-control-controller.mjs';
 import { useNamespace } from '../../../use/namespace/namespace.mjs';
@@ -91,9 +91,17 @@ const ViewLayoutPanelControl = /* @__PURE__ */ defineComponent({
       const component = resolveComponent(provider.component);
       let children;
       if (panelItem.itemType === "CTRLPOS" && slots[panelItem.id]) {
-        children = () => {
-          return slots[panelItem.id]();
-        };
+        const panelItemC2 = panelItems[panelItem.id];
+        if (panelItemC2.parent && isSimpleDataContainer(panelItemC2.parent.model)) {
+          children = () => {
+            return slots[panelItem.id]({
+              isSimple: true,
+              data: panelItemC2.data
+            });
+          };
+        } else {
+          children = () => slots[panelItem.id]();
+        }
       } else if (panelItem.itemType === "TABPANEL" && ((_a = panelItem.panelTabPages) == null ? void 0 : _a.length)) {
         children = () => {
           return panelItem.panelTabPages.map((child) => {

package/es/index.mjs

@@ -38,6 +38,9 @@ export { IBizPanelRawItem } from './panel-component/panel-rawitem/index.mjs';
 export { MultiDataContainerState } from './panel-component/multi-data-container/multi-data-container.state.mjs';
 export { MultiDataContainerController } from './panel-component/multi-data-container/multi-data-container.controller.mjs';
 export { IBizMultiDataContainer } from './panel-component/multi-data-container/index.mjs';
+export { MultiDataContainerRawState } from './panel-component/multi-data-container-raw/multi-data-container-raw.state.mjs';
+export { MultiDataContainerRawController } from './panel-component/multi-data-container-raw/multi-data-container-raw.controller.mjs';
+export { IBizMultiDataContainerRaw } from './panel-component/multi-data-container-raw/index.mjs';
 export { SingleDataContainerState } from './panel-component/single-data-container/single-data-container.state.mjs';
 export { SingleDataContainerController } from './panel-component/single-data-container/single-data-container.controller.mjs';
 export { IBizSingleDataContainer } from './panel-component/single-data-container/index.mjs';
@@ -60,6 +63,7 @@ export { IBizView } from './view/common/index.mjs';
 export { TodoRedirect } from './view/todo-redirect/todo-redirect.mjs';
 export { IBizPortalView } from './view/portal-view/index.mjs';
 export { IBizDeRedirectView } from './view/de-redirect-view/index.mjs';
+export { IBizHtmlView } from './view/html-view/index.mjs';
 export { IBizViewLayoutPanelControl } from './control/panel/view-layout-panel/index.mjs';
 export { IBizPanelControl } from './control/panel/panel/index.mjs';
 export { PluginFactory } from './plugin/plugin-factory/plugin-factory.mjs';

package/es/locale/en/index.mjs

@@ -41,7 +41,7 @@ const en = {
         noFocus: "No focus, no out-of-focus triggering"
       },
       view: {
-        stateChange: "View [{{name}] state change"
+        stateChange: "View [{name}] state change"
       }
     },
     util: {

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

@@ -27,7 +27,7 @@ export declare const GridContainer: import("vue").DefineComponent<{
     convertLayoutPos: (layoutPos: IFlexLayoutPos, adaptGrow: number) => IFlexLayoutPos;
     adaptGrow: Ref<number>;
     adaptCols: Ref<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<IPanelContainer>;
         required: true;

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

@@ -26,7 +26,7 @@ export declare const IBizGridContainer: import("../../util").TypeWithInstall<imp
     convertLayoutPos: (layoutPos: import("@ibiz/model-core").IFlexLayoutPos, adaptGrow: number) => import("@ibiz/model-core").IFlexLayoutPos;
     adaptGrow: import("vue").Ref<number>;
     adaptCols: import("vue").Ref<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").IPanelContainer>;
         required: true;

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

@@ -5,6 +5,7 @@ export * from './nav-pos';
 export * from './panel-field';
 export * from './panel-rawitem';
 export * from './multi-data-container';
+export * from './multi-data-container-raw';
 export * from './single-data-container';
 export * from './grid-container';
 export * from './panel-container-image';

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;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,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,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC"}

package/es/panel-component/index.mjs

@@ -5,6 +5,7 @@ export { IBizNavPos } from './nav-pos/index.mjs';
 export { IBizPanelField } from './panel-field/index.mjs';
 export { IBizPanelRawItem } from './panel-rawitem/index.mjs';
 export { IBizMultiDataContainer } from './multi-data-container/index.mjs';
+export { IBizMultiDataContainerRaw } from './multi-data-container-raw/index.mjs';
 export { IBizSingleDataContainer } from './single-data-container/index.mjs';
 export { IBizGridContainer } from './grid-container/index.mjs';
 export { IBizPanelContainerImage } from './panel-container-image/index.mjs';
@@ -26,6 +27,8 @@ export { PanelFieldController } from './panel-field/panel-field.controller.mjs';
 export { PanelRawItemController } from './panel-rawitem/panel-rawitem.controller.mjs';
 export { MultiDataContainerState } from './multi-data-container/multi-data-container.state.mjs';
 export { MultiDataContainerController } from './multi-data-container/multi-data-container.controller.mjs';
+export { MultiDataContainerRawState } from './multi-data-container-raw/multi-data-container-raw.state.mjs';
+export { MultiDataContainerRawController } from './multi-data-container-raw/multi-data-container-raw.controller.mjs';
 export { SingleDataContainerState } from './single-data-container/single-data-container.state.mjs';
 export { SingleDataContainerController } from './single-data-container/single-data-container.controller.mjs';
 export { GridContainerState } from './grid-container/grid-container.state.mjs';

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

@@ -23,7 +23,7 @@ export declare const IBizMultiDataContainer: import("../../util").TypeWithInstal
     } | 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/multi-data-container/multi-data-container.controller.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"multi-data-container.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/multi-data-container/multi-data-container.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,6BAA6B,EAC7B,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,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE;;;;;;GAMG;AACH,qBAAa,4BACX,SAAQ,mBAAmB,CAAC,eAAe,CAC3C,YAAW,6BAA6B;IAEhC,KAAK,EAAE,uBAAuB,CAAC;IAEvC,QAAQ,CAAC,eAAe,QAAQ;IAEhC;;;;;;OAMG;IACH,SAAS,EAAE,gCAAgC,EAAE,CAAM;IAEnD;;;;;;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,uBAAuB;cAIhC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;;OAMG;cACa,sBAAsB,CACpC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAiC,GAC3D,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IA0EnC;;;;;OAKG;IACH,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMlD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAOlC;;;;;OAKG;IACG,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB5C;;;;;;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,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"multi-data-container.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/multi-data-container/multi-data-container.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,6BAA6B,EAC7B,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,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE;;;;;;GAMG;AACH,qBAAa,4BACX,SAAQ,mBAAmB,CAAC,eAAe,CAC3C,YAAW,6BAA6B;IAEhC,KAAK,EAAE,uBAAuB,CAAC;IAEvC,QAAQ,CAAC,eAAe,QAAQ;IAEhC;;;;;;OAMG;IACH,SAAS,EAAE,gCAAgC,EAAE,CAAM;IAEnD;;;;;;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,uBAAuB;cAIhC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;;OAMG;cACa,sBAAsB,CACpC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAiC,GAC3D,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,IAAI,KAAK;IAgBnC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IA0EnC;;;;;OAKG;IACH,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMlD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAOlC;;;;;OAKG;IACG,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB5C;;;;;;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,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,OAAO,IAAI,IAAI;CAMhB"}

package/es/panel-component/multi-data-container/multi-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 { MultiDataContainerItemController } from './multi-data-container-item.controller.mjs';
 import { MultiDataContainerState } from './multi-data-container.state.mjs';
 
@@ -80,6 +80,29 @@ class MultiDataContainerController extends 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,
+      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
@@ -230,12 +253,13 @@ class MultiDataContainerController extends PanelItemController {
         ibiz.i18n.t("vue3Util.panelComponent.noConfiguredEntity")
       );
     }
+    const { context, params } = this.computeNavParams();
     const data = await execDELogicById(
       appDELogicId,
       appDataEntityId,
-      this.panel.context,
-      [],
-      this.panel.params
+      context,
+      this.panel.data,
+      params
     );
     if (!data) {
       throw new RuntimeError(
@@ -283,12 +307,13 @@ class MultiDataContainerController 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/multi-data-container/multi-data-container.d.ts

@@ -22,8 +22,8 @@ export declare const MultiDataContainer: 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/multi-data-container/multi-data-container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multi-data-container.d.ts","sourceRoot":"","sources":["../../../src/panel-component/multi-data-container/multi-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,EAEN,MAAM,KAAK,CAAC;AAEb,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,6BAA6B,CAAC;AAErC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;iCAoCZ,UAAU;;;;;;;sBASlB,KAAK,GAAG,IAAI;;;;;;;;;;YA6CrB,CAAC"}
+{"version":3,"file":"multi-data-container.d.ts","sourceRoot":"","sources":["../../../src/panel-component/multi-data-container/multi-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,EAEN,MAAM,KAAK,CAAC;AAEb,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,6BAA6B,CAAC;AAErC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;iCAoCZ,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;;;;;;;;;;YA6CrB,CAAC"}