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

package/es/ele-data-table/index.js

@@ -1,20 +1,29 @@
-import { defineComponent, ref, computed, watch, nextTick, onMounted, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode } from "vue";
-import { ElTable, ElEmpty } from "element-plus";
+import { defineComponent, ref, computed, watch, nextTick, onMounted, createVNode, mergeProps, h } from "vue";
+import { ElTable, ElEmpty, ElTableColumn } from "element-plus";
+import { FilterFilled } from "../icons";
 import { pick, omit, getValue, eachTree } from "../utils/core";
-import TableColumns from "./components/table-columns";
-import { useEmits, useMethods, useStickyHeader, useScrollAlive, isReserveChecked, getGlobalTooltipProps, getStateCols, getBodyRowClass, getHeadRowClass, isDisableRow, getTableFilter, getRowKeys, valueIsChanged, getRowByKey, arrayIsChanged, getKeysAndList, toggleRowSelectionPro } from "./util";
+import { useEmits, useMethods, useStickyHeader, isReserveChecked, getGlobalTooltipProps, getStateCols, getBodyRowClass, getHeadRowClass, isDisableRow, getTableFilter, getRowKeys, valueIsChanged, getRowByKey, arrayIsChanged, getKeysAndList, toggleRowSelectionPro, getCellClass, getFilterPopperClass, getTooltipProps } from "./util";
 import { dataTableProps, dataTableEmits, tablePropKeys } from "./props";
 const ownSlots = ["default", "append", "empty"];
-const _sfc_main = defineComponent({
+const index = /* @__PURE__ */ defineComponent({
   name: "EleDataTable",
-  components: { ElTable, ElEmpty, TableColumns },
+  components: {
+    ElTable,
+    ElEmpty
+  },
   props: dataTableProps,
   emits: dataTableEmits,
-  setup(props, { emit }) {
+  setup(props, {
+    emit,
+    slots,
+    expose
+  }) {
     const events = useEmits(emit);
     const methods = useMethods(() => tableRef.value);
-    const { isLayoutFixedHead, isLayoutMaximized } = useStickyHeader();
-    useScrollAlive(() => tableRef.value);
+    const {
+      isLayoutFixedHead,
+      isLayoutMaximized
+    } = useStickyHeader();
     const tableState = {
       sorter: props.defaultSort,
       key: null,
@@ -25,39 +34,17 @@ const _sfc_main = defineComponent({
     const tableRef = ref(null);
     const tableCols = ref(props.columns ?? []);
     const tableOverflowTooltip = computed(() => {
-      return getGlobalTooltipProps(
-        props.showOverflowTooltip,
-        props.tooltipEffect,
-        props.tooltipOptions
-      );
+      return getGlobalTooltipProps(props.showOverflowTooltip, props.tooltipEffect, props.tooltipOptions);
     });
     const childKey = computed(() => {
       var _a;
       return ((_a = props.treeProps) == null ? void 0 : _a.children) || "children";
     });
     const tableProps = computed(() => {
-      const propKeys = tablePropKeys.filter(
-        (k) => ![
-          "currentRowKey",
-          "showOverflowTooltip",
-          "tooltipOptions",
-          "tooltipEffect"
-        ].includes(k)
-      );
+      const propKeys = tablePropKeys.filter((k) => !["currentRowKey", "showOverflowTooltip", "tooltipOptions", "tooltipEffect"].includes(k));
       return {
         ...pick(props, propKeys),
-        ...omit(events, [
-          "onUpdate:currentRowKey",
-          "onUpdate:selectedRowKeys",
-          "onRowClick",
-          "onHeaderClick",
-          "onSortChange",
-          "onFilterChange",
-          "onCurrentChange",
-          "onSelect",
-          "onSelectAll",
-          "onSelectionChange"
-        ])
+        ...omit(events, ["onUpdate:currentRowKey", "onUpdate:selectedRowKeys", "onRowClick", "onHeaderClick", "onSortChange", "onFilterChange", "onCurrentChange", "onSelect", "onSelectAll", "onSelectionChange"])
       };
     });
     const handleRowClick = (row, column, event) => {
@@ -137,11 +124,7 @@ const _sfc_main = defineComponent({
     };
     const setSelectedRows = (rows) => {
       if (rows) {
-        updateCheckedState(
-          getRowKeys(rows, props.rowKey),
-          rows,
-          !!rows.length
-        );
+        updateCheckedState(getRowKeys(rows, props.rowKey), rows, !!rows.length);
       }
     };
     const setSelectedRowKeys = (keys) => {
@@ -150,16 +133,12 @@ const _sfc_main = defineComponent({
       }
     };
     const toggleRowExpansionAll = (expanded) => {
-      eachTree(
-        props.data,
-        (row) => {
-          var _a;
-          if ((_a = row[childKey.value]) == null ? void 0 : _a.length) {
-            methods.toggleRowExpansion(row, expanded);
-          }
-        },
-        childKey.value
-      );
+      eachTree(props.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 (!valueIsChanged(tableState.key, key)) {
@@ -173,22 +152,12 @@ const _sfc_main = defineComponent({
         return;
       }
       if (key != null) {
-        const row = getRowByKey(
-          key,
-          props.data,
-          props.rowKey,
-          childKey.value
-        );
+        const row = getRowByKey(key, props.data, props.rowKey, childKey.value);
         if (row != null || props.reserveCurrent) {
           tableState.oldRow = tableState.row;
           tableState.row = row || item || void 0;
           if (tableState.row == null && props.cacheData != null) {
-            tableState.row = getRowByKey(
-              key,
-              props.cacheData,
-              props.rowKey,
-              childKey.value
-            );
+            tableState.row = getRowByKey(key, props.cacheData, props.rowKey, childKey.value);
           }
           tableState.key = key;
           methods.setCurrentRow(row);
@@ -210,20 +179,10 @@ const _sfc_main = defineComponent({
       if (!force && !arrayIsChanged(tableState.checkedKeys, keys)) {
         return;
       }
-      const [dataKeys, list] = getKeysAndList(
-        props.data,
-        props.rowKey,
-        childKey.value
-      );
-      const [cacheKeys, cacheList] = getKeysAndList(
-        props.cacheData,
-        props.rowKey,
-        childKey.value
-      );
+      const [dataKeys, list] = getKeysAndList(props.data, props.rowKey, childKey.value);
+      const [cacheKeys, cacheList] = getKeysAndList(props.cacheData, props.rowKey, childKey.value);
       const itemKeys = items ? items.map((d) => getValue(d, props.rowKey)) : [];
-      const oldKeys = tableState.checked.map(
-        (d) => getValue(d, props.rowKey)
-      );
+      const oldKeys = tableState.checked.map((d) => getValue(d, props.rowKey));
       const checkedKeys = [];
       const checked = [];
       keys.forEach((key) => {
@@ -253,7 +212,10 @@ const _sfc_main = defineComponent({
             return;
           }
           if (typeof props.rowKey === "string") {
-            checked.push({ [props.rowKey]: key, _isMock: true });
+            checked.push({
+              [props.rowKey]: key,
+              _isMock: true
+            });
           }
         }
       });
@@ -274,23 +236,13 @@ const _sfc_main = defineComponent({
     const updateSelectedAndChecked = () => {
       const key = tableState.key;
       if (key != null) {
-        const row = getRowByKey(
-          key,
-          props.data,
-          props.rowKey,
-          childKey.value
-        );
+        const row = getRowByKey(key, props.data, props.rowKey, childKey.value);
         if (row != null) {
           updateSelectedState(key, row);
         } else if (!props.reserveCurrent) {
           updateSelectedState(null);
         } else if (props.cacheData != null) {
-          const temp = getRowByKey(
-            key,
-            props.cacheData,
-            props.rowKey,
-            childKey.value
-          );
+          const temp = getRowByKey(key, props.cacheData, props.rowKey, childKey.value);
           if (temp != null) {
             updateSelectedState(key, temp);
           }
@@ -311,51 +263,40 @@ const _sfc_main = defineComponent({
         events["onUpdate:selectedRowKeys"](keys);
       }
     };
-    watch(
-      () => props.columns,
-      (columns) => {
-        tableState.reserveChecked = isReserveChecked(columns);
-        if (!columns) {
-          tableCols.value = [];
-        } else {
-          const { cols, sorter } = getStateCols(
-            columns,
-            tableState.sorter,
-            tableState.filter
-          );
-          tableCols.value = cols;
-          nextTick(() => {
-            methods.doLayout();
-            updateScrollBar();
-            if (sorter) {
-              methods.sort(
-                sorter.prop,
-                sorter.order || "ascending"
-              );
-            }
-          });
-        }
-      },
-      { deep: true }
-    );
+    watch(() => props.columns, (columns) => {
+      tableState.reserveChecked = isReserveChecked(columns);
+      if (!columns) {
+        tableCols.value = [];
+      } else {
+        const {
+          cols,
+          sorter
+        } = getStateCols(columns, tableState.sorter, tableState.filter);
+        tableCols.value = cols;
+        nextTick(() => {
+          methods.doLayout();
+          updateScrollBar();
+          if (sorter) {
+            methods.sort(sorter.prop, sorter.order || "ascending");
+          }
+        });
+      }
+    }, {
+      deep: true
+    });
     watch([() => props.data, () => props.cacheData], () => {
       nextTick(() => {
         updateSelectedAndChecked();
       });
     });
-    watch(
-      () => props.currentRowKey,
-      (key) => {
-        updateSelectedState(key);
-      }
-    );
-    watch(
-      () => props.selectedRowKeys,
-      (selectedRowKeys) => {
-        updateCheckedState(selectedRowKeys || []);
-      },
-      { deep: true }
-    );
+    watch(() => props.currentRowKey, (key) => {
+      updateSelectedState(key);
+    });
+    watch(() => props.selectedRowKeys, (selectedRowKeys) => {
+      updateCheckedState(selectedRowKeys || []);
+    }, {
+      deep: true
+    });
     onMounted(() => {
       if (props.currentRowKey != null) {
         updateSelectedState(props.currentRowKey);
@@ -364,24 +305,8 @@ const _sfc_main = defineComponent({
         updateCheckedState(props.selectedRowKeys);
       }
     });
-    return {
-      ownSlots,
-      getBodyRowClass,
-      getHeadRowClass,
+    const exposeValue = {
       ...methods,
-      isLayoutFixedHead,
-      isLayoutMaximized,
-      tableRef,
-      tableCols,
-      tableOverflowTooltip,
-      tableProps,
-      handleRowClick,
-      handleHeaderClick,
-      handleSortChange,
-      handleFilterChange,
-      handleCurrentChange,
-      handleSelect,
-      handleSelectAll,
       clearSort,
       clearSelection,
       toggleRowSelection,
@@ -391,90 +316,82 @@ const _sfc_main = defineComponent({
       setSelectedRows,
       setSelectedRowKeys,
       toggleRowExpansionAll,
-      updateSelectedAndChecked
+      updateSelectedAndChecked,
+      tableRef
+    };
+    expose(exposeValue);
+    const renderTableColumn = (col) => {
+      return createVNode(ElTableColumn, mergeProps(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.pageIndex,
+        "className": getCellClass(col),
+        "columnKey": col.columnKey ?? col.prop,
+        "filterClassName": getFilterPopperClass(col.filterClassName),
+        "showOverflowTooltip": getTooltipProps(col.showOverflowTooltip, tableOverflowTooltip.value)
+      }), {
+        header: (slotProps) => {
+          var _a, _b, _c;
+          return 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 ? createVNode(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) : h(col.filterIcon);
+        },
+        default: (slotProps) => {
+          var _a;
+          return col.slot && !ownSlots.includes(col.slot) && slots[col.slot] && (!props.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 () => createVNode(ElTable, mergeProps(tableProps.value, {
+      "ref": tableRef,
+      "emptyText": props.errorText || props.emptyText,
+      "rowClassName": (param) => getBodyRowClass(props.rowClassName, param),
+      "headerRowClassName": (param) => getHeadRowClass(props.headerRowClassName, param, props.headerEllipsis),
+      "class": ["ele-data-table", {
+        "is-sticky": props.sticky
+      }, {
+        "is-layout-fixed-head": props.sticky && isLayoutFixedHead.value
+      }, {
+        "is-layout-maximized": props.sticky && isLayoutMaximized.value
+      }, {
+        "is-sticky": props.sticky
+      }, {
+        "hide-header": !props.showHeader
+      }, {
+        "hide-bottom-line": !props.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.emptyText,
+          error: props.errorText
+        });
+      } : props.emptyProps ? () => createVNode(ElEmpty, mergeProps({
+        "imageSize": 68
+      }, !props.emptyProps || props.emptyProps === true ? {} : props.emptyProps, {
+        "description": props.errorText || props.emptyText,
+        "class": "ele-table-empty"
+      }), null) : void 0,
+      default: () => tableCols.value.map(renderTableColumn)
+    });
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_TableColumns = resolveComponent("TableColumns");
-  const _component_ElEmpty = resolveComponent("ElEmpty");
-  const _component_ElTable = resolveComponent("ElTable");
-  return openBlock(), createBlock(_component_ElTable, 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
-  }), createSlots({
-    default: withCtx(() => [
-      _ctx.tableCols && _ctx.tableCols.length ? (openBlock(), createBlock(_component_TableColumns, {
-        key: 0,
-        columns: _ctx.tableCols,
-        pageIndex: _ctx.pageIndex,
-        slotNormalize: _ctx.slotNormalize,
-        globalTooltip: _ctx.tableOverflowTooltip
-      }, createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.ownSlots.includes(k)), (name) => {
-          return {
-            name,
-            fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1032, ["columns", "pageIndex", "slotNormalize", "globalTooltip"])) : createCommentVNode("", true)
-    ]),
-    _: 2
-  }, [
-    _ctx.$slots.append ? {
-      name: "append",
-      fn: withCtx((slotProps) => [
-        renderSlot(_ctx.$slots, "append", normalizeProps(guardReactiveProps(slotProps || {})))
-      ]),
-      key: "0"
-    } : void 0,
-    _ctx.$slots.empty || _ctx.emptyProps ? {
-      name: "empty",
-      fn: withCtx(() => [
-        _ctx.$slots.empty ? renderSlot(_ctx.$slots, "empty", {
-          key: 0,
-          text: _ctx.emptyText,
-          error: _ctx.errorText
-        }) : _ctx.emptyProps ? (openBlock(), createBlock(_component_ElEmpty, mergeProps({
-          key: 1,
-          imageSize: 68
-        }, !_ctx.emptyProps || _ctx.emptyProps === true ? {} : _ctx.emptyProps, {
-          description: _ctx.errorText || _ctx.emptyText,
-          class: "ele-table-empty"
-        }), null, 16, ["description"])) : 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]]);
 export {
   index as default
 };

package/es/ele-data-table/util.d.ts

@@ -138,11 +138,6 @@ export declare function useStickyHeader(): {
     isLayoutFixedHead: import('vue').ComputedRef<boolean | undefined>;
     isLayoutMaximized: import('vue').ComputedRef<boolean | undefined>;
 };
-/**
- * 表格滚动条适配 KeepAlive
- * @param getInstance 获取表格实例方法
- */
-export declare function useScrollAlive(getInstance: GetInstance): void;
 /**
  * 表格实例方法统一处理
  * @param getInstance 获取表格实例方法

package/es/ele-data-table/util.js

@@ -1,4 +1,4 @@
-import { unref, computed, onDeactivated, onActivated } from "vue";
+import { unref, computed } from "vue";
 import { mapTree, findTree, eachTree, getValue } from "../utils/core";
 import { useLayoutState } from "../ele-pro-layout/util";
 function getRowClass(rowClass, param) {
@@ -213,33 +213,6 @@ function useStickyHeader() {
   );
   return { isLayoutFixedHead, isLayoutMaximized };
 }
-function useScrollAlive(getInstance) {
-  let scrollTop;
-  let scrollLeft;
-  const getWrapEl = () => {
-    var _a;
-    const ins = getInstance();
-    return (_a = ins == null ? void 0 : ins.scrollBarRef) == null ? void 0 : _a.wrapRef;
-  };
-  onDeactivated(() => {
-    const wrapEl = getWrapEl();
-    if (!wrapEl) {
-      scrollTop = void 0;
-      scrollLeft = void 0;
-      return;
-    }
-    scrollTop = wrapEl.scrollTop;
-    scrollLeft = wrapEl.scrollLeft;
-  });
-  onActivated(() => {
-    const ins = getInstance();
-    if (ins && (scrollTop || scrollLeft)) {
-      ins.scrollTo(scrollLeft || 0, scrollTop || 0);
-      scrollTop = void 0;
-      scrollLeft = void 0;
-    }
-  });
-}
 function useMethods(getInstance) {
   const methods = {
     clearSelection: () => {
@@ -413,7 +386,6 @@ export {
   toggleRowSelectionPro,
   useEmits,
   useMethods,
-  useScrollAlive,
   useStickyHeader,
   valueIsChanged
 };

package/es/ele-dropdown/components/pro-dropdown.d.ts

@@ -17,6 +17,10 @@ declare const _default: import('vue').DefineComponent<{
     preventContextmenu: BooleanConstructor;
     splitButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
     caretButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
+    formValidate: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     type: {
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
         readonly required: false;
@@ -128,6 +132,10 @@ declare const _default: import('vue').DefineComponent<{
     preventContextmenu: BooleanConstructor;
     splitButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
     caretButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
+    formValidate: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     type: {
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
         readonly required: false;
@@ -234,5 +242,6 @@ declare const _default: import('vue').DefineComponent<{
     virtualTriggering: boolean;
     gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     preventContextmenu: boolean;
+    formValidate: boolean;
 }, {}>;
 export default _default;