@ibiz-template/vue3-components 0.7.41-alpha.9 → 0.7.41-alpha.90

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

@@ -1,8 +1,8 @@
 'use strict';
 
-var runtime = require('@ibiz-template/runtime');
-var ramda = require('ramda');
 var vue = require('vue');
+var ramda = require('ramda');
+var runtime = require('@ibiz-template/runtime');
 var navTabs_state = require('./nav-tabs.state.cjs');
 
 "use strict";
@@ -91,44 +91,54 @@ class NavTabsController extends runtime.PanelItemController {
     }
   }
   /**
-   * @description 删除分页
-   * @exposedoc
-   * @param {string} key
-   */
-  onTabRemove(key) {
-    var _a;
-    (_a = this.navPos) == null ? void 0 : _a.closeViewByKeys([key]);
-  }
-  /**
-   * 删除其他所有的标签页
-   * @author lxm
-   * @date 2023-05-09 02:19:55
+   * @description 签页删除标
+   * @param {string} actionName 行为名称
+   * @param {string} key 标签页标识
+   * @memberof NavTabsController
    */
-  removeOther() {
+  onTabRemove(actionName, key) {
     var _a;
-    const currentKey = this.state.currentKey;
-    const removeKeys = [];
-    this.state.tabItems.forEach((item) => {
-      if (item.key !== currentKey) {
-        removeKeys.push(item.key);
-      }
-    });
-    if (removeKeys.length > 0) {
-      (_a = this.navPos) == null ? void 0 : _a.closeViewByKeys(removeKeys);
+    let removeKeys = [];
+    const { tabItems, activeTab } = this.state;
+    const index = tabItems.findIndex((tab) => tab.key === key);
+    const activeIndex = tabItems.findIndex((tab) => tab.key === activeTab);
+    switch (actionName) {
+      case "current":
+        removeKeys.push(key);
+        break;
+      case "left":
+        if (activeIndex < index)
+          this.onTabClick(key);
+        removeKeys = tabItems.slice(0, index).map((tab) => tab.key);
+        break;
+      case "right":
+        if (activeIndex > index)
+          this.onTabClick(key);
+        removeKeys = tabItems.slice(index + 1).map((tab) => tab.key);
+        break;
+      case "other":
+        removeKeys = tabItems.filter((tab) => tab.key !== key).map((tab) => tab.key);
+        break;
+      case "all":
+        removeKeys = tabItems.map((tab) => tab.key);
+        break;
+      default:
+        break;
     }
+    if (removeKeys.length)
+      (_a = this.navPos) == null ? void 0 : _a.closeViewByKeys(removeKeys);
   }
   /**
-   * @description 删除所有的标签页
-   * @exposedoc
-   * @author lxm
-   * @date 2023-05-09 02:50:01
+   * @description 标签页排序
+   * @param {number} oldIndex
+   * @param {number} newIndex
+   * @memberof NavTabsController
    */
-  removeAll() {
-    var _a;
-    const removeKeys = this.state.tabItems.map((item) => item.key);
-    if (removeKeys.length > 0) {
-      (_a = this.navPos) == null ? void 0 : _a.closeViewByKeys(removeKeys);
-    }
+  onTabOrder(oldIndex, newIndex) {
+    const newTabs = [...this.state.tabItems];
+    const [movedItem] = newTabs.splice(oldIndex, 1);
+    newTabs.splice(newIndex, 0, movedItem);
+    this.state.tabItems = newTabs;
   }
   /**
    * @description 刷新项（解决主信息更新之后界面ui未刷新）

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

@@ -1 +1 @@
-.ibiz-nav-tabs{--ibiz-nav-tabs-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-left-width:calc(100% - 60px);--ibiz-nav-tabs-right-width:60px;--ibiz-nav-tabs-right-height:30px;--ibiz-nav-tabs-item-height:40px;--ibiz-nav-tabs-item-padding:0 var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-item-margin:0 var(--ibiz-spacing-base) 0 0;--ibiz-nav-tabs-item-font-size:var(--ibiz-font-size-regular);--ibiz-nav-tabs-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-nav-tabs-item-border:1px solid var(--ibiz-color-border);--ibiz-nav-tabs-item-border-radius:var(--ibiz-border-radius-medium);--ibiz-nav-tabs-item-bg-color:transparent;--ibiz-nav-tabs-item-color:var(--ibiz-color-text-0);--ibiz-nav-tabs-item-hover-color:var(--ibiz-color-primary-hover);--ibiz-nav-tabs-item-active-color:var(--ibiz-color-primary);display:flex;align-items:center;justify-content:flex-start;position:relative;padding:var(--ibiz-nav-tabs-padding)}.ibiz-nav-tabs__left{display:flex;align-items:center;width:var(--ibiz-nav-tabs-left-width)}.ibiz-nav-tabs__left--caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-nav-tabs__left--content{display:flex;align-items:center;max-width:300px}.ibiz-nav-tabs__left--content>img.ibiz-icon{max-width:var(--ibiz-width-icon-medium)}.ibiz-nav-tabs__left--icon{display:flex;align-items:center}.ibiz-nav-tabs__left--icon+.ibiz-nav-tabs__left--caption{flex:1;margin-left:var(--ibiz-spacing-extra-tight)}.ibiz-nav-tabs__left .el-tabs{width:100%;--el-tabs-header-height:getCssVar("nav-tabs-item", "height")}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav{border:none}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item{display:flex;align-items:center;height:var(--ibiz-nav-tabs-item-height);padding:var(--ibiz-nav-tabs-item-padding);margin:var(--ibiz-nav-tabs-item-margin);overflow:hidden;font-size:var(--ibiz-nav-tabs-item-font-size);font-weight:var(--ibiz-nav-tabs-item-font-weight);color:var(--ibiz-nav-tabs-item-color);vertical-align:middle;background-color:var(--ibiz-nav-tabs-item-bg-color);border:var(--ibiz-nav-tabs-item-border);border-radius:var(--ibiz-nav-tabs-item-border-radius);box-shadow:0 1px 2px 0 var(--ibiz-color-border);opacity:1}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-nav-tabs-item-hover-color);box-shadow:0 1px 4px 0 rgba(0,0,0,.25)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover .is-icon-close{color:var(--ibiz-nav-tabs-item-hover-color)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item:hover svg{fill:var(--ibiz-nav-tabs-item-hover-color)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-color-white);background-color:var(--ibiz-nav-tabs-item-active-color);box-shadow:none}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active .is-icon-close{color:var(--ibiz-color-white)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-active svg{fill:var(--ibiz-color-white)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-closable{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item.is-closable.hover{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs__left .el-tabs .el-tabs__nav .el-tabs__item .is-icon-close{position:relative;top:1px}.ibiz-nav-tabs__left .el-tabs .el-tabs__header{margin-bottom:0;border-bottom:none}.ibiz-nav-tabs__right{width:var(--ibiz-nav-tabs-right-width)}.ibiz-nav-tabs__right .el-dropdown button{height:var(--ibiz-nav-tabs-right-height)}
+.ibiz-nav-tabs{--ibiz-nav-tabs-padding:var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-left-width:calc(100% - 60px);--ibiz-nav-tabs-right-width:60px;--ibiz-nav-tabs-right-height:30px;--ibiz-nav-tabs-item-height:40px;--ibiz-nav-tabs-item-padding:0 var(--ibiz-spacing-base-loose);--ibiz-nav-tabs-item-margin:0 var(--ibiz-spacing-base) 0 0;--ibiz-nav-tabs-item-font-size:var(--ibiz-font-size-regular);--ibiz-nav-tabs-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-nav-tabs-item-border:1px solid var(--ibiz-color-border);--ibiz-nav-tabs-item-border-radius:var(--ibiz-border-radius-medium);--ibiz-nav-tabs-item-bg-color:transparent;--ibiz-nav-tabs-item-color:var(--ibiz-color-text-0);--ibiz-nav-tabs-item-hover-color:var(--ibiz-color-primary-hover);--ibiz-nav-tabs-item-active-color:var(--ibiz-color-primary);display:flex;align-items:center;justify-content:flex-start;position:relative;padding:var(--ibiz-nav-tabs-padding)}.ibiz-nav-tabs__item{display:flex;gap:var(--ibiz-spacing-extra-tight);align-items:center;max-width:300px}.ibiz-nav-tabs__item--icon{display:flex;align-items:center;max-width:var(--ibiz-width-icon-medium)}.ibiz-nav-tabs__item--caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-nav-tabs .el-tabs{width:100%;--el-tabs-header-height:getCssVar("nav-tabs-item", "height")}.ibiz-nav-tabs .el-tabs .el-tabs__nav{border:none}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item{display:flex;align-items:center;height:var(--ibiz-nav-tabs-item-height);padding:var(--ibiz-nav-tabs-item-padding);margin:var(--ibiz-nav-tabs-item-margin);overflow:hidden;font-size:var(--ibiz-nav-tabs-item-font-size);font-weight:var(--ibiz-nav-tabs-item-font-weight);color:var(--ibiz-nav-tabs-item-color);vertical-align:middle;background-color:var(--ibiz-nav-tabs-item-bg-color);border:var(--ibiz-nav-tabs-item-border);border-radius:var(--ibiz-nav-tabs-item-border-radius);box-shadow:0 1px 2px 0 var(--ibiz-color-border);opacity:1}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item:hover{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-nav-tabs-item-hover-color);box-shadow:0 1px 4px 0 rgba(0,0,0,.25)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item:hover .is-icon-close{color:var(--ibiz-nav-tabs-item-hover-color)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item:hover svg{fill:var(--ibiz-nav-tabs-item-hover-color)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item.is-active{padding:var(--ibiz-nav-tabs-item-padding);color:var(--ibiz-color-white);background-color:var(--ibiz-nav-tabs-item-active-color);box-shadow:none}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item.is-active .is-icon-close{color:var(--ibiz-color-white)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item.is-active svg{fill:var(--ibiz-color-white)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item.is-closable{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item.is-closable.hover{padding:var(--ibiz-nav-tabs-item-padding)}.ibiz-nav-tabs .el-tabs .el-tabs__nav .el-tabs__item .is-icon-close{position:relative;top:1px}.ibiz-nav-tabs .el-tabs .el-tabs__header{margin-bottom:0;border-bottom:none}.ibiz-nav-tabs__context-menu--item{cursor:pointer}

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(() => {
@@ -83,7 +89,7 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
   render() {
     const {
       icon,
-      isSvg,
+      icon2,
       caption,
       caption2,
       subCaption,
@@ -99,23 +105,16 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
     } else {
       if (this.menuAlign === "LEFT") {
         if (this.isCollapse) {
-          if (icon) {
-            let tempIcon = null;
-            if (isSvg) {
-              tempIcon = vue.createVNode("ion-icon", {
-                "class": this.ns.e("logo"),
-                "icon": icon
-              }, null);
-            } else {
-              tempIcon = vue.createVNode("span", {
-                "class": this.ns.e("logo")
-              }, [vue.createVNode("img", {
-                "src": icon
-              }, null)]);
-            }
+          const collapseIcon = icon2 || icon;
+          if (collapseIcon) {
             iconVNode = vue.createVNode("div", {
               "class": this.ns.e("collpase-icon")
-            }, [tempIcon]);
+            }, [vue.createVNode(vue.resolveComponent("iBizIcon"), {
+              "class": this.ns.e("logo"),
+              "icon": {
+                rawContent: collapseIcon
+              }
+            }, null)]);
           } else {
             iconVNode = vue.createVNode("div", {
               "class": this.ns.e("collapse-title")
@@ -126,19 +125,6 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
             }, [subCaption2])]);
           }
         } else if (this.showIcon && icon) {
-          let tempIcon = null;
-          if (isSvg) {
-            tempIcon = vue.createVNode("ion-icon", {
-              "class": this.ns.em("logo", "expand"),
-              "icon": icon
-            }, null);
-          } else {
-            tempIcon = vue.createVNode("span", {
-              "class": this.ns.em("logo", "expand")
-            }, [vue.createVNode("img", {
-              "src": icon
-            }, null)]);
-          }
           let tempContent = vue.createVNode("g", {
             "id": "app-caption-panel",
             "stroke": "none",
@@ -179,7 +165,12 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
           }
           iconVNode = vue.createVNode("span", {
             "class": this.ns.e("logo")
-          }, [tempIcon, vue.createVNode("svg", {
+          }, [vue.createVNode(vue.resolveComponent("iBizIcon"), {
+            "class": this.ns.em("logo", "expand"),
+            "icon": {
+              rawContent: icon
+            }
+          }, null), vue.createVNode("svg", {
             "width": "166px",
             "height": "80px",
             "viewBox": "0 0 166 90",
@@ -218,18 +209,12 @@ const PanelAppTitle = /* @__PURE__ */ vue.defineComponent({
         }
       } else if (this.menuAlign === "TOP") {
         if (icon) {
-          if (isSvg) {
-            iconVNode = vue.createVNode("ion-icon", {
-              "class": this.ns.e("logo"),
-              "icon": icon
-            }, null);
-          } else {
-            iconVNode = vue.createVNode("span", {
-              "class": this.ns.e("logo")
-            }, [vue.createVNode("img", {
-              "src": icon
-            }, null)]);
-          }
+          iconVNode = vue.createVNode(vue.resolveComponent("iBizIcon"), {
+            "class": this.ns.e("logo"),
+            "icon": {
+              rawContent: icon
+            }
+          }, null);
         }
       }
       if (this.menuAlign === "LEFT") {

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
@@ -58,7 +58,9 @@ class PanelAppTitleController extends runtime.PanelItemController {
     } else if (indexViewModel.appIconPath) {
       this.state.icon = indexViewModel.appIconPath;
     }
-    if (indexViewModel.appIconPath2) {
+    if (indexViewModel.sysImage && indexViewModel.sysImage.rawContent) {
+      this.state.icon2 = indexViewModel.sysImage.rawContent;
+    } else if (indexViewModel.appIconPath2) {
       this.state.icon2 = indexViewModel.appIconPath2;
     }
     if (indexViewModel.caption) {
@@ -74,8 +76,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

@@ -37,6 +37,12 @@ class PanelButtonController extends runtime.PanelItemController {
    */
   async onInit() {
     await super.onInit();
+    const { tooltip, tooltipLanguageRes, capLanguageRes } = this.model;
+    if (tooltipLanguageRes == null ? void 0 : tooltipLanguageRes.lanResTag) {
+      this.model.tooltip = ibiz.i18n.t(tooltipLanguageRes.lanResTag, tooltip);
+    } else if (capLanguageRes == null ? void 0 : capLanguageRes.lanResTag) {
+      this.model.tooltip = ibiz.i18n.t(capLanguageRes.lanResTag, tooltip);
+    }
     this.updateButtonState();
   }
   /**
@@ -95,9 +101,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 +116,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;
   }
 });

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

@@ -37,8 +37,26 @@ class PanelButtonListController extends runtime.PanelItemController {
    */
   async onInit() {
     await super.onInit();
+    await this.initUIActions();
     await this.initButtonsState();
   }
+  /**
+   * 初始化界面行为组
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof PanelButtonListController
+   */
+  async initUIActions() {
+    const { buttonListType, uiactionGroup } = this.model;
+    if (buttonListType === "UIACTIONGROUP" && uiactionGroup) {
+      await runtime.calcUIActionGroup(
+        uiactionGroup,
+        this.panel.context,
+        this.panel.params
+      );
+    }
+  }
   /**
    * 初始化按钮组状态
    *
@@ -47,20 +65,22 @@ class PanelButtonListController extends runtime.PanelItemController {
    * @memberof PanelButtonListController
    */
   async initButtonsState() {
-    var _a;
     const { buttonListType, uiactionGroup, panelButtons } = this.model;
     if (buttonListType === "UIACTIONGROUP") {
-      (_a = uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.forEach((detail) => {
-        if (detail.uiactionId) {
-          const buttonState = new runtime.UIActionButtonState(
-            detail.id,
-            detail.appId,
-            detail.uiactionId,
-            detail
-          );
-          this.state.buttonsState.addState(detail.id, buttonState);
-        }
-      });
+      if (uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) {
+        const actions = runtime.getAllUIActionItems(uiactionGroup.uiactionGroupDetails);
+        actions.forEach((detail) => {
+          if (detail.uiactionId) {
+            const buttonState = new runtime.UIActionButtonState(
+              detail.id,
+              detail.appId,
+              detail.uiactionId,
+              detail
+            );
+            this.state.buttonsState.addState(detail.id, buttonState);
+          }
+        });
+      }
     } else {
       panelButtons == null ? void 0 : panelButtons.forEach((button) => {
         if (button.uiactionId) {
@@ -112,12 +132,11 @@ class PanelButtonListController extends runtime.PanelItemController {
    * @memberof PanelButtonListController
    */
   getModelById(id) {
-    var _a;
     const { buttonListType, uiactionGroup, panelButtons } = this.model;
-    if (buttonListType === "UIACTIONGROUP")
-      return (_a = uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.find(
-        (detail) => detail.id === id
-      );
+    if (buttonListType === "UIACTIONGROUP") {
+      const actions = runtime.getAllUIActionItems(uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails);
+      return actions.find((detail) => detail.id === id);
+    }
     return panelButtons == null ? void 0 : panelButtons.find((button) => button.id === id);
   }
   /**

package/lib/panel-component/panel-container-group/index.cjs

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
+var panelContainerGroup_state = require('./panel-container-group.state.cjs');
+var panelContainerGroup_provider = require('./panel-container-group.provider.cjs');
+var panelContainerGroup_controller = require('./panel-container-group.controller.cjs');
+var panelContainerGroup = require('./panel-container-group.cjs');
+
+"use strict";
+const IBizPanelContainerGroup = vue3Util.withInstall(
+  panelContainerGroup.PanelContainerGroup,
+  function(v) {
+    v.component(panelContainerGroup.PanelContainerGroup.name, panelContainerGroup.PanelContainerGroup);
+    runtime.registerPanelItemProvider(
+      "CONTAINER_CONTAINER_GROUP",
+      () => new panelContainerGroup_provider.PanelContainerGroupProvider()
+    );
+  }
+);
+
+exports.PanelContainerGroupState = panelContainerGroup_state.PanelContainerGroupState;
+exports.PanelContainerGroupController = panelContainerGroup_controller.PanelContainerGroupController;
+exports.IBizPanelContainerGroup = IBizPanelContainerGroup;
+exports.default = IBizPanelContainerGroup;

package/lib/panel-component/panel-container-group/panel-container-group.cjs

@@ -0,0 +1,143 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+var panelContainerGroup_controller = require('./panel-container-group.controller.cjs');
+require('./panel-container-group.css');
+
+"use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
+const PanelContainerGroup = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizPanelContainerGroup",
+  props: {
+    /**
+     * @description 分组容器模型
+     */
+    modelData: {
+      type: Object,
+      required: true
+    },
+    /**
+     * @description 分组容器控制器
+     */
+    controller: {
+      type: panelContainerGroup_controller.PanelContainerGroupController,
+      required: true
+    }
+  },
+  setup(props) {
+    const ns = vue3Util.useNamespace("panel-container-group");
+    const isCollapse = vue.ref(!props.controller.defaultExpansion);
+    const {
+      zIndex
+    } = vue3Util.useUIStore();
+    const changeCollapse = () => {
+      if (!props.controller.disableClose) {
+        isCollapse.value = !isCollapse.value;
+      }
+    };
+    const onActionClick = async (detail, event) => {
+      const tempParams = {
+        srfgroupid: props.modelData.codeName
+      };
+      await props.controller.onActionClick(detail, event, tempParams);
+    };
+    const captionText = vue.computed(() => {
+      const {
+        captionItemName,
+        caption,
+        capLanguageRes
+      } = props.modelData;
+      if (captionItemName) {
+        return props.controller.data[captionItemName];
+      }
+      let text = caption;
+      if (capLanguageRes) {
+        text = ibiz.i18n.t(capLanguageRes.lanResTag, caption);
+      }
+      return text;
+    });
+    return {
+      ns,
+      captionText,
+      isCollapse,
+      zIndex,
+      changeCollapse,
+      onActionClick
+    };
+  },
+  render() {
+    var _a, _b;
+    let _slot;
+    const {
+      state
+    } = this.controller;
+    const classArr = [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass, this.ns.is("hidden", !this.controller.state.visible), this.ns.is("mob", ibiz.env.isMob)];
+    if (this.modelData.showCaption === true) {
+      classArr.push(this.ns.m("show-header"));
+      classArr.push(this.ns.b("collapse"));
+      classArr.push(this.ns.is("collapse", this.isCollapse));
+      if (this.controller.disableClose) {
+        classArr.push(this.ns.bm("collapse", "disable-close"));
+      }
+    }
+    const defaultSlots = ((_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)) || [];
+    const content = vue.createVNode(vue.resolveComponent("iBizRow"), {
+      "slot": "content",
+      "layout": this.modelData.layout
+    }, _isSlot(_slot = defaultSlots.map((slot) => {
+      const props = slot.props;
+      if (!props || !props.controller) {
+        return slot;
+      }
+      return vue.createVNode(vue.resolveComponent("iBizCol"), {
+        "layoutPos": props.modelData.layoutPos,
+        "state": props.controller.state
+      }, _isSlot(slot) ? slot : {
+        default: () => [slot]
+      });
+    })) ? _slot : {
+      default: () => [_slot]
+    });
+    let header = null;
+    if (this.modelData.showCaption) {
+      header = vue.createVNode("div", {
+        "class": [this.ns.b("header"), this.ns.is("is-mob", ibiz.env.isMob)],
+        "onClick": this.changeCollapse
+      }, [vue.createVNode("div", {
+        "class": [this.ns.be("header", "left")]
+      }, [vue.createVNode("div", {
+        "class": [this.ns.e("caption"), ...this.controller.labelClass]
+      }, [this.modelData.sysImage && vue.createVNode(vue3Util.IBizIcon, {
+        "class": this.ns.em("caption", "icon"),
+        "icon": this.modelData.sysImage
+      }, null), this.captionText, this.modelData.counterId && vue.createVNode("span", {
+        "class": this.ns.e("counter")
+      }, [vue.createTextVNode("("), this.controller.state.counterData[this.modelData.counterId], vue.createTextVNode(")")])])]), vue.createVNode("div", {
+        "class": [this.ns.be("header", "right")]
+      }, [this.modelData.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
+        "zIndex": this.zIndex.zIndex,
+        "class": this.ns.e("toolbar"),
+        "action-details": this.modelData.uiactionGroup.uiactionGroupDetails,
+        "actions-state": state.actionGroupState,
+        "onActionClick": this.onActionClick,
+        "caption": this.modelData.uiactionGroup.name,
+        "mode": this.modelData.actionGroupExtractMode === "ITEMS" ? "dropdown" : "buttons"
+      }, null), this.modelData.titleBarCloseMode !== void 0 && this.modelData.titleBarCloseMode !== 0 && (this.isCollapse ? vue.createVNode("ion-icon", {
+        "name": "caret-forward-sharp"
+      }, null) : vue.createVNode("ion-icon", {
+        "name": "caret-down-sharp"
+      }, null))])]);
+    }
+    return vue.withDirectives(vue.createVNode("div", {
+      "class": classArr,
+      "element-loading-text": this.controller.state.loadingText
+    }, [header, vue.createVNode("div", {
+      "class": [this.ns.b("content")]
+    }, [content])]), [[vue.resolveDirective("loading"), this.controller.state.loading]]);
+  }
+});
+
+exports.PanelContainerGroup = PanelContainerGroup;