ele-admin-plus 1.2.1-beta.6 → 1.2.2-beta.1

package/es/ele-virtual-table/index.d.ts

@@ -372,8 +372,8 @@ declare const _default: import('vue').DefineComponent<{
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
     sticky: boolean;
-    slotNormalize: boolean;
     headerEllipsis: boolean;
+    slotNormalize: boolean;
     bottomLine: boolean;
     emptyProps: import('../ele-data-table/types').TableEmptyProps;
     reserveCurrent: boolean;

package/es/icons/LoadingOutlined.js

@@ -16,7 +16,7 @@ const _hoisted_1 = {
   "stroke-width": "4",
   "stroke-linecap": "round"
 };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M 22 6 C 34 6 42 14 42 26" }, null, -1);
+const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M22 6C34 6 42 14 42 26" }, null, -1);
 const _hoisted_3 = [
   _hoisted_2
 ];

package/lib/ele-app/components/form-item-rest.cjs

@@ -0,0 +1,14 @@
+"use strict";
+const vue = require("vue");
+const elementPlus = require("element-plus");
+const formItemRest = vue.defineComponent({
+  name: "FormItemRest",
+  setup(_props, { slots }) {
+    vue.provide(elementPlus.formItemContextKey, null);
+    return () => {
+      var _a;
+      return (_a = slots.default) == null ? void 0 : _a.call(slots);
+    };
+  }
+});
+module.exports = formItemRest;

package/lib/ele-app/components/form-item-rest.d.ts

@@ -0,0 +1,4 @@
+declare const _default: import('vue').DefineComponent<{}, () => import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
+    [key: string]: any;
+}>[] | undefined, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/lib/ele-data-table/index.cjs

@@ -1,21 +1,30 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
+const icons = require("../icons");
 const core = require("../utils/core");
-const TableColumns = require("./components/table-columns");
 const util = require("./util");
 const props = require("./props");
 const ownSlots = ["default", "append", "empty"];
-const _sfc_main = vue.defineComponent({
+const index = /* @__PURE__ */ vue.defineComponent({
   name: "EleDataTable",
-  components: { ElTable: elementPlus.ElTable, ElEmpty: elementPlus.ElEmpty, TableColumns },
+  components: {
+    ElTable: elementPlus.ElTable,
+    ElEmpty: elementPlus.ElEmpty
+  },
   props: props.dataTableProps,
   emits: props.dataTableEmits,
-  setup(props$1, { emit }) {
+  setup(props$1, {
+    emit,
+    slots,
+    expose
+  }) {
     const events = util.useEmits(emit);
     const methods = util.useMethods(() => tableRef.value);
-    const { isLayoutFixedHead, isLayoutMaximized } = util.useStickyHeader();
-    util.useScrollAlive(() => tableRef.value);
+    const {
+      isLayoutFixedHead,
+      isLayoutMaximized
+    } = util.useStickyHeader();
     const tableState = {
       sorter: props$1.defaultSort,
       key: null,
@@ -26,39 +35,17 @@ const _sfc_main = vue.defineComponent({
     const tableRef = vue.ref(null);
     const tableCols = vue.ref(props$1.columns ?? []);
     const tableOverflowTooltip = vue.computed(() => {
-      return util.getGlobalTooltipProps(
-        props$1.showOverflowTooltip,
-        props$1.tooltipEffect,
-        props$1.tooltipOptions
-      );
+      return util.getGlobalTooltipProps(props$1.showOverflowTooltip, props$1.tooltipEffect, props$1.tooltipOptions);
     });
     const childKey = vue.computed(() => {
       var _a;
       return ((_a = props$1.treeProps) == null ? void 0 : _a.children) || "children";
     });
     const tableProps = vue.computed(() => {
-      const propKeys = props.tablePropKeys.filter(
-        (k) => ![
-          "currentRowKey",
-          "showOverflowTooltip",
-          "tooltipOptions",
-          "tooltipEffect"
-        ].includes(k)
-      );
+      const propKeys = props.tablePropKeys.filter((k) => !["currentRowKey", "showOverflowTooltip", "tooltipOptions", "tooltipEffect"].includes(k));
       return {
         ...core.pick(props$1, propKeys),
-        ...core.omit(events, [
-          "onUpdate:currentRowKey",
-          "onUpdate:selectedRowKeys",
-          "onRowClick",
-          "onHeaderClick",
-          "onSortChange",
-          "onFilterChange",
-          "onCurrentChange",
-          "onSelect",
-          "onSelectAll",
-          "onSelectionChange"
-        ])
+        ...core.omit(events, ["onUpdate:currentRowKey", "onUpdate:selectedRowKeys", "onRowClick", "onHeaderClick", "onSortChange", "onFilterChange", "onCurrentChange", "onSelect", "onSelectAll", "onSelectionChange"])
       };
     });
     const handleRowClick = (row, column, event) => {
@@ -138,11 +125,7 @@ const _sfc_main = vue.defineComponent({
     };
     const setSelectedRows = (rows) => {
       if (rows) {
-        updateCheckedState(
-          util.getRowKeys(rows, props$1.rowKey),
-          rows,
-          !!rows.length
-        );
+        updateCheckedState(util.getRowKeys(rows, props$1.rowKey), rows, !!rows.length);
       }
     };
     const setSelectedRowKeys = (keys) => {
@@ -151,16 +134,12 @@ const _sfc_main = vue.defineComponent({
       }
     };
     const toggleRowExpansionAll = (expanded) => {
-      core.eachTree(
-        props$1.data,
-        (row) => {
-          var _a;
-          if ((_a = row[childKey.value]) == null ? void 0 : _a.length) {
-            methods.toggleRowExpansion(row, expanded);
-          }
-        },
-        childKey.value
-      );
+      core.eachTree(props$1.data, (row) => {
+        var _a;
+        if ((_a = row[childKey.value]) == null ? void 0 : _a.length) {
+          methods.toggleRowExpansion(row, expanded);
+        }
+      }, childKey.value);
     };
     const updateSelectedState = (key, item) => {
       if (!util.valueIsChanged(tableState.key, key)) {
@@ -174,22 +153,12 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       if (key != null) {
-        const row = util.getRowByKey(
-          key,
-          props$1.data,
-          props$1.rowKey,
-          childKey.value
-        );
+        const row = util.getRowByKey(key, props$1.data, props$1.rowKey, childKey.value);
         if (row != null || props$1.reserveCurrent) {
           tableState.oldRow = tableState.row;
           tableState.row = row || item || void 0;
           if (tableState.row == null && props$1.cacheData != null) {
-            tableState.row = util.getRowByKey(
-              key,
-              props$1.cacheData,
-              props$1.rowKey,
-              childKey.value
-            );
+            tableState.row = util.getRowByKey(key, props$1.cacheData, props$1.rowKey, childKey.value);
           }
           tableState.key = key;
           methods.setCurrentRow(row);
@@ -211,20 +180,10 @@ const _sfc_main = vue.defineComponent({
       if (!force && !util.arrayIsChanged(tableState.checkedKeys, keys)) {
         return;
       }
-      const [dataKeys, list] = util.getKeysAndList(
-        props$1.data,
-        props$1.rowKey,
-        childKey.value
-      );
-      const [cacheKeys, cacheList] = util.getKeysAndList(
-        props$1.cacheData,
-        props$1.rowKey,
-        childKey.value
-      );
+      const [dataKeys, list] = util.getKeysAndList(props$1.data, props$1.rowKey, childKey.value);
+      const [cacheKeys, cacheList] = util.getKeysAndList(props$1.cacheData, props$1.rowKey, childKey.value);
       const itemKeys = items ? items.map((d) => core.getValue(d, props$1.rowKey)) : [];
-      const oldKeys = tableState.checked.map(
-        (d) => core.getValue(d, props$1.rowKey)
-      );
+      const oldKeys = tableState.checked.map((d) => core.getValue(d, props$1.rowKey));
       const checkedKeys = [];
       const checked = [];
       keys.forEach((key) => {
@@ -254,7 +213,10 @@ const _sfc_main = vue.defineComponent({
             return;
           }
           if (typeof props$1.rowKey === "string") {
-            checked.push({ [props$1.rowKey]: key, _isMock: true });
+            checked.push({
+              [props$1.rowKey]: key,
+              _isMock: true
+            });
           }
         }
       });
@@ -275,23 +237,13 @@ const _sfc_main = vue.defineComponent({
     const updateSelectedAndChecked = () => {
       const key = tableState.key;
       if (key != null) {
-        const row = util.getRowByKey(
-          key,
-          props$1.data,
-          props$1.rowKey,
-          childKey.value
-        );
+        const row = util.getRowByKey(key, props$1.data, props$1.rowKey, childKey.value);
         if (row != null) {
           updateSelectedState(key, row);
         } else if (!props$1.reserveCurrent) {
           updateSelectedState(null);
         } else if (props$1.cacheData != null) {
-          const temp = util.getRowByKey(
-            key,
-            props$1.cacheData,
-            props$1.rowKey,
-            childKey.value
-          );
+          const temp = util.getRowByKey(key, props$1.cacheData, props$1.rowKey, childKey.value);
           if (temp != null) {
             updateSelectedState(key, temp);
           }
@@ -312,51 +264,40 @@ const _sfc_main = vue.defineComponent({
         events["onUpdate:selectedRowKeys"](keys);
       }
     };
-    vue.watch(
-      () => props$1.columns,
-      (columns) => {
-        tableState.reserveChecked = util.isReserveChecked(columns);
-        if (!columns) {
-          tableCols.value = [];
-        } else {
-          const { cols, sorter } = util.getStateCols(
-            columns,
-            tableState.sorter,
-            tableState.filter
-          );
-          tableCols.value = cols;
-          vue.nextTick(() => {
-            methods.doLayout();
-            updateScrollBar();
-            if (sorter) {
-              methods.sort(
-                sorter.prop,
-                sorter.order || "ascending"
-              );
-            }
-          });
-        }
-      },
-      { deep: true }
-    );
+    vue.watch(() => props$1.columns, (columns) => {
+      tableState.reserveChecked = util.isReserveChecked(columns);
+      if (!columns) {
+        tableCols.value = [];
+      } else {
+        const {
+          cols,
+          sorter
+        } = util.getStateCols(columns, tableState.sorter, tableState.filter);
+        tableCols.value = cols;
+        vue.nextTick(() => {
+          methods.doLayout();
+          updateScrollBar();
+          if (sorter) {
+            methods.sort(sorter.prop, sorter.order || "ascending");
+          }
+        });
+      }
+    }, {
+      deep: true
+    });
     vue.watch([() => props$1.data, () => props$1.cacheData], () => {
       vue.nextTick(() => {
         updateSelectedAndChecked();
       });
     });
-    vue.watch(
-      () => props$1.currentRowKey,
-      (key) => {
-        updateSelectedState(key);
-      }
-    );
-    vue.watch(
-      () => props$1.selectedRowKeys,
-      (selectedRowKeys) => {
-        updateCheckedState(selectedRowKeys || []);
-      },
-      { deep: true }
-    );
+    vue.watch(() => props$1.currentRowKey, (key) => {
+      updateSelectedState(key);
+    });
+    vue.watch(() => props$1.selectedRowKeys, (selectedRowKeys) => {
+      updateCheckedState(selectedRowKeys || []);
+    }, {
+      deep: true
+    });
     vue.onMounted(() => {
       if (props$1.currentRowKey != null) {
         updateSelectedState(props$1.currentRowKey);
@@ -365,24 +306,8 @@ const _sfc_main = vue.defineComponent({
         updateCheckedState(props$1.selectedRowKeys);
       }
     });
-    return {
-      ownSlots,
-      getBodyRowClass: util.getBodyRowClass,
-      getHeadRowClass: util.getHeadRowClass,
+    const exposeValue = {
       ...methods,
-      isLayoutFixedHead,
-      isLayoutMaximized,
-      tableRef,
-      tableCols,
-      tableOverflowTooltip,
-      tableProps,
-      handleRowClick,
-      handleHeaderClick,
-      handleSortChange,
-      handleFilterChange,
-      handleCurrentChange,
-      handleSelect,
-      handleSelectAll,
       clearSort,
       clearSelection,
       toggleRowSelection,
@@ -392,88 +317,80 @@ const _sfc_main = vue.defineComponent({
       setSelectedRows,
       setSelectedRowKeys,
       toggleRowExpansionAll,
-      updateSelectedAndChecked
+      updateSelectedAndChecked,
+      tableRef
     };
+    expose(exposeValue);
+    const renderTableColumn = (col) => {
+      return vue.createVNode(elementPlus.ElTableColumn, vue.mergeProps(core.omit(col, ["showOverflowTooltip", "filterClassName", "columnKey", "className", "uid", "slot", "headerSlot", "hideInTable", "hideInSetting", "hideInExport", "hideInPrint", "printSlot", "children"]), {
+        "key": col.uid ?? col.columnKey ?? col.prop,
+        "index": col.index ?? props$1.pageIndex,
+        "className": util.getCellClass(col),
+        "columnKey": col.columnKey ?? col.prop,
+        "filterClassName": util.getFilterPopperClass(col.filterClassName),
+        "showOverflowTooltip": util.getTooltipProps(col.showOverflowTooltip, tableOverflowTooltip.value)
+      }), {
+        header: (slotProps) => {
+          var _a, _b, _c;
+          return vue.createVNode("div", {
+            "class": "ele-cell-title",
+            "title": (_a = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _a.label
+          }, [col.headerSlot && !ownSlots.includes(col.headerSlot) && slots[col.headerSlot] ? (_b = slots[col.headerSlot]) == null ? void 0 : _b.call(slots, slotProps) : (_c = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _c.label]);
+        },
+        ["filter-icon"]: (slotProps) => {
+          var _a;
+          return !col.filterIcon ? vue.createVNode(icons.FilterFilled, null, null) : typeof col.filterIcon === "string" && !ownSlots.includes(col.filterIcon) && slots[col.filterIcon] ? (_a = slots[col.filterIcon]) == null ? void 0 : _a.call(slots, slotProps) : vue.h(col.filterIcon);
+        },
+        default: (slotProps) => {
+          var _a;
+          return col.slot && !ownSlots.includes(col.slot) && slots[col.slot] && (!props$1.slotNormalize || (slotProps == null ? void 0 : slotProps.$index) != -1) ? (_a = slots[col.slot]) == null ? void 0 : _a.call(slots, slotProps) : col.children && col.children.length ? col.children.map(renderTableColumn) : void 0;
+        }
+      });
+    };
+    return () => vue.createVNode(elementPlus.ElTable, vue.mergeProps(tableProps.value, {
+      "ref": tableRef,
+      "emptyText": props$1.errorText || props$1.emptyText,
+      "rowClassName": (param) => util.getBodyRowClass(props$1.rowClassName, param),
+      "headerRowClassName": (param) => util.getHeadRowClass(props$1.headerRowClassName, param, props$1.headerEllipsis),
+      "class": ["ele-data-table", {
+        "is-sticky": props$1.sticky
+      }, {
+        "is-layout-fixed-head": props$1.sticky && isLayoutFixedHead.value
+      }, {
+        "is-layout-maximized": props$1.sticky && isLayoutMaximized.value
+      }, {
+        "is-sticky": props$1.sticky
+      }, {
+        "hide-header": !props$1.showHeader
+      }, {
+        "hide-bottom-line": !props$1.bottomLine
+      }],
+      "onRowClick": handleRowClick,
+      "onHeaderClick": handleHeaderClick,
+      "onSortChange": handleSortChange,
+      "onFilterChange": handleFilterChange,
+      "onCurrentChange": handleCurrentChange,
+      "onSelect": handleSelect,
+      "onSelectAll": handleSelectAll
+    }), {
+      append: slots.append ? (slotProps) => {
+        var _a;
+        return (_a = slots.append) == null ? void 0 : _a.call(slots, slotProps);
+      } : void 0,
+      empty: slots.empty ? () => {
+        var _a;
+        return (_a = slots.empty) == null ? void 0 : _a.call(slots, {
+          text: props$1.emptyText,
+          error: props$1.errorText
+        });
+      } : props$1.emptyProps ? () => vue.createVNode(elementPlus.ElEmpty, vue.mergeProps({
+        "imageSize": 68
+      }, !props$1.emptyProps || props$1.emptyProps === true ? {} : props$1.emptyProps, {
+        "description": props$1.errorText || props$1.emptyText,
+        "class": "ele-table-empty"
+      }), null) : void 0,
+      default: () => tableCols.value.map(renderTableColumn)
+    });
   }
 });
-const _export_sfc = (sfc, props2) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props2) {
-    target[key] = val;
-  }
-  return target;
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_TableColumns = vue.resolveComponent("TableColumns");
-  const _component_ElEmpty = vue.resolveComponent("ElEmpty");
-  const _component_ElTable = vue.resolveComponent("ElTable");
-  return vue.openBlock(), vue.createBlock(_component_ElTable, vue.mergeProps(_ctx.tableProps, {
-    ref: "tableRef",
-    emptyText: _ctx.errorText || _ctx.emptyText,
-    rowClassName: (param) => _ctx.getBodyRowClass(_ctx.rowClassName, param),
-    headerRowClassName: (param) => _ctx.getHeadRowClass(_ctx.headerRowClassName, param, _ctx.headerEllipsis),
-    class: [
-      "ele-data-table",
-      { "is-sticky": _ctx.sticky },
-      { "is-layout-fixed-head": _ctx.sticky && _ctx.isLayoutFixedHead },
-      { "is-layout-maximized": _ctx.sticky && _ctx.isLayoutMaximized },
-      { "is-sticky": _ctx.sticky },
-      { "hide-header": !_ctx.showHeader },
-      { "hide-bottom-line": !_ctx.bottomLine }
-    ],
-    onRowClick: _ctx.handleRowClick,
-    onHeaderClick: _ctx.handleHeaderClick,
-    onSortChange: _ctx.handleSortChange,
-    onFilterChange: _ctx.handleFilterChange,
-    onCurrentChange: _ctx.handleCurrentChange,
-    onSelect: _ctx.handleSelect,
-    onSelectAll: _ctx.handleSelectAll
-  }), vue.createSlots({
-    default: vue.withCtx(() => [
-      _ctx.tableCols && _ctx.tableCols.length ? (vue.openBlock(), vue.createBlock(_component_TableColumns, {
-        key: 0,
-        columns: _ctx.tableCols,
-        pageIndex: _ctx.pageIndex,
-        slotNormalize: _ctx.slotNormalize,
-        globalTooltip: _ctx.tableOverflowTooltip
-      }, vue.createSlots({ _: 2 }, [
-        vue.renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.ownSlots.includes(k)), (name) => {
-          return {
-            name,
-            fn: vue.withCtx((slotProps) => [
-              vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1032, ["columns", "pageIndex", "slotNormalize", "globalTooltip"])) : vue.createCommentVNode("", true)
-    ]),
-    _: 2
-  }, [
-    _ctx.$slots.append ? {
-      name: "append",
-      fn: vue.withCtx((slotProps) => [
-        vue.renderSlot(_ctx.$slots, "append", vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-      ]),
-      key: "0"
-    } : void 0,
-    _ctx.$slots.empty || _ctx.emptyProps ? {
-      name: "empty",
-      fn: vue.withCtx(() => [
-        _ctx.$slots.empty ? vue.renderSlot(_ctx.$slots, "empty", {
-          key: 0,
-          text: _ctx.emptyText,
-          error: _ctx.errorText
-        }) : _ctx.emptyProps ? (vue.openBlock(), vue.createBlock(_component_ElEmpty, vue.mergeProps({
-          key: 1,
-          imageSize: 68
-        }, !_ctx.emptyProps || _ctx.emptyProps === true ? {} : _ctx.emptyProps, {
-          description: _ctx.errorText || _ctx.emptyText,
-          class: "ele-table-empty"
-        }), null, 16, ["description"])) : vue.createCommentVNode("", true)
-      ]),
-      key: "1"
-    } : void 0
-  ]), 1040, ["emptyText", "rowClassName", "headerRowClassName", "class", "onRowClick", "onHeaderClick", "onSortChange", "onFilterChange", "onCurrentChange", "onSelect", "onSelectAll"]);
-}
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;