clickgo 3.0.4-dev5 → 3.0.7-dev8

package/dist/lib/native.ts

@@ -15,23 +15,6 @@
  */
 import * as clickgo from '../clickgo';
 
-/** --- 最后一个 send ID --- */
-let sendId = 0;
-// --- sendList 一定会被清理 ---
-let sendList: Array<{
-    'id': number;
-    'name': string;
-    'param': string | undefined;
-}> = [];
-
-/** --- 监听的 listener，需要调用者手动清理（或者 task 结束后自动会被清理，未设置 taskId 的则不会自动清理） --- */
-const listeners: Record<string, Array<{
-    'id': number;
-    'once': boolean;
-    'taskId'?: number;
-    'handler': (param?: string) => void | Promise<void>;
-}>> = {};
-
 const token = (Math.random() * 100000000000000 * (100 + Math.round(Math.random() * (999 - 100)))).toString(32);
 /**
  * --- 获取 native 通讯 token，app 模式下无效 ---
@@ -40,217 +23,29 @@ export function getToken(): string {
     return token;
 }
 
-/**
- * --- 获取已经创建的监听列表 ---
- */
-export function getListeners(): Array<{ 'id': number; 'name': string; 'once': boolean; 'taskId'?: number; }> {
-    const list = [];
-    for (const name in listeners) {
-        for (const item of listeners[name]) {
-            list.push({
-                'id': item.id,
-                'name': name,
-                'once': item.once,
-                'taskId': item.taskId
-            });
-        }
-    }
-    return list;
-}
-
 /**
  * --- 向 native 发送指令 ---
  * @param name 指令名
  * @param param 参数
- * @param handler 回调
- * @param taskId 仅在任务活跃时可监听，App 模式下无效
  */
-export function send(
-    name: string,
-    param?: string,
-    handler?: (param?: string) => void | Promise<void>,
-    taskId?: number
-): number {
-    if (!clickgo.getNative()) {
-        return 0;
-    }
-    const id = ++sendId;
-    sendList.push({
-        'id': id,
-        'name': name,
-        'param': param
-    });
-    if (handler) {
-        on(name, handler, id, true, taskId);
-    }
-    return id;
-}
-
-/**
- * --- 监听 native 传递的指令 ---
- * @param name 指令名
- * @param handler 指令接收回调
- * @param id 可选，监听特定 id 的指令
- * @param once 可选，默认为非一次性监听
- * @param taskId 仅在任务活跃时可监听，App 模式下无效
- */
-export function on(
-    name: string,
-    handler: (param?: string) => void | Promise<void>,
-    id?: number,
-    once: boolean = false,
-    taskId?: number
-): void {
+export function invoke(name: string, ...param: any[]): any {
     if (!clickgo.getNative()) {
         return;
     }
-    if (!listeners[name]) {
-        listeners[name] = [];
-    }
-    listeners[name].push({
-        'id': id ?? 0,
-        'once': once,
-        'taskId': taskId,
-        'handler': handler
-    });
-}
-
-/**
- * --- 监听一次 native 传递的指令 ---
- * @param name 指令名
- * @param handler 指令接收回调
- * @param id 可选，监听特定 id 的指令
- * @param taskId 仅在任务活跃时可监听，App 模式下无效
- */
-export function once(
-    name: string,
-    handler: (param?: string) => void | Promise<void>,
-    id?: number,
-    taskId?: number
-): void {
-    on(name, handler, id, true, taskId);
-}
-
-/**
- * --- 取消监听 native 指令 ---
- * @param name 指令名
- * @param handler 绑定监听时的回调函数
- * @param taskId 校验 taskId，为空则不校验，但 App 模式下无效
- */
-export function off(name: string, handler: (param?: string) => void | Promise<void>, taskId?: number): void {
-    if (!listeners[name]) {
-        return;
-    }
-    for (let i = 0; i < listeners[name].length; ++i) {
-        if (listeners[name][i].handler !== handler) {
-            continue;
-        }
-        if (taskId && (listeners[name][i].taskId !== taskId)) {
-            continue;
-        }
-        listeners[name].splice(i, 1);
-        if (listeners[name].length === 0) {
-            delete listeners[name];
-            break;
-        }
-        --i;
-    }
-}
-
-/**
- * --- 清除某个 task 当中的全部本地监听 ---
- * @param taskId 要清除的 task id，App 模式下无效
- */
-export function clearListener(taskId?: number): void {
-    if (!taskId) {
-        return;
-    }
-    for (const name in listeners) {
-        for (let i = 0; i < listeners[name].length; ++i) {
-            if (listeners[name][i].taskId !== taskId) {
-                continue;
-            }
-            listeners[name].splice(i, 1);
-            if (listeners[name].length === 0) {
-                delete listeners[name];
-                break;
-            }
-        }
-    }
+    return (window as any).clickgoNative.invoke(name, ...param);
 }
 
 // --- 常见操作 ---
 
 export function max(): void {
-    send('cg-set-state', JSON.stringify({
-        'token': token,
-        'state': 'max'
-    }));
+    invoke('cg-set-state', token, 'max');
 }
 export function min(): void {
-    send('cg-set-state', JSON.stringify({
-        'token': token,
-        'state': 'min'
-    }));
+    invoke('cg-set-state', token, 'min');
 }
 export function restore(): void {
-    send('cg-set-state', JSON.stringify({
-        'token': token,
-        'state': 'restore'
-    }));
+    invoke('cg-set-state', token, 'restore');
 }
 export function size(width: number, height: number): void {
-    send('cg-set-size', JSON.stringify({
-        'token': token,
-        'width': width,
-        'height': height
-    }));
-}
-
-// --- 以下为供 native 调用的内部函数 ---
-
-// --- 将 send 值全部提交给 native ---
-export function cgInnerGetSends(): string {
-    const json = JSON.stringify(sendList);
-    sendList = [];
-    return json;
+    invoke('cg-set-size', token, width, height);
 }
-
-// --- 供 native 调用的回调数据（执行结果） ---
-export function cgInnerReceive(id: number, name: string, result?: string): void {
-    if (!listeners[name]) {
-        return;
-    }
-    for (let i = 0; i < listeners[name].length; ++i) {
-        const item = listeners[name][i];
-        if (item.id > 0) {
-            if (item.id !== id) {
-                continue;
-            }
-            const r = item.handler(result);
-            if (r instanceof Promise) {
-                r.catch(function(e) {
-                    console.log(e);
-                });
-            }
-        }
-        else {
-            const r = item.handler(result);
-            if (r instanceof Promise) {
-                r.catch(function(e) {
-                    console.log(e);
-                });
-            }
-        }
-        if (item.once) {
-            listeners[name].splice(i, 1);
-            --i;
-        }
-    }
-}
-
-(window as any).clickGoNative = {
-    isReady: true,
-    cgInnerGetSends: cgInnerGetSends,
-    cgInnerReceive: cgInnerReceive
-};

package/dist/lib/task.js

@@ -170,7 +170,8 @@ function run(url, opt = {}) {
         }) : undefined;
         const app = yield core.fetchApp(url, {
             'notifyId': notifyId,
-            'current': ntask ? ntask.path : undefined
+            'current': ntask ? ntask.path : undefined,
+            'progress': opt.progress
         });
         if (notifyId) {
             setTimeout(function () {
@@ -276,13 +277,6 @@ 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() + '_');
@@ -311,7 +305,15 @@ function run(url, opt = {}) {
             }
         }
         if (task.id === 1) {
-            clickgo.native.send('cg-init', clickgo.native.getToken());
+            native.invoke('cg-init', native.getToken());
+        }
+        if (clickgo.getNative() && opt.sync) {
+            f.vroot.$refs.form.isNativeSync = true;
+            native.invoke('cg-set-size', native.getToken(), f.vroot.$refs.form.widthData, f.vroot.$refs.form.heightData);
+            window.addEventListener('resize', function () {
+                f.vroot.$refs.form.setPropData('width', window.innerWidth);
+                f.vroot.$refs.form.setPropData('height', window.innerHeight);
+            });
         }
         return task.id;
     });
@@ -323,9 +325,7 @@ function end(taskId) {
         return true;
     }
     if (clickgo.getNative() && task.main) {
-        clickgo.native.send('cg-main-close', JSON.stringify({
-            'token': clickgo.native.getToken()
-        }));
+        native.invoke('cg-close', native.getToken());
     }
     const fid = form.getMaxZIndexID({
         'taskIds': [task.id]
@@ -356,7 +356,6 @@ function end(taskId) {
             clearTimeout(parseFloat(timer));
         }
     }
-    native.clearListener(taskId);
     dom.clearWatchSize(taskId);
     delete exports.list[taskId];
     core.trigger('taskEnded', taskId);
@@ -656,12 +655,12 @@ function refreshSystemPosition() {
             case 'left':
             case 'right': {
                 form.vroot.$refs.form.setPropData('width', 'auto');
-                form.vroot.$refs.form.setPropData('height', document.body.clientHeight);
+                form.vroot.$refs.form.setPropData('height', window.innerHeight);
                 break;
             }
             case 'top':
             case 'bottom': {
-                form.vroot.$refs.form.setPropData('width', document.body.clientWidth);
+                form.vroot.$refs.form.setPropData('width', window.innerWidth);
                 form.vroot.$refs.form.setPropData('height', 'auto');
                 break;
             }
@@ -676,7 +675,7 @@ function refreshSystemPosition() {
                 }
                 case 'right': {
                     exports.systemTaskInfo.length = form.vroot.$el.offsetWidth;
-                    form.vroot.$refs.form.setPropData('left', document.body.clientWidth - exports.systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('left', window.innerWidth - exports.systemTaskInfo.length);
                     form.vroot.$refs.form.setPropData('top', 0);
                     break;
                 }
@@ -689,7 +688,7 @@ function refreshSystemPosition() {
                 case 'bottom': {
                     exports.systemTaskInfo.length = form.vroot.$el.offsetHeight;
                     form.vroot.$refs.form.setPropData('left', 0);
-                    form.vroot.$refs.form.setPropData('top', document.body.clientHeight - exports.systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('top', window.innerHeight - exports.systemTaskInfo.length);
                     break;
                 }
             }

package/dist/lib/task.ts

@@ -222,7 +222,8 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     }) : undefined;
     const app: types.IApp | null = await core.fetchApp(url, {
         'notifyId': notifyId,
-        'current': ntask ? ntask.path : undefined
+        'current': ntask ? ntask.path : undefined,
+        'progress': opt.progress
     });
     if (notifyId) {
         setTimeout(function(): void {
@@ -339,13 +340,6 @@ 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;
@@ -378,7 +372,16 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     }
     // --- 给 native 发送任务启动成功的消息 ---
     if (task.id === 1) {
-        clickgo.native.send('cg-init', clickgo.native.getToken());
+        native.invoke('cg-init', native.getToken());
+    }
+    // --- 提交 sync ---
+    if (clickgo.getNative() && opt.sync) {
+        f.vroot.$refs.form.isNativeSync = true;
+        native.invoke('cg-set-size', native.getToken(), f.vroot.$refs.form.widthData, f.vroot.$refs.form.heightData);
+        window.addEventListener('resize', function(): void {
+            f.vroot.$refs.form.setPropData('width', window.innerWidth);
+            f.vroot.$refs.form.setPropData('height', window.innerHeight);
+        });
     }
     return task.id;
 }
@@ -394,9 +397,7 @@ export function end(taskId: number): boolean {
     }
     // --- 如果是 native 模式 ---
     if (clickgo.getNative() && task.main) {
-        clickgo.native.send('cg-main-close', JSON.stringify({
-            'token': clickgo.native.getToken()
-        }));
+        native.invoke('cg-close', native.getToken());
     }
     // --- 获取最大的 z index 窗体，并让他获取焦点 ---
     const fid = form.getMaxZIndexID({
@@ -433,7 +434,6 @@ export function end(taskId: number): boolean {
         }
     }
     // --- 移除各类监听 ---
-    native.clearListener(taskId);
     dom.clearWatchSize(taskId);
     // --- 移除 task ---
     delete list[taskId];
@@ -815,12 +815,12 @@ export function refreshSystemPosition(): void {
             case 'left':
             case 'right': {
                 form.vroot.$refs.form.setPropData('width', 'auto');
-                form.vroot.$refs.form.setPropData('height', document.body.clientHeight);
+                form.vroot.$refs.form.setPropData('height', window.innerHeight);
                 break;
             }
             case 'top':
             case 'bottom': {
-                form.vroot.$refs.form.setPropData('width', document.body.clientWidth);
+                form.vroot.$refs.form.setPropData('width', window.innerWidth);
                 form.vroot.$refs.form.setPropData('height', 'auto');
                 break;
             }
@@ -835,7 +835,7 @@ export function refreshSystemPosition(): void {
                 }
                 case 'right': {
                     systemTaskInfo.length = form.vroot.$el.offsetWidth;
-                    form.vroot.$refs.form.setPropData('left', document.body.clientWidth - systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('left', window.innerWidth - systemTaskInfo.length);
                     form.vroot.$refs.form.setPropData('top', 0);
                     break;
                 }
@@ -848,7 +848,7 @@ export function refreshSystemPosition(): void {
                 case 'bottom': {
                     systemTaskInfo.length = form.vroot.$el.offsetHeight;
                     form.vroot.$refs.form.setPropData('left', 0);
-                    form.vroot.$refs.form.setPropData('top', document.body.clientHeight - systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('top', window.innerHeight - systemTaskInfo.length);
                     break;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.0.4-dev5",
+  "version": "3.0.7-dev8",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",

package/types/index.d.ts

@@ -61,10 +61,12 @@ export interface IGlobalEvents {
     taskStartedHandler: null | ((taskId: number) => void | Promise<void>);
     /** --- 任务结束后触发 --- */
     taskEndedHandler: null | ((taskId: number) => void | Promise<void>);
+    /** --- launcher 的文件夹名称被修改后触发 --- */
+    launcherFolderNameChangedHandler: null | ((id: string, name: string) => void | Promise<void>);
 }
 
 /** --- Core Config 属性列表 --- */
-export type TConfigName = 'locale' | 'task.position' | 'task.pin' | 'desktop.icon.storage' | 'desktop.icon.recycler' | 'desktop.wallpaper' | 'desktop.path';
+export type TConfigName = 'locale' | 'task.position' | 'task.pin' | 'desktop.icon.storage' | 'desktop.icon.recycler' | 'desktop.wallpaper' | 'desktop.path' | 'launcher.list';
 
 /** --- Config 对象 --- */
 export interface IConfig {
@@ -75,10 +77,20 @@ export interface IConfig {
     ['desktop.icon.recycler']: boolean;
     ['desktop.wallpaper']: string | null;
     ['desktop.path']: string | null;
+    ['launcher.list']: IConfigLauncherItem[];
+}
+
+/** --- Launcher 的 item 对象 --- */
+export interface IConfigLauncherItem {
+    'id'?: string;
+    'name': string;
+    'path'?: string;
+    'icon'?: string;
+    'list'?: Array<{ 'id'?: string; 'name': string; 'path': string; 'icon': string; }>;
 }
 
 /** --- 全局事件类型 --- */
-export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCreated' | 'formRemoved' | 'formTitleChanged' | 'formIconChanged' | 'formStateMinChanged' | 'formStateMaxChanged' | 'formShowChanged' | 'formFocused' | 'formBlurred' | 'formFlash' | 'taskStarted' | 'taskEnded';
+export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCreated' | 'formRemoved' | 'formTitleChanged' | 'formIconChanged' | 'formStateMinChanged' | 'formStateMaxChanged' | 'formShowChanged' | 'formFocused' | 'formBlurred' | 'formFlash' | 'taskStarted' | 'taskEnded' | 'launcherFolderNameChanged';
 
 export interface ICoreFetchAppOptions {
     'notifyId'?: number;
@@ -627,6 +639,7 @@ export interface IVueObject {
         cb: (n: any, o: any) => void | Promise<void>,
         opt: Record<string, string | boolean>
     ): void;
+    h(tag: string, props?: Record<string, any> | any[], list?: any[]): any;
 }
 
 export type IVueOptionMergeFunction = (to: unknown, from: unknown, instance: IVue) => any;