@ibiz-template/vue3-components 0.7.38-alpha.12 → 0.7.38-alpha.31

package/lib/control/drtab/drtab.controller.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var qxUtil = require('qx-util');
 var runtime = require('@ibiz-template/runtime');
 var vue3Util = require('@ibiz-template/vue3-util');
 
@@ -20,6 +21,18 @@ class DRTabController extends runtime.ControlController {
      * @type {AppCounter}
      */
     __publicField(this, "counter");
+    /**
+     * @description 启用缓存
+     * @type {boolean}
+     * @memberof DRTabController
+     */
+    __publicField(this, "srfCachePos", false);
+    /**
+     * @description 缓存标记
+     * @type {string}
+     * @memberof DRTabController
+     */
+    __publicField(this, "srfCacheKeyTempl", "");
     /**
      * Router 对象
      *
@@ -58,6 +71,19 @@ class DRTabController extends runtime.ControlController {
   get routeDepth() {
     return this.view.modal.routeDepth;
   }
+  /**
+   * @description 选中缓存标识
+   * @readonly
+   * @type {string}
+   * @memberof DRTabController
+   */
+  get storageTag() {
+    if (this.srfCacheKeyTempl) {
+      return this.srfCacheKeyTempl;
+    }
+    const userId = this.context.srfuserid;
+    return "".concat(userId, "_").concat(this.view.model.codeName, "_").concat(this.model.codeName);
+  }
   /**
    * 设置 Router 对象
    *
@@ -98,18 +124,13 @@ class DRTabController extends runtime.ControlController {
   async onCreated() {
     await super.onCreated();
     await this.initCounter();
-  }
-  /**
-   * 部件参数解析
-   *
-   * @protected
-   * @memberof ControlController
-   */
-  handleControlParams() {
-    super.handleControlParams();
+    this.srfCacheKeyTempl = this.controlParams.srfcachekeytempl || "";
     if (this.controlParams.showmore) {
       this.state.showMore = this.controlParams.showmore === "true";
     }
+    if (this.controlParams.srfcachepos) {
+      this.srfCachePos = this.controlParams.srfcachepos.toLowerCase() === "true";
+    }
   }
   /**
    * 通过计数器数据，计算项状态
@@ -317,6 +338,10 @@ class DRTabController extends runtime.ControlController {
       this.state.activeName = this.view.state.srfnav;
     } else {
       this.state.activeName = drTabPages[0].tag;
+      if (this.srfCachePos && localStorage.getItem(this.storageTag)) {
+        const activeName = localStorage.getItem(this.storageTag);
+        this.state.activeName = activeName;
+      }
     }
     const isRoutePushed = !!this.routeDepth && runtime.hasSubRoute(this.routeDepth);
     this.handleTabChange(isRoutePushed);
@@ -334,6 +359,9 @@ class DRTabController extends runtime.ControlController {
     const drBarItem = (_a = this.model.dedrtabPages) == null ? void 0 : _a.find(
       (item) => item.id === activeName
     );
+    if (this.srfCachePos && activeName) {
+      localStorage.setItem("".concat(this.storageTag), activeName);
+    }
     if (drBarItem) {
       this.setVisible("navPos");
       this.openNavPosView(drBarItem, isRoutePushed);
@@ -410,11 +438,11 @@ class DRTabController extends runtime.ControlController {
    * @param {boolean} [isRoutePushed=false]
    * @return {*}  {Promise<void>}
    */
-  async openNavPosView(drTabPages, isRoutePushed = false) {
+  async openNavPosView(drTabPages, isRoutePushed = false, navViewKey) {
     var _a;
     const { context, params } = this.prepareParams(drTabPages);
     (_a = this.navPos) == null ? void 0 : _a.openView({
-      key: drTabPages.id,
+      key: navViewKey || drTabPages.id,
       context,
       params,
       viewId: drTabPages.appViewId,
@@ -441,6 +469,29 @@ class DRTabController extends runtime.ControlController {
       this.counter.onChange(this.calcItemStateByCounter);
     }
   }
+  /**
+   * 刷新
+   *
+   * @author tony001
+   * @date 2024-10-21 11:10:10
+   * @return {*}  {Promise<void>}
+   */
+  async refresh() {
+    var _a;
+    const { activeName } = this.state;
+    const drBarItem = (_a = this.model.dedrtabPages) == null ? void 0 : _a.find(
+      (item) => item.id === activeName
+    );
+    if (drBarItem) {
+      this.setVisible("navPos");
+      this.openNavPosView(drBarItem, false, qxUtil.createUUID());
+    } else {
+      this.setVisible("form");
+      if (this.routeDepth && this.state.drTabPages[0]) {
+        this.router.push(this.state.drTabPages[0].fullPath);
+      }
+    }
+  }
   /**
    * 监听组件销毁
    *

package/lib/control/drtab/drtab.css

@@ -1 +1 @@
-.ibiz-control-drtab{--ibiz-control-drtab-active-color:var(--ibiz-color-primary);--ibiz-control-drtab-hover-color:var(--ibiz-color-text-0);--ibiz-control-drtab-hover-bg-color:transparent}.ibiz-control-drtab__counter{margin-left:var(--ibiz-spacing-tight)}.ibiz-control-drtab .el-tabs .el-tabs__header{margin:var(--ibiz-spacing-none)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:var(--ibiz-spacing-none)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-control-drtab-active-color)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-control-drtab-hover-color);background-color:var(--ibiz-control-drtab-hover-bg-color)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-control-drtab-active-color)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child{padding-right:var(--ibiz-spacing-none)}.ibiz-control-drtab .el-tabs.el-tabs--bottom .el-tabs__nav-scroll,.ibiz-control-drtab .el-tabs.el-tabs--top .el-tabs__nav-scroll{padding:0 var(--ibiz-spacing-base)}.ibiz-control-drtab .el-tabs__item{padding:0 var(--ibiz-spacing-base)}.ibiz-control-drtab .el-tabs__nav-next,.ibiz-control-drtab .el-tabs__nav-prev{line-height:var(--el-tabs-header-height)}.ibiz-control-drtab-pane-label__text+.ibiz-control-drtab-pane-label__counter{margin-left:var(--ibiz-spacing-tight)}.ibiz-control-drtab-more .el-tabs.el-tabs.el-tabs--top .el-tabs__header .el-tabs__nav-next,.ibiz-control-drtab-more .el-tabs.el-tabs.el-tabs--top .el-tabs__header .el-tabs__nav-prev{display:none}.ibiz-control-drtab-more .el-tabs.el-tabs.el-tabs--top .el-tabs__nav-wrap.is-scrollable{padding:var(--ibiz-spacing-none)}.ibiz-control-drtab-more-dropdown{height:100%}.ibiz-control-drtab-more-dropdown__link{position:relative;display:flex;align-items:center;font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-drtab-more-dropdown__link svg{color:var(--ibiz-color-text-2);fill:var(--ibiz-color-text-2)}.ibiz-control-drtab-more-dropdown__link:hover{color:var(--ibiz-color-text-0)}.ibiz-control-drtab-more-dropdown__link:hover svg{color:var(--ibiz-color-text-0);fill:var(--ibiz-color-text-0)}.ibiz-control-drtab-more-dropdown__link::after{position:absolute;left:-16px;display:inline-block;width:100%;height:100%;content:""}.ibiz-control-drtab-more-dropdown-popper{width:240px}.ibiz-control-drtab-more-dropdown-popper__active{background-color:var(--ibiz-color-primary-active)}.ibiz-control-drtab-more-dropdown-popper__label{display:flex;align-items:center;width:100%;overflow:hidden}.ibiz-control-drtab-more-dropdown-popper__label--text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-drtab-more-dropdown-popper__label--counter{min-width:20px;margin-left:var(--ibiz-spacing-tight)}.ibiz-control-drtab-more-dropdown-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .ibiz-control-drtab-more-dropdown-popper__active.el-dropdown-menu__item{background-color:var(--ibiz-color-primary-active)}
+.ibiz-control-drtab{--ibiz-control-drtab-active-color:var(--ibiz-color-primary);--ibiz-control-drtab-hover-color:var(--ibiz-color-text-0);--ibiz-control-drtab-hover-bg-color:transparent}.ibiz-control-drtab__counter{margin-left:var(--ibiz-spacing-tight)}.ibiz-control-drtab .el-tabs .el-tabs__header{margin:var(--ibiz-spacing-none)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:var(--ibiz-spacing-none)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-control-drtab-active-color)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item{font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-control-drtab-hover-color);background-color:var(--ibiz-control-drtab-hover-bg-color)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-control-drtab-active-color)}.ibiz-control-drtab .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child{padding-right:var(--ibiz-spacing-none)}.ibiz-control-drtab .el-tabs.el-tabs--bottom .el-tabs__nav-scroll,.ibiz-control-drtab .el-tabs.el-tabs--top .el-tabs__nav-scroll{padding:0 var(--ibiz-spacing-base)}.ibiz-control-drtab .el-tabs__item{padding:0 var(--ibiz-spacing-base)}.ibiz-control-drtab .el-tabs__nav-next,.ibiz-control-drtab .el-tabs__nav-prev{line-height:var(--el-tabs-header-height)}.ibiz-control-drtab-label__icon{margin-right:var(--ibiz-spacing-tight)}.ibiz-control-drtab-more .el-tabs.el-tabs.el-tabs--top .el-tabs__header .el-tabs__nav-next,.ibiz-control-drtab-more .el-tabs.el-tabs.el-tabs--top .el-tabs__header .el-tabs__nav-prev{display:none}.ibiz-control-drtab-more .el-tabs.el-tabs.el-tabs--top .el-tabs__nav-wrap.is-scrollable{padding:var(--ibiz-spacing-none)}.ibiz-control-drtab-more-dropdown{height:100%}.ibiz-control-drtab-more-dropdown__link{position:relative;display:flex;align-items:center;font-size:var(--ibiz-font-size-regular);color:var(--ibiz-color-text-2)}.ibiz-control-drtab-more-dropdown__link svg{color:var(--ibiz-color-text-2);fill:var(--ibiz-color-text-2)}.ibiz-control-drtab-more-dropdown__link:hover{color:var(--ibiz-color-text-0)}.ibiz-control-drtab-more-dropdown__link:hover svg{color:var(--ibiz-color-text-0);fill:var(--ibiz-color-text-0)}.ibiz-control-drtab-more-dropdown__link::after{position:absolute;left:-16px;display:inline-block;width:100%;height:100%;content:""}.ibiz-control-drtab-more-dropdown-popper{width:240px}.ibiz-control-drtab-more-dropdown-popper__active{background-color:var(--ibiz-color-primary-active)}.ibiz-control-drtab-more-dropdown-popper__label{display:flex;align-items:center;width:100%;overflow:hidden}.ibiz-control-drtab-more-dropdown-popper__label--text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-drtab-more-dropdown-popper__label--counter{min-width:20px;margin-left:var(--ibiz-spacing-tight)}.ibiz-control-drtab-more-dropdown-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .ibiz-control-drtab-more-dropdown-popper__active.el-dropdown-menu__item{background-color:var(--ibiz-color-primary-active)}.ibiz-control-drtab-dropdown-list .ibiz-badge{width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);display:flex;align-items:center;justify-content:center;font-size:var(--ibiz-font-size-small)}.ibiz-control-drtab-dropdown-list__trigger{display:flex;cursor:pointer;align-items:center;font-size:var(--ibiz-font-size-header-5)}.ibiz-control-drtab-dropdown-list__trigger .caption{position:relative;padding:var(--ibiz-spacing-tight)}.ibiz-control-drtab-dropdown-list__trigger .caption .ibiz-badge{top:0;right:-6px;position:absolute}.ibiz-control-drtab-dropdown-list__popper{max-width:220px;min-width:150px}.ibiz-control-drtab-dropdown-list__popper--content{max-height:26vh;overflow:auto}.ibiz-control-drtab-dropdown-list__popper--item{display:flex;align-items:center}.ibiz-control-drtab-dropdown-list__popper--item .caption{padding-right:var(--ibiz-spacing-tight);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-drtab-dropdown-list__popper--item .ibiz-badge{width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);display:flex;align-items:center;justify-content:center;font-size:var(--ibiz-font-size-small);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-drtab-dropdown-list__popper--item ion-icon{color:var(--ibiz-color-primary);font-size:var(--ibiz-width-icon-medium)}.ibiz-control-drtab-dropdown-list__popper--item.is-active{background-color:var(--ibiz-color-fill-0)!important}.ibiz-control-drtab-dropdown-list__popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background-color:transparent}.ibiz-control-drtab-dropdown-list__popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item{min-height:38px;color:var(--ibiz-color-text-0);background-color:transparent}.ibiz-control-drtab-dropdown-list__popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item:hover{background-color:var(--ibiz-color-fill-0)}

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

@@ -130,7 +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,
+      "id": "".concat(this.controller.form.view.model.codeName, "_").concat(this.controller.form.model.codeName, "_").concat(this.modelData.codeName),
       "class": classArr,
       "onClick": (event) => this.controller.onClick(event)
     }, [header, vue.createVNode("div", {

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

@@ -28,14 +28,32 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup(props) {
+    var _a, _b, _c, _d;
     const ns = vue3Util.useNamespace("form-item");
     const c = props.controller;
     const onValueChange = (val, name) => {
       props.controller.setDataValue(val, name);
     };
+    const extraParams = vue.ref({});
+    let emptyHiddenUnit = ibiz.config.form.emptyHiddenUnit;
+    const emptyhiddenunit = (_b = (_a = props.controller.form) == null ? void 0 : _a.controlParams) == null ? void 0 : _b.emptyhiddenunit;
+    if (emptyhiddenunit) {
+      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
+    }
+    const editorParams = ((_d = (_c = props.controller.editor) == null ? void 0 : _c.model) == null ? void 0 : _d.editorParams) || {};
+    const {
+      EMPTYHIDDENUNIT
+    } = editorParams;
+    if (EMPTYHIDDENUNIT) {
+      emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, "true");
+    }
+    Object.assign(extraParams.value, {
+      emptyHiddenUnit
+    });
     return {
       ns,
       c,
+      extraParams,
       onValueChange
     };
   },
@@ -54,6 +72,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       disabled: this.controller.state.disabled,
       readonly: this.controller.state.readonly,
       onChange: this.onValueChange,
+      extraParams: this.extraParams,
       controlParams: editMode ? {
         ...this.controller.form.controlParams,
         editmode: editMode
@@ -79,7 +98,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       }
     }
     return vue.createVNode(vue.resolveComponent("iBizFormItemContainer"), {
-      "id": this.c.model.id,
+      "id": "".concat(this.controller.form.view.model.codeName, "_").concat(this.controller.form.model.codeName, "_").concat(this.modelData.codeName),
       "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-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{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__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/search-form/search-form.cjs

@@ -24,6 +24,10 @@ const SearchFormControl = /* @__PURE__ */ vue.defineComponent({
     provider: {
       type: Object
     },
+    isSimple: {
+      type: Boolean,
+      required: false
+    },
     loadDefault: {
       type: Boolean,
       default: true

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');
@@ -45,12 +46,12 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
     const ganttRef = vue.ref();
     const isInited = vue.ref(false);
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
+    let overlay = null;
     const sliderMove = vue.ref(false);
     const iBizRawItem = vue.resolveComponent("IBizRawItem");
     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');
@@ -77,22 +78,26 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       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) {
@@ -201,6 +206,30 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       sliderMove.value = true;
       c.modifyNodeTime(nodeData, newValue);
     };
+    const onSettingClick = async () => {
+      let limitsize = 0;
+      if (c.controlParams.limitsize) {
+        limitsize = Number(c.controlParams.limitsize);
+      }
+      const res = await ibiz.overlay.modal((modal) => {
+        const comp = vue.resolveComponent("IBizGanttSetting");
+        const options = {
+          modal,
+          columnStates: c.state.columnStates,
+          limitsize
+        };
+        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) => {
@@ -307,18 +336,25 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         align
       } = model;
       const columnC = c.columns[codeName];
+      const columnState = c.state.columnStates.find((item) => {
+        return item.key === codeName;
+      });
+      let tempWidth = 30;
+      if (columnState && columnState.columnWidth) {
+        tempWidth = columnState.columnWidth > 30 ? columnState.columnWidth : 30;
+      } else if (width && width > 30) {
+        tempWidth = width;
+      }
       return vue.createVNode(vue.resolveComponent("x-gantt-column"), {
         "label": caption,
         "prop": codeName,
-        "width": width && width > 30 ? width : 30,
+        "width": tempWidth,
         "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
@@ -337,12 +373,12 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const renderNodePanel = (modelData, item) => {
-      return vue.createVNode(vue.resolveComponent("iBizControlShell"), {
-        "data": item,
-        "modelData": modelData,
-        "context": c.context,
-        "params": c.params
-      }, null);
+      return vue.h(vue3Util.IBizControlShell, {
+        data: item,
+        modelData,
+        context: c.context,
+        params: c.params
+      });
     };
     const renderNodeInfo = (item) => {
       return vue.createVNode("div", {
@@ -358,6 +394,29 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "class": "caption"
       }, [item._text])])]);
     };
+    const openPopover = (row, evt) => {
+      if (overlay) {
+        return;
+      }
+      const panel = findNodeLayoutPanel(row._nodeId);
+      const component = panel ? renderNodePanel(panel, row._deData) : renderNodeInfo(row);
+      overlay = ibiz.overlay.createPopover((modal) => {
+        return vue.h(component, {
+          modal
+        });
+      }, void 0, {
+        width: "auto",
+        height: "auto",
+        noArrow: true,
+        placement: "bottom",
+        modalClass: ns.e("slider-popover")
+      });
+      overlay == null ? void 0 : overlay.present(evt.target.children[0]);
+    };
+    const closePopover = () => {
+      overlay == null ? void 0 : overlay.dismiss();
+      overlay = null;
+    };
     const renderSlider = () => {
       return vue.createVNode(vue.resolveComponent("x-gantt-slider"), {
         "allow-link": false,
@@ -366,31 +425,30 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "resize-right": c.state.sliderDraggable
       }, {
         content: ({
-          row
+          row,
+          left
         }) => {
-          return vue.createVNode(vue.resolveComponent("el-popover"), {
-            "placement": "bottom",
-            "width": "auto",
-            "popper-style": {
-              "min-width": "300px"
-            }
-          }, {
-            reference: () => {
-              return vue.createVNode("div", {
-                "class": ns.e("slider"),
-                "style": {
-                  background: sliderColor.value[row._nodeId]
-                },
-                "onClick": (evt) => onNodeClick(row, evt),
-                "onDblclick": () => onNodeDbClick(row),
-                "onContextmenu": (evt) => onNodeContextmenu(row, evt)
-              }, null);
+          const {
+            sysCss
+          } = c.getNodeModel(row._nodeId);
+          const sysCssName = (sysCss == null ? void 0 : sysCss.cssName) || "";
+          const marginLeft = left < 0 ? "".concat(-left, "px") : "";
+          const caption = row == null ? void 0 : row._text;
+          return vue.createVNode("div", {
+            "class": [ns.e("slider"), sysCssName],
+            "onClick": (evt) => onNodeClick(row, evt),
+            "onDblclick": () => onNodeDbClick(row),
+            "onContextmenu": (evt) => onNodeContextmenu(row, evt),
+            "onMouseenter": (evt) => openPopover(row, evt),
+            "onMouseleave": closePopover
+          }, [vue.createVNode("div", {
+            "class": ns.em("slider", "caption"),
+            "style": {
+              marginLeft
             },
-            default: () => {
-              const panel = findNodeLayoutPanel(row._nodeId);
-              return panel ? renderNodePanel(panel, row._deData) : renderNodeInfo(row);
-            }
-          });
+            "title": caption,
+            "innerHTML": caption
+          }, null)]);
         }
       });
     };
@@ -401,6 +459,39 @@ 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)])])]);
+    };
+    const onHeaderDragend = (index, width) => {
+      const columnState = c.state.columnStates.filter((item) => {
+        var _a2;
+        const columnModel = (_a2 = c.columns[item.key]) == null ? void 0 : _a2.model;
+        return !item.hidden && columnModel;
+      });
+      if (columnState && columnState[index]) {
+        columnState[index].columnWidth = width;
+        c.saveColumnState();
+      }
+    };
     return {
       c,
       ns,
@@ -417,11 +508,13 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       onNodeExpand,
       onNodeCollapse,
       renderContent,
+      renderSetting,
       onSliderMove,
       renderNoData,
       allowDrop,
       allowDrag,
-      handleDrop
+      handleDrop,
+      onHeaderDragend
     };
   },
   render() {
@@ -439,6 +532,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",
@@ -458,10 +552,19 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "onRowClick": this.onNodeClick,
         "onRowDblClick": this.onNodeDbClick,
         "onRowChecked": this.onCheck,
+        "onHeaderDragend": this.onHeaderDragend,
         "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: () => {
@@ -469,6 +572,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 .xg-root .xg-row.xg-gantt-row{overflow:visible}.ibiz-control-gantt .xg-root .xg-row.xg-gantt-row .xg-slider.xg-slider-drag.xg-slider-level0{overflow:visible}.ibiz-control-gantt .xg-root .xg-row.xg-gantt-row .xg-slider .xg-slider-block{overflow:visible}.ibiz-control-gantt .xg-root .xg-row.xg-gantt-row .xg-slider.is-no-width{display:none}.ibiz-control-gantt .xg-root .ibiz-control-gantt__slider--caption{position:sticky;left:8px}.ibiz-control-gantt .xg-root .is-exceeds-range .ibiz-control-gantt__slider::after{position:absolute;right:0;z-index:99;display:block;width:16px;height:100%;content:"";background-color:var(--ibiz-color-primary)}.ibiz-control-gantt--empty .xg-table-body{height:calc(100% - 86px)!important}.ibiz-control-gantt__slider{display:flex;align-items:center;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__slider--caption{overflow:hidden;color:var(--ibiz-color-primary-text);text-overflow:ellipsis;white-space:nowrap}.ibiz-control-gantt__setting{display:flex;align-items:center}.ibiz-control-gantt__setting--icon{cursor:pointer;fill:var(--ibiz-color-primary)}.ibiz-control-gantt__slider-popover{z-index:300!important;width:auto;min-width:300px;padding:12px;border:none;box-shadow:var(--ibiz-shadow-elevated)}.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

@@ -30,6 +30,19 @@ function useITableEvent(c) {
   const tableRef = vue.ref();
   let forbidChange = false;
   let isGridUISort = false;
+  let isCtrlDown = false;
+  let cleanKeyDown = core.NOOP;
+  let cleanKeyUp = core.NOOP;
+  cleanKeyDown = core.listenJSEvent(window, "keydown", (e) => {
+    if (e.code === "ControlLeft") {
+      isCtrlDown = true;
+    }
+  });
+  cleanKeyUp = core.listenJSEvent(window, "keyup", (e) => {
+    if (e.code === "ControlLeft") {
+      isCtrlDown = false;
+    }
+  });
   c.evt.on("onToggleRowExpansion", (event) => {
     const { row, expand } = event;
     if (tableRef.value) {
@@ -49,6 +62,17 @@ function useITableEvent(c) {
     if (data.srfuf === runtime.Srfuf.CREATE) {
       return;
     }
+    if (isCtrlDown) {
+      const selection = [...c.state.selectedData];
+      const index = selection.findIndex((x) => x.srfkey === data.srfkey);
+      if (index !== -1) {
+        selection.splice(index, 1);
+        c.setSelection(selection);
+      } else {
+        c.setSelection([...selection, data]);
+      }
+      return;
+    }
     const target = _event.target;
     const { classList } = target.parentElement || {};
     if (classList && classList.contains("el-table-column--selection")) {
@@ -116,7 +140,7 @@ function useITableEvent(c) {
     if (sortQuery === c.state.sortQuery) {
       return;
     }
-    if (c.context && c.context.srfrunmode === "DESIGN") {
+    if (c.runMode === "DESIGN") {
       c.state.items = lodashEs.orderBy(
         c.state.items,
         [(item) => {
@@ -202,7 +226,9 @@ function useITableEvent(c) {
     onSelectionChange,
     onSortChange,
     handleRowClassName,
-    handleHeaderCellClassName
+    handleHeaderCellClassName,
+    cleanKeyDown,
+    cleanKeyUp
   };
 }
 function useAppGridPagination(c) {
@@ -233,7 +259,7 @@ function useAppGridBase(c, props) {
       return;
     }
     c.state.items = props.data;
-    if (c.context && c.context.srfrunmode === "DESIGN") {
+    if (c.runMode === "DESIGN") {
       c.state.simpleData = props.data;
       c.state.total = props.data.length;
       c.state.curPage = 1;
@@ -385,7 +411,13 @@ function useAppGridBase(c, props) {
   const headerDragend = (newWidth, oldWidth, column) => {
     const { property } = column;
     const columnC = c.columns[property];
+    const columnState = c.state.columnStates.find((item) => {
+      return item.key === property;
+    });
     if (columnC.isAdaptiveColumn) {
+      if (columnState) {
+        columnState.adaptive = false;
+      }
       columnC.isAdaptiveColumn = false;
       columnC.model.width = newWidth;
       const index = renderColumns.value.findIndex((renderColumn) => {
@@ -394,6 +426,10 @@ function useAppGridBase(c, props) {
       });
       c.hasAdaptiveColumn = index !== -1;
     }
+    if (columnState) {
+      columnState.columnWidth = newWidth;
+      c.saveColumnStates();
+    }
   };
   return {
     tableData,