clickgo 3.1.0-dev9 → 3.1.2-dev11

package/dist/lib/form.ts

@@ -78,7 +78,12 @@ const info: {
 /** --- 窗体的抽象类 --- */
 export class AbstractForm {
 
-    public static async create(data?: Record<string, any>): Promise<AbstractForm | number> {
+    /**
+     * --- 创建窗体工厂函数 ---
+     * @param data 要传递的对象
+     * @param layout 是否使用此参数替换 layout 值
+     */
+    public static async create(data?: Record<string, any>, layout?: string): Promise<AbstractForm | number> {
         const frm = new this();
         /** --- 要挂载的 vue 参数 --- */
         const code: types.IFormCreateCode = {
@@ -118,9 +123,12 @@ export class AbstractForm {
         for (const item of cdata) {
             code.data![item[0]] = item[1];
         }
-        const layout = task.list[frm.taskId].app.files[frm.filename.slice(0, -2) + 'xml'];
-        if (typeof layout !== 'string') {
-            return 0;
+        if (!layout) {
+            const l = task.list[frm.taskId].app.files[frm.filename.slice(0, -2) + 'xml'];
+            if (typeof l !== 'string') {
+                return 0;
+            }
+            layout = l;
         }
         const prot = tool.getClassPrototype(frm);
         code.methods = prot.method;
@@ -285,6 +293,26 @@ export class AbstractForm {
 
     // --- 以下为窗体有，但 control 没有 ---
 
+    /**
+     * --- 无 js 文件的窗体创建 ---
+     * @param path 包内相对于本窗体的路径或包内绝对路径，不含扩展名
+     * @param data 要传递的值
+     */
+    public async createForm(path: string, data?: Record<string, any>): Promise<AbstractForm | number> {
+        path = tool.urlResolve(this.filename, path);
+        const taskId = this.taskId;
+        const cls = class extends AbstractForm {
+            public get filename(): string {
+                return path + '.js';
+            }
+
+            public get taskId(): number {
+                return taskId;
+            }
+        };
+        return cls.create(data);
+    }
+
     /** --- 是否是置顶 --- */
     public get topMost(): boolean {
         // --- 将在初始化时系统自动重写本函数 ---
@@ -324,7 +352,7 @@ export class AbstractForm {
     public show(): void {
         // --- 创建成功的窗体，可以直接显示 ---
         const v = this as any;
-        v.$refs.form.$data.showData = true;
+        v.$refs.form.$data.isShow = true;
         if (this._firstShow) {
             this._firstShow = false;
             // --- 将窗体居中 ---
@@ -337,7 +365,7 @@ export class AbstractForm {
                     v.$refs.form.setPropData('top', (area.height - v.$el.offsetHeight) / 2);
                 }
             }
-            v.$refs.form.$data.showData = true;
+            v.$refs.form.$data.isShow = true;
             changeFocus(this.formId);
         }
     }
@@ -346,6 +374,7 @@ export class AbstractForm {
      * --- 显示独占的窗体 ---
      */
     public async showDialog(): Promise<string> {
+        this.topMost = true;
         this.show();
         task.list[this.taskId].runtime.dialogFormIds.push(this.formId);
         return new Promise((resolve) => {
@@ -360,7 +389,7 @@ export class AbstractForm {
      */
     public hide(): void {
         const v = this as any;
-        v.$refs.form.$data.showData = false;
+        v.$refs.form.$data.isShow = false;
     }
 
     /**
@@ -547,7 +576,8 @@ const elements: {
         /** --- clickgo 所有的 div wrap --- */
         this.wrap.id = 'cg-wrap';
         document.getElementsByTagName('body')[0].appendChild(this.wrap);
-        if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) {
+        if (clickgo.isImmersion()) {
+            // --- 只有沉浸式模式（Windows 下非 frame 的 native）才会绑定这个事件 ---
             this.wrap.addEventListener('mouseenter', function() {
                 native.invoke('cg-mouse-ignore', native.getToken(), false);
             });
@@ -1012,10 +1042,10 @@ export function get(formId: number): types.IFormInfo | null {
     return {
         'taskId': taskId,
         'title': item.vroot.$refs.form.title,
-        'icon': item.vroot.$refs.form.iconData,
+        'icon': item.vroot.$refs.form.iconDataUrl,
         'stateMax': item.vroot.$refs.form.stateMaxData,
         'stateMin': item.vroot.$refs.form.stateMinData,
-        'show': item.vroot.$refs.form.showData,
+        'show': item.vroot.$refs.form.isShow,
         'focus': item.vroot.formFocus
     };
 }
@@ -1048,10 +1078,10 @@ export function getList(taskId: number): Record<string, types.IFormInfo> {
         list[fid] = {
             'taskId': taskId,
             'title': item.vroot.$refs.form.title,
-            'icon': item.vroot.$refs.form.iconData,
+            'icon': item.vroot.$refs.form.iconDataUrl,
             'stateMax': item.vroot.$refs.form.stateMaxData,
             'stateMin': item.vroot.$refs.form.stateMinData,
-            'show': item.vroot.$refs.form.showData,
+            'show': item.vroot.$refs.form.isShow,
             'focus': item.vroot.formFocus
         };
     }
@@ -1106,40 +1136,39 @@ export function changeFocus(formId: number = 0): void {
     // --- 获取所属的 taskId ---
     const taskId: number = parseInt(el.getAttribute('data-task-id') ?? '0');
     const t = task.list[taskId];
-    // --- 如果不是自定义的 zindex，则设置 zIndex 为最大 ---
-    if (t.forms[formId].vroot._topMost) {
-        t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
-    }
-    else {
-        t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
-    }
     // --- 检测是否有 dialog mask 层 ---
     if (t.runtime.dialogFormIds.length) {
         // --- 有 dialog ---
         const dialogFormId = t.runtime.dialogFormIds[t.runtime.dialogFormIds.length - 1];
-        // --- 的判断点击的窗体是不是就是 dialog mask 窗体本身 ---
+        // --- 如果是最小化状态的话，需要还原 ---
+        if (get(dialogFormId)!.stateMin) {
+            min(dialogFormId);
+        }
+        if (t.forms[dialogFormId].vroot._topMost) {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
+        }
+        else {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
+        }
+        // --- 开启 focus ---
+        t.forms[dialogFormId].vapp._container.dataset.formFocus = '';
+        t.forms[dialogFormId].vroot._formFocus = true;
+        // --- 触发 formFocused 事件 ---
+        core.trigger('formFocused', taskId, dialogFormId);
+        // --- 判断点击的窗体是不是就是 dialog mask 窗体本身 ---
         if (dialogFormId !== formId) {
-            // --- 如果是最小化状态的话，需要还原 ---
-            if (get(dialogFormId)!.stateMin) {
-                min(dialogFormId);
-            }
-            // --- 如果不是自定义的 zindex，则设置 zIndex 为最大 ---
-            if (task.list[taskId].forms[dialogFormId].vroot._topMost) {
-                task.list[taskId].forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
-            }
-            else {
-                task.list[taskId].forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
-            }
-            // --- 开启 focus ---
-            task.list[taskId].forms[dialogFormId].vapp._container.dataset.formFocus = '';
-            task.list[taskId].forms[dialogFormId].vroot._formFocus = true;
-            // --- 触发 formFocused 事件 ---
-            core.trigger('formFocused', taskId, dialogFormId);
             // --- 闪烁 ---
             clickgo.form.flash(dialogFormId, taskId);
         }
     }
     else {
+        // --- 没有 dialog，才修改 zindex ---
+        if (t.forms[formId].vroot._topMost) {
+            t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
+        }
+        else {
+            t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
+        }
         // --- 正常开启 focus ---
         t.forms[formId].vapp._container.dataset.formFocus = '';
         t.forms[formId].vroot._formFocus = true;
@@ -1797,13 +1826,13 @@ export function remove(formId: number): boolean {
     let icon = '';
     if (task.list[taskId].forms[formId]) {
         title = task.list[taskId].forms[formId].vroot.$refs.form.title;
-        icon = task.list[taskId].forms[formId].vroot.$refs.form.iconData;
+        icon = task.list[taskId].forms[formId].vroot.$refs.form.iconDataUrl;
         const io = task.list[taskId].runtime.dialogFormIds.indexOf(formId);
         if (io > -1) {
             // --- 取消 dialog mask 记录 ---
             task.list[taskId].runtime.dialogFormIds.splice(io, 1);
         }
-        task.list[taskId].forms[formId].vroot.$refs.form.$data.showData = false;
+        task.list[taskId].forms[formId].vroot.$refs.form.$data.isShow = false;
         setTimeout(function() {
             // --- 获取最大的 z index 窗体，并让他获取焦点 ---
             const fid = getMaxZIndexID({
@@ -1999,13 +2028,13 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
                     changeFocus(form.id);
                 }
                 else {
-                    form.vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
+                    form.vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
                 }
             }
             else {
                 // --- 取消置顶 ---
                 form.vroot.$data._topMost = false;
-                form.vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
+                form.vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
             }
             return;
         }
@@ -2041,7 +2070,7 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
                         'current': t.current,
                         'files': t.app.files
                     });
-                    this.$refs.form.iconData = (icon instanceof Blob) ? await tool.blob2DataUrl(icon) : '';
+                    this.$refs.form.iconDataUrl = (icon instanceof Blob) ? await tool.blob2DataUrl(icon) : '';
                 }
                 // --- 完成 ---
                 resolve({
@@ -2103,7 +2132,16 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
         }
     }
     // --- 触发 formCreated 事件 ---
-    core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconData);
+    core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
+    // --- 判断是否要与 native 实体窗体大小同步 ---
+    if (clickgo.isNative() && (formId === 1) && !clickgo.isImmersion() && !clickgo.hasFrame()) {
+        rtn.vroot.$refs.form.isNativeSync = true;
+        native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
+        window.addEventListener('resize', function(): void {
+            rtn.vroot.$refs.form.setPropData('width', window.innerWidth);
+            rtn.vroot.$refs.form.setPropData('height', window.innerHeight);
+        });
+    }
     return formId;
 }
 
@@ -2118,7 +2156,8 @@ export function dialog(opt: string | types.IFormDialogOptions): Promise<string>
                 'content': opt
             };
         }
-        const taskId = opt.taskId;
+        const nopt = opt;
+        const taskId = nopt.taskId;
         if (!taskId) {
             resolve('');
             return;
@@ -2129,36 +2168,42 @@ export function dialog(opt: string | types.IFormDialogOptions): Promise<string>
             return;
         }
         const locale = t.locale.lang || core.config.locale;
-        if (opt.buttons === undefined) {
-            opt.buttons = [info.locale[locale]?.ok ?? info.locale['en'].ok];
+        if (nopt.buttons === undefined) {
+            nopt.buttons = [info.locale[locale]?.ok ?? info.locale['en'].ok];
         }
-        create({
-            'code': {
-                data: {
-                    'buttons': opt.buttons
-                },
-                methods: {
-                    select: function(this: types.IVue, button: string) {
-                        const event = {
-                            'go': true,
-                            preventDefault: function() {
-                                this.go = false;
-                            }
-                        };
-                        (opt as types.IFormDialogOptions).select?.(event as unknown as Event, button);
-                        if (event.go) {
-                            this.dialogResult = button;
-                            close(this.formId);
-                        }
+        const cls = class extends AbstractForm {
+            public buttons = nopt.buttons;
+
+            public get taskId(): number {
+                return taskId;
+            }
+
+            public select(button: string): void {
+                const event = {
+                    'go': true,
+                    preventDefault: function() {
+                        this.go = false;
                     }
+                };
+                nopt.select?.(event as unknown as Event, button);
+                if (event.go) {
+                    this.dialogResult = button;
+                    close(this.formId);
                 }
-            },
-            'layout': `<form title="${opt.title ?? 'dialog'}" :min="false" :max="false" :resize="false" border="${opt.title ? 'normal' : 'plain'}" direction="v"><dialog :buttons="buttons" @select="select"${opt.direction ? ` direction="${opt.direction}"` : ''}>${opt.content}</dialog></form>`,
-            'taskId': taskId
-        }).then(async (fid: number) => {
-            resolve(await t.forms[fid].vroot.showDialog());
-        }).catch((e) => {
-            throw e;
+            }
+        };
+        cls.create(undefined, `<form title="${nopt.title ?? 'dialog'}" min="false" max="false" resize="false" height="0" border="${nopt.title ? 'normal' : 'plain'}" direction="v"><dialog :buttons="buttons" @select="select"${nopt.direction ? ` direction="${nopt.direction}"` : ''}>${nopt.content}</dialog></form>`).then((frm) => {
+            if (typeof frm === 'number') {
+                resolve('');
+                return;
+            }
+            frm.showDialog().then((v) => {
+                resolve(v);
+            }).catch(() => {
+                resolve('');
+            });
+        }).catch(() => {
+            resolve('');
         });
     });
 }

package/dist/lib/fs.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyFile = exports.copyFolder = exports.readDir = exports.rename = exports.chmod = exports.rmdirDeep = exports.rmdir = exports.mkdir = exports.isFile = exports.isDir = exports.stats = exports.unlink = exports.symlink = exports.readLink = exports.putContent = exports.getContent = void 0;
 const tool = require("./tool");
-const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
+const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/test.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
 function getContent(path, options) {
     return __awaiter(this, void 0, void 0, function* () {
         path = tool.urlResolve('/', path);

package/dist/lib/fs.ts

@@ -8,7 +8,7 @@
 import * as types from '../../types';
 import * as tool from './tool';
 
-const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
+const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/test.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
 
 export async function getContent(path: string, options?: {
     'start'?: number;

package/dist/lib/native.js

@@ -8,7 +8,7 @@ function getToken() {
 }
 exports.getToken = getToken;
 function invoke(name, ...param) {
-    if (!clickgo.getNative()) {
+    if (!clickgo.isNative()) {
         return;
     }
     return window.clickgoNative.invoke(name, ...param);

package/dist/lib/native.ts

@@ -29,7 +29,7 @@ export function getToken(): string {
  * @param param 参数
  */
 export function invoke(name: string, ...param: any[]): any {
-    if (!clickgo.getNative()) {
+    if (!clickgo.isNative()) {
         return;
     }
     return (window as any).clickgoNative.invoke(name, ...param);

package/dist/lib/task.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.run = exports.getList = exports.get = exports.offFrame = exports.onFrame = exports.isMain = exports.setMain = exports.lastId = exports.list = void 0;
+exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.run = exports.getList = exports.get = exports.offFrame = exports.onFrame = exports.lastId = exports.list = void 0;
 const clickgo = require("../clickgo");
 const core = require("./core");
 const dom = require("./dom");
@@ -20,19 +20,6 @@ const fs = require("./fs");
 const native = require("./native");
 exports.list = {};
 exports.lastId = 0;
-let mainTaskId = 0;
-function setMain(taskId) {
-    if (mainTaskId > 0) {
-        return false;
-    }
-    mainTaskId = taskId;
-    return true;
-}
-exports.setMain = setMain;
-function isMain(taskId) {
-    return taskId === mainTaskId;
-}
-exports.isMain = isMain;
 const localeData = {
     'en': {
         'loading': 'Loading...',
@@ -269,12 +256,18 @@ function run(url, opt = {}) {
             getVersion: function () {
                 return clickgo.getVersion();
             },
-            getNative() {
-                return clickgo.getNative();
+            isNative() {
+                return clickgo.isNative();
             },
             getPlatform() {
                 return clickgo.getPlatform();
             },
+            isImmersion() {
+                return clickgo.isImmersion();
+            },
+            hasFrame() {
+                return clickgo.hasFrame();
+            },
             'control': {
                 'AbstractControl': class extends control.AbstractControl {
                     get taskId() {
@@ -619,9 +612,6 @@ function run(url, opt = {}) {
                 }
             },
             'task': {
-                isMain(taskId) {
-                    return isMain(taskId);
-                },
                 onFrame: function (fun, opt = {}) {
                     opt.taskId = taskId;
                     return clickgo.task.onFrame(fun, opt);
@@ -638,7 +628,6 @@ function run(url, opt = {}) {
                 },
                 run: function (url, opt = {}) {
                     opt.taskId = taskId;
-                    opt.main = false;
                     return clickgo.task.run(url, opt);
                 },
                 end: function (tid) {
@@ -736,6 +725,9 @@ function run(url, opt = {}) {
                 getBoolean: function (param) {
                     return clickgo.tool.getBoolean(param);
                 },
+                getNumber: function (param) {
+                    return clickgo.tool.getNumber(param);
+                },
                 escapeHTML: function (html) {
                     return clickgo.tool.escapeHTML(html);
                 },
@@ -823,17 +815,18 @@ function run(url, opt = {}) {
             return -3;
         }
         dom.createToStyleList(taskId);
+        core.trigger('taskStarted', taskId);
+        if (taskId === 1) {
+            native.invoke('cg-init', native.getToken());
+        }
         const appCls = new expo.default();
         yield appCls.main();
         if (!exports.list[taskId].class) {
             delete exports.list[taskId];
             dom.removeFromStyleList(taskId);
+            core.trigger('taskEnded', taskId);
             return -4;
         }
-        core.trigger('taskStarted', taskId);
-        if (taskId === 1) {
-            native.invoke('cg-init', native.getToken());
-        }
         return taskId;
     });
 }
@@ -843,7 +836,7 @@ function end(taskId) {
     if (!task) {
         return true;
     }
-    if (clickgo.getNative() && isMain(taskId)) {
+    if (clickgo.isNative() && (taskId === 1)) {
         native.invoke('cg-close', native.getToken());
     }
     const fid = form.getMaxZIndexID({
@@ -857,7 +850,7 @@ function end(taskId) {
     }
     for (const fid in task.forms) {
         const f = task.forms[fid];
-        core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconData);
+        core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconDataUrl);
         try {
             f.vapp.unmount();
         }