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

package/es/view-engine/edit-view.engine.mjs

@@ -6,10 +6,6 @@ class EditViewEngine extends DEMainViewEngine {
   get form() {
     return this.view.getController("form");
   }
-  get coopPos() {
-    var _a;
-    return (_a = this.view.layoutPanel) == null ? void 0 : _a.panelItems.coop_pos;
-  }
   init() {
     super.init();
     if (this.view.model.multiFormMode === 1 && this.view.params.srfdatatype) {
@@ -342,31 +338,14 @@ class EditViewEngine extends DEMainViewEngine {
    * @memberof EditViewEngine
    */
   doMarkDataAction() {
+    super.doMarkDataAction();
     if (this.doActions.includes("VIEW")) {
-      const callback = async (data) => {
-        const dataInfo = this.form.getData()[0].srfmajortext;
-        this.markOpenDataCallback(data, dataInfo);
-      };
-      this.form.evt.on("onLoadSuccess", async (event) => {
-        const data = event.data[0];
-        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
-        if (result.ok && result.data.length > 0) {
-          result.data.forEach((item) => {
-            var _a;
-            if (item.data) {
-              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
-                data: item.data
-              });
-            }
-          });
-        }
-        this.subscribeMarkDataAction(data.srfkey, callback);
-      });
+      this.form.evt.on("onLoadSuccess", () => this.sendViewDataAction());
     }
     if (this.doActions.includes("EDIT")) {
       let isWait = false;
-      this.form.evt.on("onFormDataChange", (event) => {
-        const data = event.data[0];
+      this.form.evt.on("onFormDataChange", () => {
+        const data = this.form.getData()[0];
         if (isWait) {
           return;
         }
@@ -381,8 +360,8 @@ class EditViewEngine extends DEMainViewEngine {
       });
     }
     if (this.doActions.includes("UPDATE")) {
-      this.form.evt.on("onSaveSuccess", (event) => {
-        const data = event.data[0];
+      this.form.evt.on("onSaveSuccess", () => {
+        const data = this.form.getData()[0];
         this.sendMarkDataAction("UPDATE", data.srfkey);
       });
     }

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

@@ -5,6 +5,49 @@ export * from './data-view.engine';
 export * from './opt-view.engine';
 export * from './tab-exp-view.engine';
 export * from './tree-exp-view.engine';
+export * from './app-data-upload-view.engine';
+export * from './calendar-exp-view.engine';
+export * from './calendar-view.engine';
+export * from './chart-exp-view.engine';
+export * from './chart-view.engine';
+export * from './custom-view.engine';
+export * from './data-view-exp-view.engine';
+export * from './de-index-view-engine';
+export * from './edit-view.engine';
+export * from './edit-view2.engine';
+export * from './edit-view3.engine';
+export * from './edit-view4.engine';
+export * from './exp-view.engine';
+export * from './form-pickup-data-view.engine';
+export * from './gantt-view.engine';
+export * from './grid-exp-view.engine';
+export * from './kanban-view.engine';
+export * from './list-exp-view.engine';
+export * from './list-view.engine';
+export * from './login-view.engine';
+export * from './map-view.engine';
+export * from './medit-view9.engine';
+export * from './mpickup-view-engine';
+export * from './mpickup-view2-engine';
+export * from './panel-view-engine';
+export * from './pickup-data-view.engine';
+export * from './pickup-grid-view.engine';
+export * from './pickup-tree-view.engine';
+export * from './pickup-view.engine';
+export * from './pickup-view2.engine';
+export * from './portal-view-engine';
+export * from './report-view.engine';
+export * from './sub-app-ref-view.engine';
+export * from './tab-search-view.engine';
+export * from './tree-grid-ex-view.engine';
+export * from './tree-grid-view.engine';
+export * from './tree-view.engine';
+export * from './wf-dyna-action-view.engine';
+export * from './wf-dyna-edit-view.engine';
+export * from './wf-dyna-edit-view3.engine';
+export * from './wf-dyna-start-view.engine';
+export * from './wf-step-data-view.engine';
+export * from './wizard-view-engine';
 export declare const IBizViewEngine: {
     install: (_v: App) => void;
 };

package/es/view-engine/index.mjs

@@ -46,6 +46,7 @@ import { SubAppRefViewEngine } from './sub-app-ref-view.engine.mjs';
 import { TabSearchViewEngine } from './tab-search-view.engine.mjs';
 import { AppDataUploadViewEngine } from './app-data-upload-view.engine.mjs';
 import { WFStepDataViewEngine } from './wf-step-data-view.engine.mjs';
+export { ExpViewEngine } from './exp-view.engine.mjs';
 
 "use strict";
 const IBizViewEngine = {
@@ -301,4 +302,4 @@ const IBizViewEngine = {
   }
 };
 
-export { DataViewEngine, GridViewEngine, IBizViewEngine, IndexViewEngine, OptViewEngine, TabExpViewEngine, TreeExpViewEngine };
+export { AppDataUploadViewEngine, CalendarExpViewEngine, CalendarViewEngine, ChartExpViewEngine, ChartViewEngine, CustomViewEngine, DEIndexViewEngine, DataViewEngine, DataViewExpViewEngine, EditView2Engine, EditView3Engine, EditView4Engine, EditViewEngine, FormPickupDataViewEngine, GanttViewEngine, GridExpViewEngine, GridViewEngine, IBizViewEngine, IndexViewEngine, KanbanViewEngine, ListExpViewEngine, ListViewEngine, LoginViewEngine, MEditView9Engine, MPickupView2Engine, MPickupViewEngine, MapViewEngine, OptViewEngine, PanelViewEngine, PickupDataViewEngine, PickupGridViewEngine, PickupTreeViewEngine, PickupView2Engine, PickupViewEngine, PortalViewEngine, ReportViewEngine, SubAppRefViewEngine, TabExpViewEngine, TabSearchViewEngine, TreeExpViewEngine, TreeGridExViewEngine, TreeGridViewEngine, TreeViewEngine, WFDynaActionViewEngine, WFDynaEditView3Engine, WFDynaEditViewEngine, WFDynaStartViewEngine, WFStepDataViewEngine, WizardViewEngine };

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

@@ -30,6 +30,14 @@ export declare class PortalViewEngine extends DEMainViewEngine {
      * @memberof PortalViewEngine
      */
     refresh(): Promise<void>;
+    /**
+     * 主数据
+     *
+     * @protected
+     * @return {*}  {IData[]}
+     * @memberof PortalViewEngine
+     */
+    protected getData(): IData[];
     /**
      * 执行视图预置界面行为能力
      *

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

@@ -31,6 +31,16 @@ class PortalViewEngine extends DEMainViewEngine {
   async refresh() {
     await this.dashboard.refresh();
   }
+  /**
+   * 主数据
+   *
+   * @protected
+   * @return {*}  {IData[]}
+   * @memberof PortalViewEngine
+   */
+  getData() {
+    return this.view.state.srfactiveviewdata ? [this.view.state.srfactiveviewdata] : [];
+  }
   /**
    * 执行视图预置界面行为能力
    *
@@ -62,30 +72,14 @@ class PortalViewEngine extends DEMainViewEngine {
    * @memberof PortalViewEngine
    */
   doMarkDataAction() {
-    let data;
+    super.doMarkDataAction();
     if (this.doActions.includes("VIEW")) {
-      const callback = async (_data) => {
-        this.markOpenDataCallback(_data, data == null ? void 0 : data.srfmajortext);
-      };
-      this.view.evt.on("onDataChange", async (event) => {
-        data = event.data[0];
-        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
-        if (result.ok && result.data.length > 0) {
-          result.data.forEach((item) => {
-            var _a;
-            if (item.data) {
-              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
-                data: item.data
-              });
-            }
-          });
-        }
-        this.subscribeMarkDataAction(data.srfkey, callback);
-      });
+      this.view.evt.on("onDataChange", () => this.sendViewDataAction());
     }
     if (this.doActions.includes("EDIT")) {
       let isWait = false;
       this.dashboard.evt.on("onConfigChange", () => {
+        const data = this.getData()[0];
         if (!(data == null ? void 0 : data.srfkey) || isWait) {
           return;
         }
@@ -101,18 +95,12 @@ class PortalViewEngine extends DEMainViewEngine {
     }
     if (this.doActions.includes("UPDATE")) {
       this.dashboard.evt.on("onSavePortlet", () => {
+        const data = this.getData()[0];
         if (data == null ? void 0 : data.srfkey) {
           this.sendMarkDataAction("UPDATE", data == null ? void 0 : data.srfkey);
         }
       });
     }
-    if (this.doActions.includes("CLOSE")) {
-      this.view.evt.on("onCloseView", () => {
-        if (data == null ? void 0 : data.srfkey) {
-          this.sendMarkDataAction("CLOSE", data.srfkey);
-        }
-      });
-    }
   }
 }
 

package/es/web-app/App.mjs

@@ -1,5 +1,6 @@
 import { defineComponent, onUnmounted, createVNode, resolveComponent } from 'vue';
 import { Modal, ViewMode } from '@ibiz-template/runtime';
+import { AppHooks } from '@ibiz-template/vue3-util';
 import './App.css';
 
 "use strict";
@@ -17,6 +18,7 @@ var App = /* @__PURE__ */ defineComponent({
     window.addEventListener("unload", destroyAppHub);
     onUnmounted(() => {
       destroyAppHub();
+      AppHooks.destoryApp.call(null);
     });
     return {
       modal

package/es/web-app/attach-environment-config.mjs

@@ -15,7 +15,7 @@ async function attachEnvironmentConfig() {
   Object.keys(ibiz.env).forEach((key) => {
     const key2 = envMap.has(key) ? envMap.get(key) : key;
     if (env[key2] != null) {
-      if (key2 === "customParams") {
+      if (key2 === "customParams" || key2 === "devtoolConfig") {
         ibiz.env[key] = JSON.parse(env[key2]);
       } else {
         ibiz.env[key] = env[key2];

package/es/web-app/components/router-shell/router-shell.d.ts

@@ -19,10 +19,10 @@ export declare const RouterShell: import("vue").DefineComponent<{
             height?: number | undefined;
             appDataEntityId?: string | undefined;
             redirectView?: boolean | undefined;
-            modalOption?: IData | undefined;
+            modalOption?: import("@ibiz-template/core").IApiData | undefined;
         } | undefined;
-        context?: IParams | undefined;
-        params?: IParams | undefined;
+        context?: import("@ibiz-template/core").IApiParams | undefined;
+        params?: import("@ibiz-template/core").IApiParams | undefined;
         srfnav?: string | undefined;
     }>;
     isLoaded: import("vue").Ref<boolean>;

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -1,6 +1,7 @@
 import { RuntimeError, getAppCookie, CoreConst, HttpError } from '@ibiz-template/core';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
+import { updateDevToolConfig } from '@ibiz-template/devtool';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -110,11 +111,13 @@ class AuthGuard {
    * @return {*}  {Promise<void>}
    */
   async appInit(context) {
+    await AppHooks.beforeInitApp.call({ context });
     try {
       if (ibiz.env.isSaaSMode === true) {
         await this.loadOrgData();
       }
       await this.loadAppData(context);
+      await AppHooks.authedApp.call({ context });
     } catch (error) {
       const responseStatus = error.status;
       const remember = getAppCookie(CoreConst.TOKEN_REMEMBER);
@@ -126,6 +129,7 @@ class AuthGuard {
             await this.loadOrgData();
           }
           await this.loadAppData(context);
+          await AppHooks.authedApp.call({ context });
         } catch (refreshTokenError) {
           throw error;
         }
@@ -166,6 +170,7 @@ class AuthGuard {
     }
     if (res.ok) {
       ibiz.appData = res.data;
+      updateDevToolConfig();
     }
   }
   /**

package/es/web-app/guard/auth-guard/dyna-auth-guard.mjs

@@ -35,6 +35,7 @@ class DynaAuthGuard extends AuthGuard {
       const tempApp = await helper.getAppModel();
       await this.initEnvironment(tempApp);
       const app = await ibiz.hub.getAppAsync(ibiz.env.appId);
+      await AppHooks.initedApp.call({ context, app });
       const appModel = app.model;
       ibiz.env.isMob = appModel.mobileApp === true;
       if (ibiz.env.isEnableMultiLan) {
@@ -52,6 +53,8 @@ class DynaAuthGuard extends AuthGuard {
       const module = await import('@ibiz-template/web-theme');
       const theme = module.default || module;
       AppHooks.useComponent.callSync(null, theme);
+      if (ibiz.config.theme)
+        ibiz.util.theme.setTheme(ibiz.config.theme);
       if (appModel.appUIThemes) {
         await this.loadTheme();
       }

package/es/web-app/main.mjs

@@ -34,7 +34,6 @@ async function runApp(plugins, opts) {
   });
   install();
   install$1();
-  install$2();
   ibiz.util.getGlobalParam = () => {
     return useAppStore().appStore;
   };
@@ -59,6 +58,7 @@ async function runApp(plugins, opts) {
     });
   });
   await attachEnvironmentConfig();
+  install$2();
   let authGuard;
   if (opts == null ? void 0 : opts.getAuthGuard) {
     authGuard = opts.getAuthGuard();

package/lib/common/action-toolbar/action-toolbar.cjs

@@ -2,8 +2,8 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./action-toolbar.css');
 var core = require('@ibiz-template/core');
+require('./action-toolbar.css');
 
 "use strict";
 function _isSlot(s) {
@@ -48,7 +48,13 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
     var _a;
     const ns = vue3Util.useNamespace("action-toolbar");
     const dropdownRef = vue.ref();
-    const popoverVisible = vue.ref(false);
+    const groupButtonRef = vue.ref();
+    const {
+      popoverVisible,
+      setPopoverVisible
+    } = vue3Util.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);
@@ -63,7 +69,7 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         await props.actionCallBack(detail, e);
       }
       if (props.mode === "buttons") {
-        popoverVisible.value = false;
+        setPopoverVisible(false);
       } else if (dropdownRef.value) {
         dropdownRef.value.handleClose();
       }
@@ -82,7 +88,6 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         }
       });
     }
-    const groupButtonRef = vue.ref();
     const calcActionItemClass = (item) => {
       const {
         actionLevel
@@ -155,7 +160,10 @@ const IBizActionToolbar = /* @__PURE__ */ vue.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: () => vue.createVNode("ion-icon", {
           "class": this.ns.e("icon"),
@@ -165,9 +173,7 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       }), vue.createVNode(vue.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/lib/common/button-list/button-list.cjs

@@ -3,7 +3,9 @@
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var lodashEs = require('lodash-es');
+require('../../util/index.cjs');
 require('./button-list.css');
+var buttonUtil = require('../../util/button-util/button-util.cjs');
 
 "use strict";
 function _isSlot(s) {
@@ -26,7 +28,7 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
     }
   },
   emits: {
-    click: (_e, _actionId) => true
+    click: (_id, _e) => true
   },
   setup(props, {
     emit
@@ -35,18 +37,26 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
     const dropdown = vue.ref();
     const componentRef = vue.ref();
     const {
-      uiactionGroup,
-      actionGroupExtractMode
+      actionGroupExtractMode,
+      buttonListType,
+      uiactionGroup
     } = props.model;
     const sliceIndex = vue.ref(-1);
     const isActivated = vue.ref(true);
     const visible = vue.ref(false);
+    const details = vue.computed(() => {
+      if (buttonListType === "UIACTIONGROUP")
+        return (uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) || [];
+      return props.model.panelButtons || props.model.deformButtons || [];
+    });
     const firstIndex = vue.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 = vue.computed(() => {
+    const buttonListStyle = vue.computed(() => {
       const {
         itemStyle,
         detailStyle
@@ -54,7 +64,7 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
       return itemStyle || detailStyle || "DEFAULT";
     });
     const trigger = vue.computed(() => {
-      return actionGroupExtractMode === "ITEMX" && buttonStyle.value === "STYLE2" ? "hover" : "click";
+      return actionGroupExtractMode === "ITEMX" && buttonListStyle.value === "STYLE2" ? "hover" : "click";
     });
     const calcItemWidth = (item) => {
       const computedStyle = getComputedStyle(item);
@@ -102,7 +112,7 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
     });
     let resizeObserver;
     vue.onMounted(() => {
-      if (actionGroupExtractMode === "ITEM") {
+      if (actionGroupExtractMode === "ITEM" || buttonListType === "BUTTONS") {
         handleResize = lodashEs.debounce(handleResize, 33.34);
         if (componentRef.value && ResizeObserver) {
           resizeObserver = new ResizeObserver(() => {
@@ -116,39 +126,39 @@ const IBizButtonList = /* @__PURE__ */ vue.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 vue.createVNode(vue.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: () => [vue.createVNode("div", {
-            "class": ns.e("button-content")
-          }, [item.showIcon && vue.createVNode(vue.resolveComponent("iBizIcon"), {
-            "icon": item.sysImage,
-            "class": ns.em("button-content", "icon")
-          }, null), item.showCaption && vue.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 vue.createVNode(vue.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 || buttonUtil.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: () => [vue.createVNode("div", {
+          "class": ns.e("button-content")
+        }, [item.showIcon && vue.createVNode(vue.resolveComponent("iBizIcon"), {
+          "icon": item.sysImage,
+          "class": ns.em("button-content", "icon")
+        }, null), item.showCaption && vue.createVNode("span", {
+          "class": ns.em("button-content", "caption")
+        }, [item.caption])])]
+      });
     };
     const renderDropdown = (items, iconName = "chevron-down-outline") => {
       const {
@@ -159,8 +169,9 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
       return vue.createVNode(vue.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",
@@ -176,10 +187,11 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
         default: () => {
           const item = items[firstIndex.value];
           return vue.createVNode(vue.resolveComponent("el-button-group"), null, {
-            default: () => [actionGroupExtractMode === "ITEMX" && item && renderButton(item, props.disabled), (actionGroupExtractMode !== "ITEMX" || item) && vue.createVNode(vue.resolveComponent("el-button"), {
+            default: () => [actionGroupExtractMode === "ITEMX" && item && renderButton(item, buttonUtil.convertBtnType(buttonListStyle.value)), (actionGroupExtractMode !== "ITEMX" || item) && vue.createVNode(vue.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": buttonUtil.convertBtnType(buttonListStyle.value),
               "onClick": (event) => handleMoreClick(event, item)
             }, {
               default: () => [vue.createVNode("div", {
@@ -199,7 +211,8 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
         dropdown: () => {
           let _slot2;
           return vue.createVNode(vue.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 vue.createVNode(vue.resolveComponent("el-dropdown-item"), null, _isSlot(_slot = renderButton(item)) ? _slot : {
                 default: () => [_slot]
@@ -213,7 +226,7 @@ const IBizButtonList = /* @__PURE__ */ vue.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 vue.createVNode("div", {
@@ -223,19 +236,18 @@ const IBizButtonList = /* @__PURE__ */ vue.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 vue.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/lib/common/control-navigation/control-navigation.cjs

@@ -19,6 +19,7 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-navigation");
     const provider = index.getNavigationProvider(props.controller);
     const outerWrapper = vue.ref(null);
+    const isEmbedCtrlNav = vue.ref(false);
     const {
       navViewPos,
       controlParam,
@@ -39,10 +40,14 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
     const navRenderMode = ((_a = controlParam == null ? void 0 : controlParam.ctrlParams) == null ? void 0 : _a.navRenderMode) ? controlParam.ctrlParams.navRenderMode : "RELOAD";
     const splitValue = vue.ref(0.5);
     const splitMode = vue.ref(["BOTTOM", "ANY_BOTTOM"].includes(navViewPos) ? "vertical" : "horizontal");
-    vue.watch(() => provider.navViewMsg.value, (newVal, oldVal) => {
+    vue.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,
@@ -73,6 +78,7 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
           return;
         return vue.h(vue.resolveComponent("IBizViewShell"), {
           ...navViewMsg.value,
+          isEmbedCtrlNav: isEmbedCtrlNav.value,
           class: ns.e("nav-view")
         });
       }

package/lib/common/control-navigation/provider/navigation-base.provider.cjs

@@ -116,9 +116,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/lib/common/map-chart-user/map-user-manager.cjs

@@ -27,7 +27,7 @@ function useMapManager(controller, opts, calcEchartsOpts) {
   const setOption = async (data) => {
     controller.options = data;
     await controller.evt.emit("onBeforeUpdate", { data });
-    chart.setOption(data);
+    chart.setOption(data, true);
   };
   const registerMap = async (name) => {
     if (mapInfos.has(name)) {