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

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

@@ -36,12 +36,10 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
       pickDay,
       handleEVentClick,
       handleEVentDblClick,
+      handleEventContextmenu,
       selectDate,
       selectLegend
     } = useCustomCalendar.useCustomCalendar(props, emit, "custom-calendar");
-    vue.onMounted(() => {
-      pickDay(dayjs(/* @__PURE__ */ new Date()));
-    });
     const renderWeek = () => {
       var _a;
       return vue.createVNode("div", {
@@ -66,13 +64,10 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         }, [vue.createVNode("div", {
           "class": ns.em("calendar-week", "legend-item-tip"),
           "style": {
-            background: item.isShow ? item.bkcolor : "#CCCCCC"
+            background: item.isShow ? item.bkcolor : "var(".concat(ns.cssVarName("color-disabled-bg"), ")")
           }
         }, null), vue.createVNode("div", {
           "class": ns.em("calendar-week", "legend-item-text"),
-          "style": {
-            color: item.isShow ? item.color : "#CCCCCC"
-          },
           "title": core.showTitle(item.name)
         }, [item.name])]);
       })]), vue.createVNode("div", {
@@ -91,7 +86,8 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "multiple": multiple.value,
         "selectedData": selectedData.value,
         "onEventClick": (value) => handleEVentClick(value),
-        "onEventDblClick": (value) => handleEVentDblClick(value)
+        "onEventDblClick": (value) => handleEVentDblClick(value),
+        "onEventContextmenu": (value) => handleEventContextmenu(value)
       }, slots)]);
     };
     const renderDay = () => {
@@ -118,13 +114,10 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         }, [vue.createVNode("div", {
           "class": ns.em("calendar-week", "legend-item-tip"),
           "style": {
-            background: item.isShow ? item.bkcolor : "#CCCCCC"
+            background: item.isShow ? item.bkcolor : "var(".concat(ns.cssVarName("color-disabled-bg"), ")")
           }
         }, null), vue.createVNode("div", {
           "class": ns.em("calendar-week", "legend-item-text"),
-          "style": {
-            color: item.isShow ? item.color : "#CCCCCC"
-          },
           "title": core.showTitle(item.name)
         }, [item.name])]);
       })]), vue.createVNode("div", {
@@ -133,28 +126,50 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "modelValue": realSelectedDay.value,
         "onUpdate:modelValue": ($event) => realSelectedDay.value = $event,
         "type": "date",
-        "placeholder": "\u9009\u62E9\u65E5\u671F",
+        "placeholder": ibiz.i18n.t("control.calendar.calendardaily.selectdate"),
         "shortcuts": shortcuts
       }, null)])]), vue.createVNode("div", {
         "class": ns.em("calendar-week", "text-secondary")
       }, [curWeek.value])]), vue.createVNode(index$1.IBizCalendarDaily, {
         "selected-day": realSelectedDay.value,
         "controller": props.controller,
+        "showDetail": props.showDetail,
         "events": events.value,
         "legends": legends.value,
         "multiple": multiple.value,
         "selectedData": selectedData.value,
         "onEventClick": (value) => handleEVentClick(value),
-        "onEventDblClick": (value) => handleEVentDblClick(value)
+        "onEventDblClick": (value) => handleEVentDblClick(value),
+        "onEventContextmenu": (value) => handleEventContextmenu(value)
       }, slots)]);
     };
     const renderUser = () => {
-      return vue.createVNode(index$2.IBizCalendarUser, {
+      const weekRange = useCustomCalendar.calcCurrentWeekRange(new Date(realSelectedDay.value));
+      return vue.createVNode("div", {
+        "class": [ns.e("calendar-user")]
+      }, [vue.createVNode("div", {
+        "class": [ns.e("calendar-user-header")]
+      }, [vue.createVNode("div", {
+        "class": ns.em("calendar-user-header", "left")
+      }, [weekRange.map((_date) => {
+        return dayjs(new Date(_date)).format("YYYY-MM-DD");
+      }).join(" ~ ")]), vue.createVNode("div", {
+        "class": ns.em("calendar-user-header", "right")
+      }, [vue.createVNode(vue.resolveComponent("el-date-picker"), {
+        "type": "week",
+        "clearable": false,
+        "popper-class": ns.em("calendar-user-header", "date-picker"),
+        "modelValue": realSelectedDay.value,
+        "onUpdate:modelValue": ($event) => realSelectedDay.value = $event,
+        "class": ns.em("calendar-user-header", "date-range"),
+        "placeholder": ibiz.i18n.t("control.calendar.calendarUser.selectWeekRange"),
+        "format": ibiz.i18n.t("control.calendar.calendarUser.weekFormat")
+      }, null)])]), vue.createVNode(index$2.IBizCalendarUser, {
         "selected-day": realSelectedDay.value,
         "events": events.value,
         "onEventClick": (value) => handleEVentClick(value),
         "onEventDblClick": (value) => handleEVentDblClick(value)
-      }, slots);
+      }, slots)]);
     };
     const renderContent = () => {
       switch (viewType.value) {

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

@@ -1 +1 @@
-.ibiz-custom-calendar{width:100%;height:100%}.ibiz-custom-calendar__calendar-day{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;min-height:900px;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-day--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-day--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-day--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-day--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-day--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-day--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 3px;cursor:pointer}.ibiz-custom-calendar__calendar-day--legend-item-tip{display:inline-block;width:26px;height:14px;margin-right:6px;border-radius:4px}.ibiz-custom-calendar__calendar-day--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-week{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-week--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-week--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-week--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-week--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-week--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-week--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 3px;cursor:pointer}.ibiz-custom-calendar__calendar-week--legend-item-tip{display:inline-block;width:26px;height:14px;margin-right:6px;border-radius:4px}.ibiz-custom-calendar__calendar-week--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-custom-calendar__calendar-month--body{flex-grow:1;width:100%;height:calc(100% - 58px)}.ibiz-custom-calendar__calendar-month--legend{display:flex;align-items:center;justify-content:center;width:auto;height:100%}.ibiz-custom-calendar__calendar-month--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 3px;cursor:pointer}.ibiz-custom-calendar__calendar-month--legend-item-tip{display:inline-block;width:26px;height:14px;margin-right:6px;border-radius:4px}.ibiz-custom-calendar__calendar-month--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month--header{display:flex;align-items:center;justify-content:space-between;width:100%;min-height:58px;padding:12px 20px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-month--button-group{display:flex;align-items:center;justify-content:space-between;width:388px}.ibiz-custom-calendar__header--title{min-width:120px}.ibiz-custom-calendar .el-date-editor.el-input,.ibiz-custom-calendar .el-date-editor.el-input__wrapper{width:130px;height:32px}
+.ibiz-custom-calendar{width:100%;height:100%}.ibiz-custom-calendar__calendar-day{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;min-height:900px;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-day--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-day--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-day--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-day--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-day--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-day--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-day--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-day--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-week{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-week--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-week--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-week--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-week--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-week--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-week--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-week--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-week--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-custom-calendar__calendar-month--body{flex-grow:1;width:100%;height:calc(100% - 58px)}.ibiz-custom-calendar__calendar-month--legend{display:flex;align-items:center;justify-content:center;width:auto;height:100%}.ibiz-custom-calendar__calendar-month--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-month--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-month--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month--header{display:flex;align-items:center;justify-content:space-between;width:100%;min-height:58px;padding:12px 20px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-month--button-group{display:flex;align-items:center;justify-content:space-between;width:388px}.ibiz-custom-calendar__header--title{min-width:120px}.ibiz-custom-calendar__calendar-user{display:flex;flex-direction:column;height:100%}.ibiz-custom-calendar__calendar-user-header{display:flex;align-items:center;justify-content:space-between;width:100%;padding:0 var(--ibiz-spacing-base)}.ibiz-custom-calendar__calendar-user-header--right .el-date-editor.el-date-editor--week.el-input{width:250px}.ibiz-custom-calendar .el-date-editor.el-input,.ibiz-custom-calendar .el-date-editor.el-input__wrapper{width:130px;height:32px}

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

@@ -213,6 +213,9 @@ const useCustomCalendar = (props, emit, _componentName) => {
   const handleEVentDblClick = (value) => {
     emit("eventDblClick", value);
   };
+  const handleEventContextmenu = (value) => {
+    emit("eventContextmenu", value);
+  };
   const curWeek = vue.computed(() => {
     let tempWeek = "";
     if (realSelectedDay.value) {
@@ -259,8 +262,29 @@ const useCustomCalendar = (props, emit, _componentName) => {
     selectDate,
     handleEVentClick,
     handleEVentDblClick,
+    handleEventContextmenu,
     selectLegend
   };
 };
+function calcCurrentWeekRange(date) {
+  let monday;
+  let sunday;
+  const day = date.getDay();
+  if (day === 0) {
+    monday = dayjs(new Date(date.getTime() - 6 * 864e5)).format(
+      "YYYY-MM-DD"
+    );
+    sunday = dayjs(date).format("YYYY-MM-DD");
+  } else {
+    monday = dayjs(new Date(date.getTime() - (day - 1) * 864e5)).format(
+      "YYYY-MM-DD"
+    );
+    sunday = dayjs(new Date(date.getTime() + (7 - day) * 864e5)).format(
+      "YYYY-MM-DD"
+    );
+  }
+  return [monday, sunday];
+}
 
+exports.calcCurrentWeekRange = calcCurrentWeekRange;
 exports.useCustomCalendar = useCustomCalendar;

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

@@ -22,12 +22,17 @@ const calendarDailyProps = util.handleProps({
   },
   selectedData: {
     type: Object
+  },
+  showDetail: {
+    type: Boolean,
+    default: false
   }
 });
 const calendarDailyEmits = {
   pick: (value) => lodashEs.isObject(value),
   eventClick: (value) => value,
-  eventDblClick: (value) => value
+  eventDblClick: (value) => value,
+  eventContextmenu: (_value) => _value
 };
 
 exports.calendarDailyEmits = calendarDailyEmits;

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

@@ -31,7 +31,8 @@ const calendarWeekProps = util.handleProps({
 const calendarWeekEmits = {
   pick: (value) => lodashEs.isObject(value),
   eventClick: (value) => value,
-  eventDblClick: (value) => value
+  eventDblClick: (value) => value,
+  eventContextmenu: (_value) => _value
 };
 
 exports.calendarWeekEmits = calendarWeekEmits;

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

@@ -68,7 +68,8 @@ const customCalendarEmits = {
   [event.INPUT_EVENT]: (value) => lodashEs.isDate(value),
   [event.CHANGE_EVENT]: (value) => lodashEs.isDate(value),
   [event.EVENT_CLICK_EVENT]: (value) => value,
-  [event.EVENT_DBL_CLICK_EVENT]: (value) => value
+  [event.EVENT_DBL_CLICK_EVENT]: (value) => value,
+  [event.EVENT_CONTEXT_MENU]: (_value) => _value
 };
 
 exports.customCalendarEmits = customCalendarEmits;

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

@@ -5,13 +5,17 @@ var lodashEs = require('lodash-es');
 
 "use strict";
 
+exports.checkDateRangeIncludes = util.checkDateRangeIncludes;
 exports.closeIcon = util.closeIcon;
+exports.createFollowElement = util.createFollowElement;
 exports.definePropType = util.definePropType;
 exports.epPropKey = util.epPropKey;
 exports.fade = util.fade;
+exports.followMouseMove = util.followMouseMove;
 exports.getCurWeekDates = util.getCurWeekDates;
 exports.handleBkColor = util.handleBkColor;
 exports.handleEVentClick = util.handleEVentClick;
+exports.handleEmit = util.handleEmit;
 exports.handlePopClose = util.handlePopClose;
 exports.handleProps = util.handleProps;
 exports.handleTimeRange = util.handleTimeRange;
@@ -19,7 +23,9 @@ exports.isDateInCurWeek = util.isDateInCurWeek;
 exports.isTimeGreaterThan = util.isTimeGreaterThan;
 exports.isToday = util.isToday;
 exports.isValidRange = util.isValidRange;
+exports.openPopover = util.openPopover;
 exports.rangeArr = util.rangeArr;
+exports.removeFollowElement = util.removeFollowElement;
 Object.defineProperty(exports, "get", {
 	enumerable: true,
 	get: function () { return lodashEs.get; }

package/lib/control/calendar/components/util/util.cjs

@@ -36,7 +36,7 @@ const handlePopClose = (el) => {
     node.style.display = "none";
   }
 };
-const handleTimeRange = (startTime, endTime, format, partition = "-") => {
+const handleTimeRange = (startTime, endTime, format, partition = "~") => {
   var _a, _b;
   let timeRange = "";
   if (startTime && ((_a = dayjs(startTime)) == null ? void 0 : _a.isValid())) {
@@ -128,6 +128,14 @@ const isToday = (date, curDate) => {
   const state = dateToCheck.getDate() === currentDate.getDate() && dateToCheck.getMonth() === currentDate.getMonth() && dateToCheck.getFullYear() === currentDate.getFullYear();
   return state;
 };
+function checkDateRangeIncludes(start, end, curDate) {
+  const targetDate = dayjs(curDate);
+  const startDate = dayjs(start);
+  const endDate = dayjs(end);
+  if (!targetDate.isValid() || !startDate.isValid() || !endDate.isValid())
+    return false;
+  return targetDate.isSame(startDate, "day") || targetDate.isSame(endDate, "day") || startDate.isBefore(targetDate, "day") && endDate.isAfter(targetDate, "day");
+}
 function hasOwn(obj, key) {
   return Object.prototype.hasOwnProperty.call(obj, key);
 }
@@ -278,6 +286,36 @@ const handleProps = (props) => lodashEs.fromPairs(
     handleProp(option, key)
   ])
 );
+function openPopover(_component, _targetEvt, _opts) {
+  const overlay = ibiz.overlay.createPopover(
+    (modal) => {
+      return vue.h(_component, { modal });
+    },
+    void 0,
+    {
+      width: "auto",
+      height: "auto",
+      noArrow: true,
+      ..._opts
+    }
+  );
+  overlay == null ? void 0 : overlay.present(_targetEvt);
+  return overlay;
+}
+function followMouseMove(_event, _follow) {
+  _follow.style.left = "".concat(_event.clientX + 20, "px");
+  _follow.style.top = "".concat(_event.clientY + 20, "px");
+}
+const createFollowElement = () => {
+  var _a;
+  const followEl = document.createElement("div");
+  followEl.style = "position: fixed; height: 2px; width: 2px; z-index: -1;";
+  (_a = document.body) == null ? void 0 : _a.appendChild(followEl);
+  return followEl;
+};
+const removeFollowElement = (followEl) => {
+  document.body.removeChild(followEl);
+};
 
 Object.defineProperty(exports, "get", {
   enumerable: true,
@@ -299,13 +337,17 @@ Object.defineProperty(exports, "set", {
   enumerable: true,
   get: function () { return lodashEs.set; }
 });
+exports.checkDateRangeIncludes = checkDateRangeIncludes;
 exports.closeIcon = closeIcon;
+exports.createFollowElement = createFollowElement;
 exports.definePropType = definePropType;
 exports.epPropKey = epPropKey;
 exports.fade = fade;
+exports.followMouseMove = followMouseMove;
 exports.getCurWeekDates = getCurWeekDates;
 exports.handleBkColor = handleBkColor;
 exports.handleEVentClick = handleEVentClick;
+exports.handleEmit = handleEmit;
 exports.handlePopClose = handlePopClose;
 exports.handleProps = handleProps;
 exports.handleTimeRange = handleTimeRange;
@@ -313,4 +355,6 @@ exports.isDateInCurWeek = isDateInCurWeek;
 exports.isTimeGreaterThan = isTimeGreaterThan;
 exports.isToday = isToday;
 exports.isValidRange = isValidRange;
+exports.openPopover = openPopover;
 exports.rangeArr = rangeArr;
+exports.removeFollowElement = removeFollowElement;

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

@@ -36,6 +36,12 @@ const CaptionBarControl = /* @__PURE__ */ vue.defineComponent({
      */
     provider: {
       type: Object
+    },
+    /**
+     * @description 业务数据（为修复面板下）
+     */
+    data: {
+      type: Object
     }
   },
   setup() {

package/lib/control/chart/chart.cjs

@@ -223,6 +223,7 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
           width: "100%"
         },
         "max-height": maxHeight.value,
+        "span-method": c.spanMethod.bind(c),
         "header-row-class-name": ns.e("grid-header")
       }, _isSlot(_slot = c.state.gridHeaders.map((column) => {
         return vue.createVNode(vue.resolveComponent("el-table-column"), {
@@ -273,47 +274,51 @@ const ChartControl = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
+    return vue.createVNode(vue.resolveComponent("iBizControlNavigation"), {
       "controller": this.c
     }, {
-      default: () => [vue.createVNode("div", {
-        "id": this.uuid,
-        "class": this.ns.b("chart-container")
-      }, [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
-        }]
-      }, [vue.createVNode("div", {
-        "class": [this.ns.e("chart-grid-container"), this.ns.is(this.c.state.gridPosition, this.c.state.showGrid), this.ns.is("no-grid", !this.c.state.showGrid)]
-      }, [vue.createVNode("div", {
-        "ref": "chartRef",
-        "class": [this.ns.e("chart")]
-      }, [ibiz.i18n.t("control.chart.chartPlaceholder")]), this.showCheck ? vue.createVNode("div", {
-        "ref": "drillDetailRef",
-        "class": this.ns.e("drill-detail"),
-        "style": this.drillDetailPos,
-        "onPointerdown": this.openDrillDetail
-      }, [vue.createVNode("div", {
-        "class": this.ns.em("drill-detail", "item")
-      }, [vue.createVNode("svg", {
-        "viewBox": "0 0 16 16",
-        "xmlns": "http://www.w3.org/2000/svg",
-        "height": "1em",
-        "width": "1em",
-        "focusable": "false",
-        "fill": "currentColor"
-      }, [vue.createVNode("g", {
-        "id": "aspnormal/preview",
-        "stroke-width": "1",
-        "fill-rule": "evenodd"
-      }, [vue.createVNode("path", {
-        "d": "M11.626 0c1.057 0 1.923.818 2 1.855l.005.15v3.411a.6.6 0 0 1-1.192.097l-.008-.097.001-1.348V2.005c0-.41-.31-.749-.705-.799l-.101-.006h-9.62c-.41 0-.75.308-.8.704l-.006.101v11.989c0 .41.308.75.705.8l.101.006h5.906l.017-.004.016-.003h2.074a.598.598 0 1 1 .107 1.187l-.095.01V16H2.006a2.006 2.006 0 0 1-2-1.856L0 13.994V2.005C0 .948.818.082 1.856.005L2.006 0h9.62zm-1.595 6.328a3.669 3.669 0 0 1 3.665 3.665c0 .79-.251 1.523-.678 2.123l2.412 2.412a.6.6 0 1 1-.848.85l-2.41-2.412a3.646 3.646 0 0 1-2.14.692 3.67 3.67 0 0 1-3.667-3.665 3.67 3.67 0 0 1 3.666-3.665zm-5.106 5.29a.6.6 0 0 1 .097 1.191l-.097.008H2.85a.6.6 0 0 1-.097-1.192l.097-.008h2.074zm5.106-4.09a2.468 2.468 0 0 0-2.466 2.465 2.468 2.468 0 0 0 2.466 2.466 2.47 2.47 0 0 0 2.466-2.466 2.469 2.469 0 0 0-2.466-2.465zm-4.815-.126a.6.6 0 0 1 .097 1.193l-.097.007h-2.35A.6.6 0 0 1 2.77 7.41l.098-.008h2.349zm5.58-4a.6.6 0 0 1 .097 1.192l-.097.008H2.867A.6.6 0 0 1 2.77 3.41l.097-.008h7.929z",
-        "id": "asp\u5408\u5E76\u5F62\u72B6"
-      }, null)])]), vue.createVNode("div", {
-        "class": this.ns.em("drill-detail", "item-text")
-      }, [ibiz.i18n.t("control.chart.drillDetail")])])]) : null]), this.c.state.showGrid ? vue.createVNode("div", {
-        "class": this.ns.e("grid")
-      }, [this.renderGrid()]) : null])])]
+      default: () => [vue.createVNode(vue.resolveComponent("iBizControlBase"), {
+        "controller": this.c
+      }, {
+        default: () => [vue.createVNode("div", {
+          "id": this.uuid,
+          "class": this.ns.b("chart-container")
+        }, [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
+          }]
+        }, [vue.createVNode("div", {
+          "class": [this.ns.e("chart-grid-container"), this.ns.is(this.c.state.gridPosition, this.c.state.showGrid), this.ns.is("no-grid", !this.c.state.showGrid)]
+        }, [vue.createVNode("div", {
+          "ref": "chartRef",
+          "class": [this.ns.e("chart")]
+        }, [ibiz.i18n.t("control.chart.chartPlaceholder")]), this.showCheck ? vue.createVNode("div", {
+          "ref": "drillDetailRef",
+          "class": this.ns.e("drill-detail"),
+          "style": this.drillDetailPos,
+          "onPointerdown": this.openDrillDetail
+        }, [vue.createVNode("div", {
+          "class": this.ns.em("drill-detail", "item")
+        }, [vue.createVNode("svg", {
+          "viewBox": "0 0 16 16",
+          "xmlns": "http://www.w3.org/2000/svg",
+          "height": "1em",
+          "width": "1em",
+          "focusable": "false",
+          "fill": "currentColor"
+        }, [vue.createVNode("g", {
+          "id": "aspnormal/preview",
+          "stroke-width": "1",
+          "fill-rule": "evenodd"
+        }, [vue.createVNode("path", {
+          "d": "M11.626 0c1.057 0 1.923.818 2 1.855l.005.15v3.411a.6.6 0 0 1-1.192.097l-.008-.097.001-1.348V2.005c0-.41-.31-.749-.705-.799l-.101-.006h-9.62c-.41 0-.75.308-.8.704l-.006.101v11.989c0 .41.308.75.705.8l.101.006h5.906l.017-.004.016-.003h2.074a.598.598 0 1 1 .107 1.187l-.095.01V16H2.006a2.006 2.006 0 0 1-2-1.856L0 13.994V2.005C0 .948.818.082 1.856.005L2.006 0h9.62zm-1.595 6.328a3.669 3.669 0 0 1 3.665 3.665c0 .79-.251 1.523-.678 2.123l2.412 2.412a.6.6 0 1 1-.848.85l-2.41-2.412a3.646 3.646 0 0 1-2.14.692 3.67 3.67 0 0 1-3.667-3.665 3.67 3.67 0 0 1 3.666-3.665zm-5.106 5.29a.6.6 0 0 1 .097 1.191l-.097.008H2.85a.6.6 0 0 1-.097-1.192l.097-.008h2.074zm5.106-4.09a2.468 2.468 0 0 0-2.466 2.465 2.468 2.468 0 0 0 2.466 2.466 2.47 2.47 0 0 0 2.466-2.466 2.469 2.469 0 0 0-2.466-2.465zm-4.815-.126a.6.6 0 0 1 .097 1.193l-.097.007h-2.35A.6.6 0 0 1 2.77 7.41l.098-.008h2.349zm5.58-4a.6.6 0 0 1 .097 1.192l-.097.008H2.867A.6.6 0 0 1 2.77 3.41l.097-.008h7.929z",
+          "id": "asp\u5408\u5E76\u5F62\u72B6"
+        }, null)])]), vue.createVNode("div", {
+          "class": this.ns.em("drill-detail", "item-text")
+        }, [ibiz.i18n.t("control.chart.drillDetail")])])]) : null]), this.c.state.showGrid ? vue.createVNode("div", {
+          "class": this.ns.e("grid")
+        }, [this.renderGrid()]) : null])])]
+      })]
     });
   }
 });

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

@@ -37,7 +37,7 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
       showTypeDir.value = type === "left";
     };
     const getPortletModelByCodeName = (codeName) => {
-      const app = ibiz.hub.getApp(ibiz.env.appId);
+      const app = ibiz.hub.getApp(props.dashboard.model.appId);
       if (app.model.appPortlets) {
         const appPortlet = app.model.appPortlets.find((portlet) => {
           var _a;
@@ -71,14 +71,18 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
       return tempModelDatas;
     };
     const handleCustomModelChange = async (args) => {
-      var _a;
+      var _a, _b;
       const filterModels = (_a = props.dashboard.model.controls) == null ? void 0 : _a.filter((element) => {
         return element.portletType === "FILTER";
       });
+      const noFilterModels = (_b = props.dashboard.model.controls) == null ? void 0 : _b.filter((element) => {
+        return element.portletType !== "FILTER";
+      });
       if (args.model && args.model.length > 0) {
         await props.dashboard.initPortlets(args.model);
       } else if (filterModels && filterModels.length > 0) {
         await props.dashboard.initPortlets(filterModels);
+        await props.dashboard.initPortlets(noFilterModels || []);
       }
       await props.dashboard.initPortletsConfig(args.config);
     };

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

@@ -113,7 +113,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
     };
     const prepareData = async () => {
       const list3 = [];
-      const app = ibiz.hub.getApp(ibiz.env.appId);
+      const app = ibiz.hub.getApp(c.model.appId);
       if (c.model.customizeMode === 2) {
         const dynamicPortlets = await c.loadAllDynaPortlet();
         dynamicPortlets == null ? void 0 : dynamicPortlets.forEach((portlet) => {
@@ -212,7 +212,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const getPortletModelByCodeName = (tag) => {
-      const app = ibiz.hub.getApp(ibiz.env.appId);
+      const app = ibiz.hub.getApp(c.model.appId);
       if (app.model.appPortlets) {
         const appPortlet = app.model.appPortlets.find((portlet) => {
           var _a;

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

@@ -145,7 +145,7 @@ function calculatePositions(items, parentPos) {
 function loadDefaultLayoutModel(dashboard, customDashboard) {
   var _a;
   const { layoutRowH, layoutColNum } = customDashboard;
-  const app = ibiz.hub.getApp(ibiz.env.appId);
+  const app = ibiz.hub.getApp(dashboard.model.appId);
   const recursivePortlePart = (container, parentPos) => {
     const { controls, layout } = container;
     const children = (controls == null ? void 0 : controls.filter((child) => !!child.layoutPos)) || [];

package/lib/control/dashboard/dashboard.cjs

@@ -2,9 +2,9 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./dashboard.css');
 var runtime = require('@ibiz-template/runtime');
 var lodashEs = require('lodash-es');
+require('./dashboard.css');
 
 "use strict";
 function _isSlot(s) {
@@ -76,6 +76,7 @@ const DashboardControl = /* @__PURE__ */ vue.defineComponent({
   },
   setup() {
     const c = vue3Util.useControlController((...args) => new runtime.DashboardController(...args));
+    vue3Util.useControlPopoverzIndex(c);
     const vue$1 = vue.getCurrentInstance().proxy;
     const customModelDatas = vue.ref([]);
     const anchorList = vue.ref([]);
@@ -100,7 +101,7 @@ const DashboardControl = /* @__PURE__ */ vue.defineComponent({
         return item.id === name;
       });
       if (targetIndex !== -1) {
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const app = ibiz.hub.getApp(c.model.appId);
         const model = await c.loadDynaPortletById("".concat(app.model.codeName, ".").concat(name));
         if (model) {
           refreshTagObj[model.id] = {

package/lib/control/dashboard/dashboard.css

@@ -1 +1 @@
-.ibiz-control-dashboard{position:relative;align-content:flex-start;height:100%;overflow-y:scroll}.ibiz-control-dashboard .ibiz-control-dashboard-build-btn{position:absolute;right:0;z-index:10}
+.ibiz-control-dashboard{position:relative;align-content:flex-start;height:100%;overflow-y:auto}.ibiz-control-dashboard .ibiz-control-dashboard-build-btn{position:absolute;right:0;z-index:10}

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

@@ -20,11 +20,13 @@ const ActionBarPortlet = /* @__PURE__ */ vue.defineComponent({
   setup(props) {
     var _a;
     const ns = vue3Util.useNamespace("portlet-".concat((_a = props.modelData.portletType) == null ? void 0 : _a.toLowerCase()));
+    const zIndex = props.controller.dashboard.state.zIndex;
     const onActionClick = async (detail, event) => {
       await props.controller.onActionClick(detail, event);
     };
     return {
       ns,
+      zIndex,
       onActionClick
     };
   },
@@ -35,6 +37,7 @@ const ActionBarPortlet = /* @__PURE__ */ vue.defineComponent({
       "class": classArr
     }, {
       default: () => [this.modelData.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
+        "zIndex": this.zIndex,
         "action-details": this.modelData.uiactionGroup.uiactionGroupDetails,
         "actions-state": this.controller.state.actionGroupState,
         "onActionClick": this.onActionClick

package/lib/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.css

@@ -1 +1 @@
-.ibiz-control-appmenu-portlet{--ibiz-control-appmenu-portlet-margin:var(--ibiz-spacing-base-tight);--ibiz-control-appmenu-portlet-border-color:var(--ibiz-color-primary);--ibiz-control-appmenu-portlet-bg-color:var(--ibiz-color-bg-0);--ibiz-control-appmenu-portlet-padding:var(--ibiz-spacing-base-tight)}.ibiz-control-appmenu-portlet__content{display:flex;flex-wrap:wrap;width:100%}.ibiz-control-appmenu-portlet-item{position:relative;display:flex;flex-direction:column;flex-shrink:0;align-items:flex-start;justify-content:center;width:calc(25% - var(--ibiz-control-appmenu-portlet-margin) * 2);padding:var(--ibiz-control-appmenu-portlet-padding);margin:var(--ibiz-control-appmenu-portlet-margin);cursor:pointer;background-color:var(--ibiz-control-appmenu-portlet-bg-color)}.ibiz-control-appmenu-portlet-item::before{position:absolute;left:0;width:4px;height:100%;content:"";background-color:var(--ibiz-control-appmenu-portlet-border-color)}.ibiz-control-appmenu-portlet-group{width:100%}.ibiz-control-appmenu-portlet-group .el-collapse-item__content{display:flex;flex-wrap:wrap}
+.ibiz-control-appmenu-portlet{--ibiz-control-appmenu-portlet-margin:var(--ibiz-spacing-base-tight);--ibiz-control-appmenu-portlet-border-color:var(--ibiz-color-primary);--ibiz-control-appmenu-portlet-bg-color:var(--ibiz-color-bg-0);--ibiz-control-appmenu-portlet-padding:var(--ibiz-spacing-base-tight);--ibiz-control-appmenu-portlet-content-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);padding:var(--ibiz-control-appmenu-portlet-content-padding)}.ibiz-control-appmenu-portlet__content{display:flex;flex-wrap:wrap;width:100%}.ibiz-control-appmenu-portlet-item{position:relative;display:flex;flex-direction:column;flex-shrink:0;align-items:flex-start;justify-content:center;width:calc(25% - var(--ibiz-control-appmenu-portlet-margin) * 2);padding:var(--ibiz-control-appmenu-portlet-padding);margin:var(--ibiz-control-appmenu-portlet-margin);cursor:pointer;background-color:var(--ibiz-control-appmenu-portlet-bg-color)}.ibiz-control-appmenu-portlet-item::before{position:absolute;left:0;width:4px;height:100%;content:"";background-color:var(--ibiz-control-appmenu-portlet-border-color)}.ibiz-control-appmenu-portlet-group{width:100%}.ibiz-control-appmenu-portlet-group .el-collapse-item__content{display:flex;flex-wrap:wrap}