ele-admin-plus 1.5.1-beta.3 → 1.6.0-beta.1

package/es/ele-tree-select/index.d.ts

@@ -27,31 +27,31 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     checkedValueStrategy: BooleanConstructor;
     wrapperComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
     wrapperComponentProps: ObjectConstructor;
+    size: import('vue').PropType<import('../ele-app/el').ElInputProps["size"]>;
+    disabled: BooleanConstructor;
+    placeholder: StringConstructor;
+    clearable: BooleanConstructor;
+    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    visible: BooleanConstructor;
+    popperClass: StringConstructor;
     placement: {
         type: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["placement"]>;
         default: string;
     };
-    popperClass: StringConstructor;
+    popperOptions: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
+    persistent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     teleported: {
         type: BooleanConstructor;
         default: boolean;
     };
-    clearable: BooleanConstructor;
-    disabled: BooleanConstructor;
-    size: import('vue').PropType<import('../ele-app/el').ElInputProps["size"]>;
-    placeholder: StringConstructor;
     filterable: BooleanConstructor;
     tagType: {
         type: import('vue').PropType<import('../ele-app/el').ElTagProps["type"]>;
         default: string;
     };
-    persistent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    visible: BooleanConstructor;
-    popperOptions: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
-    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     automaticDropdown: BooleanConstructor;
     multiple: BooleanConstructor;
     responsive: {
@@ -99,10 +99,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     select: (_item: import('element-plus/es/components/tree-v2/src/types').TreeNodeData | import('element-plus/es/components/tree-v2/src/types').TreeNodeData[]) => void;
     clear: () => void;
-    focus: (_e: FocusEvent) => void;
     blur: (_e: FocusEvent) => void;
-    "update:modelValue": (_value: SelectValue) => void;
     change: (_value: SelectValue) => void;
+    focus: (_e: FocusEvent) => void;
+    "update:modelValue": (_value: SelectValue) => void;
     "update:visible": (_visible: boolean) => void;
     visibleChange: (_visible: boolean) => void;
     filterChange: (_value: string) => void;
@@ -127,31 +127,31 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     checkedValueStrategy: BooleanConstructor;
     wrapperComponent: import('vue').PropType<import('../ele-app/types').UserComponent>;
     wrapperComponentProps: ObjectConstructor;
+    size: import('vue').PropType<import('../ele-app/el').ElInputProps["size"]>;
+    disabled: BooleanConstructor;
+    placeholder: StringConstructor;
+    clearable: BooleanConstructor;
+    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    visible: BooleanConstructor;
+    popperClass: StringConstructor;
     placement: {
         type: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["placement"]>;
         default: string;
     };
-    popperClass: StringConstructor;
+    popperOptions: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
+    persistent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     teleported: {
         type: BooleanConstructor;
         default: boolean;
     };
-    clearable: BooleanConstructor;
-    disabled: BooleanConstructor;
-    size: import('vue').PropType<import('../ele-app/el').ElInputProps["size"]>;
-    placeholder: StringConstructor;
     filterable: BooleanConstructor;
     tagType: {
         type: import('vue').PropType<import('../ele-app/el').ElTagProps["type"]>;
         default: string;
     };
-    persistent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    visible: BooleanConstructor;
-    popperOptions: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
-    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     automaticDropdown: BooleanConstructor;
     multiple: BooleanConstructor;
     responsive: {
@@ -172,26 +172,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{
     onSelect?: ((_item: import('element-plus/es/components/tree-v2/src/types').TreeNodeData | import('element-plus/es/components/tree-v2/src/types').TreeNodeData[]) => any) | undefined;
     onClear?: (() => any) | undefined;
-    onFocus?: ((_e: FocusEvent) => any) | undefined;
     onBlur?: ((_e: FocusEvent) => any) | undefined;
-    "onUpdate:modelValue"?: ((_value: SelectValue) => any) | undefined;
     onChange?: ((_value: SelectValue) => any) | undefined;
+    onFocus?: ((_e: FocusEvent) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: SelectValue) => any) | undefined;
     "onUpdate:visible"?: ((_visible: boolean) => any) | undefined;
     onVisibleChange?: ((_visible: boolean) => any) | undefined;
     onFilterChange?: ((_value: string) => any) | undefined;
     onRemoveTag?: ((_value: import('../ele-basic-select/types').SingleValue) => any) | undefined;
 }>, {
     transition: string;
+    disabled: boolean;
     modelValue: SelectValue;
-    placement: import('element-plus').Placement | undefined;
-    teleported: boolean;
     clearable: boolean;
-    disabled: boolean;
-    filterable: boolean;
-    tagType: ("success" | "primary" | "warning" | "info" | "danger") | undefined;
     validateEvent: boolean;
-    persistent: boolean;
     visible: boolean;
+    placement: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined;
+    persistent: boolean;
+    teleported: boolean;
+    filterable: boolean;
+    tagType: "info" | "primary" | "success" | "warning" | "danger" | undefined;
     automaticDropdown: boolean;
     multiple: boolean;
     responsive: boolean;

package/es/ele-tree-select/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, nextTick, onMounted, provide, createBlock, openBlock, createSlots, withCtx, resolveDynamicComponent, normalizeProps, mergeProps, createVNode, unref, createElementVNode, normalizeClass, renderSlot, guardReactiveProps, createTextVNode, toDisplayString, renderList } from "vue";
+import { defineComponent, ref, computed, watch, nextTick, onMounted, provide, openBlock, createBlock, createSlots, withCtx, resolveDynamicComponent, normalizeProps, mergeProps, createVNode, unref, createElementVNode, normalizeClass, renderSlot, guardReactiveProps, createTextVNode, toDisplayString, renderList } from "vue";
 import { ElTreeV2 } from "element-plus";
 import { omit, getValue, eachTree } from "../utils/common";
 import { useProOptions } from "../utils/hook";
@@ -684,7 +684,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         isModalType.value && !_ctx.$slots.modalFooter ? {
           name: "modalFooter",
           fn: withCtx(() => [
-            createVNode(EleButtons, {
+            createVNode(unref(EleButtons), {
               items: [
                 { preset: "cancel", onClick: () => updateVisible(false) },
                 { preset: "confirm", onClick: () => handleConfirm() }

package/es/ele-tree-select/props.d.ts

@@ -35,31 +35,31 @@ export declare const treeSelectProps: {
     wrapperComponent: PropType<UserComponent>;
     /** 内容容器组件属性 */
     wrapperComponentProps: ObjectConstructor;
+    size: PropType<import('../ele-app/el').ElInputProps["size"]>;
+    disabled: BooleanConstructor;
+    placeholder: StringConstructor;
+    clearable: BooleanConstructor;
+    inputStyle: PropType<import('../ele-app/types').StyleValue>;
+    visible: BooleanConstructor;
+    popperClass: StringConstructor;
     placement: {
         type: PropType<import('../ele-app/plus').EleTooltipProps["placement"]>;
         default: string;
     };
-    popperClass: StringConstructor;
+    popperOptions: PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
+    persistent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     teleported: {
         type: BooleanConstructor;
         default: boolean;
     };
-    clearable: BooleanConstructor;
-    disabled: BooleanConstructor;
-    size: PropType<import('../ele-app/el').ElInputProps["size"]>;
-    placeholder: StringConstructor;
     filterable: BooleanConstructor;
     tagType: {
         type: PropType<import('../ele-app/el').ElTagProps["type"]>;
         default: string;
     };
-    persistent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    visible: BooleanConstructor;
-    popperOptions: PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
-    inputStyle: PropType<import('../ele-app/types').StyleValue>;
     automaticDropdown: BooleanConstructor;
     multiple: BooleanConstructor;
     responsive: {

package/es/ele-tree-table/components/table-body.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, createElementBlock, openBlock, Fragment, renderList, createBlock, withCtx, createCommentVNode, createSlots, renderSlot, mergeProps, normalizeClass, normalizeStyle, createTextVNode, toDisplayString } from "vue";
+import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createSlots, renderSlot, mergeProps, createCommentVNode, normalizeClass, normalizeStyle, createTextVNode, toDisplayString } from "vue";
 import TableRow from "./table-row";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "TableBody" },

package/es/ele-tree-table/components/table-row.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createElementBlock, openBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, renderSlot, Fragment, renderList, createCommentVNode, createVNode, unref, withCtx } from "vue";
+import { defineComponent, ref, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, Fragment, renderList, createVNode, unref, withCtx, createCommentVNode, renderSlot } from "vue";
 import { ElIcon } from "element-plus";
 import { ArrowDown } from "../../icons/index";
 const _hoisted_1 = { class: "ele-tree-table-row-body" };

package/es/ele-tree-table/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, nextTick, onMounted, createElementBlock, openBlock, normalizeClass, createElementVNode, normalizeStyle, createBlock, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, createSlots, withCtx, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, watch, nextTick, onMounted, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, createBlock, createSlots, withCtx, normalizeProps, guardReactiveProps } from "vue";
 import TableBody from "./components/table-body";
 import { treeTableProps } from "./props";
 const _hoisted_1 = { class: "ele-tree-table-row" };

package/es/ele-upload-list/components/list-item.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, createElementBlock, openBlock, renderSlot, createCommentVNode, createBlock, createVNode, createElementVNode, unref, withCtx, toDisplayString, mergeProps, withModifiers } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, renderSlot, createVNode, unref, withCtx, createElementVNode, toDisplayString, createBlock, mergeProps, withModifiers, createCommentVNode } from "vue";
 import { ElIcon, ElImage, ElProgress } from "element-plus";
 import { FileOutlined, SyncOutlined, EyeOutlined, EditOutlined, CloseOutlined } from "../../icons/index";
 const _hoisted_1 = ["title"];

package/es/ele-upload-list/index.d.ts

@@ -89,14 +89,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onPreview?: ((_item: UploadItem) => any) | undefined;
     onEditUpload?: ((_result: import('./types').EditUploadResult) => any) | undefined;
 }>, {
+    drag: boolean;
     disabled: boolean;
     readonly: boolean;
     multiple: boolean;
     sortable: boolean | Record<string | number | symbol, any>;
-    drag: boolean;
-    tools: boolean;
-    preview: boolean;
     accept: string;
+    preview: boolean;
+    tools: boolean;
     buttonStyle: false | Partial<import('vue').CSSProperties>;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-upload-list/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, onBeforeUnmount, createBlock, openBlock, unref, mergeProps, withCtx, createElementBlock, createCommentVNode, createElementVNode, renderSlot, normalizeStyle, createVNode, createSlots, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, computed, watch, onBeforeUnmount, openBlock, createBlock, unref, mergeProps, withCtx, createElementBlock, normalizeStyle, createVNode, createElementVNode, renderSlot, createCommentVNode, createSlots, renderList, normalizeProps, guardReactiveProps } from "vue";
 import VueDraggable from "vuedraggable";
 import { ElUpload, ElIcon } from "element-plus";
 import { uuid } from "../utils/common";
@@ -246,7 +246,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, 8, ["drag", "accept", "multiple", "disabled"])
           ], 4)) : createCommentVNode("", true),
           createElementVNode("div", _hoisted_1, [
-            _ctx.tools ? (openBlock(), createElementBlock("input", {
+            _ctx.tools && !_ctx.readonly ? (openBlock(), createElementBlock("input", {
               key: 0,
               ref_key: "uploadInputRef",
               ref: uploadInputRef,

package/es/ele-viewer/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, onMounted, onBeforeUnmount, createElementBlock, openBlock, createElementVNode, normalizeStyle, unref, normalizeClass, renderSlot, Fragment, renderList } from "vue";
+import { defineComponent, ref, computed, onMounted, onBeforeUnmount, openBlock, createElementBlock, createElementVNode, normalizeStyle, unref, normalizeClass, renderSlot, Fragment, renderList } from "vue";
 import { useMoveEvent, useMousewheel } from "../utils/hook";
 import { useContentRatio, getRotatedBounds } from "./util";
 import { viewerEmits, viewerProps } from "./props";

package/es/ele-viewer/util.d.ts

@@ -113,3 +113,108 @@ export declare function useContentRatio(updateStyle?: any): {
     show: import('vue').ComputedRef<any>;
     to: import('vue').ComputedRef<HTMLElement | "body">;
 };
+/**
+ * 内容容器组件插槽传递处理
+ */
+export declare function useContentSlot(): {
+    customProps: import('vue').Ref<any, any>;
+    LoadingSpinner: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
+        width: {
+            type: NumberConstructor;
+            default: number;
+        };
+        height: {
+            type: NumberConstructor;
+            default: number;
+        };
+        rotate: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        lineGap: {
+            type: NumberConstructor;
+            default: number;
+        };
+        font: {
+            type: import('vue').PropType<Required<import('../ele-watermark/types').WatermarkFont>>;
+            required: true;
+        };
+        contents: {
+            type: import('vue').PropType<string[]>;
+            required: true;
+        };
+        image: StringConstructor;
+        offsetX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        offsetY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        commonStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+        width: {
+            type: NumberConstructor;
+            default: number;
+        };
+        height: {
+            type: NumberConstructor;
+            default: number;
+        };
+        rotate: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        lineGap: {
+            type: NumberConstructor;
+            default: number;
+        };
+        font: {
+            type: import('vue').PropType<Required<import('../ele-watermark/types').WatermarkFont>>;
+            required: true;
+        };
+        contents: {
+            type: import('vue').PropType<string[]>;
+            required: true;
+        };
+        image: StringConstructor;
+        offsetX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        offsetY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        commonStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    }>> & Readonly<{}>, {
+        height: number;
+        rotate: number;
+        width: number;
+        gapX: number;
+        gapY: number;
+        lineGap: number;
+        offsetX: number;
+        offsetY: number;
+    }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+    slotProps: Record<string, any>;
+    show: import('vue').ComputedRef<any>;
+    to: import('vue').ComputedRef<HTMLElement | "body">;
+};

package/es/ele-viewer/util.js

@@ -1,4 +1,4 @@
-import { computed, onMounted, watch } from "vue";
+import { computed, onMounted, watch, ref } from "vue";
 import { useLayoutState } from "../ele-pro-layout/util";
 import SvgRender from "../ele-qr-code-svg/components/svg-render";
 import { useSvgOption } from "../ele-qr-code-svg/util";
@@ -39,7 +39,15 @@ function useContentRatio(updateStyle) {
   });
   return { LoadingSpinner: SvgRender, slotProps: svgProps, show: imageId, to };
 }
+function useContentSlot() {
+  const customProps = ref();
+  const contentRatio = useContentRatio((merged) => {
+    customProps.value = merged;
+  });
+  return { ...contentRatio, customProps };
+}
 export {
   getRotatedBounds,
-  useContentRatio
+  useContentRatio,
+  useContentSlot
 };

package/es/ele-virtual-table/components/body-cell.d.ts

@@ -137,8 +137,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>, {
     loading: boolean;
     isCollapse: boolean;
-    isDisabled: boolean;
     hasChildren: boolean;
+    isDisabled: boolean;
     fixedCellHeight: boolean;
     autoRowHeight: boolean;
     isChecked: boolean;

package/es/ele-virtual-table/components/body-cell.js

@@ -1,4 +1,4 @@
-import { defineComponent, useSlots, computed, createElementBlock, openBlock, normalizeStyle, normalizeClass, createElementVNode, createCommentVNode, createBlock, Fragment, withModifiers, createVNode, unref, withCtx, normalizeProps, mergeProps, createTextVNode, toDisplayString } from "vue";
+import { defineComponent, useSlots, computed, openBlock, createElementBlock, normalizeStyle, normalizeClass, createElementVNode, Fragment, createCommentVNode, withModifiers, createVNode, unref, withCtx, createBlock, normalizeProps, mergeProps, createTextVNode, toDisplayString } from "vue";
 import { ElIcon } from "element-plus";
 import { getValue } from "../../utils/common";
 import { LoadingDotOutlined, ArrowDown } from "../../icons/index";
@@ -102,7 +102,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const cellSpan = computed(() => {
       const span = getCellSpan(cellParam.value, props.spanMethod);
-      if (["indedx", "selection", "expand"].includes(colType.value)) {
+      if (["index", "selection", "expand"].includes(colType.value)) {
         span.rowspan = 1;
       }
       return span;

package/es/ele-virtual-table/components/body-row.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, createElementBlock, openBlock, Fragment, renderList, createBlock, createSlots, withCtx, renderSlot, mergeProps } from "vue";
+import { defineComponent, ref, computed, openBlock, createElementBlock, Fragment, renderList, createBlock, createSlots, withCtx, renderSlot, mergeProps } from "vue";
 import BodyCell from "./body-cell";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "BodyRow" },

package/es/ele-virtual-table/components/cell-checkbox.js

@@ -1,4 +1,4 @@
-import { defineComponent, createBlock, openBlock, unref } from "vue";
+import { defineComponent, openBlock, createBlock, unref } from "vue";
 import { ElCheckbox } from "element-plus";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "CellCheckbox" },

package/es/ele-virtual-table/components/cell-filter.d.ts

@@ -33,7 +33,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>> & Readonly<{
     onChange?: ((_filtered: FilterValue) => any) | undefined;
 }>, {
-    filterPlacement: import('element-plus').Placement | undefined;
+    filterPlacement: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined;
     filterMultiple: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/ele-virtual-table/components/cell-filter.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, createElementBlock, openBlock, withModifiers, createVNode, withCtx, unref, Fragment, createElementVNode, renderList, createBlock, createTextVNode, toDisplayString, normalizeClass } from "vue";
+import { defineComponent, ref, computed, openBlock, createElementBlock, withModifiers, createVNode, withCtx, unref, Fragment, renderList, createBlock, createElementVNode, createTextVNode, toDisplayString, normalizeClass } from "vue";
 import { useLocale, ElIcon, ElScrollbar, ElCheckboxGroup, ElCheckbox, ElButton } from "element-plus";
 import EleTooltip from "../../ele-tooltip/index";
 import { FilterFilled } from "../../icons/index";

package/es/ele-virtual-table/components/expand-row.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, renderSlot, createCommentVNode, normalizeProps, mergeProps } from "vue";
+import { defineComponent, openBlock, createElementBlock, renderSlot, normalizeProps, mergeProps, createCommentVNode } from "vue";
 const _hoisted_1 = { class: "el-table-v2__row-cell ele-table-td" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "ExpandRow" },

package/es/ele-virtual-table/components/footer-row.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, createElementBlock, openBlock, normalizeStyle, Fragment, renderList, normalizeClass, createElementVNode, createVNode, unref } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, Fragment, renderList, normalizeClass, createElementVNode, createVNode, unref } from "vue";
 import { getUserSums, getSumValue, CellRender } from "../util";
 const _hoisted_1 = { class: "ele-table-cell" };
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/es/ele-virtual-table/components/header-cell.d.ts

@@ -32,9 +32,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     /** 表格行高 */
     rowHeight: NumberConstructor;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    resize: (_headerCol: HeaderColumn, _width: number, _lineLeft: number, _e: MouseEvent | TouchEvent) => void;
     click: (_col: Column, _e: MouseEvent) => void;
     contextmenu: (_col: Column, _e: MouseEvent) => void;
-    resize: (_headerCol: HeaderColumn, _width: number, _lineLeft: number, _e: MouseEvent | TouchEvent) => void;
     mouseenter: (_col: Column, _e: MouseEvent) => void;
     filterChange: (_params: CellFilterChangeParams) => void;
     checkedChange: (_checked: boolean) => void;
@@ -70,9 +70,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     /** 表格行高 */
     rowHeight: NumberConstructor;
 }>> & Readonly<{
+    onResize?: ((_headerCol: HeaderColumn, _width: number, _lineLeft: number, _e: MouseEvent | TouchEvent) => any) | undefined;
     onClick?: ((_col: Column, _e: MouseEvent) => any) | undefined;
     onContextmenu?: ((_col: Column, _e: MouseEvent) => any) | undefined;
-    onResize?: ((_headerCol: HeaderColumn, _width: number, _lineLeft: number, _e: MouseEvent | TouchEvent) => any) | undefined;
     onMouseenter?: ((_col: Column, _e: MouseEvent) => any) | undefined;
     onFilterChange?: ((_params: CellFilterChangeParams) => any) | undefined;
     onCheckedChange?: ((_checked: boolean) => any) | undefined;

package/es/ele-virtual-table/components/header-cell.js

@@ -1,4 +1,4 @@
-import { defineComponent, useSlots, computed, createElementBlock, openBlock, normalizeStyle, normalizeClass, createCommentVNode, Fragment, createElementVNode, createBlock, unref, normalizeProps, mergeProps, withCtx, createTextVNode, toDisplayString, withModifiers } from "vue";
+import { defineComponent, useSlots, computed, openBlock, createElementBlock, normalizeStyle, normalizeClass, Fragment, createElementVNode, createBlock, unref, normalizeProps, mergeProps, withCtx, createTextVNode, toDisplayString, createCommentVNode, withModifiers } from "vue";
 import { useMoveEvent } from "../../utils/hook";
 import { getColKey, getOrderValue, CellRender, getNumberSize } from "../util";
 import CellCheckbox from "./cell-checkbox";
@@ -272,7 +272,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               onChange: handleFilterChange
             }, null, 8, ["filtered", "filterMultiple", "filters", "filterPlacement"])) : createCommentVNode("", true)
           ]),
-          originalCol.value.resizable !== false ? (openBlock(), createElementBlock("div", {
+          originalCol.value.resizable !== false && !(__props.column && __props.column.colspan && __props.column.colspan > 1) ? (openBlock(), createElementBlock("div", {
             key: 0,
             class: "ele-table-resize-handle",
             onClick: _cache[0] || (_cache[0] = withModifiers(() => {

package/es/ele-virtual-table/components/header-row.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, Fragment, renderList, createBlock, createSlots, withCtx, renderSlot, mergeProps } from "vue";
+import { defineComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, createSlots, withCtx, renderSlot, mergeProps } from "vue";
 import { getColFiltered } from "../util";
 import HeaderCell from "./header-cell";
 const _sfc_main = /* @__PURE__ */ defineComponent({