ele-admin-plus 1.1.8 → 1.1.9-beta.10

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

@@ -1,16 +1,26 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString } from "vue";
-import { getSumValue } from "../util";
+import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, normalizeStyle, Fragment, renderList, normalizeClass, createElementVNode, createVNode } from "vue";
+import { CellRender, getUserSums, getSumValue } from "../util";
 const _sfc_main = defineComponent({
   name: "FooterRow",
+  components: { CellRender },
   props: {
     /** 表格主体列配置 */
-    bodyCols: Array,
+    bodyCols: {
+      type: Array,
+      required: true
+    },
+    /** 表格数据 */
+    tableData: {
+      type: Array,
+      required: true
+    },
     /** 表格主体列宽 */
-    colSizes: Array,
+    colSizes: {
+      type: Array,
+      required: true
+    },
     /** 表格主体所有列合计宽度 */
     sumWidth: Number,
-    /** 表格数据 */
-    tableData: Array,
     /** 表格行高 */
     rowHeight: Number,
     /** 合计行文本 */
@@ -23,23 +33,17 @@ const _sfc_main = defineComponent({
     mouseenter: (_e) => true
   },
   setup(props, { emit }) {
+    const data = computed(() => {
+      return props.tableData.map((row) => row.rowData);
+    });
     const userSums = computed(() => {
-      if (typeof props.summaryMethod !== "function" || !props.bodyCols) {
-        return;
-      }
-      const columns = props.bodyCols.map((col) => {
-        return { ...col.originalCol || {}, property: col.dataKey };
-      });
-      return props.summaryMethod({ columns, data: props.tableData });
+      return getUserSums(props.summaryMethod, props.bodyCols, data.value);
     });
     const sumCols = computed(() => {
-      if (!props.bodyCols) {
-        return [];
-      }
       const sums = userSums.value;
       return props.bodyCols.map((column, i) => {
-        const colSize = props.colSizes ? props.colSizes[i] : void 0;
-        const sumValue = getSumValue(props.tableData, column.dataKey);
+        const colSize = props.colSizes[i];
+        const sumValue = getSumValue(data.value, column.dataKey);
         const col = column.originalCol;
         return {
           key: i + "-" + column.key,
@@ -69,6 +73,7 @@ const _export_sfc = (sfc, props) => {
 };
 const _hoisted_1 = { class: "ele-table-cell" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_CellRender = resolveComponent("CellRender");
   return openBlock(), createElementBlock("div", {
     class: "ele-table-foot-tr",
     style: normalizeStyle({ width: (_ctx.sumWidth || 0) + "px", height: (_ctx.rowHeight || 0) + "px" })
@@ -94,7 +99,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }),
         onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args))
       }, [
-        createElementVNode("div", _hoisted_1, toDisplayString(col.text), 1)
+        createElementVNode("div", _hoisted_1, [
+          createVNode(_component_CellRender, {
+            render: () => col.text,
+            params: []
+          }, null, 8, ["render"])
+        ])
       ], 38);
     }), 128))
   ], 4);

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

@@ -1,8 +1,9 @@
-import type { PropType } from 'vue';
+import { HeaderColumn, SortBy, CellFilterChangeParams, CustomRenderProps, ColSize } from '../types';
+import { Column, FilterValue } from '../../ele-data-table/types';
 import { StyleValues } from '../../ele-app/types';
-import type { Column, FilterValue } from '../../ele-data-table/types';
-import type { HeaderColumn, SortBy, CellFilterChangeParams, CustomRenderProps, ColSize } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 当前列配置 */
     column: PropType<HeaderColumn>;
     /** 当前列索引 */

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

@@ -1,7 +1,8 @@
-import type { PropType } from 'vue';
-import type { Column, Filter } from '../../ele-data-table/types';
-import type { VirtualColumn, HeaderColumns, SortBy, CellFilterChangeParams, ColSize } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { VirtualColumn, HeaderColumns, SortBy, CellFilterChangeParams, ColSize } from '../types';
+import { Column, Filter } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 表头行配置 */
     headerCols: PropType<HeaderColumns>;
     /** 表头所有行列宽 */

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

@@ -1,8 +1,9 @@
-import type { Ref } from 'vue';
-import type { ElTableV2Instance, ElTableV2Props } from '../ele-app/el';
-import type { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
-import type { BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize } from './types';
-declare const _default: import("vue").DefineComponent<{
+import { BodyColumn, BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize, VirtualRow } from './types';
+import { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
+import { ElTableV2Instance, ElTableV2Props } from '../ele-app/el';
+import { Ref } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     rowHeight: NumberConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -65,14 +66,10 @@ declare const _default: import("vue").DefineComponent<{
         default: () => never[];
     };
     height: (StringConstructor | NumberConstructor)[];
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    scrollbarAlwaysOn: BooleanConstructor;
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
-        /** 是否显示表尾 */
         type: NumberConstructor;
         default: number;
     };
@@ -138,7 +135,7 @@ declare const _default: import("vue").DefineComponent<{
     bodyColSizes: Ref<ColSize[]>;
     colsSumWidth: Ref<number>;
     tableWidth: Ref<number>;
-    tableData: Ref<DataItem[]>;
+    tableData: Ref<VirtualRow[]>;
     isCheckAll: Ref<boolean>;
     isIndeterminate: import("vue").ComputedRef<boolean>;
     checkedRowKeys: Ref<Set<DataKey>>;
@@ -146,8 +143,7 @@ declare const _default: import("vue").DefineComponent<{
     sortBy: Ref<SortBy | undefined>;
     filtered: Filter;
     tableTooltipProps: Partial<import("../ele-tooltip/props").TooltipProps>;
-    treeHasChildrenName: import("vue").ComputedRef<string>;
-    tableExpandCol: import("vue").ComputedRef<Partial<import("element-plus").Column<DataItem>> | undefined>;
+    tableExpandCol: import("vue").ComputedRef<BodyColumn | undefined>;
     hasExpandCol: import("vue").ComputedRef<boolean>;
     tableExpandColumnKey: import("vue").ComputedRef<string | undefined>;
     tableRowHeight: import("vue").ComputedRef<number>;
@@ -160,13 +156,13 @@ declare const _default: import("vue").DefineComponent<{
     tableEmptyText: import("vue").ComputedRef<string>;
     tableEmptyProps: import("vue").ComputedRef<import("../ele-app/el").ElEmptyProps>;
     onTableFilterChange: (params: CellFilterChangeParams) => void;
-    onCellCheckedChange: (row: DataItem, checked: boolean) => void;
-    onCellExpandChange: (row: DataItem, expanded: boolean, children?: DataItem[]) => void;
-    onCellClick: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellDblclick: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellContextmenu: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellMouseenter: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellMouseleave: (row: DataItem, col: Column, e: MouseEvent) => void;
+    onCellCheckedChange: (row: VirtualRow, checked: boolean) => void;
+    onCellExpandChange: (row: VirtualRow, expanded: boolean, children?: DataItem[]) => void;
+    onCellClick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellDblclick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellContextmenu: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellMouseenter: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellMouseleave: (row: VirtualRow, col: Column, e: MouseEvent) => void;
     onHeaderCellClick: (col: Column | undefined, e: MouseEvent) => void;
     onHeaderCellContextmenu: (col: Column, e: MouseEvent) => void;
     onHeaderCellMouseenter: () => void;
@@ -184,7 +180,7 @@ declare const _default: import("vue").DefineComponent<{
     getSelectionRows: () => DataItem[];
     toggleRowSelection: (row: DataItem, selected?: boolean) => void;
     toggleAllSelection: () => void;
-    toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
+    toggleRowExpansion: (row: VirtualRow, expanded?: boolean) => void;
     setCurrentRow: (row?: DataItem | null) => void;
     setCurrentRowKey: (key?: DataKey | null) => void;
     getCurrentRow: () => DataItem | undefined;
@@ -207,18 +203,17 @@ declare const _default: import("vue").DefineComponent<{
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
-    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean; /** 根节点 */
+    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: import("../ele-data-table/types").Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean; /** 主体区域列 */
+    filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
-    /** 表头所有行列宽 */
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean; /** 表格高度 */
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -282,14 +277,10 @@ declare const _default: import("vue").DefineComponent<{
         default: () => never[];
     };
     height: (StringConstructor | NumberConstructor)[];
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    scrollbarAlwaysOn: BooleanConstructor;
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
-        /** 是否显示表尾 */
         type: NumberConstructor;
         default: number;
     };
@@ -346,6 +337,7 @@ declare const _default: import("vue").DefineComponent<{
     flexible: BooleanConstructor;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
@@ -362,7 +354,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {
@@ -385,9 +376,9 @@ declare const _default: import("vue").DefineComponent<{
     } | undefined;
     tableLayout: "auto" | "fixed";
     flexible: boolean;
+    sticky: boolean;
     headerEllipsis: boolean;
     slotNormalize: boolean;
-    sticky: boolean;
     bottomLine: boolean;
     emptyProps: import("../ele-data-table/types").TableEmptyProps;
     reserveCurrent: boolean;