clickgo-native 0.0.16 → 0.0.18

package/README.md

@@ -4,7 +4,6 @@
 
 [![npm version](https://img.shields.io/npm/v/clickgo-native.svg?colorB=brightgreen)](https://www.npmjs.com/package/clickgo-native "Stable Version")
 [![npm version](https://img.shields.io/npm/v/clickgo-native/dev.svg)](https://www.npmjs.com/package/clickgo-native "Development Version")
-[![npm version](https://img.shields.io/npm/v/clickgo-native/beta.svg)](https://www.npmjs.com/package/clickgo-native "Beta Version")
 [![License](https://img.shields.io/github/license/maiyun/clickgo-native.svg)](https://github.com/maiyun/clickgo-native/blob/master/LICENSE)
 [![GitHub issues](https://img.shields.io/github/issues/maiyun/clickgo-native.svg)](https://github.com/maiyun/clickgo-native/issues)
 [![GitHub Releases](https://img.shields.io/github/release/maiyun/clickgo-native.svg)](https://github.com/maiyun/clickgo-native/releases "Stable Release")

package/dist/index.d.ts

@@ -12,6 +12,7 @@ export declare abstract class AbstractBoot {
     run(path: string, opt?: {
         'frame'?: boolean;
         'quit'?: boolean;
+        'dev'?: boolean;
     }): void;
     on(name: string, handler: (...param: any[]) => any | Promise<any>, once?: boolean): void;
     once(name: string, handler: (...param: any[]) => any | Promise<any>): void;

package/dist/index.js

@@ -96,7 +96,7 @@ const methods = {
     'cg-set-state': {
         'once': false,
         handler: function (t, state) {
-            if (!hasFrame || !form || !state) {
+            if (!form || !state) {
                 return;
             }
             if (!verifyToken(t)) {
@@ -438,6 +438,9 @@ class AbstractBoot {
             }
         }
         createForm(path);
+        if (form && opt.dev) {
+            form.webContents.openDevTools();
+        }
         electron.app.on('window-all-closed', function () {
             if (isNoFormQuit) {
                 electron.app.quit();
@@ -448,6 +451,9 @@ class AbstractBoot {
                 return;
             }
             createForm(path);
+            if (form && opt.dev) {
+                form.webContents.openDevTools();
+            }
             methods['cg-init'] = {
                 'once': true,
                 handler: function (t) {
@@ -554,16 +560,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://') || p.startsWith('http://')) {
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo-native",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "The software developed with ClickGo will run in Windows, Mac OS, Linux.",
   "keywords": [
     "clickgo",