hifun-tools 1.3.30 → 1.3.32

package/dist/init/index.js

@@ -144,18 +144,17 @@ class InitCls {
         throw new Error("无法获取有效的租户信息");
     }
     refreshHttp() {
-        rewardMsg({
-            title: "提示",
-            text: "网络环境异常，刷新页面以重置",
-            onSubmit() {
-                location.reload();
-            },
-        });
         try {
             getOptimalDecodedString([this.getBaseUrl()]);
         }
         catch (error) {
-            console.log(error);
+            rewardMsg({
+                title: "提示",
+                text: "网络环境异常，刷新页面以重置",
+                onSubmit() {
+                    location.reload();
+                },
+            });
         }
     }
     /** 获取 lineDict.txt 内容 */
@@ -187,10 +186,12 @@ class InitCls {
                 // 备用策略
                 let allBaseUrl = filterSmartLines(dictList, OriginBaseUrl);
                 try {
-                    this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(difArr(allBaseUrl, baseUrl)));
+                    this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(difArr(allBaseUrl, baseUrl), {
+                        filterIp: false,
+                    }));
                     console.info("✅ 备用配置成功:", this.domainBaseUrl);
                 }
-                catch {
+                catch (err) {
                     this.domainBaseUrl = toStandardUrl(allBaseUrl[0]);
                     console.warn("⚠️ 备选测速失败，使用备用配置:", allBaseUrl);
                 }

package/dist/init/utils.js

@@ -136,8 +136,6 @@ export async function getOptimalDecodedString(arr, options) {
             ? targetArr.filter(isIPv4)
             : targetArr.filter((v) => !isIPv4(v));
     }
-    if (!targetArr.length)
-        throw new Error("无可用地址");
     const failedUrls = [];
     const controllerMap = {};
     return new Promise((resolve, reject) => {

package/dist/msg/index.js

@@ -1,7 +1,9 @@
+let isRewardShowing = false;
 // --------------------------- 普通消息 ---------------------------
 let messageStackContainer = null;
 // --------------------------- reward 弹窗 ---------------------------
 let rewardMask = null;
+const rewardQueue = [];
 let rewardStackContainer = null;
 function getMessageStackContainer() {
     if (!messageStackContainer) {
@@ -55,7 +57,7 @@ function getRewardMask() {
             left: "0",
             width: "100vw",
             height: "100vh",
-            background: "rgba(0,0,0,0.5)", // 使用 rgba，蒙层透明不影响弹窗
+            background: "rgba(0,0,0,0.5)",
             zIndex: "100000",
             pointerEvents: "auto",
             display: "flex",
@@ -82,71 +84,21 @@ function getRewardStackContainer() {
     }
     return rewardStackContainer;
 }
-export function msg(message, options = {}) {
-    const { type = "info", duration = 3000, closable = false, onClose } = options;
-    const container = document.createElement("div");
-    Object.assign(container.style, {
-        backgroundColor: getColorByType(type),
-        color: "#fff",
-        borderRadius: "12px",
-        fontSize: "12px",
-        fontWeight: "500",
-        padding: "10px 16px",
-        maxWidth: "400px",
-        minWidth: "120px",
-        textAlign: "center",
-        display: "-webkit-box",
-        WebkitLineClamp: "2",
-        WebkitBoxOrient: "vertical",
-        overflow: "hidden",
-        textOverflow: "ellipsis",
-        wordWrap: "break-word",
-        boxShadow: "0 6px 18px rgba(0,0,0,0.12)",
-        opacity: "0",
-        transform: "translateY(20px)",
-        transition: "all 0.3s cubic-bezier(0.4,0,0.2,1)",
-        pointerEvents: "auto",
-        position: "relative",
-    });
-    container.textContent = message;
-    if (closable) {
-        const closeBtn = document.createElement("span");
-        closeBtn.innerHTML = "×";
-        Object.assign(closeBtn.style, {
-            position: "absolute",
-            top: "50%",
-            right: "10px",
-            transform: "translateY(-50%)",
-            cursor: "pointer",
-            fontSize: "14px",
-            fontWeight: "bold",
-        });
-        closeBtn.onclick = () => hideMsg(container, onClose);
-        container.appendChild(closeBtn);
-        container.style.paddingRight = "30px";
-    }
-    const stack = getMessageStackContainer();
-    stack.appendChild(container);
-    requestAnimationFrame(() => {
-        container.style.opacity = "1";
-        container.style.transform = "translateY(0)";
-    });
-    if (duration > 0) {
-        setTimeout(() => hideMsg(container, onClose), duration);
-    }
-}
-export function rewardMsg(options) {
-    const { title, text, topImg, submitText, cancelText, onSubmit, onCancel, onClose, } = options;
+function showNextReward() {
+    if (isRewardShowing || rewardQueue.length === 0)
+        return;
+    const options = rewardQueue.shift();
+    isRewardShowing = true;
     const mask = getRewardMask();
     const originalOverflow = document.body.style.overflow;
-    document.body.style.overflow = "hidden"; // 禁止下方滚动
+    document.body.style.overflow = "hidden";
     const container = document.createElement("div");
     container.className = "rewardWindow";
     Object.assign(container.style, {
         position: "relative",
         width: "calc(100% - 60px)",
         maxWidth: "370px",
-        paddingTop: topImg ? "88px" : "23px",
+        paddingTop: options.topImg ? "88px" : "23px",
         backgroundColor: "#fff",
         borderRadius: "12px",
         boxSizing: "border-box",
@@ -155,15 +107,14 @@ export function rewardMsg(options) {
         alignItems: "center",
         textAlign: "center",
         opacity: "0",
-        transform: "translateY(-20px) scale(0.9)",
+        transform: "scale(0.9)",
         transition: "all 0.3s cubic-bezier(0.4,0,0.2,1)",
         overflow: "hidden",
         zIndex: "100001",
     });
-    // 标题
-    if (title) {
+    if (options.title) {
         const titleEl = document.createElement("div");
-        titleEl.textContent = title;
+        titleEl.textContent = options.title;
         Object.assign(titleEl.style, {
             fontSize: "16px",
             fontWeight: "600",
@@ -171,10 +122,9 @@ export function rewardMsg(options) {
         });
         container.appendChild(titleEl);
     }
-    // 顶部图片
-    if (topImg) {
+    if (options.topImg) {
         const imgEl = document.createElement("img");
-        imgEl.src = topImg;
+        imgEl.src = options.topImg;
         Object.assign(imgEl.style, {
             position: "absolute",
             top: "-68px",
@@ -183,10 +133,9 @@ export function rewardMsg(options) {
         });
         container.appendChild(imgEl);
     }
-    // 文本内容
-    if (text) {
+    if (options.text) {
         const textEl = document.createElement("div");
-        textEl.innerHTML = text;
+        textEl.innerHTML = options.text;
         Object.assign(textEl.style, {
             padding: "14px 22px 12px",
             fontSize: "12px",
@@ -200,7 +149,6 @@ export function rewardMsg(options) {
         });
         container.appendChild(textEl);
     }
-    // 按钮容器
     const btnContainer = document.createElement("div");
     Object.assign(btnContainer.style, {
         display: "flex",
@@ -217,39 +165,26 @@ export function rewardMsg(options) {
         fontSize: "14px",
         fontWeight: "500",
     };
-    // 仅当传入 cancelText 才显示取消按钮
-    if (cancelText) {
+    if (options.cancelText) {
         const cancelBtn = document.createElement("button");
-        cancelBtn.textContent = cancelText;
+        cancelBtn.textContent = options.cancelText;
         Object.assign(cancelBtn.style, {
             ...btnStyle,
             borderRight: "1px solid #f2f2f6",
             color: "#303442",
         });
-        cancelBtn.onclick = () => {
-            hideMsg(container, onCancel ?? onClose);
-            // 如果这是最后一个弹窗，隐藏蒙层并恢复滚动
-            if (rewardStackContainer?.childElementCount === 1) {
-                hideMsg(mask);
-                document.body.style.overflow = originalOverflow;
-            }
-        };
+        cancelBtn.onclick = () => closeReward(container, options.onCancel ?? options.onClose, originalOverflow);
         btnContainer.appendChild(cancelBtn);
     }
-    // 确认按钮始终显示
     const confirmBtn = document.createElement("button");
-    confirmBtn.textContent = submitText || "确认";
+    confirmBtn.textContent = options.submitText || "确认";
     Object.assign(confirmBtn.style, {
         ...btnStyle,
         color: "#179CFF",
     });
     confirmBtn.onclick = () => {
-        onSubmit?.();
-        hideMsg(container, onClose);
-        if (rewardStackContainer?.childElementCount === 1) {
-            hideMsg(mask);
-            document.body.style.overflow = originalOverflow;
-        }
+        options.onSubmit?.();
+        closeReward(container, options.onClose, originalOverflow);
     };
     btnContainer.appendChild(confirmBtn);
     container.appendChild(btnContainer);
@@ -257,6 +192,79 @@ export function rewardMsg(options) {
     stack.appendChild(container);
     requestAnimationFrame(() => {
         container.style.opacity = "1";
-        container.style.transform = "translateY(0) scale(1)";
+        container.style.transform = "scale(1)";
     });
 }
+function closeReward(container, callback, originalOverflow) {
+    container.style.opacity = "0";
+    container.style.transform = "scale(0.9)";
+    setTimeout(() => {
+        container.parentNode?.removeChild(container);
+        callback?.();
+        if (rewardStackContainer?.childElementCount === 0) {
+            rewardMask?.remove();
+            rewardMask = null;
+            rewardStackContainer = null;
+            document.body.style.overflow = originalOverflow ?? "";
+        }
+        isRewardShowing = false;
+        showNextReward(); // 显示下一个弹窗
+    }, 300);
+}
+export function msg(message, options = {}) {
+    const { type = "info", duration = 3000, closable = false, onClose } = options;
+    const container = document.createElement("div");
+    Object.assign(container.style, {
+        backgroundColor: getColorByType(type),
+        color: "#fff",
+        borderRadius: "12px",
+        fontSize: "12px",
+        fontWeight: "500",
+        padding: "10px 16px",
+        maxWidth: "400px",
+        minWidth: "120px",
+        textAlign: "center",
+        display: "-webkit-box",
+        WebkitLineClamp: "2",
+        WebkitBoxOrient: "vertical",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+        wordWrap: "break-word",
+        boxShadow: "0 6px 18px rgba(0,0,0,0.12)",
+        opacity: "0",
+        transform: "translateY(20px)",
+        transition: "all 0.3s cubic-bezier(0.4,0,0.2,1)",
+        pointerEvents: "auto",
+        position: "relative",
+    });
+    container.textContent = message;
+    if (closable) {
+        const closeBtn = document.createElement("span");
+        closeBtn.innerHTML = "×";
+        Object.assign(closeBtn.style, {
+            position: "absolute",
+            top: "50%",
+            right: "10px",
+            transform: "translateY(-50%)",
+            cursor: "pointer",
+            fontSize: "14px",
+            fontWeight: "bold",
+        });
+        closeBtn.onclick = () => hideMsg(container, onClose);
+        container.appendChild(closeBtn);
+        container.style.paddingRight = "30px";
+    }
+    const stack = getMessageStackContainer();
+    stack.appendChild(container);
+    requestAnimationFrame(() => {
+        container.style.opacity = "1";
+        container.style.transform = "translateY(0)";
+    });
+    if (duration > 0) {
+        setTimeout(() => hideMsg(container, onClose), duration);
+    }
+}
+export function rewardMsg(options) {
+    rewardQueue.push(options);
+    showNextReward();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",