@ibiz-template/vue3-components 0.7.41-alpha.4 → 0.7.41-alpha.41

package/lib/panel-component/global-search/global-search.cjs

@@ -48,6 +48,12 @@ const GlobalSearch = /* @__PURE__ */ vue.defineComponent({
       const showEmpty = histories.includes(query) && list.length === 0;
       return (showSearch || showEmpty || showHistory || loading) && activated.value;
     });
+    const curPlaceholder = vue.computed(() => {
+      const {
+        placeholder
+      } = c.rawItemParams;
+      return placeholder || ibiz.i18n.t("panelComponent.globalSearch.placeholder");
+    });
     const handleEnter = (event) => {
       if (event.key === "Enter") {
         activated.value = true;
@@ -190,6 +196,7 @@ const GlobalSearch = /* @__PURE__ */ vue.defineComponent({
       visible,
       editorRef,
       searchValue,
+      curPlaceholder,
       handleFocus,
       handleEnter,
       renderAction,
@@ -214,7 +221,7 @@ const GlobalSearch = /* @__PURE__ */ vue.defineComponent({
           "ref": "editorRef",
           "modelValue": this.searchValue,
           "onUpdate:modelValue": ($event) => this.searchValue = $event,
-          "placeholder": ibiz.i18n.t("panelComponent.globalSearch.placeholder"),
+          "placeholder": this.curPlaceholder,
           "class": [this.ns.e("search"), this.ns.is("search", this.visible)],
           "onFocus": this.handleFocus,
           "onKeyup": this.handleEnter,

package/lib/panel-component/global-search/global-search.controller.cjs

@@ -2,7 +2,6 @@
 
 var runtime = require('@ibiz-template/runtime');
 var qxUtil = require('qx-util');
-var core = require('@ibiz-template/core');
 var globalSearch_state = require('./global-search.state.cjs');
 
 "use strict";
@@ -32,7 +31,7 @@ class GlobalSearchController extends runtime.PanelItemController {
     /**
      * @description 自定义参数
      * @exposedoc
-     * @protected
+     * @public
      * @type {IData}
      * @memberof GlobalSearchController
      */
@@ -127,6 +126,38 @@ class GlobalSearchController extends runtime.PanelItemController {
     if (cache)
       this.state.histories = JSON.parse(cache);
   }
+  /**
+   * @description 获取全局搜索应用功能
+   * @param {IAppMenuItem[]} appMenuItems
+   * @returns {*}  {Promise<IAppFunc[]>}
+   * @memberof GlobalSearchController
+   */
+  async getSearchFunc(appMenuItems) {
+    const result = [];
+    const promises = appMenuItems.map(async (menuItem) => {
+      try {
+        if (menuItem.appMenuItems) {
+          const subFuncs = await this.getSearchFunc(menuItem.appMenuItems);
+          result.push(...subFuncs);
+          return;
+        }
+        if (menuItem.appFuncId) {
+          let app = ibiz.hub.getApp(menuItem.appId);
+          if (!app) {
+            app = await ibiz.hub.getAppAsync(menuItem.appId);
+          }
+          const appFunc = app.getAppFunc(menuItem.appFuncId);
+          if (appFunc && appFunc.appFuncType === "SEARCH" && appFunc.appDEACModeId && appFunc.appDataEntityId) {
+            result.push(appFunc);
+          }
+        }
+      } catch (err) {
+        console.error("\u8BA1\u7B97\u83DC\u5355\u5E94\u7528\u529F\u80FD\u5F02\u5E38: ".concat(menuItem.appFuncId), err);
+      }
+    });
+    await Promise.all(promises);
+    return result;
+  }
   /**
    * 初始化全局搜索项
    *
@@ -134,24 +165,14 @@ class GlobalSearchController extends runtime.PanelItemController {
    * @memberof GlobalSearchController
    */
   async initGlobalSearchItem() {
-    const appMenu = runtime.getControl(this.panel.view.model, "appmenu");
+    const appMenu = runtime.getControl(
+      this.panel.view.model,
+      "appmenu"
+    );
     if (!appMenu)
       return;
-    const appFuncs = [];
-    core.recursiveIterate(
-      appMenu,
-      (menuItem) => {
-        if (menuItem.appFuncId) {
-          const app = ibiz.hub.getApp(menuItem.appId);
-          const appFunc = app.getAppFunc(menuItem.appFuncId);
-          if (appFunc && appFunc.appFuncType === "SEARCH" && appFunc.appDEACModeId && appFunc.appDataEntityId)
-            appFuncs.push(appFunc);
-        }
-      },
-      {
-        childrenFields: ["appMenuItems"]
-      }
-    );
+    const appMenuItems = appMenu.appMenuItems || [];
+    const appFuncs = await this.getSearchFunc(appMenuItems);
     await Promise.all(
       appFuncs.map(async (func) => {
         const deACMode = await runtime.getDeACMode(

package/lib/panel-component/index-actions/index-actions.cjs

@@ -68,9 +68,7 @@ const IndexActions = /* @__PURE__ */ vue.defineComponent({
     });
     return vue.createVNode("div", {
       "class": this.classArr,
-      "onClick": () => {
-        this.controller.onClick();
-      }
+      "onClick": (event) => this.controller.onClick(event)
     }, [this.controller.model.cssStyle ? vue.createVNode("style", {
       "type": "text/css"
     }, [this.controller.model.cssStyle]) : null, content]);

package/lib/panel-component/index-blank-placeholder/index-blank-placeholder.cjs

@@ -70,9 +70,7 @@ const IndexBlankPlaceholder = /* @__PURE__ */ vue.defineComponent({
     });
     return vue.createVNode("div", {
       "class": this.classArr,
-      "onClick": () => {
-        this.controller.onClick();
-      }
+      "onClick": (event) => this.controller.onClick(event)
     }, [this.controller.model.cssStyle ? vue.createVNode("style", {
       "type": "text/css"
     }, [this.controller.model.cssStyle]) : null, content]);

package/lib/panel-component/index-blank-placeholder/index-blank-placeholder.controller.cjs

@@ -59,8 +59,6 @@ class IndexBlankPlaceholderController extends runtime.PanelItemController {
         const appView = await ibiz.hub.config.view.get(appViewId);
         const { openMode = "INDEXVIEWTAB" } = appView;
         this.state.visible = !openMode.startsWith("INDEXVIEWTAB");
-      } else {
-        this.state.visible = true;
       }
     });
   }

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

@@ -4,6 +4,7 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var vueRouter = require('vue-router');
 var navBreadcrumb_controller = require('./nav-breadcrumb.controller.cjs');
+var navBreadcrumb_util = require('./nav-breadcrumb.util.cjs');
 require('./nav-breadcrumb.css');
 
 "use strict";
@@ -44,15 +45,23 @@ const NavBreadcrumb = /* @__PURE__ */ vue.defineComponent({
         breadcrumbItems
       } = c.state;
       let result = breadcrumbItems.filter((x) => x.caption);
+      const indexViewName = navBreadcrumb_util.getAppIndexViewName(c.panel.context);
       if (!c.showHome) {
-        result = result.filter((x) => x.viewName !== ibiz.hub.defaultAppIndexViewName);
+        result = result.filter((x) => x.viewName !== indexViewName);
       }
       return result;
     });
+    const onClick = (event, item) => {
+      if (item.type === "menuItem") {
+        event.stopPropagation();
+        c.openMenuItemView(item, event);
+      }
+    };
     return {
       ns,
       c,
-      items
+      items,
+      onClick
     };
   },
   render() {
@@ -67,7 +76,9 @@ const NavBreadcrumb = /* @__PURE__ */ vue.defineComponent({
         label += " - ".concat(item.dataInfo);
       }
       return vue.createVNode(vue.resolveComponent("el-breadcrumb-item"), {
-        "to": item.fullPath
+        "class": this.ns.is("link", item.type === "menuItem"),
+        "to": item.fullPath,
+        "onClick": (event) => this.onClick(event, item)
       }, _isSlot(label) ? label : {
         default: () => [label]
       });

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.controller.cjs

@@ -110,24 +110,33 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     if (this.navMode === "store") {
       const { currentRoute } = router;
+      const routePath = vue3Util.route2routePath(currentRoute.value);
       const fullPath = currentRoute.value.fullPath;
       const viewName = navBreadcrumb_util.getCurViewName(router);
+      const menuTag = navBreadcrumb_util.getMenuTag(routePath.pathNodes);
       const chacheItem = this.service.getItem({ fullPath, viewName });
+      const indexViewName = navBreadcrumb_util.getAppIndexViewName(this.panel.context);
       if (chacheItem) {
-        if (chacheItem.viewName === ibiz.hub.defaultAppIndexViewName) {
+        if (chacheItem.viewName === indexViewName) {
           this.service.setChache([
             { ...navBreadcrumb_util.getIndexBreadcrumb(this.panel.context), fullPath }
           ]);
           this.resetBreadcrumbs();
           return;
         }
+        this.service.update({ ...chacheItem, fullPath });
         const removeItems = this.service.removeAfter(fullPath);
         removeItems.forEach((item) => {
           var _a;
           (_a = this.navPos) == null ? void 0 : _a.removeCache(item.fullPath);
         });
         this.resetBreadcrumbs();
+      } else if (this.state.menuTag !== menuTag) {
+        this.setBreadcrumbByRouter(router);
+      } else {
+        this.service.add({ viewName, fullPath, type: "default" });
       }
+      this.state.menuTag = menuTag;
     }
   }
   /**
@@ -148,7 +157,7 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     if (this.navMode === "menu") {
       return;
     }
-    this.service.updateOrAdd({ fullPath, ...info });
+    this.service.update({ fullPath, type: "default", ...info });
     this.resetBreadcrumbs();
   }
   /**
@@ -164,19 +173,30 @@ class NavBreadcrumbController extends runtime.PanelItemController {
    * @param {Router} router
    * @memberof NavBreadcrumbController
    */
-  setBreadcrumbByRouter(router) {
+  async setBreadcrumbByRouter(router) {
     const { currentRoute } = router;
     const routePath = vue3Util.route2routePath(currentRoute.value);
-    const items = routePath.pathNodes.map(
-      (node, index) => {
-        const { appContext, pathNodes } = routePath;
+    const { appContext = {}, pathNodes } = routePath;
+    const menuTag = navBreadcrumb_util.getMenuTag(pathNodes);
+    let hasMenuItem = false;
+    const menuData = await navBreadcrumb_util.getMenuItemByTag(
+      menuTag,
+      this.appmenu,
+      this.panel.context
+    );
+    const calcPathNodes = routePath.pathNodes.map(
+      async (node, index) => {
+        if (this.appmenu && menuData && menuData.viewName === node.viewName) {
+          hasMenuItem = true;
+        }
         const fullPath = vue3Util.routePath2string({
           appContext,
           pathNodes: pathNodes.slice(0, index + 1)
         });
         const result = {
           viewName: node.viewName,
-          fullPath
+          fullPath,
+          type: "default"
         };
         const chacheItem = this.service.getItem({ viewName: node.viewName });
         if (chacheItem) {
@@ -185,13 +205,28 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           }
           Object.assign(result, chacheItem);
         }
-        const viewInfo = navBreadcrumb_util.getViewInfoByViewStack(node.viewName);
+        const viewInfo = navBreadcrumb_util.getViewInfoByViewStack(
+          node.viewName,
+          this.panel.context
+        );
         if (viewInfo) {
           Object.assign(result, ramda.reject(ramda.isNil, viewInfo));
         }
         return result;
       }
     );
+    const items = await Promise.all(calcPathNodes);
+    if (!hasMenuItem && menuData) {
+      this.state.menuTag = menuData.tag;
+      const item = {
+        viewName: menuData.viewName,
+        caption: menuData.menuItem.caption,
+        fullPath: "",
+        type: "menuItem",
+        menuTag: menuData.tag
+      };
+      items.splice(1, 0, item);
+    }
     this.service.setChache(items);
     this.resetBreadcrumbs();
   }
@@ -225,6 +260,7 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           return {
             caption: item.caption,
             fullPath: "",
+            type: "default",
             viewName: item.id
           };
         });
@@ -267,16 +303,14 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     if (this.appmenu) {
       this.appmenu.evt.on("onClick", async (data) => {
-        var _a;
         const { eventArg } = data;
-        const menuItem = this.appmenu.allAppMenuItems.find(
-          (x) => x.id === eventArg
+        const menuData = await navBreadcrumb_util.getMenuItemByTag(
+          eventArg,
+          this.appmenu,
+          this.panel.context
         );
-        if (menuItem) {
-          const app = ibiz.hub.getApp(this.panel.context.srfappid);
-          const appFunc = app.getAppFunc(menuItem.appFuncId);
-          const viewName = ((_a = appFunc.appViewId) == null ? void 0 : _a.split(".").pop()) || "";
-          const viewConfig = await ibiz.hub.config.view.get(viewName);
+        if (menuData) {
+          const { viewName, appFunc, viewConfig } = menuData;
           if (appFunc.openMode !== "INDEXVIEWTAB" || viewConfig && viewConfig.openMode && viewConfig.openMode !== "INDEXVIEWTAB") {
             return;
           }
@@ -287,7 +321,8 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           } else {
             items.push({
               viewName,
-              fullPath: ""
+              fullPath: "",
+              type: "default"
             });
           }
           items.unshift(navBreadcrumb_util.getIndexBreadcrumb(this.panel.context));
@@ -314,6 +349,17 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     Object.assign(this.rawItemParams, params);
   }
+  /**
+   * @description 打开菜单项视图
+   * @param {IData} item
+   * @param {MouseEvent} event
+   * @memberof NavBreadcrumbController
+   */
+  openMenuItemView(item, event) {
+    if (this.appmenu) {
+      this.appmenu.onClickMenuItem(item.menuTag, event);
+    }
+  }
 }
 
 exports.NavBreadcrumbController = NavBreadcrumbController;

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.css

@@ -1 +1 @@
-.ibiz-nav-breadcrumb{--ibiz-nav-breadcrumb-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-breadcrumb-link-color:var(--ibiz-color-link);--ibiz-nav-breadcrumb-disabled-color:var(--ibiz-color-text-0);padding:var(--ibiz-nav-breadcrumb-padding);--el-text-color-primary:var(--ibiz-nav-breadcrumb-link-color)}.ibiz-nav-breadcrumb--menu{color:var(--ibiz-nav-breadcrumb-disabled-color);--el-text-color-primary:var(--ibiz-nav-breadcrumb-disabled-color)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item{cursor:text}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item:last-child .el-breadcrumb__inner{color:var(--ibiz-color-primary)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__inner.is-link{font-weight:400;pointer-events:none}
+.ibiz-nav-breadcrumb{--ibiz-nav-breadcrumb-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-breadcrumb-link-color:var(--ibiz-color-link);--ibiz-nav-breadcrumb-disabled-color:var(--ibiz-color-text-0);padding:var(--ibiz-nav-breadcrumb-padding);--el-text-color-primary:var(--ibiz-nav-breadcrumb-link-color)}.ibiz-nav-breadcrumb--menu{color:var(--ibiz-nav-breadcrumb-disabled-color);--el-text-color-primary:var(--ibiz-nav-breadcrumb-disabled-color)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item{cursor:text}.ibiz-nav-breadcrumb--menu .el-breadcrumb__item:last-child .el-breadcrumb__inner{color:var(--ibiz-color-primary)}.ibiz-nav-breadcrumb--menu .el-breadcrumb__inner.is-link{font-weight:400;pointer-events:none}.ibiz-nav-breadcrumb .el-breadcrumb__item.is-link .el-breadcrumb__inner{font-weight:700;color:var(--el-text-color-primary);text-decoration:none;cursor:pointer;transition:var(--el-transition-color)}

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.service.cjs

@@ -72,7 +72,7 @@ class NavBreadcrumbService {
    * @param {BreadcrumbMsg} item
    * @memberof NavBreadcrumbService
    */
-  updateOrAdd(item) {
+  update(item) {
     if (!this.chache.length && this.navMode === "store") {
       const result = localStorage.getItem("breadcrumb");
       if (result) {
@@ -82,9 +82,7 @@ class NavBreadcrumbService {
     const index = this.chache.findIndex(
       (x) => x.fullPath && x.fullPath === item.fullPath || x.viewName.toLowerCase() === item.viewName.toLowerCase()
     );
-    if (index === -1) {
-      this.add(item);
-    } else {
+    if (index !== -1) {
       Object.assign(this.chache[index], ramda.reject(ramda.isNil, item));
       this.chache = this.chache.filter((x) => !x.isEmbed && !x.isModal);
       if (this.navMode === "store") {
@@ -100,7 +98,8 @@ class NavBreadcrumbService {
    */
   getItem(data) {
     const { viewName = "", fullPath = "" } = data;
-    if (viewName === "index") {
+    const indexViewName = navBreadcrumb_util.getAppIndexViewName(this.context);
+    if (viewName === indexViewName) {
       return navBreadcrumb_util.getIndexBreadcrumb(this.context);
     }
     const item = this.chache.find(

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.state.cjs

@@ -19,6 +19,12 @@ class NavBreadcrumbState extends runtime.PanelItemState {
      * @memberof NavBreadcrumbState
      */
     __publicField(this, "breadcrumbItems", []);
+    /**
+     * @description 菜单标识
+     * @type {string}
+     * @memberof NavBreadcrumbState
+     */
+    __publicField(this, "menuTag", "");
   }
 }
 

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.util.cjs

@@ -4,12 +4,23 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 
 "use strict";
+function getAppIndexViewName(context) {
+  const targetAppModel = ibiz.hub.getAppSourceModel(context.srfappid);
+  if (targetAppModel.getDefaultPSAppIndexView) {
+    const view = targetAppModel.getDefaultPSAppIndexView;
+    const name = view.path.split("/").pop().replace(".json", "");
+    return name;
+  }
+  return ibiz.hub.defaultAppIndexViewName;
+}
 function getIndexBreadcrumb(context) {
   const app = ibiz.hub.getApp(context.srfappid);
   const caption = app.model.caption;
+  const indexViewName = getAppIndexViewName(context);
   return {
-    viewName: ibiz.hub.defaultAppIndexViewName,
+    viewName: indexViewName,
     fullPath: "/",
+    type: "default",
     caption
   };
 }
@@ -50,7 +61,7 @@ function getCurViewName(router) {
   const routePath = vue3Util.route2routePath(currentRoute.value);
   return ((_a = routePath.pathNodes.pop()) == null ? void 0 : _a.viewName) || "";
 }
-function getViewInfoByViewStack(viewName) {
+function getViewInfoByViewStack(viewName, context) {
   if (viewName === runtime.RouteConst.ROUTE_MODAL_TAG) {
     return {
       viewName,
@@ -58,22 +69,58 @@ function getViewInfoByViewStack(viewName) {
       isModal: true
     };
   }
-  const view = ibiz.util.viewStack.getViewByCodeName(viewName);
+  const view = ibiz.appUtil.viewCacheCenter.get(viewName);
+  const indexViewName = getAppIndexViewName(context);
   if (view) {
     let isEmbed = false;
-    if (view.parentView && view.parentView.model.codeName !== ibiz.hub.defaultAppIndexViewName) {
+    if (view.parentView && view.parentView.model.codeName !== indexViewName && view.parentView.model.viewType !== "APPINDEXVIEW") {
       isEmbed = true;
     }
-    return {
+    const data = view.state.srfactiveviewdata;
+    const result = {
       viewName: view.model.codeName,
       caption: view.model.caption,
       isEmbed
     };
+    if (data && data.srfkey) {
+      Object.assign(result, { dataInfo: data.srfmajortext || "" });
+    }
+    return result;
+  }
+}
+function getMenuTag(pathNodes) {
+  var _a;
+  if (pathNodes.length > 1) {
+    return ((_a = pathNodes[1].params) == null ? void 0 : _a.srfmenuitem) || "";
+  }
+  return "";
+}
+async function getMenuItemByTag(tag, appMenu, context) {
+  var _a;
+  if (!tag) {
+    return;
+  }
+  const menuItem = appMenu.allAppMenuItems.find((x) => x.id === tag);
+  if (menuItem) {
+    const app = ibiz.hub.getApp(context.srfappid);
+    const appFunc = app.getAppFunc(menuItem.appFuncId);
+    const viewName = ((_a = appFunc.appViewId) == null ? void 0 : _a.split(".").pop()) || "";
+    const viewConfig = await ibiz.hub.config.view.get(viewName);
+    return {
+      tag,
+      viewName,
+      viewConfig,
+      appFunc,
+      menuItem
+    };
   }
 }
 
 exports.getAppFuncByViewName = getAppFuncByViewName;
+exports.getAppIndexViewName = getAppIndexViewName;
 exports.getCurViewName = getCurViewName;
 exports.getIndexBreadcrumb = getIndexBreadcrumb;
+exports.getMenuItemByTag = getMenuItemByTag;
 exports.getMenuItemsByAppFunc = getMenuItemsByAppFunc;
+exports.getMenuTag = getMenuTag;
 exports.getViewInfoByViewStack = getViewInfoByViewStack;

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

@@ -67,7 +67,7 @@ class NavPosIndexController extends runtime.PanelItemController {
   }
   /**
    * @exposedoc
-   * @description 当前视图的路由层级，非路由模式不存在。
+   * @description 当前视图的路由层级，非路由模式不存在
    * @readonly
    * @type {(number | undefined)}
    * @memberof NavPosIndexController
@@ -254,7 +254,7 @@ class NavPosIndexController extends runtime.PanelItemController {
    * @memberof NavPosIndexController
    */
   clearCache() {
-    this.state.cacheKeys = [this.currentKey];
+    this.state.cacheKeys = [];
     this.viewModals = {};
   }
   /**

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

@@ -77,6 +77,8 @@ const NavTabs = /* @__PURE__ */ vue.defineComponent({
     const {
       state
     } = this.controller;
+    if (ibiz.config.view.disableHomeTabs)
+      return;
     return vue.createVNode("div", {
       "class": [this.ns.b(), ...this.controller.containerClass]
     }, [vue.createVNode("div", {

package/lib/panel-component/panel-app-login-view/panel-app-login-view.cjs

@@ -82,9 +82,7 @@ const PanelAppLoginView = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode("div", {
       "class": this.classArr,
       "style": this.cssVars,
-      "onClick": () => {
-        this.controller.onClick();
-      }
+      "onClick": (event) => this.controller.onClick(event)
     }, [this.controller.model.cssStyle ? vue.createVNode("style", {
       "type": "text/css"
     }, [this.controller.model.cssStyle]) : null, content]);

package/lib/panel-component/panel-app-title/panel-app-title.cjs

@@ -39,7 +39,7 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
       }
       return "LEFT";
     });
-    const handleClick = async () => {
+    const handleClick = async (event) => {
       if (c.panel.view.model.viewType === "APPLOGINVIEW")
         return;
       if (ctx == null ? void 0 : ctx.view) {
@@ -53,7 +53,7 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
           window.location.reload();
         });
       }
-      props.controller.onClick();
+      props.controller.onClick(event);
     };
     const showImgOnly = vue.computed(() => {
       if (menuAlign.value === "LEFT") {
@@ -62,6 +62,12 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
       return false;
     });
     const isCollapse = vue.computed(() => {
+      const {
+        strictly
+      } = c.rawItemParams;
+      if (strictly && strictly === "true") {
+        return false;
+      }
       return c.panel.view.state.isCollapse;
     });
     const showIcon = vue.computed(() => {

package/lib/panel-component/panel-app-title/panel-app-title.controller.cjs

@@ -14,7 +14,7 @@ class PanelAppTitleController extends runtime.PanelItemController {
   constructor() {
     super(...arguments);
     /**
-     * @description 分隔符,将标题以`|`符分割，分隔符前面为caption，后面为caption2
+     * @description 分隔符，将标题以`\|`符分割，分隔符前面为caption，后面为caption2
      * @exposedoc
      * @return {*}
      * @memberof PanelAppTitleController
@@ -74,8 +74,11 @@ class PanelAppTitleController extends runtime.PanelItemController {
     if (this.state.icon.endsWith(".svg") || this.state.icon2.endsWith(".svg")) {
       this.state.isSvg = true;
     }
-    if (ibiz.env.AppTitle)
-      this.state.caption = ibiz.env.AppTitle;
+    const defaultApp = ibiz.hub.getApp();
+    if (defaultApp.model.appId === indexViewModel.appId) {
+      if (ibiz.env.AppTitle)
+        this.state.caption = ibiz.env.AppTitle;
+    }
   }
   /**
    * 处理自定义补充参数 [{key:'name',value:'data'}] => {name:'data'}

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

@@ -70,7 +70,7 @@ const PanelButton = /* @__PURE__ */ vue.defineComponent({
       try {
         state.loading = true;
         await props.controller.onActionClick(event);
-        props.controller.onClick();
+        props.controller.onClick(event);
       } finally {
         state.loading = false;
       }
@@ -99,6 +99,7 @@ const PanelButton = /* @__PURE__ */ vue.defineComponent({
       }, [vue.createVNode(vue.resolveComponent("el-button"), {
         "type": this.buttonType,
         "text": this.isText,
+        "data-id": this.modelData.id,
         "title": core.showTitle(this.tooltip),
         "disabled": this.state.disabled,
         "loading": this.state.loading,

package/lib/panel-component/panel-button/panel-button.controller.cjs

@@ -95,9 +95,8 @@ class PanelButtonController extends runtime.PanelItemController {
    */
   async onActionClick(event) {
     const { uiactionId, actionType } = this.model;
-    if (actionType === "NONE") {
+    if (actionType === "NONE")
       return;
-    }
     event.stopPropagation();
     event.preventDefault();
     await runtime.UIActionUtil.execAndResolved(
@@ -111,7 +110,8 @@ class PanelButtonController extends runtime.PanelItemController {
         data: [this.data],
         view: this.panel.view,
         event,
-        noWaitRoute: true
+        noWaitRoute: true,
+        ctrl: this.panel
       },
       this.model.appId
     );

package/lib/panel-component/panel-button/panel-button.css

@@ -1 +1 @@
-.ibiz-panel-button{--ibiz-panel-button-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-panel-button-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-panel-button-icon-max-height:var(--ibiz-width-icon-medium);width:100%;padding:var(--ibiz-spacing-tight);overflow:hidden}.ibiz-panel-button .el-button{width:100%}.ibiz-panel-button .el-button .ibiz-panel-button-content{display:flex;align-items:center;justify-content:flex-start}.ibiz-panel-button .el-button .ibiz-panel-button-content i,.ibiz-panel-button .el-button .ibiz-panel-button-content img{display:inline-block;max-width:var(--ibiz-panel-button-icon-max-width);max-height:var(--ibiz-panel-button-icon-max-height)}.ibiz-panel-button .el-button .ibiz-panel-button-content .ibiz-icon+.ibiz-panel-button-content--caption{margin-left:var(--ibiz-panel-button-icon-margin)}.ibiz-panel-button.is-loading .el-button .ibiz-icon{display:none}
+.ibiz-panel-button{--ibiz-panel-button-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-panel-button-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-panel-button-icon-max-height:var(--ibiz-width-icon-medium);width:100%;padding:var(--ibiz-spacing-tight);overflow:hidden}.ibiz-panel-button .el-button{width:100%}.ibiz-panel-button .el-button>span{pointer-events:none}.ibiz-panel-button .el-button .ibiz-panel-button-content{display:flex;align-items:center;justify-content:flex-start}.ibiz-panel-button .el-button .ibiz-panel-button-content i,.ibiz-panel-button .el-button .ibiz-panel-button-content img{display:inline-block;max-width:var(--ibiz-panel-button-icon-max-width);max-height:var(--ibiz-panel-button-icon-max-height)}.ibiz-panel-button .el-button .ibiz-panel-button-content .ibiz-icon+.ibiz-panel-button-content--caption{margin-left:var(--ibiz-panel-button-icon-margin)}.ibiz-panel-button.is-loading .el-button .ibiz-icon{display:none}

package/lib/panel-component/panel-button-list/panel-button-list.cjs

@@ -42,7 +42,7 @@ const PanelButtonList = /* @__PURE__ */ vue.defineComponent({
     const {
       state
     } = this.controller;
-    if (state.visible) {
+    if (state.visible)
       return vue.createVNode(vue.resolveComponent("iBizButtonList"), {
         "class": [this.ns.b(), ...this.controller.containerClass],
         "model": this.modelData,
@@ -50,7 +50,6 @@ const PanelButtonList = /* @__PURE__ */ vue.defineComponent({
         "buttonsState": state.buttonsState,
         "onClick": this.handleClick
       }, null);
-    }
     return null;
   }
 });