wkjp-list-page 1.0.32 → 1.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wkjp-list-page",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Vue2 + ElementUI CommonListPage component",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/components/NestedTableColumn.vue

@@ -8,10 +8,12 @@ export default {
     column: { type: Object, required: true },
     resolveCellText: { type: Function, default: null },
     columnBind: { type: Function, default: null },
+    parentScopedSlots: { type: Object, default: null }, // 新增：接收父组件传递的插槽
   },
   render(h) {
     const col = this.column;
-    const slots = this.$scopedSlots;
+    // 优先使用 parentScopedSlots，否则使用 $scopedSlots
+    const slots = this.parentScopedSlots || this.$scopedSlots;
     const resolveCellText = this.resolveCellText;
     const columnBind = this.columnBind;
 
@@ -26,6 +28,7 @@ export default {
         minWidth: parentBind.minWidth != null ? parentBind.minWidth : col.minWidth,
         headerAlign: parentBind.headerAlign,
       };
+      
       return h(
         "el-table-column",
         { props: parentProps },
@@ -36,26 +39,64 @@ export default {
               column: child,
               resolveCellText,
               columnBind,
+              parentScopedSlots: slots, // 关键：继续向下传递插槽
             },
-            scopedSlots: slots,
+            scopedSlots: slots, // 也传递 scopedSlots 作为备选
           }),
         ),
       );
     }
 
     const bind = typeof columnBind === "function" ? columnBind(col) || {} : {};
-    const columnProps = Object.assign({}, bind);
+    
+    // 构建 columnProps
+    const columnProps = Object.assign(
+      {
+        prop: col.prop,
+        label: col.label,
+        slot: col.slot,
+        type: col.type,
+        align: col.align,
+        fixed: col.fixed,
+        width: col.width,
+        minWidth: col.minWidth,
+        sortable: col.sortable,
+        sortMethod: col.sortMethod,
+        sortBy: col.sortBy,
+        sortOrders: col.sortOrders,
+        resizable: col.resizable,
+        formatter: col.formatter,
+        showOverflowTooltip: col.showOverflowTooltip,
+        inlineTemplate: col.inlineTemplate,
+        headerAlign: col.headerAlign,
+        className: col.className,
+        labelClassName: col.labelClassName,
+        selectable: col.selectable,
+        reserveSelection: col.reserveSelection,
+        filters: col.filters,
+        filterMultiple: col.filterMultiple,
+        filterMethod: col.filterMethod,
+        filteredValue: col.filteredValue,
+      },
+      bind,
+    );
+    
     delete columnProps.children;
 
+    // 处理自定义 slot
     if (col.slot && slots[col.slot]) {
       return h("el-table-column", {
         props: columnProps,
         scopedSlots: {
-          default: (scope) => slots[col.slot](scope),
+          default: (scope) => {
+            const slotFn = slots[col.slot];
+            return slotFn(scope);
+          },
         },
       });
     }
 
+    // 处理普通文本渲染
     return h("el-table-column", {
       props: columnProps,
       scopedSlots: {
@@ -70,4 +111,4 @@ export default {
     });
   },
 };
-</script>
+</script>