Fix/login error tips (#2535)

* Fix: Add policy url open

* Feature: Add version alpha

package.json

@@ -1,6 +1,6 @@
 {
   "name": "snapmaker-luban",
-  "version": "4.13.1-beta.1.3",
+  "version": "4.14.0-alpha.1",
   "description": "A web-based interface for Snapmaker 3-in-1 3D Printer",
   "homepage": "https://github.com/Snapmaker/Luban",
   "author": "Snapmaker Software Team",

src/app/ui/pages/HomePage/Avatar/index.tsx

@@ -36,6 +36,7 @@ const Avatar: React.FC = () => {
 
     const showModal = () => {
         setIsModalVisible(true);
+        setErrorTips('');
         setTimeout(() => {
             const webviewBox = document.getElementById('webviewBox');
             webviewBox?.addEventListener('will-navigate', (event) => {
@@ -47,17 +48,22 @@ const Avatar: React.FC = () => {
                     setWebviewUrl('https://snapmaker.com');
                 } else if (url.includes('logout')) {
                     setWebviewUrl('https://snapmaker.com');
+                } else if (url.includes('policy')) {
+                    window.open(url);
+                    event.preventDefault();
                 }
             });
+
             webviewBox?.addEventListener('did-fail-load', (event) => {
-                log.info(`Load failed: ${event}`);
+                log.info(`Load failed: ${event.errorDescription}`);
                 const errorDescription = event.errorDescription;
                 setErrorTips(errorDescription || 'Load Error');
             });
         }, 0);
     };
     const handleCancel = () => {
         setIsModalVisible(false);
+        setErrorTips('');
     };
 
     // define url

src/main.js

@@ -349,6 +349,14 @@ const showMainWindow = async () => {
     const windowOptions = getBrowserWindowOptions();
     const window = new BrowserWindow(windowOptions);
     mainWindow = window;
+    // Monitor policy links, do not allow redirection
+    window.webContents.on('did-attach-webview', (e, webContent)=>  {
+        webContent.on('will-navigate', (e, url) => {
+            if (url.includes('policy')) {
+                e.preventDefault();
+            }
+        });
+    });
     powerId = powerSaveBlocker.start('prevent-display-sleep');
 
     if (process.platform === 'win32') {

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snapmaker-luban",
-  "version": "4.13.1-beta.1.3",
+  "version": "4.14.0-alpha.1",
   "description": "Snapmaker 3-in-1 Software for 3D Printing, Laser Engraving and CNC Cutting.",
   "homepage": "https://github.com/Snapmaker/Luban",
   "author": "Snapmaker Software Team",