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

package/lib/ele-pro-table/components/table-tools.cjs

@@ -67,8 +67,8 @@ const _sfc_main = vue.defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
-    /** 子级字段名 */
-    childrenField: String,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 导出配置 */
@@ -230,12 +230,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" ? (vue.openBlock(), vue.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" ? (vue.openBlock(), vue.createBlock(_component_ToolPrint, {
         key: index + "-print",
         placement: _ctx.placement,
         locale: _ctx.lang,
@@ -256,7 +256,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
@@ -269,7 +269,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 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] ? vue.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] ? vue.renderSlot(_ctx.$slots, tool, {
         key: 6,
         pageIndex: _ctx.pageIndex,
         fetch: _ctx.fetch

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

@@ -1,5 +1,5 @@
 import { TableLocale, FetchFunction, ExportConfig, PrintConfig } from '../types';
-import { Columns, TableSize, DataItem } from '../../ele-data-table/types';
+import { Columns, TableSize, DataItem, TreeProps } from '../../ele-data-table/types';
 import { PropType } from 'vue';
 
 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/lib/ele-pro-table/components/tool-column.cjs

@@ -228,6 +228,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/lib/ele-pro-table/components/tool-export.cjs

@@ -53,8 +53,8 @@ const _sfc_main = vue.defineComponent({
     summaryMethod: Function,
     /** 序号列起始索引 */
     pageIndex: Number,
-    /** 子级字段名 */
-    childrenField: String,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 默认文件名 */
@@ -105,6 +105,7 @@ const _sfc_main = vue.defineComponent({
       loading.value = false;
     };
     const exportData = (data) => {
+      var _a;
       showLoading();
       const columns = util.getCheckedColumns(
         props.columns,
@@ -120,7 +121,7 @@ const _sfc_main = vue.defineComponent({
         showFooter.value,
         props.sumText,
         props.summaryMethod,
-        props.childrenField,
+        (_a = props.treeProps) == null ? void 0 : _a.children,
         showTreeIndex.value,
         showHeader.value
       );
@@ -169,7 +170,8 @@ const _sfc_main = vue.defineComponent({
               return;
             }
             exportData(result);
-          }).catch(() => {
+          }).catch((e) => {
+            console.error(e);
             hideLoading();
           });
         });
@@ -261,8 +263,8 @@ const _sfc_main = vue.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"];
           }
         )) && core.findTree(colItems.value, (c) => c.type === "expand") == null;
         if (treeIndexDisabled.value) {
@@ -462,9 +464,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     vue.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"]),
                     vue.createVNode(_component_ElCheckbox, {
                       label: _ctx.locale.exportOtherFooter,
                       modelValue: _ctx.showFooter,

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

@@ -1,5 +1,5 @@
 import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem } from '../types';
-import { Columns, DataItem } from '../../ele-data-table/types';
+import { Columns, DataItem, TreeProps } from '../../ele-data-table/types';
 import { EleModalProps } from '../../ele-app/plus';
 import { ElFormInstance } from '../../ele-app/el';
 import { PropType } from 'vue';
@@ -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/lib/ele-pro-table/components/tool-print.cjs

@@ -74,8 +74,8 @@ const _sfc_main = vue.defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
-    /** 子级字段名 */
-    childrenField: String,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 默认数据类型 */
@@ -123,6 +123,7 @@ const _sfc_main = vue.defineComponent({
       hideLoading();
     };
     const printData = (data) => {
+      var _a;
       showLoading();
       const columns = util$1.getCheckedColumns(
         props.columns,
@@ -138,7 +139,7 @@ const _sfc_main = vue.defineComponent({
         showFooter.value,
         props.sumText,
         props.summaryMethod,
-        props.childrenField,
+        (_a = props.treeProps) == null ? void 0 : _a.children,
         showTreeIndex.value,
         showHeader.value
       );
@@ -188,7 +189,8 @@ const _sfc_main = vue.defineComponent({
             return;
           }
           printData(result);
-        }).catch(() => {
+        }).catch((e) => {
+          console.error(e);
           hideLoading();
         });
       });
@@ -277,8 +279,8 @@ const _sfc_main = vue.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"];
           }
         )) && core.findTree(colItems.value, (c) => c.type === "expand") == null;
         if (treeIndexDisabled.value) {
@@ -471,9 +473,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     vue.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"]),
                     vue.createVNode(_component_ElCheckbox, {
                       label: _ctx.locale.exportOtherFooter,
                       modelValue: _ctx.showFooter,
@@ -591,7 +592,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: vue.normalizeClass([
                               "ele-print-tree-index",

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

@@ -1,5 +1,5 @@
 import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
-import { Columns, DataItem } from '../../ele-data-table/types';
+import { Columns, DataItem, TreeProps } from '../../ele-data-table/types';
 import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
 import { PropType } from 'vue';
 
@@ -28,9 +28,9 @@ declare const _default: import('vue').DefineComponent<{
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
         row: DataItem;
-        rowIndex: number; /** 序号列起始索引 */
+        rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
+        columnIndex: number; /** 树表字段名 */
     }) => number[] | {
         rowspan: number;
         colspan: 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,9 +117,9 @@ declare const _default: import('vue').DefineComponent<{
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
         row: DataItem;
-        rowIndex: number; /** 序号列起始索引 */
+        rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
+        columnIndex: number; /** 树表字段名 */
     }) => number[] | {
         rowspan: number;
         colspan: 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/lib/ele-pro-table/index.cjs

@@ -283,7 +283,7 @@ const _sfc_main = vue.defineComponent({
       vue.nextTick(() => {
         if (props2.current != null) {
           methods.setCurrentRowKey(
-            util.getValue(props2.current, tableRowKey.value)
+            core.getValue(props2.current, tableRowKey.value)
           );
         }
         if (props2.selections != null && props2.selections.length) {
@@ -371,7 +371,7 @@ const _sfc_main = vue.defineComponent({
       }
       const rowKey = tableRowKey.value;
       const data = util$1.sortData(props2.datasource, tableState.sorter);
-      const index2 = data.findIndex((d) => util.getValue(d, rowKey) === key);
+      const index2 = data.findIndex((d) => core.getValue(d, rowKey) === key);
       const page = Math.floor(index2 / tableLimit.value) + 1;
       if (tablePage.value !== page) {
         reload({ page });
@@ -440,7 +440,7 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props2.current,
       (current) => {
-        methods.setCurrentRowKey(util.getValue(current, tableRowKey.value));
+        methods.setCurrentRowKey(core.getValue(current, tableRowKey.value));
       }
     );
     vue.watch(
@@ -517,61 +517,58 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(_component_EleLoading, vue.normalizeProps(vue.guardReactiveProps(_ctx.loadingProps)), {
     default: vue.withCtx(() => [
       _ctx.toolbar ? (vue.openBlock(), vue.createBlock(_component_EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
-        tools: vue.withCtx(() => {
-          var _a;
-          return [
-            vue.renderSlot(_ctx.$slots, "tools"),
-            _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.createBlock(_component_TableTools, {
-              key: 0,
-              tools: _ctx.toolNames,
-              size: _ctx.tableSize,
-              columns: _ctx.columns,
-              columnSortable: _ctx.columnSortable,
-              columnFixed: _ctx.columnFixed,
-              maximized: _ctx.tableMaximized,
-              cacheKey: _ctx.cacheKey,
-              locale: _ctx.locale,
-              selections: _ctx.selections,
-              pageData: _ctx.tableData,
-              spanMethod: _ctx.spanMethod,
-              tableHeader: _ctx.showHeader,
-              showSummary: _ctx.showSummary,
-              sumText: _ctx.sumText,
-              summaryMethod: _ctx.summaryMethod,
-              cellStyle: _ctx.cellStyle,
-              cellClassName: _ctx.cellClassName,
-              headerCellStyle: _ctx.headerCellStyle,
-              headerCellClassName: _ctx.headerCellClassName,
-              pageIndex: _ctx.tableIndex,
-              childrenField: (_a = _ctx.treeProps) == null ? void 0 : _a.children,
-              fetch: _ctx.fetch,
-              exportConfig: _ctx.toolExportConfig,
-              printConfig: _ctx.toolPrintConfig,
-              onReload: _ctx.onRefresh,
-              "onUpdate:size": _ctx.onSizeChange,
-              "onUpdate:columns": _ctx.onColumnsChange,
-              "onUpdate:maximized": _ctx.onMaximizedChange
-            }, vue.createSlots({ _: 2 }, [
-              vue.renderList(Object.keys(_ctx.$slots).filter(
-                (k) => ![
-                  "default",
-                  "toolbar",
-                  "tools",
-                  "footer",
-                  "empty",
-                  "append"
-                ].includes(k)
-              ), (name) => {
-                return {
-                  name,
-                  fn: vue.withCtx((slotProps) => [
-                    vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-                  ])
-                };
-              })
-            ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : vue.createCommentVNode("", true)
-          ];
-        }),
+        tools: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "tools"),
+          _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.createBlock(_component_TableTools, {
+            key: 0,
+            tools: _ctx.toolNames,
+            size: _ctx.tableSize,
+            columns: _ctx.columns,
+            columnSortable: _ctx.columnSortable,
+            columnFixed: _ctx.columnFixed,
+            maximized: _ctx.tableMaximized,
+            cacheKey: _ctx.cacheKey,
+            locale: _ctx.locale,
+            selections: _ctx.selections,
+            pageData: _ctx.tableData,
+            spanMethod: _ctx.spanMethod,
+            tableHeader: _ctx.showHeader,
+            showSummary: _ctx.showSummary,
+            sumText: _ctx.sumText,
+            summaryMethod: _ctx.summaryMethod,
+            cellStyle: _ctx.cellStyle,
+            cellClassName: _ctx.cellClassName,
+            headerCellStyle: _ctx.headerCellStyle,
+            headerCellClassName: _ctx.headerCellClassName,
+            pageIndex: _ctx.tableIndex,
+            treeProps: _ctx.treeProps,
+            fetch: _ctx.fetch,
+            exportConfig: _ctx.toolExportConfig,
+            printConfig: _ctx.toolPrintConfig,
+            onReload: _ctx.onRefresh,
+            "onUpdate:size": _ctx.onSizeChange,
+            "onUpdate:columns": _ctx.onColumnsChange,
+            "onUpdate:maximized": _ctx.onMaximizedChange
+          }, vue.createSlots({ _: 2 }, [
+            vue.renderList(Object.keys(_ctx.$slots).filter(
+              (k) => ![
+                "default",
+                "toolbar",
+                "tools",
+                "footer",
+                "empty",
+                "append"
+              ].includes(k)
+            ), (name) => {
+              return {
+                name,
+                fn: vue.withCtx((slotProps) => [
+                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : vue.createCommentVNode("", true)
+        ]),
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "toolbar")
         ]),