ele-admin-plus 1.1.9-beta.9 → 1.1.9

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

@@ -5,6 +5,7 @@ import type {
   ElTableInstance,
   ElEmptyProps
 } from '../ele-app/el';
+import type { EleTooltipProps } from '../ele-app/plus';
 
 /**
  * 数据唯一键
@@ -15,22 +16,8 @@ export type DataKey = string | number;
  * 数据
  */
 export interface DataItem extends Record<keyof any, any> {
-  /** 子级数据 */
-  children?: DataItem[];
-  /** 是否为模拟数据 */
+  /** 是否为模拟数据, 用于保留不存在的选中数据 */
   _isMock?: boolean;
-  /** 行唯一值 */
-  _rowKey?: DataKey | null;
-  /** 行索引 */
-  _rowIndex?: number;
-  /** 行是否禁用 */
-  _rowDisabled?: boolean;
-  /** 是否是展开行 */
-  _isExpandRow?: boolean;
-  /** 展开行对应的行数据 */
-  _expandParent?: DataItem;
-  /** 展开行对应的行索引 */
-  _expandParantIndex?: number;
 }
 
 /**
@@ -41,7 +28,8 @@ export type TableColumn = Partial<ElColumnProps>;
 /**
  * 列属性
  */
-export interface Column extends TableColumn {
+export interface Column extends Omit<TableColumn, 'filterPlacement'> {
+  filterPlacement?: EleTooltipProps['placement'];
   /** 唯一标识 */
   uid?: string;
   /** 插槽名称 */
@@ -52,6 +40,10 @@ export interface Column extends TableColumn {
   hideInTable?: boolean;
   /** 是否不显示在列配置中 */
   hideInSetting?: boolean;
+  /** 是否不显示在导出列中 */
+  hideInExport?: boolean;
+  /** 是否不显示在打印列中 */
+  hideInPrint?: boolean;
   /** 子级 */
   children?: Columns;
 }

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

@@ -1,8 +1,9 @@
-import type { Slots, VNode } from 'vue';
-import type { Emitter } from '../ele-app/types';
-import type { ElEmptyProps, ElTableInstance } from '../ele-app/el';
-import type { dataTableEmits } from './props';
-import type { DataKey, DataItem, Column, Columns, Sorter, Filter, GetInstance, TableMethods, ShowOverflowTooltip, TooltipEffect, TooltipOptions, RowClass, RowKey } from './types';
+import { DataKey, DataItem, Column, Columns, Sorter, Filter, GetInstance, TableMethods, ShowOverflowTooltip, TooltipEffect, TooltipOptions, RowClass, RowKey } from './types';
+import { dataTableEmits } from './props';
+import { ElEmptyProps, ElTableInstance } from '../ele-app/el';
+import { Emitter } from '../ele-app/types';
+import { Slots, VNode } from 'vue';
+
 /**
  * 获取数据某字段值
  * @param data 数据
@@ -17,7 +18,7 @@ export declare function getValue<T, K>(data?: K, field?: string | ((d: K) => T))
  * @param slotNormalize 是否过滤非正常的插槽渲染
  * @param globalTooltip 表格提示组件属性
  */
-export declare function getCols(cols: Columns | undefined, pageIndex: number | undefined, slots: Slots, slotNormalize: boolean, globalTooltip?: ShowOverflowTooltip): VNode<import("vue").RendererNode, import("vue").RendererElement, {
+export declare function getCols(cols: Columns | undefined, pageIndex: number | undefined, slots: Slots, slotNormalize: boolean, globalTooltip?: ShowOverflowTooltip): VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }>[];
 /**
@@ -63,7 +64,7 @@ export declare function getTooltipProps(props?: ShowOverflowTooltip, globalProps
  * @param slots 插槽对象
  * @param name 插槽名称
  */
-export declare function getSlot(slots: Slots, name?: string): import("vue").Slot<any> | undefined;
+export declare function getSlot(slots: Slots, name?: string): import('vue').Slot<any> | undefined;
 /**
  * 渲染插槽
  * @param slots 插槽对象
@@ -85,9 +86,9 @@ export declare function getEmptyProps(emptyProps?: boolean | ElEmptyProps, empty
  * @param emptyText 空文本
  * @param errorText 错误文本
  */
-export declare function getEmptySlot(slots: Slots, emptyProps?: boolean | ElEmptyProps, emptyText?: string, errorText?: string): (() => VNode<import("vue").RendererNode, import("vue").RendererElement, {
+export declare function getEmptySlot(slots: Slots, emptyProps?: boolean | ElEmptyProps, emptyText?: string, errorText?: string): (() => VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
-}> | VNode<import("vue").RendererNode, import("vue").RendererElement, {
+}> | VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }>[] | undefined) | undefined;
 /**

package/lib/ele-dot/index.d.ts

@@ -1,5 +1,5 @@
-declare const _default: import("vue").DefineComponent<{
-    type: import("vue").PropType<import("./types").DotType>;
+declare const _default: import('vue').DefineComponent<{
+    type: import('vue').PropType<import('./types').DotType>;
     color: StringConstructor;
     ripple: {
         type: BooleanConstructor;
@@ -10,8 +10,8 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    type: import("vue").PropType<import("./types").DotType>;
+}, unknown, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    type: import('vue').PropType<import('./types').DotType>;
     color: StringConstructor;
     ripple: {
         type: BooleanConstructor;

package/lib/ele-dot/props.d.ts

@@ -1,5 +1,6 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { DotType } from './types';
+import { DotType } from './types';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */

package/lib/ele-drawer/index.cjs

@@ -2,8 +2,8 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const icons = require("../icons");
-const ReceiverView = require("../ele-config-provider/components/receiver-view");
 const receiver = require("../ele-config-provider/receiver");
+const ReceiverView = require("../ele-config-provider/components/receiver-view");
 const util = require("../ele-modal/util");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
@@ -16,7 +16,6 @@ const _sfc_main = vue.defineComponent({
     const drawerRef = vue.ref(null);
     const isActivated = vue.ref(true);
     const drawerClass = vue.computed(() => {
-      const layoutState = vue.unref(layoutProvide);
       const classes = ["ele-drawer"];
       if (!props2.modelValue) {
         classes.push("ele-drawer-closed");
@@ -26,41 +25,20 @@ const _sfc_main = vue.defineComponent({
       }
       if (props2.inner) {
         classes.push("ele-drawer-inner");
-        if (layoutState && layoutState.sidebar != null) {
-          if (layoutState.collapse && !layoutState.topLayout) {
-            classes.push(util.collapseClass);
-          }
-          if (layoutState.compact && layoutState.mixSidebar && !layoutState.topLayout) {
-            classes.push(util.compactClass);
-          }
-          if (layoutState.maximized) {
-            classes.push(util.maximizedClass);
-          }
-          if (layoutState.tabBar) {
-            classes.push(util.hasTabClass);
-          }
-          if (layoutState.mixSidebar && !layoutState.topLayout) {
-            classes.push(util.mixSidebarClass);
-            if (!layoutState.sidebar) {
-              classes.push(util.singleSidebarClass);
-            }
-          }
-          if (layoutState.topLayout) {
-            classes.push(util.topLayoutClass);
-          }
-          if (layoutState.maximized && layoutState.expanded) {
-            classes.push(util.expandedClass);
-          }
-          if (layoutState.mobile) {
-            classes.push(util.mobileClass);
-          }
-        }
       }
       if (props2.modalClass) {
         classes.push(props2.modalClass);
       }
       return classes.join(" ");
     });
+    const teleportTo = vue.computed(() => {
+      return util.getModalContainer(
+        props2.inner,
+        false,
+        void 0,
+        layoutProvide.modalsEl
+      );
+    });
     const handleClose = () => {
       if (drawerRef.value && drawerRef.value.handleClose) {
         drawerRef.value.handleClose();
@@ -81,6 +59,12 @@ const _sfc_main = vue.defineComponent({
     const onClosed = () => {
       emit("closed");
     };
+    const onOpenAutoFocus = () => {
+      emit("openAutoFocus");
+    };
+    const onCloseAutoFocus = () => {
+      emit("closeAutoFocus");
+    };
     vue.onActivated(() => {
       isActivated.value = true;
     });
@@ -90,12 +74,15 @@ const _sfc_main = vue.defineComponent({
     return {
       drawerRef,
       drawerClass,
+      teleportTo,
       handleClose,
       updateModelValue,
       onOpen,
       onOpened,
       onClose,
-      onClosed
+      onClosed,
+      onOpenAutoFocus,
+      onCloseAutoFocus
     };
   }
 });
@@ -112,90 +99,97 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElIcon = vue.resolveComponent("ElIcon");
   const _component_ReceiverView = vue.resolveComponent("ReceiverView");
   const _component_ElDrawer = vue.resolveComponent("ElDrawer");
-  return vue.openBlock(), vue.createBlock(_component_ElDrawer, {
-    ref: "drawerRef",
-    modelValue: _ctx.modelValue,
-    appendToBody: _ctx.appendToBody,
-    lockScroll: _ctx.lockScroll,
-    beforeClose: _ctx.beforeClose,
-    closeOnClickModal: _ctx.closeOnClickModal,
-    closeOnPressEscape: _ctx.closeOnPressEscape,
-    openDelay: _ctx.openDelay,
-    closeDelay: _ctx.closeDelay,
-    destroyOnClose: _ctx.destroyOnClose,
-    modal: _ctx.modal,
-    direction: _ctx.direction,
-    showClose: false,
-    size: _ctx.size,
-    title: _ctx.title,
-    withHeader: _ctx.withHeader,
-    modalClass: _ctx.drawerClass,
-    zIndex: _ctx.zIndex,
-    headerAriaLevel: _ctx.headerAriaLevel,
-    onOpen: _ctx.onOpen,
-    onOpened: _ctx.onOpened,
-    onClose: _ctx.onClose,
-    onClosed: _ctx.onClosed,
-    "onUpdate:modelValue": _ctx.updateModelValue
-  }, vue.createSlots({
-    header: vue.withCtx(({ close }) => [
-      vue.createElementVNode("div", {
-        class: "ele-drawer-header",
-        style: vue.normalizeStyle(_ctx.headerStyle)
-      }, [
-        vue.createElementVNode("div", {
-          role: "heading",
-          class: "ele-drawer-title",
-          style: vue.normalizeStyle(_ctx.titleStyle)
-        }, [
-          vue.renderSlot(_ctx.$slots, "header", {}, () => [
-            vue.createTextVNode(vue.toDisplayString(_ctx.title), 1)
-          ])
-        ], 4),
-        _ctx.showClose ? (vue.openBlock(), vue.createElementBlock("div", {
-          key: 0,
-          class: "ele-drawer-close",
-          style: vue.normalizeStyle(_ctx.closeBtnStyle),
-          onClick: close
-        }, [
-          vue.renderSlot(_ctx.$slots, "closeBtn", {}, () => [
-            vue.createVNode(_component_ElIcon, null, {
-              default: vue.withCtx(() => [
-                vue.createVNode(_component_CloseOutlined)
-              ]),
-              _: 1
-            })
-          ])
-        ], 12, _hoisted_1)) : vue.createCommentVNode("", true)
-      ], 4)
-    ]),
-    default: vue.withCtx(() => [
-      vue.createVNode(_component_ReceiverView, {
-        wrapPosition: false,
-        class: "ele-drawer-body",
-        style: vue.normalizeStyle(_ctx.bodyStyle)
-      }, {
-        default: vue.withCtx(() => [
-          vue.renderSlot(_ctx.$slots, "default")
-        ]),
-        _: 3
-      }, 8, ["style"])
-    ]),
-    _: 2
+  return vue.openBlock(), vue.createBlock(vue.Teleport, {
+    to: _ctx.teleportTo,
+    disabled: _ctx.inner ? false : !_ctx.appendToBody
   }, [
-    _ctx.$slots.footer ? {
-      name: "footer",
-      fn: vue.withCtx(() => [
+    vue.createVNode(_component_ElDrawer, vue.mergeProps(_ctx.$attrs, {
+      ref: "drawerRef",
+      modelValue: _ctx.modelValue,
+      appendToBody: false,
+      lockScroll: _ctx.inner ? false : _ctx.lockScroll,
+      beforeClose: _ctx.beforeClose,
+      closeOnClickModal: _ctx.closeOnClickModal,
+      closeOnPressEscape: _ctx.closeOnPressEscape,
+      openDelay: _ctx.openDelay,
+      closeDelay: _ctx.closeDelay,
+      destroyOnClose: _ctx.destroyOnClose,
+      modal: _ctx.modal,
+      direction: _ctx.direction,
+      showClose: false,
+      size: _ctx.size,
+      title: _ctx.title,
+      withHeader: _ctx.withHeader,
+      modalClass: _ctx.drawerClass,
+      zIndex: _ctx.zIndex,
+      headerAriaLevel: _ctx.headerAriaLevel,
+      onOpen: _ctx.onOpen,
+      onOpened: _ctx.onOpened,
+      onClose: _ctx.onClose,
+      onClosed: _ctx.onClosed,
+      onOpenAutoFocus: _ctx.onOpenAutoFocus,
+      onCloseAutoFocus: _ctx.onCloseAutoFocus,
+      "onUpdate:modelValue": _ctx.updateModelValue
+    }), vue.createSlots({
+      header: vue.withCtx(({ close }) => [
         vue.createElementVNode("div", {
-          class: "ele-drawer-footer",
-          style: vue.normalizeStyle(_ctx.footerStyle)
+          class: "ele-drawer-header",
+          style: vue.normalizeStyle(_ctx.headerStyle)
         }, [
-          vue.renderSlot(_ctx.$slots, "footer")
+          vue.createElementVNode("div", {
+            role: "heading",
+            class: "ele-drawer-title",
+            style: vue.normalizeStyle(_ctx.titleStyle)
+          }, [
+            vue.renderSlot(_ctx.$slots, "header", {}, () => [
+              vue.createTextVNode(vue.toDisplayString(_ctx.title), 1)
+            ])
+          ], 4),
+          _ctx.showClose ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 0,
+            class: "ele-drawer-close",
+            style: vue.normalizeStyle(_ctx.closeBtnStyle),
+            onClick: close
+          }, [
+            vue.renderSlot(_ctx.$slots, "closeBtn", {}, () => [
+              vue.createVNode(_component_ElIcon, null, {
+                default: vue.withCtx(() => [
+                  vue.createVNode(_component_CloseOutlined)
+                ]),
+                _: 1
+              })
+            ])
+          ], 12, _hoisted_1)) : vue.createCommentVNode("", true)
         ], 4)
       ]),
-      key: "0"
-    } : void 0
-  ]), 1032, ["modelValue", "appendToBody", "lockScroll", "beforeClose", "closeOnClickModal", "closeOnPressEscape", "openDelay", "closeDelay", "destroyOnClose", "modal", "direction", "size", "title", "withHeader", "modalClass", "zIndex", "headerAriaLevel", "onOpen", "onOpened", "onClose", "onClosed", "onUpdate:modelValue"]);
+      default: vue.withCtx(() => [
+        vue.createVNode(_component_ReceiverView, {
+          wrapPosition: false,
+          class: "ele-drawer-body",
+          style: vue.normalizeStyle(_ctx.bodyStyle)
+        }, {
+          default: vue.withCtx(() => [
+            vue.renderSlot(_ctx.$slots, "default")
+          ]),
+          _: 3
+        }, 8, ["style"])
+      ]),
+      _: 2
+    }, [
+      _ctx.$slots.footer ? {
+        name: "footer",
+        fn: vue.withCtx(() => [
+          vue.createElementVNode("div", {
+            class: "ele-drawer-footer",
+            style: vue.normalizeStyle(_ctx.footerStyle)
+          }, [
+            vue.renderSlot(_ctx.$slots, "footer")
+          ], 4)
+        ]),
+        key: "0"
+      } : void 0
+    ]), 1040, ["modelValue", "lockScroll", "beforeClose", "closeOnClickModal", "closeOnPressEscape", "openDelay", "closeDelay", "destroyOnClose", "modal", "direction", "size", "title", "withHeader", "modalClass", "zIndex", "headerAriaLevel", "onOpen", "onOpened", "onClose", "onClosed", "onOpenAutoFocus", "onCloseAutoFocus", "onUpdate:modelValue"])
+  ], 8, ["to", "disabled"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;