ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.11

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

@@ -1,7 +1,8 @@
-import type { PropType } from 'vue';
-import type { FilterValue } from '../../ele-data-table/types';
-import type { EleTooltipInstance } from '../../ele-app/plus';
-declare const _default: import("vue").DefineComponent<{
+import { EleTooltipInstance } from '../../ele-app/plus';
+import { FilterValue } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 选中项 */
     filtered: PropType<FilterValue>;
     /** 是否多选 */
@@ -10,11 +11,11 @@ declare const _default: import("vue").DefineComponent<{
     filters: PropType<import("element-plus/es/components/table/src/table-column/defaults").Filters | undefined>;
     /** 弹出框定位 */
     filterPlacement: {
-        type: PropType<any>;
+        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
         default: string;
     };
 }, {
-    tooltipRef: import("vue").Ref<EleTooltipInstance>;
+    popperRef: import("vue").Ref<EleTooltipInstance>;
     checkedValue: import("vue").Ref<string[]>;
     clearFilterText: import("vue").ComputedRef<string>;
     filteredValue: import("vue").ComputedRef<string | undefined>;
@@ -37,13 +38,13 @@ declare const _default: import("vue").DefineComponent<{
     filters: PropType<import("element-plus/es/components/table/src/table-column/defaults").Filters | undefined>;
     /** 弹出框定位 */
     filterPlacement: {
-        type: PropType<any>;
+        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
         default: string;
     };
 }>> & {
     onChange?: ((_filtered: FilterValue) => any) | undefined;
 }, {
-    filterPlacement: any;
+    filterPlacement: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
     filterMultiple: boolean;
 }, {}>;
 export default _default;

package/lib/ele-virtual-table/components/expand-row.cjs

@@ -3,11 +3,11 @@ const vue = require("vue");
 const _sfc_main = vue.defineComponent({
   name: "ExpandRow",
   props: {
-    /** 列配置 */
+    /** 列配置(原始配置) */
     column: Object,
     /** 行索引 */
     rowIndex: Number,
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: Object
   }
 });
@@ -21,7 +21,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 vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-    _ctx.column && _ctx.column.originalCol && _ctx.column.originalCol.slot ? vue.renderSlot(_ctx.$slots, _ctx.column.originalCol.slot, vue.normalizeProps(vue.mergeProps({ key: 0 }, { row: _ctx.rowData, column: _ctx.column.originalCol, $index: _ctx.rowIndex }))) : vue.createCommentVNode("", true)
+    _ctx.column && _ctx.column.slot ? vue.renderSlot(_ctx.$slots, _ctx.column.slot, vue.normalizeProps(vue.mergeProps({ key: 0 }, { row: _ctx.rowData, column: _ctx.column, $index: _ctx.rowIndex }))) : vue.createCommentVNode("", true)
   ]);
 }
 const expandRow = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/lib/ele-virtual-table/components/expand-row.d.ts

@@ -1,18 +1,19 @@
-import type { PropType } from 'vue';
-import type { DataItem } from '../../ele-data-table/types';
-declare const _default: import("vue").DefineComponent<{
-    /** 列配置 */
-    column: PropType<Partial<import("element-plus").Column<DataItem>>>;
+import { DataItem, Column } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
+    /** 列配置(原始配置) */
+    column: PropType<Column>;
     /** 行索引 */
     rowIndex: NumberConstructor;
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: PropType<DataItem>;
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    /** 列配置 */
-    column: PropType<Partial<import("element-plus").Column<DataItem>>>;
+    /** 列配置(原始配置) */
+    column: PropType<Column>;
     /** 行索引 */
     rowIndex: NumberConstructor;
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: PropType<DataItem>;
 }>>, {}, {}>;
 export default _default;

package/lib/ele-virtual-table/components/footer-row.cjs

@@ -3,15 +3,25 @@ const vue = require("vue");
 const util = require("../util");
 const _sfc_main = vue.defineComponent({
   name: "FooterRow",
+  components: { CellRender: util.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,
     /** 合计行文本 */
@@ -24,23 +34,17 @@ const _sfc_main = vue.defineComponent({
     mouseenter: (_e) => true
   },
   setup(props, { emit }) {
+    const data = vue.computed(() => {
+      return props.tableData.map((row) => row.rowData);
+    });
     const userSums = vue.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 util.getUserSums(props.summaryMethod, props.bodyCols, data.value);
     });
     const sumCols = vue.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 = util.getSumValue(props.tableData, column.dataKey);
+        const colSize = props.colSizes[i];
+        const sumValue = util.getSumValue(data.value, column.dataKey);
         const col = column.originalCol;
         return {
           key: i + "-" + column.key,
@@ -70,6 +74,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 = vue.resolveComponent("CellRender");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: "ele-table-foot-tr",
     style: vue.normalizeStyle({ width: (_ctx.sumWidth || 0) + "px", height: (_ctx.rowHeight || 0) + "px" })
@@ -95,7 +100,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }),
         onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args))
       }, [
-        vue.createElementVNode("div", _hoisted_1, vue.toDisplayString(col.text), 1)
+        vue.createElementVNode("div", _hoisted_1, [
+          vue.createVNode(_component_CellRender, {
+            render: () => col.text,
+            params: []
+          }, null, 8, ["render"])
+        ])
       ], 38);
     }), 128))
   ], 4);

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

@@ -1,21 +1,31 @@
-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/es/components/table/src/table/defaults").SummaryMethod<DataItem> | undefined>;
 }, {
     sumCols: import("vue").ComputedRef<SumCol[]>;
     onMouseenter: (e: MouseEvent) => void;
@@ -24,19 +34,28 @@ declare const _default: import("vue").DefineComponent<{
     mouseenter: (_e: MouseEvent) => true;
 }, 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/es/components/table/src/table/defaults").SummaryMethod<DataItem> | undefined>;
 }>> & {
     onMouseenter?: ((_e: MouseEvent) => any) | undefined;
 }, {}, {}>;

package/lib/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/lib/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>;
     /** 表头所有行列宽 */