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

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,15 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
         default: () => [_slot]
       });
     };
+    const renderNoData = () => {
+      if (c.state.items.length === 0) {
+        return vue.createVNode(vue.resolveComponent("iBizNoData"), {
+          "text": c.model.emptyText,
+          "emptyTextLanguageRes": c.model.emptyTextLanguageRes,
+          "hideNoDataImage": c.state.hideNoDataImage
+        }, null);
+      }
+    };
     vue.onBeforeUnmount(() => {
       window.removeEventListener("resize", setHeight);
       window.removeEventListener("pointerdown", setDrillState);
@@ -214,7 +223,8 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
       drillDetailPos,
       drillDetailRef,
       openDrillDetail,
-      renderGrid
+      renderGrid,
+      renderNoData
     };
   },
   render() {
@@ -224,10 +234,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/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", {
@@ -553,7 +573,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       });
     })) ? _slot6 : {
       default: () => [_slot6]
-    })])])])]);
+    })])]), [[vue.resolveDirective("loading"), this.isLoading]])])]);
   }
 });
 

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 = colXS || colSM || colMD || colLG;
+  const _offset = colXSOffset || colSMOffset || colMDOffset || colLGOffset;
+  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,

package/lib/control/data-view/data-view.cjs

@@ -181,10 +181,17 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
           height: "".concat(c.model.cardHeight, "px")
         });
       }
+      const itemStyle = ns.cssVarBlock({
+        "item-bg-color": "".concat(item.bgcolor || ""),
+        "text-color": "".concat(item.fontcolor || ""),
+        "hover-bg-color": "".concat(item.hovercolor || ""),
+        "active-bg-color": "".concat(item.activecolor || "")
+      });
       const panel = props.modelData.itemLayoutPanel;
       return vue.createVNode(vue.resolveComponent("el-card"), {
         "shadow": "hover",
         "class": cardClass,
+        "style": itemStyle,
         "body-style": cardStyle,
         "onClick": (event) => onRowClick(item, event),
         "onDblclick": (event) => onDbRowClick(item, event)
@@ -355,7 +362,7 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         "class": ns.e("content"),
         "text": c.model.emptyText,
         "emptyTextLanguageRes": c.model.emptyTextLanguageRes,
-        "enableShowImage": c.state.hideNoDataImage
+        "hideNoDataImage": c.state.hideNoDataImage
       }, null);
     };
     const renderCollapseExpandIcon = () => {

package/lib/control/data-view/data-view.css

@@ -1 +1 @@
-.ibiz-control-dataview{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-dataview__nav-icon{right:10px;top:20px;cursor:pointer;position:absolute;color:var(--ibiz-color-primary)}.ibiz-control-dataview__content{flex-grow:1;height:100%}.ibiz-control-dataview__pagination{flex-shrink:0}.ibiz-control-dataview__load-more{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__load-more i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__load-more i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview__collapse-expand-icon{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__collapse-expand-icon i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__collapse-expand-icon i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview-scroll{display:flex;flex-wrap:wrap;align-content:flex-start;padding:var(--ibiz-control-dataview-padding);overflow:auto}.ibiz-control-dataview-scroll>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}.ibiz-control-dataview-item{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;color:var(--ibiz-control-dataview-text-color);cursor:pointer}.ibiz-control-dataview-item:hover{background-color:var(--ibiz-control-dataview-hover-bg-color)}.ibiz-control-dataview-item.is-active{background-color:var(--ibiz-control-dataview-active-bg-color)}.ibiz-control-dataview-item-content{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px}.ibiz-control-dataview-item-content__top--title{text-align:center}.ibiz-control-dataview-item-content__top--description{min-width:150px;text-align:justify;text-justify:newspaper;word-break:break-all}.ibiz-control-dataview-item-content__bottom--actions{display:flex;justify-content:center}.ibiz-control-dataview-group-content{--ibiz-control-dataview-group-item-header-bg-color:transparent;--ibiz-control-dataview-group-item-header-padding:var(--ibiz-spacing-base-tight);--ibiz-control-dataview-group-item-header-border-color:var(--ibiz-color-border);--ibiz-control-dataview-group-item-caption-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-group-item-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-control-dataview-group-item-caption-font-weight:var(--ibiz-font-weight-bold);--ibiz-control-dataview-group-item-content-bg-color:transparent;--ibiz-control-dataview-group-item-content-padding:var(--ibiz-spacing-tight);width:100%}.ibiz-control-dataview-group-content__item .el-collapse-item__content{display:flex;flex-wrap:wrap}.ibiz-control-dataview-group-content__item--empty{width:100%;text-align:center}.ibiz-control-dataview-group-content__item.is-collapse .ibiz-control-dataview-group-content__item-content{height:0;overflow:hidden}.ibiz-control-dataview-group-content__item-header{display:flex;align-items:center;justify-content:space-between;width:100%;padding:var(--ibiz-control-dataview-group-item-header-padding);border-bottom:1px solid var(--ibiz-control-dataview-group-item-header-border-color)}.ibiz-control-dataview-group-content__item-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-control-dataview-group-item-caption-font-size);font-weight:var(--ibiz-control-dataview-group-item-caption-font-weight);color:var(--ibiz-control-dataview-group-item-caption-text-color)}.ibiz-control-dataview-group-content__item-content{display:flex;flex-wrap:wrap;padding:var(--ibiz-control-dataview-group-item-content-padding);background-color:var(--ibiz-control-dataview-group-item-content-bg-color);will-change:height}.ibiz-control-dataview-group-content__item-content>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-group-content__item-row{padding:var(--ibiz-control-dataview-group-item-content-padding)}.ibiz-control-dataview-group-content__item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}
+.ibiz-control-dataview{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;--ibiz-control-dataview-item-bg-color:transparent;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:flex-start;position:relative;height:100%}.ibiz-control-dataview__nav-icon{position:absolute;top:20px;right:10px;color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-dataview__content{flex-grow:1;height:100%}.ibiz-control-dataview__pagination{flex-shrink:0}.ibiz-control-dataview__load-more{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__load-more i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__load-more i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview__collapse-expand-icon{width:calc(100% - var(--ibiz-spacing-base-tight));text-align:center}.ibiz-control-dataview__collapse-expand-icon i{font-size:var(--ibiz-font-size-header-3);color:var(--ibiz-color-text-2);cursor:pointer}.ibiz-control-dataview__collapse-expand-icon i:hover{color:var(--ibiz-color-primary-light-hover)}.ibiz-control-dataview-scroll{display:flex;flex-wrap:wrap;align-content:flex-start;padding:var(--ibiz-control-dataview-padding);overflow:auto}.ibiz-control-dataview-scroll>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}.ibiz-control-dataview-item{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;--ibiz-control-dataview-item-bg-color:transparent;color:var(--ibiz-control-dataview-text-color);cursor:pointer;background-color:var(--ibiz-control-dataview-item-bg-color)}.ibiz-control-dataview-item:hover{background-color:var(--ibiz-control-dataview-hover-bg-color)}.ibiz-control-dataview-item.is-active{background-color:var(--ibiz-control-dataview-active-bg-color)}.ibiz-control-dataview-item-content{--ibiz-control-dataview-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-control-dataview-active-bg-color:var(--ibiz-color-fill-2);--ibiz-control-dataview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base) 0;--ibiz-control-dataview-page-height:50px;--ibiz-control-dataview-item-bg-color:transparent}.ibiz-control-dataview-item-content__top--title{text-align:center}.ibiz-control-dataview-item-content__top--description{min-width:150px;text-align:justify;text-justify:newspaper;word-break:break-all}.ibiz-control-dataview-item-content__bottom--actions{display:flex;justify-content:center}.ibiz-control-dataview-group-content{--ibiz-control-dataview-group-item-header-bg-color:transparent;--ibiz-control-dataview-group-item-header-padding:var(--ibiz-spacing-base-tight);--ibiz-control-dataview-group-item-header-border-color:var(--ibiz-color-border);--ibiz-control-dataview-group-item-caption-text-color:var(--ibiz-color-text-0);--ibiz-control-dataview-group-item-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-control-dataview-group-item-caption-font-weight:var(--ibiz-font-weight-bold);--ibiz-control-dataview-group-item-content-bg-color:transparent;--ibiz-control-dataview-group-item-content-padding:var(--ibiz-spacing-tight);width:100%}.ibiz-control-dataview-group-content__item .el-collapse-item__content{display:flex;flex-wrap:wrap}.ibiz-control-dataview-group-content__item--empty{width:100%;text-align:center}.ibiz-control-dataview-group-content__item.is-collapse .ibiz-control-dataview-group-content__item-content{height:0;overflow:hidden}.ibiz-control-dataview-group-content__item-header{display:flex;align-items:center;justify-content:space-between;width:100%;padding:var(--ibiz-control-dataview-group-item-header-padding);border-bottom:1px solid var(--ibiz-control-dataview-group-item-header-border-color)}.ibiz-control-dataview-group-content__item-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-control-dataview-group-item-caption-font-size);font-weight:var(--ibiz-control-dataview-group-item-caption-font-weight);color:var(--ibiz-control-dataview-group-item-caption-text-color)}.ibiz-control-dataview-group-content__item-content{display:flex;flex-wrap:wrap;padding:var(--ibiz-control-dataview-group-item-content-padding);background-color:var(--ibiz-control-dataview-group-item-content-bg-color);will-change:height}.ibiz-control-dataview-group-content__item-content>*{margin:calc(var(--ibiz-spacing-base-tight)/ 2)}.ibiz-control-dataview-group-content__item-row{padding:var(--ibiz-control-dataview-group-item-content-padding)}.ibiz-control-dataview-group-content__item-col{padding:0 var(--ibiz-spacing-base-tight) var(--ibiz-spacing-base-tight) 0}

package/lib/control/drtab/drtab-control.util.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var vue = require('vue');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.38-alpha.32_axios@1.7.7_lodash-es@4.17.21_qs@6.13.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.38-alpha.43_axios@1.7.7_lodash-es@4.17.21_qs@6.13.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

package/lib/control/form/form-detail/form-item/composite-form-item/composite-form-item.cjs

@@ -0,0 +1,98 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+const CompositeFormItem = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizCompositeFormItem",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: runtime.FormItemController,
+      required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
+    }
+  },
+  setup(props) {
+    var _a, _b, _c, _d;
+    const c = props.controller;
+    const onValueChange = (val, name) => {
+      props.controller.setDataValue(val, name);
+    };
+    const extraParams = vue.ref({});
+    let emptyHiddenUnit = ibiz.config.form.emptyHiddenUnit;
+    const emptyhiddenunit = (_b = (_a = props.controller.form) == null ? void 0 : _a.controlParams) == null ? void 0 : _b.emptyhiddenunit;
+    if (emptyhiddenunit) {
+      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
+    }
+    const editorParams = ((_d = (_c = props.controller.editor) == null ? void 0 : _c.model) == null ? void 0 : _d.editorParams) || {};
+    const {
+      EMPTYHIDDENUNIT
+    } = editorParams;
+    if (EMPTYHIDDENUNIT) {
+      emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, "true");
+    }
+    Object.assign(extraParams.value, {
+      emptyHiddenUnit
+    });
+    return {
+      c,
+      extraParams,
+      onValueChange
+    };
+  },
+  render() {
+    var _a, _b, _c, _d, _e;
+    if (!this.c.state.visible || ((_a = this.controller.model.editor) == null ? void 0 : _a.editorType) === "HIDDEN") {
+      return null;
+    }
+    let editor = null;
+    const editMode = (_d = (_c = (_b = this.controller.editor) == null ? void 0 : _b.model) == null ? void 0 : _c.editorParams) == null ? void 0 : _d.editMode;
+    const editorProps = {
+      style: (_e = this.controller.editor) == null ? void 0 : _e.style,
+      value: this.controller.value,
+      data: this.controller.data,
+      controller: this.controller.editor,
+      disabled: this.controller.state.disabled,
+      readonly: this.controller.state.readonly,
+      onChange: this.onValueChange,
+      extraParams: this.extraParams,
+      controlParams: editMode ? {
+        ...this.controller.form.controlParams,
+        editmode: editMode
+      } : this.controller.form.controlParams,
+      onFocus: (event) => this.c.onFocus(event),
+      onBlur: (event) => this.c.onBlur(event),
+      onEnter: (event) => this.controller.onEnter(event),
+      onClick: (event, params) => this.controller.onClick(event, params),
+      ...this.attrs
+    };
+    if (this.c.form.state.isLoaded) {
+      if (this.$slots.default) {
+        editor = this.$slots.default(editorProps);
+      } else if (this.controller.editorProvider) {
+        const component = vue.resolveComponent(this.controller.editorProvider.formEditor);
+        editor = vue.h(component, {
+          ...editorProps
+        });
+      } else {
+        editor = vue.createVNode(vue.resolveComponent("not-supported-editor"), {
+          "modelData": this.modelData.editor
+        }, null);
+      }
+    }
+    return editor;
+  }
+});
+
+exports.CompositeFormItem = CompositeFormItem;
+exports.default = CompositeFormItem;