ele-admin-plus 1.4.1 → 1.5.0-beta.1

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

@@ -34,14 +34,10 @@ const index = /* @__PURE__ */ vue.defineComponent({
       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";
+      return props$1.treeProps?.children || "children";
     });
     const borderKey = vue.computed(() => {
-      if (tableCols.value.some((col) => {
-        var _a;
-        return (_a = col.children) == null ? void 0 : _a.length;
-      })) {
+      if (tableCols.value.some((col) => col.children?.length)) {
         return 1;
       }
       return props$1.border ? 1 : 0;
@@ -54,7 +50,8 @@ const index = /* @__PURE__ */ vue.defineComponent({
       };
     });
     const handleRowClick = (row, column, event) => {
-      if (props$1.rowClickChecked && !util.isDisableRow(row, props$1.data.indexOf(row), props$1.columns)) {
+      const disabled = util.isDisableRow(row, props$1.data.indexOf(row), props$1.columns);
+      if (props$1.rowClickChecked && !disabled) {
         const selections = methods.getSelectionRows();
         if (props$1.rowClickChecked === "smart" && (!selections || !selections.length || selections.length === 1)) {
           const key = common.getValue(row, props$1.rowKey);
@@ -63,7 +60,7 @@ const index = /* @__PURE__ */ vue.defineComponent({
           toggleRowSelection(row);
         }
       }
-      events.onRowClick(row, column, event);
+      events.onRowClick(row, column, event, disabled, methods.getSelectionRows());
     };
     const handleHeaderClick = (column, e) => {
       if (column.sortable && column.filters) {
@@ -101,8 +98,7 @@ const index = /* @__PURE__ */ vue.defineComponent({
       events.onSelectAll(selection);
     };
     const updateScrollBar = () => {
-      var _a;
-      const scrollBarRef = (_a = tableRef.value) == null ? void 0 : _a.scrollBarRef;
+      const scrollBarRef = tableRef.value?.scrollBarRef;
       if (scrollBarRef && typeof scrollBarRef.update === "function") {
         scrollBarRef.update();
       }
@@ -140,8 +136,7 @@ const index = /* @__PURE__ */ vue.defineComponent({
     };
     const toggleRowExpansionAll = (expanded) => {
       common.eachTree(props$1.data, (row) => {
-        var _a;
-        if ((_a = row[childKey.value]) == null ? void 0 : _a.length) {
+        if (row[childKey.value]?.length) {
           methods.toggleRowExpansion(row, expanded);
         }
       }, childKey.value);
@@ -338,24 +333,12 @@ const index = /* @__PURE__ */ vue.defineComponent({
         "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(index$1.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: col.children && col.children.length ? () => {
-          var _a, _b;
-          return (_b = (_a = col == null ? void 0 : col.children) == null ? void 0 : _a.map) == null ? void 0 : _b.call(_a, renderTableColumn);
-        } : col.slot && !ownSlots.includes(col.slot) && slots[col.slot] ? (slotProps) => {
-          var _a;
-          return (!props$1.slotNormalize || (slotProps == null ? void 0 : slotProps.$index) != -1) && col.slot ? (_a = slots[col.slot]) == null ? void 0 : _a.call(slots, slotProps) : void 0;
-        } : void 0
+        header: (slotProps) => vue.createVNode("div", {
+          "class": "ele-cell-title",
+          "title": slotProps?.column?.label
+        }, [col.headerSlot && !ownSlots.includes(col.headerSlot) && slots[col.headerSlot] ? slots[col.headerSlot]?.(slotProps) : slotProps?.column?.label]),
+        ["filter-icon"]: (slotProps) => !col.filterIcon ? vue.createVNode(index$1.FilterFilled, null, null) : typeof col.filterIcon === "string" && !ownSlots.includes(col.filterIcon) && slots[col.filterIcon] ? slots[col.filterIcon]?.(slotProps) : vue.h(col.filterIcon),
+        default: col.children && col.children.length ? () => col?.children?.map?.(renderTableColumn) : col.slot && !ownSlots.includes(col.slot) && slots[col.slot] ? (slotProps) => (!props$1.slotNormalize || slotProps?.$index != -1) && col.slot ? slots[col.slot]?.(slotProps) : void 0 : void 0
       });
     };
     return () => vue.createVNode(elementPlus.ElTable, vue.mergeProps({
@@ -386,17 +369,11 @@ const index = /* @__PURE__ */ vue.defineComponent({
       "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({
+      append: slots.append ? (slotProps) => slots.append?.(slotProps) : void 0,
+      empty: slots.empty ? () => slots.empty?.({
+        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,

package/lib/ele-data-table/index.d.ts

@@ -123,6 +123,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }>, {
     clearSort: () => void;
     clearSelection: () => void;
@@ -155,7 +156,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     cellClick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
+    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean, _selection?: DataItem[]) => boolean;
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
@@ -290,38 +291,39 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onScroll?: ((_option: {
         scrollLeft: number;
         scrollTop: number;
     }) => any) | undefined;
+    onFilterChange?: ((_filter: Filter) => any) | undefined;
+    onCellClick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
+    onCellContextmenu?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
+    onCellDblclick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     onCellMouseLeave?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onCellClick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onCellDblclick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onCellContextmenu?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onRowClick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
+    onRowClick?: ((_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean | undefined, _selection?: DataItem[] | undefined) => any) | undefined;
     onRowContextmenu?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onRowDblclick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderClick?: ((_column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderContextmenu?: ((_column: Column, _e: MouseEvent) => any) | undefined;
     onSortChange?: ((_sorter: Sorter) => any) | undefined;
-    onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
 }>, {
     data: any[];
     fit: boolean;
+    border: boolean;
     lazy: boolean;
     className: string;
     stripe: boolean;
-    border: boolean;
     showHeader: boolean;
     showSummary: boolean;
     highlightCurrentRow: boolean;
@@ -335,6 +337,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
     preserveExpandedContent: boolean;
+    nativeScrollbar: boolean;
     sticky: boolean;
     headerEllipsis: boolean;
     slotNormalize: boolean;

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

@@ -68,7 +68,7 @@ const elDataTableEmits = {
   cellClick: (_row, _column, _cell, _e) => true,
   cellDblclick: (_row, _column, _cell, _e) => true,
   cellContextmenu: (_row, _column, _cell, _e) => true,
-  rowClick: (_row, _column, _e) => true,
+  rowClick: (_row, _column, _e, _disabled, _selection) => true,
   rowContextmenu: (_row, _column, _e) => true,
   rowDblclick: (_row, _column, _e) => true,
   headerClick: (_column, _e) => true,

package/lib/ele-data-table/props.d.ts

@@ -1,7 +1,7 @@
 import { PropType, ExtractPropTypes } from 'vue';
 import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked, RowKey } from './types';
 
-declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
+declare const normalizeProps: Omit<{
     data: {
         type: PropType<any[]>;
         default: () => never[];
@@ -90,7 +90,8 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
-}, "style">>;
+    nativeScrollbar: BooleanConstructor;
+}, "style">;
 /**
  * 属性
  */
@@ -150,8 +151,13 @@ export declare const dataTableProps: {
         type: PropType<any[]>;
         default: () => never[];
     };
-    width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
+    tableLayout: {
+        type: PropType<"fixed" | "auto">;
+        default: string;
+    };
+    width: (NumberConstructor | StringConstructor)[];
     size: {
         readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -162,7 +168,6 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -209,10 +214,6 @@ export declare const dataTableProps: {
         };
     };
     load: PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
-    tableLayout: {
-        type: PropType<"fixed" | "auto">;
-        default: string;
-    };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
     showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
@@ -227,6 +228,7 @@ export declare const dataTableProps: {
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**
@@ -241,7 +243,7 @@ export declare const elDataTableEmits: {
     cellClick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
+    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean, _selection?: DataItem[]) => boolean;
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
@@ -272,7 +274,7 @@ export declare const dataTableEmits: {
     cellClick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
+    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean, _selection?: DataItem[]) => boolean;
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;

package/lib/ele-data-table/style/index.scss

@@ -148,13 +148,13 @@
 
     .ascending {
       border-bottom-color: eleVar('table', 'icon-color');
-      margin-top: calc(0px - #{eleVar('table', 'sort-size')});
+      margin-top: calc(#{eleVar('table', 'sort-size')} * -1);
       margin-bottom: calc(#{eleVar('table', 'sort-space')} / 2);
     }
 
     .descending {
       border-top-color: eleVar('table', 'icon-color');
-      margin-bottom: calc(0px - #{eleVar('table', 'sort-size')});
+      margin-bottom: calc(#{eleVar('table', 'sort-size')} * -1);
       margin-top: calc(#{eleVar('table', 'sort-space')} / 2);
     }
   }

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

@@ -65,12 +65,11 @@ function getTooltipProps(props2, globalProps) {
   return opt;
 }
 function toggleRowSelectionPro(tableRef, row, selected) {
-  var _a, _b;
   if (tableRef == null) {
     return;
   }
-  const store = (_a = vue.unref(tableRef)) == null ? void 0 : _a.store;
-  const selection = vue.unref((_b = store == null ? void 0 : store.states) == null ? void 0 : _b.selection);
+  const store = vue.unref(tableRef)?.store;
+  const selection = vue.unref(store?.states?.selection);
   const index = selection.indexOf(row);
   const included = index !== -1;
   if (selected && !included) {
@@ -81,10 +80,9 @@ function toggleRowSelectionPro(tableRef, row, selected) {
   store.updateAllSelected();
 }
 function getTableFilter(tableRef) {
-  var _a, _b;
-  const states = (_b = (_a = vue.unref(tableRef)) == null ? void 0 : _a.store) == null ? void 0 : _b.states;
-  const columns = vue.unref(states == null ? void 0 : states.columns);
-  const filters = vue.unref(states == null ? void 0 : states.filters);
+  const states = vue.unref(tableRef)?.store?.states;
+  const columns = vue.unref(states?.columns);
+  const filters = vue.unref(states?.filters);
   if (!filters || !columns) {
     return;
   }

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

@@ -165,7 +165,7 @@ export declare function useEmits(emit: Emitter<DataTableEmitsType>): {
     onCellClick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any;
     onCellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any;
     onCellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any;
-    onRowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => any;
+    onRowClick: (_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean | undefined, _selection?: DataItem[] | undefined) => any;
     onRowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => any;
     onRowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => any;
     onHeaderClick: (_column: Column, _e: MouseEvent) => any;

package/lib/ele-dot/index.cjs

@@ -12,14 +12,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props) {
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("span", {
-        class: vue.normalizeClass([
-          "ele-dot",
+        class: vue.normalizeClass(["ele-dot", [
           { "is-success": "success" === _ctx.type },
           { "is-warning": "warning" === _ctx.type },
           { "is-danger": "danger" === _ctx.type },
           { "is-info": "info" === _ctx.type },
           { "is-ripple": _ctx.ripple }
-        ])
+        ]])
       }, [
         vue.createElementVNode("span", {
           class: "ele-dot-status",

package/lib/ele-drawer/index.cjs

@@ -3,7 +3,8 @@ const vue = require("vue");
 const elementPlus = require("element-plus");
 const index = require("../icons/index");
 const common = require("../utils/common");
-const ReceiverView = require("../ele-config-provider/components/receiver-view");
+const LoadingSpinner = require("../ele-loading/components/loading-spinner");
+const MainContent = require("../ele-loading/components/main-content");
 const util = require("../ele-pro-layout/util");
 const util$1 = require("../ele-modal/util");
 const props = require("./props");
@@ -19,7 +20,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const layoutState = util.useLayoutState();
     const isResponsive = util.useResponsive(props$1);
     const drawerRef = vue.ref(null);
-    const isActivated = vue.ref(true);
+    const isActivated = vue.ref(!props$1.isDeactivated);
     const drawerClass = vue.computed(() => {
       const classes = ["ele-drawer"];
       if (isResponsive.value) {
@@ -34,6 +35,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (props$1.inner) {
         classes.push("ele-drawer-inner");
       }
+      if (props$1.compLoading && !props$1.loading) {
+        classes.push("ele-drawer-comp-loading");
+      }
+      if (props$1.flexTable === "auto") {
+        classes.push("ele-drawer-flex-auto-table");
+      } else if (props$1.flexTable) {
+        classes.push("ele-drawer-flex-table");
+      }
+      if (props$1.customFooter) {
+        classes.push("ele-drawer-custom-footer");
+      }
       if (props$1.modalClass) {
         classes.push(props$1.modalClass);
       }
@@ -78,6 +90,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleDrawerCloseAutoFocus = () => {
       emit("closeAutoFocus");
     };
+    vue.watch(
+      () => props$1.isDeactivated,
+      (deactivated) => {
+        isActivated.value = !deactivated;
+      }
+    );
     vue.onActivated(() => {
       isActivated.value = true;
     });
@@ -154,16 +172,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ], 4)
           ]),
           default: vue.withCtx(() => [
-            vue.createVNode(vue.unref(ReceiverView), {
-              wrapPosition: false,
-              class: "ele-drawer-body",
+            vue.createVNode(MainContent, {
+              class: vue.normalizeClass(["ele-drawer-body", [{ "is-form": _ctx.form }, _ctx.drawerBodyClass]]),
               style: vue.normalizeStyle(_ctx.bodyStyle)
             }, {
               default: vue.withCtx(() => [
                 vue.renderSlot(_ctx.$slots, "default")
               ]),
               _: 3
-            }, 8, ["style"])
+            }, 8, ["class", "style"]),
+            vue.createVNode(LoadingSpinner, vue.mergeProps(_ctx.loadingProps || {}, {
+              loading: _ctx.compLoading || _ctx.loading,
+              plain: true
+            }), null, 16, ["loading"])
           ]),
           _: 2
         }, [