ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/es/ele-virtual-table/props.d.ts

@@ -50,8 +50,13 @@ export declare const virtualTableProps: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
     };
-    width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
+    tableLayout: {
+        type: import('vue').PropType<"fixed" | "auto">;
+        default: string;
+    };
+    width: (NumberConstructor | StringConstructor)[];
     size: {
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -62,7 +67,6 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -109,10 +113,6 @@ export declare const virtualTableProps: {
         };
     };
     load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
-    tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
-        default: string;
-    };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
     showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
@@ -127,6 +127,7 @@ export declare const virtualTableProps: {
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 };
 export type VirtualTableProps = ExtractPropTypes<typeof virtualTableProps>;
 /**
@@ -146,7 +147,7 @@ export declare const virtualTableEmits: {
     cellClick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellDblclick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
+    rowClick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent, _disabled?: boolean, _selection?: import('../ele-data-table/types').DataItem[]) => boolean;
     rowContextmenu: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
     headerClick: (_column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;

package/es/ele-virtual-table/style/index.scss

@@ -9,6 +9,7 @@
 .ele-virtual-table {
   position: relative;
   box-sizing: border-box;
+  overflow: hidden;
 
   /* 原始样式重写 */
   @include virtual-table-wrap {
@@ -529,13 +530,13 @@
 
   &::before {
     border-bottom-color: eleVar('table', 'icon-color');
-    margin-top: calc(0px - #{eleVar('table', 'sort-size')});
+    margin-top: calc(#{eleVar('table', 'sort-size')} * -1);
     margin-bottom: calc(#{eleVar('table', 'sort-space')} / 2);
   }
 
   &::after {
     border-top-color: eleVar('table', 'icon-color');
-    margin-bottom: calc(0px - #{eleVar('table', 'sort-size')});
+    margin-bottom: calc(#{eleVar('table', 'sort-size')} * -1);
     margin-top: calc(#{eleVar('table', 'sort-space')} / 2);
   }
 }

package/es/ele-virtual-table/types.d.ts

@@ -16,7 +16,8 @@ import type {
   DataKey,
   DataItem,
   Column,
-  FilterValue
+  FilterValue,
+  Sorter
 } from '../ele-data-table/types';
 export { RowExpandHandler, ScrollStrategy, SortBy, ScrollPos };
 
@@ -202,6 +203,8 @@ export interface TableState {
   reserveChecked: boolean;
   /** 表格垂直滚动位置 */
   scrollTop: number;
+  /** 表格排序状态 */
+  sorter?: Sorter;
 }
 
 /**

package/es/ele-virtual-table/util.d.ts

@@ -147,6 +147,12 @@ export declare function getOrderValue(sort?: TableV2SortOrder): OrderValue | und
  * @param defaultSort 默认排序值
  */
 export declare function getDefaultSort(defaultSort?: Sorter): SortBy | undefined;
+/**
+ * 获取默认排序状态
+ * @param defaultSort 默认排序值
+ * @param columns 列配置
+ */
+export declare function getDefaultSorter(defaultSort?: Sorter, columns?: Columns): Sorter | undefined;
 /**
  * 获取默认筛选
  * @param columns 列配置
@@ -217,11 +223,10 @@ export declare function floorSize(size: number): number;
  */
 export declare function cellIsOverflow(cell: HTMLElement): boolean;
 /**
- * 表格自适应容器宽高
- * @param getEl 获取根节点的方法
+ * 获取排序对比值
+ * @param sortMethod 自定义的排序方法
+ * @param a 排序数据
+ * @param b 排序比较数据
+ * @param prop 排序字段名
  */
-export declare function useAutoResize(getEl: () => HTMLElement | null): {
-    wrapWidth: import('vue').Ref<number, number>;
-    wrapHeight: import('vue').Ref<number, number>;
-    updateWrapSize: () => void;
-};
+export declare function getSortCompareValue(sortMethod: Column['sortMethod'], a: DataItem, b: DataItem, prop?: string): number;

package/es/ele-virtual-table/util.js

@@ -1,6 +1,5 @@
-import { ref, onMounted, onBeforeUnmount, onActivated, onDeactivated } from "vue";
 import { TableV2SortOrder } from "element-plus";
-import { omit, getValue, mapTree, findTree, eachTree, contentIsEllipsis, debounce } from "../utils/common";
+import { omit, getValue, mapTree, findTree, eachTree, contentIsEllipsis } from "../utils/common";
 import { getColFixedNumber } from "../ele-data-table/util";
 function getRowHeight(size, rowHeight) {
   if (rowHeight != null && rowHeight > 0) {
@@ -252,7 +251,7 @@ function transformTableData(data, hasExpandCol, childrenName, hasChildrenName, r
     return data.map((d, i) => {
       const key = getValue(d, rowKey) ?? i;
       const temp = {
-        rowId: "_expand_" + key,
+        rowId: `_expand_${key}`,
         rowIndex: i,
         rowData: d,
         isExpandRow: true
@@ -325,14 +324,13 @@ function isAutoRowHeight(hasExpandCol, bodyCols, showOverflowTooltip) {
   return showOverflowTooltip == null || showOverflowTooltip === false;
 }
 function CellRender(props, ctx) {
-  var _a, _b;
   if (typeof props.render === "function" && props.params != null) {
     const node = props.render(...props.params);
     if (node != null) {
       return Array.isArray(node) ? node : [node];
     }
   }
-  return (_b = (_a = ctx.slots).default) == null ? void 0 : _b.call(_a);
+  return ctx.slots.default?.();
 }
 function getSortBy(current, col) {
   const key = getColKey(col);
@@ -375,6 +373,14 @@ function getDefaultSort(defaultSort) {
     order: order === "ascending" ? TableV2SortOrder.ASC : TableV2SortOrder.DESC
   };
 }
+function getDefaultSorter(defaultSort, columns) {
+  if (!defaultSort) {
+    return;
+  }
+  const { prop, order } = defaultSort;
+  const col = findTree(columns, (c) => c.prop === prop);
+  return { prop, order, column: col };
+}
 function getDefaultFiltered(columns) {
   const filtered = {};
   eachTree(columns, (col) => {
@@ -423,9 +429,8 @@ function getIndexValue(rowIndex, index, pageIndex) {
   return index + rowIndex;
 }
 function getCellSpan(params, spanMethod) {
-  var _a;
   const span = { rowspan: 1, colspan: 1 };
-  const type = (_a = params.column) == null ? void 0 : _a.type;
+  const type = params.column?.type;
   if ((!type || !["index", "selection", "expand"].includes(type)) && typeof spanMethod === "function") {
     const result = spanMethod(params);
     if (result != null) {
@@ -503,55 +508,22 @@ function cellIsOverflow(cell) {
   const cellChild = cell.querySelector(".ele-table-cell");
   return contentIsEllipsis(cellChild, "horizontal");
 }
-function useAutoResize(getEl) {
-  const wrapWidth = ref(0);
-  const wrapHeight = ref(0);
-  const updateWrapSize = () => {
-    const el = getEl();
-    if (el) {
-      const width = Math.floor(el.clientWidth);
-      if (wrapWidth.value !== width) {
-        wrapWidth.value = width;
-      }
-      const height = Math.floor(el.clientHeight);
-      if (wrapWidth.value !== height) {
-        wrapHeight.value = height;
-      }
-    }
-  };
-  const observer = new ResizeObserver(
-    debounce(() => {
-      updateWrapSize();
-    }, 400)
-  );
-  const observe = () => {
-    unobserve();
-    const el = getEl();
-    if (el) {
-      observer.observe(el);
-    }
-  };
-  const unobserve = () => {
-    const el = getEl();
-    if (el) {
-      observer.unobserve(el);
-    }
-  };
-  onMounted(() => {
-    updateWrapSize();
-    observe();
-  });
-  onBeforeUnmount(() => {
-    observer.disconnect();
-  });
-  onActivated(() => {
-    updateWrapSize();
-    observe();
-  });
-  onDeactivated(() => {
-    unobserve();
-  });
-  return { wrapWidth, wrapHeight, updateWrapSize };
+function getSortCompareValue(sortMethod, a, b, prop) {
+  if (sortMethod) {
+    return sortMethod(a.rowData, b.rowData);
+  }
+  if (!prop) {
+    return a.rowIndex - b.rowIndex;
+  }
+  const aValue = getValue(a.rowData, prop);
+  const bValue = getValue(b.rowData, prop);
+  if (aValue < bValue) {
+    return -1;
+  }
+  if (aValue > bValue) {
+    return 1;
+  }
+  return 0;
 }
 export {
   CellRender,
@@ -570,6 +542,7 @@ export {
   getColumnByKey,
   getDefaultFiltered,
   getDefaultSort,
+  getDefaultSorter,
   getIndexValue,
   getKeysAndList,
   getNumberSize,
@@ -578,6 +551,7 @@ export {
   getRowHeight,
   getSelectableFunction,
   getSortBy,
+  getSortCompareValue,
   getSortOrder,
   getSumValue,
   getTableColumns,
@@ -585,6 +559,5 @@ export {
   getTreeProps,
   getUserSums,
   isAutoRowHeight,
-  transformTableData,
-  useAutoResize
+  transformTableData
 };

package/es/ele-watermark/index.d.ts

@@ -7,20 +7,14 @@ declare function __VLS_template(): {
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     width: NumberConstructor;
     height: NumberConstructor;
-    rotate: {
-        type: NumberConstructor;
-        default: number;
-    };
+    rotate: NumberConstructor;
     zIndex: NumberConstructor;
     image: StringConstructor;
     content: import('vue').PropType<string | string[]>;
     font: import('vue').PropType<WatermarkFont>;
     gap: import('vue').PropType<import('./types').WatermarkGap>;
     offset: import('vue').PropType<import('./types').WatermarkOffset>;
-    lineGap: {
-        type: NumberConstructor;
-        default: number;
-    };
+    lineGap: NumberConstructor;
     customStyle: import('vue').PropType<Exclude<StyleValue, string>>;
     svgRender: BooleanConstructor;
     disabled: BooleanConstructor;
@@ -29,24 +23,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    wrapHeight: StringConstructor;
+    wrapHeight: (NumberConstructor | StringConstructor)[];
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     width: NumberConstructor;
     height: NumberConstructor;
-    rotate: {
-        type: NumberConstructor;
-        default: number;
-    };
+    rotate: NumberConstructor;
     zIndex: NumberConstructor;
     image: StringConstructor;
     content: import('vue').PropType<string | string[]>;
     font: import('vue').PropType<WatermarkFont>;
     gap: import('vue').PropType<import('./types').WatermarkGap>;
     offset: import('vue').PropType<import('./types').WatermarkOffset>;
-    lineGap: {
-        type: NumberConstructor;
-        default: number;
-    };
+    lineGap: NumberConstructor;
     customStyle: import('vue').PropType<Exclude<StyleValue, string>>;
     svgRender: BooleanConstructor;
     disabled: BooleanConstructor;
@@ -55,13 +43,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    wrapHeight: StringConstructor;
+    wrapHeight: (NumberConstructor | StringConstructor)[];
 }>> & Readonly<{}>, {
     fixed: boolean;
-    rotate: number;
-    lineGap: number;
-    svgRender: boolean;
     disabled: boolean;
+    svgRender: boolean;
     wrapPosition: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;