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

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

@@ -1,7 +1,7 @@
 'use strict';
 
 var vue = require('vue');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.38-alpha.16_axios@1.7.7_lodash-es@4.17.21_qs@6.13.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.38-alpha.32_axios@1.7.7_lodash-es@4.17.21_qs@6.13.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

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

@@ -21,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 对象
      *
@@ -59,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 对象
    *
@@ -99,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";
+    }
   }
   /**
    * 通过计数器数据，计算项状态
@@ -318,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);
@@ -335,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);

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/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

@@ -46,6 +46,7 @@ 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");
@@ -206,11 +207,16 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       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
+          columnStates: c.state.columnStates,
+          limitsize
         };
         if (c.state.mustShowColumns) {
           options.mustShowColumns = c.state.mustShowColumns;
@@ -330,10 +336,19 @@ 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: () => {
@@ -358,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", {
@@ -379,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,
@@ -387,32 +425,30 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "resize-right": c.state.sliderDraggable
       }, {
         content: ({
-          row
+          row,
+          left
         }) => {
           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",
-            "popper-style": {
-              "min-width": "300px"
-            }
-          }, {
-            reference: () => {
-              return vue.createVNode("div", {
-                "class": [ns.e("slider"), sysCssName],
-                "onClick": (evt) => onNodeClick(row, evt),
-                "onDblclick": () => onNodeDbClick(row),
-                "onContextmenu": (evt) => onNodeContextmenu(row, evt)
-              }, null);
+          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)]);
         }
       });
     };
@@ -445,6 +481,17 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
         "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,
@@ -466,7 +513,8 @@ const GanttControl = /* @__PURE__ */ vue.defineComponent({
       renderNoData,
       allowDrop,
       allowDrag,
-      handleDrop
+      handleDrop,
+      onHeaderDragend
     };
   },
   render() {
@@ -504,6 +552,7 @@ 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": {

package/lib/control/gantt/gantt.css

@@ -1 +1 @@
-.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)}
+.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")) {
@@ -202,7 +226,9 @@ function useITableEvent(c) {
     onSelectionChange,
     onSortChange,
     handleRowClassName,
-    handleHeaderCellClassName
+    handleHeaderCellClassName,
+    cleanKeyDown,
+    cleanKeyUp
   };
 }
 function useAppGridPagination(c) {
@@ -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,

package/lib/control/grid/grid/grid.cjs

@@ -37,11 +37,12 @@ function renderColumn(c, model, renderColumns, index) {
   const columnState = c.state.columnStates.find((item) => item.key === columnName);
   const widthFlexGrow = columnC.isAdaptiveColumn || !c.hasAdaptiveColumn && index === renderColumns.length - 1;
   const widthName = widthFlexGrow ? "min-width" : "width";
+  const tempWidth = (columnState == null ? void 0 : columnState.columnWidth) || width;
   return vue.createVNode(vue.resolveComponent("el-table-column"), vue.mergeProps({
     "label": model.caption,
     "prop": columnName
   }, {
-    [widthName]: width
+    [widthName]: tempWidth
   }, {
     "fixed": columnState.fixed,
     "sortable": model.enableSort ? "custom" : false,
@@ -165,7 +166,9 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       onSelectionChange,
       onSortChange,
       handleRowClassName,
-      handleHeaderCellClassName
+      handleHeaderCellClassName,
+      cleanKeyDown = core.NOOP,
+      cleanKeyUp = core.NOOP
     } = gridControl_util.useITableEvent(c);
     const {
       onPageChange,
@@ -280,6 +283,12 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       if (cleanup !== core.NOOP) {
         cleanup();
       }
+      if (cleanKeyDown !== core.NOOP) {
+        cleanKeyDown();
+      }
+      if (cleanKeyUp !== core.NOOP) {
+        cleanKeyUp();
+      }
     });
     const isLodeMoreDisabled = vue.computed(() => {
       if (c.model.pagingMode !== 2) {

package/lib/control/grid/grid-column/grid-field-column/grid-field-column.cjs

@@ -24,6 +24,13 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
   },
   setup(props) {
     const ns = vue3Util.useNamespace("grid-field-column");
+    let emptyHiddenUnit = ibiz.config.grid.emptyHiddenUnit;
+    const {
+      emptyhiddenunit
+    } = props.controller.grid.controlParams;
+    if (emptyhiddenunit) {
+      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
+    }
     const zIndex = props.controller.grid.state.zIndex;
     const onCellClick = (event) => {
       if (props.controller.hasAction) {
@@ -66,6 +73,18 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
       }
       return "";
     });
+    const hiddenEmpty = vue.computed(() => {
+      if (fieldValue.value) {
+        if (emptyHiddenUnit) {
+          if (formatValue.value) {
+            return true;
+          }
+          return false;
+        }
+        return true;
+      }
+      return false;
+    });
     const codeListValue = vue.computed(() => runtime.ValueExUtil.toText(props.controller.model, fieldValue.value));
     const codeListText = vue.ref("");
     const onInfoTextChange = (text) => {
@@ -123,6 +142,7 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
       tooltip,
       zIndex,
       codeListItems,
+      hiddenEmpty,
       findLayoutPanel,
       renderPanelItemLayout
     };
@@ -167,7 +187,7 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
         "class": this.ns.e("text"),
         "title": core.showTitle(this.tooltip),
         "onClick": this.onTextClick
-      }, [this.formatValue, this.fieldValue != null && c.model.unitName, this.percent && "(".concat(this.percent, ")")]);
+      }, [this.formatValue, this.hiddenEmpty && c.model.unitName, this.percent && "(".concat(this.percent, ")")]);
     }
     return vue.createVNode("div", {
       "class": [this.ns.b(), c.clickable(this.row) && this.ns.m("clickable"), this.ns.m(this.controller.grid.overflowMode), (_a = this.controller.model.cellSysCss) == null ? void 0 : _a.cssName, this.ns.is("has-action", !!c.model.deuiactionGroup)],

package/lib/control/tab-exp-panel/tab-exp-panel.css

@@ -1 +1 @@
-.ibiz-control-tabexppanel .el-tabs .el-tabs__header{margin:var(--ibiz-spacing-none)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:var(--ibiz-spacing-none)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .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-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-color-text-0)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .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-tabexppanel .el-tabs.el-tabs--bottom,.ibiz-control-tabexppanel .el-tabs.el-tabs--top{padding-left:var(--ibiz-spacing-base)}.ibiz-control-tabexppanel .el-tabs__item{padding:var(--ibiz-spacing-base)}
+.ibiz-control-tabexppanel{--ibiz-control-tabexppanel-color:var(--ibiz-color-text-2);--ibiz-control-tabexppanel-hover-color:var(--ibiz-color-text-0);--ibiz-control-tabexppanel-active-color:var(--ibiz-color-primary);--ibiz-control-tabexppanel-bar-color:var(--ibiz-color-primary)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header{margin:var(--ibiz-spacing-none)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap{margin:var(--ibiz-spacing-none)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar{background-color:var(--ibiz-control-tabexppanel-bar-color)}.ibiz-control-tabexppanel .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-control-tabexppanel-color)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item:hover{color:var(--ibiz-control-tabexppanel-hover-color)}.ibiz-control-tabexppanel .el-tabs .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-active{color:var(--ibiz-control-tabexppanel-active-color)}.ibiz-control-tabexppanel .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-tabexppanel .el-tabs.el-tabs--bottom,.ibiz-control-tabexppanel .el-tabs.el-tabs--top{padding-left:var(--ibiz-spacing-base)}.ibiz-control-tabexppanel .el-tabs__item{padding:var(--ibiz-spacing-base)}

package/lib/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-text-color:var(--ibiz-color-text-0);--ibiz-control-treeview-bg-color:transparent;--ibiz-control-treeview-disabled-color:var(--ibiz-color-disabled-text);--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) 0;--ibiz-control-treeview-row-hover-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-row-select-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-select-bg-color:var(--ibiz-color-primary-light-default);--ibiz-control-treeview-font-size:var(--ibiz-font-size-regular);--ibiz-control-treeview-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-treeview-node-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-node-icon-width:var(--ibiz-spacing-base);--ibiz-control-treeview-node-icon-margin-right:var(--ibiz-spacing-tight);--ibiz-control-treeview-node-height:26px;--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2);--ibiz-control-treeview-quick-search-padding:0 var(--ibiz-spacing-base) var(--ibiz-spacing-tight);--ibiz-control-treeview-tree-padding:0 var(--ibiz-spacing-base);position:relative;height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview__nav-icon{right:10px;top:14px;cursor:pointer;position:absolute;color:var(--ibiz-color-primary)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{display:flex;align-items:center;width:var(--ibiz-control-treeview-node-icon-width);height:var(--ibiz-control-treeview-node-icon-height);margin-right:var(--ibiz-control-treeview-node-icon-margin-right)}.ibiz-control-treeview-node__icon>svg{width:100%;height:100%}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-control-treeview-disabled-color);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:var(--ibiz-control-treeview-context-menu-width);text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu{--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2)}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-control-treeview-context-menu-padding);background-color:var(--ibiz-control-treeview-context-menu-bg-color);border-radius:var(--ibiz-control-treeview-context-menu-border-radius);--mx-menu-text:var(--ibiz-control-treeview-context-menu-text-color)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{height:var(--ibiz-control-treeview-context-menu-item-height);padding:var(--ibiz-control-treeview-context-menu-item-padding)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item:hover{color:var(--ibiz-control-treeview-context-menu-text-color);background-color:var(--ibiz-control-treeview-context-menu-hover-color)}.ibiz-control-treeview-quick-search{padding:var(--ibiz-control-treeview-quick-search-padding)}.ibiz-control-treeview-tree.el-tree{--el-tree-text-color:var(--ibiz-control-treeview-text-color);--el-tree-node-content-height:var(--ibiz-control-treeview-node-height);padding:var(--ibiz-control-treeview-tree-padding);background-color:var(--ibiz-control-treeview-bg-color)}.ibiz-control-treeview-tree.el-tree .el-tree-node__content:hover{color:var(--ibiz-control-treeview-row-hover-color);background-color:var(--ibiz-control-treeview-row-hover-bg-color)}.ibiz-control-treeview-tree.el-tree.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{color:var(--ibiz-control-treeview-row-select-color);background-color:var(--ibiz-control-treeview-row-select-bg-color)}
+.ibiz-control-treeview{--ibiz-control-treeview-text-color:var(--ibiz-color-text-0);--ibiz-control-treeview-bg-color:transparent;--ibiz-control-treeview-disabled-color:var(--ibiz-color-disabled-text);--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) 0;--ibiz-control-treeview-row-hover-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-row-select-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-select-bg-color:var(--ibiz-color-primary-light-default);--ibiz-control-treeview-font-size:var(--ibiz-font-size-regular);--ibiz-control-treeview-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-treeview-node-icon-height:var(--ibiz-width-icon-medium);--ibiz-control-treeview-node-icon-width:var(--ibiz-width-icon-medium);--ibiz-control-treeview-node-icon-margin-right:var(--ibiz-spacing-tight);--ibiz-control-treeview-node-height:26px;--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2);--ibiz-control-treeview-quick-search-padding:0 var(--ibiz-spacing-base) var(--ibiz-spacing-tight);--ibiz-control-treeview-tree-padding:0 var(--ibiz-spacing-base);position:relative;height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview__nav-icon{position:absolute;top:14px;right:10px;color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{display:flex;align-items:center;width:var(--ibiz-control-treeview-node-icon-width);height:var(--ibiz-control-treeview-node-icon-height);margin-right:var(--ibiz-control-treeview-node-icon-margin-right)}.ibiz-control-treeview-node__icon>svg{width:100%;height:100%}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-control-treeview-disabled-color);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:var(--ibiz-control-treeview-context-menu-width);text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu{--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2)}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-control-treeview-context-menu-padding);background-color:var(--ibiz-control-treeview-context-menu-bg-color);border-radius:var(--ibiz-control-treeview-context-menu-border-radius);--mx-menu-text:var(--ibiz-control-treeview-context-menu-text-color)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{height:var(--ibiz-control-treeview-context-menu-item-height);padding:var(--ibiz-control-treeview-context-menu-item-padding)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item:hover{color:var(--ibiz-control-treeview-context-menu-text-color);background-color:var(--ibiz-control-treeview-context-menu-hover-color)}.ibiz-control-treeview-quick-search{padding:var(--ibiz-control-treeview-quick-search-padding)}.ibiz-control-treeview-tree.el-tree{--el-tree-text-color:var(--ibiz-control-treeview-text-color);--el-tree-node-content-height:var(--ibiz-control-treeview-node-height);padding:var(--ibiz-control-treeview-tree-padding);background-color:var(--ibiz-control-treeview-bg-color)}.ibiz-control-treeview-tree.el-tree .el-tree-node__content:hover{color:var(--ibiz-control-treeview-row-hover-color);background-color:var(--ibiz-control-treeview-row-hover-bg-color)}.ibiz-control-treeview-tree.el-tree.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{color:var(--ibiz-control-treeview-row-select-color);background-color:var(--ibiz-control-treeview-row-select-bg-color)}

package/lib/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.cjs

@@ -24,6 +24,13 @@ const TreeGridExFieldColumn = /* @__PURE__ */ vue.defineComponent({
   },
   setup(props) {
     const ns = vue3Util.useNamespace("tree-grid-ex-field-column");
+    let emptyHiddenUnit = ibiz.config.grid.emptyHiddenUnit;
+    const {
+      emptyhiddenunit
+    } = props.controller.treeGrid.controlParams;
+    if (emptyhiddenunit) {
+      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
+    }
     const fieldValue = vue.computed(() => {
       if (props.row.data._nodeType !== "DE" && props.controller.isFirstShowColumn) {
         return props.row.data._text;
@@ -38,6 +45,7 @@ const TreeGridExFieldColumn = /* @__PURE__ */ vue.defineComponent({
       codeListText.value = text;
     };
     const showText = vue.computed(() => {
+      var _a, _b;
       const nodeColumnC = nodeColumn.value;
       if (nodeColumnC) {
         if (nodeColumnC.nodeEditItem) {
@@ -46,7 +54,15 @@ const TreeGridExFieldColumn = /* @__PURE__ */ vue.defineComponent({
         if (nodeColumnC.codeList) {
           return codeListText.value;
         }
-        return nodeColumnC.formatValue(fieldValue.value) + (nodeColumnC.unitName || "");
+        let text = nodeColumnC.formatValue(fieldValue.value);
+        if (emptyHiddenUnit) {
+          if (text) {
+            text += nodeColumnC.unitName || ((_a = nodeColumnC.nodeColumn) == null ? void 0 : _a.unitName) || "";
+          }
+        } else {
+          text += nodeColumnC.unitName || ((_b = nodeColumnC.nodeColumn) == null ? void 0 : _b.unitName) || "";
+        }
+        return text;
       }
       return fieldValue.value;
     });

package/lib/editor/data-picker/ibiz-picker-embed-view/ibiz-picker-embed-view.css

@@ -1 +1 @@
-.ibiz-picker-embed-view--disabled{cursor:not-allowed}.ibiz-picker-embed-view--disabled *{pointer-events:none;cursor:not-allowed}.ibiz-picker-embed-view--disabled .el-tree-node__expand-icon{pointer-events:all;cursor:pointer}.ibiz-picker-embed-view--show-value{height:calc(100% - var(--ibiz-form-item-line-height))}.ibiz-picker-embed-view .ibiz-picker-embed-view-view{height:100%}.ibiz-picker-embed-view .ibiz-picker-embed-view-value{height:var(--ibiz-form-item-line-height);line-height:var(--ibiz-form-item-line-height)}
+.ibiz-picker-embed-view{width:100%;height:100%}.ibiz-picker-embed-view--disabled{cursor:not-allowed}.ibiz-picker-embed-view--disabled *{pointer-events:none;cursor:not-allowed}.ibiz-picker-embed-view--disabled .el-tree-node__expand-icon{pointer-events:all;cursor:pointer}.ibiz-picker-embed-view--show-value .ibiz-picker-embed-view-view{height:calc(100% - var(--ibiz-form-item-line-height))!important}.ibiz-picker-embed-view .ibiz-picker-embed-view-view{height:100%}.ibiz-picker-embed-view .ibiz-picker-embed-view-value{height:var(--ibiz-form-item-line-height)}

package/lib/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.cjs

@@ -49,7 +49,12 @@ const IBizDropdown = /* @__PURE__ */ vue.defineComponent({
       const list = [];
       nodes.forEach((codeItem) => {
         var _a;
-        codeListItems.value.push(codeItem);
+        const index = codeListItems.value.findIndex((_item) => {
+          return _item.value === codeItem.value;
+        });
+        if (index === -1) {
+          codeListItems.value.push(codeItem);
+        }
         const tempObj = {
           label: codeItem.text,
           value: (_a = codeItem.value) == null ? void 0 : _a.toString(),
@@ -301,7 +306,8 @@ const IBizDropdown = /* @__PURE__ */ vue.defineComponent({
               "class": [ns.b("select-option-text"), codeListItem == null ? void 0 : codeListItem.textCls],
               "style": (codeListItem == null ? void 0 : codeListItem.color) || (codeListItem == null ? void 0 : codeListItem.bkcolor) ? ns.cssVarBlock({
                 "select-option-item-color": "".concat(codeListItem.color || ""),
-                "select-option-item-bkcolor": "".concat(codeListItem.bkcolor || "")
+                "select-option-item-bkcolor": "".concat(codeListItem.bkcolor || ""),
+                "select-option-item-padding": "0 var(".concat(ns.cssVarName("spacing-base"), ")")
               }) : ""
             }, [(codeListItem == null ? void 0 : codeListItem.sysImage) && vue.createVNode(vue.resolveComponent("iBizIcon"), {
               "icon": codeListItem == null ? void 0 : codeListItem.sysImage