ele-admin-plus 1.2.0-beta.1 → 1.2.0-beta.3

package/es/ele-pro-table/components/table-tools.d.ts

@@ -1,6 +1,6 @@
-import { TableLocale, FetchFunction, ExportConfig, PrintConfig } from '../types';
-import { Columns, TableSize, DataItem } from '../../ele-data-table/types';
 import { PropType } from 'vue';
+import { Columns, TableSize, DataItem, TreeProps } from '../../ele-data-table/types';
+import { TableLocale, FetchFunction, ExportConfig, PrintConfig } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 工具按钮布局 */
@@ -54,8 +54,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
-    /** 子级字段名 */
-    childrenField: StringConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 导出配置 */
@@ -132,8 +132,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
-    /** 子级字段名 */
-    childrenField: StringConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 导出配置 */

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, createSlots, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode } from "vue";
+import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, createSlots, renderSlot, mergeProps, createCommentVNode } from "vue";
 import { ElIcon } from "element-plus";
 import { ReloadOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined } from "../../icons";
 import EleDropdown from "../../ele-dropdown/index";
@@ -66,8 +66,8 @@ const _sfc_main = defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
-    /** 子级字段名 */
-    childrenField: String,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 导出配置 */
@@ -229,12 +229,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
         pageIndex: _ctx.pageIndex,
-        childrenField: _ctx.childrenField,
+        treeProps: _ctx.treeProps,
         fetch: _ctx.fetch,
         defaultFileName: _ctx.exportConfig.fileName,
         defaultDataType: _ctx.exportConfig.dataType,
         beforeExport: _ctx.exportConfig.beforeExport
-      }, null, 8, ["placement", "locale", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "pageIndex", "childrenField", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (openBlock(), createBlock(_component_ToolPrint, {
+      }, null, 8, ["placement", "locale", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "pageIndex", "treeProps", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (openBlock(), createBlock(_component_ToolPrint, {
         key: index + "-print",
         placement: _ctx.placement,
         locale: _ctx.lang,
@@ -255,7 +255,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         headerCellStyle: _ctx.headerCellStyle,
         headerCellClassName: _ctx.headerCellClassName,
         pageIndex: _ctx.pageIndex,
-        childrenField: _ctx.childrenField,
+        treeProps: _ctx.treeProps,
         fetch: _ctx.fetch,
         defaultDataType: _ctx.printConfig.dataType,
         beforePrint: _ctx.printConfig.beforePrint
@@ -264,11 +264,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           return {
             name,
             fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+              renderSlot(_ctx.$slots, name, mergeProps({ ref_for: true }, slotProps || {}))
             ])
           };
         })
-      ]), 1032, ["placement", "locale", "modalProps", "printerProps", "tableProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "defaultDataType", "beforePrint"])) : tool && !["default", "printTop", "printBottom"].includes(tool) && _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, {
+      ]), 1032, ["placement", "locale", "modalProps", "printerProps", "tableProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "fetch", "defaultDataType", "beforePrint"])) : tool && !["default", "printTop", "printBottom"].includes(tool) && _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, {
         key: 6,
         pageIndex: _ctx.pageIndex,
         fetch: _ctx.fetch

package/es/ele-pro-table/components/tool-column-list.d.ts

@@ -1,5 +1,5 @@
-import { ColItem } from '../types';
 import { PropType } from 'vue';
+import { ColItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 列配置数据 */

package/es/ele-pro-table/components/tool-column.d.ts

@@ -1,6 +1,6 @@
-import { ColItem } from '../types';
-import { Columns } from '../../ele-data-table/types';
 import { PropType } from 'vue';
+import { Columns } from '../../ele-data-table/types';
+import { ColItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 提示文字 */

package/es/ele-pro-table/components/tool-column.js

@@ -227,6 +227,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         effect: "light",
         isPopover: true,
         popperOptions: {
+          strategy: "fixed",
           modifiers: [{ name: "offset", options: { offset: [20, 10] } }]
         }
       }, {

package/es/ele-pro-table/components/tool-export.d.ts

@@ -1,8 +1,8 @@
-import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem } from '../types';
-import { Columns, DataItem } from '../../ele-data-table/types';
-import { EleModalProps } from '../../ele-app/plus';
-import { ElFormInstance } from '../../ele-app/el';
 import { PropType } from 'vue';
+import { ElFormInstance } from '../../ele-app/el';
+import { EleModalProps } from '../../ele-app/plus';
+import { Columns, DataItem, TreeProps } from '../../ele-data-table/types';
+import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 提示位置 */
@@ -29,7 +29,7 @@ declare const _default: import('vue').DefineComponent<{
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
-        rowspan: number; /** 数据来源 */
+        rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
     /** 表格是否有表头 */
@@ -42,8 +42,8 @@ declare const _default: import('vue').DefineComponent<{
     summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
-    /** 子级字段名 */
-    childrenField: StringConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 默认文件名 */
@@ -114,7 +114,7 @@ declare const _default: import('vue').DefineComponent<{
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
-        rowspan: number; /** 数据来源 */
+        rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
     /** 表格是否有表头 */
@@ -127,8 +127,8 @@ declare const _default: import('vue').DefineComponent<{
     summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
-    /** 子级字段名 */
-    childrenField: StringConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 默认文件名 */

package/es/ele-pro-table/components/tool-export.js

@@ -52,8 +52,8 @@ const _sfc_main = defineComponent({
     summaryMethod: Function,
     /** 序号列起始索引 */
     pageIndex: Number,
-    /** 子级字段名 */
-    childrenField: String,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 默认文件名 */
@@ -104,6 +104,7 @@ const _sfc_main = defineComponent({
       loading.value = false;
     };
     const exportData = (data) => {
+      var _a;
       showLoading();
       const columns = getCheckedColumns(
         props.columns,
@@ -119,7 +120,7 @@ const _sfc_main = defineComponent({
         showFooter.value,
         props.sumText,
         props.summaryMethod,
-        props.childrenField,
+        (_a = props.treeProps) == null ? void 0 : _a.children,
         showTreeIndex.value,
         showHeader.value
       );
@@ -168,7 +169,8 @@ const _sfc_main = defineComponent({
               return;
             }
             exportData(result);
-          }).catch(() => {
+          }).catch((e) => {
+            console.error(e);
             hideLoading();
           });
         });
@@ -260,8 +262,8 @@ const _sfc_main = defineComponent({
         showFooter.value = props.showSummary;
         treeIndexDisabled.value = !(props.pageData && props.pageData.some(
           (d) => {
-            var _a2;
-            return props.childrenField && ((_a2 = d[props.childrenField]) == null ? void 0 : _a2.length);
+            var _a2, _b2, _c;
+            return ((_b2 = d[((_a2 = props.treeProps) == null ? void 0 : _a2.children) || "children"]) == null ? void 0 : _b2.length) || d[((_c = props.treeProps) == null ? void 0 : _c.hasChildren) || "hasChildren"];
           }
         )) && findTree(colItems.value, (c) => c.type === "expand") == null;
         if (treeIndexDisabled.value) {
@@ -461,9 +463,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     createVNode(_component_ElCheckbox, {
                       label: _ctx.locale.exportOtherHeader,
                       modelValue: _ctx.showHeader,
-                      "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.showHeader = $event),
-                      disabled: !_ctx.tableHeader
-                    }, null, 8, ["label", "modelValue", "disabled"]),
+                      "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.showHeader = $event)
+                    }, null, 8, ["label", "modelValue"]),
                     createVNode(_component_ElCheckbox, {
                       label: _ctx.locale.exportOtherFooter,
                       modelValue: _ctx.showFooter,

package/es/ele-pro-table/components/tool-print-body-cell.d.ts

@@ -1,7 +1,7 @@
-import { ExportDataItem } from '../types';
-import { CustomRenderProps } from '../../ele-virtual-table/types';
-import { StyleValues } from '../../ele-app/types';
 import { PropType } from 'vue';
+import { StyleValues } from '../../ele-app/types';
+import { CustomRenderProps } from '../../ele-virtual-table/types';
+import { ExportDataItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 列数据 */

package/es/ele-pro-table/components/tool-print-header-cell.d.ts

@@ -1,7 +1,7 @@
-import { ExportDataItem } from '../types';
-import { CustomRenderProps } from '../../ele-virtual-table/types';
-import { StyleValues } from '../../ele-app/types';
 import { PropType } from 'vue';
+import { StyleValues } from '../../ele-app/types';
+import { CustomRenderProps } from '../../ele-virtual-table/types';
+import { ExportDataItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 列数据 */

package/es/ele-pro-table/components/tool-print.d.ts

@@ -1,7 +1,7 @@
-import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
-import { Columns, DataItem } from '../../ele-data-table/types';
-import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
 import { PropType } from 'vue';
+import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
+import { Columns, DataItem, TreeProps } from '../../ele-data-table/types';
+import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 提示位置 */
@@ -28,7 +28,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
         row: DataItem;
-        rowIndex: number; /** 序号列起始索引 */
+        rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
@@ -53,8 +53,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
-    /** 子级字段名 */
-    childrenField: StringConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 默认数据类型 */
@@ -117,7 +117,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
         row: DataItem;
-        rowIndex: number; /** 序号列起始索引 */
+        rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
@@ -142,8 +142,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
-    /** 子级字段名 */
-    childrenField: StringConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 默认数据类型 */

package/es/ele-pro-table/components/tool-print.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, watch, nextTick, resolveComponent, openBlock, createBlock, withCtx, createVNode, mergeProps, createTextVNode, toDisplayString, withModifiers, createCommentVNode, createElementVNode, renderSlot, createElementBlock, Fragment, renderList, createSlots, normalizeProps, guardReactiveProps, normalizeStyle, normalizeClass } from "vue";
+import { defineComponent, ref, reactive, watch, nextTick, resolveComponent, openBlock, createBlock, withCtx, createVNode, mergeProps, createTextVNode, toDisplayString, withModifiers, createCommentVNode, createElementVNode, renderSlot, createElementBlock, Fragment, renderList, createSlots, normalizeStyle, normalizeClass } from "vue";
 import { ElForm, ElFormItem, ElSelect, ElOption, ElCheckbox, ElButton, ElIcon } from "element-plus";
 import { PrinterOutlined } from "../../icons";
 import { findTree, eachTree } from "../../utils/core";
@@ -73,8 +73,8 @@ const _sfc_main = defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
-    /** 子级字段名 */
-    childrenField: String,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 默认数据类型 */
@@ -122,6 +122,7 @@ const _sfc_main = defineComponent({
       hideLoading();
     };
     const printData = (data) => {
+      var _a;
       showLoading();
       const columns = getCheckedColumns(
         props.columns,
@@ -137,7 +138,7 @@ const _sfc_main = defineComponent({
         showFooter.value,
         props.sumText,
         props.summaryMethod,
-        props.childrenField,
+        (_a = props.treeProps) == null ? void 0 : _a.children,
         showTreeIndex.value,
         showHeader.value
       );
@@ -187,7 +188,8 @@ const _sfc_main = defineComponent({
             return;
           }
           printData(result);
-        }).catch(() => {
+        }).catch((e) => {
+          console.error(e);
           hideLoading();
         });
       });
@@ -276,8 +278,8 @@ const _sfc_main = defineComponent({
         showFooter.value = props.showSummary;
         treeIndexDisabled.value = !(props.pageData && props.pageData.some(
           (d) => {
-            var _a;
-            return props.childrenField && ((_a = d[props.childrenField]) == null ? void 0 : _a.length);
+            var _a, _b, _c;
+            return ((_b = d[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"]) == null ? void 0 : _b.length) || d[((_c = props.treeProps) == null ? void 0 : _c.hasChildren) || "hasChildren"];
           }
         )) && findTree(colItems.value, (c) => c.type === "expand") == null;
         if (treeIndexDisabled.value) {
@@ -470,9 +472,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     createVNode(_component_ElCheckbox, {
                       label: _ctx.locale.exportOtherHeader,
                       modelValue: _ctx.showHeader,
-                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.showHeader = $event),
-                      disabled: !_ctx.tableHeader
-                    }, null, 8, ["label", "modelValue", "disabled"]),
+                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.showHeader = $event)
+                    }, null, 8, ["label", "modelValue"]),
                     createVNode(_component_ElCheckbox, {
                       label: _ctx.locale.exportOtherFooter,
                       modelValue: _ctx.showFooter,
@@ -547,7 +548,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                             return {
                               name,
                               fn: withCtx((slotProps) => [
-                                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                                renderSlot(_ctx.$slots, name, mergeProps({ ref_for: true }, slotProps || {}))
                               ])
                             };
                           })
@@ -574,11 +575,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           }, [
                             col.column && (col.column.printSlot || col.column.slot) && !["printTop", "printBottom"].includes(
                               col.column.printSlot || col.column.slot
-                            ) ? renderSlot(_ctx.$slots, col.column.printSlot || col.column.slot, normalizeProps(mergeProps({ key: 0 }, {
+                            ) ? renderSlot(_ctx.$slots, col.column.printSlot || col.column.slot, mergeProps({
+                              key: 0,
+                              ref_for: true
+                            }, {
                               row: col.row,
                               column: col.column,
                               $index: col.index
-                            }))) : createCommentVNode("", true)
+                            })) : createCommentVNode("", true)
                           ], 8, _hoisted_8)) : createCommentVNode("", true)
                         ], 64)) : col.isTreeIndex ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                           col.rowspan !== 0 && col.colspan !== 0 ? (openBlock(), createElementBlock("td", {
@@ -590,7 +594,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                               paddingRight: 0,
                               textAlign: "center",
                               verticalAlign: "top",
-                              borderLeftColor: col.text ? void 0 : "transparent"
+                              borderLeftColor: col.hideLeftBorder ? "transparent" : void 0
                             }),
                             class: normalizeClass([
                               "ele-print-tree-index",
@@ -610,7 +614,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                             return {
                               name,
                               fn: withCtx((slotProps) => [
-                                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                                renderSlot(_ctx.$slots, name, mergeProps({ ref_for: true }, slotProps || {}))
                               ])
                             };
                           })