ele-admin-plus 1.1.9-beta.8 → 1.1.9

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

@@ -2,11 +2,11 @@ import { defineComponent, openBlock, createElementBlock, renderSlot, normalizePr
 const _sfc_main = defineComponent({
   name: "ExpandRow",
   props: {
-    /** 列配置 */
+    /** 列配置(原始配置) */
     column: Object,
     /** 行索引 */
     rowIndex: Number,
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: Object
   }
 });
@@ -20,7 +20,7 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { class: "el-table-v2__row-cell ele-table-td" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", _hoisted_1, [
-    _ctx.column && _ctx.column.originalCol && _ctx.column.originalCol.slot ? renderSlot(_ctx.$slots, _ctx.column.originalCol.slot, normalizeProps(mergeProps({ key: 0 }, { row: _ctx.rowData, column: _ctx.column.originalCol, $index: _ctx.rowIndex }))) : createCommentVNode("", true)
+    _ctx.column && _ctx.column.slot ? renderSlot(_ctx.$slots, _ctx.column.slot, normalizeProps(mergeProps({ key: 0 }, { row: _ctx.rowData, column: _ctx.column, $index: _ctx.rowIndex }))) : createCommentVNode("", true)
   ]);
 }
 const expandRow = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

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

@@ -1,42 +1,61 @@
-import type { PropType } from 'vue';
-import type { DataItem } from '../../ele-data-table/types';
-import type { BodyColumns, SumCol, ColSize } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { BodyColumns, SumCol, ColSize, VirtualRow } from '../types';
+import { DataItem } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 表格主体列配置 */
-    bodyCols: PropType<BodyColumns>;
+    bodyCols: {
+        type: PropType<BodyColumns>;
+        required: true;
+    };
+    /** 表格数据 */
+    tableData: {
+        type: PropType<VirtualRow[]>;
+        required: true;
+    };
     /** 表格主体列宽 */
-    colSizes: PropType<ColSize[]>;
+    colSizes: {
+        type: PropType<ColSize[]>;
+        required: true;
+    };
     /** 表格主体所有列合计宽度 */
     sumWidth: NumberConstructor;
-    /** 表格数据 */
-    tableData: PropType<DataItem[]>;
     /** 表格行高 */
     rowHeight: NumberConstructor;
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: FunctionConstructor;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
 }, {
-    sumCols: import("vue").ComputedRef<SumCol[]>;
+    sumCols: import('vue').ComputedRef<SumCol[]>;
     onMouseenter: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     /** 单元格鼠标移入事件 */
     mouseenter: (_e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 表格主体列配置 */
-    bodyCols: PropType<BodyColumns>;
+    bodyCols: {
+        type: PropType<BodyColumns>;
+        required: true;
+    };
+    /** 表格数据 */
+    tableData: {
+        type: PropType<VirtualRow[]>;
+        required: true;
+    };
     /** 表格主体列宽 */
-    colSizes: PropType<ColSize[]>;
+    colSizes: {
+        type: PropType<ColSize[]>;
+        required: true;
+    };
     /** 表格主体所有列合计宽度 */
     sumWidth: NumberConstructor;
-    /** 表格数据 */
-    tableData: PropType<DataItem[]>;
     /** 表格行高 */
     rowHeight: NumberConstructor;
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: FunctionConstructor;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
 }>> & {
     onMouseenter?: ((_e: MouseEvent) => any) | undefined;
 }, {}, {}>;

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>;
     /** 当前列索引 */
@@ -24,25 +25,25 @@ declare const _default: import("vue").DefineComponent<{
     /** 表格尺寸 */
     tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 单元格样式自定义 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */
     rowHeight: NumberConstructor;
 }, {
-    originalCol: import("vue").ComputedRef<Column | undefined>;
-    cellClass: import("vue").ComputedRef<string>;
-    cellStyle: import("vue").ComputedRef<StyleValues | undefined>;
-    cellTitle: import("vue").ComputedRef<string | undefined>;
-    renderOpt: import("vue").ComputedRef<CustomRenderProps>;
+    originalCol: import('vue').ComputedRef<Column | undefined>;
+    cellClass: import('vue').ComputedRef<string>;
+    cellStyle: import('vue').ComputedRef<StyleValues | undefined>;
+    cellTitle: import('vue').ComputedRef<string | undefined>;
+    renderOpt: import('vue').ComputedRef<CustomRenderProps>;
     onCheckedChange: (checked: boolean) => void;
     onFilterChange: (value: FilterValue) => void;
     onClick: (e: MouseEvent) => void;
     onContextmenu: (e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     /** 多选框选中改变事件 */
     checkedChange: (_checked: boolean) => true;
     /** 列筛选改变事件 */
@@ -53,7 +54,7 @@ declare const _default: import("vue").DefineComponent<{
     contextmenu: (_col: Column, _e: MouseEvent) => true;
     /** 鼠标移入事件 */
     mouseenter: (_col: Column, _e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 当前列配置 */
     column: PropType<HeaderColumn>;
     /** 当前列索引 */
@@ -75,9 +76,9 @@ declare const _default: import("vue").DefineComponent<{
     /** 表格尺寸 */
     tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 单元格样式自定义 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */

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>;
     /** 表头所有行列宽 */
@@ -21,22 +22,22 @@ declare const _default: import("vue").DefineComponent<{
     /** 表格尺寸 */
     tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 表头单元格类名自定义 */
-    headerCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 表头单元样式自定义 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */
     rowHeight: NumberConstructor;
 }, {
     getKey: (column: VirtualColumn, columnIndex: number) => string;
-    getFiltered: (column: VirtualColumn) => import("../../ele-data-table/types").FilterValue;
+    getFiltered: (column: VirtualColumn) => import('../../ele-data-table/types').FilterValue;
     onCellCheckedChange: (checked: boolean) => void;
     onCellFilterChange: (params: CellFilterChangeParams) => void;
     onCellClick: (col: Column, e: MouseEvent) => void;
     onCellContextmenu: (col: Column, e: MouseEvent) => void;
     onCellMouseenter: (col: Column, e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     /** 多选框选中改变事件 */
     checkedChange: (_checked: boolean) => true;
     /** 列筛选改变事件 */
@@ -47,7 +48,7 @@ declare const _default: import("vue").DefineComponent<{
     cellContextmenu: (_col: Column, _e: MouseEvent) => true;
     /** 单元格鼠标移入事件 */
     cellMouseenter: (_col: Column, _e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 表头行配置 */
     headerCols: PropType<HeaderColumns>;
     /** 表头所有行列宽 */
@@ -67,9 +68,9 @@ declare const _default: import("vue").DefineComponent<{
     /** 表格尺寸 */
     tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 表头单元格类名自定义 */
-    headerCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 表头单元样式自定义 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<import("../../ele-data-table/types").DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */