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

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

@@ -41,27 +41,138 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    controller: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   setup(props) {
     const ns = vue3Util.useNamespace("flow-drtab");
     const uuid = qxUtil.createUUID();
+    const c = props.controller;
     const navtag = vue.ref("");
     const viewList = vue.ref([]);
+    const navbarpos = vue.ref();
+    const navBarWidth = vue.ref(200);
+    const visibleViews = [];
+    const scrollTop = vue.ref(0);
+    const navbarRef = vue.ref();
+    const completedViews = vue.ref(0);
+    const tempTimer = vue.ref();
+    const tempTarget = vue.ref();
+    navbarpos.value = c.navbarpos;
+    navBarWidth.value = c.navbarwidth;
+    const allVisibleViews = vue.computed(() => {
+      return props.pagesstate.filter((item) => {
+        const target = props.drtabpages.find((page) => {
+          return page.id === item.tag;
+        });
+        return target && !item.hidden;
+      }).length;
+    });
+    const allNavTags = vue.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);
+      }
     };
     vue.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();
       }
     }, {
@@ -85,6 +196,14 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
       deep: true,
       immediate: true
     });
+    vue.onActivated(() => {
+      vue.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;
@@ -96,14 +215,68 @@ const FlowDrtab = /* @__PURE__ */ vue.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 vue.createVNode("div", {
+          "class": [ns.e("anchor-bar"), ns.is(navbarpos.value, true)],
+          "style": {
+            width: "".concat(navBarWidth.value, "px")
+          }
+        }, [vue.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 vue.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 = vue.resolveComponent("IBizViewShell");
@@ -114,7 +287,7 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
         return null;
       }
       return vue.createVNode("div", {
-        "id": "".concat(this.uuid, "_").concat(item.tag),
+        "id": "".concat(target.appViewId, "_").concat(item.tag),
         "class": this.ns.e("tab-item")
       }, [this.showHeader && vue.createVNode("div", {
         "class": this.ns.em("tab-item", "label")
@@ -134,13 +307,18 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
         context: this.context,
         params: this.params,
         viewId: target.appViewId,
-        onMounted: this.onViewMounted
+        onMounted: () => this.onViewMounted(item)
       })])]);
     });
     return vue.createVNode("div", {
-      "class": this.ns.b()
-    }, [vue.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(), vue.createVNode("div", {
+      "class": this.ns.e("container"),
+      "style": {
+        "--navbarwidth": "".concat(this.navBarWidth, "px")
+      }
     }, [tabs])]);
   }
 });

package/lib/control/drtab/flow-drtab.css

@@ -1 +1 @@
-.ibiz-flow-drtab{width:100%;height:100%;overflow:auto;background-color:var(--ibiz-color-bg-0)}.ibiz-flow-drtab__container{display:flex;flex-direction:column;gap:var(--ibiz-spacing-base)}.ibiz-flow-drtab__tab-item{background-color:var(--ibiz-color-bg-1);border-radius:var(--ibiz-border-radius-medium)}.ibiz-flow-drtab__tab-item--label{padding:var(--ibiz-spacing-base);font-size:var(--ibiz-font-size-header-5);border-bottom:1px solid var(--ibiz-color-fill-1)}.ibiz-flow-drtab__tab-item--tab-view{padding:var(--ibiz-spacing-tight) 0}.ibiz-flow-drtab__counter{font-size:var(--ibiz-font-size-regular);text-align:center}.ibiz-flow-drtab .ibiz-flow-drtab{background-color:inherit}
+.ibiz-flow-drtab{width:100%;height:100%;overflow:hidden;background-color:var(--ibiz-color-bg-0)}.ibiz-flow-drtab__container{height:100%;overflow:auto}.ibiz-flow-drtab__tab-item{background-color:var(--ibiz-color-bg-1);border-radius:var(--ibiz-border-radius-medium)}.ibiz-flow-drtab__tab-item--label{padding:var(--ibiz-spacing-base);font-size:var(--ibiz-font-size-header-5);border-bottom:1px solid var(--ibiz-color-fill-1)}.ibiz-flow-drtab__tab-item--tab-view{padding:var(--ibiz-spacing-tight) 0}.ibiz-flow-drtab__tab-item+.ibiz-flow-drtab__tab-item{margin-top:var(--ibiz-spacing-base)}.ibiz-flow-drtab__counter{font-size:var(--ibiz-font-size-regular);text-align:center}.ibiz-flow-drtab .ibiz-flow-drtab{background-color:inherit}.ibiz-flow-drtab.is-enable-anchor{display:flex;gap:var(--ibiz-spacing-base)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__container{flex:1}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar{display:flex;min-width:200px;padding:var(--ibiz-spacing-base) 0;font-size:var(--ibiz-font-size-regular);background-color:#fff}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-topleft{align-items:start}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-bottomleft{align-items:end}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-topright{flex-direction:row-reverse;align-items:start}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-bottomright{flex-direction:row-reverse;align-items:end}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-middleleft{align-items:center}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-middleright{flex-direction:row-reverse;align-items:center}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-items{width:100%;max-height:100%;overflow:auto}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item{width:100%;height:32px;padding:0 var(--ibiz-spacing-base);line-height:32px;cursor:pointer}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item:hover{color:var(--ibiz-color-primary)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item.is-active{position:relative;color:var(--ibiz-color-primary)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item.is-active::before{position:absolute;top:0;left:0;width:4px;height:100%;content:"";background-color:var(--ibiz-color-primary);border-radius:2px}.ibiz-flow-drtab.is-enable-anchor.is-left{flex-direction:row;overflow:auto}.ibiz-flow-drtab.is-enable-anchor.is-left .ibiz-flow-drtab__container{--navbarwidth:200;flex:1 0;width:calc(100% - var(--navbarwidth) - 2 * var(--ibiz-spacing-base));overflow:unset}.ibiz-flow-drtab.is-enable-anchor.is-left .ibiz-flow-drtab__anchor-bar{position:sticky;top:0}.ibiz-flow-drtab.is-enable-anchor.is-left .ibiz-flow-drtab__anchor-items::-webkit-scrollbar{display:none}.ibiz-flow-drtab.is-enable-anchor.is-right{flex-direction:row-reverse;overflow:auto}.ibiz-flow-drtab.is-enable-anchor.is-right .ibiz-flow-drtab__container{--navbarwidth:200;flex:1 0;width:calc(100% - var(--navbarwidth) - 2 * var(--ibiz-spacing-base));overflow:unset}.ibiz-flow-drtab.is-enable-anchor.is-right .ibiz-flow-drtab__anchor-bar{position:sticky;top:0}.ibiz-flow-drtab.is-enable-anchor.is-right .ibiz-flow-drtab__anchor-items::-webkit-scrollbar{display:none}

package/lib/control/form/edit-form/edit-form.cjs

@@ -62,6 +62,14 @@ const EditFormControl = /* @__PURE__ */ vue.defineComponent({
     loadDefault: {
       type: Boolean,
       default: true
+    },
+    /**
+     * @description 简单模式下传入的数据索引
+     * @default false
+     */
+    simpleDataIndex: {
+      type: Number,
+      required: false
     }
   },
   setup(props) {
@@ -73,6 +81,9 @@ const EditFormControl = /* @__PURE__ */ vue.defineComponent({
     const anchorList = vue.ref([]);
     const anchorTargetRef = vue.ref();
     if (props.isSimple) {
+      if (props.simpleDataIndex || props.simpleDataIndex === 0) {
+        c.setSimpleDataIndex(props.simpleDataIndex);
+      }
       c.evt.on("onMounted", () => {
         c.setSimpleData(props.data || {});
       });

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

@@ -70,13 +70,17 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       } = this.c.model.editor || {};
       editor = editorItems.map((item, index) => {
         const controller = this.c.form.details[item.id];
-        return [vue.createVNode(compositeFormItem.CompositeFormItem, {
-          "modelData": controller.model,
-          "controller": controller,
-          "attrs": this.attrs
-        }, null), editorItems.length - 1 > index && vue.createVNode("span", {
-          "class": this.ns.e("composite-separator")
-        }, [vue.createTextVNode("-")])];
+        return [
+          vue.createVNode(compositeFormItem.CompositeFormItem, {
+            "modelData": controller.model,
+            "controller": controller,
+            "attrs": this.attrs
+          }, null),
+          // feat：复合表单项样式2会在编辑器之间加`-`分隔符
+          editorItems.length - 1 > index && this.c.model.detailStyle === "STYLE2" && vue.createVNode("span", {
+            "class": this.ns.e("composite-separator")
+          }, [vue.createTextVNode("-")])
+        ];
       });
     } else {
       const editMode = (_d = (_c = (_b = this.c.editor) == null ? void 0 : _b.model) == null ? void 0 : _c.editorParams) == null ? void 0 : _d.editMode;

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.cjs

@@ -1,7 +1,9 @@
 'use strict';
 
 var vue = require('vue');
+var sortable_esm = require('../../../../../../node_modules/.pnpm/sortablejs@1.15.6/node_modules/sortablejs/modular/sortable.esm.cjs');
 var runtime = require('@ibiz-template/runtime');
+var qxUtil = require('qx-util');
 var vue3Util = require('@ibiz-template/vue3-util');
 var core = require('@ibiz-template/core');
 require('./repeater-grid.css');
@@ -26,9 +28,14 @@ const RepeaterGrid = /* @__PURE__ */ vue.defineComponent({
   }) {
     const ns = vue3Util.useNamespace("repeater-grid");
     const formItems = [];
+    const tableRef = vue.ref();
+    const tableKey = vue.ref(qxUtil.createUUID());
     core.recursiveIterate(props.controller.repeatedForm, (item) => {
+      var _a;
       if (item.detailType === "FORMITEM") {
-        formItems.push(item);
+        if (((_a = item.editor) == null ? void 0 : _a.editorType) !== "HIDDEN") {
+          formItems.push(item);
+        }
       }
     }, {
       childrenFields: ["deformPages", "deformTabPages", "deformDetails"]
@@ -84,6 +91,27 @@ const RepeaterGrid = /* @__PURE__ */ vue.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_esm.default.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 = qxUtil.createUUID();
+        }
+      });
+    };
+    vue.onMounted(() => {
+      vue.nextTick(() => rowDrop());
+    });
     const renderRemoveBtn = (index) => {
       let _slot2;
       if (!props.controller.enableDelete) {
@@ -119,6 +147,8 @@ const RepeaterGrid = /* @__PURE__ */ vue.defineComponent({
     };
     return {
       ns,
+      tableRef,
+      tableKey,
       formItems,
       formControllers,
       renderRemoveBtn
@@ -136,16 +166,40 @@ const RepeaterGrid = /* @__PURE__ */ vue.defineComponent({
     }, _isSlot(_slot3 = ibiz.i18n.t("app.add")) ? _slot3 : {
       default: () => [_slot3]
     }), vue.createVNode(vue.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: () => [vue.createVNode(vue.resolveComponent("el-table-column"), {
+      default: () => [this.controller.enableSort && vue.createVNode(vue.resolveComponent("el-table-column"), {
+        "width": 26,
+        "type": "default"
+      }, {
+        default: () => vue.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"
+        }, [vue.createVNode("g", {
+          "stroke-width": "1",
+          "fill-rule": "evenodd"
+        }, [vue.createVNode("g", {
+          "transform": "translate(5 1)",
+          "fill-rule": "nonzero"
+        }, [vue.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)])])])
+      }), vue.createVNode(vue.resolveComponent("el-table-column"), {
         "type": "index",
         "width": 66,
         "align": "center"

package/lib/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/lib/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-multi-form/repeater-multi-form.cjs

@@ -61,6 +61,7 @@ const RepeaterMultiForm = /* @__PURE__ */ vue.defineComponent({
         return vue.createVNode(repeaterSingleForm.RepeaterSingleForm, {
           "key": index,
           "data": data,
+          "simpleDataIndex": index,
           "controller": this.controller,
           "onChange": (value) => {
             this.onValueChange(value, index);

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-single-form/repeater-single-form.cjs

@@ -17,6 +17,9 @@ const RepeaterSingleForm = /* @__PURE__ */ vue.defineComponent({
     controller: {
       type: runtime.FormMDCtrlRepeaterController,
       required: true
+    },
+    simpleDataIndex: {
+      type: Number
     }
   },
   emits: {
@@ -53,6 +56,7 @@ const RepeaterSingleForm = /* @__PURE__ */ vue.defineComponent({
       "params": this.controller.params,
       "modelData": this.controller.repeatedForm,
       "isSimple": true,
+      "simpleDataIndex": this.simpleDataIndex,
       "data": this.data,
       "onFormDataChange": this.onFormDataChange,
       "onCreated": this.onCreated

package/lib/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.cjs

@@ -90,9 +90,8 @@ const MDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
     };
     const renderRemoveBtn = (item, index) => {
       let _slot3;
-      if (!props.enableDelete) {
+      if (!props.enableDelete)
         return null;
-      }
       if (ibiz.config.form.mdCtrlConfirmBeforeRemove) {
         return vue.createVNode(vue.resolveComponent("el-popconfirm"), {
           "title": core.showTitle(ibiz.i18n.t("control.form.mdCtrlContainer.promptInformation")),
@@ -132,9 +131,8 @@ const MDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
     };
     const renderStyle2RemoveBtn = (item, index) => {
       let _slot4;
-      if (!props.enableDelete) {
+      if (!props.enableDelete)
         return null;
-      }
       if (ibiz.config.form.mdCtrlConfirmBeforeRemove) {
         return vue.createVNode(vue.resolveComponent("el-popconfirm"), {
           "title": core.showTitle(ibiz.i18n.t("control.form.mdCtrlContainer.promptInformation")),
@@ -170,9 +168,11 @@ const MDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
       }) : vue.createVNode("div", null, [ibiz.i18n.t("control.form.mdCtrlContainer.noSlot")]);
       return vue.createVNode("div", {
         "class": ns.b("item")
-      }, [props.enableSort && renderDragBtn(), formComponent, showActions.value && vue.createVNode("div", {
-        "class": ns.b("item-actions")
-      }, [index === 0 && props.enableCreate && renderAddBtn(), renderRemoveBtn(item, index)])]);
+      }, [vue.createVNode("div", {
+        "class": ns.be("item", "left")
+      }, [props.enableSort && renderDragBtn()]), formComponent, renderRemoveBtn(item, index), vue.createVNode("div", {
+        "class": ns.be("item", "right")
+      }, [index === 0 && props.enableCreate && renderAddBtn()])]);
     };
     return {
       ns,
@@ -214,13 +214,13 @@ const MDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
     let defaultContent;
     if ((_b = this.items) == null ? void 0 : _b.length) {
       defaultContent = this.enableSort ? vue.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/lib/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/lib/control/gantt/gantt.cjs

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

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

@@ -209,7 +209,7 @@ function useITableEvent(c) {
   }
   async function onRowClickDynamic(data, _column, event) {
     if (data.srfuf === runtime.Srfuf.CREATE) {
-      if (c.editShowMode === "row") {
+      if (c.editShowMode === "row" && !data.isGroupRow) {
         const row = c.findRowState(data);
         if (row)
           await c.switchRowEdit(row);
@@ -231,6 +231,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);
@@ -266,9 +271,8 @@ function useITableEvent(c) {
     }, 200);
   }
   function onDbRowClick(data) {
-    if (data.srfuf === runtime.Srfuf.CREATE) {
+    if (data.srfuf === runtime.Srfuf.CREATE || data.isGroupRow)
       return;
-    }
     c.onDbRowClick(data);
   }
   function onSelectionChange(selection) {
@@ -491,21 +495,29 @@ function useAppGridBase(c, props, tableRef) {
   const tableData = vue.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;
     }
@@ -662,6 +674,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/lib/control/grid/grid/grid.cjs

@@ -179,9 +179,14 @@ function renderColumn(c, model, renderColumns, index) {
       row
     }) => {
       let elRow = row;
-      if (row.isGroupData) {
+      if (elRow.isGroupRow)
+        return vue.createVNode("div", {
+          "class": "ibiz-grid-field-column"
+        }, [vue.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") {
@@ -562,7 +567,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       "controller": this.c
     }, {
       default: () => [vue.createVNode(vue.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
       }, {