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

package/lib/ele-modal/index.cjs

@@ -2,9 +2,9 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const icons = require("../icons");
-const receiver = require("../ele-config-provider/receiver");
 const ReceiverView = require("../ele-config-provider/components/receiver-view");
-const util = require("./util");
+const util = require("../ele-pro-layout/util");
+const util$1 = require("./util");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleModal",
@@ -22,13 +22,14 @@ const _sfc_main = vue.defineComponent({
   emits: props.modalEmits,
   setup(props2, { emit }) {
     const state = { isInit: true };
-    const layoutProvide = receiver.useLayoutState();
+    const layoutState = util.useLayoutState();
+    const isResponsive = util.useResponsive(props2);
     const dialogRef = vue.ref(null);
     const isFullscreen = vue.ref(props2.fullscreen ?? false);
     const isActivated = vue.ref(true);
     const dialogClass = vue.computed(() => {
-      const classes = [util.wrapperClass];
-      if (props2.responsive ?? layoutProvide.responsive ?? true) {
+      const classes = [util$1.wrapperClass];
+      if (props2.responsive ?? isResponsive.value ?? true) {
         classes.push("ele-modal-responsive");
       }
       if (props2.alignCenter || props2.position === "center") {
@@ -63,7 +64,7 @@ const _sfc_main = vue.defineComponent({
         classes.push("ele-modal-fullscreen");
       }
       if (!props2.modelValue) {
-        classes.push(util.closedClass);
+        classes.push(util$1.closedClass);
       }
       if (!isActivated.value && props2.modelValue) {
         classes.push("ele-modal-hide");
@@ -77,11 +78,11 @@ const _sfc_main = vue.defineComponent({
       return classes.join(" ");
     });
     const teleportTo = vue.computed(() => {
-      return util.getModalContainer(
+      return util$1.getModalContainer(
         props2.inner,
         props2.multiple,
         props2.appendTo,
-        layoutProvide.modalsEl
+        layoutState.modalsEl
       );
     });
     const teleportDisabled = vue.computed(() => {
@@ -109,7 +110,7 @@ const _sfc_main = vue.defineComponent({
       if (state.isInit) {
         state.isInit = false;
         const modalEl = getModalEl();
-        const margin = util.getPositionMargin(getPosition());
+        const margin = util$1.getPositionMargin(getPosition());
         if (modalEl && margin != null) {
           modalEl.style.margin = margin;
         }
@@ -117,7 +118,7 @@ const _sfc_main = vue.defineComponent({
     };
     const mousedownListener = (event) => {
       if (props2.multiple) {
-        util.topModal(event.currentTarget, getZIndex());
+        util$1.topModal(event.currentTarget, getZIndex());
       }
     };
     const handleHeaderMousedown = (event) => {
@@ -125,14 +126,14 @@ const _sfc_main = vue.defineComponent({
       if (!modalEl || !props2.draggable || isFullscreen.value) {
         return;
       }
-      util.handleMove(modalEl, event, props2);
+      util$1.handleMove(modalEl, event, props2);
     };
     const handleResizeMousedown = (event) => {
       const modalEl = getModalEl();
       if (!modalEl || !props2.resizable || isFullscreen.value) {
         return;
       }
-      util.handleResize(modalEl, event, props2);
+      util$1.handleResize(modalEl, event, props2);
     };
     const updateModelValue = (modelValue) => {
       emit("update:modelValue", modelValue);
@@ -140,7 +141,7 @@ const _sfc_main = vue.defineComponent({
     const toggleFullscreen = (fullscreen) => {
       isFullscreen.value = fullscreen ?? !isFullscreen.value;
       vue.nextTick(() => {
-        util.topModal(getModalEl(), getZIndex());
+        util$1.topModal(getModalEl(), getZIndex());
       });
       emit("update:fullscreen", isFullscreen.value);
     };
@@ -151,11 +152,11 @@ const _sfc_main = vue.defineComponent({
       vue.nextTick(() => {
         const modalEl = getModalEl();
         if (props2.resetOnClose) {
-          util.resetModalStyle(modalEl, props2.width, getPosition());
+          util$1.resetModalStyle(modalEl, props2.width, getPosition());
         } else {
           setInitPosition();
         }
-        util.topModal(modalEl, getZIndex());
+        util$1.topModal(modalEl, getZIndex());
       });
       emit("open");
     };
@@ -288,7 +289,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ], 4),
           _ctx.maxable ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
-            class: "ele-modal-tool",
+            class: "ele-modal-tool ele-modal-tool-max",
             style: vue.normalizeStyle(_ctx.fullscreenBtnStyle),
             onClick: _cache[0] || (_cache[0] = ($event) => _ctx.toggleFullscreen()),
             onMousedown: _cache[1] || (_cache[1] = vue.withModifiers(() => {

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

@@ -37,10 +37,9 @@ declare const _default: import('vue').DefineComponent<{
     resizeIconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     responsive: {
         type: BooleanConstructor;
-        /** 弹窗类名 */
         default: null;
     };
-    form: BooleanConstructor;
+    form: BooleanConstructor; /** 弹窗类名 */
     appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
@@ -151,10 +150,9 @@ declare const _default: import('vue').DefineComponent<{
     resizeIconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     responsive: {
         type: BooleanConstructor;
-        /** 弹窗类名 */
         default: null;
     };
-    form: BooleanConstructor;
+    form: BooleanConstructor; /** 弹窗类名 */
     appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
@@ -206,10 +204,10 @@ declare const _default: import('vue').DefineComponent<{
     ariaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
 }>> & {
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
-    onOpen?: (() => any) | undefined;
-    onClose?: (() => any) | undefined;
     onOpenAutoFocus?: (() => any) | undefined;
     onCloseAutoFocus?: (() => any) | undefined;
+    onClose?: (() => any) | undefined;
+    onOpen?: (() => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
     "onUpdate:fullscreen"?: ((_fullscreen: boolean) => any) | undefined;
@@ -218,8 +216,9 @@ declare const _default: import('vue').DefineComponent<{
     title: string;
     center: boolean;
     modelValue: boolean;
-    appendTo: string;
+    multiple: boolean;
     appendToBody: boolean;
+    appendTo: string;
     destroyOnClose: boolean;
     closeOnClickModal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     closeOnPressEscape: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -236,7 +235,6 @@ declare const _default: import('vue').DefineComponent<{
     showClose: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     ariaLevel: string;
     minWidth: number;
-    multiple: boolean;
     minHeight: number;
     responsive: boolean;
     resetOnClose: boolean;

package/lib/ele-modal/style/index.cjs

@@ -1,4 +1,4 @@
 "use strict";
-require("element-plus/lib/components/dialog/style/index");
-require("element-plus/lib/components/icon/style/index");
+require("element-plus/es/components/dialog/style/index");
+require("element-plus/es/components/icon/style/index");
 require("./index.scss");

package/lib/ele-modal/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-modal/style/index.scss

@@ -71,7 +71,7 @@
   color: eleVar('modal', 'icon-color');
   font-size: eleVar('modal', 'icon-font-size');
   border-radius: eleVar('modal', 'icon-radius');
-  transition: (color $ele-transition, background-color $ele-transition);
+  transition: (color $transition-base, background-color $transition-base);
   box-sizing: border-box;
   cursor: pointer;
 
@@ -210,7 +210,9 @@
   width: 100%;
   height: 100%;
   pointer-events: none;
+  box-sizing: border-box;
   z-index: elVar('index', 'popper');
+  overflow: hidden;
 }
 
 .ele-modal-multiple {

package/lib/ele-modal/util.cjs

@@ -23,9 +23,7 @@ function canMoveOut(moveOut, direction) {
 function getModalContainer(inner, multiple, appendTo, modalsEl) {
   if (multiple) {
     const parent = (inner ? modalsEl : void 0) || document.body;
-    const wrapper = Array.from(parent.children).find(
-      (el) => el.classList.contains(containerClass)
-    );
+    const wrapper = core.queryChild(parent, containerClass);
     if (wrapper) {
       return wrapper;
     }

package/lib/ele-modal/util.d.ts

@@ -11,7 +11,7 @@ export declare const closedClass = "ele-modal-closed";
  * @param appendTo 自定义插入的容器
  * @param modalsEl 限制在主体内部时的容器
  */
-export declare function getModalContainer(inner?: boolean, multiple?: boolean, appendTo?: string, modalsEl?: HTMLElement | null): Element | string;
+export declare function getModalContainer(inner?: boolean, multiple?: boolean, appendTo?: string, modalsEl?: HTMLElement | null): HTMLElement | string;
 /**
  * 弹窗移动事件处理
  * @param modalEl 弹窗节点

package/lib/ele-page/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-page/style/index.scss

@@ -58,16 +58,17 @@
 }
 
 /* 内容定宽 */
-.ele-admin-limited .ele-page:not(.is-plain) {
-  margin: 0 auto;
-  width: eleVar('page', 'max-width');
-  max-width: 100%;
+.ele-admin-limited > .ele-admin-main > .ele-admin-body > .ele-admin-wrapper {
+  & > .ele-admin-content > .ele-page:not(.is-plain) {
+    margin: 0 auto;
+    width: eleVar('page', 'max-width');
+    max-width: 100%;
+  }
 }
 
 /* 按钮风格页签 */
-.ele-admin-tab-card.ele-admin-open-tab .ele-admin-content {
-  & > .ele-page:first-child,
-  & > .ele-admin-iframe-wrap + .ele-page {
+.ele-admin-tabs.is-button + .ele-admin-wrapper > .ele-admin-content {
+  & > .ele-page:first-child {
     padding-top: 0;
   }
 }

package/lib/ele-pagination/index.cjs

@@ -19,13 +19,29 @@ const _sfc_main = vue.defineComponent({
       const num = props2.total == null ? void 0 : Number(props2.total);
       return num == null || isNaN(num) ? void 0 : num;
     });
+    const sizesPopperClass = vue.computed(() => {
+      const classes = ["ele-pagination-popper"];
+      if (props2.isFixedPopper) {
+        classes.push("is-fixed");
+      }
+      if (props2.popperClass) {
+        classes.push(props2.popperClass);
+      }
+      return classes.join(" ");
+    });
     const onUpdateCurrentPage = (currentPage) => {
       emit("update:currentPage", currentPage);
     };
     const onUpdatePageSize = (pageSize) => {
       emit("update:pageSize", pageSize);
     };
-    return { isInfinite, pageTotal, onUpdateCurrentPage, onUpdatePageSize };
+    return {
+      isInfinite,
+      pageTotal,
+      sizesPopperClass,
+      onUpdateCurrentPage,
+      onUpdatePageSize
+    };
   }
 });
 const _export_sfc = (sfc, props2) => {
@@ -49,7 +65,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     defaultCurrentPage: _ctx.defaultCurrentPage,
     layout: _ctx.layout,
     pageSizes: _ctx.pageSizes,
-    popperClass: _ctx.popperClass,
+    popperClass: _ctx.sizesPopperClass,
     prevText: _ctx.prevText,
     prevIcon: _ctx.prevIcon,
     nextText: _ctx.nextText,

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

@@ -8,6 +8,10 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<import('./types').PaginationType>;
         default: string;
     };
+    isFixedPopper: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageSize: NumberConstructor;
     defaultPageSize: NumberConstructor;
     pageCount: NumberConstructor;
@@ -29,6 +33,7 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     isInfinite: import('vue').ComputedRef<boolean>;
     pageTotal: import('vue').ComputedRef<number | undefined>;
+    sizesPopperClass: import('vue').ComputedRef<string>;
     onUpdateCurrentPage: (currentPage: number) => void;
     onUpdatePageSize: (pageSize: number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
@@ -44,6 +49,10 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<import('./types').PaginationType>;
         default: string;
     };
+    isFixedPopper: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageSize: NumberConstructor;
     defaultPageSize: NumberConstructor;
     pageCount: NumberConstructor;
@@ -68,6 +77,7 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     type: import('./types').PaginationType;
     hasNext: boolean;
+    isFixedPopper: boolean;
     pagerCount: number;
     layout: string;
     pageSizes: number[];

package/lib/ele-pagination/props.cjs

@@ -14,6 +14,11 @@ const paginationProps = {
   type: {
     type: String,
     default: "circle"
+  },
+  /** 每页数量选择下拉是否使用固定定位 */
+  isFixedPopper: {
+    type: Boolean,
+    default: true
   }
 };
 const paginationEmits = {

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

@@ -17,6 +17,11 @@ export declare const paginationProps: {
         type: PropType<PaginationType>;
         default: string;
     };
+    /** 每页数量选择下拉是否使用固定定位 */
+    isFixedPopper: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageSize: NumberConstructor;
     defaultPageSize: NumberConstructor;
     pageCount: NumberConstructor;

package/lib/ele-pagination/style/index.cjs

@@ -1,3 +1,3 @@
 "use strict";
-require("element-plus/lib/components/pagination/style/index");
+require("element-plus/es/components/pagination/style/index");
 require("./index.scss");

package/lib/ele-pagination/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-pagination/style/index.scss

@@ -34,7 +34,7 @@
       font-size: eleVar('pagination', 'font-size');
       background: eleVar('pagination', 'bg');
       border: eleVar('pagination', 'border');
-      transition: (color $ele-transition, background-color $ele-transition);
+      transition: (color $transition-base, background-color $transition-base);
 
       &:hover {
         color: eleVar('pagination', 'hover-color');
@@ -209,3 +209,10 @@
     }
   }
 }
+
+/* 每页数量选择下拉框 */
+.ele-pagination-popper.el-popper {
+  &.is-fixed {
+    position: fixed !important;
+  }
+}