clickgo 3.0.1-dev2 → 3.0.2-dev3

package/dist/app/task/config.json

@@ -16,6 +16,9 @@
         "/package/locale/ja": "ja"
     },
     "main": "/package/form/bar/bar",
+    "native": {
+        "state": "max"
+    },
 
     "files": [
         "/form/bar/bar.js",

package/dist/clickgo.js

@@ -1,16 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getNative = exports.getVersion = void 0;
+exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = void 0;
 const version = '3.0.0';
 function getVersion() {
     return version;
 }
 exports.getVersion = getVersion;
-const native = navigator.userAgent.toLowerCase().includes('electron') ? true : false;
+const native = navigator.userAgent.includes('electron') ? true : false;
 function getNative() {
     return native;
 }
 exports.getNative = getNative;
+let platform = 'web';
+if (native) {
+    const reg = /electron\/(.+?) (.+?)\//.exec(navigator.userAgent);
+    if (reg) {
+        platform = reg[2];
+    }
+}
+function getPlatform() {
+    return platform;
+}
+exports.getPlatform = getPlatform;
 let safe = true;
 function setSafe(val) {
     safe = val;

package/dist/clickgo.ts

@@ -18,11 +18,22 @@ export function getVersion(): string {
     return version;
 }
 
-const native = navigator.userAgent.toLowerCase().includes('electron') ? true : false;
+const native = navigator.userAgent.includes('electron') ? true : false;
 export function getNative(): boolean {
     return native;
 }
 
+let platform: NodeJS.Platform | 'web' = 'web';
+if (native) {
+    const reg = /electron\/(.+?) (.+?)\//.exec(navigator.userAgent);
+    if (reg) {
+        platform = reg[2] as any;
+    }
+}
+export function getPlatform(): NodeJS.Platform | 'web' {
+    return platform;
+}
+
 let safe = true;
 export function setSafe(val: boolean): void {
     safe = val;

package/dist/global.css

@@ -1 +1 @@
-#cg-wrap{--cg:hsl(20, 100%, 70%);--success:hsl(150, 100%, 40%);--success-hover:hsl(150, 100%, 45%);--success-active:hsl(150, 100%, 30%);--success-focus:hsl(150, 100%, 35%);--success-disabled:hsl(150, 0%, 40%);--info:hsl(210, 100%, 50%);--info-hover:hsl(210, 100%, 60%);--info-active:hsl(210, 100%, 40%);--info-focus:hsl(210, 100%, 45%);--info-disabled:hsl(210, 0%, 50%);--warning:hsl(20, 100%, 70%);--warning-hover:hsl(20, 100%, 80%);--warning-active:hsl(20, 100%, 60%);--warning-focus:hsl(20, 100%, 65%);--warning-disabled:hsl(20, 0%, 70%);--danger:hsl(350, 100%, 50%);--danger-hover:hsl(350, 100%, 70%);--danger-active:hsl(350, 100%, 40%);--danger-focus:hsl(350, 100%, 45%);--danger-disabled:hsl(350, 0%, 50%);--system-color:hsl(0, 0%, 95%);--system-background:hsla(0, 0%, 0%, .5);--face:hsl(0, 0%, 95%);--g-color:hsl(0, 0%, 20%);--g-color-hover:hsl(0, 0%, 30%);--g-color-active:hsl(0, 0%, 10%);--g-color-focus:hsl(0, 0%, 15%);--g-color-disabled:hsl(0, 0%, 60%);--g-background:hsl(0, 0%, 95%);--g-background-hover:hsl(0, 0%, 100%);--g-background-active:hsl(0, 0%, 85%);--g-background-kp:hsl(0, 0%, 80%);--g-background-opacity:hsl(0, 0%, 50%, .2);--g-background-focus:hsl(0, 0%, 97.5%);--g-background-disabled:hsl(0, 0%, 75%);--g-border-color:hsl(0, 0%, 40%);--g-border-color-hover:hsl(0, 0%, 50%);--g-border-color-active:hsl(0, 0%, 30%);--g-border-color-focus:hsl(0, 0%, 35%);--g-border-color-disabled:hsl(0, 0%, 60%);--g-plain-color:var(--g-color);--g-plain-color-hover:var(--g-color-hover);--g-plain-color-active:var(--g-color-active);--g-plain-color-focus:var(--g-color-focus);--g-plain-color-disabled:var(--g-color-disabled);--g-plain-background:hsl(0, 0%, 100%);--g-plain-background-hover:hsl(0, 0%, 98%);--g-plain-background-active:hsl(0, 0%, 95%);--g-plain-background-focus:var(--g-plain-background);--g-plain-background-disabled:hsl(0, 0%, 95%);--g-plain-border-color:hsl(0, 0%, 70%);--g-plain-border-color-hover:hsl(0, 0%, 80%);--g-plain-border-color-active:hsl(0, 0%, 60%);--g-plain-border-color-focus:hsl(0, 0%, 65%);--g-plain-border-color-disabled:hsl(0, 0%, 60%)}#cg-form-list{z-index:20020000}#cg-pop-list{z-index:20020001}#cg-simpletask{z-index:20020002}#cg-system{z-index:20020003}#cg-rectangle{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:3px;box-shadow:0 0 10px rgba(0,0,0,.25);background:rgba(255,255,255,.05);pointer-events:none;opacity:0}#cg-circular{z-index:20020004;box-sizing:border-box;position:fixed;border:solid 3px var(--cg);border-radius:50%;filter:drop-shadow(0 0 3px var(--cg));pointer-events:none;opacity:0}#cg-gesture{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:50%;pointer-events:none;opacity:0;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);transform:scale(0);width:20px;height:20px}#cg-gesture.done{background:rgba(255,255,255,.3);border:solid 3px rgba(0,0,0,.3)}#cg-drag{box-sizing:border-box;position:fixed;border-radius:3px;z-index:20020004;pointer-events:none;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);opacity:0;display:flex;justify-content:center;align-items:center}[data-cg-pop]{position:fixed;box-shadow:0px 5px 20px rgba(0,0,0,.25);transition:.1s ease-out;transition-property:transform,opacity;transform:translateY(-10px);opacity:0}[data-cg-pop]:not([data-cg-open]){pointer-events:none}[data-cg-pop][data-cg-open]{transform:translateY(0px);opacity:1}.cg-system-notify{background:var(--system-background);position:fixed;padding:15px;border-radius:3px;right:0;top:0;width:280px;font-size:14px;display:flex;transition:.1s ease-out;transition-property:transform,opacity;overflow:hidden;color:#f6f6f6;box-shadow:0 5px 20px rgba(0,0,0,.25);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1)}.cg-system-icon{margin-right:10px;width:16px;height:16px;border-radius:50%}.cg-system-icon.cg-primary{background:var(--success)}.cg-system-icon.cg-info{background:var(--info)}.cg-system-icon.cg-warning{background:var(--warning)}.cg-system-icon.cg-danger{background:var(--danger)}.cg-system-icon.cg-progress{background:var(--cg)}.cg-system-notify-title{font-size:16px;font-weight:bold;padding-bottom:10px}.cg-system-notify-content{line-height:1.5;word-break:break-word}.cg-system-notify-progress{position:absolute;bottom:0;left:0;border-radius:1px;background:var(--cg);transition:width 1s ease-out;width:0%;height:2px}#cg-simpletask{bottom:-46px;width:100%;height:46px;top:initial;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1);padding:5px 0 5px 5px;display:flex;color:var(--system-color);transition:bottom .1s ease-out;overflow-x:auto}#cg-simpletask::-webkit-scrollbar{display:none}.cg-simpletask-item{background:rgba(0,0,0,.05);border-radius:3px;padding:10px;display:flex;align-items:center;margin-right:5px}.cg-simpletask-item:hover{background:rgba(0,0,0,.1)}.cg-simpletask-item:active{background:rgba(0,0,0,.2)}.cg-simpletask-icon{margin-right:5px;background-size:cover;width:16px;height:16px}
+#cg-wrap{--cg:hsl(20, 100%, 65%);--success:hsl(150, 100%, 40%);--success-hover:hsl(150, 100%, 45%);--success-active:hsl(150, 100%, 30%);--success-focus:hsl(150, 100%, 35%);--success-disabled:hsl(150, 0%, 40%);--info:hsl(210, 100%, 50%);--info-hover:hsl(210, 100%, 60%);--info-active:hsl(210, 100%, 40%);--info-focus:hsl(210, 100%, 45%);--info-disabled:hsl(210, 0%, 50%);--warning:hsl(20, 100%, 70%);--warning-hover:hsl(20, 100%, 80%);--warning-active:hsl(20, 100%, 60%);--warning-focus:hsl(20, 100%, 65%);--warning-disabled:hsl(20, 0%, 70%);--danger:hsl(350, 100%, 50%);--danger-hover:hsl(350, 100%, 70%);--danger-active:hsl(350, 100%, 40%);--danger-focus:hsl(350, 100%, 45%);--danger-disabled:hsl(350, 0%, 50%);--system-color:hsl(0, 0%, 95%);--system-background:hsla(0, 0%, 0%, .5);--face:hsl(0, 0%, 95%);--g-color:hsl(0, 0%, 20%);--g-color-hover:hsl(0, 0%, 30%);--g-color-active:hsl(0, 0%, 10%);--g-color-focus:hsl(0, 0%, 15%);--g-color-disabled:hsl(0, 0%, 60%);--g-background:hsl(0, 0%, 95%);--g-background-hover:hsl(0, 0%, 100%);--g-background-active:hsl(0, 0%, 85%);--g-background-kp:hsl(0, 0%, 80%);--g-background-opacity:hsl(0, 0%, 50%, .2);--g-background-focus:hsl(0, 0%, 97.5%);--g-background-disabled:hsl(0, 0%, 75%);--g-border-color:hsl(0, 0%, 40%);--g-border-color-hover:hsl(0, 0%, 50%);--g-border-color-active:hsl(0, 0%, 30%);--g-border-color-focus:hsl(0, 0%, 35%);--g-border-color-disabled:hsl(0, 0%, 60%);--g-plain-color:var(--g-color);--g-plain-color-hover:var(--g-color-hover);--g-plain-color-active:var(--g-color-active);--g-plain-color-focus:var(--g-color-focus);--g-plain-color-disabled:var(--g-color-disabled);--g-plain-background:hsl(0, 0%, 100%);--g-plain-background-hover:hsl(0, 0%, 98%);--g-plain-background-active:hsl(0, 0%, 95%);--g-plain-background-focus:var(--g-plain-background);--g-plain-background-disabled:hsl(0, 0%, 95%);--g-plain-border-color:hsl(0, 0%, 70%);--g-plain-border-color-hover:hsl(0, 0%, 80%);--g-plain-border-color-active:hsl(0, 0%, 60%);--g-plain-border-color-focus:hsl(0, 0%, 65%);--g-plain-border-color-disabled:hsl(0, 0%, 60%)}#cg-form-list{z-index:20020000}#cg-pop-list{z-index:20020001}#cg-simpletask{z-index:20020002}#cg-system{z-index:20020003}#cg-rectangle{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:3px;box-shadow:0 0 10px rgba(0,0,0,.25);background:rgba(255,255,255,.05);pointer-events:none;opacity:0}#cg-circular{z-index:20020004;box-sizing:border-box;position:fixed;border:solid 3px var(--cg);border-radius:50%;filter:drop-shadow(0 0 3px var(--cg));pointer-events:none;opacity:0}#cg-gesture{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:50%;pointer-events:none;opacity:0;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);transform:scale(0);width:20px;height:20px}#cg-gesture.done{background:rgba(255,255,255,.3);border:solid 3px rgba(0,0,0,.3)}#cg-drag{box-sizing:border-box;position:fixed;border-radius:3px;z-index:20020004;pointer-events:none;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);opacity:0;display:flex;justify-content:center;align-items:center}[data-cg-pop]{position:fixed;box-shadow:0px 5px 20px rgba(0,0,0,.25);transition:.1s ease-out;transition-property:transform,opacity;transform:translateY(-10px);opacity:0}[data-cg-pop]:not([data-cg-open]){pointer-events:none}[data-cg-pop][data-cg-open]{transform:translateY(0px);opacity:1}.cg-system-notify{background:var(--system-background);position:fixed;padding:15px;border-radius:3px;right:0;top:0;width:280px;font-size:14px;display:flex;transition:.1s ease-out;transition-property:transform,opacity;overflow:hidden;color:#f6f6f6;box-shadow:0 5px 20px rgba(0,0,0,.25);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1)}.cg-system-icon{margin-right:10px;width:16px;height:16px;border-radius:50%}.cg-system-icon.cg-primary{background:var(--success)}.cg-system-icon.cg-info{background:var(--info)}.cg-system-icon.cg-warning{background:var(--warning)}.cg-system-icon.cg-danger{background:var(--danger)}.cg-system-icon.cg-progress{background:var(--cg)}.cg-system-notify-title{font-size:16px;font-weight:bold;padding-bottom:10px}.cg-system-notify-content{line-height:1.5;word-break:break-word}.cg-system-notify-progress{position:absolute;bottom:0;left:0;border-radius:1px;background:var(--cg);transition:width 1s ease-out;width:0%;height:2px}#cg-simpletask{bottom:-46px;width:100%;height:46px;top:initial;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1);padding:5px 0 5px 5px;display:flex;color:var(--system-color);transition:bottom .1s ease-out;overflow-x:auto}#cg-simpletask::-webkit-scrollbar{display:none}.cg-simpletask-item{background:rgba(0,0,0,.05);border-radius:3px;padding:10px;display:flex;align-items:center;margin-right:5px}.cg-simpletask-item:hover{background:rgba(0,0,0,.1)}.cg-simpletask-item:active{background:rgba(0,0,0,.2)}.cg-simpletask-icon{margin-right:5px;background-size:cover;width:16px;height:16px}

package/dist/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
+exports.init = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
 function getVersion() {
     return exports.clickgo.getVersion();
 }
@@ -18,6 +18,10 @@ function getNative() {
     return exports.clickgo.getNative();
 }
 exports.getNative = getNative;
+function getPlatform() {
+    return exports.clickgo.getPlatform();
+}
+exports.getPlatform = getPlatform;
 function setSafe(val) {
     exports.clickgo.setSafe(val);
 }

package/dist/index.ts

@@ -22,6 +22,10 @@ export function getNative(): boolean {
     return clickgo.getNative();
 }
 
+export function getPlatform(): NodeJS.Platform | 'web' {
+    return clickgo.getPlatform();
+}
+
 export function setSafe(val: boolean): void {
     clickgo.setSafe(val);
 }

package/dist/lib/core.js

@@ -515,32 +515,28 @@ function fetchApp(url, opt = {}) {
             }
         }
         if (cga) {
-            if (opt.notifyId) {
+            try {
                 const blob = yield fs.getContent(url, {
                     'current': current,
-                    progress: (loaded, total) => {
-                        form.notifyProgress(opt.notifyId, loaded / total);
+                    'progress': (loaded, total) => {
+                        if (opt.notifyId) {
+                            form.notifyProgress(opt.notifyId, loaded / total);
+                        }
+                        if (opt.progress) {
+                            opt.progress(loaded, total);
+                        }
                     }
                 });
-                if ((blob === null) || (typeof blob === 'string')) {
+                if ((blob === null) || typeof blob === 'string') {
                     return null;
                 }
-                form.notifyProgress(opt.notifyId, 1);
+                if (opt.notifyId) {
+                    form.notifyProgress(opt.notifyId, 1);
+                }
                 return (yield readApp(blob)) || null;
             }
-            else {
-                try {
-                    const blob = yield fs.getContent(url, {
-                        'current': current
-                    });
-                    if ((blob === null) || typeof blob === 'string') {
-                        return null;
-                    }
-                    return (yield readApp(blob)) || null;
-                }
-                catch (_a) {
-                    return null;
-                }
+            catch (_a) {
+                return null;
             }
         }
         let config;

package/dist/lib/core.ts

@@ -577,32 +577,28 @@ export async function fetchApp(url: string, opt: types.ICoreFetchAppOptions = {}
 
     // --- 如果是 cga 文件，直接读取并交给 readApp 函数处理 ---
     if (cga) {
-        if (opt.notifyId) {
+        try {
             const blob = await fs.getContent(url, {
                 'current': current,
-                progress: (loaded, total): void => {
-                    form.notifyProgress(opt.notifyId!, loaded / total);
+                'progress': (loaded: number, total: number): void => {
+                    if (opt.notifyId) {
+                        form.notifyProgress(opt.notifyId, loaded / total);
+                    }
+                    if (opt.progress) {
+                        opt.progress(loaded, total) as unknown;
+                    }
                 }
             });
-            if ((blob === null) || (typeof blob === 'string')) {
+            if ((blob === null) || typeof blob === 'string') {
                 return null;
             }
-            form.notifyProgress(opt.notifyId, 1);
+            if (opt.notifyId) {
+                form.notifyProgress(opt.notifyId, 1);
+            }
             return await readApp(blob) || null;
         }
-        else {
-            try {
-                const blob = await fs.getContent(url, {
-                    'current': current
-                });
-                if ((blob === null) || typeof blob === 'string') {
-                    return null;
-                }
-                return await readApp(blob) || null;
-            }
-            catch {
-                return null;
-            }
+        catch {
+            return null;
         }
     }
     // --- 加载目录 ---

package/dist/lib/dom.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fullscreen = exports.siblingsData = exports.siblings = exports.findParentByClass = exports.findParentByData = exports.bindResize = exports.bindMove = exports.is = exports.bindDrag = exports.bindLong = exports.allowEvent = exports.bindGesture = exports.bindDown = exports.isWatchStyle = exports.watchStyle = exports.clearWatch = exports.unwatch = exports.watch = exports.clearWatchSize = exports.unwatchSize = exports.watchSize = exports.getSize = exports.getStyleCount = exports.removeStyle = exports.pushStyle = exports.removeFromStyleList = exports.createToStyleList = exports.hasTouchButMouse = exports.setGlobalCursor = void 0;
+const clickgo = require("../clickgo");
 const form = require("./form");
 const core = require("./core");
 const topClass = ['#cg-form-list', '#cg-pop-list', '#cg-system', '#cg-simpletask'];
@@ -16,7 +17,8 @@ styleList.style.display = 'none';
 document.getElementsByTagName('body')[0].appendChild(styleList);
 styleList.insertAdjacentHTML('beforeend', '<style id=\'cg-global-cursor\'></style>');
 styleList.insertAdjacentHTML('beforeend', `<style id='cg-global'>
-${classUnfold()} {-webkit-user-select: none; user-select: none; position: fixed; left: 0; top: 0; width: 0; height: 0; cursor: default; box-sizing: border-box;}
+${classUnfold()} {-webkit-user-select: none; user-select: none; position: fixed; cursor: default; box-sizing: border-box;}
+${topClass.slice(0, 3).join(', ')} {left: 0; top: 0; width: 0; height: 0;}
 ${classUnfold('img')} {vertical-align: bottom;}
 ${classUnfold('::selection')} {background-color: rgba(0, 0, 0, .1);}
 ${classUnfold('*')}, ${classUnfold('*::after')}, ${classUnfold('*::before')} {box-sizing: border-box; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); flex-shrink: 0;}
@@ -1001,7 +1003,7 @@ function bindDrag(e, opt) {
     });
 }
 exports.bindDrag = bindDrag;
-exports.is = Vue.reactive({
+exports.is = clickgo.vue.reactive({
     'move': false,
     'shift': false,
     'ctrl': false

package/dist/lib/dom.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import * as types from '../../types';
+import * as clickgo from '../clickgo';
 import * as form from './form';
 import * as core from './core';
 
@@ -36,7 +37,8 @@ styleList.style.display = 'none';
 document.getElementsByTagName('body')[0].appendChild(styleList);
 styleList.insertAdjacentHTML('beforeend', '<style id=\'cg-global-cursor\'></style>');
 styleList.insertAdjacentHTML('beforeend', `<style id='cg-global'>
-${classUnfold()} {-webkit-user-select: none; user-select: none; position: fixed; left: 0; top: 0; width: 0; height: 0; cursor: default; box-sizing: border-box;}
+${classUnfold()} {-webkit-user-select: none; user-select: none; position: fixed; cursor: default; box-sizing: border-box;}
+${topClass.slice(0, 3).join(', ')} {left: 0; top: 0; width: 0; height: 0;}
 ${classUnfold('img')} {vertical-align: bottom;}
 ${classUnfold('::selection')} {background-color: rgba(0, 0, 0, .1);}
 ${classUnfold('*')}, ${classUnfold('*::after')}, ${classUnfold('*::before')} {box-sizing: border-box; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); flex-shrink: 0;}
@@ -1217,7 +1219,7 @@ export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; '
 }
 
 /** --- 目前是否已绑定了 bindMove --- */
-export const is = Vue.reactive({
+export const is = clickgo.vue.reactive({
     'move': false,
     'shift': false,
     'ctrl': false

package/dist/lib/form.js

@@ -67,12 +67,18 @@ const elements = {
     'init': function () {
         this.wrap.id = 'cg-wrap';
         document.getElementsByTagName('body')[0].appendChild(this.wrap);
-        if (clickgo.getNative()) {
+        if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) {
             this.wrap.addEventListener('mouseenter', function () {
-                native.send('cg-mouse-ignore', 'false');
+                native.send('cg-mouse-ignore', JSON.stringify({
+                    'token': native.getToken(),
+                    'param': false
+                }));
             });
             this.wrap.addEventListener('mouseleave', function () {
-                native.send('cg-mouse-ignore', 'true');
+                native.send('cg-mouse-ignore', JSON.stringify({
+                    'token': native.getToken(),
+                    'param': true
+                }));
             });
         }
         this.list.id = 'cg-form-list';
@@ -123,7 +129,7 @@ const elements = {
         }, {
             'passive': false
         });
-        this.simpleSystemtask.id = 'cg-simplesystemtask';
+        this.simpleSystemtask.id = 'cg-simpletask';
         this.simpleSystemtask.addEventListener('contextmenu', function (e) {
             e.preventDefault();
         });
@@ -133,8 +139,8 @@ const elements = {
         }, {
             'passive': false
         });
-        const simpleSystemtaskApp = clickgo.vue.createApp({
-            'template': '<div v-for="(item, formId) of forms" class="cg-simplesystemtask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simplesystemtask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
+        const simpletaskApp = clickgo.vue.createApp({
+            'template': '<div v-for="(item, formId) of forms" class="cg-simpletask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simpletask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
             'data': function () {
                 return {
                     'forms': {}
@@ -169,7 +175,7 @@ const elements = {
                 exports.simpleSystemTaskRoot = this;
             }
         });
-        simpleSystemtaskApp.mount('#cg-simplesystemtask');
+        simpletaskApp.mount('#cg-simpletask');
     }
 };
 elements.init();
@@ -1089,6 +1095,9 @@ function create(opt) {
                 getNative() {
                     return clickgo.getNative();
                 },
+                getPlatform() {
+                    return clickgo.getPlatform();
+                },
                 getSafe() {
                     return clickgo.getSafe();
                 },
@@ -1448,6 +1457,18 @@ function create(opt) {
                     },
                     clearListener: function () {
                         clickgo.native.clearListener(taskId);
+                    },
+                    max: function () {
+                        clickgo.native.max();
+                    },
+                    min: function () {
+                        clickgo.native.min();
+                    },
+                    restore: function () {
+                        clickgo.native.restore();
+                    },
+                    size: function (width, height) {
+                        clickgo.native.size(width, height);
                     }
                 },
                 'task': {
@@ -1468,6 +1489,7 @@ function create(opt) {
                     },
                     run: function (url, opt = {}) {
                         opt.taskId = taskId;
+                        opt.main = false;
                         return clickgo.task.run(url, opt);
                     },
                     end: function (tid) {

package/dist/lib/form.ts

@@ -111,12 +111,18 @@ const elements: {
         /** --- clickgo 所有的 div wrap --- */
         this.wrap.id = 'cg-wrap';
         document.getElementsByTagName('body')[0].appendChild(this.wrap);
-        if (clickgo.getNative()) {
+        if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) {
             this.wrap.addEventListener('mouseenter', function() {
-                native.send('cg-mouse-ignore', 'false');
+                native.send('cg-mouse-ignore', JSON.stringify({
+                    'token': native.getToken(),
+                    'param': false
+                }));
             });
             this.wrap.addEventListener('mouseleave', function() {
-                native.send('cg-mouse-ignore', 'true');
+                native.send('cg-mouse-ignore', JSON.stringify({
+                    'token': native.getToken(),
+                    'param': true
+                }));
             });
         }
 
@@ -187,8 +193,8 @@ const elements: {
             'passive': false
         });
 
-        // --- 添加 cg-simplesystemtask 的 dom ---
-        this.simpleSystemtask.id = 'cg-simplesystemtask';
+        // --- 添加 cg-simpletask 的 dom ---
+        this.simpleSystemtask.id = 'cg-simpletask';
         this.simpleSystemtask.addEventListener('contextmenu', function(e): void {
             e.preventDefault();
         });
@@ -199,8 +205,8 @@ const elements: {
         }, {
             'passive': false
         });
-        const simpleSystemtaskApp = clickgo.vue.createApp({
-            'template': '<div v-for="(item, formId) of forms" class="cg-simplesystemtask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simplesystemtask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
+        const simpletaskApp = clickgo.vue.createApp({
+            'template': '<div v-for="(item, formId) of forms" class="cg-simpletask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simpletask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
             'data': function() {
                 return {
                     'forms': {}
@@ -235,7 +241,7 @@ const elements: {
                 simpleSystemTaskRoot = this;
             }
         });
-        simpleSystemtaskApp.mount('#cg-simplesystemtask');
+        simpletaskApp.mount('#cg-simpletask');
     }
 };
 elements.init();
@@ -1365,6 +1371,9 @@ export async function create(opt: string | types.IFormCreateOptions): Promise<nu
             getNative(): boolean {
                 return clickgo.getNative();
             },
+            getPlatform(): string {
+                return clickgo.getPlatform();
+            },
             getSafe(): boolean {
                 return clickgo.getSafe();
             },
@@ -1762,6 +1771,18 @@ export async function create(opt: string | types.IFormCreateOptions): Promise<nu
                 },
                 clearListener: function(): void {
                     clickgo.native.clearListener(taskId);
+                },
+                max: function(): void {
+                    clickgo.native.max();
+                },
+                min: function(): void {
+                    clickgo.native.min();
+                },
+                restore: function(): void {
+                    clickgo.native.restore();
+                },
+                size: function(width: number, height: number): void {
+                    clickgo.native.size(width, height);
                 }
             },
             'task': {
@@ -1789,6 +1810,7 @@ export async function create(opt: string | types.IFormCreateOptions): Promise<nu
                 },
                 run: function(url: string, opt: types.ITaskRunOptions = {}): Promise<number> {
                     opt.taskId = taskId;
+                    opt.main = false;
                     return clickgo.task.run(url, opt);
                 },
                 end: function(tid: number): boolean {

package/dist/lib/native.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cgInnerReceive = exports.cgInnerGetSends = exports.clearListener = exports.off = exports.once = exports.on = exports.send = exports.getListeners = void 0;
+exports.cgInnerReceive = exports.cgInnerGetSends = exports.size = exports.restore = exports.min = exports.max = exports.clearListener = exports.off = exports.once = exports.on = exports.send = exports.getListeners = exports.getToken = void 0;
 const clickgo = require("../clickgo");
 let sendId = 0;
 let sendList = [];
 const listeners = {};
+const token = (Math.random() * 100000000000000 * (100 + Math.round(Math.random() * (999 - 100)))).toString(32);
+function getToken() {
+    return token;
+}
+exports.getToken = getToken;
 function getListeners() {
     const list = [];
     for (const name in listeners) {
@@ -93,6 +98,35 @@ function clearListener(taskId) {
     }
 }
 exports.clearListener = clearListener;
+function max() {
+    send('cg-set-state', JSON.stringify({
+        'token': token,
+        'state': 'max'
+    }));
+}
+exports.max = max;
+function min() {
+    send('cg-set-state', JSON.stringify({
+        'token': token,
+        'state': 'min'
+    }));
+}
+exports.min = min;
+function restore() {
+    send('cg-set-state', JSON.stringify({
+        'token': token,
+        'state': 'restore'
+    }));
+}
+exports.restore = restore;
+function size(width, height) {
+    send('cg-set-size', JSON.stringify({
+        'token': token,
+        'width': width,
+        'height': height
+    }));
+}
+exports.size = size;
 function cgInnerGetSends() {
     const json = JSON.stringify(sendList);
     sendList = [];

package/dist/lib/native.ts

@@ -15,6 +15,7 @@
  */
 import * as clickgo from '../clickgo';
 
+/** --- 最后一个 send ID --- */
 let sendId = 0;
 // --- sendList 一定会被清理 ---
 let sendList: Array<{
@@ -31,6 +32,14 @@ const listeners: Record<string, Array<{
     'handler': (param?: string) => void | Promise<void>;
 }>> = {};
 
+const token = (Math.random() * 100000000000000 * (100 + Math.round(Math.random() * (999 - 100)))).toString(32);
+/**
+ * --- 获取 native 通讯 token，app 模式下无效 ---
+ */
+export function getToken(): string {
+    return token;
+}
+
 /**
  * --- 获取已经创建的监听列表 ---
  */
@@ -123,7 +132,7 @@ export function once(
 }
 
 /**
- * --- 取消监听 native 指令
+ * --- 取消监听 native 指令 ---
  * @param name 指令名
  * @param handler 绑定监听时的回调函数
  * @param taskId 校验 taskId，为空则不校验，但 App 模式下无效
@@ -170,6 +179,34 @@ export function clearListener(taskId?: number): void {
     }
 }
 
+// --- 常见操作 ---
+
+export function max(): void {
+    send('cg-set-state', JSON.stringify({
+        'token': token,
+        'state': 'max'
+    }));
+}
+export function min(): void {
+    send('cg-set-state', JSON.stringify({
+        'token': token,
+        'state': 'min'
+    }));
+}
+export function restore(): void {
+    send('cg-set-state', JSON.stringify({
+        'token': token,
+        'state': 'restore'
+    }));
+}
+export function size(width: number, height: number): void {
+    send('cg-set-size', JSON.stringify({
+        'token': token,
+        'width': width,
+        'height': height
+    }));
+}
+
 // --- 以下为供 native 调用的内部函数 ---
 
 // --- 将 send 值全部提交给 native ---

package/dist/lib/task.js

@@ -145,7 +145,7 @@ function getList() {
 }
 exports.getList = getList;
 function run(url, opt = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         let ntask = null;
         if (opt.taskId) {
@@ -158,10 +158,10 @@ function run(url, opt = {}) {
         if (opt.icon) {
             icon = opt.icon;
         }
-        if (opt.progress === undefined) {
-            opt.progress = true;
+        if (opt.notify === undefined) {
+            opt.notify = true;
         }
-        const notifyId = opt.progress ? form.notify({
+        const notifyId = opt.notify ? form.notify({
             'title': (_b = (_a = localeData[core.config.locale]) === null || _a === void 0 ? void 0 : _a.loading) !== null && _b !== void 0 ? _b : localeData['en'].loading,
             'content': url,
             'icon': icon,
@@ -196,6 +196,7 @@ function run(url, opt = {}) {
             'icon': (_c = app.icon) !== null && _c !== void 0 ? _c : icon,
             'path': url,
             'files': files,
+            'main': (_d = opt.main) !== null && _d !== void 0 ? _d : false,
             'permissions': {},
             'forms': {},
             'objectURLs': [],
@@ -259,7 +260,7 @@ function run(url, opt = {}) {
                     const data = JSON.parse(lcontent);
                     loadLocaleData(locale, data, '', task.id);
                 }
-                catch (_d) {
+                catch (_e) {
                 }
             }
         }
@@ -275,6 +276,13 @@ function run(url, opt = {}) {
             core.trigger('taskEnded', task.id);
             return f - 100;
         }
+        if (clickgo.getNative() && opt.sync) {
+            f.vroot.$refs.form.isNativeSync = true;
+            window.addEventListener('resize', function () {
+                f.vroot.$refs.form.setPropData('width', window.innerWidth);
+                f.vroot.$refs.form.setPropData('height', window.innerHeight);
+            });
+        }
         if (app.config.style && app.files[app.config.style + '.css']) {
             const style = app.files[app.config.style + '.css'];
             const r = tool.stylePrepend(style, 'cg-task' + task.id.toString() + '_');
@@ -302,6 +310,9 @@ function run(url, opt = {}) {
                 yield theme.load(undefined, task.id);
             }
         }
+        if (task.id === 1) {
+            clickgo.native.send('cg-init', clickgo.native.getToken());
+        }
         return task.id;
     });
 }
@@ -311,6 +322,11 @@ function end(taskId) {
     if (!task) {
         return true;
     }
+    if (clickgo.getNative() && task.main) {
+        clickgo.native.send('cg-main-close', JSON.stringify({
+            'token': clickgo.native.getToken()
+        }));
+    }
     const fid = form.getMaxZIndexID({
         'taskIds': [task.id]
     });

package/dist/lib/task.ts

@@ -193,7 +193,7 @@ export function getList(): Record<string, types.ITaskInfo> {
 /**
  * --- 运行一个应用 ---
  * @param url app 路径（以 / 为结尾的路径或以 .cga 结尾的文件）
- * @param opt 选项，icon:图标,progress:显示进度条,taskId:所属任务，App 模式下无效
+ * @param opt 选项，icon:图标,progress:显示进度条,main:native模式下的主进程，App 模式下无效,taskId:所属任务，App 模式下无效
  */
 export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise<number> {
     /** --- 是否是在任务当中启动的任务 --- */
@@ -210,10 +210,10 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     if (opt.icon) {
         icon = opt.icon;
     }
-    if (opt.progress === undefined) {
-        opt.progress = true;
+    if (opt.notify === undefined) {
+        opt.notify = true;
     }
-    const notifyId: number | undefined = opt.progress ? form.notify({
+    const notifyId: number | undefined = opt.notify ? form.notify({
         'title': localeData[core.config.locale]?.loading ?? localeData['en'].loading,
         'content': url,
         'icon': icon,
@@ -250,6 +250,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         'icon': app.icon ?? icon,
         'path': url,
         'files': files,
+        'main': opt.main ?? false,
 
         'permissions': {},
         'forms': {},
@@ -338,6 +339,13 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         core.trigger('taskEnded', task.id);
         return f - 100;
     }
+    if (clickgo.getNative() && opt.sync) {
+        f.vroot.$refs.form.isNativeSync = true;
+        window.addEventListener('resize', function(): void {
+            f.vroot.$refs.form.setPropData('width', window.innerWidth);
+            f.vroot.$refs.form.setPropData('height', window.innerHeight);
+        });
+    }
     // --- 设置 global style（如果 form 创建失败，就不设置 global style 了） ---
     if (app.config.style && app.files[app.config.style + '.css']) {
         const style = app.files[app.config.style + '.css'] as string;
@@ -368,6 +376,10 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             await theme.load(undefined, task.id);
         }
     }
+    // --- 给 native 发送任务启动成功的消息 ---
+    if (task.id === 1) {
+        clickgo.native.send('cg-init', clickgo.native.getToken());
+    }
     return task.id;
 }
 
@@ -380,6 +392,12 @@ export function end(taskId: number): boolean {
     if (!task) {
         return true;
     }
+    // --- 如果是 native 模式 ---
+    if (clickgo.getNative() && task.main) {
+        clickgo.native.send('cg-main-close', JSON.stringify({
+            'token': clickgo.native.getToken()
+        }));
+    }
     // --- 获取最大的 z index 窗体，并让他获取焦点 ---
     const fid = form.getMaxZIndexID({
         'taskIds': [task.id]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.0.1-dev2",
+  "version": "3.0.2-dev3",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -12,14 +12,17 @@
   "license": "Apache-2.0",
   "types": "./types/index.d.ts",
   "scripts": {
-    "native": "electron ./dist/test/native"
+    "native": "electron ./dist/test/native",
+    "native2": "electron ./dist/test/native/index2",
+    "native3": "electron ./dist/test/native/index3",
+    "native4": "electron ./dist/test/native/index4"
   },
   "devDependencies": {
     "@litert/loader": "^3.2.0",
     "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",
-    "electron": "^18.3.4",
+    "electron": "^19.0.8",
     "eslint": "^8.12.0",
     "typescript": "^4.6.4"
   },

package/types/index.d.ts

@@ -11,6 +11,7 @@ export let zip: typeof import('../dist/lib/zip');
 
 export function getVersion(): string;
 export function getNative(): boolean;
+export function getPlatform(): NodeJS.Platform | 'web';
 export function setSafe(val: boolean): void;
 export function getSafe(): boolean;
 export function setCdn(val: string): void;
@@ -84,6 +85,7 @@ export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCre
 export interface ICoreFetchAppOptions {
     'notifyId'?: number;
     'current'?: string;
+    'progress'?: (loaded: number, total: number) => void | Promise<void>;
 }
 
 /** --- 应用文件包 --- */
@@ -341,7 +343,10 @@ export interface ISystemTaskInfo {
 
 export interface ITaskRunOptions {
     'icon'?: string;
-    'progress'?: boolean;
+    'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    'notify'?: boolean;
+    'main'?: boolean;
+    'sync'?: boolean;
     'taskId'?: number;
 }
 
@@ -367,6 +372,7 @@ export interface ITask {
     /** --- 当前 app 运行路径，末尾包含 / --- */
     'path': string;
     'files': Record<string, Blob | string>;
+    'main': boolean;
 
     /** --- 已申请的权限列表 --- */
     'permissions': Record<string, any>;