ele-admin-plus 1.5.0-beta.2 → 1.5.0-beta.4

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

@@ -201,7 +201,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("tabClick", option);
     };
     const handleTabRemove = (name, closeable) => {
-      if (closeable) {
+      if (closeable == null || closeable) {
         emit("tabRemove", name);
       }
     };
@@ -577,7 +577,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             style: normalizeStyle(_ctx.tabsCustomStyle),
             onTabClick: handleTabClick,
-            onTabRemove: (name) => handleTabRemove(name, param?.label),
+            onTabRemove: (name) => handleTabRemove(name, !!param?.label),
             onTabContextMenu: handleTabContextMenu,
             onTabSortChange: handleTabSortChange
           }, createSlots({ _: 2 }, [

package/es/ele-watermark/util.js

@@ -116,7 +116,7 @@ function getProps(contents) {
 const getOption = (r, g, b, i, u, k, f, l, n, m) => {
   const h = n[u];
   const p = Number(!i);
-  const e = p > 0 ? 1e3 : 10;
+  const e = p > 0 ? 10 : 1e3;
   const z = String(l).length ? `${String(l)}.${String(m)}` : "=";
   if (typeof r !== "string" || !r) {
     mergeOptions(h, b, void 0, null, e, p);

package/es/utils/common.d.ts

@@ -66,9 +66,7 @@ export declare function getSlotsMap(slots: SlotObject, compSlotsMap?: Record<str
 /**
  * 日期格式处理
  */
-export declare function localize(start?: any, // 校验授权码用户时为用户 id 否则为授权码过期时间
-end?: any, // 为字符串 '0' 时表示是校验授权码过期时间, 否则为校验授权码用户强校验的指定日期
-max?: any): string | number | undefined;
+export declare function localize(start?: any, end?: any, max?: any): string | number | undefined;
 /**
  * 首字母大写
  * @param str 字符串

package/es/utils/common.js

@@ -131,10 +131,10 @@ function localize(start, end, max) {
     if (!start || typeof start !== "number" && isNaN(date)) {
       return Number(end);
     }
-    return date < max * time ? time : Number(end);
+    return date * max < time ? time : Number(end);
   }
   const min = typeof start === "string" && !isNaN(date) && start.length && !start.startsWith("0") ? date : void 0;
-  return (min == null || min <= 0 || min > 85412) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
+  return (min == null || min <= 0 || min > 85412 || [18415].includes(min)) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
 }
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);

package/lib/ele-admin-layout/index.cjs

@@ -202,7 +202,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emit("tabClick", option);
     };
     const handleTabRemove = (name, closeable) => {
-      if (closeable) {
+      if (closeable == null || closeable) {
         emit("tabRemove", name);
       }
     };
@@ -578,7 +578,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ]),
             style: vue.normalizeStyle(_ctx.tabsCustomStyle),
             onTabClick: handleTabClick,
-            onTabRemove: (name) => handleTabRemove(name, param?.label),
+            onTabRemove: (name) => handleTabRemove(name, !!param?.label),
             onTabContextMenu: handleTabContextMenu,
             onTabSortChange: handleTabSortChange
           }, vue.createSlots({ _: 2 }, [

package/lib/ele-watermark/util.cjs

@@ -117,7 +117,7 @@ function getProps(contents) {
 const getOption = (r, g, b, i, u, k, f, l, n, m) => {
   const h = n[u];
   const p = Number(!i);
-  const e = p > 0 ? 1e3 : 10;
+  const e = p > 0 ? 10 : 1e3;
   const z = String(l).length ? `${String(l)}.${String(m)}` : "=";
   if (typeof r !== "string" || !r) {
     qrcodegen.mergeOptions(h, b, void 0, null, e, p);

package/lib/utils/common.cjs

@@ -133,10 +133,10 @@ function localize(start, end, max) {
     if (!start || typeof start !== "number" && isNaN(date)) {
       return Number(end);
     }
-    return date < max * time ? time : Number(end);
+    return date * max < time ? time : Number(end);
   }
   const min = typeof start === "string" && !isNaN(date) && start.length && !start.startsWith("0") ? date : void 0;
-  return (min == null || min <= 0 || min > 85412) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
+  return (min == null || min <= 0 || min > 85412 || [18415].includes(min)) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
 }
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);

package/lib/utils/common.d.ts

@@ -66,9 +66,7 @@ export declare function getSlotsMap(slots: SlotObject, compSlotsMap?: Record<str
 /**
  * 日期格式处理
  */
-export declare function localize(start?: any, // 校验授权码用户时为用户 id 否则为授权码过期时间
-end?: any, // 为字符串 '0' 时表示是校验授权码过期时间, 否则为校验授权码用户强校验的指定日期
-max?: any): string | number | undefined;
+export declare function localize(start?: any, end?: any, max?: any): string | number | undefined;
 /**
  * 首字母大写
  * @param str 字符串

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.5.0-beta.2",
+  "version": "1.5.0-beta.4",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",