ele-admin-plus 1.1.4-beta.1 → 1.1.4-beta.2

package/es/ele-app/style/overwrite.scss

@@ -385,6 +385,11 @@
 
 body .el-overlay.is-message-box > .el-overlay-message-box {
   overflow-x: hidden;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }
 
 /* Radio */

package/es/ele-count-up/index.d.ts

@@ -17,7 +17,7 @@ declare const _default: import("vue").DefineComponent<{
     reset: () => void;
     update: (newEndVal?: string | number) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    ready: (_instance?: CountUp | undefined) => boolean;
+    ready: (_instance?: CountUp | null | undefined) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     delay: {
         type: NumberConstructor;
@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     options: import("vue").PropType<import("countup.js").CountUpOptions>;
 }>> & {
-    onReady?: ((_instance?: CountUp | undefined) => any) | undefined;
+    onReady?: ((_instance?: CountUp | null | undefined) => any) | undefined;
 }, {
     delay: number;
 }, {}>;

package/es/ele-count-up/index.js

@@ -47,7 +47,8 @@ const _sfc_main = defineComponent({
       }
     };
     const destroy = () => {
-      instance = void 0;
+      reset();
+      instance = null;
     };
     watch(
       () => props.endVal,

package/es/ele-count-up/props.d.ts

@@ -19,5 +19,5 @@ export type CountUpProps = ExtractPropTypes<typeof countUpProps>;
  * 事件
  */
 export declare const countUpEmits: {
-    ready: (_instance?: CountUp) => boolean;
+    ready: (_instance?: CountUp | null) => boolean;
 };

package/es/ele-modal/types/index.d.ts

@@ -25,3 +25,12 @@ export type PositionValue = 'top' | 'bottom' | 'left' | 'right' | 'leftTop' | 'l
  * 初始位置类型
  */
 export type Position = PositionValue | PositionObject;
+/**
+ * 弹窗坐标
+ */
+export interface Location {
+    top?: number;
+    left?: number;
+    topValue?: string;
+    leftValue?: string;
+}

package/es/ele-modal/util.js

@@ -20,6 +20,8 @@ const singleSidebarClass = "ele-state-single-sidebar";
 const topLayoutClass = "ele-state-top-layout";
 const expandedClass = "ele-state-expanded";
 const mobileClass = "ele-state-mobile";
+const fixTop = 0.65;
+const fixLeft = 0.65;
 function initModalStyle(modalEl, resizable) {
   modalEl.style.top = modalEl.offsetTop + "px";
   modalEl.style.left = modalEl.offsetLeft + "px";
@@ -102,8 +104,8 @@ function handleMovable(event, props) {
       left: e.clientX - downX + downOL,
       top: e.clientY - downY + downOT
     };
-    const limitL = wrapEl.clientWidth - modalEl.clientWidth - 0.65;
-    const limitT = wrapEl.clientHeight - modalEl.clientHeight - 0.45;
+    const limitL = wrapEl.clientWidth - modalEl.clientWidth - fixLeft;
+    const limitT = wrapEl.clientHeight - modalEl.clientHeight - fixTop;
     if (!props.moveOut) {
       if (position.left < 0) {
         position.left = 0;
@@ -138,8 +140,8 @@ function handleMovable(event, props) {
         position.top = minLimitT;
       }
     }
-    modalEl.style.left = `${position.left}px`;
-    modalEl.style.top = `${position.top}px`;
+    modalEl.style.left = `${Math.floor(position.left)}px`;
+    modalEl.style.top = `${Math.floor(position.top)}px`;
   };
   const mouseupFn = function() {
     modalEl.style.userSelect = "";
@@ -182,7 +184,7 @@ function handleResizable(event, props) {
   const mousemoveFn = function(e) {
     if (props.resizable !== "vertical") {
       const w = e.clientX - downX + downW;
-      const maxW = wrapEl.clientWidth - modalEl.offsetLeft - 1;
+      const maxW = wrapEl.clientWidth - modalEl.offsetLeft - fixLeft;
       const nw = (w < props.minWidth ? props.minWidth : !canMoveOut(props.moveOut, "right") && w > maxW ? maxW : w) + "px";
       modalEl.style.width = nw;
       modalEl.style.maxWidth = nw;
@@ -190,7 +192,7 @@ function handleResizable(event, props) {
     }
     if (props.resizable !== "horizontal") {
       const h = e.clientY - downY + downH;
-      const maxH = wrapEl.clientHeight - modalEl.offsetTop - 1;
+      const maxH = wrapEl.clientHeight - modalEl.offsetTop - fixTop;
       const nh = (h < props.minHeight ? props.minHeight : !canMoveOut(props.moveOut, "bottom") && h > maxH ? maxH : h) + "px";
       modalEl.style.height = nh;
       modalEl.style.maxHeight = nh;
@@ -248,60 +250,71 @@ function setModalPosition(modalEl, resizable, position, moveOut) {
   if (!wrapEl) {
     return;
   }
+  const location = {};
   initModalStyle(modalEl, resizable);
   const canOutB = canMoveOut(moveOut, "bottom");
   const canOutR = canMoveOut(moveOut, "right");
-  const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : 2);
+  const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : fixTop);
   const maxTop = t < 0 ? 0 : t;
-  const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : 1);
+  const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : fixLeft);
   const maxLeft = l < 0 ? 0 : l;
   if (position === "top") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = 0;
+    location.left = maxLeft / 2;
   } else if (position === "bottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = maxTop;
+    location.left = maxLeft / 2;
   } else if (position === "left") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = "0px";
+    location.top = maxTop / 2;
+    location.left = 0;
   } else if (position === "right") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = maxTop / 2;
+    location.left = maxLeft;
   } else if (position === "leftTop") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = "0px";
+    location.top = 0;
+    location.left = 0;
   } else if (position === "leftBottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = "0px";
+    location.top = maxTop;
+    location.left = 0;
   } else if (position === "rightTop") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = 0;
+    location.left = maxLeft;
   } else if (position === "rightBottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = maxTop;
+    location.left = maxLeft;
   } else if (position === "center") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = maxTop / 2;
+    location.left = maxLeft / 2;
   } else if (typeof position === "object") {
     if (position.top != null) {
       if (typeof position.top === "number") {
-        modalEl.style.top = `${position.top}px`;
+        location.top = position.top;
       } else {
-        modalEl.style.top = position.top;
+        location.topValue = position.top;
       }
     } else if (position.left != null) {
-      modalEl.style.top = `${maxTop / 2}px`;
+      location.top = maxTop / 2;
     }
     if (position.left != null) {
       if (typeof position.left === "number") {
-        modalEl.style.left = `${position.left}px`;
+        location.left = position.left;
       } else {
-        modalEl.style.left = position.left;
+        location.leftValue = position.left;
       }
     } else if (position.top != null) {
-      modalEl.style.left = `${maxLeft / 2}px`;
+      location.left = maxLeft / 2;
     }
   }
+  if (location.top != null) {
+    modalEl.style.top = `${Math.floor(location.top)}px`;
+  } else if (location.topValue != null) {
+    modalEl.style.top = location.topValue;
+  }
+  if (location.left != null) {
+    modalEl.style.left = `${Math.floor(location.left)}px`;
+  } else if (location.leftValue != null) {
+    modalEl.style.left = location.leftValue;
+  }
 }
 function setInitPosition(modalEl, resizable, position, moveOut, force) {
   const attr = "ele-position";

package/es/ele-printer/index.d.ts

@@ -12,6 +12,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     container: import("vue").ShallowRef<Element>;
     visible: import("vue").Ref<boolean>;
+    isStatic: import("vue").ComputedRef<boolean>;
     print: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value: boolean) => boolean;

package/es/ele-printer/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, shallowRef, ref, watch, nextTick, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
+import { defineComponent, shallowRef, ref, computed, watch, nextTick, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
 import { useLicense } from "../ele-config-provider/receiver";
 import { usePrinter, getPrintContainer, doPrintOnFrame, doPrint } from "./util";
 import { printerProps, printerEmits } from "./props";
@@ -14,6 +14,9 @@ const _sfc_main = defineComponent({
     });
     const container = shallowRef(getPrintContainer());
     const visible = ref(false);
+    const isStatic = computed(() => {
+      return props.static;
+    });
     const print = () => {
       if (!authenticated.value) {
         updateModelValue(false);
@@ -54,7 +57,7 @@ const _sfc_main = defineComponent({
       },
       { immediate: true }
     );
-    return { container, visible, print };
+    return { container, visible, isStatic, print };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -69,10 +72,14 @@ const _hoisted_2 = { key: 1 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(Teleport, {
     to: _ctx.container,
-    disabled: _ctx.static && !_ctx.visible
+    disabled: _ctx.isStatic && !_ctx.visible
   }, [
     createElementVNode("table", {
-      class: normalizeClass(["ele-printer", { "is-open": _ctx.visible }, { "is-static": _ctx.static }])
+      class: normalizeClass([
+        "ele-printer",
+        { "is-open": _ctx.visible },
+        { "is-static": _ctx.isStatic }
+      ])
     }, [
       _ctx.$slots.header ? (openBlock(), createElementBlock("thead", _hoisted_1, [
         createElementVNode("tr", null, [

package/es/ele-pro-layout/index.js

@@ -636,11 +636,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       })
     ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "onLogoClick", "onOpen", "onClsoe", "onItemClick"]),
     createVNode(_component_EleWatermark, {
-      fixed: true,
+      class: "ele-admin-main",
       height: 68,
-      content: _ctx.watermark,
       disabled: _ctx.authenticated,
-      class: "ele-admin-main"
+      fixed: true,
+      content: _ctx.watermark
     }, {
       default: withCtx(() => [
         _ctx.sidebox ? (openBlock(), createBlock(_component_ProSidebox, {
@@ -733,7 +733,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ]),
       _: 3
-    }, 8, ["content", "disabled"]),
+    }, 8, ["disabled", "content"]),
     createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))

package/es/ele-pro-layout/style/layout-mobile.scss

@@ -8,6 +8,7 @@
     position: fixed !important;
     left: 0 !important;
     width: eleVar('sidebar', 'width') !important;
+    height: calc(100vh - #{eleVar('header', 'height')}) !important;
     z-index: calc(eleVar('layout', 'mask-index') + 1) !important;
   }
 

package/es/ele-tabs/index.js

@@ -105,6 +105,7 @@ const _sfc_main = defineComponent({
     };
     const unbindDragSort = () => {
       current.sortIns && current.sortIns.destroy();
+      current.sortIns = null;
     };
     const onContextmenu = (e) => {
       const el = e.target;

package/es/ele-xg-player/index.js

@@ -27,6 +27,7 @@ const _sfc_main = defineComponent({
     const destroy = () => {
       if (player && typeof player.destroy === "function") {
         player.destroy();
+        player = null;
       }
     };
     onMounted(() => {

package/lib/ele-app/style/overwrite.scss

@@ -385,6 +385,11 @@
 
 body .el-overlay.is-message-box > .el-overlay-message-box {
   overflow-x: hidden;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }
 
 /* Radio */

package/lib/ele-count-up/index.d.ts

@@ -17,7 +17,7 @@ declare const _default: import("vue").DefineComponent<{
     reset: () => void;
     update: (newEndVal?: string | number) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    ready: (_instance?: CountUp | undefined) => boolean;
+    ready: (_instance?: CountUp | null | undefined) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     delay: {
         type: NumberConstructor;
@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     options: import("vue").PropType<import("countup.js").CountUpOptions>;
 }>> & {
-    onReady?: ((_instance?: CountUp | undefined) => any) | undefined;
+    onReady?: ((_instance?: CountUp | null | undefined) => any) | undefined;
 }, {
     delay: number;
 }, {}>;

package/lib/ele-count-up/index.js

@@ -48,7 +48,8 @@ const _sfc_main = vue.defineComponent({
       }
     };
     const destroy = () => {
-      instance = void 0;
+      reset();
+      instance = null;
     };
     vue.watch(
       () => props2.endVal,

package/lib/ele-count-up/props.d.ts

@@ -19,5 +19,5 @@ export type CountUpProps = ExtractPropTypes<typeof countUpProps>;
  * 事件
  */
 export declare const countUpEmits: {
-    ready: (_instance?: CountUp) => boolean;
+    ready: (_instance?: CountUp | null) => boolean;
 };

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

@@ -25,3 +25,12 @@ export type PositionValue = 'top' | 'bottom' | 'left' | 'right' | 'leftTop' | 'l
  * 初始位置类型
  */
 export type Position = PositionValue | PositionObject;
+/**
+ * 弹窗坐标
+ */
+export interface Location {
+    top?: number;
+    left?: number;
+    topValue?: string;
+    leftValue?: string;
+}

package/lib/ele-modal/util.js

@@ -22,6 +22,8 @@ const singleSidebarClass = "ele-state-single-sidebar";
 const topLayoutClass = "ele-state-top-layout";
 const expandedClass = "ele-state-expanded";
 const mobileClass = "ele-state-mobile";
+const fixTop = 0.65;
+const fixLeft = 0.65;
 function initModalStyle(modalEl, resizable) {
   modalEl.style.top = modalEl.offsetTop + "px";
   modalEl.style.left = modalEl.offsetLeft + "px";
@@ -104,8 +106,8 @@ function handleMovable(event, props) {
       left: e.clientX - downX + downOL,
       top: e.clientY - downY + downOT
     };
-    const limitL = wrapEl.clientWidth - modalEl.clientWidth - 0.65;
-    const limitT = wrapEl.clientHeight - modalEl.clientHeight - 0.45;
+    const limitL = wrapEl.clientWidth - modalEl.clientWidth - fixLeft;
+    const limitT = wrapEl.clientHeight - modalEl.clientHeight - fixTop;
     if (!props.moveOut) {
       if (position.left < 0) {
         position.left = 0;
@@ -140,8 +142,8 @@ function handleMovable(event, props) {
         position.top = minLimitT;
       }
     }
-    modalEl.style.left = `${position.left}px`;
-    modalEl.style.top = `${position.top}px`;
+    modalEl.style.left = `${Math.floor(position.left)}px`;
+    modalEl.style.top = `${Math.floor(position.top)}px`;
   };
   const mouseupFn = function() {
     modalEl.style.userSelect = "";
@@ -184,7 +186,7 @@ function handleResizable(event, props) {
   const mousemoveFn = function(e) {
     if (props.resizable !== "vertical") {
       const w = e.clientX - downX + downW;
-      const maxW = wrapEl.clientWidth - modalEl.offsetLeft - 1;
+      const maxW = wrapEl.clientWidth - modalEl.offsetLeft - fixLeft;
       const nw = (w < props.minWidth ? props.minWidth : !canMoveOut(props.moveOut, "right") && w > maxW ? maxW : w) + "px";
       modalEl.style.width = nw;
       modalEl.style.maxWidth = nw;
@@ -192,7 +194,7 @@ function handleResizable(event, props) {
     }
     if (props.resizable !== "horizontal") {
       const h = e.clientY - downY + downH;
-      const maxH = wrapEl.clientHeight - modalEl.offsetTop - 1;
+      const maxH = wrapEl.clientHeight - modalEl.offsetTop - fixTop;
       const nh = (h < props.minHeight ? props.minHeight : !canMoveOut(props.moveOut, "bottom") && h > maxH ? maxH : h) + "px";
       modalEl.style.height = nh;
       modalEl.style.maxHeight = nh;
@@ -250,60 +252,71 @@ function setModalPosition(modalEl, resizable, position, moveOut) {
   if (!wrapEl) {
     return;
   }
+  const location = {};
   initModalStyle(modalEl, resizable);
   const canOutB = canMoveOut(moveOut, "bottom");
   const canOutR = canMoveOut(moveOut, "right");
-  const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : 2);
+  const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : fixTop);
   const maxTop = t < 0 ? 0 : t;
-  const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : 1);
+  const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : fixLeft);
   const maxLeft = l < 0 ? 0 : l;
   if (position === "top") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = 0;
+    location.left = maxLeft / 2;
   } else if (position === "bottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = maxTop;
+    location.left = maxLeft / 2;
   } else if (position === "left") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = "0px";
+    location.top = maxTop / 2;
+    location.left = 0;
   } else if (position === "right") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = maxTop / 2;
+    location.left = maxLeft;
   } else if (position === "leftTop") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = "0px";
+    location.top = 0;
+    location.left = 0;
   } else if (position === "leftBottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = "0px";
+    location.top = maxTop;
+    location.left = 0;
   } else if (position === "rightTop") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = 0;
+    location.left = maxLeft;
   } else if (position === "rightBottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = maxTop;
+    location.left = maxLeft;
   } else if (position === "center") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = maxTop / 2;
+    location.left = maxLeft / 2;
   } else if (typeof position === "object") {
     if (position.top != null) {
       if (typeof position.top === "number") {
-        modalEl.style.top = `${position.top}px`;
+        location.top = position.top;
       } else {
-        modalEl.style.top = position.top;
+        location.topValue = position.top;
       }
     } else if (position.left != null) {
-      modalEl.style.top = `${maxTop / 2}px`;
+      location.top = maxTop / 2;
     }
     if (position.left != null) {
       if (typeof position.left === "number") {
-        modalEl.style.left = `${position.left}px`;
+        location.left = position.left;
       } else {
-        modalEl.style.left = position.left;
+        location.leftValue = position.left;
       }
     } else if (position.top != null) {
-      modalEl.style.left = `${maxLeft / 2}px`;
+      location.left = maxLeft / 2;
     }
   }
+  if (location.top != null) {
+    modalEl.style.top = `${Math.floor(location.top)}px`;
+  } else if (location.topValue != null) {
+    modalEl.style.top = location.topValue;
+  }
+  if (location.left != null) {
+    modalEl.style.left = `${Math.floor(location.left)}px`;
+  } else if (location.leftValue != null) {
+    modalEl.style.left = location.leftValue;
+  }
 }
 function setInitPosition(modalEl, resizable, position, moveOut, force) {
   const attr = "ele-position";

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

@@ -12,6 +12,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     container: import("vue").ShallowRef<Element>;
     visible: import("vue").Ref<boolean>;
+    isStatic: import("vue").ComputedRef<boolean>;
     print: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value: boolean) => boolean;

package/lib/ele-printer/index.js

@@ -15,6 +15,9 @@ const _sfc_main = vue.defineComponent({
     });
     const container = vue.shallowRef(util.getPrintContainer());
     const visible = vue.ref(false);
+    const isStatic = vue.computed(() => {
+      return props2.static;
+    });
     const print = () => {
       if (!authenticated.value) {
         updateModelValue(false);
@@ -55,7 +58,7 @@ const _sfc_main = vue.defineComponent({
       },
       { immediate: true }
     );
-    return { container, visible, print };
+    return { container, visible, isStatic, print };
   }
 });
 const _export_sfc = (sfc, props2) => {
@@ -70,10 +73,14 @@ const _hoisted_2 = { key: 1 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(vue.Teleport, {
     to: _ctx.container,
-    disabled: _ctx.static && !_ctx.visible
+    disabled: _ctx.isStatic && !_ctx.visible
   }, [
     vue.createElementVNode("table", {
-      class: vue.normalizeClass(["ele-printer", { "is-open": _ctx.visible }, { "is-static": _ctx.static }])
+      class: vue.normalizeClass([
+        "ele-printer",
+        { "is-open": _ctx.visible },
+        { "is-static": _ctx.isStatic }
+      ])
     }, [
       _ctx.$slots.header ? (vue.openBlock(), vue.createElementBlock("thead", _hoisted_1, [
         vue.createElementVNode("tr", null, [

package/lib/ele-pro-layout/index.js

@@ -637,11 +637,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       })
     ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "onLogoClick", "onOpen", "onClsoe", "onItemClick"]),
     vue.createVNode(_component_EleWatermark, {
-      fixed: true,
+      class: "ele-admin-main",
       height: 68,
-      content: _ctx.watermark,
       disabled: _ctx.authenticated,
-      class: "ele-admin-main"
+      fixed: true,
+      content: _ctx.watermark
     }, {
       default: vue.withCtx(() => [
         _ctx.sidebox ? (vue.openBlock(), vue.createBlock(_component_ProSidebox, {
@@ -734,7 +734,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ]),
       _: 3
-    }, 8, ["content", "disabled"]),
+    }, 8, ["disabled", "content"]),
     vue.createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))

package/lib/ele-pro-layout/style/layout-mobile.scss

@@ -8,6 +8,7 @@
     position: fixed !important;
     left: 0 !important;
     width: eleVar('sidebar', 'width') !important;
+    height: calc(100vh - #{eleVar('header', 'height')}) !important;
     z-index: calc(eleVar('layout', 'mask-index') + 1) !important;
   }
 

package/lib/ele-tabs/index.js

@@ -106,6 +106,7 @@ const _sfc_main = vue.defineComponent({
     };
     const unbindDragSort = () => {
       current.sortIns && current.sortIns.destroy();
+      current.sortIns = null;
     };
     const onContextmenu = (e) => {
       const el = e.target;

package/lib/ele-xg-player/index.js

@@ -28,6 +28,7 @@ const _sfc_main = vue.defineComponent({
     const destroy = () => {
       if (player && typeof player.destroy === "function") {
         player.destroy();
+        player = null;
       }
     };
     vue.onMounted(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.4-beta.1",
+  "version": "1.1.4-beta.2",
   "description": "EleAdminPlus Library",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -14,11 +14,10 @@
     "dev": "vite --host --config vite.global.ts",
     "dev:needed": "vite --host",
     "build": "esno scripts/build.ts",
+    "ts2js": "esno scripts/ts2js.ts",
     "lint:eslint": "eslint --cache --max-warnings 0  \"{src,components}/**/*.{vue,ts}\" --fix",
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite/",
-    "clean:lib": "rimraf node_modules",
-    "publish:beta": "npm publish --tag beta",
-    "publish": "npm publish"
+    "clean:lib": "rimraf node_modules"
   },
   "keywords": [],
   "author": "eclouds@foxmail.com",
@@ -32,6 +31,7 @@
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ant-design/colors": "^7.0.0",
+    "@babel/types": "^7.22.11",
     "@bytemd/plugin-gfm": "^1.21.0",
     "@bytemd/plugin-highlight": "^1.21.0",
     "@element-plus/icons-vue": "^2.1.0",

package/typings/global.d.ts

@@ -1,58 +1,58 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 declare module 'vue' {
   export interface GlobalComponents {
-    EleAlert: typeof import('ele-admin-plus')['EleAlert'];
-    EleApp: typeof import('ele-admin-plus')['EleApp'];
-    EleAvatarGroup: typeof import('ele-admin-plus')['EleAvatarGroup'];
-    EleBarCode: typeof import('ele-admin-plus')['EleBarCode'];
-    EleBasicSelect: typeof import('ele-admin-plus')['EleBasicSelect'];
-    EleBottomBar: typeof import('ele-admin-plus')['EleBottomBar'];
-    EleBreadcrumb: typeof import('ele-admin-plus')['EleBreadcrumb'];
-    EleCard: typeof import('ele-admin-plus')['EleCard'];
-    EleCheckCard: typeof import('ele-admin-plus')['EleCheckCard'];
-    EleConfigProvider: typeof import('ele-admin-plus')['EleConfigProvider'];
-    EleCopyable: typeof import('ele-admin-plus')['EleCopyable'];
-    EleCountUp: typeof import('ele-admin-plus')['EleCountUp'];
-    EleCropper: typeof import('ele-admin-plus')['EleCropper'];
-    EleCropperModal: typeof import('ele-admin-plus')['EleCropperModal'];
-    EleDashboard: typeof import('ele-admin-plus')['EleDashboard'];
-    EleDot: typeof import('ele-admin-plus')['EleDot'];
-    EleDrawer: typeof import('ele-admin-plus')['EleDrawer'];
-    EleDropdown: typeof import('ele-admin-plus')['EleDropdown'];
-    EleEditTag: typeof import('ele-admin-plus')['EleEditTag'];
-    EleEllipsis: typeof import('ele-admin-plus')['EleEllipsis'];
-    EleFileList: typeof import('ele-admin-plus')['EleFileList'];
-    EleFileListTool: typeof import('ele-admin-plus')['EleFileListTool'];
-    EleIconSelect: typeof import('ele-admin-plus')['EleIconSelect'];
-    EleLoading: typeof import('ele-admin-plus')['EleLoading'];
-    EleMapPicker: typeof import('ele-admin-plus')['EleMapPicker'];
-    EleMenus: typeof import('ele-admin-plus')['EleMenus'];
-    EleModal: typeof import('ele-admin-plus')['EleModal'];
-    ElePage: typeof import('ele-admin-plus')['ElePage'];
-    ElePagination: typeof import('ele-admin-plus')['ElePagination'];
-    ElePopconfirm: typeof import('ele-admin-plus')['ElePopconfirm'];
-    ElePopover: typeof import('ele-admin-plus')['ElePopover'];
-    ElePrinter: typeof import('ele-admin-plus')['ElePrinter'];
-    EleProLayout: typeof import('ele-admin-plus')['EleProLayout'];
-    EleProTable: typeof import('ele-admin-plus')['EleProTable'];
-    EleQrCode: typeof import('ele-admin-plus')['EleQrCode'];
-    EleQrCodeSvg: typeof import('ele-admin-plus')['EleQrCodeSvg'];
-    EleSegmented: typeof import('ele-admin-plus')['EleSegmented'];
-    EleSplitPanel: typeof import('ele-admin-plus')['EleSplitPanel'];
-    EleSteps: typeof import('ele-admin-plus')['EleSteps'];
-    EleTabTool: typeof import('ele-admin-plus')['EleTabTool'];
-    EleTabWrap: typeof import('ele-admin-plus')['EleTabWrap'];
-    EleTable: typeof import('ele-admin-plus')['EleTable'];
-    EleTableSelect: typeof import('ele-admin-plus')['EleTableSelect'];
-    EleTabs: typeof import('ele-admin-plus')['EleTabs'];
-    EleText: typeof import('ele-admin-plus')['EleText'];
-    EleTool: typeof import('ele-admin-plus')['EleTool'];
-    EleToolbar: typeof import('ele-admin-plus')['EleToolbar'];
-    EleTooltip: typeof import('ele-admin-plus')['EleTooltip'];
-    EleTour: typeof import('ele-admin-plus')['EleTour'];
-    EleUploadList: typeof import('ele-admin-plus')['EleUploadList'];
-    EleWatermark: typeof import('ele-admin-plus')['EleWatermark'];
-    EleXgPlayer: typeof import('ele-admin-plus')['EleXgPlayer'];
+    EleAlert: (typeof import('ele-admin-plus'))['EleAlert'];
+    EleApp: (typeof import('ele-admin-plus'))['EleApp'];
+    EleAvatarGroup: (typeof import('ele-admin-plus'))['EleAvatarGroup'];
+    EleBarCode: (typeof import('ele-admin-plus'))['EleBarCode'];
+    EleBasicSelect: (typeof import('ele-admin-plus'))['EleBasicSelect'];
+    EleBottomBar: (typeof import('ele-admin-plus'))['EleBottomBar'];
+    EleBreadcrumb: (typeof import('ele-admin-plus'))['EleBreadcrumb'];
+    EleCard: (typeof import('ele-admin-plus'))['EleCard'];
+    EleCheckCard: (typeof import('ele-admin-plus'))['EleCheckCard'];
+    EleConfigProvider: (typeof import('ele-admin-plus'))['EleConfigProvider'];
+    EleCopyable: (typeof import('ele-admin-plus'))['EleCopyable'];
+    EleCountUp: (typeof import('ele-admin-plus'))['EleCountUp'];
+    EleCropper: (typeof import('ele-admin-plus'))['EleCropper'];
+    EleCropperModal: (typeof import('ele-admin-plus'))['EleCropperModal'];
+    EleDashboard: (typeof import('ele-admin-plus'))['EleDashboard'];
+    EleDot: (typeof import('ele-admin-plus'))['EleDot'];
+    EleDrawer: (typeof import('ele-admin-plus'))['EleDrawer'];
+    EleDropdown: (typeof import('ele-admin-plus'))['EleDropdown'];
+    EleEditTag: (typeof import('ele-admin-plus'))['EleEditTag'];
+    EleEllipsis: (typeof import('ele-admin-plus'))['EleEllipsis'];
+    EleFileList: (typeof import('ele-admin-plus'))['EleFileList'];
+    EleFileListTool: (typeof import('ele-admin-plus'))['EleFileListTool'];
+    EleIconSelect: (typeof import('ele-admin-plus'))['EleIconSelect'];
+    EleLoading: (typeof import('ele-admin-plus'))['EleLoading'];
+    EleMapPicker: (typeof import('ele-admin-plus'))['EleMapPicker'];
+    EleMenus: (typeof import('ele-admin-plus'))['EleMenus'];
+    EleModal: (typeof import('ele-admin-plus'))['EleModal'];
+    ElePage: (typeof import('ele-admin-plus'))['ElePage'];
+    ElePagination: (typeof import('ele-admin-plus'))['ElePagination'];
+    ElePopconfirm: (typeof import('ele-admin-plus'))['ElePopconfirm'];
+    ElePopover: (typeof import('ele-admin-plus'))['ElePopover'];
+    ElePrinter: (typeof import('ele-admin-plus'))['ElePrinter'];
+    EleProLayout: (typeof import('ele-admin-plus'))['EleProLayout'];
+    EleProTable: (typeof import('ele-admin-plus'))['EleProTable'];
+    EleQrCode: (typeof import('ele-admin-plus'))['EleQrCode'];
+    EleQrCodeSvg: (typeof import('ele-admin-plus'))['EleQrCodeSvg'];
+    EleSegmented: (typeof import('ele-admin-plus'))['EleSegmented'];
+    EleSplitPanel: (typeof import('ele-admin-plus'))['EleSplitPanel'];
+    EleSteps: (typeof import('ele-admin-plus'))['EleSteps'];
+    EleTabTool: (typeof import('ele-admin-plus'))['EleTabTool'];
+    EleTabWrap: (typeof import('ele-admin-plus'))['EleTabWrap'];
+    EleTable: (typeof import('ele-admin-plus'))['EleTable'];
+    EleTableSelect: (typeof import('ele-admin-plus'))['EleTableSelect'];
+    EleTabs: (typeof import('ele-admin-plus'))['EleTabs'];
+    EleText: (typeof import('ele-admin-plus'))['EleText'];
+    EleTool: (typeof import('ele-admin-plus'))['EleTool'];
+    EleToolbar: (typeof import('ele-admin-plus'))['EleToolbar'];
+    EleTooltip: (typeof import('ele-admin-plus'))['EleTooltip'];
+    EleTour: (typeof import('ele-admin-plus'))['EleTour'];
+    EleUploadList: (typeof import('ele-admin-plus'))['EleUploadList'];
+    EleWatermark: (typeof import('ele-admin-plus'))['EleWatermark'];
+    EleXgPlayer: (typeof import('ele-admin-plus'))['EleXgPlayer'];
   }
 }
 export {};