ele-admin-plus 1.0.0-beta.2 → 1.0.0-beta.4

package/es/ele-pro-table/components/table-view.js

@@ -1,52 +1,38 @@
 import { defineComponent, ref, withDirectives, h } from "vue";
 import { ElTable, vLoading, ElTableColumn } from "element-plus";
-import tableProps from "element-plus/es/components/table/src/table/defaults";
-import { omit } from "../../utils/core";
+import { pick, omit } from "../../utils/core";
 import { useTableMethods, useTableEvents } from "../util";
-import { tableEmits } from "../props";
+import { tableViewProps, tableEmits, tablePropKeys } from "../props";
 const tableView = defineComponent({
   name: "TableView",
-  props: {
-    ...tableProps,
-    // 列配置
-    columns: {
-      type: Array,
-      required: true
-    },
-    // 起始编号
-    pageIndex: Number,
-    // 加载状态
-    loading: Boolean
-  },
+  props: tableViewProps,
   emits: tableEmits,
   setup(props, { emit, slots, expose }) {
     const tableIns = useTableMethods(() => tableRef.value);
     const tableEvents = useTableEvents(emit);
     const tableRef = ref(null);
-    const renderCols = (cols, index) => {
+    const getCols = (cols, index, getSlot) => {
       const nodes = [];
       if (cols) {
         cols.forEach((col) => {
-          const tSlot = col.slot ? slots[col.slot] : void 0;
+          const ts = col.slot && getSlot ? getSlot(col.slot) : void 0;
           nodes.push(
             h(
               ElTableColumn,
               {
-                ...omit(
-                  col,
-                  "index",
+                ...omit(col, [
                   "id",
                   "slot",
                   "headerSlot",
                   "hideInTable",
                   "hideInSetting",
                   "children"
-                ),
+                ]),
                 key: col.id,
                 index: col.index ?? index
               },
               {
-                default: tSlot ? tSlot : () => renderCols(col.children, index),
+                default: ts ? ts : () => getCols(col.children, index, getSlot),
                 header: col.headerSlot ? slots[col.headerSlot] : void 0
               }
             )
@@ -58,16 +44,17 @@ const tableView = defineComponent({
     const exposeValue = { ...tableIns, tableRef };
     expose(exposeValue);
     return () => {
+      const getSlot = (name) => slots[name];
       return withDirectives(
         h(
           ElTable,
           {
-            ...omit(props, "columns", "pageIndex", "loading"),
+            ...pick(props, tablePropKeys),
             ...tableEvents,
             ref: tableRef
           },
           {
-            default: () => renderCols(props.columns, props.pageIndex),
+            default: () => getCols(props.columns, props.pageIndex, getSlot),
             append: slots.append,
             empty: slots.empty
           }