@ibiz-template/vue3-components 0.7.41-alpha.23 → 0.7.41-alpha.25

package/lib/common/action-toolbar/action-toolbar.cjs

@@ -40,6 +40,10 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
     // 二者区别在于：行为回调为同步执行（主要解决pop打开视图位置异常），action-click为异步执行（不关心执行是否完成）
     actionCallBack: {
       type: Function
+    },
+    direction: {
+      type: String,
+      default: "horizontal"
     }
   },
   setup(props, {
@@ -89,10 +93,11 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       });
     }
     const calcActionItemClass = (item) => {
+      var _a2;
       const {
         actionLevel
       } = item;
-      return [ns.e("item"), ns.is("disabled", false), ns.em("item", "level-".concat(actionLevel))];
+      return [ns.e("item"), (_a2 = item.sysCss) == null ? void 0 : _a2.codeName, ns.em("item", "level-".concat(actionLevel))];
     };
     const popoverIndex = props.zIndex;
     return {
@@ -111,10 +116,11 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
     var _a;
     const details = this.actionDetails || [];
     const renderDivider = (isExpand) => {
+      const ishorizontal = isExpand && this.direction === "horizontal";
       return vue.createVNode(vue.resolveComponent("el-divider"), {
         "class": this.ns.e("separator"),
         "border-style": "double",
-        "direction": isExpand ? "vertical" : "horizontal"
+        "direction": ishorizontal ? "vertical" : "horizontal"
       }, null);
     };
     const renderActionGroup = (detail, isExpand = true) => {
@@ -122,15 +128,17 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       const actionGroup = detail.refUIActionGroup;
       if (!((_a2 = actionGroup == null ? void 0 : actionGroup.uiactionGroupDetails) == null ? void 0 : _a2.length))
         return null;
-      const pvisible = actionGroup.uiactionGroupDetails.findIndex((item) => {
-        return this.actionsState[item.id].visible === true;
-      }) !== -1;
+      const pvisible = actionGroup.uiactionGroupDetails.some((item) => {
+        return this.actionsState[item.id].visible;
+      });
       if (!pvisible)
         return null;
+      const ishorizontal = isExpand && this.direction === "horizontal";
       return [detail.addSeparator && renderDivider(isExpand), vue.createVNode(vue.resolveComponent("el-popover"), {
+        "trigger": "click",
         "teleported": false,
-        "placement": "right-start",
         "popper-class": this.ns.e("popover"),
+        "placement": ishorizontal ? "bottom" : "right-start",
         "popper-options": {
           modifiers: [{
             name: "offset",
@@ -149,14 +157,14 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
           }, {
             default: () => [vue.createVNode("div", {
               "class": this.ns.em("group-item", "caption")
-            }, [vue.createVNode("span", null, [actionGroup.id]), vue.createVNode("ion-icon", {
+            }, [vue.createVNode("span", null, [actionGroup.name || actionGroup.id]), vue.createVNode("ion-icon", {
               "class": this.ns.em("group-item", "caption-icon"),
-              "name": "chevron-forward-outline"
+              "name": ishorizontal ? "chevron-down-outline" : "chevron-forward-outline"
             }, null)])]
           });
         },
         default: () => {
-          return renderActions(actionGroup.uiactionGroupDetails || [], isExpand);
+          return renderActions(actionGroup.uiactionGroupDetails || [], false);
         }
       })];
     };
@@ -164,7 +172,7 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
       return items.map((detail) => {
         var _a2;
         if (detail.detailType === "DEUIACTIONGROUP" && detail.refUIActionGroup)
-          return renderActionGroup(detail);
+          return renderActionGroup(detail, isExpand);
         if ((_a2 = this.actionsState[detail.id]) == null ? void 0 : _a2.visible) {
           return [detail.addSeparator && renderDivider(isExpand), vue.createVNode(vue.resolveComponent("el-button"), {
             "text": true,
@@ -248,10 +256,10 @@ const IBizActionToolbar = /* @__PURE__ */ vue.defineComponent({
         default: () => [details.length > 0 && details.map((detail) => {
           if (this.actionsState[detail.id].visible) {
             return vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-              "class": [this.ns.e("item"), this.ns.is("disabled", false)],
+              "command": detail,
               "title": core.showTitle(detail.tooltip),
-              "disabled": this.actionsState[detail.id].disabled,
-              "command": detail
+              "class": this.calcActionItemClass(detail),
+              "disabled": this.actionsState[detail.id].disabled
             }, {
               default: () => [detail.showIcon && detail.sysImage && vue.createVNode(vue.resolveComponent("iBizIcon"), {
                 "icon": detail.sysImage

package/lib/common/action-toolbar/action-toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-action-toolbar{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);display:flex;flex-wrap:wrap}.ibiz-action-toolbar__item{padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__item--icon.is-has-icon{display:flex;align-items:baseline;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-width-icon-medium)}.ibiz-action-toolbar__item--label.is-has-caption{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__item+.ibiz-action-toolbar__item{margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__group-item>span{width:100%}.ibiz-action-toolbar__group-item--caption{display:flex;align-items:center;justify-content:space-between;width:100%}.ibiz-action-toolbar__separator{height:auto}.ibiz-action-toolbar__popover{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-action-toolbar-popover-padding)}.ibiz-action-toolbar__popover .el-button{--el-button-size:getCssVar("height-control", "large");display:block;width:100%;padding:var(--ibiz-action-toolbar-popover-button-padding);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-action-toolbar-popover-button-color);text-align:left;border-radius:0}.ibiz-action-toolbar__popover .el-button:hover{background-color:var(--ibiz-action-toolbar-popover-button-hover-bg)}.ibiz-action-toolbar__popover .el-button .ibiz-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__popover .ibiz-action-toolbar__separator{margin:var(--ibiz-spacing-none)}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption{cursor:pointer}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption-icon{vertical-align:bottom}
+@charset "UTF-8";.ibiz-action-toolbar{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);display:flex;flex-wrap:wrap}.ibiz-action-toolbar__item{padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__item--icon.is-has-icon{display:flex;align-items:baseline;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-width-icon-medium)}.ibiz-action-toolbar__item--label.is-has-caption{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__item+.ibiz-action-toolbar__item{margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__group-item>span{width:100%}.ibiz-action-toolbar__group-item--caption{display:flex;gap:var(--ibiz-spacing-extra-tight);align-items:center;justify-content:space-between;width:100%}.ibiz-action-toolbar__separator{height:auto}.ibiz-action-toolbar__popover{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-action-toolbar-popover-padding)}.ibiz-action-toolbar__popover .el-button{--el-button-size:getCssVar("height-control", "large");display:block;width:100%;padding:var(--ibiz-action-toolbar-popover-button-padding);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-action-toolbar-popover-button-color);text-align:left;border-radius:0}.ibiz-action-toolbar__popover .el-button:hover{background-color:var(--ibiz-action-toolbar-popover-button-hover-bg)}.ibiz-action-toolbar__popover .el-button .ibiz-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__popover .ibiz-action-toolbar__separator{margin:var(--ibiz-spacing-none)}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption{cursor:pointer}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption-icon{vertical-align:bottom}

package/lib/common/button-list/button-list.cjs

@@ -8,9 +8,6 @@ require('./button-list.css');
 var buttonUtil = require('../../util/button-util/button-util.cjs');
 
 "use strict";
-function _isSlot(s) {
-  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
-}
 const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
   name: "IBizButtonList",
   props: {
@@ -34,6 +31,9 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
     emit
   }) {
     const ns = vue3Util.useNamespace("button-list");
+    const {
+      zIndex
+    } = vue3Util.useUIStore();
     const dropdown = vue.ref();
     const componentRef = vue.ref();
     const {
@@ -139,27 +139,76 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
         (_d = (_c = dropdown.value) == null ? void 0 : _c.handleOpen) == null ? void 0 : _d.call(_c);
       }
     };
-    const renderButton = (item, type) => {
-      var _a, _b, _c, _d;
-      if (((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible) === false)
+    const renderActionGroup = (detail, isFlatten) => {
+      var _a;
+      const actionGroup = detail.refUIActionGroup;
+      if (!((_a = actionGroup == null ? void 0 : actionGroup.uiactionGroupDetails) == null ? void 0 : _a.length))
         return null;
-      return vue.createVNode(vue.resolveComponent("el-button"), {
-        "class": [ns.e("item"), ns.em("item", "".concat((_b = item.id) == null ? void 0 : _b.toLowerCase())), "".concat(((_c = item.sysCss) == null ? void 0 : _c.cssName) || "")],
-        "type": type || buttonUtil.convertBtnType(item.buttonStyle),
-        "title": item.tooltip || item.caption,
-        "disabled": ((_d = props.buttonsState[item.id]) == null ? void 0 : _d.disabled) || props.disabled,
-        "onClick": (event) => handleClick(event, item)
+      const pvisible = actionGroup.uiactionGroupDetails.findIndex((item) => {
+        return props.buttonsState[item.id].visible === true;
+      }) !== -1;
+      if (!pvisible)
+        return null;
+      return vue.createVNode(vue.resolveComponent("el-popover"), {
+        "trigger": "click",
+        "teleported": isFlatten,
+        "popper-class": ns.e("popover"),
+        "placement": isFlatten ? "bottom" : "right-start",
+        "popper-options": {
+          modifiers: [{
+            name: "offset",
+            options: {
+              offset: [0, 4]
+            }
+          }]
+        },
+        "popper-style": "z-index: ".concat(zIndex.zIndex)
       }, {
-        default: () => [vue.createVNode("div", {
-          "class": ns.e("button-content")
-        }, [item.showIcon && vue.createVNode(vue.resolveComponent("iBizIcon"), {
-          "icon": item.sysImage,
-          "class": ns.em("button-content", "icon")
-        }, null), item.showCaption && vue.createVNode("span", {
-          "class": ns.em("button-content", "caption")
-        }, [item.caption])])]
+        reference: () => {
+          var _a2, _b;
+          return vue.createVNode(vue.resolveComponent("el-button"), {
+            "class": [ns.e("item"), ns.em("item", "group"), ns.em("item", "".concat((_a2 = detail.id) == null ? void 0 : _a2.toLowerCase())), "".concat(((_b = detail.sysCss) == null ? void 0 : _b.cssName) || "")],
+            "type": buttonUtil.convertBtnType(detail.buttonStyle)
+          }, {
+            default: () => [vue.createVNode("div", {
+              "class": ns.e("button-content")
+            }, [vue.createVNode("span", {
+              "class": ns.em("button-content", "caption")
+            }, [actionGroup.name || actionGroup.id]), vue.createVNode("ion-icon", {
+              "class": ns.em("button-content", "icon"),
+              "name": isFlatten ? "chevron-down-outline" : "chevron-forward-outline"
+            }, null)])]
+          });
+        },
+        default: () => {
+          var _a2;
+          return (_a2 = actionGroup.uiactionGroupDetails) == null ? void 0 : _a2.map((item) => renderButton(item, false));
+        }
       });
     };
+    const renderButton = (item, isFlatten, type) => {
+      var _a, _b, _c, _d;
+      if (item.detailType === "DEUIACTIONGROUP" && item.refUIActionGroup)
+        return renderActionGroup(item, isFlatten);
+      if ((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible)
+        return vue.createVNode(vue.resolveComponent("el-button"), {
+          "class": [ns.e("item"), ns.em("item", "".concat((_b = item.id) == null ? void 0 : _b.toLowerCase())), "".concat(((_c = item.sysCss) == null ? void 0 : _c.cssName) || "")],
+          "text": !isFlatten,
+          "title": item.tooltip || item.caption,
+          "type": type || buttonUtil.convertBtnType(item.buttonStyle),
+          "onClick": (event) => handleClick(event, item),
+          "disabled": ((_d = props.buttonsState[item.id]) == null ? void 0 : _d.disabled) || props.disabled
+        }, {
+          default: () => [vue.createVNode("div", {
+            "class": ns.e("button-content")
+          }, [item.showIcon && vue.createVNode(vue.resolveComponent("iBizIcon"), {
+            "icon": item.sysImage,
+            "class": ns.em("button-content", "icon")
+          }, null), item.showCaption && vue.createVNode("span", {
+            "class": ns.em("button-content", "caption")
+          }, [item.caption])])]
+        });
+    };
     const renderDropdown = (items, iconName = "chevron-down-outline") => {
       const {
         id,
@@ -187,7 +236,7 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
         default: () => {
           const item = items[firstIndex.value];
           return vue.createVNode(vue.resolveComponent("el-button-group"), null, {
-            default: () => [actionGroupExtractMode === "ITEMX" && item && renderButton(item, buttonUtil.convertBtnType(buttonListStyle.value)), (actionGroupExtractMode !== "ITEMX" || item) && vue.createVNode(vue.resolveComponent("el-button"), {
+            default: () => [actionGroupExtractMode === "ITEMX" && item && renderButton(item, true, buttonUtil.convertBtnType(buttonListStyle.value)), (actionGroupExtractMode !== "ITEMX" || item) && vue.createVNode(vue.resolveComponent("el-button"), {
               "disabled": props.disabled,
               "class": ns.e("more-button"),
               "title": actionGroupExtractMode !== "ITEMX" ? caption || ibiz.i18n.t("app.more") : ibiz.i18n.t("app.more"),
@@ -208,21 +257,15 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
             })]
           });
         },
-        dropdown: () => {
-          let _slot2;
-          return vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, _isSlot(_slot2 = items.map((item, index) => {
-            var _a;
-            if (!(((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible) === false) && (actionGroupExtractMode !== "ITEMX" || index !== firstIndex.value)) {
-              let _slot;
-              return vue.createVNode(vue.resolveComponent("el-dropdown-item"), null, _isSlot(_slot = renderButton(item)) ? _slot : {
-                default: () => [_slot]
-              });
-            }
-            return null;
-          })) ? _slot2 : {
-            default: () => [_slot2]
-          });
-        }
+        dropdown: () => vue.createVNode("div", {
+          "class": ns.e("dropdown-popper-content")
+        }, [items.map((item, index) => {
+          var _a;
+          if (!(((_a = props.buttonsState[item.id]) == null ? void 0 : _a.visible) === false) && (actionGroupExtractMode !== "ITEMX" || index !== firstIndex.value)) {
+            return renderButton(item, false);
+          }
+          return null;
+        })])
       });
     };
     const renderActions = () => {
@@ -232,7 +275,7 @@ const IBizButtonList = /* @__PURE__ */ vue.defineComponent({
       return vue.createVNode("div", {
         "class": ns.e("content"),
         "ref": componentRef
-      }, [items.map((item) => renderButton(item)), moreItems.length ? renderDropdown(moreItems, "ellipsis-horizontal") : null]);
+      }, [items.map((item) => renderButton(item, true)), moreItems.length ? renderDropdown(moreItems, "ellipsis-horizontal") : null]);
     };
     return {
       ns,

package/lib/common/button-list/button-list.css

@@ -1 +1 @@
-.ibiz-button-list{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular);--ibiz-button-list-gap:var(--ibiz-spacing-base-tight)}.ibiz-button-list__content{display:flex}.ibiz-button-list__content .ibiz-button-list__dropdown{width:auto}.ibiz-button-list__content .el-button+.el-dropdown{margin-left:var(--ibiz-button-list-gap)}.ibiz-button-list__button-content{display:flex;align-items:center}.ibiz-button-list__button-content--icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-button-list-icon-size);height:var(--ibiz-button-list-icon-size);margin-right:var(--ibiz-button-list-icon-margin);font-size:var(--ibiz-button-list-icon-size)}.ibiz-button-list__item>span{pointer-events:none}.ibiz-button-list__dropdown{width:100%;height:100%}.ibiz-button-list__dropdown .ibiz-icon{margin-right:0}.ibiz-button-list__dropdown .ibiz-icon+.ibiz-button-list__button-content--caption{margin-left:var(--ibiz-button-list-icon-margin)}.ibiz-button-list__dropdown .el-button-group{display:flex;width:100%;height:100%;border-radius:var(--ibiz-border-radius-small)}.ibiz-button-list__dropdown .el-button-group .el-button:first-child{flex-grow:1}.ibiz-button-list__dropdown .el-button-group .el-button:last-child{flex-shrink:0}.ibiz-button-list__dropdown--style2 .el-button{--el-button-active-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;--el-button-hover-bg-color:transparent}.ibiz-button-list__dropdown--style2 .el-button-group .ibiz-button-list__item{padding-right:0}.ibiz-button-list__dropdown--style2 .el-button-group .el-button{color:var(--ibiz-color-text-2)}.ibiz-button-list__dropdown--style2 .el-button-group:hover .el-button{color:var(--ibiz-color-primary)}.ibiz-button-list--itemx .ibiz-button-list__more-button{width:32px;padding-right:0;padding-left:0}.ibiz-button-list__dropdown-popper{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular);--ibiz-button-list-gap:var(--ibiz-spacing-base-tight)}.ibiz-button-list__dropdown-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu .el-dropdown-menu__item{padding:var(--ibiz-spacing-none)}.ibiz-button-list__dropdown-popper .el-button{--el-button-active-bg-color:transparent;--el-button-hover-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;display:block;width:100%;padding:var(--ibiz-button-list-popover-button-padding);margin:var(--ibiz-button-list-popover-button-margin);font-size:var(--ibiz-button-list-popover-button-font-size);text-align:left;border-radius:0}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item:hover{background-color:var(--ibiz-color-bg-0)}.ibiz-button-list__dropdown-popper--style2 .el-button{color:var(--ibiz-color-text-2)}
+.ibiz-button-list{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular);--ibiz-button-list-gap:var(--ibiz-spacing-base-tight)}.ibiz-button-list__content{display:flex}.ibiz-button-list__content .ibiz-button-list__dropdown{width:auto}.ibiz-button-list__content .el-button+.el-dropdown{margin-left:var(--ibiz-button-list-gap)}.ibiz-button-list__button-content{display:flex;gap:var(--ibiz-spacing-extra-tight);align-items:center;width:100%}.ibiz-button-list__button-content--icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-button-list-icon-size);height:var(--ibiz-button-list-icon-size);margin-right:var(--ibiz-button-list-icon-margin);font-size:var(--ibiz-button-list-icon-size)}.ibiz-button-list__item>span{width:100%;pointer-events:none}.ibiz-button-list__item--group .ibiz-button-list__button-content{justify-content:space-between}.ibiz-button-list__dropdown{width:100%;height:100%}.ibiz-button-list__dropdown .ibiz-icon{margin-right:0}.ibiz-button-list__dropdown .ibiz-icon+.ibiz-button-list__button-content--caption{margin-left:var(--ibiz-button-list-icon-margin)}.ibiz-button-list__dropdown .el-button-group{display:flex;width:100%;height:100%;border-radius:var(--ibiz-border-radius-small)}.ibiz-button-list__dropdown .el-button-group .el-button:first-child{flex-grow:1}.ibiz-button-list__dropdown .el-button-group .el-button:last-child{flex-shrink:0}.ibiz-button-list__dropdown--style2 .el-button{--el-button-active-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;--el-button-hover-bg-color:transparent}.ibiz-button-list__dropdown--style2 .el-button-group .ibiz-button-list__item{padding-right:0}.ibiz-button-list__dropdown--style2 .el-button-group .el-button{color:var(--ibiz-color-text-2)}.ibiz-button-list__dropdown--style2 .el-button-group:hover .el-button{color:var(--ibiz-color-primary)}.ibiz-button-list--itemx .ibiz-button-list__more-button{width:32px;padding-right:0;padding-left:0}.ibiz-button-list__dropdown-popper{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular);--ibiz-button-list-gap:var(--ibiz-spacing-base-tight)}.ibiz-button-list__dropdown-popper>.el-scrollbar{min-width:150px;overflow:visible}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item:hover{background-color:var(--ibiz-color-bg-0)}.ibiz-button-list__dropdown-popper--style2 .el-button{color:var(--ibiz-color-text-2)}.ibiz-button-list__dropdown-popper-content{padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none)}.ibiz-button-list__popover{padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none)!important;border-radius:0!important}.ibiz-button-list__dropdown-popper-content,.ibiz-button-list__popover{display:flex;flex-direction:column;background-color:var(--ibiz-color-primary)!important}.ibiz-button-list__dropdown-popper-content .el-button,.ibiz-button-list__popover .el-button{justify-content:flex-start;width:100%;height:var(--ibiz-height-control-large);padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-primary-text)}.ibiz-button-list__dropdown-popper-content .el-button ion-icon,.ibiz-button-list__popover .el-button ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-button-list__dropdown-popper-content .el-button.is-text:not(.is-disabled):hover,.ibiz-button-list__popover .el-button.is-text:not(.is-disabled):hover{background-color:var(--el-button-hover-bg-color);border-color:var(--el-button-hover-border-color)}

package/lib/common/control-navigation/provider/chart-navigation.provider.cjs

@@ -0,0 +1,150 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+var navigationBase_provider = require('./navigation-base.provider.cjs');
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class ChartNavigationProvider extends navigationBase_provider.NavgationBaseProvider {
+  constructor(controller) {
+    super(controller);
+    /**
+     * 图表导航栈数据
+     *
+     * @type {IData[]}
+     * @memberof ChartNavigationProvider
+     */
+    __publicField(this, "chartNavStack", []);
+    if (controller.state.enableNavView) {
+      controller.evt.on("onActive", (event) => {
+        this.xDataActive(event);
+      });
+    }
+  }
+  /**
+   * 获取默认激活数据
+   *
+   * @return {*}  {(IData | undefined)}
+   * @memberof ChartNavigationProvider
+   */
+  getDefaultActiveData() {
+    const activeSeriesGenerator = this.controller.generator.seriesGenerators.find((generator) => {
+      return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+    });
+    if (activeSeriesGenerator && activeSeriesGenerator.groupData) {
+      const firstGroupName = Object.keys(activeSeriesGenerator.groupData)[0];
+      const { chartData } = activeSeriesGenerator.groupData[firstGroupName].values().next().value;
+      return chartData;
+    }
+  }
+  /**
+   * 图表数据激活
+   *
+   * @param {EventBase} event
+   * @memberof ChartNavigationProvider
+   */
+  xDataActive(event) {
+    const { data } = event;
+    this.navViewMsg.value = this.getNavViewMsg(data[0]);
+    this.chartNavStack.unshift(data[0]);
+  }
+  /**
+   * 通过栈数据导航
+   *
+   * @return {*}  {void}
+   * @memberof ChartNavigationProvider
+   */
+  onNavDataByStack() {
+    const data = this.getDefaultActiveData();
+    if (!data)
+      return this.clearNavigation();
+    this.controller.setActive(data);
+    this.controller.setSelection([data]);
+  }
+  /**
+   * 解析参数
+   *
+   * @param {(INavigatable & { appDataEntityId?: string })} XDataModel
+   * @param {IData} data
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {{ context: IContext; params: IParams }}
+   * @memberof ChartNavigationProvider
+   */
+  prepareParams(XDataModel, data, context, params) {
+    var _a;
+    const { context: tempContext, params: tempParams } = super.prepareParams(
+      XDataModel,
+      data,
+      context,
+      params
+    );
+    if (data._seriesModelId) {
+      const seriesModel = (_a = this.controller.model.dechartSerieses) == null ? void 0 : _a.find(
+        (series) => {
+          return series.id === data._seriesModelId;
+        }
+      );
+      if (seriesModel) {
+        const { navigateContexts, navigateParams } = seriesModel;
+        const tempContext2 = runtime.convertNavData(
+          navigateContexts,
+          data,
+          params,
+          tempContext
+        );
+        const tempParams2 = runtime.convertNavData(
+          navigateParams,
+          data,
+          params,
+          tempParams
+        );
+        if (data.navParams)
+          Object.assign(tempParams2, data.navParams);
+        return {
+          context: Object.assign(tempContext.clone(), tempContext2),
+          params: tempParams2
+        };
+      }
+    }
+    return { context: tempContext, params: tempParams };
+  }
+  /**
+   * 获取导航视图信息
+   *
+   * @param {IData} data
+   * @return {*}  {INavViewMsg}
+   * @memberof ChartNavigationProvider
+   */
+  getNavViewMsg(data) {
+    var _a;
+    let viewModelId;
+    if (data._seriesModelId) {
+      const seriesModel = (_a = this.controller.model.dechartSerieses) == null ? void 0 : _a.find(
+        (series) => {
+          return series.id === data._seriesModelId;
+        }
+      );
+      viewModelId = seriesModel == null ? void 0 : seriesModel.navAppViewId;
+    }
+    const result = this.prepareParams(
+      this.controller.model,
+      data,
+      this.controller.context,
+      this.controller.params
+    );
+    return {
+      key: data._uuid,
+      context: result.context,
+      params: result.params,
+      viewId: viewModelId
+    };
+  }
+}
+
+exports.ChartNavigationProvider = ChartNavigationProvider;

package/lib/common/control-navigation/provider/index.cjs

@@ -4,6 +4,7 @@ var navigationBase_provider = require('./navigation-base.provider.cjs');
 var calendarNavigation_provider = require('./calendar-navigation.provider.cjs');
 var treeNavigation_provider = require('./tree-navigation.provider.cjs');
 var mapNavigation_provider = require('./map-navigation.provider.cjs');
+var chartNavigation_provider = require('./chart-navigation.provider.cjs');
 
 "use strict";
 function getNavigationProvider(controller) {
@@ -14,6 +15,8 @@ function getNavigationProvider(controller) {
     return new treeNavigation_provider.TreeNavigationProvider(controller);
   if (controlType === "MAP")
     return new mapNavigation_provider.MapNavigationProvider(controller);
+  if (controlType === "CHART")
+    return new chartNavigation_provider.ChartNavigationProvider(controller);
   return new navigationBase_provider.NavgationBaseProvider(controller);
 }
 

package/lib/common/custom-theme/custom-theme.cjs

@@ -3,10 +3,10 @@
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var core = require('@ibiz-template/core');
-require('../../node_modules/.pnpm/@monaco-editor_loader@1.4.0_monaco-editor@0.45.0/node_modules/@monaco-editor/loader/lib/es/index.cjs');
+require('../../node_modules/.pnpm/@monaco-editor_loader@1.4.0_monaco-editor@0.52.2/node_modules/@monaco-editor/loader/lib/es/index.cjs');
 var customTheme_controller = require('./custom-theme.controller.cjs');
 require('./custom-theme.css');
-var index = require('../../node_modules/.pnpm/@monaco-editor_loader@1.4.0_monaco-editor@0.45.0/node_modules/@monaco-editor/loader/lib/es/loader/index.cjs');
+var index = require('../../node_modules/.pnpm/@monaco-editor_loader@1.4.0_monaco-editor@0.52.2/node_modules/@monaco-editor/loader/lib/es/loader/index.cjs');
 
 "use strict";
 function _isSlot(s) {
@@ -44,7 +44,7 @@ const CustomTheme = /* @__PURE__ */ vue.defineComponent({
       vue.nextTick(() => {
         index.default.config({
           paths: {
-            vs: "".concat(ibiz.env.pluginBaseUrl, "/monaco-editor@0.45.0/min/vs")
+            vs: "".concat(ibiz.env.pluginBaseUrl, "/monaco-editor@0.52.2/min/vs")
           }
         });
         index.default.init().then((loaderMonaco) => {

package/lib/common/data-import2/data-import2.cjs

@@ -76,7 +76,7 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
         }
         let columnMapData = columnData.fields;
         if (!columnData.fields) {
-          const res = await runtime.getImportSchema(columnData.id);
+          const res = await runtime.getImportSchema(columnData.id, props.context);
           if (res.status === 200 && res.data) {
             columnMapData = res.data.fields;
           }
@@ -145,7 +145,8 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
           const resput = await runtime.updateImportSchema({
             appDataEntity: props.appDataEntity,
             dataImport,
-            data
+            data,
+            context: props.context
           });
           if (resput.status === 200 && resput.ok) {
             columnMappingListMap.set(listValue.value, resput.data);
@@ -162,7 +163,8 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
           const res = await runtime.createImportSchema({
             appDataEntity: props.appDataEntity,
             dataImport,
-            data
+            data,
+            context: props.context
           });
           if (res.status === 200 && res.ok) {
             columnMappingListMap.set(data.name, res.data);
@@ -185,7 +187,8 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
             appDataEntity: props.appDataEntity,
             dataImport,
             fileId: fileid,
-            schemaId: id
+            schemaId: id,
+            context: props.context
           });
           onCancelButtonClick();
         } else {
@@ -209,7 +212,8 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
     const columnMappingListQuery = async () => {
       const res = await runtime.fetchImportSchemas({
         appDataEntity: props.appDataEntity,
-        dataImport
+        dataImport,
+        context: props.context
       });
       if (res.status === 200 && res.data) {
         res.data.forEach((item) => {
@@ -388,6 +392,7 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       "options": this.options,
       "columnMappingListMap": this.columnMappingListMap,
       "listValue": this.listValue,
+      "context": this.context,
       "onListValueChange": this.listValueChange,
       "onColumnMappingListMapChange": this.columnMappingListMapChange,
       "onOptionsChange": this.optionsChange

package/lib/common/data-import2-select/data-import2-select.cjs

@@ -27,6 +27,10 @@ const DataImport2Select = /* @__PURE__ */ vue.defineComponent({
     listValue: {
       type: String,
       required: true
+    },
+    context: {
+      type: Object,
+      required: false
     }
   },
   setup(props, {
@@ -57,7 +61,8 @@ const DataImport2Select = /* @__PURE__ */ vue.defineComponent({
       if (data) {
         data.name = item.label;
         const result = await runtime.updateImportSchema({
-          data
+          data,
+          context: props.context
         });
         if (result.status === 200 && result.ok) {
           emit("columnMappingListMapChange", item.label, result.data);
@@ -83,7 +88,7 @@ const DataImport2Select = /* @__PURE__ */ vue.defineComponent({
       e.stopPropagation();
       const columnData = props.columnMappingListMap.get(str);
       if (columnData) {
-        const res = await runtime.deleteImportSchema(columnData.id);
+        const res = await runtime.deleteImportSchema(columnData.id, props.context);
         if (res.status === 200 && res.ok) {
           emit("optionsChange", str);
           emit("columnMappingListMapChange", str);