@ibiz-template/vue3-components 0.7.38-alpha.56 → 0.7.40-alpha.9

package/es/common/action-toolbar/action-toolbar.d.ts

@@ -47,7 +47,7 @@ export declare const IBizActionToolbar: import("vue").DefineComponent<{
     popoverIndex: number;
     expandDetails: Ref<IAppDEUIActionGroupDetail[]>;
     groupDetails: Ref<IAppDEUIActionGroupDetail[]>;
-    groupButtonRef: Ref<any>;
+    groupButtonRef: Ref<HTMLElement | null | undefined>;
     popoverVisible: Ref<boolean>;
     handleClick: (detail: IAppDEUIActionGroupDetail, e: MouseEvent) => Promise<void>;
     calcActionItemClass: (item: IAppDEUIActionGroupDetail) => string[];

package/es/common/action-toolbar/action-toolbar.mjs

@@ -1,7 +1,7 @@
 import { isVNode, defineComponent, ref, createVNode, resolveComponent } from 'vue';
-import { useNamespace } from '@ibiz-template/vue3-util';
-import './action-toolbar.css';
+import { useNamespace, usePopoverVisible } from '@ibiz-template/vue3-util';
 import { showTitle } from '@ibiz-template/core';
+import './action-toolbar.css';
 
 "use strict";
 function _isSlot(s) {
@@ -46,7 +46,13 @@ const IBizActionToolbar = /* @__PURE__ */ defineComponent({
     var _a;
     const ns = useNamespace("action-toolbar");
     const dropdownRef = ref();
-    const popoverVisible = ref(false);
+    const groupButtonRef = ref();
+    const {
+      popoverVisible,
+      setPopoverVisible
+    } = usePopoverVisible(groupButtonRef, (ele) => {
+      return ele.ref;
+    });
     (_a = props.actionDetails) == null ? void 0 : _a.forEach((detail) => {
       if (detail.capLanguageRes && detail.capLanguageRes.lanResTag) {
         detail.caption = ibiz.i18n.t(detail.capLanguageRes.lanResTag, detail.caption);
@@ -61,7 +67,7 @@ const IBizActionToolbar = /* @__PURE__ */ defineComponent({
         await props.actionCallBack(detail, e);
       }
       if (props.mode === "buttons") {
-        popoverVisible.value = false;
+        setPopoverVisible(false);
       } else if (dropdownRef.value) {
         dropdownRef.value.handleClose();
       }
@@ -80,7 +86,6 @@ const IBizActionToolbar = /* @__PURE__ */ defineComponent({
         }
       });
     }
-    const groupButtonRef = ref();
     const calcActionItemClass = (item) => {
       const {
         actionLevel
@@ -153,7 +158,10 @@ const IBizActionToolbar = /* @__PURE__ */ defineComponent({
         "text": true,
         "disabled": pdisabled,
         "ref": "groupButtonRef",
-        "class": [this.ns.e("item"), this.ns.is("expand", this.popoverVisible)]
+        "class": [this.ns.e("item"), this.ns.is("group", true), this.ns.is("expand", this.popoverVisible)],
+        "onClick": () => {
+          this.popoverVisible = !this.popoverVisible;
+        }
       }, {
         icon: () => createVNode("ion-icon", {
           "class": this.ns.e("icon"),
@@ -163,9 +171,7 @@ const IBizActionToolbar = /* @__PURE__ */ defineComponent({
       }), createVNode(resolveComponent("el-popover"), {
         "placement": "bottom-start",
         "virtual-ref": this.groupButtonRef,
-        "trigger": "click",
         "visible": this.popoverVisible,
-        "onUpdate:visible": ($event) => this.popoverVisible = $event,
         "popper-class": this.ns.e("popover"),
         "virtual-triggering": true,
         "popper-style": "z-index:".concat(this.popoverIndex)

package/es/common/anchor-container/anchor-bar-list/anchor-bar-list.d.ts

@@ -2,10 +2,10 @@ import './anchor-bar-list.scss';
 export declare const IBizAnchorBarList: import("vue").DefineComponent<{
     anchorList: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
+            new (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            new (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -33,10 +33,10 @@ export declare const IBizAnchorBarList: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "select"[], "select", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     anchorList: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
+            new (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            new (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -61,6 +61,6 @@ export declare const IBizAnchorBarList: import("vue").DefineComponent<{
 }>> & {
     onSelect?: ((...args: any[]) => any) | undefined;
 }, {
-    anchorList: IData[];
+    anchorList: import("@ibiz-template/core").IApiData[];
     selected: string;
 }, {}>;

package/es/common/anchor-container/anchor-container.d.ts

@@ -40,10 +40,10 @@ export interface navBarConfig {
 export declare const IBizAnchorContainer: import("vue").DefineComponent<{
     anchorList: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
+            new (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            new (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -56,7 +56,7 @@ export declare const IBizAnchorContainer: import("vue").DefineComponent<{
         default: never[];
     };
     anchorTargetEle: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
         required: true;
     };
     navBarConfig: {
@@ -69,15 +69,15 @@ export declare const IBizAnchorContainer: import("vue").DefineComponent<{
     navBarPos: string;
     navBarStyle: string;
     navBarSysCss: string;
-    style: () => IData;
+    style: () => import("@ibiz-template/core").IApiData;
     onSelect: (key: string) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     anchorList: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
+            new (arrayLength: number): import("@ibiz-template/core").IApiData[];
+            new (...items: import("@ibiz-template/core").IApiData[]): import("@ibiz-template/core").IApiData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -90,7 +90,7 @@ export declare const IBizAnchorContainer: import("vue").DefineComponent<{
         default: never[];
     };
     anchorTargetEle: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
         required: true;
     };
     navBarConfig: {
@@ -98,6 +98,6 @@ export declare const IBizAnchorContainer: import("vue").DefineComponent<{
         default: () => void;
     };
 }>>, {
-    anchorList: IData[];
+    anchorList: import("@ibiz-template/core").IApiData[];
     navBarConfig: navBarConfig;
 }, {}>;

package/es/common/button-list/button-list.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { IAppDEUIActionGroupDetail, IDEFormButtonList, IPanelButtonList } from '@ibiz/model-core';
+import { IPanelButtonList, IDEFormButtonList, IAppDEUIActionGroupDetail } from '@ibiz/model-core';
 import { IButtonContainerState } from '@ibiz-template/runtime';
 import './button-list.scss';
 /**
@@ -20,12 +20,12 @@ export declare const IBizButtonList: import("vue").DefineComponent<{
     };
 }, {
     ns: import("@ibiz-template/core").Namespace;
-    buttonStyle: import("vue").ComputedRef<any>;
-    uiactionGroup: import("@ibiz/model-core").IUIActionGroup | undefined;
+    buttonListStyle: import("vue").ComputedRef<any>;
+    details: import("vue").ComputedRef<IAppDEUIActionGroupDetail[] | import("@ibiz/model-core").IPanelButton[] | import("@ibiz/model-core").IDEFormButton[]>;
     renderDropdown: (items: IAppDEUIActionGroupDetail[], iconName?: string) => JSX.Element;
     renderActions: () => JSX.Element;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    click: (_e: MouseEvent, _actionId: string) => true;
+    click: (_id: string, _e: MouseEvent) => true;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     model: {
         type: PropType<IPanelButtonList | IDEFormButtonList>;
@@ -40,7 +40,7 @@ export declare const IBizButtonList: import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
-    onClick?: ((_e: MouseEvent, _actionId: string) => any) | undefined;
+    onClick?: ((_id: string, _e: MouseEvent) => any) | undefined;
 }, {
     disabled: boolean;
 }, {}>;

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

@@ -1,7 +1,9 @@
 import { isVNode, defineComponent, ref, computed, nextTick, onActivated, onDeactivated, onMounted, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { debounce } from 'lodash-es';
+import '../../util/index.mjs';
 import './button-list.css';
+import { convertBtnType } from '../../util/button-util/button-util.mjs';
 
 "use strict";
 function _isSlot(s) {
@@ -24,7 +26,7 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
     }
   },
   emits: {
-    click: (_e, _actionId) => true
+    click: (_id, _e) => true
   },
   setup(props, {
     emit
@@ -33,18 +35,26 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
     const dropdown = ref();
     const componentRef = ref();
     const {
-      uiactionGroup,
-      actionGroupExtractMode
+      actionGroupExtractMode,
+      buttonListType,
+      uiactionGroup
     } = props.model;
     const sliceIndex = ref(-1);
     const isActivated = ref(true);
     const visible = ref(false);
+    const details = computed(() => {
+      if (buttonListType === "UIACTIONGROUP")
+        return (uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) || [];
+      return props.model.panelButtons || props.model.deformButtons || [];
+    });
     const firstIndex = computed(() => {
-      var _a;
-      const index = (_a = uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.findIndex((item) => props.buttonsState[item.id].visible);
+      const index = details.value.findIndex((item) => {
+        var _a;
+        return ((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible) !== false;
+      });
       return index === void 0 ? -1 : index;
     });
-    const buttonStyle = computed(() => {
+    const buttonListStyle = computed(() => {
       const {
         itemStyle,
         detailStyle
@@ -52,7 +62,7 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
       return itemStyle || detailStyle || "DEFAULT";
     });
     const trigger = computed(() => {
-      return actionGroupExtractMode === "ITEMX" && buttonStyle.value === "STYLE2" ? "hover" : "click";
+      return actionGroupExtractMode === "ITEMX" && buttonListStyle.value === "STYLE2" ? "hover" : "click";
     });
     const calcItemWidth = (item) => {
       const computedStyle = getComputedStyle(item);
@@ -100,7 +110,7 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
     });
     let resizeObserver;
     onMounted(() => {
-      if (actionGroupExtractMode === "ITEM") {
+      if (actionGroupExtractMode === "ITEM" || buttonListType === "BUTTONS") {
         handleResize = debounce(handleResize, 33.34);
         if (componentRef.value && ResizeObserver) {
           resizeObserver = new ResizeObserver(() => {
@@ -114,39 +124,39 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
       var _a, _b;
       e.stopPropagation();
       (_b = (_a = dropdown.value) == null ? void 0 : _a.handleClose) == null ? void 0 : _b.call(_a);
-      emit("click", e, item.uiactionId);
+      emit("click", item.id, e);
     };
     const handleMoreClick = (e, item) => {
       var _a, _b, _c, _d;
       e.stopPropagation();
       if (trigger.value === "hover") {
-        emit("click", e, item.uiactionId);
+        emit("click", item.id, e);
       } else if (visible.value) {
         (_b = (_a = dropdown.value) == null ? void 0 : _a.handleClose) == null ? void 0 : _b.call(_a);
       } else {
         (_d = (_c = dropdown.value) == null ? void 0 : _c.handleOpen) == null ? void 0 : _d.call(_c);
       }
     };
-    const renderButton = (item, disabled = false) => {
-      var _a, _b;
-      if (props.buttonsState[item.id].visible) {
-        return createVNode(resolveComponent("el-button"), {
-          "class": [ns.e("item"), ns.em("item", "".concat((_a = item.id) == null ? void 0 : _a.toLowerCase())), "".concat(((_b = item.sysCss) == null ? void 0 : _b.cssName) || "")],
-          "title": item.tooltip || item.caption,
-          "disabled": props.buttonsState[item.id].disabled || disabled,
-          "onClick": (event) => handleClick(event, item)
-        }, {
-          default: () => [createVNode("div", {
-            "class": ns.e("button-content")
-          }, [item.showIcon && createVNode(resolveComponent("iBizIcon"), {
-            "icon": item.sysImage,
-            "class": ns.em("button-content", "icon")
-          }, null), item.showCaption && createVNode("span", {
-            "class": ns.em("button-content", "caption")
-          }, [item.caption])])]
-        });
-      }
-      return null;
+    const renderButton = (item, type) => {
+      var _a, _b, _c, _d;
+      if (((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible) === false)
+        return null;
+      return createVNode(resolveComponent("el-button"), {
+        "class": [ns.e("item"), ns.em("item", "".concat((_b = item.id) == null ? void 0 : _b.toLowerCase())), "".concat(((_c = item.sysCss) == null ? void 0 : _c.cssName) || "")],
+        "type": type || convertBtnType(item.buttonStyle),
+        "title": item.tooltip || item.caption,
+        "disabled": ((_d = props.buttonsState[item.id]) == null ? void 0 : _d.disabled) || props.disabled,
+        "onClick": (event) => handleClick(event, item)
+      }, {
+        default: () => [createVNode("div", {
+          "class": ns.e("button-content")
+        }, [item.showIcon && createVNode(resolveComponent("iBizIcon"), {
+          "icon": item.sysImage,
+          "class": ns.em("button-content", "icon")
+        }, null), item.showCaption && createVNode("span", {
+          "class": ns.em("button-content", "caption")
+        }, [item.caption])])]
+      });
     };
     const renderDropdown = (items, iconName = "chevron-down-outline") => {
       const {
@@ -157,8 +167,9 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
       return createVNode(resolveComponent("el-dropdown"), {
         "ref": dropdown,
         "trigger": trigger.value,
-        "class": [ns.e("dropdown"), ns.em("dropdown", "".concat(buttonStyle.value.toLowerCase()))],
-        "popper-class": [ns.e("dropdown-popper"), ns.em("dropdown-popper", "".concat(buttonStyle.value.toLowerCase())), ns.em("dropdown-popper", "".concat(id == null ? void 0 : id.toLowerCase()))],
+        "disabled": props.disabled,
+        "class": [ns.e("dropdown"), ns.em("dropdown", "".concat(buttonListStyle.value.toLowerCase()))],
+        "popper-class": [ns.e("dropdown-popper"), ns.em("dropdown-popper", "".concat(buttonListStyle.value.toLowerCase())), ns.em("dropdown-popper", "".concat(id == null ? void 0 : id.toLowerCase()))],
         "popper-options": {
           modifiers: [{
             name: "offset",
@@ -174,10 +185,11 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
         default: () => {
           const item = items[firstIndex.value];
           return createVNode(resolveComponent("el-button-group"), null, {
-            default: () => [actionGroupExtractMode === "ITEMX" && item && renderButton(item, props.disabled), (actionGroupExtractMode !== "ITEMX" || item) && createVNode(resolveComponent("el-button"), {
+            default: () => [actionGroupExtractMode === "ITEMX" && item && renderButton(item, convertBtnType(buttonListStyle.value)), (actionGroupExtractMode !== "ITEMX" || item) && createVNode(resolveComponent("el-button"), {
               "disabled": props.disabled,
               "class": ns.e("more-button"),
               "title": actionGroupExtractMode !== "ITEMX" ? caption || ibiz.i18n.t("app.more") : ibiz.i18n.t("app.more"),
+              "type": convertBtnType(buttonListStyle.value),
               "onClick": (event) => handleMoreClick(event, item)
             }, {
               default: () => [createVNode("div", {
@@ -197,7 +209,8 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
         dropdown: () => {
           let _slot2;
           return createVNode(resolveComponent("el-dropdown-menu"), null, _isSlot(_slot2 = items.map((item, index) => {
-            if (props.buttonsState[item.id].visible && (actionGroupExtractMode !== "ITEMX" || index !== firstIndex.value)) {
+            var _a;
+            if (!(((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible) === false) && (actionGroupExtractMode !== "ITEMX" || index !== firstIndex.value)) {
               let _slot;
               return createVNode(resolveComponent("el-dropdown-item"), null, _isSlot(_slot = renderButton(item)) ? _slot : {
                 default: () => [_slot]
@@ -211,7 +224,7 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
       });
     };
     const renderActions = () => {
-      const groupDetails = (uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) || [];
+      const groupDetails = details.value || [];
       const items = sliceIndex.value === -1 ? groupDetails : groupDetails.slice(0, sliceIndex.value);
       const moreItems = sliceIndex.value === -1 ? [] : groupDetails.slice(sliceIndex.value);
       return createVNode("div", {
@@ -221,19 +234,18 @@ const IBizButtonList = /* @__PURE__ */ defineComponent({
     };
     return {
       ns,
-      buttonStyle,
-      uiactionGroup,
+      buttonListStyle,
+      details,
       renderDropdown,
       renderActions
     };
   },
   render() {
-    var _a, _b;
-    const items = ((_a = this.uiactionGroup) == null ? void 0 : _a.uiactionGroupDetails) || [];
+    var _a;
     return createVNode("div", {
-      "class": [this.ns.b(), this.ns.m(this.model.id), this.ns.m(this.buttonStyle.toLowerCase()), this.ns.m((_b = this.model.actionGroupExtractMode) == null ? void 0 : _b.toLowerCase())],
+      "class": [this.ns.b(), this.ns.m(this.model.id), this.ns.m(this.buttonListStyle.toLowerCase()), this.ns.m((_a = this.model.actionGroupExtractMode) == null ? void 0 : _a.toLowerCase())],
       "style": this.model.cssStyle
-    }, [this.model.actionGroupExtractMode === "ITEM" ? this.renderActions() : this.renderDropdown(items)]);
+    }, [this.model.actionGroupExtractMode === "ITEM" || this.model.buttonListType === "BUTTONS" ? this.renderActions() : this.renderDropdown(this.details)]);
   }
 });
 

package/es/common/carousel/carousel.d.ts

@@ -68,7 +68,7 @@ export declare const IBizCarouselComponent: import("vue").DefineComponent<{
     };
 }, {
     ns: import("@ibiz-template/core").Namespace;
-    swipeData: Ref<IData[]>;
+    swipeData: Ref<import("@ibiz-template/core").IApiData[]>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     carouselData: {
         type: {

package/es/common/carousel-card/carousel-card.d.ts

@@ -2,7 +2,7 @@ import { PropType, Ref } from 'vue';
 import './carousel-card.scss';
 export declare const IBizCarouselCard: import("vue").DefineComponent<{
     swipeData: {
-        type: PropType<IData[]>;
+        type: PropType<import("@ibiz-template/core").IApiData[]>;
         required: true;
     };
     isAuto: {
@@ -19,12 +19,12 @@ export declare const IBizCarouselCard: import("vue").DefineComponent<{
     mainDom: Ref<any>;
     listDom: Ref<any>;
     imgWidth: Ref<number>;
-    resImgArr: import("vue").ComputedRef<IData[]>;
+    resImgArr: import("vue").ComputedRef<import("@ibiz-template/core").IApiData[]>;
     dotClick: (targetIndex: number) => void;
     nowIndex: Ref<number>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     swipeData: {
-        type: PropType<IData[]>;
+        type: PropType<import("@ibiz-template/core").IApiData[]>;
         required: true;
     };
     isAuto: {

package/es/common/control-navigation/control-navigation.mjs

@@ -17,6 +17,7 @@ const IBizControlNavigation = /* @__PURE__ */ defineComponent({
     const ns = useNamespace("control-navigation");
     const provider = getNavigationProvider(props.controller);
     const outerWrapper = ref(null);
+    const isEmbedCtrlNav = ref(false);
     const {
       navViewPos,
       controlParam,
@@ -37,10 +38,14 @@ const IBizControlNavigation = /* @__PURE__ */ defineComponent({
     const navRenderMode = ((_a = controlParam == null ? void 0 : controlParam.ctrlParams) == null ? void 0 : _a.navRenderMode) ? controlParam.ctrlParams.navRenderMode : "RELOAD";
     const splitValue = ref(0.5);
     const splitMode = ref(["BOTTOM", "ANY_BOTTOM"].includes(navViewPos) ? "vertical" : "horizontal");
-    watch(() => provider.navViewMsg.value, (newVal, oldVal) => {
+    watch(() => provider.navViewMsg.value, async (newVal, oldVal) => {
       if (navRenderMode === "REDRAW" || !newVal || oldVal && newVal.viewId !== oldVal.viewId) {
         navViewMsg.value = newVal;
       } else {
+        const viewModel = await ibiz.hub.getAppView(newVal.viewId);
+        if (viewModel && viewModel.viewType === "DEREDIRECTVIEW") {
+          isEmbedCtrlNav.value = true;
+        }
         navViewMsg.value = {
           context: newVal.context,
           params: newVal.params,
@@ -71,6 +76,7 @@ const IBizControlNavigation = /* @__PURE__ */ defineComponent({
           return;
         return h(resolveComponent("IBizViewShell"), {
           ...navViewMsg.value,
+          isEmbedCtrlNav: isEmbedCtrlNav.value,
           class: ns.e("nav-view")
         });
       }

package/es/common/control-navigation/provider/navigation-base.provider.mjs

@@ -114,9 +114,12 @@ class NavgationBaseProvider {
    * @memberof NavgationBaseProvider
    */
   onNavDataChange(event) {
+    var _a;
     const { navData, context, params } = event;
-    this.navStack.unshift(navData[this.keyName]);
-    this.navViewMsg.value = this.getNavViewMsg(navData, context, params);
+    if (((_a = this.navViewMsg.value) == null ? void 0 : _a.key) !== navData[this.keyName]) {
+      this.navStack.unshift(navData[this.keyName]);
+      this.navViewMsg.value = this.getNavViewMsg(navData, context, params);
+    }
   }
   /**
    * 获取导航视图信息

package/es/common/cropping/cropping.d.ts

@@ -2,7 +2,7 @@ import { PropType, Ref } from 'vue';
 import './cropping.scss';
 export declare const IBizCropping: import("vue").DefineComponent<{
     img: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
     };
     url: {
         type: StringConstructor;
@@ -19,7 +19,7 @@ export declare const IBizCropping: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     cropImgUrl: import("vue").ComputedRef<string>;
     scaleNumber: Ref<number>;
-    style: import("vue").ComputedRef<IData>;
+    style: import("vue").ComputedRef<import("@ibiz-template/core").IApiData>;
     uuid: string;
     imgRef: Ref<any>;
     onReduce: () => void;
@@ -33,7 +33,7 @@ export declare const IBizCropping: import("vue").DefineComponent<{
     onWheel: (e: WheelEvent) => Promise<void>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     img: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
     };
     url: {
         type: StringConstructor;

package/es/common/custom-filter-condition/custom-filter-condition.d.ts

@@ -5,17 +5,17 @@ import { IField, IFilterCondition } from '../../interface';
 import './custom-filter-condition.scss';
 export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
     value: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
     };
     context: {
-        type: PropType<IContext>;
+        type: PropType<import("@ibiz-template/core").IApiContext>;
         required: true;
     };
     params: {
-        type: PropType<IParams>;
+        type: PropType<import("@ibiz-template/core").IApiParams>;
     };
     schemaFields: {
-        type: PropType<IData[]>;
+        type: PropType<import("@ibiz-template/core").IApiData[]>;
         default: () => never[];
     };
 }, {
@@ -947,7 +947,7 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
                 modelId?: string | undefined;
                 modelType?: string | undefined;
             };
-            readonly style: IData;
+            readonly style: import("@ibiz-template/core").IApiData;
             readonly context: {
                 [x: string]: any;
                 [x: symbol]: any;
@@ -956,7 +956,7 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
                 srfsimple?: boolean | undefined;
                 srfnavctrlid?: string | undefined;
             };
-            readonly params: IParams;
+            readonly params: import("@ibiz-template/core").IApiParams;
             readonly parent: {
                 unitName: string | undefined;
                 valueFormat: string | undefined;
@@ -968,7 +968,7 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
                     srfsimple?: boolean | undefined;
                     srfnavctrlid?: string | undefined;
                 };
-                params: IParams;
+                params: import("@ibiz-template/core").IApiParams;
                 dataType: number | undefined;
             };
             init: () => Promise<void>;
@@ -983,21 +983,21 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
     handleValueOPChange: (item: IFilterCondition) => Promise<void>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
-        type: PropType<IData>;
+        type: PropType<import("@ibiz-template/core").IApiData>;
     };
     context: {
-        type: PropType<IContext>;
+        type: PropType<import("@ibiz-template/core").IApiContext>;
         required: true;
     };
     params: {
-        type: PropType<IParams>;
+        type: PropType<import("@ibiz-template/core").IApiParams>;
     };
     schemaFields: {
-        type: PropType<IData[]>;
+        type: PropType<import("@ibiz-template/core").IApiData[]>;
         default: () => never[];
     };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
 }, {
-    schemaFields: IData[];
+    schemaFields: import("@ibiz-template/core").IApiData[];
 }, {}>;

package/es/common/data-import/data-import.d.ts

@@ -15,11 +15,11 @@ export declare const DataImport: import("vue").DefineComponent<{
         required: false;
     };
     context: {
-        type: PropType<IContext>;
+        type: PropType<import("@ibiz-template/core").IApiContext>;
         required: false;
     };
     params: {
-        type: PropType<IParams>;
+        type: PropType<import("@ibiz-template/core").IApiParams>;
         required: false;
     };
 }, {
@@ -47,11 +47,11 @@ export declare const DataImport: import("vue").DefineComponent<{
         required: false;
     };
     context: {
-        type: PropType<IContext>;
+        type: PropType<import("@ibiz-template/core").IApiContext>;
         required: false;
     };
     params: {
-        type: PropType<IParams>;
+        type: PropType<import("@ibiz-template/core").IApiParams>;
         required: false;
     };
 }>>, {}, {}>;