@ibiz-template/vue3-components 0.7.41-alpha.16 → 0.7.41-alpha.17

package/es/control/drtab/flow-drtab.mjs

@@ -1,4 +1,4 @@
-import { ref, watch, resolveComponent, createVNode, h, defineComponent } from 'vue';
+import { ref, computed, watch, nextTick, onActivated, createVNode, resolveComponent, h, defineComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { isNil } from 'ramda';
 import { createUUID } from 'qx-util';
@@ -39,27 +39,138 @@ const FlowDrtab = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    controller: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   setup(props) {
     const ns = useNamespace("flow-drtab");
     const uuid = createUUID();
+    const c = props.controller;
     const navtag = ref("");
     const viewList = ref([]);
+    const navbarpos = ref();
+    const navBarWidth = ref(200);
+    const visibleViews = [];
+    const scrollTop = ref(0);
+    const navbarRef = ref();
+    const completedViews = ref(0);
+    const tempTimer = ref();
+    const tempTarget = ref();
+    navbarpos.value = c.navbarpos;
+    navBarWidth.value = c.navbarwidth;
+    const allVisibleViews = computed(() => {
+      return props.pagesstate.filter((item) => {
+        const target = props.drtabpages.find((page) => {
+          return page.id === item.tag;
+        });
+        return target && !item.hidden;
+      }).length;
+    });
+    const allNavTags = computed(() => {
+      if (props.pagesstate) {
+        return props.pagesstate.map((item) => {
+          const target = props.drtabpages.find((page) => {
+            return page.id === item.tag;
+          });
+          return "".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag);
+        });
+      }
+      return [];
+    });
     const scrollToTarget = () => {
       if (navtag.value) {
-        const el = document.getElementById("".concat(uuid, "_").concat(navtag.value));
+        const el = document.getElementById("".concat(navtag.value));
         if (el) {
           el.scrollIntoView();
         }
       }
     };
-    const onViewMounted = () => {
-      scrollToTarget();
+    const isFullyVisible = (element, container) => {
+      const containerRect = container.getBoundingClientRect();
+      const elementRect = element.getBoundingClientRect();
+      return (
+        // 元素顶部不超出容器顶部
+        elementRect.top >= containerRect.top && // 元素底部不超出容器底部
+        elementRect.bottom <= containerRect.bottom && // 元素左侧不超出容器左侧
+        elementRect.left >= containerRect.left && // 元素右侧不超出容器右侧
+        elementRect.right <= containerRect.right
+      );
+    };
+    const scrollToTargetNavItem = () => {
+      const anchor = document.getElementById("navbar_".concat(navtag.value));
+      if (anchor && navbarRef.value && !isFullyVisible(anchor, navbarRef.value)) {
+        anchor.scrollIntoView({
+          behavior: "smooth"
+        });
+      }
+    };
+    const computeSelectItem = () => {
+      if (visibleViews.length > 0) {
+        navtag.value = visibleViews[0];
+      }
+      if (tempTarget.value) {
+        clearTimeout(tempTimer.value);
+        tempTimer.value = setTimeout(() => {
+          navtag.value = tempTarget.value;
+          scrollToTargetNavItem();
+          tempTarget.value = "";
+        }, 200);
+      } else {
+        scrollToTargetNavItem();
+      }
+    };
+    const observer = new IntersectionObserver((entries) => {
+      if (allVisibleViews.value !== completedViews.value) {
+        return;
+      }
+      entries.forEach((entry) => {
+        var _a, _b;
+        if (entry.isIntersecting) {
+          if (entry.target && entry.target.id) {
+            if (visibleViews.length > 0) {
+              const curIndex = (_a = allNavTags.value) == null ? void 0 : _a.findIndex((tag) => tag === entry.target.id);
+              const index = (_b = allNavTags.value) == null ? void 0 : _b.findIndex((tag) => tag === visibleViews[0]);
+              if (curIndex < index) {
+                visibleViews.unshift(entry.target.id);
+              } else {
+                visibleViews.push(entry.target.id);
+              }
+            } else {
+              visibleViews.push(entry.target.id);
+            }
+          }
+        } else if (entry.target && entry.target.id) {
+          const index = visibleViews.indexOf(entry.target.id);
+          if (index >= 0) {
+            visibleViews.splice(index, 1);
+          }
+        }
+      });
+      computeSelectItem();
+    });
+    const onViewMounted = (item) => {
+      const target = props.drtabpages.find((page) => {
+        return page.id === item.tag;
+      });
+      completedViews.value += 1;
+      if (completedViews.value === allVisibleViews.value && !navtag.value) {
+        navtag.value = "".concat(target == null ? void 0 : target.appViewId, "_").concat(props.pagesstate[0].tag);
+      }
+      const el = document.getElementById("".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag));
+      if (el) {
+        observer.observe(el);
+      }
     };
     watch(() => props.activeTab, (newVal, oldVal) => {
       if (newVal && newVal.tag !== (oldVal == null ? void 0 : oldVal.tag)) {
-        navtag.value = newVal.tag;
+        const target = props.drtabpages.find((page) => {
+          return page.id === newVal.tag;
+        });
+        navtag.value = "".concat(target == null ? void 0 : target.appViewId, "_").concat(newVal.tag);
         scrollToTarget();
       }
     }, {
@@ -83,6 +194,14 @@ const FlowDrtab = /* @__PURE__ */ defineComponent({
       deep: true,
       immediate: true
     });
+    onActivated(() => {
+      nextTick(() => {
+        const el = document.getElementById("".concat(uuid));
+        if (el) {
+          el.scrollTop = scrollTop.value;
+        }
+      });
+    });
     const calcStyle = (tag) => {
       const target = viewList.value.find((item) => {
         return item.id === tag;
@@ -94,14 +213,68 @@ const FlowDrtab = /* @__PURE__ */ defineComponent({
         };
       }
     };
+    const onClickBar = (item) => {
+      const target = props.drtabpages.find((page) => {
+        return page.id === item.tag;
+      });
+      tempTarget.value = "".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag);
+      const el = document.getElementById("".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag));
+      if (el) {
+        el.scrollIntoView({
+          behavior: "smooth"
+        });
+        if (visibleViews.includes(tempTarget.value)) {
+          navtag.value = tempTarget.value;
+        }
+      }
+    };
+    const renderAnchorBar = () => {
+      if (c.enableAnchor) {
+        return createVNode("div", {
+          "class": [ns.e("anchor-bar"), ns.is(navbarpos.value, true)],
+          "style": {
+            width: "".concat(navBarWidth.value, "px")
+          }
+        }, [createVNode("div", {
+          "class": [ns.e("anchor-items"), ns.is(navbarpos.value)],
+          "ref": (el) => {
+            navbarRef.value = el;
+          }
+        }, [props.pagesstate.map((item) => {
+          const target = props.drtabpages.find((page) => {
+            return page.id === item.tag;
+          });
+          if (!target || item.hidden) {
+            return null;
+          }
+          return createVNode("div", {
+            "class": [ns.e("anchor-item"), ns.is("active", "".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag) === navtag.value)],
+            "id": "navbar_".concat(target.appViewId, "_").concat(item.tag),
+            "onClick": () => onClickBar(item)
+          }, [item.caption]);
+        })])]);
+      }
+    };
+    const handleScroll = () => {
+      const el = document.getElementById("".concat(uuid));
+      if (el) {
+        scrollTop.value = el.scrollTop;
+      }
+    };
     return {
+      c,
       ns,
       uuid,
+      navbarpos,
       onViewMounted,
-      calcStyle
+      navBarWidth,
+      calcStyle,
+      renderAnchorBar,
+      handleScroll
     };
   },
   render() {
+    var _a, _b;
     const tabs = this.pagesstate.map((item) => {
       const counterNum = item.counterId ? this.counterData[item.counterId] : void 0;
       const viewShell = resolveComponent("IBizViewShell");
@@ -112,7 +285,7 @@ const FlowDrtab = /* @__PURE__ */ defineComponent({
         return null;
       }
       return createVNode("div", {
-        "id": "".concat(this.uuid, "_").concat(item.tag),
+        "id": "".concat(target.appViewId, "_").concat(item.tag),
         "class": this.ns.e("tab-item")
       }, [this.showHeader && createVNode("div", {
         "class": this.ns.em("tab-item", "label")
@@ -132,13 +305,18 @@ const FlowDrtab = /* @__PURE__ */ defineComponent({
         context: this.context,
         params: this.params,
         viewId: target.appViewId,
-        onMounted: this.onViewMounted
+        onMounted: () => this.onViewMounted(item)
       })])]);
     });
     return createVNode("div", {
-      "class": this.ns.b()
-    }, [createVNode("div", {
-      "class": this.ns.e("container")
+      "class": [this.ns.b(), this.ns.m(this.navbarpos), this.ns.is("left", (_a = this.navbarpos) == null ? void 0 : _a.includes("left")), this.ns.is("right", (_b = this.navbarpos) == null ? void 0 : _b.includes("right")), this.ns.is("enable-anchor", this.c.enableAnchor)],
+      "onScroll": this.handleScroll,
+      "id": this.uuid
+    }, [this.renderAnchorBar(), createVNode("div", {
+      "class": this.ns.e("container"),
+      "style": {
+        "--navbarwidth": "".concat(this.navBarWidth, "px")
+      }
     }, [tabs])]);
   }
 });

package/es/control/drtab/index.d.ts

@@ -17,6 +17,7 @@ export declare const IBizDRTabControl: import("@ibiz-template/vue3-util").TypeWi
     };
     hideEditItem: {
         type: BooleanConstructor;
+        default: undefined;
     };
 }, {
     c: import("./drtab.controller").DRTabController;
@@ -48,6 +49,7 @@ export declare const IBizDRTabControl: import("@ibiz-template/vue3-util").TypeWi
     };
     hideEditItem: {
         type: BooleanConstructor;
+        default: undefined;
     };
 }>>, {
     params: import("@ibiz-template/core").IApiParams;

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.css

@@ -1 +1 @@
-.ibiz-repeater-grid{position:relative;width:100%;--ibiz-grid-column-justify-content:center}.ibiz-repeater-grid__add-btn{position:absolute;top:0;right:0;z-index:2}.ibiz-repeater-grid .el-table__row:hover .ibiz-repeater-grid-index__text:last-child{display:none}.ibiz-repeater-grid .el-table__row:hover .ibiz-repeater-grid-index__remove{display:inline}.ibiz-repeater-grid .ibiz-repeater-grid-index__remove.el-button.el-button--danger{--el-button-text-color:var(--ibiz-color-danger)}.ibiz-repeater-grid-index .cell{padding:var(--ibiz-spacing-extra-tight)}.ibiz-repeater-grid-index__remove{display:none}
+.ibiz-repeater-grid{position:relative;width:100%;--ibiz-grid-column-justify-content:center}.ibiz-repeater-grid__add-btn{position:absolute;top:0;right:0;z-index:2}.ibiz-repeater-grid__drag-icon{cursor:move}.ibiz-repeater-grid__sortable-ghost{opacity:.5}.ibiz-repeater-grid .el-table__row{height:57px}.ibiz-repeater-grid .el-table__row:hover .ibiz-repeater-grid-index__text:last-child{display:none}.ibiz-repeater-grid .el-table__row:hover .ibiz-repeater-grid-index__remove{display:inline}.ibiz-repeater-grid .ibiz-repeater-grid-index__remove.el-button.el-button--danger{--el-button-text-color:var(--ibiz-color-danger)}.ibiz-repeater-grid-index .cell{padding:var(--ibiz-spacing-extra-tight)}.ibiz-repeater-grid-index__remove{display:none}

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.mjs

@@ -1,5 +1,7 @@
-import { isVNode, reactive, watch, resolveComponent, createVNode, toRaw, h, defineComponent } from 'vue';
+import { isVNode, ref, reactive, watch, nextTick, onMounted, resolveComponent, createVNode, toRaw, h, defineComponent } from 'vue';
+import Sortable from '../../../../../../node_modules/.pnpm/sortablejs@1.15.6/node_modules/sortablejs/modular/sortable.esm.mjs';
 import { FormMDCtrlRepeaterController, EditFormController, ControlVO } from '@ibiz-template/runtime';
+import { createUUID } from 'qx-util';
 import { useNamespace, useCtx } from '@ibiz-template/vue3-util';
 import { recursiveIterate, showTitle } from '@ibiz-template/core';
 import './repeater-grid.css';
@@ -24,6 +26,8 @@ const RepeaterGrid = /* @__PURE__ */ defineComponent({
   }) {
     const ns = useNamespace("repeater-grid");
     const formItems = [];
+    const tableRef = ref();
+    const tableKey = ref(createUUID());
     recursiveIterate(props.controller.repeatedForm, (item) => {
       var _a;
       if (item.detailType === "FORMITEM") {
@@ -85,6 +89,27 @@ const RepeaterGrid = /* @__PURE__ */ defineComponent({
       immediate: true,
       deep: true
     });
+    const rowDrop = () => {
+      var _a, _b;
+      const wrapper = (_b = (_a = tableRef.value) == null ? void 0 : _a.$el) == null ? void 0 : _b.querySelector(".el-table__body-wrapper tbody");
+      if (!wrapper || !props.controller.enableSort)
+        return;
+      Sortable.create(wrapper, {
+        animation: 150,
+        handle: ".".concat(ns.e("drag-icon")),
+        ghostClass: "".concat(ns.e("sortable-ghost")),
+        onEnd({
+          newIndex,
+          oldIndex
+        }) {
+          props.controller.dragChange(oldIndex, newIndex);
+          tableKey.value = createUUID();
+        }
+      });
+    };
+    onMounted(() => {
+      nextTick(() => rowDrop());
+    });
     const renderRemoveBtn = (index) => {
       let _slot2;
       if (!props.controller.enableDelete) {
@@ -120,6 +145,8 @@ const RepeaterGrid = /* @__PURE__ */ defineComponent({
     };
     return {
       ns,
+      tableRef,
+      tableKey,
       formItems,
       formControllers,
       renderRemoveBtn
@@ -137,16 +164,40 @@ const RepeaterGrid = /* @__PURE__ */ defineComponent({
     }, _isSlot(_slot3 = ibiz.i18n.t("app.add")) ? _slot3 : {
       default: () => [_slot3]
     }), createVNode(resolveComponent("el-table"), {
-      "class": this.ns.e("table"),
+      "ref": "tableRef",
+      "key": this.tableKey,
       "show-header": true,
+      "class": this.ns.e("table"),
       "data": this.controller.value,
       "cell-class-name": ({
         columnIndex
       }) => {
-        return columnIndex === 0 ? this.ns.b("index") : "";
+        const shouldShowIndex = this.controller.enableSort ? columnIndex === 1 : columnIndex === 0;
+        return shouldShowIndex ? this.ns.b("index") : "";
       }
     }, {
-      default: () => [createVNode(resolveComponent("el-table-column"), {
+      default: () => [this.controller.enableSort && createVNode(resolveComponent("el-table-column"), {
+        "width": 26,
+        "type": "default"
+      }, {
+        default: () => createVNode("svg", {
+          "viewBox": "0 0 16 16",
+          "xmlns": "http://www.w3.org/2000/svg",
+          "height": "1em",
+          "width": "1em",
+          "class": this.ns.e("drag-icon"),
+          "preserveAspectRatio": "xMidYMid meet",
+          "focusable": "false"
+        }, [createVNode("g", {
+          "stroke-width": "1",
+          "fill-rule": "evenodd"
+        }, [createVNode("g", {
+          "transform": "translate(5 1)",
+          "fill-rule": "nonzero"
+        }, [createVNode("path", {
+          "d": "M1 2a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zM1 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"
+        }, null)])])])
+      }), createVNode(resolveComponent("el-table-column"), {
         "type": "index",
         "width": 66,
         "align": "center"

package/es/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.css

@@ -1 +1 @@
-.ibiz-mdctrl-container-item{--ibiz-mdctrl-container-item-drag-chosen-color:rgba(var(--ibiz-grey-1), 1);display:flex}.ibiz-mdctrl-container-item__form{flex-grow:1}.ibiz-mdctrl-container-item__icon-drag{display:flex;align-items:center;min-height:var(--ibiz-height-control-default);max-height:var(--ibiz-height-control-default);margin-top:var(--ibiz-spacing-tight);cursor:move}.ibiz-mdctrl-container-item__icon-drag>svg{display:flex;align-items:center;justify-content:center;width:var(--ibiz-spacing-base);height:var(--ibiz-spacing-base);fill:var(--ibiz-color-text-3)}.ibiz-mdctrl-container-item.is-drag-chosen{background-color:var(--ibiz-mdctrl-container-item-drag-chosen-color)}.ibiz-mdctrl-container-item-actions{flex-shrink:0;width:80px;text-align:center}.ibiz-mdctrl-container-item-actions .el-button+.el-button{margin-left:var(--ibiz-spacing-none)}.ibiz-mdctrl-container-item-actions__btn{margin-top:var(--ibiz-spacing-tight)}.ibiz-mdctrl-container-no-data{width:100%;display:flex;justify-content:flex-end}.ibiz-mdctrl-container-style2-item-actions{flex:1;width:100%}.ibiz-mdctrl-container-style2-item-actions .el-button+.el-button{margin-left:var(--ibiz-spacing-none)}.ibiz-mdctrl-container-style2-item-actions__btn{margin-top:var(--ibiz-spacing-tight)}.ibiz-mdctrl-container-style2-item-actions__create{width:100%;color:var(--ibiz-color-primary);background-color:transparent;border:1px dashed var(--ibiz-color-border);border-width:1px!important}.ibiz-mdctrl-container-style2-item-actions__create ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-mdctrl-container-style2-item-actions__create:focus{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-mdctrl-container-style2-item-actions__create:hover{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-mdctrl-container-style2-item-actions__remove{font-size:var(--ibiz-font-size-heder-6)}
+.ibiz-mdctrl-container-item{--ibiz-mdctrl-container-item-drag-chosen-color:rgba(var(--ibiz-grey-1), 1);display:flex}.ibiz-mdctrl-container-item__form{flex-grow:1}.ibiz-mdctrl-container-item__left{flex-shrink:0}.ibiz-mdctrl-container-item__right{flex-shrink:0;width:60px;margin-left:var(--ibiz-spacing-tight)}.ibiz-mdctrl-container-item__icon-drag{display:flex;align-items:center;min-height:var(--ibiz-height-control-default);max-height:var(--ibiz-height-control-default);margin-top:var(--ibiz-spacing-tight);cursor:move}.ibiz-mdctrl-container-item__icon-drag>svg{display:flex;align-items:center;justify-content:center;width:var(--ibiz-spacing-base);height:var(--ibiz-spacing-base);fill:var(--ibiz-color-text-3)}.ibiz-mdctrl-container-item.is-drag-chosen{background-color:var(--ibiz-mdctrl-container-item-drag-chosen-color)}.ibiz-mdctrl-container-item-actions{flex-shrink:0;width:80px;text-align:center}.ibiz-mdctrl-container-item-actions .el-button+.el-button{margin-left:var(--ibiz-spacing-none)}.ibiz-mdctrl-container-item-actions__btn{margin-top:var(--ibiz-spacing-tight)}.ibiz-mdctrl-container-no-data{width:100%;display:flex;justify-content:flex-end}.ibiz-mdctrl-container-style2-item-actions{flex:1;width:100%}.ibiz-mdctrl-container-style2-item-actions .el-button+.el-button{margin-left:var(--ibiz-spacing-none)}.ibiz-mdctrl-container-style2-item-actions__btn{margin-top:var(--ibiz-spacing-tight)}.ibiz-mdctrl-container-style2-item-actions__create{width:100%;color:var(--ibiz-color-primary);background-color:transparent;border:1px dashed var(--ibiz-color-border);border-width:1px!important}.ibiz-mdctrl-container-style2-item-actions__create ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-mdctrl-container-style2-item-actions__create:focus{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-mdctrl-container-style2-item-actions__create:hover{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-mdctrl-container-style2-item-actions__remove{font-size:var(--ibiz-font-size-heder-6)}

package/es/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.mjs

@@ -88,9 +88,8 @@ const MDCtrlContainer = /* @__PURE__ */ defineComponent({
     };
     const renderRemoveBtn = (item, index) => {
       let _slot3;
-      if (!props.enableDelete) {
+      if (!props.enableDelete)
         return null;
-      }
       if (ibiz.config.form.mdCtrlConfirmBeforeRemove) {
         return createVNode(resolveComponent("el-popconfirm"), {
           "title": showTitle(ibiz.i18n.t("control.form.mdCtrlContainer.promptInformation")),
@@ -130,9 +129,8 @@ const MDCtrlContainer = /* @__PURE__ */ defineComponent({
     };
     const renderStyle2RemoveBtn = (item, index) => {
       let _slot4;
-      if (!props.enableDelete) {
+      if (!props.enableDelete)
         return null;
-      }
       if (ibiz.config.form.mdCtrlConfirmBeforeRemove) {
         return createVNode(resolveComponent("el-popconfirm"), {
           "title": showTitle(ibiz.i18n.t("control.form.mdCtrlContainer.promptInformation")),
@@ -168,9 +166,11 @@ const MDCtrlContainer = /* @__PURE__ */ defineComponent({
       }) : createVNode("div", null, [ibiz.i18n.t("control.form.mdCtrlContainer.noSlot")]);
       return createVNode("div", {
         "class": ns.b("item")
-      }, [props.enableSort && renderDragBtn(), formComponent, showActions.value && createVNode("div", {
-        "class": ns.b("item-actions")
-      }, [index === 0 && props.enableCreate && renderAddBtn(), renderRemoveBtn(item, index)])]);
+      }, [createVNode("div", {
+        "class": ns.be("item", "left")
+      }, [props.enableSort && renderDragBtn()]), formComponent, renderRemoveBtn(item, index), createVNode("div", {
+        "class": ns.be("item", "right")
+      }, [index === 0 && props.enableCreate && renderAddBtn()])]);
     };
     return {
       ns,
@@ -212,13 +212,13 @@ const MDCtrlContainer = /* @__PURE__ */ defineComponent({
     let defaultContent;
     if ((_b = this.items) == null ? void 0 : _b.length) {
       defaultContent = this.enableSort ? createVNode(draggable, {
+        "itemKey": "id",
         "ref": "container",
-        "class": [this.ns.e("drag")],
-        "chosenClass": this.ns.is("drag-chosen", true),
         "list": this.dragItems,
-        "itemKey": "id",
+        "class": [this.ns.e("drag")],
         "handle": ".".concat(this.dragClssName),
-        "onChange": this.handleDragChange
+        "onChange": this.handleDragChange,
+        "chosenClass": this.ns.is("drag-chosen", true)
       }, {
         item: ({
           element,

package/es/control/gantt/gantt.mjs

@@ -577,6 +577,7 @@ const GanttControl = /* @__PURE__ */ defineComponent({
         "leaf": "_leaf",
         "expand-key": "_defaultExpand",
         "locale": this.locale,
+        "unit": this.c.state.unit,
         "draggable": {
           level: "all",
           draggable: true

package/es/control/grid/grid/grid-control.util.mjs

@@ -207,7 +207,7 @@ function useITableEvent(c) {
   }
   async function onRowClickDynamic(data, _column, event) {
     if (data.srfuf === Srfuf.CREATE) {
-      if (c.editShowMode === "row") {
+      if (c.editShowMode === "row" && !data.isGroupRow) {
         const row = c.findRowState(data);
         if (row)
           await c.switchRowEdit(row);
@@ -229,6 +229,11 @@ function useITableEvent(c) {
   }
   let forbidClick = false;
   async function onRowClick(data, _column, event) {
+    var _a;
+    if (data.isGroupRow) {
+      (_a = tableRef.value) == null ? void 0 : _a.store.loadOrToggle(data);
+      return;
+    }
     if (!event.shiftKey) {
       const index = c.findRowStateIndex(data);
       const isSelected = c.state.selectedData.includes(data);
@@ -264,9 +269,8 @@ function useITableEvent(c) {
     }, 200);
   }
   function onDbRowClick(data) {
-    if (data.srfuf === Srfuf.CREATE) {
+    if (data.srfuf === Srfuf.CREATE || data.isGroupRow)
       return;
-    }
     c.onDbRowClick(data);
   }
   function onSelectionChange(selection) {
@@ -489,21 +493,29 @@ function useAppGridBase(c, props, tableRef) {
   const tableData = computed(() => {
     const state = c.state;
     if (c.state.enableGroup) {
+      const grouprowmode = c.controlParams.grouprowmode;
       const result = [];
       state.groups.forEach((item) => {
-        if (!item.children.length) {
+        if (!item.children.length)
           return;
+        if (grouprowmode === "NEWROW") {
+          result.push({
+            ...item,
+            tempsrfkey: item.key,
+            isGroupRow: true
+          });
+        } else {
+          const children = [...item.children];
+          const first = children.shift();
+          result.push({
+            tempsrfkey: (first == null ? void 0 : first.tempsrfkey) || item.caption,
+            srfkey: (first == null ? void 0 : first.srfkey) || item.caption,
+            isGroupData: true,
+            caption: item.caption,
+            first,
+            children
+          });
         }
-        const children = [...item.children];
-        const first = children.shift();
-        result.push({
-          tempsrfkey: (first == null ? void 0 : first.tempsrfkey) || item.caption,
-          srfkey: (first == null ? void 0 : first.srfkey) || item.caption,
-          isGroupData: true,
-          caption: item.caption,
-          first,
-          children
-        });
       });
       return result;
     }
@@ -660,6 +672,16 @@ function useAppGridBase(c, props, tableRef) {
         colspan
       };
     }
+    if (row.isGroupRow) {
+      const total = c.state.singleSelect ? renderColumns.value.length : renderColumns.value.length + 1;
+      const index = c.state.singleSelect ? 0 : 1;
+      if (columnIndex === index)
+        return { rowspan: 1, colspan: total };
+      return {
+        rowspan: 0,
+        colspan: 0
+      };
+    }
   };
   const headerDragend = (newWidth, oldWidth, column) => {
     const { property } = column;

package/es/control/grid/grid/grid.css

@@ -1 +1 @@
-.ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:var(--ibiz-spacing-none);--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-row-edit-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-row-bg-color:var(--ibiz-color-bg-1);--ibiz-control-grid-row-bg-color-2:var(--ibiz-color-bg-0);--ibiz-control-grid-row-hover-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-row-select-color:var(--ibiz-color-primary-light-default);--ibiz-control-grid-row-expand-icon-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-tight);--ibiz-control-grid-now-header-height:auto;--ibiz-control-grid-scrollbar-width:4px;--ibiz-control-grid-scrollbar-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-scrollbar-bg-hover-opacity:0.5;--ibiz-control-grid-scrollbar-bg-hover-color:var(--ibiz-color-fill-2);--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:calc(var(--ibiz-spacing-base-tight) / 2) var(--ibiz-spacing-base-tight);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-header-min-height:54px;--ibiz-control-grid-header-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-header-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-header-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:var(--ibiz-spacing-none) var(--ibiz-spacing-base-tight);--ibiz-control-grid-footer-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-footer-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-footer-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-footer-font-weight:var(--ibiz-font-weight-bold);position:relative;width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid .el-table{--el-table-header-bg-color:var(--ibiz-control-grid-header-bg-color);--el-table-current-row-bg-color:var(--ibiz-control-grid-row-select-color);--el-table-border-color:transparent}.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-last-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-last-column::before{bottom:0}.ibiz-control-grid.is-empty .el-scrollbar .el-scrollbar__view{height:100%}.ibiz-control-grid.is-empty .el-table__empty-text{display:inline-block;height:100%}.ibiz-control-grid .el-table--border .el-table__cell{border-right:none}.ibiz-control-grid .el-table-fixed-column--left,.ibiz-control-grid .el-table-fixed-column--right{--el-bg-color:transparent}.ibiz-control-grid .el-table thead.is-group th.el-table__cell{background:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid.is-dynamic-grid .el-table__empty-block{height:calc(100% - 48px)!important;min-height:248px}.ibiz-control-grid__add{width:calc(100% - var(--ibiz-spacing-extra-tight));margin:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);color:var(--ibiz-color-primary);background-color:transparent;border:1px dashed var(--ibiz-color-border)}.ibiz-control-grid__add ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-control-grid__add:focus{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__add:hover{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{justify-content:center}.ibiz-control-grid__table .caret-wrapper>*+*{margin-top:var(--ibiz-spacing-super-tight)}.ibiz-control-grid__table .sort-caret{--el-text-color-placeholder:--ibiz-control-grid-header-text-color;position:initial;opacity:.6}.ibiz-control-grid__table.el-table .el-table__cell{padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr td{background:var(--ibiz-control-grid-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:nth-child(2n) td{background-color:var(--ibiz-control-grid-row-bg-color-2)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:hover td{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.current-row td{background-color:var(--el-table-current-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td.uagridcolumn{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td:not(.uagridcolumn){background-color:var(--ibiz-control-grid-row-edit-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-date-editor,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-input__wrapper,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-textarea__inner{--el-input-bg-color:var(--ibiz-color-white)}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);min-height:var(--ibiz-control-grid-header-min-height);padding:var(--ibiz-control-grid-header-cell-padding);font-size:var(--ibiz-control-grid-header-font-size);font-weight:var(--ibiz-control-grid-header-font-weight);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--left .cell,.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--right .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-0:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-1:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-2:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-3:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row .el-table__expand-icon{margin:var(--ibiz-control-grid-row-expand-icon-margin)}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid__table .el-scrollbar__wrap{position:relative}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell{font-size:var(--ibiz-control-grid-footer-font-size);font-weight:var(--ibiz-control-grid-footer-font-weight);color:var(--ibiz-control-grid-footer-text-color);background-color:var(--ibiz-control-grid-footer-bg-color)}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell:first-child>div{display:inline;vertical-align:4px}.ibiz-control-grid__table .enable-order{position:relative;padding-left:var(--ibiz-spacing-base-tight);transition:transform .25s cubic-bezier(0,0,.2,1)}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon{padding:var(--ibiz-spacing-none)!important}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon .cell{display:none}.ibiz-control-grid__table .enable-order:hover .ibiz-control-grid__drag-icon .cell{display:flex}.ibiz-control-grid__table .el-scrollbar__bar.is-horizontal{height:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__bar.is-vertical{width:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__thumb{background-color:var(--ibiz-control-grid-scrollbar-bg-color)}.ibiz-control-grid__table .el-scrollbar__thumb:hover{background-color:var(--ibiz-control-grid-scrollbar-bg-hover-color);opacity:var(--ibiz-control-grid-scrollbar-bg-hover-opacity)}.ibiz-control-grid__load-more-button{padding:var(--ibiz-control-grid-header-cell-padding);text-align:center}.ibiz-control-grid .el-table td.el-table__cell,.ibiz-control-grid .el-table th.el-table__cell.is-leaf{border-bottom:none}.ibiz-control-grid .ibiz-pagination{--ibiz-pagination-height:var(--ibiz-control-grid-page-height);--ibiz-pagination-text-color:var(--ibiz-control-grid-text-color);--ibiz-pagination-padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid.is-single-select .el-table__header-wrapper .el-table__header thead>tr th:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-single-select .el-table__body-wrapper .el-table__body tbody>tr td:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-enable-customized .el-table__header-wrapper .el-table__header thead>tr:first-child th:last-child{padding-right:var(--ibiz-spacing-base-loose)}.ibiz-control-grid.is-enable-customized .ibiz-control-grid-setting-box{display:flex;align-items:center;justify-content:flex-start;position:absolute;top:0;right:0;z-index:10;height:var(--ibiz-control-grid-now-header-height);padding-right:var(--ibiz-spacing-extra-tight);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-quick-toolbar{justify-content:center}.ibiz-control-grid-batch-toolbar{position:absolute;top:0;left:54px;z-index:99;display:none;width:calc(100% - 54px);height:var(--ibiz-control-grid-now-header-height);font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-batch-toolbar.is-show{display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-separator{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-content{height:100%;display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-text{flex:none}
+.ibiz-control-grid{--ibiz-control-grid-text-color:var(--ibiz-color-text-0);--ibiz-control-grid-bg-color:transparent;--ibiz-control-grid-padding:var(--ibiz-spacing-none);--ibiz-control-grid-cell-padding:var(--ibiz-spacing-tight);--ibiz-control-grid-selection-padding:var(--ibiz-spacing-base-loose);--ibiz-control-grid-row-edit-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-row-bg-color:var(--ibiz-color-bg-1);--ibiz-control-grid-row-bg-color-2:var(--ibiz-color-bg-0);--ibiz-control-grid-row-hover-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-row-select-color:var(--ibiz-color-primary-light-default);--ibiz-control-grid-row-expand-icon-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-tight);--ibiz-control-grid-now-header-height:auto;--ibiz-control-grid-scrollbar-width:4px;--ibiz-control-grid-scrollbar-bg-color:var(--ibiz-color-fill-2);--ibiz-control-grid-scrollbar-bg-hover-opacity:0.5;--ibiz-control-grid-scrollbar-bg-hover-color:var(--ibiz-color-fill-2);--ibiz-control-grid-header-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-header-cell-padding:calc(var(--ibiz-spacing-base-tight) / 2) var(--ibiz-spacing-base-tight);--ibiz-control-grid-header-height:auto;--ibiz-control-grid-header-min-height:54px;--ibiz-control-grid-header-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-header-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-header-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-grid-content-text-color:var(--ibiz-control-grid-text-color);--ibiz-control-grid-content-row-height:48px;--ibiz-control-grid-page-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-page-height:50px;--ibiz-control-grid-page-padding:var(--ibiz-spacing-none) var(--ibiz-spacing-base-tight);--ibiz-control-grid-footer-text-color:var(--ibiz-color-text-2);--ibiz-control-grid-footer-bg-color:rgba(var(--ibiz-grey-1), 1);--ibiz-control-grid-footer-font-size:var(--ibiz-font-size-regular);--ibiz-control-grid-footer-font-weight:var(--ibiz-font-weight-bold);position:relative;width:100%;height:100%;padding:var(--ibiz-control-grid-padding);background-color:var(--ibiz-control-grid-bg-color)}.ibiz-control-grid .el-table{--el-table-header-bg-color:var(--ibiz-control-grid-header-bg-color);--el-table-current-row-bg-color:var(--ibiz-control-grid-row-select-color);--el-table-border-color:transparent}.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--left.is-last-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-first-column::before,.ibiz-control-grid .el-table__body-wrapper tr td.el-table-fixed-column--right.is-last-column::before{bottom:0}.ibiz-control-grid.is-empty .el-scrollbar .el-scrollbar__view{height:100%}.ibiz-control-grid.is-empty .el-table__empty-text{display:inline-block;height:100%}.ibiz-control-grid .el-table--border .el-table__cell{border-right:none}.ibiz-control-grid .el-table-fixed-column--left,.ibiz-control-grid .el-table-fixed-column--right{--el-bg-color:transparent}.ibiz-control-grid .el-table thead.is-group th.el-table__cell{background:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid.is-enable-page .ibiz-control-grid__table{height:calc(100% - var(--ibiz-control-grid-page-height))}.ibiz-control-grid.is-enable-group .el-table__indent{display:none}.ibiz-control-grid.is-dynamic-grid .el-table__empty-block{height:calc(100% - 48px)!important;min-height:248px}.ibiz-control-grid.is-group-row-mode .el-table .el-table__body-wrapper .el-table__row .el-table__expand-icon{margin:0 0 0 20px}.ibiz-control-grid__add{width:calc(100% - var(--ibiz-spacing-extra-tight));margin:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);color:var(--ibiz-color-primary);background-color:transparent;border:1px dashed var(--ibiz-color-border)}.ibiz-control-grid__add ion-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-control-grid__add:focus{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__add:hover{color:var(--ibiz-color-primary-hover);background-color:transparent;border:1px dashed var(--ibiz-color-primary-hover)}.ibiz-control-grid__table{width:100%;height:100%}.ibiz-control-grid__table .caret-wrapper{justify-content:center}.ibiz-control-grid__table .caret-wrapper>*+*{margin-top:var(--ibiz-spacing-super-tight)}.ibiz-control-grid__table .sort-caret{--el-text-color-placeholder:--ibiz-control-grid-header-text-color;position:initial;opacity:.6}.ibiz-control-grid__table.el-table .el-table__cell{padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr td{background:var(--ibiz-control-grid-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:nth-child(2n) td{background-color:var(--ibiz-control-grid-row-bg-color-2)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr:hover td{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.current-row td{background-color:var(--el-table-current-row-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td.uagridcolumn{background-color:var(--ibiz-control-grid-row-hover-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td:not(.uagridcolumn){background-color:var(--ibiz-control-grid-row-edit-bg-color)}.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-date-editor,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-input__wrapper,.ibiz-control-grid__table.el-table .el-table__body-wrapper tr.editing-row td .el-textarea__inner{--el-input-bg-color:var(--ibiz-color-white)}.ibiz-control-grid__table .el-table__header-wrapper .cell{height:var(--ibiz-control-grid-header-height);min-height:var(--ibiz-control-grid-header-min-height);padding:var(--ibiz-control-grid-header-cell-padding);font-size:var(--ibiz-control-grid-header-font-size);font-weight:var(--ibiz-control-grid-header-font-weight);color:var(--ibiz-control-grid-header-text-color);word-break:break-word;white-space:pre-wrap}.ibiz-control-grid__table .el-table__header-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__header-wrapper .el-table__cell .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--left .cell,.ibiz-control-grid__table .el-table__header-wrapper .el-table-fixed-column--right .cell{display:flex;align-items:center;justify-content:var(--ibiz-grid-column-justify-content)}.ibiz-control-grid__table .el-table__body-wrapper{color:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-0:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-1:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-2:var(--ibiz-control-grid-content-text-color);--ibiz-color-text-3:var(--ibiz-control-grid-content-text-color);border-bottom:.1px solid var(--ibiz-color-border)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row{height:var(--ibiz-control-grid-content-row-height);cursor:pointer}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:0;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table__row .el-table__expand-icon{margin:var(--ibiz-control-grid-row-expand-icon-margin)}@-moz-document url-prefix(){.ibiz-control-grid__table .el-table__body-wrapper .el-table__row>td{height:100%}}.ibiz-control-grid__table .el-table__body-wrapper .cell{display:flex;align-items:center;height:100%;padding:var(--ibiz-spacing-none)}.ibiz-control-grid__table .el-table__body-wrapper .el-table-column--selection .cell{padding:var(--ibiz-control-grid-selection-padding)}.ibiz-control-grid__table .el-table__cell.is-center{--ibiz-grid-column-text-align:center;--ibiz-grid-column-justify-content:center}.ibiz-control-grid__table .el-table__cell.is-left{--ibiz-grid-column-text-align:left;--ibiz-grid-column-justify-content:flex-start}.ibiz-control-grid__table .el-table__cell.is-right{--ibiz-grid-column-text-align:right;--ibiz-grid-column-justify-content:flex-end}.ibiz-control-grid__table .el-scrollbar__wrap{position:relative}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell{font-size:var(--ibiz-control-grid-footer-font-size);font-weight:var(--ibiz-control-grid-footer-font-weight);color:var(--ibiz-control-grid-footer-text-color);background-color:var(--ibiz-control-grid-footer-bg-color)}.ibiz-control-grid__table .el-table__footer-wrapper tfoot td.el-table__cell:first-child>div{display:inline;vertical-align:4px}.ibiz-control-grid__table .enable-order{position:relative;padding-left:var(--ibiz-spacing-base-tight);transition:transform .25s cubic-bezier(0,0,.2,1)}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon{padding:var(--ibiz-spacing-none)!important}.ibiz-control-grid__table .enable-order .ibiz-control-grid__drag-icon .cell{display:none}.ibiz-control-grid__table .enable-order:hover .ibiz-control-grid__drag-icon .cell{display:flex}.ibiz-control-grid__table .el-scrollbar__bar.is-horizontal{height:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__bar.is-vertical{width:var(--ibiz-control-grid-scrollbar-width)}.ibiz-control-grid__table .el-scrollbar__thumb{background-color:var(--ibiz-control-grid-scrollbar-bg-color)}.ibiz-control-grid__table .el-scrollbar__thumb:hover{background-color:var(--ibiz-control-grid-scrollbar-bg-hover-color);opacity:var(--ibiz-control-grid-scrollbar-bg-hover-opacity)}.ibiz-control-grid__load-more-button{padding:var(--ibiz-control-grid-header-cell-padding);text-align:center}.ibiz-control-grid .el-table td.el-table__cell,.ibiz-control-grid .el-table th.el-table__cell.is-leaf{border-bottom:none}.ibiz-control-grid .ibiz-pagination{--ibiz-pagination-height:var(--ibiz-control-grid-page-height);--ibiz-pagination-text-color:var(--ibiz-control-grid-text-color);--ibiz-pagination-padding:var(--ibiz-control-grid-page-padding)}.ibiz-control-grid.is-single-select .el-table__header-wrapper .el-table__header thead>tr th:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-single-select .el-table__body-wrapper .el-table__body tbody>tr td:nth-child(1){padding-left:var(--ibiz-spacing-tight)}.ibiz-control-grid.is-enable-customized .el-table__header-wrapper .el-table__header thead>tr:first-child th:last-child{padding-right:var(--ibiz-spacing-base-loose)}.ibiz-control-grid.is-enable-customized .ibiz-control-grid-setting-box{display:flex;align-items:center;justify-content:flex-start;position:absolute;top:0;right:0;z-index:10;height:var(--ibiz-control-grid-now-header-height);padding-right:var(--ibiz-spacing-extra-tight);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-quick-toolbar{justify-content:center}.ibiz-control-grid-batch-toolbar{position:absolute;top:0;left:54px;z-index:99;display:none;width:calc(100% - 54px);height:var(--ibiz-control-grid-now-header-height);font-size:var(--ibiz-font-size-regular);font-weight:var(--ibiz-font-weight-regular);background-color:var(--ibiz-control-grid-header-bg-color)}.ibiz-control-grid-batch-toolbar.is-show{display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-separator{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-content{height:100%;display:flex;align-items:center;justify-content:flex-start}.ibiz-control-grid-batch-toolbar .ibiz-control-grid-batch-toolbar-text{flex:none}

package/es/control/grid/grid/grid.mjs

@@ -177,9 +177,14 @@ function renderColumn(c, model, renderColumns, index) {
       row
     }) => {
       let elRow = row;
-      if (row.isGroupData) {
+      if (elRow.isGroupRow)
+        return createVNode("div", {
+          "class": "ibiz-grid-field-column"
+        }, [createVNode("span", {
+          "class": "ibiz-grid-field-column__text"
+        }, [row.caption])]);
+      if (row.isGroupData)
         elRow = row.first;
-      }
       const rowState = c.findRowState(elRow);
       if (rowState) {
         if (model.columnType === "DEFGRIDCOLUMN" || model.columnType === "DEFTREEGRIDCOLUMN") {
@@ -560,7 +565,7 @@ const GridControl = /* @__PURE__ */ defineComponent({
       "controller": this.c
     }, {
       default: () => [createVNode(resolveComponent("iBizControlBase"), {
-        "class": [this.ns.b(), this.ns.is("dynamic-grid", this.c.state.isAutoGrid), this.ns.is("show-header", !this.c.state.hideHeader), this.ns.is("enable-page", this.c.state.enablePagingBar), this.ns.is("enable-group", this.c.state.enableGroup), this.ns.is("single-select", state.singleSelect), this.ns.is("empty", state.items.length === 0), this.ns.is("enable-customized", this.c.model.enableCustomized)],
+        "class": [this.ns.b(), this.ns.is("dynamic-grid", this.c.state.isAutoGrid), this.ns.is("show-header", !this.c.state.hideHeader), this.ns.is("enable-page", this.c.state.enablePagingBar), this.ns.is("enable-group", this.c.state.enableGroup), this.ns.is("single-select", state.singleSelect), this.ns.is("empty", state.items.length === 0), this.ns.is("enable-customized", this.c.model.enableCustomized), this.ns.is("group-row-mode", this.c.controlParams.grouprowmode === "NEWROW")],
         "controller": this.c,
         "style": this.headerCssVars
       }, {

package/es/control/kanban/index.d.ts

@@ -52,8 +52,11 @@ export declare const IBizKanbanControl: import("@ibiz-template/vue3-util").TypeW
     ns: import("@ibiz-template/core").Namespace;
     isFull: import("vue").Ref<boolean>;
     kanban: import("vue").Ref<any>;
-    onFullScreen: () => void;
     renderGroup: (group: import("@ibiz-template/runtime").IKanbanGroupState) => JSX.Element;
+    onFullScreen: () => void;
+    onPageChange: (page: number) => void;
+    onPageRefresh: () => void;
+    onPageSizeChange: (size: number) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IDEKanban>;