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

package/es/control/calendar/components/custom-calendar/custom-calendar.mjs

@@ -1,14 +1,14 @@
-import { onMounted, createVNode, resolveComponent, defineComponent } from 'vue';
+import { defineComponent, createVNode, resolveComponent } from 'vue';
 import dayjs from 'dayjs';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { showTitle } from '@ibiz-template/core';
 import { IBizCalendarDaily } from '../calendar-daily/index.mjs';
 import { IBizCalendarWeek } from '../calendar-week/index.mjs';
 import { IBizCalendarUser } from '../calendar-user/index.mjs';
-import { useCustomCalendar } from './use-custom-calendar.mjs';
+import { useCustomCalendar, calcCurrentWeekRange } from './use-custom-calendar.mjs';
 import './custom-calendar.css';
 import '../interface/index.mjs';
-import { customCalendarProps, customCalendarEmits } from '../interface/custom-calendar.mjs';
+import { customCalendarEmits, customCalendarProps } from '../interface/custom-calendar.mjs';
 
 "use strict";
 const CustomCalendar = /* @__PURE__ */ defineComponent({
@@ -34,12 +34,10 @@ const CustomCalendar = /* @__PURE__ */ defineComponent({
       pickDay,
       handleEVentClick,
       handleEVentDblClick,
+      handleEventContextmenu,
       selectDate,
       selectLegend
     } = useCustomCalendar(props, emit, "custom-calendar");
-    onMounted(() => {
-      pickDay(dayjs(/* @__PURE__ */ new Date()));
-    });
     const renderWeek = () => {
       var _a;
       return createVNode("div", {
@@ -64,13 +62,10 @@ const CustomCalendar = /* @__PURE__ */ defineComponent({
         }, [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), createVNode("div", {
           "class": ns.em("calendar-week", "legend-item-text"),
-          "style": {
-            color: item.isShow ? item.color : "#CCCCCC"
-          },
           "title": showTitle(item.name)
         }, [item.name])]);
       })]), createVNode("div", {
@@ -89,7 +84,8 @@ const CustomCalendar = /* @__PURE__ */ 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 = () => {
@@ -116,13 +112,10 @@ const CustomCalendar = /* @__PURE__ */ defineComponent({
         }, [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), createVNode("div", {
           "class": ns.em("calendar-week", "legend-item-text"),
-          "style": {
-            color: item.isShow ? item.color : "#CCCCCC"
-          },
           "title": showTitle(item.name)
         }, [item.name])]);
       })]), createVNode("div", {
@@ -131,28 +124,50 @@ const CustomCalendar = /* @__PURE__ */ 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)])]), createVNode("div", {
         "class": ns.em("calendar-week", "text-secondary")
       }, [curWeek.value])]), createVNode(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 createVNode(IBizCalendarUser, {
+      const weekRange = calcCurrentWeekRange(new Date(realSelectedDay.value));
+      return createVNode("div", {
+        "class": [ns.e("calendar-user")]
+      }, [createVNode("div", {
+        "class": [ns.e("calendar-user-header")]
+      }, [createVNode("div", {
+        "class": ns.em("calendar-user-header", "left")
+      }, [weekRange.map((_date) => {
+        return dayjs(new Date(_date)).format("YYYY-MM-DD");
+      }).join(" ~ ")]), createVNode("div", {
+        "class": ns.em("calendar-user-header", "right")
+      }, [createVNode(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)])]), createVNode(IBizCalendarUser, {
         "selected-day": realSelectedDay.value,
         "events": events.value,
         "onEventClick": (value) => handleEVentClick(value),
         "onEventDblClick": (value) => handleEVentDblClick(value)
-      }, slots);
+      }, slots)]);
     };
     const renderContent = () => {
       switch (viewType.value) {

package/es/control/calendar/components/custom-calendar/use-custom-calendar.mjs

@@ -211,6 +211,9 @@ const useCustomCalendar = (props, emit, _componentName) => {
   const handleEVentDblClick = (value) => {
     emit("eventDblClick", value);
   };
+  const handleEventContextmenu = (value) => {
+    emit("eventContextmenu", value);
+  };
   const curWeek = computed(() => {
     let tempWeek = "";
     if (realSelectedDay.value) {
@@ -257,8 +260,28 @@ 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];
+}
 
-export { useCustomCalendar };
+export { calcCurrentWeekRange, useCustomCalendar };

package/es/control/calendar/components/interface/calendar-daily.mjs

@@ -1,5 +1,5 @@
 import '../util/index.mjs';
-import { definePropType, handleProps } from '../util/util.mjs';
+import { handleProps, definePropType } from '../util/util.mjs';
 import { isObject } from 'lodash-es';
 
 "use strict";
@@ -20,12 +20,17 @@ const calendarDailyProps = handleProps({
   },
   selectedData: {
     type: Object
+  },
+  showDetail: {
+    type: Boolean,
+    default: false
   }
 });
 const calendarDailyEmits = {
   pick: (value) => isObject(value),
   eventClick: (value) => value,
-  eventDblClick: (value) => value
+  eventDblClick: (value) => value,
+  eventContextmenu: (_value) => _value
 };
 
 export { calendarDailyEmits, calendarDailyProps };

package/es/control/calendar/components/interface/calendar-user.mjs

@@ -1,5 +1,5 @@
 import '../util/index.mjs';
-import { definePropType, handleProps } from '../util/util.mjs';
+import { handleProps, definePropType } from '../util/util.mjs';
 
 "use strict";
 const calendarUserProps = handleProps({

package/es/control/calendar/components/interface/calendar-week.mjs

@@ -1,5 +1,5 @@
 import '../util/index.mjs';
-import { definePropType, handleProps } from '../util/util.mjs';
+import { handleProps, definePropType } from '../util/util.mjs';
 import { isObject } from 'lodash-es';
 
 "use strict";
@@ -29,7 +29,8 @@ const calendarWeekProps = handleProps({
 const calendarWeekEmits = {
   pick: (value) => isObject(value),
   eventClick: (value) => value,
-  eventDblClick: (value) => value
+  eventDblClick: (value) => value,
+  eventContextmenu: (_value) => _value
 };
 
 export { calendarWeekEmits, calendarWeekProps };

package/es/control/calendar/components/interface/custom-calendar.mjs

@@ -1,8 +1,8 @@
 import '../util/index.mjs';
 import '../constant/index.mjs';
 import { isArray, isDate } from 'lodash-es';
-import { definePropType, handleProps } from '../util/util.mjs';
-import { UPDATE_MODEL_EVENT, INPUT_EVENT, CHANGE_EVENT, EVENT_CLICK_EVENT, EVENT_DBL_CLICK_EVENT } from '../constant/event.mjs';
+import { handleProps, definePropType } from '../util/util.mjs';
+import { EVENT_CONTEXT_MENU, EVENT_DBL_CLICK_EVENT, EVENT_CLICK_EVENT, CHANGE_EVENT, INPUT_EVENT, UPDATE_MODEL_EVENT } from '../constant/event.mjs';
 
 "use strict";
 const isValidRange = (range) => isArray(range) && range.length === 2 && range.every((item) => isDate(item));
@@ -66,7 +66,8 @@ const customCalendarEmits = {
   [INPUT_EVENT]: (value) => isDate(value),
   [CHANGE_EVENT]: (value) => isDate(value),
   [EVENT_CLICK_EVENT]: (value) => value,
-  [EVENT_DBL_CLICK_EVENT]: (value) => value
+  [EVENT_DBL_CLICK_EVENT]: (value) => value,
+  [EVENT_CONTEXT_MENU]: (_value) => _value
 };
 
 export { customCalendarEmits, customCalendarProps };

package/es/control/calendar/components/util/index.mjs

@@ -1,4 +1,4 @@
-export { closeIcon, definePropType, epPropKey, fade, getCurWeekDates, handleBkColor, handleEVentClick, handlePopClose, handleProps, handleTimeRange, isDateInCurWeek, isTimeGreaterThan, isToday, isValidRange, rangeArr } from './util.mjs';
+export { checkDateRangeIncludes, closeIcon, createFollowElement, definePropType, epPropKey, fade, followMouseMove, getCurWeekDates, handleBkColor, handleEVentClick, handleEmit, handlePopClose, handleProps, handleTimeRange, isDateInCurWeek, isTimeGreaterThan, isToday, isValidRange, openPopover, rangeArr, removeFollowElement } from './util.mjs';
 export { get, isArray, isDate, isObject, set } from 'lodash-es';
 
 "use strict";

package/es/control/calendar/components/util/util.mjs

@@ -1,4 +1,4 @@
-import { warn } from 'vue';
+import { warn, h } from 'vue';
 import dayjs from 'dayjs';
 import { clone } from 'ramda';
 import { isObject, isArray, isDate, fromPairs } from 'lodash-es';
@@ -35,7 +35,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())) {
@@ -127,6 +127,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);
 }
@@ -277,5 +285,35 @@ const handleProps = (props) => fromPairs(
     handleProp(option, key)
   ])
 );
+function openPopover(_component, _targetEvt, _opts) {
+  const overlay = ibiz.overlay.createPopover(
+    (modal) => {
+      return 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);
+};
 
-export { closeIcon, definePropType, epPropKey, fade, getCurWeekDates, handleBkColor, handleEVentClick, handlePopClose, handleProps, handleTimeRange, isDateInCurWeek, isTimeGreaterThan, isToday, isValidRange, rangeArr };
+export { checkDateRangeIncludes, closeIcon, createFollowElement, definePropType, epPropKey, fade, followMouseMove, getCurWeekDates, handleBkColor, handleEVentClick, handleEmit, handlePopClose, handleProps, handleTimeRange, isDateInCurWeek, isTimeGreaterThan, isToday, isValidRange, openPopover, rangeArr, removeFollowElement };

package/es/control/calendar/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { CalendarControl } from './calendar.mjs';
 import { CalendarProvider } from './calendar.provider.mjs';

package/es/control/caption-bar/caption-bar.mjs

@@ -1,4 +1,4 @@
-import { onActivated, computed, resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, resolveComponent, onActivated, computed } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { CaptionBarController } from '@ibiz-template/runtime';
 import './caption-bar.css';
@@ -34,6 +34,12 @@ const CaptionBarControl = /* @__PURE__ */ defineComponent({
      */
     provider: {
       type: Object
+    },
+    /**
+     * @description 业务数据（为修复面板下）
+     */
+    data: {
+      type: Object
     }
   },
   setup() {

package/es/control/caption-bar/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { CaptionBarControl } from './caption-bar.mjs';
 import { CaptionBarProvider } from './caption-bar.provider.mjs';

package/es/control/chart/chart.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, watch, nextTick, onMounted, resolveComponent, createVNode, onBeforeUnmount, defineComponent } from 'vue';
+import { defineComponent, isVNode, createVNode, resolveComponent, ref, watch, nextTick, onMounted, onBeforeUnmount } from 'vue';
 import { useControlController, useNamespace, hasEmptyPanelRenderer, IBizCustomRender } from '@ibiz-template/vue3-util';
 import { init } from 'echarts';
 import { createUUID } from 'qx-util';
@@ -219,6 +219,7 @@ const ChartControl = /* @__PURE__ */ 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 createVNode(resolveComponent("el-table-column"), {
@@ -269,47 +270,51 @@ const ChartControl = /* @__PURE__ */ defineComponent({
     };
   },
   render() {
-    return createVNode(resolveComponent("iBizControlBase"), {
+    return createVNode(resolveComponent("iBizControlNavigation"), {
       "controller": this.c
     }, {
-      default: () => [createVNode("div", {
-        "id": this.uuid,
-        "class": this.ns.b("chart-container")
-      }, [this.renderNoData(), 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
-        }]
-      }, [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)]
-      }, [createVNode("div", {
-        "ref": "chartRef",
-        "class": [this.ns.e("chart")]
-      }, [ibiz.i18n.t("control.chart.chartPlaceholder")]), this.showCheck ? createVNode("div", {
-        "ref": "drillDetailRef",
-        "class": this.ns.e("drill-detail"),
-        "style": this.drillDetailPos,
-        "onPointerdown": this.openDrillDetail
-      }, [createVNode("div", {
-        "class": this.ns.em("drill-detail", "item")
-      }, [createVNode("svg", {
-        "viewBox": "0 0 16 16",
-        "xmlns": "http://www.w3.org/2000/svg",
-        "height": "1em",
-        "width": "1em",
-        "focusable": "false",
-        "fill": "currentColor"
-      }, [createVNode("g", {
-        "id": "aspnormal/preview",
-        "stroke-width": "1",
-        "fill-rule": "evenodd"
-      }, [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)])]), createVNode("div", {
-        "class": this.ns.em("drill-detail", "item-text")
-      }, [ibiz.i18n.t("control.chart.drillDetail")])])]) : null]), this.c.state.showGrid ? createVNode("div", {
-        "class": this.ns.e("grid")
-      }, [this.renderGrid()]) : null])])]
+      default: () => [createVNode(resolveComponent("iBizControlBase"), {
+        "controller": this.c
+      }, {
+        default: () => [createVNode("div", {
+          "id": this.uuid,
+          "class": this.ns.b("chart-container")
+        }, [this.renderNoData(), 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
+          }]
+        }, [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)]
+        }, [createVNode("div", {
+          "ref": "chartRef",
+          "class": [this.ns.e("chart")]
+        }, [ibiz.i18n.t("control.chart.chartPlaceholder")]), this.showCheck ? createVNode("div", {
+          "ref": "drillDetailRef",
+          "class": this.ns.e("drill-detail"),
+          "style": this.drillDetailPos,
+          "onPointerdown": this.openDrillDetail
+        }, [createVNode("div", {
+          "class": this.ns.em("drill-detail", "item")
+        }, [createVNode("svg", {
+          "viewBox": "0 0 16 16",
+          "xmlns": "http://www.w3.org/2000/svg",
+          "height": "1em",
+          "width": "1em",
+          "focusable": "false",
+          "fill": "currentColor"
+        }, [createVNode("g", {
+          "id": "aspnormal/preview",
+          "stroke-width": "1",
+          "fill-rule": "evenodd"
+        }, [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)])]), createVNode("div", {
+          "class": this.ns.em("drill-detail", "item-text")
+        }, [ibiz.i18n.t("control.chart.drillDetail")])])]) : null]), this.c.state.showGrid ? createVNode("div", {
+          "class": this.ns.e("grid")
+        }, [this.renderGrid()]) : null])])]
+      })]
     });
   }
 });

package/es/control/chart/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { ControlLoadingPlaceholder } from '@ibiz-template/vue3-util';
 import { defineAsyncComponent } from 'vue';
 import { ChartProvider } from './chart.provider.mjs';

package/es/control/context-menu/context-menu.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, watch, resolveComponent, createVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent, ref, watch } from 'vue';
 import { useControlController, useNamespace, usePopoverVisible, usePopoverzIndex } from '@ibiz-template/vue3-util';
 import './context-menu.css';
 import { ContextMenuController } from '@ibiz-template/runtime';

package/es/control/context-menu/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { ContextMenuControl } from './context-menu.mjs';
 import { ContextMenuProvider } from './context-menu.provider.mjs';

package/es/control/dashboard/custom-dashboard-container/custom-dashboard-container.mjs

@@ -1,4 +1,4 @@
-import { reactive, ref, nextTick, onMounted, resolveComponent, createVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
+import { defineComponent, withDirectives, createVNode, resolveComponent, resolveDirective, reactive, ref, nextTick, onMounted } from 'vue';
 import { CustomDashboardController } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './custom-dashboard-container.css';
@@ -35,7 +35,7 @@ const CustomDashboardContainer = /* @__PURE__ */ 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;
@@ -69,14 +69,18 @@ const CustomDashboardContainer = /* @__PURE__ */ 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/es/control/dashboard/dashboard-design/dashboard-design.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, computed, watch, onUnmounted, resolveComponent, createVNode, h, createTextVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent, h, createTextVNode, withDirectives, resolveDirective, ref, computed, watch, onUnmounted } from 'vue';
 import { getPortletProvider } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { showTitle } from '@ibiz-template/core';
@@ -111,7 +111,7 @@ const DashboardDesign = /* @__PURE__ */ 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) => {
@@ -210,7 +210,7 @@ const DashboardDesign = /* @__PURE__ */ 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/es/control/dashboard/dashboard-design/dashboard-design.util.mjs

@@ -143,7 +143,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/es/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/es/control/dashboard/dashboard.mjs

@@ -1,8 +1,8 @@
-import { isVNode, createVNode, resolveComponent, h, getCurrentInstance, ref, isReactive, reactive, defineComponent } from 'vue';
-import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
-import './dashboard.css';
+import { isVNode, createVNode, resolveComponent, h, defineComponent, getCurrentInstance, ref, isReactive, reactive } from 'vue';
+import { useControlController, useControlPopoverzIndex, useNamespace } from '@ibiz-template/vue3-util';
 import { DashboardController } from '@ibiz-template/runtime';
 import { uniqueId } from 'lodash-es';
+import './dashboard.css';
 
 "use strict";
 function _isSlot(s) {
@@ -74,6 +74,7 @@ const DashboardControl = /* @__PURE__ */ defineComponent({
   },
   setup() {
     const c = useControlController((...args) => new DashboardController(...args));
+    useControlPopoverzIndex(c);
     const vue = getCurrentInstance().proxy;
     const customModelDatas = ref([]);
     const anchorList = ref([]);
@@ -98,7 +99,7 @@ const DashboardControl = /* @__PURE__ */ 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/es/control/dashboard/index.mjs

@@ -1,4 +1,4 @@
-import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import { registerControlProvider, ControlType } from '@ibiz-template/runtime';
 import { withInstall } from '@ibiz-template/vue3-util';
 import { DashboardControl } from './dashboard.mjs';
 import { DashboardDesign } from './dashboard-design/dashboard-design.mjs';

package/es/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.mjs

@@ -1,4 +1,4 @@
-import { resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, resolveComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { ActionBarPortletController } from '@ibiz-template/runtime';
 
@@ -18,11 +18,13 @@ const ActionBarPortlet = /* @__PURE__ */ defineComponent({
   setup(props) {
     var _a;
     const ns = 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
     };
   },
@@ -33,6 +35,7 @@ const ActionBarPortlet = /* @__PURE__ */ defineComponent({
       "class": classArr
     }, {
       default: () => [this.modelData.uiactionGroup && createVNode(resolveComponent("iBizActionToolbar"), {
+        "zIndex": this.zIndex,
         "action-details": this.modelData.uiactionGroup.uiactionGroupDetails,
         "actions-state": this.controller.state.actionGroupState,
         "onActionClick": this.onActionClick

package/es/control/dashboard/portlet/chart-portlet/chart-portlet.mjs

@@ -1,6 +1,6 @@
-import { isVNode, onMounted, onBeforeUnmount, resolveComponent, h, createVNode, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent, h, onMounted, onBeforeUnmount } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
-import { ChartPortletController, ControlType } from '@ibiz-template/runtime';
+import { ControlType, ChartPortletController } from '@ibiz-template/runtime';
 
 "use strict";
 function _isSlot(s) {