clickgo-native 0.0.3-dev3 → 0.0.5-dev5

package/dist/index.js

@@ -84,7 +84,7 @@ const methods = {
     'cg-set-state': {
         'once': false,
         handler: function (t, state) {
-            if (hasFrame || !form || !state) {
+            if (!hasFrame || !form || !state) {
                 return;
             }
             if (!verifyToken(t)) {
@@ -105,6 +105,24 @@ const methods = {
             }
         }
     },
+    'cg-activate': {
+        'once': false,
+        handler: function (t) {
+            if (!form) {
+                return;
+            }
+            if (!verifyToken(t)) {
+                return;
+            }
+            if (form.isMinimized()) {
+                form.restore();
+            }
+            form.setAlwaysOnTop(true);
+            form.show();
+            form.focus();
+            form.setAlwaysOnTop(false);
+        },
+    },
     'cg-close': {
         'once': false,
         handler: function (t) {
@@ -397,7 +415,7 @@ function createForm(p) {
             'preload': path.join(__dirname, '/pre.js')
         },
         'width': hasFrame ? 800 : 500,
-        'height': hasFrame ? 600 : 300,
+        'height': hasFrame ? 700 : 300,
         'frame': hasFrame,
         'resizable': false,
         'show': false,
@@ -418,16 +436,23 @@ function createForm(p) {
         }
         form.show();
     });
-    const lio = p.indexOf('?');
-    const search = lio === -1 ? '' : p.slice(lio + 1);
-    if (lio !== -1) {
-        p = p.slice(0, lio);
+    if (p.startsWith('https://')) {
+        form.loadURL(p).catch(function (e) {
+            throw e;
+        });
+    }
+    else {
+        const lio = p.indexOf('?');
+        const search = lio === -1 ? '' : p.slice(lio + 1);
+        if (lio !== -1) {
+            p = p.slice(0, lio);
+        }
+        form.loadFile(p, {
+            'search': search
+        }).catch(function (e) {
+            throw e;
+        });
     }
-    form.loadFile(p, {
-        'search': search
-    }).catch(function (e) {
-        throw e;
-    });
     form.on('close', function () {
         form = undefined;
     });

package/dist/index.ts

@@ -76,7 +76,7 @@ const methods: Record<string, {
     'cg-set-state': {
         'once': false,
         handler: function(t: string, state: string): void {
-            if (hasFrame || !form || !state) {
+            if (!hasFrame || !form || !state) {
                 return;
             }
             if (!verifyToken(t)) {
@@ -97,6 +97,25 @@ const methods: Record<string, {
             }
         }
     },
+    // --- 激活窗体 ---
+    'cg-activate': {
+        'once': false,
+        handler: function(t: string): void {
+            if (!form) {
+                return;
+            }
+            if (!verifyToken(t)) {
+                return;
+            }
+            if (form.isMinimized()) {
+                form.restore();
+            }
+            form.setAlwaysOnTop(true);
+            form.show();
+            form.focus();
+            form.setAlwaysOnTop(false);
+        },
+    },
     // --- 关闭窗体（可能软件进程不会被退出） ---
     'cg-close': {
         'once': false,
@@ -461,7 +480,7 @@ function createForm(p: string): void {
             'preload': path.join(__dirname, '/pre.js')
         },
         'width': hasFrame ? 800 : 500,
-        'height': hasFrame ? 600 : 300,
+        'height': hasFrame ? 700 : 300,
         'frame': hasFrame,
         'resizable': false,
         'show': false,
@@ -485,16 +504,25 @@ function createForm(p: string): void {
         }
         form.show();
     });
-    const lio = p.indexOf('?');
-    const search = lio === -1 ? '' : p.slice(lio + 1);
-    if (lio !== -1) {
-        p = p.slice(0, lio);
+    if (p.startsWith('https://')) {
+        // --- 加载网页 ---
+        form.loadURL(p).catch(function(e): void {
+            throw e;
+        });
+    }
+    else {
+        // --- 加载本地文件 ---
+        const lio = p.indexOf('?');
+        const search = lio === -1 ? '' : p.slice(lio + 1);
+        if (lio !== -1) {
+            p = p.slice(0, lio);
+        }
+        form.loadFile(p, {
+            'search': search
+        }).catch(function(e): void {
+            throw e;
+        });
     }
-    form.loadFile(p, {
-        'search': search
-    }).catch(function(e): void {
-        throw e;
-    });
     form.on('close', function() {
         form = undefined;
     });

package/eslint.config.js

@@ -0,0 +1,22 @@
+// eslint.config.js
+const rules = require('@litert/eslint-plugin-recommended-rules');
+
+module.exports = [
+    ...rules.typescript,
+    {
+        files: [
+            '**/*.ts', // don't add `./` before the path
+        ],
+        languageOptions: {
+            parserOptions: {
+                project: 'tsconfig.json',
+                tsconfigRootDir: __dirname,
+            },
+        },
+        rules: {
+            '@typescript-eslint/no-explicit-any': 'off',
+            '@typescript-eslint/explicit-module-boundary-types': 'off',
+            'max-lines': ['warn', 5000]
+        }
+    }
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo-native",
-  "version": "0.0.3-dev3",
+  "version": "0.0.5-dev5",
   "description": "The software developed with ClickGo will run in Windows, Mac OS, Linux.",
   "keywords": [
     "clickgo",
@@ -14,14 +14,14 @@
     "native": "electron ./dist/test"
   },
   "devDependencies": {
-    "@litert/eslint-plugin-rules": "^0.1.2",
-    "@litert/loader": "^3.4.6",
-    "@types/jszip": "^3.4.1",
-    "@types/node": "^18.11.14",
-    "clickgo": "^3.1.6-dev15",
-    "typescript": "^4.9.4"
+    "@litert/eslint-plugin-rules": "^0.3.1",
+    "@litert/loader": "^3.5.9",
+    "@types/node": "^24.0.3",
+    "clickgo": "^3.16.16",
+    "jszip": "^3.10.1",
+    "typescript": "^5.8.3"
   },
   "dependencies": {
-    "electron": "^22.0.2"
+    "electron": "^36.4.0"
   }
 }