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

package/lib/control/calendar/components/calendar-week/calendar-week.css

@@ -1 +1 @@
-.ibiz-calendar-week{display:flex;flex:1;flex-direction:column;width:100%;height:100%;overflow:hidden}.ibiz-calendar-week__header{position:relative;z-index:100;display:flex;flex-direction:column;width:calc(100% - 7px);height:150px;min-height:150px}.ibiz-calendar-week__header--date-cell-first{width:90px;max-width:90px;height:100%;border-right:1px solid var(--ibiz-color-border);border-bottom:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--event-cell-first{display:flex;align-items:center;justify-content:center;width:90px;max-width:90px;height:100%;padding-left:40px;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--dates{display:flex;justify-content:space-between;width:100%;height:96px}.ibiz-calendar-week__header--date-cell{display:flex;flex:1;flex-direction:column;align-items:center;border-right:1px solid var(--ibiz-color-border);border-bottom:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--date-week{width:100%;height:26px;margin-top:6px;text-align:center}.ibiz-calendar-week__header--date-day{display:flex;align-items:center;justify-content:center;width:50px;height:50px;margin-top:6px;font-weight:600;border:none;border-radius:50%}.ibiz-calendar-week__header--date-day.is-today{color:#fff;background:var(--ibiz-color-primary)}.ibiz-calendar-week__header--events{display:flex;flex:1;justify-content:space-between;width:100%;height:30px;overflow:hidden}.ibiz-calendar-week__header--event-cell{position:relative;top:0;left:0;flex:1;width:100%;height:100%;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--event-box{position:absolute}.ibiz-calendar-week__header--event-content{position:relative;z-index:2;width:100%;height:22px;padding-left:4px;cursor:pointer;background-color:var(--ibiz-color-primary);border:none;border-radius:4px;outline:0}.ibiz-calendar-week__header--event-summary{width:100%;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-calendar-week__header--resizable-handle{position:absolute;bottom:-6px;display:flex;align-items:center;width:100%;height:10PX;cursor:row-resize}.ibiz-calendar-week__header--resize-line{width:100%;height:1px;background-color:var(--ibiz-color-border)}.ibiz-calendar-week__header--check{position:absolute;top:50%;right:6px;color:var(--ibiz-color-primary);transform:translate(0,-50%)}.ibiz-calendar-week__scroll-area{flex:1;overflow:hidden scroll}.ibiz-calendar-week__time-pane{position:relative;display:flex;flex:1 1 0%;width:calc(100% - 3px);height:auto}.ibiz-calendar-week__time-pane--time-labels{position:sticky;left:0;width:90px;min-width:90px;padding:27px 0 27px 40px;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--time-label{height:22px;margin-top:38px;line-height:22px;text-align:left}.ibiz-calendar-week__time-pane--time-label:nth-child(1){height:22px;margin-top:22px}.ibiz-calendar-week__time-pane--time-columns{position:relative;flex:1;padding-bottom:60px;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--time-column{height:60px;border-top:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--time-column:nth-child(1){border-top:none}.ibiz-calendar-week__time-pane--time-column-last{border-bottom:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--event-timed-container{position:absolute;top:0;width:100%;height:100%;overflow:hidden}.ibiz-calendar-week__time-pane--container-scroll{position:relative;top:0;width:100%;height:100%;overflow:auto;overflow:hidden}.ibiz-calendar-week__time-pane--event-box{position:absolute;width:auto;height:auto;padding:0 2px}.ibiz-calendar-week__time-pane--event-content{position:relative;z-index:3;width:100%;height:100%;padding:12px 8px;overflow:hidden;line-height:100%;text-align:left;cursor:pointer;border:none;outline:0}.ibiz-calendar-week__time-pane--event-content:active{animation:pulse 1s linear}.ibiz-calendar-week__time-pane--event-content.is-selected-event{border:1px solid var(--ibiz-color-primary)}.ibiz-calendar-week__time-pane--event-summary{width:100%;height:100%;overflow:hidden;line-height:30px;text-overflow:ellipsis;white-space:nowrap}.ibiz-calendar-week__time-pane--event-summary>span{margin-right:4px}.ibiz-calendar-week__event-popover{position:relative;width:auto;height:auto;padding:0}.ibiz-calendar-week__event-popover.el-popover.el-popper{padding:24px 12px 8px}.ibiz-calendar-week__event-popover--body{width:auto;height:auto;overflow:hidden}.ibiz-calendar-week__event-popover--scroll{width:auto;min-width:450px;height:auto;min-height:200px;overflow:auto}.ibiz-calendar-week__event-popover--close{position:absolute;top:8px;right:8px;cursor:pointer}.ibiz-calendar-week__event-popover--close:hover .el-icon{background:var(--ibiz-color-primary);border-radius:50%}.ibiz-calendar-week__event-popover--close:hover .el-icon svg{fill:#fff}.ibiz-calendar-week__event-popover .el-icon{display:flex;align-items:center;justify-content:center;min-width:24px;min-height:24px;font-size:20px}.ibiz-calendar-week__event-popover .el-icon svg{fill:var(--el-text-color-secondary)}@keyframes pulse{0%{transform:scale(1)}50%{transform:scale(1.1)}100%{transform:scale(1)}}@keyframes move{0%{transform:scale(1)}50%{transform:scale(1.03)}100%{transform:scale(1)}}
+.ibiz-calendar-week{display:flex;flex:1;flex-direction:column;width:100%;height:100%;overflow:hidden}.ibiz-calendar-week__header{position:relative;z-index:100;display:flex;flex-direction:column;width:calc(100% - 7px);height:150px;min-height:150px}.ibiz-calendar-week__header--date-cell-first{width:90px;max-width:90px;height:100%;border-right:1px solid var(--ibiz-color-border);border-bottom:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--event-cell-first{display:flex;align-items:center;justify-content:center;width:90px;max-width:90px;height:100%;padding-left:40px;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--dates{display:flex;justify-content:space-between;width:100%;height:96px}.ibiz-calendar-week__header--date-cell{display:flex;flex:1;flex-direction:column;align-items:center;border-right:1px solid var(--ibiz-color-border);border-bottom:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--date-week{width:100%;height:26px;margin-top:6px;text-align:center}.ibiz-calendar-week__header--date-day{display:flex;align-items:center;justify-content:center;width:50px;height:50px;margin-top:6px;font-weight:600;border:none;border-radius:50%}.ibiz-calendar-week__header--date-day.is-today{color:#fff;background:var(--ibiz-color-primary)}.ibiz-calendar-week__header--events{display:flex;flex:1;justify-content:space-between;width:100%;height:30px;overflow:hidden}.ibiz-calendar-week__header--event-cell{position:relative;top:0;left:0;flex:1;width:100%;height:100%;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__header--event-box{position:absolute}.ibiz-calendar-week__header--event-content{position:relative;z-index:2;width:100%;height:22px;padding-left:4px;cursor:pointer;background-color:var(--ibiz-color-primary);border:none;border-radius:4px;outline:0}.ibiz-calendar-week__header--event-summary{width:100%;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-calendar-week__header--resizable-handle{position:absolute;bottom:-6px;display:flex;align-items:center;width:100%;height:10PX;cursor:row-resize}.ibiz-calendar-week__header--resize-line{width:100%;height:1px;background-color:var(--ibiz-color-border)}.ibiz-calendar-week__header--check{position:absolute;top:50%;right:6px;color:var(--ibiz-color-primary);transform:translate(0,-50%)}.ibiz-calendar-week__scroll-area{flex:1;overflow:hidden scroll}.ibiz-calendar-week__time-pane{position:relative;display:flex;flex:1 1 0%;width:calc(100% - 3px);height:auto}.ibiz-calendar-week__time-pane--time-labels{position:sticky;left:0;width:90px;min-width:90px;padding:27px 0 27px 40px;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--time-label{height:22px;margin-top:38px;line-height:22px;text-align:left}.ibiz-calendar-week__time-pane--time-label:nth-child(1){height:22px;margin-top:22px}.ibiz-calendar-week__time-pane--time-columns{position:relative;flex:1;padding-bottom:60px;border-right:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--time-column{height:60px;border-top:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--time-column:nth-child(1){border-top:none}.ibiz-calendar-week__time-pane--time-column-last{border-bottom:1px solid var(--ibiz-color-border)}.ibiz-calendar-week__time-pane--event-timed-container{position:absolute;top:0;width:100%;height:100%;overflow:hidden}.ibiz-calendar-week__time-pane--container-scroll{position:relative;top:0;width:100%;height:100%;overflow:auto;overflow:hidden}.ibiz-calendar-week__time-pane--event-box{position:absolute;width:auto;height:auto;padding:0 2px}.ibiz-calendar-week__time-pane--event-content{position:relative;z-index:3;width:100%;height:100%;padding:8px;overflow:hidden;line-height:100%;text-align:left;cursor:pointer;border:none;outline:0}.ibiz-calendar-week__time-pane--event-content:active{animation:pulse 1s linear}.ibiz-calendar-week__time-pane--event-content.is-selected-event{border:1px solid var(--ibiz-color-primary)}.ibiz-calendar-week__time-pane--event-summary{width:100%;height:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-calendar-week__time-pane--event-summary>span{margin-right:4px}.ibiz-calendar-week__event-popover{position:relative;width:auto;height:auto;padding:0}.ibiz-calendar-week__event-popover.el-popover.el-popper{padding:24px 12px 8px}.ibiz-calendar-week__event-popover--body{width:auto;height:auto;overflow:hidden}.ibiz-calendar-week__event-popover--scroll{width:auto;min-width:450px;height:auto;min-height:200px;overflow:auto}.ibiz-calendar-week__event-popover--close{position:absolute;top:8px;right:8px;cursor:pointer}.ibiz-calendar-week__event-popover--close:hover .el-icon{background:var(--ibiz-color-primary);border-radius:50%}.ibiz-calendar-week__event-popover--close:hover .el-icon svg{fill:#fff}.ibiz-calendar-week__event-popover .el-icon{display:flex;align-items:center;justify-content:center;min-width:24px;min-height:24px;font-size:20px}.ibiz-calendar-week__event-popover .el-icon svg{fill:var(--el-text-color-secondary)}@keyframes pulse{0%{transform:scale(1)}50%{transform:scale(1.1)}100%{transform:scale(1)}}@keyframes move{0%{transform:scale(1)}50%{transform:scale(1.03)}100%{transform:scale(1)}}

package/lib/control/calendar/components/custom-calendar/custom-calendar.cjs

@@ -6,6 +6,7 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var core = require('@ibiz-template/core');
 var index$1 = require('../calendar-daily/index.cjs');
 var index = require('../calendar-week/index.cjs');
+var index$2 = require('../calendar-user/index.cjs');
 var useCustomCalendar = require('./use-custom-calendar.cjs');
 require('./custom-calendar.css');
 require('../interface/index.cjs');
@@ -147,12 +148,22 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "onEventDblClick": (value) => handleEVentDblClick(value)
       }, slots)]);
     };
+    const renderUser = () => {
+      return vue.createVNode(index$2.IBizCalendarUser, {
+        "selected-day": realSelectedDay.value,
+        "events": events.value,
+        "onEventClick": (value) => handleEVentClick(value),
+        "onEventDblClick": (value) => handleEVentDblClick(value)
+      }, slots);
+    };
     const renderContent = () => {
       switch (viewType.value) {
         case "DAY":
           return renderDay();
         case "WEEK":
           return renderWeek();
+        case "USER":
+          return renderUser();
         default:
           return null;
       }

package/lib/control/calendar/components/interface/calendar-user.cjs

@@ -0,0 +1,23 @@
+'use strict';
+
+require('../util/index.cjs');
+var util = require('../util/util.cjs');
+
+"use strict";
+const calendarUserProps = util.handleProps({
+  selectedDay: {
+    type: util.definePropType(Object),
+    default: () => /* @__PURE__ */ new Date()
+  },
+  events: {
+    type: Array,
+    default: []
+  }
+});
+const calendarUserEmits = {
+  eventClick: (value) => value,
+  eventDblClick: (value) => value
+};
+
+exports.calendarUserEmits = calendarUserEmits;
+exports.calendarUserProps = calendarUserProps;

package/lib/control/calendar/components/interface/index.cjs

@@ -4,6 +4,7 @@ require('./common.cjs');
 var customCalendar = require('./custom-calendar.cjs');
 var calendarDaily = require('./calendar-daily.cjs');
 var calendarWeek = require('./calendar-week.cjs');
+var calendarUser = require('./calendar-user.cjs');
 
 "use strict";
 
@@ -13,3 +14,5 @@ exports.calendarDailyEmits = calendarDaily.calendarDailyEmits;
 exports.calendarDailyProps = calendarDaily.calendarDailyProps;
 exports.calendarWeekEmits = calendarWeek.calendarWeekEmits;
 exports.calendarWeekProps = calendarWeek.calendarWeekProps;
+exports.calendarUserEmits = calendarUser.calendarUserEmits;
+exports.calendarUserProps = calendarUser.calendarUserProps;

package/lib/control/caption-bar/caption-bar.css

@@ -1 +1 @@
-.ibiz-control-captionbar{--ibiz-control-captionbar-color:var(--ibiz-color-text-0);--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-padding:0 var(--ibiz-spacing-base);--ibiz-control-captionbar-margin:var(--ibiz-spacing-none);position:relative;height:100%;padding:var(--ibiz-control-captionbar-padding)}.ibiz-control-captionbar .ibiz-control-captionbar-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:relative;height:100%;padding-left:var(--ibiz-spacing-base);font-size:var(--ibiz-control-captionbar-font-size);font-weight:var(--ibiz-control-captionbar-font-weight);color:var(--ibiz-control-captionbar-color);display:flex;align-items:center;justify-content:flex-start}.ibiz-control-captionbar .ibiz-control-captionbar-caption::before{position:absolute;top:50%;left:0;width:4px;height:var(--ibiz-width-icon-large);content:"";background-color:var(--ibiz-color-primary);border-radius:2px;transform:translateY(-50%)}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon{padding-left:0}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon::before{display:none}.ibiz-control-captionbar-caption__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-control-captionbar-caption__content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-captionbar-caption__total{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-3);transform:translate(0,2px)}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);padding-left:0}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}
+.ibiz-control-captionbar{--ibiz-control-captionbar-color:var(--ibiz-color-text-0);--ibiz-control-captionbar-font-size:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-size2:var(--ibiz-font-size-header-5);--ibiz-control-captionbar-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-font-weight2:var(--ibiz-font-weight-regular);--ibiz-control-captionbar-padding:0 var(--ibiz-spacing-base);--ibiz-control-captionbar-margin:var(--ibiz-spacing-none);position:relative;height:100%;padding:var(--ibiz-control-captionbar-padding)}.ibiz-control-captionbar .ibiz-control-captionbar-caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:relative;height:100%;padding-left:var(--ibiz-spacing-base);font-size:var(--ibiz-control-captionbar-font-size);font-weight:var(--ibiz-control-captionbar-font-weight);color:var(--ibiz-control-captionbar-color);display:flex;align-items:center;justify-content:flex-start}.ibiz-control-captionbar .ibiz-control-captionbar-caption::before{position:absolute;top:50%;left:0;width:4px;height:var(--ibiz-width-icon-large);content:"";background-color:var(--ibiz-color-primary);border-radius:2px;transform:translateY(-50%)}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon{padding-left:0}.ibiz-control-captionbar .ibiz-control-captionbar-caption.is-show-icon::before{display:none}.ibiz-control-captionbar-caption__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-control-captionbar-caption__content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-captionbar-caption__total{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-3);transform:translate(0,2px)}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-control-captionbar-font-size2);--ibiz-control-captionbar-font-weight:var(--ibiz-control-captionbar-font-weight2);padding-left:0}.ibiz-view:not(.ibiz-view-appindexview) .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption{--ibiz-control-captionbar-font-size:var(--ibiz-control-captionbar-font-size2);--ibiz-control-captionbar-font-weight:var(--ibiz-control-captionbar-font-weight2);padding-left:0}.ibiz-drawer .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-modal .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before,.ibiz-popover .ibiz-view .ibiz-view .ibiz-control-captionbar-caption::before{content:none}

package/lib/control/chart/chart.cjs

@@ -199,6 +199,25 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
         default: () => [_slot]
       });
     };
+    const renderNoData = () => {
+      if (c.state.items.length === 0) {
+        const noDataSlots = {};
+        if (vue3Util.hasEmptyPanelRenderer(c)) {
+          Object.assign(noDataSlots, {
+            customRender: () => vue.createVNode(vue3Util.IBizCustomRender, {
+              "controller": c
+            }, null)
+          });
+        }
+        return vue.createVNode(vue.resolveComponent("iBizNoData"), {
+          "text": c.model.emptyText,
+          "emptyTextLanguageRes": c.model.emptyTextLanguageRes,
+          "hideNoDataImage": c.state.hideNoDataImage
+        }, _isSlot(noDataSlots) ? noDataSlots : {
+          default: () => [noDataSlots]
+        });
+      }
+    };
     vue.onBeforeUnmount(() => {
       window.removeEventListener("resize", setHeight);
       window.removeEventListener("pointerdown", setDrillState);
@@ -214,7 +233,8 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
       drillDetailPos,
       drillDetailRef,
       openDrillDetail,
-      renderGrid
+      renderGrid,
+      renderNoData
     };
   },
   render() {
@@ -224,10 +244,7 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
       default: () => [vue.createVNode("div", {
         "id": this.uuid,
         "class": this.ns.b("chart-container")
-      }, [vue.createVNode(vue.resolveComponent("el-empty"), {
-        "class": [this.ns.e("empty"), this.ns.is("no-data", this.c.state.items.length === 0)],
-        "description": ibiz.i18n.t("control.common.currentNoData")
-      }, null), vue.createVNode("div", {
+      }, [this.renderNoData(), vue.createVNode("div", {
         "class": [this.ns.e("chart-grid"), this.ns.is("no-data", this.c.state.items.length === 0), this.ns.is("show-grid", this.c.state.showGrid), {
           [this.ns.em("chart-grid", this.c.state.gridPosition)]: this.c.state.showGrid
         }]

package/lib/control/chart/chart.css

@@ -1 +1 @@
-.ibiz-control-chart{width:100%;height:100%}.ibiz-control-chart__chart-grid{width:100%;height:100%}.ibiz-control-chart__chart-grid.is-show-grid{display:flex;height:calc(100% - 16px)}.ibiz-control-chart__chart-grid--bottom{flex-direction:column}.ibiz-control-chart__chart-grid--top{flex-direction:column-reverse}.ibiz-control-chart__chart-grid--left{flex-direction:row-reverse}.ibiz-control-chart__chart-grid--right{flex-direction:row}.ibiz-control-chart__chart-grid.is-no-data{display:none}.ibiz-control-chart__chart-grid-container{position:relative;flex:1;height:50%}.ibiz-control-chart__chart-grid-container.is-bottom{width:100%;height:50%;min-height:50%}.ibiz-control-chart__chart-grid-container.is-top{width:100%;height:50%;min-height:50%}.ibiz-control-chart__chart-grid-container.is-left{width:50%;min-width:50%;height:100%}.ibiz-control-chart__chart-grid-container.is-right{width:50%;min-width:50%;height:100%}.ibiz-control-chart__chart-grid-container.is-no-grid{flex:unset;width:100%;height:100%}.ibiz-control-chart__chart{width:100%;height:100%}.ibiz-control-chart__drill-detail{position:absolute;top:0;left:0;width:150px;padding:var(--ibiz-spacing-tight) 0;background:var(--ibiz-color-bg-1);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-border-radius-small);box-shadow:var(--ibiz-color-elevated)}.ibiz-control-chart__drill-detail--item{display:flex;gap:var(--ibiz-spacing-tight);align-items:center;height:40px;padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);font-size:var(--ibiz-font-size-regular);cursor:pointer}.ibiz-control-chart__drill-detail--item:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-control-chart__drill-detail--item-text{margin-bottom:var(--ibiz-spacing-super-tight)}.ibiz-control-chart__grid{flex:1;height:auto}.ibiz-control-chart__grid .cell{text-overflow:ellipsis;white-space:nowrap}.ibiz-control-chart__grid .el-table__body-wrapper{border-bottom:1px solid var(--ibiz-color-border)}.ibiz-control-chart__empty{display:none;height:100%}.ibiz-control-chart__empty.is-no-data{display:flex}.ibiz-control-chart-chart-container{width:100%;height:100%}
+.ibiz-control-chart{width:100%;height:100%}.ibiz-control-chart__chart-grid{width:100%;height:100%}.ibiz-control-chart__chart-grid.is-show-grid{display:flex;height:calc(100% - 16px)}.ibiz-control-chart__chart-grid--bottom{flex-direction:column}.ibiz-control-chart__chart-grid--top{flex-direction:column-reverse}.ibiz-control-chart__chart-grid--left{flex-direction:row-reverse}.ibiz-control-chart__chart-grid--right{flex-direction:row}.ibiz-control-chart__chart-grid.is-no-data{display:none}.ibiz-control-chart__chart-grid-container{position:relative;flex:1;height:50%}.ibiz-control-chart__chart-grid-container.is-bottom{width:100%;height:50%;min-height:50%}.ibiz-control-chart__chart-grid-container.is-top{width:100%;height:50%;min-height:50%}.ibiz-control-chart__chart-grid-container.is-left{width:50%;min-width:50%;height:100%}.ibiz-control-chart__chart-grid-container.is-right{width:50%;min-width:50%;height:100%}.ibiz-control-chart__chart-grid-container.is-no-grid{flex:unset;width:100%;height:100%}.ibiz-control-chart__chart{width:100%;height:100%}.ibiz-control-chart__drill-detail{position:absolute;top:0;left:0;width:150px;padding:var(--ibiz-spacing-tight) 0;background:var(--ibiz-color-bg-1);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-border-radius-small);box-shadow:var(--ibiz-color-elevated)}.ibiz-control-chart__drill-detail--item{display:flex;gap:var(--ibiz-spacing-tight);align-items:center;height:40px;padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);font-size:var(--ibiz-font-size-regular);cursor:pointer}.ibiz-control-chart__drill-detail--item:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-control-chart__drill-detail--item-text{margin-bottom:var(--ibiz-spacing-super-tight)}.ibiz-control-chart__grid{flex:1;height:auto}.ibiz-control-chart__grid .cell{text-overflow:ellipsis;white-space:nowrap}.ibiz-control-chart__grid .el-table__body-wrapper{border-bottom:1px solid var(--ibiz-color-border)}.ibiz-control-chart-chart-container{width:100%;height:100%}

package/lib/control/context-menu/context-menu.cjs

@@ -45,6 +45,11 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
     nodeModel: {
       type: Object,
       required: true
+    },
+    // 行为回调，和action-click事件互斥，二者只有一个生效，actionCallBack优先级大于行为回调
+    // 二者区别在于：行为回调为同步执行（主要解决pop打开视图位置异常），action-click为异步执行（不关心执行是否完成）
+    actionCallBack: {
+      type: Function
     }
   },
   setup(props, {
@@ -97,15 +102,21 @@ const ContextMenuControl = /* @__PURE__ */ vue.defineComponent({
     c.evt.on("onCreated", async () => {
       await c.calcButtonState(props.nodeData._deData || (props.nodeData.srfkey ? props.nodeData : void 0), props.nodeModel.appDataEntityId);
     });
-    const handleClick = (detail, e) => {
+    const handleClick = async (detail, e) => {
+      e.stopPropagation();
+      if (!detail.uiactionId) {
+        popoverVisible.value = false;
+        return;
+      }
+      if (props.actionCallBack) {
+        await props.actionCallBack(detail, e);
+      }
       if (props.mode === "buttons") {
         popoverVisible.value = false;
       } else if (dropdownRef.value) {
         dropdownRef.value.handleClose();
       }
-      e.stopPropagation();
-      popoverVisible.value = false;
-      if (detail.uiactionId) {
+      if (!props.actionCallBack) {
         emit("action-click", detail, e);
       }
     };

package/lib/control/dashboard/custom-dashboard-container/custom-dashboard-container.cjs

@@ -153,7 +153,7 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
   },
   render() {
     var _a, _b;
-    return vue.createVNode("div", {
+    return vue.withDirectives(vue.createVNode("div", {
       "class": [this.ns.b()]
     }, [this.customC.showDesignBtn ? vue.createVNode("div", {
       "class": this.ns.b("build-btn")
@@ -213,7 +213,7 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
       return vue.createVNode("div", {
         "style": itemStyle
       }, [(_b2 = (_a2 = this.$slots)[item.portletCodeName]) == null ? void 0 : _b2.call(_a2)]);
-    }))]);
+    }))]), [[vue.resolveDirective("loading"), !this.isInited]]);
   }
 });
 

package/lib/control/dashboard/dashboard-design/dashboard-design.cjs

@@ -3,9 +3,10 @@
 var vue = require('vue');
 var runtime = require('@ibiz-template/runtime');
 var vue3Util = require('@ibiz-template/vue3-util');
+var core = require('@ibiz-template/core');
 var ramda = require('ramda');
+var dashboardDesign_util = require('./dashboard-design.util.cjs');
 require('./dashboard-design.css');
-var core = require('@ibiz-template/core');
 
 "use strict";
 function _isSlot(s) {
@@ -43,6 +44,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
     const providers = vue.ref({});
     const portletControllers = vue.ref({});
     const designPanel = vue.ref(null);
+    const isLoading = vue.ref(false);
     const filterData = (list1) => {
       const items = [];
       list1.forEach((data) => {
@@ -131,6 +133,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       } else if (app.model.appPortletCats && app.model.appPortlets) {
         const isDEView = customC.model.appDataEntityId;
         const categoryTag = props.dashboard.controlParams.categorytag;
+        const portletNameTag = props.dashboard.controlParams.portletnametag;
         app.model.appPortlets.forEach((portlet) => {
           var _a;
           if (!isDEView && !portlet.enableAppDashboard) {
@@ -149,6 +152,12 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
               return;
             }
           }
+          if (portletNameTag) {
+            const portletNameRegex = new RegExp(portletNameTag);
+            if (portlet.codeName && !portletNameRegex.test(portlet.codeName)) {
+              return;
+            }
+          }
           const temp = {
             type: "app",
             portletCodeName: portlet.codeName,
@@ -244,17 +253,27 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
     };
     vue.watch(() => props.isShowDesign, async (newVal) => {
       if (newVal) {
-        await prepareData();
-        const res = await customC.loadCustomModelData();
-        const model = ramda.clone(res.model);
-        const tempModelDatas = await preparePortlet(model);
-        layoutModel.value = model;
-        layoutModel.value.forEach((item, index) => {
-          if (item.dynamodelFlag) {
-            item.portletModel = tempModelDatas[index];
+        try {
+          isLoading.value = true;
+          await prepareData();
+          const res = await customC.loadCustomModelData();
+          let model = ramda.clone(res.model);
+          if (!model.length) {
+            model = dashboardDesign_util.loadDefaultLayoutModel(c, customC);
           }
-        });
-        layoutConfig.value = ramda.clone(res.config);
+          const tempModelDatas = await preparePortlet(model);
+          layoutModel.value = model;
+          layoutModel.value.forEach((item, index) => {
+            if (item.dynamodelFlag) {
+              item.portletModel = tempModelDatas[index];
+            }
+          });
+          layoutConfig.value = ramda.clone(res.config);
+        } catch (error) {
+          ibiz.log.error(error);
+        } finally {
+          isLoading.value = false;
+        }
       }
     }, {
       immediate: true
@@ -356,6 +375,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       filterVal,
       defaultOpens,
       layoutModel,
+      isLoading,
       onReset,
       onSave,
       removeItem,
@@ -505,9 +525,9 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       default: () => [_slot5]
     }), vue.createVNode("div", {
       "class": this.ns.b("tree-content")
-    }, [renderTree()])]), vue.createVNode("div", {
-      "class": this.ns.b("scroll-box"),
-      "ref": "designPanel"
+    }, [renderTree()])]), vue.withDirectives(vue.createVNode("div", {
+      "ref": "designPanel",
+      "class": this.ns.b("scroll-box")
     }, [vue.createVNode("div", {
       "class": this.ns.b("panel")
     }, [vue.createVNode("div", {
@@ -541,19 +561,19 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
         default: () => [vue.createVNode(vue.resolveComponent("el-card"), {
           "class": this.ns.b("grid-layout-item")
         }, {
-          default: () => [vue.createVNode("div", {
-            "class": this.ns.b("grid-layout-item-header")
-          }, [vue.createVNode("span", null, [item.portletName]), vue.createVNode("ion-icon", {
+          default: () => [vue.createVNode("ion-icon", {
             "name": "close-outline",
-            "onClick": () => this.removeItem(item)
-          }, null)]), vue.createVNode("div", {
+            "title": ibiz.i18n.t("app.delete"),
+            "onClick": () => this.removeItem(item),
+            "class": this.ns.b("grid-layout-item-icon")
+          }, null), vue.createVNode("div", {
             "class": this.ns.b("grid-layout-item-content")
           }, [renderPortlet(item)])]
         })]
       });
     })) ? _slot6 : {
       default: () => [_slot6]
-    })])])])]);
+    })])]), [[vue.resolveDirective("loading"), this.isLoading]])])]);
   }
 });
 

package/lib/control/dashboard/dashboard-design/dashboard-design.css

@@ -1 +1 @@
-.ibiz-dashboard-design{width:100%;height:100%}.ibiz-dashboard-design .ibiz-dashboard-design-header{height:48px;padding:var(--ibiz-spacing-tight);display:flex;align-items:center;justify-content:space-between}.ibiz-dashboard-design .ibiz-dashboard-design-header .ibiz-dashboard-design-header-utils{display:flex;align-items:center;justify-content:flex-start}.ibiz-dashboard-design-header-utils__col-num{margin-right:var(--ibiz-spacing-tight)}.ibiz-dashboard-design-header-utils__row-h{margin-right:var(--ibiz-spacing-tight)}.ibiz-dashboard-design .ibiz-dashboard-design-content{width:100%;height:calc(100% - 48px);display:flex;align-items:flex-start;justify-content:flex-start}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree{min-width:300px;height:100%;overflow-y:scroll}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-filter{width:100%;height:32px;padding:var(--ibiz-spacing-none) var(--ibiz-spacing-tight)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content{height:calc(100% - 32px);overflow:auto}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu{height:100%;border:none}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item{display:flex;flex-flow:flex nowrap;align-items:center;justify-content:space-between}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item>span{max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item ion-icon{font-size:calc(var(--ibiz-width-icon-medium) - 2px);cursor:pointer}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item ion-icon:hover{color:var(--ibiz-color-primary)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-scroll-box{flex-grow:1;height:100%;overflow-y:scroll;background:var(--ibiz-color-fill-1)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel{position:relative}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout-mask{position:absolute;inset:0;height:100%;min-height:1248px;background:linear-gradient(to bottom,var(--ibiz-color-primary) 10px,transparent 10px),linear-gradient(to right,var(--ibiz-color-primary) 10px,transparent 10px)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item{width:100%;height:100%}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .el-card__body{display:flex;flex-flow:column nowrap;height:100%;background-color:var(--ibiz-color-bg-1)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .ibiz-dashboard-design-grid-layout-item-header{display:flex;align-items:center;justify-content:space-between}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .ibiz-dashboard-design-grid-layout-item-header>span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .ibiz-dashboard-design-grid-layout-item-header ion-icon{cursor:pointer}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .ibiz-dashboard-design-grid-layout-item-content{display:flex;align-items:center;justify-content:center;width:100%;height:100%;pointer-events:none}
+.ibiz-dashboard-design{width:100%;height:100%}.ibiz-dashboard-design .ibiz-dashboard-design-header{height:48px;padding:var(--ibiz-spacing-tight);display:flex;align-items:center;justify-content:space-between}.ibiz-dashboard-design .ibiz-dashboard-design-header .ibiz-dashboard-design-header-utils{display:flex;align-items:center;justify-content:flex-start}.ibiz-dashboard-design-header-utils__col-num{margin-right:var(--ibiz-spacing-tight)}.ibiz-dashboard-design-header-utils__row-h{margin-right:var(--ibiz-spacing-tight)}.ibiz-dashboard-design .ibiz-dashboard-design-content{width:100%;height:calc(100% - 48px);display:flex;align-items:flex-start;justify-content:flex-start}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree{min-width:300px;height:100%;overflow-y:scroll}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-filter{width:100%;height:32px;padding:var(--ibiz-spacing-none) var(--ibiz-spacing-tight)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content{height:calc(100% - 32px);overflow:auto}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu{height:100%;border:none}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item{display:flex;flex-flow:flex nowrap;align-items:center;justify-content:space-between}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item>span{max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item ion-icon{font-size:calc(var(--ibiz-width-icon-medium) - 2px);cursor:pointer}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-tree .ibiz-dashboard-design-tree-content>.el-menu .el-menu-item ion-icon:hover{color:var(--ibiz-color-primary)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-scroll-box{flex-grow:1;height:100%;overflow-y:scroll;background:var(--ibiz-color-fill-1)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel{position:relative}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout-mask{position:absolute;inset:0;height:100%;min-height:1248px;background:linear-gradient(to bottom,var(--ibiz-color-primary) 10px,transparent 10px),linear-gradient(to right,var(--ibiz-color-primary) 10px,transparent 10px)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item{width:100%;height:100%}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .el-card__body{display:flex;flex-flow:column nowrap;height:100%;position:relative;background-color:var(--ibiz-color-bg-1)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .ibiz-dashboard-design-grid-layout-item-icon{cursor:pointer;position:absolute;right:var(--ibiz-spacing-tight);top:var(--ibiz-spacing-tight)}.ibiz-dashboard-design .ibiz-dashboard-design-content .ibiz-dashboard-design-panel .ibiz-dashboard-design-grid-layout .ibiz-dashboard-design-grid-layout-item .ibiz-dashboard-design-grid-layout-item-content{display:flex;align-items:center;justify-content:center;width:100%;height:100%;pointer-events:none}

package/lib/control/dashboard/dashboard-design/dashboard-design.util.cjs

@@ -0,0 +1,248 @@
+'use strict';
+
+"use strict";
+function calcGridSpanOffset(layoutPos) {
+  const {
+    layout,
+    colXS,
+    colSM,
+    colMD,
+    colLG,
+    colXSOffset,
+    colSMOffset,
+    colMDOffset,
+    colLGOffset
+  } = layoutPos;
+  const _span = colLG || colMD || colSM || colXS;
+  const _offset = colLGOffset || colMDOffset || colSMOffset || colXSOffset;
+  const spanDefault = layout === "TABLE_24COL" ? 24 : 12;
+  const span = !_span || _span === -1 ? 1 : _span / spanDefault;
+  const offset = !_offset || _offset === -1 ? 0 : _offset / spanDefault;
+  return { span, offset };
+}
+function calculateXYPositions(items, parentPos) {
+  let currentRowWidth = 0;
+  let currentY = 0;
+  let currentRowHeight = 0;
+  items.forEach((item) => {
+    if (currentRowWidth + item.x + item.w > parentPos.w) {
+      currentY += currentRowHeight;
+      currentRowWidth = 0;
+      currentRowHeight = 0;
+    }
+    item.x = currentRowWidth + item.x;
+    item.y = currentY;
+    currentRowWidth += item.x + item.w - currentRowWidth;
+    currentRowHeight = Math.max(currentRowHeight, item.h);
+  });
+  items.forEach((item) => {
+    item.x += parentPos.x;
+  });
+}
+function calculatePositions(items, parentPos) {
+  const { dir, align, valign } = parentPos.layout;
+  const flexLayoutPos = [];
+  const models = (dir == null ? void 0 : dir.includes("reverse")) ? items.toReversed() : items;
+  if (dir == null ? void 0 : dir.includes("row")) {
+    const W = parseFloat((parentPos.w / models.length).toFixed(1));
+    let widthSum = 0;
+    let growCount = 0;
+    let shrinkCont = 0;
+    models.forEach((model) => {
+      const { grow, width } = model.layoutPos;
+      if (grow || !width) {
+        growCount++;
+      } else {
+        shrinkCont++;
+        widthSum += parseFloat((width / 100).toFixed(1));
+      }
+    });
+    const fixedWidthSum = widthSum > W * shrinkCont ? W * shrinkCont : widthSum;
+    const remainingWidth = parentPos.w - fixedWidthSum;
+    const growWidth = growCount > 0 ? remainingWidth / growCount : 0;
+    models.forEach((model) => {
+      const { grow, width } = model.layoutPos;
+      flexLayoutPos.push({
+        x: 0,
+        model,
+        w: grow || !width ? growWidth : parseFloat((width / 100).toFixed(1))
+      });
+    });
+    const flexW = flexLayoutPos.reduce((sum, element) => sum + element.w, 0);
+    const poorW = parentPos.w - flexW;
+    switch (align) {
+      case "flex-start":
+        if (dir === "row-reverse") {
+          flexLayoutPos[0].x = poorW;
+        }
+        break;
+      case "flex-end":
+        if (dir === "row") {
+          flexLayoutPos[0].x = poorW;
+        }
+        break;
+      case "center":
+        if (poorW) {
+          flexLayoutPos[0].x = poorW / 2;
+        }
+        break;
+      case "space-between":
+        if (poorW && flexLayoutPos.length > 1) {
+          const x = poorW / (flexLayoutPos.length - 1);
+          flexLayoutPos.forEach((f, index) => {
+            if (index !== 0) {
+              f.x = x;
+            }
+          });
+        }
+        break;
+      case "space-around":
+        if (poorW) {
+          const x = poorW / (flexLayoutPos.length * 2);
+          flexLayoutPos.forEach((f, index) => {
+            if (index === 0) {
+              f.x = x;
+            } else {
+              f.x = x * 2;
+            }
+          });
+        }
+        break;
+      default:
+        break;
+    }
+  }
+  if (dir == null ? void 0 : dir.includes("column")) {
+    models.forEach((model) => {
+      const { width } = model.layoutPos;
+      let x = 0;
+      let w = parentPos.w;
+      if (width) {
+        w = width / 100 > 1 && width / 100 < parentPos.w ? width / 100 : parentPos.w;
+      }
+      const poorW = parentPos.w - w;
+      switch (valign) {
+        case "flex-end":
+          x = poorW;
+          break;
+        case "center":
+          if (poorW) {
+            x = (parentPos.w - w) / 2;
+          }
+          break;
+        default:
+          break;
+      }
+      flexLayoutPos.push({
+        x,
+        w,
+        model
+      });
+    });
+  }
+  return flexLayoutPos;
+}
+function loadDefaultLayoutModel(dashboard, customDashboard) {
+  var _a;
+  const { layoutRowH, layoutColNum } = customDashboard;
+  const app = ibiz.hub.getApp(ibiz.env.appId);
+  const recursivePortlePart = (container, parentPos) => {
+    const { controls, layout } = container;
+    const children = (controls == null ? void 0 : controls.filter((child) => !!child.layoutPos)) || [];
+    const portletLayoutPos = [];
+    const childrenLayoutPos = [];
+    if ((layout == null ? void 0 : layout.layout) === "TABLE_24COL" || (layout == null ? void 0 : layout.layout) === "TABLE_12COL") {
+      children.forEach((model) => {
+        var _a2;
+        const { height } = model.layoutPos;
+        const { span, offset } = calcGridSpanOffset(model.layoutPos);
+        const w = span * parentPos.w;
+        const x = offset * parentPos.w;
+        let h = height ? height / layoutRowH : 3;
+        if (model.portletType === "CONTAINER" && ((_a2 = model.controls) == null ? void 0 : _a2.length)) {
+          const _childrenLayoutPos = recursivePortlePart(model, { w, x });
+          h = _childrenLayoutPos.reduce((max, current) => {
+            return Math.max(max, current.y + current.h);
+          }, -Infinity);
+          childrenLayoutPos.push(..._childrenLayoutPos);
+        }
+        portletLayoutPos.push({
+          w,
+          x,
+          h,
+          y: 0,
+          model,
+          parentId: container.codeName
+        });
+      });
+    } else if ((layout == null ? void 0 : layout.layout) === "FLEX") {
+      const flexLayoutPos = calculatePositions(children, {
+        ...parentPos,
+        layout
+      });
+      flexLayoutPos.forEach((pos) => {
+        var _a2;
+        const { x, w, model } = pos;
+        const { height } = model.layoutPos;
+        let h = height ? height / layoutRowH : 3;
+        if (model.portletType === "CONTAINER" && ((_a2 = model.controls) == null ? void 0 : _a2.length)) {
+          const _childrenLayoutPos = recursivePortlePart(model, { w, x });
+          h = _childrenLayoutPos.reduce((max, current) => {
+            return Math.max(max, current.y + current.h);
+          }, -Infinity);
+          childrenLayoutPos.push(..._childrenLayoutPos);
+        }
+        portletLayoutPos.push({
+          w,
+          x,
+          h,
+          y: 0,
+          model,
+          parentId: container.codeName
+        });
+      });
+    }
+    calculateXYPositions(portletLayoutPos, parentPos);
+    portletLayoutPos.forEach((layoutPos) => {
+      if (layoutPos.model.portletType === "CONTAINER") {
+        const _children = childrenLayoutPos.filter(
+          (child) => child.parentId === layoutPos.model.codeName
+        );
+        _children.forEach((child) => {
+          child.x += layoutPos.x;
+          child.y += layoutPos.y;
+        });
+      }
+    });
+    const modelLayoutPos = portletLayoutPos.filter(
+      (layoutPos) => !["CONTAINER", "RAWITEM"].includes(layoutPos.model.portletType)
+    );
+    modelLayoutPos.push(...childrenLayoutPos);
+    return modelLayoutPos;
+  };
+  const layoutModel = [];
+  if ((_a = dashboard.model.controls) == null ? void 0 : _a.length) {
+    const modelLayoutPos = recursivePortlePart(dashboard.model, {
+      x: 0,
+      w: layoutColNum
+    });
+    modelLayoutPos.forEach((layout) => {
+      const { x, y, w, h, model } = layout;
+      layoutModel.push({
+        x,
+        y,
+        w,
+        h,
+        i: model.codeName,
+        appName: app.model.name,
+        portletName: model.title,
+        portletImage: model.sysImage,
+        portletCodeName: model.codeName,
+        appCodeName: model.appDataEntityId || app.model.pkgcodeName
+      });
+    });
+  }
+  return layoutModel;
+}
+
+exports.loadDefaultLayoutModel = loadDefaultLayoutModel;

package/lib/control/dashboard/portlet/portlet-layout/portlet-layout.cjs

@@ -87,7 +87,7 @@ const PortletLayout = /* @__PURE__ */ vue.defineComponent({
       "title": core.showTitle(state.title)
     }, [state.title])])]), vue.createVNode("div", {
       "class": this.ns.be("header", "right")
-    }, [model.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
+    }, [model.portletType !== "ACTIONBAR" && model.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
       "class": this.ns.e("toolbar"),
       "action-details": model.uiactionGroup.uiactionGroupDetails,
       "actions-state": state.actionGroupState,