@ibiz-template/vue3-components 0.7.37-alpha.5 → 0.7.38-alpha.21

package/lib/control/form/form-detail/form-group-panel/form-group-panel.cjs

@@ -25,14 +25,17 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
   },
   setup(props) {
     const ns = vue3Util.useNamespace("form-group");
-    const isCollapse = vue.ref(!props.controller.defaultExpansion);
+    const c = props.controller;
     const changeCollapse = () => {
-      if (!props.controller.disableClose) {
-        isCollapse.value = !isCollapse.value;
+      if (!c.disableClose) {
+        c.state.collapse = !c.state.collapse;
       }
     };
     const onActionClick = async (detail, event) => {
-      await props.controller.onActionClick(detail, event);
+      const tempParams = {
+        srfgroupid: props.modelData.codeName
+      };
+      await props.controller.onActionClick(detail, event, tempParams);
     };
     const captionText = vue.computed(() => {
       const {
@@ -46,7 +49,6 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
     });
     return {
       ns,
-      isCollapse,
       captionText,
       changeCollapse,
       onActionClick
@@ -80,7 +82,7 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
     if (this.modelData.showCaption === true) {
       classArr.push(this.ns.m("show-header"));
       classArr.push(this.ns.b("collapse"));
-      classArr.push(this.ns.is("collapse", this.isCollapse));
+      classArr.push(this.ns.is("collapse", this.controller.state.collapse));
       if (this.controller.disableClose) {
         classArr.push(this.ns.bm("collapse", "disable-close"));
       }
@@ -106,7 +108,7 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
         "onActionClick": this.onActionClick,
         "caption": this.modelData.uiactionGroup.name,
         "mode": this.modelData.actionGroupExtractMode === "ITEMS" ? "dropdown" : "buttons"
-      }, null), this.modelData.titleBarCloseMode !== void 0 && this.modelData.titleBarCloseMode !== 0 && (this.isCollapse ? vue.createVNode("ion-icon", {
+      }, null), this.modelData.titleBarCloseMode !== void 0 && this.modelData.titleBarCloseMode !== 0 && (this.controller.state.collapse ? vue.createVNode("ion-icon", {
         "name": "caret-forward-sharp",
         "class": this.ns.be("header", "icon"),
         "title": ibiz.i18n.t("control.form.formGroup.unfold")
@@ -128,6 +130,7 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
       }, [!state.isShowMore ? ibiz.i18n.t("control.form.formGroupPanel.showMore") : ibiz.i18n.t("app.retract")])]);
     }
     return vue.createVNode("div", {
+      "id": this.modelData.id,
       "class": classArr,
       "onClick": (event) => this.controller.onClick(event)
     }, [header, vue.createVNode("div", {

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

@@ -79,6 +79,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       }
     }
     return vue.createVNode(vue.resolveComponent("iBizFormItemContainer"), {
+      "id": this.c.model.id,
       "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass],
       "style": this.modelData.cssStyle,
       "required": this.c.state.required,

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

@@ -37,8 +37,13 @@ const RepeaterMultiForm = /* @__PURE__ */ vue.defineComponent({
   },
   render() {
     const items = this.controller.value;
+    let userStyle = "";
+    if (this.controller.model.userParam && this.controller.model.userParam.STYLE) {
+      userStyle = this.controller.model.userParam.STYLE;
+    }
     return vue.createVNode(vue.resolveComponent("iBizMDCtrlContainer"), {
       "class": this.ns.b(),
+      "userStyle": userStyle,
       "items": items,
       "enableCreate": this.controller.enableCreate,
       "enableDelete": this.controller.enableDelete,

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

@@ -23,6 +23,9 @@ const MDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
     items: {
       type: Object,
       required: true
+    },
+    userStyle: {
+      type: String
     }
   },
   emits: {
@@ -76,18 +79,85 @@ const MDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
         default: () => [_slot3]
       });
     };
+    const renderStyle2AddBtn = () => {
+      return vue.createVNode(vue.resolveComponent("el-button"), {
+        "class": [ns.be("style2-item-actions", "create"), ns.be("style2-item-actions", "btn")],
+        "title": ibiz.i18n.t("app.add"),
+        "onClick": () => emit("addClick")
+      }, {
+        default: () => [vue.createVNode("ion-icon", {
+          "name": "add-outline"
+        }, null), ibiz.i18n.t("app.add")]
+      });
+    };
+    const renderStyle2RemoveBtn = (item, index) => {
+      let _slot4;
+      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")),
+          "confirm-button-text": ibiz.i18n.t("app.confirm"),
+          "cancel-button-text": ibiz.i18n.t("app.cancel"),
+          "onConfirm": () => emit("removeClick", item, index)
+        }, {
+          reference: () => {
+            return vue.createVNode(vue.resolveComponent("el-button"), {
+              "type": "danger",
+              "class": [ns.be("style2-item-actions", "remove"), ns.be("style2-item-actions", "btn")],
+              "title": ibiz.i18n.t("app.delete")
+            }, {
+              default: () => [vue.createVNode("ion-icon", {
+                "name": "trash-outline"
+              }, null)]
+            });
+          }
+        });
+      }
+      return vue.createVNode(vue.resolveComponent("el-button"), {
+        "type": "danger",
+        "class": [ns.be("item-actions", "remove"), ns.be("item-actions", "btn")],
+        "onClick": () => emit("removeClick", item, index)
+      }, _isSlot(_slot4 = ibiz.i18n.t("app.delete")) ? _slot4 : {
+        default: () => [_slot4]
+      });
+    };
     return {
       ns,
       showActions,
       renderAddBtn,
-      renderRemoveBtn
+      renderRemoveBtn,
+      renderStyle2AddBtn,
+      renderStyle2RemoveBtn
     };
   },
   render() {
-    var _a;
+    var _a, _b;
+    if (this.userStyle === "STYLE2") {
+      return vue.createVNode("div", {
+        "class": [this.ns.b(), this.ns.b("style2")]
+      }, [((_a = this.items) == null ? void 0 : _a.length) ? vue.createVNode("div", {
+        "class": this.ns.e("item-container")
+      }, [this.showActions && this.enableCreate && this.renderStyle2AddBtn(), this.items.map((item, index) => {
+        const formComponent = this.$slots.item ? this.$slots.item({
+          data: item,
+          index
+        }) : vue.createVNode("div", null, [ibiz.i18n.t("control.form.mdCtrlContainer.noSlot")]);
+        return vue.createVNode("div", {
+          "class": this.ns.b("item")
+        }, [formComponent, this.showActions && vue.createVNode("div", {
+          "class": this.ns.b("style2-item-actions")
+        }, [this.renderStyle2RemoveBtn(item, index)])]);
+      })]) : vue.createVNode("div", {
+        "class": this.ns.b("no-data")
+      }, [this.enableCreate && vue.createVNode("div", {
+        "class": this.ns.b("style2-item-actions")
+      }, [this.renderStyle2AddBtn()])])]);
+    }
     return vue.createVNode("div", {
       "class": this.ns.b()
-    }, [((_a = this.items) == null ? void 0 : _a.length) ? this.items.map((item, index) => {
+    }, [((_b = this.items) == null ? void 0 : _b.length) ? this.items.map((item, index) => {
       const formComponent = this.$slots.item ? this.$slots.item({
         data: item,
         index

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

@@ -1 +1 @@
-.ibiz-mdctrl-container-item{display:flex}.ibiz-mdctrl-container-item__form{flex-grow:1}.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-item{display:flex}.ibiz-mdctrl-container-item__form{flex-grow:1}.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/form/form-detail/form-page/form-page.cjs

@@ -16,6 +16,10 @@ const FormPage = /* @__PURE__ */ vue.defineComponent({
     modelData: {
       type: Object,
       required: true
+    },
+    controller: {
+      type: Object,
+      required: true
     }
   },
   setup(props) {
@@ -24,9 +28,13 @@ const FormPage = /* @__PURE__ */ vue.defineComponent({
     if (props.modelData.tabHeaderPos) {
       position = props.modelData.tabHeaderPos.toLowerCase();
     }
+    const onTabChange = (name) => {
+      props.controller.setActiveTab(name);
+    };
     return {
       ns,
-      position
+      position,
+      onTabChange
     };
   },
   render() {
@@ -44,7 +52,8 @@ const FormPage = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode(vue.resolveComponent("el-tabs"), {
       "class": [this.ns.b(), this.ns.b("tab"), this.ns.e(this.position)],
       "model-value": (_d = defaultSlots[0]) == null ? void 0 : _d.key,
-      "tab-position": this.position
+      "tab-position": this.position,
+      "onTabChange": this.onTabChange
     }, _isSlot(_slot = defaultSlots.map((slot) => {
       const props = slot.props;
       if (!props || !props.controller) {

package/lib/control/form/form-detail/form-page/form-page.css

@@ -1 +1 @@
-.ibiz-form-page{--ibiz-form-page-font-size:var(--ibiz-font-size-header-4);--ibiz-form-page-header-border-color:var(--ibiz-color-border);--ibiz-form-page-text-color:var(--ibiz-color-text-2);--ibiz-form-page-bg-color:transparent;--ibiz-form-page-hover-text-color:var(--ibiz-color-primary);--ibiz-form-page-hover-bg-color:transparent;--ibiz-form-page-active-text-color:var(--ibiz-color-primary);--ibiz-form-page-active-bg-color:transparent;--ibiz-form-page-active-border-color:var(--ibiz-color-primary)}.ibiz-form-page__left{height:100%}.ibiz-form-page__left>.el-tabs__header{height:100%}.ibiz-form-page__left>.el-tabs__content{height:100%;overflow:auto}.ibiz-form-page__right{height:100%}.ibiz-form-page__right>.el-tabs__header{height:100%}.ibiz-form-page__right>.el-tabs__content{height:100%;overflow:auto}.ibiz-form-page--no-tab-header .ibiz-form-page-item{padding-top:var(--ibiz-spacing-none)}.ibiz-form-page-tab>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-page-font-size);color:var(--ibiz-form-page-text-color);background-color:var(--ibiz-form-page-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-page-hover-text-color);background-color:var(--ibiz-form-page-hover-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-page-active-text-color);background-color:var(--ibiz-form-page-active-bg-color)}.ibiz-form-page-tab .el-tabs__nav-wrap::after{background-color:var(--ibiz-form-page-header-border-color)}.ibiz-form-page-tab .el-tabs__active-bar{background-color:var(--ibiz-form-page-active-border-color)}.ibiz-form-page-item{padding-top:var(--ibiz-padding-top)}.ibiz-form-page-item-child{margin-bottom:var(--ibiz-margin-bottom)}
+.ibiz-form-page{--ibiz-form-page-font-size:var(--ibiz-font-size-header-4);--ibiz-form-page-header-border-color:var(--ibiz-color-border);--ibiz-form-page-text-color:var(--ibiz-color-text-2);--ibiz-form-page-bg-color:transparent;--ibiz-form-page-hover-text-color:var(--ibiz-color-primary);--ibiz-form-page-hover-bg-color:transparent;--ibiz-form-page-active-text-color:var(--ibiz-color-primary);--ibiz-form-page-active-bg-color:transparent;--ibiz-form-page-active-border-color:var(--ibiz-color-primary)}.ibiz-form-page__left{height:100%}.ibiz-form-page__left>.el-tabs__header{height:100%}.ibiz-form-page__left>.el-tabs__content{height:100%;overflow:auto}.ibiz-form-page__right{height:100%}.ibiz-form-page__right>.el-tabs__header{height:100%}.ibiz-form-page__right>.el-tabs__content{height:100%;overflow:auto}.ibiz-form-page--no-tab-header .ibiz-form-page-item{padding-top:var(--ibiz-spacing-none)}.ibiz-form-page-tab>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-page-font-size);color:var(--ibiz-form-page-text-color);background-color:var(--ibiz-form-page-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-page-hover-text-color);background-color:var(--ibiz-form-page-hover-bg-color)}.ibiz-form-page-tab>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-page-active-text-color);background-color:var(--ibiz-form-page-active-bg-color)}.ibiz-form-page-tab .el-tabs__nav-wrap::after{height:1px;background-color:var(--ibiz-form-page-header-border-color)}.ibiz-form-page-tab .el-tabs__active-bar{background-color:var(--ibiz-form-page-active-border-color)}.ibiz-form-page-item{padding-top:var(--ibiz-padding-top)}.ibiz-form-page-item-child{margin-bottom:var(--ibiz-margin-bottom)}

package/lib/control/form/form-detail/form-tab-panel/form-tab-panel.cjs

@@ -103,7 +103,7 @@ const FormTabPanel = /* @__PURE__ */ vue.defineComponent({
           let _slot;
           const value = c.model.counterId ? this.counterData.value[c.model.counterId] : void 0;
           return c.model.counterId ? vue.createVNode(vue.resolveComponent("el-badge"), {
-            "class": this.ns.e("badge"),
+            "class": [this.ns.e("badge"), this.ns.is("no-counter", !value && value !== 0 || c.model.counterMode === 1 && value <= 0)],
             "value": value,
             "hidden": !value && value !== 0 || c.model.counterMode === 1 && value <= 0
           }, _isSlot(_slot = renderItemText(c)) ? _slot : {

package/lib/control/form/form-detail/form-tab-panel/form-tab-panel.css

@@ -1 +1 @@
-.ibiz-form-tab-panel{width:100%;height:100%;--ibiz-form-tab-panel-font-size:var(--ibiz-font-size-header-4);--ibiz-form-tab-panel-header-border-color:var(--ibiz-color-border);--ibiz-form-tab-panel-text-color:var(--ibiz-color-text-2);--ibiz-form-tab-panel-bg-color:transparent;--ibiz-form-tab-panel-hover-text-color:var(--ibiz-color-primary);--ibiz-form-tab-panel-hover-bg-color:transparent;--ibiz-form-tab-panel-active-text-color:var(--ibiz-color-primary);--ibiz-form-tab-panel-active-bg-color:transparent;--ibiz-form-tab-panel-active-border-color:var(--ibiz-color-primary)}.ibiz-form-tab-panel>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-tab-panel-font-size);color:var(--ibiz-form-tab-panel-text-color);background-color:var(--ibiz-form-tab-panel-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-tab-panel-hover-text-color);background-color:var(--ibiz-form-tab-panel-hover-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-tab-panel-active-text-color);background-color:var(--ibiz-form-tab-panel-active-bg-color)}.ibiz-form-tab-panel .el-tabs__nav-wrap::after{background-color:var(--ibiz-form-tab-panel-header-border-color)}.ibiz-form-tab-panel .el-tabs__active-bar{background-color:var(--ibiz-form-tab-panel-active-border-color)}.ibiz-form-tab-panel__badge .el-badge__content{padding:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-small);background-color:var(--ibiz-color-danger)}
+.ibiz-form-tab-panel{width:100%;height:100%;--ibiz-form-tab-panel-font-size:var(--ibiz-font-size-header-4);--ibiz-form-tab-panel-header-border-color:var(--ibiz-color-border);--ibiz-form-tab-panel-text-color:var(--ibiz-color-text-2);--ibiz-form-tab-panel-bg-color:transparent;--ibiz-form-tab-panel-hover-text-color:var(--ibiz-color-primary);--ibiz-form-tab-panel-hover-bg-color:transparent;--ibiz-form-tab-panel-active-text-color:var(--ibiz-color-primary);--ibiz-form-tab-panel-active-bg-color:transparent;--ibiz-form-tab-panel-active-border-color:var(--ibiz-color-primary)}.ibiz-form-tab-panel>.el-tabs__header.is-top{margin-bottom:var(--ibiz-spacing-tight)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top{font-size:var(--ibiz-form-tab-panel-font-size);color:var(--ibiz-form-tab-panel-text-color);background-color:var(--ibiz-form-tab-panel-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top:hover{color:var(--ibiz-form-tab-panel-hover-text-color);background-color:var(--ibiz-form-tab-panel-hover-bg-color)}.ibiz-form-tab-panel>.el-tabs__header.is-top .el-tabs__item.is-top.is-active{color:var(--ibiz-form-tab-panel-active-text-color);background-color:var(--ibiz-form-tab-panel-active-bg-color)}.ibiz-form-tab-panel .el-tabs__nav-wrap::after{height:1px;background-color:var(--ibiz-form-tab-panel-header-border-color)}.ibiz-form-tab-panel .el-tabs__active-bar{background-color:var(--ibiz-form-tab-panel-active-border-color)}.ibiz-form-tab-panel .el-tabs__item .ibiz-form-tab-panel__badge.is-no-counter{padding-right:var(--ibiz-spacing-none)}.ibiz-form-tab-panel__badge .el-badge__content{padding:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-small);background-color:var(--ibiz-color-danger)}

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

@@ -9,6 +9,7 @@ var index$5 = require('./form-mdctrl/index.cjs');
 var index$6 = require('./form-rawitem/index.cjs');
 var index$7 = require('./form-tab-panel/index.cjs');
 var index$8 = require('./form-tab-page/index.cjs');
+var index$9 = require('./form-button-list/index.cjs');
 var formItemContainer = require('./form-item/form-item-container/form-item-container.cjs');
 var formPage_item = require('./form-page/form-page-item/form-page.item.cjs');
 
@@ -23,5 +24,6 @@ exports.IBizFormMDCtrl = index$5.IBizFormMDCtrl;
 exports.IBizFormRawItem = index$6.IBizFormRawItem;
 exports.IBizFormTabPanel = index$7.IBizFormTabPanel;
 exports.IBizFormTabPage = index$8.IBizFormTabPage;
+exports.IBizFormButtonList = index$9.IBizFormButtonList;
 exports.IBizFormItemContainer = formItemContainer.IBizFormItemContainer;
 exports.IBizFormPageItem = formPage_item.IBizFormPageItem;

package/lib/control/form/index.cjs

@@ -2,8 +2,8 @@
 
 var index = require('./search-form/index.cjs');
 require('./form-detail/index.cjs');
-var index$a = require('./edit-form/index.cjs');
-var index$b = require('./form/index.cjs');
+var index$b = require('./edit-form/index.cjs');
+var index$c = require('./form/index.cjs');
 var index$1 = require('./form-detail/form-group-panel/index.cjs');
 var formItemContainer = require('./form-detail/form-item/form-item-container/form-item-container.cjs');
 var index$2 = require('./form-detail/form-item/index.cjs');
@@ -15,12 +15,13 @@ var index$6 = require('./form-detail/form-mdctrl/index.cjs');
 var index$7 = require('./form-detail/form-rawitem/index.cjs');
 var index$8 = require('./form-detail/form-tab-panel/index.cjs');
 var index$9 = require('./form-detail/form-tab-page/index.cjs');
+var index$a = require('./form-detail/form-button-list/index.cjs');
 
 "use strict";
 
 exports.IBizSearchFormControl = index.IBizSearchFormControl;
-exports.IBizEditFormControl = index$a.IBizEditFormControl;
-exports.IBizFormControl = index$b.IBizFormControl;
+exports.IBizEditFormControl = index$b.IBizEditFormControl;
+exports.IBizFormControl = index$c.IBizFormControl;
 exports.IBizFormGroupPanel = index$1.IBizFormGroupPanel;
 exports.IBizFormItemContainer = formItemContainer.IBizFormItemContainer;
 exports.IBizFormItem = index$2.IBizFormItem;
@@ -32,3 +33,4 @@ exports.IBizFormMDCtrl = index$6.IBizFormMDCtrl;
 exports.IBizFormRawItem = index$7.IBizFormRawItem;
 exports.IBizFormTabPanel = index$8.IBizFormTabPanel;
 exports.IBizFormTabPage = index$9.IBizFormTabPage;
+exports.IBizFormButtonList = index$a.IBizFormButtonList;

package/lib/control/gantt/gantt.cjs

@@ -3,6 +3,7 @@
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
+var core = require('@ibiz-template/core');
 var dayjs = require('dayjs');
 var elTreeUtil = require('../tree/el-tree-util.cjs');
 require('./gantt.css');
@@ -50,7 +51,6 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
     const iBizIcon = vue.resolveComponent("IBizIcon");
     let forbidClick = false;
     const selection = [];
-    const color = ["blue", "light-blue", "blue-cyan", "pink", "purple", "violet", "indigo", "cyan", "teal", "green", "light-green", "lime", "yellow", "amber", "orange", "grey", "sky-blue"];
     const app = (_a = vue.getCurrentInstance()) == null ? void 0 : _a.appContext.app;
     vue.onMounted(() => {
       const importGantt = () => import('@ibiz-template-plugin/gantt');
@@ -59,27 +59,44 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         app == null ? void 0 : app.use(defaltModule);
         isInited.value = true;
       });
+      c.evt.on("onToggleRowExpansion", (event) => {
+        const {
+          row,
+          expand
+        } = event;
+        if (ganttRef.value) {
+          if (expand) {
+            ganttRef.value.setExpand(row);
+          } else {
+            ganttRef.value.setCollapse(row);
+          }
+        }
+      });
     });
     const getVarValue = (varName) => {
       const root = document.documentElement;
       return getComputedStyle(root).getPropertyValue(varName);
     };
-    const ganttStyle = vue.computed(() => {
+    const {
+      UIStore
+    } = vue3Util.useUIStore();
+    const ganttStyle = vue.ref({});
+    const calcGanttStyle = () => {
       var _a2, _b;
-      const style = {
+      return {
         primaryColor: ((_a2 = c.state.ganttStyle) == null ? void 0 : _a2.primaryColor) || getVarValue("--ibiz-color-primary"),
-        textColor: ((_b = c.state.ganttStyle) == null ? void 0 : _b.textColor) || getVarValue("--ibiz-color-primary-text")
+        textColor: ((_b = c.state.ganttStyle) == null ? void 0 : _b.textColor) || getVarValue("--ibiz-color-text-3"),
+        headerBgColor: "rgba(".concat(getVarValue("--ibiz-grey-1"), ", 1)"),
+        bgColor: getVarValue("--ibiz-color-bg-1"),
+        weekendColor: getVarValue("--ibiz-color-fill-2"),
+        todayColor: getVarValue("--ibiz-color-primary-light-active"),
+        borderColor: getVarValue("--ibiz-color-tertiary-light-active")
       };
-      return style;
-    });
-    const sliderColor = vue.computed(() => {
-      var _a2;
-      const nodeColor = {};
-      (_a2 = c.model.detreeNodes) == null ? void 0 : _a2.forEach((node, index) => {
-        const colorIndex = index % color.length;
-        nodeColor[node.id] = "rgba(".concat(getVarValue("--ibiz-".concat(color[colorIndex], "-0")), ", 1)");
-      });
-      return nodeColor;
+    };
+    vue.watch(() => UIStore.theme, () => {
+      ganttStyle.value = calcGanttStyle();
+    }, {
+      immediate: true
     });
     const loading = vue.computed(() => {
       if (c.state.isLoaded) {
@@ -188,6 +205,25 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       sliderMove.value = true;
       c.modifyNodeTime(nodeData, newValue);
     };
+    const onSettingClick = async () => {
+      const res = await ibiz.overlay.modal((modal) => {
+        const comp = vue.resolveComponent("IBizGanttSetting");
+        const options = {
+          modal,
+          columnStates: c.state.columnStates
+        };
+        if (c.state.mustShowColumns) {
+          options.mustShowColumns = c.state.mustShowColumns;
+        }
+        return vue.h(comp, options);
+      }, void 0, {
+        width: "auto",
+        height: "auto"
+      });
+      if (res.ok && res.data && res.data.length > 0) {
+        c.setColumnVisible(res.data);
+      }
+    };
     const calcContextMenuItems = (toolbarItems, nodeData, evt, menuState) => {
       const result = [];
       toolbarItems.forEach((item) => {
@@ -300,12 +336,10 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "width": width && width > 30 ? width : 30,
         "center": (align == null ? void 0 : align.toLowerCase()) === "center"
       }, {
-        title: ({
-          label
-        }) => {
+        title: () => {
           return vue.createVNode("div", {
             "class": headerSysCss == null ? void 0 : headerSysCss.cssName
-          }, [label]);
+          }, [caption]);
         },
         default: ({
           row
@@ -355,6 +389,10 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         content: ({
           row
         }) => {
+          const {
+            sysCss
+          } = c.getNodeModel(row._nodeId);
+          const sysCssName = (sysCss == null ? void 0 : sysCss.cssName) || "";
           return vue.createVNode(vue.resolveComponent("el-popover"), {
             "placement": "bottom",
             "width": "auto",
@@ -364,10 +402,7 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
           }, {
             reference: () => {
               return vue.createVNode("div", {
-                "class": ns.e("slider"),
-                "style": {
-                  background: sliderColor.value[row._nodeId]
-                },
+                "class": [ns.e("slider"), sysCssName],
                 "onClick": (evt) => onNodeClick(row, evt),
                 "onDblclick": () => onNodeDbClick(row),
                 "onContextmenu": (evt) => onNodeContextmenu(row, evt)
@@ -388,6 +423,28 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       const slider = renderSlider();
       return [..._columns, slider];
     };
+    const renderSetting = () => {
+      if (!c.controlParams.enablecustomized || c.controlParams.enablecustomized && c.controlParams.enablecustomized === "false") {
+        return null;
+      }
+      return vue.createVNode("div", {
+        "class": ns.e("setting"),
+        "onClick": () => onSettingClick(),
+        "title": core.showTitle(ibiz.i18n.t("control.gantt.hideControl"))
+      }, [vue.createVNode("svg", {
+        "class": ns.em("setting", "icon"),
+        "viewBox": "0 0 16 16",
+        "xmlns": "http://www.w3.org/2000/svg",
+        "height": "1em",
+        "width": "1em",
+        "focusable": "false"
+      }, [vue.createVNode("g", {
+        "stroke-width": "1",
+        "fill-rule": "evenodd"
+      }, [vue.createVNode("path", {
+        "d": "M11.405 13.975l3.398-5.889L11.405 2.2H4.607L1.208 8.087l3.399 5.889h6.798zm1.023-12.4l3.43 5.938c.205.356.205.793 0 1.149l-3.43 5.938a1.147 1.147 0 0 1-.993.574H4.577c-.41 0-.789-.218-.994-.573L.153 8.66a1.153 1.153 0 0 1 0-1.147l3.43-5.94c.205-.356.584-.575.994-.575h6.858c.409 0 .788.22.993.576zM8.006 9.879c.988 0 1.792-.804 1.792-1.792s-.804-1.792-1.792-1.792-1.792.804-1.792 1.792.804 1.792 1.792 1.792zm0-4.784a2.993 2.993 0 1 1-.002 5.985 2.993 2.993 0 0 1 .002-5.985z"
+      }, null)])])]);
+    };
     return {
       c,
       ns,
@@ -404,6 +461,7 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       onNodeExpand,
       onNodeCollapse,
       renderContent,
+      renderSetting,
       onSliderMove,
       renderNoData,
       allowDrop,
@@ -426,6 +484,7 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "data": this.data,
         "row-height": 46,
         "expand-all": false,
+        "headerDrag": true,
         "start-key": "_beginDataItemValue",
         "end-key": "_endDataItemValue",
         "children": "_children",
@@ -448,7 +507,15 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "onMoveSlider": this.onSliderMove,
         "primaryColor": this.ganttStyle.primaryColor,
         "headerStyle": {
-          textColor: this.ganttStyle.textColor
+          textColor: this.ganttStyle.textColor,
+          bgColor: this.ganttStyle.headerBgColor
+        },
+        "borderColor": this.ganttStyle.borderColor,
+        "bodyStyle": {
+          todayColor: this.ganttStyle.todayColor,
+          weekendColor: this.ganttStyle.headerBgColor,
+          bgColor: this.ganttStyle.bgColor,
+          selectColor: this.ganttStyle.headerBgColor
         }
       }, {
         default: () => {
@@ -456,6 +523,9 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         },
         empty: () => {
           return this.renderNoData();
+        },
+        setting: () => {
+          return this.renderSetting();
         }
       })]
     }), [[vue.resolveDirective("loading"), this.loading]]);

package/lib/control/gantt/gantt.css

@@ -1 +1 @@
-.ibiz-control-gantt{width:100%;height:100%}.ibiz-control-gantt .xg-root .xg-table-body .xg-table-row{cursor:pointer}.ibiz-control-gantt .xg-root .xg-table-body .xg-table-row .xg-table-cell:not(:first-child)>div{padding:var(--ibiz-spacing-none)}.ibiz-control-gantt .xg-root .xg-table-cell>div{width:100%}.ibiz-control-gantt .xg-root .xg-table-cell>div .cell{height:100%}.ibiz-control-gantt--empty .xg-table-body{height:calc(100% - 86px)!important}.ibiz-control-gantt__slider{height:100%;padding:var(--ibiz-spacing-none) var(--ibiz-spacing-base-tight);cursor:pointer;border-radius:var(--ibiz-border-radius-small)}.ibiz-control-gantt__slider--container-title .icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-control-gantt__slider--container-title .number{display:flex;align-items:center}.ibiz-control-gantt__slider--container-title .caption{margin:var(--ibiz-spacing-tight);font-size:var(--ibiz-font-size-header-6);font-weight:var(--ibiz-font-weight-regular)}.ibiz-control-gantt__slider--container-content{display:flex;justify-content:space-between}.ibiz-control-gantt__slider--container-content .caption{margin:var(--ibiz-spacing-extra-tight);color:var(--ibiz-color-disabled-text)}.ibiz-control-gantt__slider--container-content .detail{display:flex;flex-direction:column;flex-grow:1;align-items:center}.ibiz-control-gantt .ibiz-tree-grid-ex-field-column--ellipsis .ibiz-tree-grid-ex-field-column-text-container{min-width:0}.ibiz-control-gantt .ibiz-tree-grid-ex-field-column-toolbar-container{flex-shrink:0}.ibiz-control-gantt .ibiz-tree-grid-ex-edit-column__editor{min-height:32px}
+.ibiz-control-gantt{width:100%;height:100%}.ibiz-control-gantt .xg-root{--gantt-bg:var(--ibiz-color-bg-1);--gantt-bg-hover:var(--ibiz-color-disabled-border);--gantt-bg-active:var(--ibiz-color-disabled-border);--gantt-bg-checkmark:transparent;--gantt-bg-toolbar-item-hover:var(--ibiz-color-primary-light-default);--gantt-shadow:var(--ibiz-color-shadow);--gantt-shadow-toolbar-item:var(--ibiz-color-shadow);--gantt-border:var(--ibiz-color-tertiary-light-active);--gantt-border-hover:var(--ibiz-color-tertiary-light-active);--gantt-border-dashed:var(--ibiz-color-disabled-border);--gantt-border-toolbar-item:var(--ibiz-color-border);--gantt-border-separate-line:var(--ibiz-color-border);--gantt-text-0:var(--ibiz-color-text-0);--gantt-text-3:var(--ibiz-color-text-3);--gantt-white:var(--ibiz-color-white);--gantt-black:var(--ibiz-color-black);--gantt-warning:var(--ibiz-color-warning)}.ibiz-control-gantt .xg-root .xg-table-body .xg-table-row{cursor:pointer}.ibiz-control-gantt .xg-root .xg-table-body .xg-table-row .xg-table-cell:not(:first-child)>div{padding:var(--ibiz-spacing-none)}.ibiz-control-gantt .xg-root .xg-table-cell>div{width:100%}.ibiz-control-gantt .xg-root .xg-table-cell>div .cell{height:100%}.ibiz-control-gantt--empty .xg-table-body{height:calc(100% - 86px)!important}.ibiz-control-gantt__slider{height:100%;padding:var(--ibiz-spacing-none) var(--ibiz-spacing-base-tight);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:var(--ibiz-border-radius-small)}.ibiz-control-gantt__slider--container-title .icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-control-gantt__slider--container-title .number{display:flex;align-items:center}.ibiz-control-gantt__slider--container-title .caption{margin:var(--ibiz-spacing-tight);font-size:var(--ibiz-font-size-header-6);font-weight:var(--ibiz-font-weight-regular)}.ibiz-control-gantt__slider--container-content{display:flex;justify-content:space-between}.ibiz-control-gantt__slider--container-content .caption{margin:var(--ibiz-spacing-extra-tight);color:var(--ibiz-color-disabled-text)}.ibiz-control-gantt__slider--container-content .detail{display:flex;flex-direction:column;flex-grow:1;align-items:center}.ibiz-control-gantt__setting{display:flex;align-items:center}.ibiz-control-gantt__setting--icon{cursor:pointer;fill:var(--ibiz-color-primary)}.ibiz-control-gantt .ibiz-tree-grid-ex-field-column--ellipsis .ibiz-tree-grid-ex-field-column-text-container{min-width:0}.ibiz-control-gantt .ibiz-tree-grid-ex-field-column-toolbar-container{flex-shrink:0}.ibiz-control-gantt .ibiz-tree-grid-ex-edit-column__editor{min-height:32px}.xg-view-toolbar-switch-action{--gantt-text-switch-item:var(--ibiz-color-text-3);--gantt-bg-hover-switch-item:var(--ibiz-color-bg-0)}

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

@@ -2,6 +2,7 @@
 
 var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
+var lodashEs = require('lodash-es');
 var vue = require('vue');
 
 "use strict";
@@ -29,10 +30,31 @@ function useITableEvent(c) {
   const tableRef = vue.ref();
   let forbidChange = false;
   let isGridUISort = false;
+  c.evt.on("onToggleRowExpansion", (event) => {
+    const { row, expand } = event;
+    if (tableRef.value) {
+      if (tableRef.value.lazy) {
+        const { store } = tableRef.value;
+        const { treeData } = tableRef.value.store.states;
+        const data = treeData.value[row.srfkey];
+        if (data && data.expanded !== expand) {
+          store.loadOrToggle(row);
+        }
+      } else {
+        tableRef.value.toggleRowExpansion(row, expand);
+      }
+    }
+  });
   async function onRowClick(data, _column, _event) {
     if (data.srfuf === runtime.Srfuf.CREATE) {
       return;
     }
+    const target = _event.target;
+    const { classList } = target.parentElement || {};
+    if (classList && classList.contains("el-table-column--selection")) {
+      tableRef.value.toggleRowSelection(data);
+      return;
+    }
     if (c.editShowMode === "row" && c.model.enableRowEdit) {
       const row = c.findRowState(data);
       if (row && row.showRowEdit !== true) {
@@ -94,6 +116,21 @@ function useITableEvent(c) {
     if (sortQuery === c.state.sortQuery) {
       return;
     }
+    if (c.runMode === "DESIGN") {
+      c.state.items = lodashEs.orderBy(
+        c.state.items,
+        [(item) => {
+          var _a;
+          return ((_a = item == null ? void 0 : item[fieldName || ""]) == null ? void 0 : _a.length) || 0;
+        }],
+        [order1 || "asc"]
+      );
+      c.state.rows = c.state.items.map((item) => {
+        const row = new runtime.GridRowState(new runtime.ControlVO(item), c);
+        return row;
+      });
+      return;
+    }
     c.setSort(fieldName, order1);
     c.load({
       isInitialLoad: c.model.pagingMode === 2 || c.model.pagingMode === 3
@@ -196,7 +233,13 @@ function useAppGridBase(c, props) {
       return;
     }
     c.state.items = props.data;
-    c.state.rows = props.data.map((item) => {
+    if (c.runMode === "DESIGN") {
+      c.state.simpleData = props.data;
+      c.state.total = props.data.length;
+      c.state.curPage = 1;
+      c.state.items = lodashEs.chunk(c.state.simpleData, c.state.size)[c.state.curPage - 1] || [];
+    }
+    c.state.rows = c.state.items.map((item) => {
       const row = new runtime.GridRowState(new runtime.ControlVO(item), c);
       return row;
     });