clickgo 3.1.0-dev9 → 3.1.1-dev10

package/dist/app/demo/form/control/dialog/dialog.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.data = void 0;
-exports.data = {
-    'message': 'message',
-    'buttons': ['OK'],
-    'btn': 'none'
-};
+const clickgo = require("clickgo");
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.message = 'message';
+        this.buttons = ['OK'];
+        this.btn = 'none';
+    }
+}
+exports.default = default_1;

package/dist/app/demo/form/main.js

@@ -11,6 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const clickgo = require("clickgo");
 const form_1 = require("./control/form/form");
+const dialog_1 = require("./control/dialog/dialog");
+const form_2 = require("./method/form/form");
 class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
@@ -20,10 +22,22 @@ class default_1 extends clickgo.form.AbstractForm {
         return __awaiter(this, void 0, void 0, function* () {
             let frm = 0;
             switch (name) {
+                case 'cblock': {
+                    frm = yield this.createForm('control/block/block');
+                    break;
+                }
                 case 'cform': {
                     frm = yield form_1.default.create();
                     break;
                 }
+                case 'cdialog': {
+                    frm = yield dialog_1.default.create();
+                    break;
+                }
+                case 'mform': {
+                    frm = yield form_2.default.create();
+                    break;
+                }
             }
             if (typeof frm === 'number') {
                 return;

package/dist/app/demo/form/main.xml

@@ -11,9 +11,9 @@
                 <button @click="openForm('control', 'tab')">Tab</button>
                 <button @click="openForm('control', 'label')">Label</button>
                 <button @click="openForm('control', 'loading')">Loading</button>
-                <button @click="openForm('control', 'dialog')">Dialog</button>
+                <button @click="openForm('cdialog')">Dialog</button>
                 <button @click="openForm('control', 'file')">File</button>
-                <button @click="openForm('control', 'block')">Block</button>
+                <button @click="openForm('cblock')">Block</button>
                 <button @click="openForm('control', 'overflow')">Overflow</button>
                 <button @click="openForm('control', 'view')">View</button>
                 <button @click="openForm('control', 'greatview')">Greatview</button>
@@ -30,7 +30,7 @@
             <layout class="buttons" gutter="10" direction="v">
                 <button @click="openForm('method', 'core')">Library core</button>
                 <button @click="openForm('method', 'dom')">Library dom</button>
-                <button @click="openForm('method', 'form')">Library form</button>
+                <button @click="openForm('mform')">Library form</button>
                 <button @click="openForm('method', 'fs')">Library fs</button>
                 <button @click="openForm('method', 'task')">Library task</button>
                 <button @click="openForm('method', 'theme')">Library theme</button>

package/dist/app/demo/form/method/form/form.js

@@ -9,76 +9,76 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mounted = exports.receive = exports.methods = exports.data = void 0;
 const clickgo = require("clickgo");
-exports.data = {
-    'fid': '0',
-    'sendValue': 'sendValue',
-    'tid': '0',
-    'type': 'primary',
-    'progress': 'noraml',
-    'dialogResult': '',
-    'setTopMostValue': false
-};
-exports.methods = {
-    min: function () {
-        clickgo.form.min();
-    },
-    max: function () {
-        clickgo.form.max();
-    },
-    close: function () {
-        clickgo.form.close();
-    },
-    bindResize: function (e) {
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.fid = '0';
+        this.sendValue = 'sendValue';
+        this.tid = '0';
+        this.type = 'primary';
+        this.progress = 'noraml';
+        this.dr = '';
+        this.setTopMostValue = false;
+    }
+    min() {
+        clickgo.form.min(this.formId);
+    }
+    max() {
+        clickgo.form.max(this.formId);
+    }
+    close() {
+        clickgo.form.close(this.formId);
+    }
+    bindResize(e) {
         clickgo.form.bindResize(e, 'rb');
-    },
-    bindDrag: function (e) {
+    }
+    bindDrag(e) {
         clickgo.form.bindDrag(e);
-    },
-    getTaskId: function () {
+    }
+    getTaskId() {
         clickgo.form.dialog(clickgo.form.getTaskId(parseInt(this.fid)).toString()).catch((e) => { throw e; });
-    },
-    get: function () {
+    }
+    get() {
         clickgo.form.dialog(JSON.stringify(clickgo.form.get(parseInt(this.fid)))).catch((e) => { throw e; });
-    },
-    send: function () {
+    }
+    send() {
         clickgo.form.send(parseInt(this.fid), {
             'key': this.sendValue
         });
-    },
-    changeFocus: function () {
+    }
+    changeFocus() {
         clickgo.form.changeFocus(parseInt(this.fid));
-    },
-    getList: function () {
+    }
+    getList() {
         let str = JSON.stringify(clickgo.form.getList(this.taskId));
         str = str.replace(/"icon":"(.*?)"/g, function (t, t1) {
             return `"icon":"${t1 ? (t1.slice(0, 10) + '...') : t1}"`;
         });
         clickgo.form.dialog(`<overflow direction="v" style="width: 200px; height: 80px;">${str}</overflow>`).catch((e) => { throw e; });
-    },
-    getMaxZIndexID: function () {
+    }
+    getMaxZIndexID() {
         const fid = clickgo.form.getMaxZIndexID();
         clickgo.form.dialog(JSON.stringify(fid)).catch((e) => { throw e; });
-    },
-    getRectByBorder: function () {
+    }
+    getRectByBorder() {
         const size = clickgo.form.getRectByBorder('rb');
         clickgo.form.dialog(JSON.stringify(size)).catch((e) => { throw e; });
-    },
-    showCircular: function (e) {
+    }
+    showCircular(e) {
         clickgo.form.showCircular(e.clientX, e.clientY);
-    },
-    showRectangle: function (e) {
+    }
+    showRectangle(e) {
         return __awaiter(this, void 0, void 0, function* () {
             clickgo.form.showRectangle(e.clientX, e.clientY, 'rb');
             yield clickgo.tool.sleep(1000);
             clickgo.form.hideRectangle();
         });
-    },
-    showDrag: function () {
+    }
+    showDrag() {
         return __awaiter(this, void 0, void 0, function* () {
             clickgo.form.showDrag();
-            const rect = this.$refs.showDrag.$el.getBoundingClientRect();
+            const rect = this.refs.showDrag.$el.getBoundingClientRect();
             clickgo.form.moveDrag({
                 'left': rect.left,
                 'top': rect.top,
@@ -88,8 +88,8 @@ exports.methods = {
             yield clickgo.tool.sleep(1000);
             clickgo.form.hideDrag();
         });
-    },
-    notify: function () {
+    }
+    notify() {
         return __awaiter(this, void 0, void 0, function* () {
             let icon = null;
             if (this.progress === 'progress + icon') {
@@ -117,56 +117,59 @@ exports.methods = {
                 clickgo.form.notifyProgress(nid, 100);
             }
         });
-    },
-    showPop: function (e) {
+    }
+    showPop(e) {
         if (!e.currentTarget) {
             return;
         }
-        clickgo.form.showPop(e.currentTarget, this.$refs.pop, 'v');
-    },
-    createParam: function () {
+        clickgo.form.showPop(e.currentTarget, this.refs.pop, 'v');
+    }
+    createParam() {
         clickgo.form.create({
             'layout': '<form width=\'300\' height=\'300\' title=\'normal\'></form>'
         }).catch((e) => { throw e; });
-    },
-    createPath: function () {
-        clickgo.form.create('test').then((e) => { console.log(e); }).catch((e) => { throw e; });
-    },
-    createTop: function () {
-        clickgo.form.create({
-            'layout': '<form width=\'300\' height=\'300\' title=\'normal\'></form>',
-            'topMost': true
-        }).catch((e) => { throw e; });
-    },
-    dialog: function () {
+    }
+    createPath() {
+        this.createForm('test').then((e) => { console.log(e); }).catch((e) => { throw e; });
+    }
+    createTop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const frm = yield this.createForm('test');
+            if (typeof frm === 'number') {
+                return;
+            }
+            frm.topMost = true;
+        });
+    }
+    dialog() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dialogResult = yield clickgo.form.dialog('Hello world!');
+            this.dr = yield clickgo.form.dialog('Hello world!');
         });
-    },
-    dialogLong: function () {
+    }
+    dialogLong() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dialogResult = yield clickgo.form.dialog('longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong');
+            this.dr = yield clickgo.form.dialog('longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong');
         });
-    },
-    dialogTitle: function () {
+    }
+    dialogTitle() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dialogResult = yield clickgo.form.dialog({
+            this.dr = yield clickgo.form.dialog({
                 'title': 'Title',
                 'content': 'Hello world!'
             });
         });
-    },
-    dialogButtons: function () {
+    }
+    dialogButtons() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dialogResult = yield clickgo.form.dialog({
+            this.dr = yield clickgo.form.dialog({
                 'content': 'Hello world!',
                 'buttons': ['A', 'B', 'C']
             });
         });
-    },
-    dialogCannot: function () {
+    }
+    dialogCannot() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dialogResult = yield clickgo.form.dialog({
+            this.dr = yield clickgo.form.dialog({
                 'content': 'Hello world!',
                 'buttons': ['Do not close', 'Close'],
                 'select': (e, button) => {
@@ -176,42 +179,41 @@ exports.methods = {
                 }
             });
         });
-    },
-    confirm: function (cancel) {
+    }
+    confirm(cancel) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dialogResult = yield clickgo.form.confirm({
+            this.dr = yield clickgo.form.confirm({
                 'content': 'Hello world?',
                 'cancel': cancel
             });
-            if (typeof this.dialogResult === 'boolean') {
-                this.dialogResult = this.dialogResult ? 'true (boolean)' : 'false (boolean)';
+            if (typeof this.dr === 'boolean') {
+                this.dr = this.dr ? 'true (boolean)' : 'false (boolean)';
             }
             else {
-                this.dialogResult = this.dialogResult.toString() + ' (number)';
+                this.dr = this.dr.toString() + ' (number)';
             }
         });
-    },
-    setTopMost: function () {
+    }
+    setTopMost() {
         this.setTopMostValue = !this.setTopMostValue;
-        clickgo.form.setTopMost(this.setTopMostValue);
-    },
-    flash: function () {
-        clickgo.form.flash();
-    },
-    hide: function () {
+        this.topMost = this.setTopMostValue;
+    }
+    flash() {
+        clickgo.form.flash(this.formId);
+    }
+    hhide() {
         return __awaiter(this, void 0, void 0, function* () {
-            clickgo.form.hide();
+            this.hide();
             yield clickgo.tool.sleep(1000);
-            clickgo.form.show();
+            this.show();
         });
     }
-};
-const receive = function (obj) {
-    clickgo.form.dialog(JSON.stringify(obj)).catch((e) => { throw e; });
-};
-exports.receive = receive;
-const mounted = function () {
-    this.fid = this.formId;
-    this.tid = this.taskId;
-};
-exports.mounted = mounted;
+    onReceive(obj) {
+        clickgo.form.dialog(JSON.stringify(obj)).catch((e) => { throw e; });
+    }
+    onMounted() {
+        this.fid = this.formId.toString();
+        this.tid = this.taskId.toString();
+    }
+}
+exports.default = default_1;

package/dist/app/demo/form/method/form/form.xml

@@ -1,11 +1,11 @@
-<form width="350" height="400" title="Library form" padding="10">
-    <overflow direction="v" style="flex: 1;">
+<form width="350" height="400" title="Library form">
+    <overflow direction="v" style="flex: 1; padding: 10px;">
         <layout gutter="10" direction="v" style="flex: 1;">
-            <button @click="min" style="height: 30px;">min()</button>
-            <button @click="max" style="height: 30px;">max()</button>
-            <button @click="close" style="height: 30px;">close()</button>
+            <button @click="min" style="height: 30px;">min({{formId}})</button>
+            <button @click="max" style="height: 30px;">max({{formId}})</button>
+            <button @click="close" style="height: 30px;">close({{formId}})</button>
             <label @mousedown="bindResize" @touchstart="bindResize" style="padding: 20px; background: rgba(0, 0, 0, .1); cursor: se-resize;">bindResize(e, 'rb')</label>
-            <label @mousedown="bindDrag" @touchstart="bindDrag" style="padding: 20px; background: rgba(0, 0, 0, .1);">bindDrag(e)</label>
+            <label @mousedown="bindDrag" @touchstart="bindDrag" style="padding: 20px; background: rgba(0, 0, 0, .1); cursor: move;">bindDrag(e)</label>
             <layout gutter="10" align-v="center">
                 <label>Form ID:</label>
                 <text v-model="fid" style="flex: 1; width: 0; height: 30px;"></text>
@@ -37,10 +37,9 @@
             <teleport to="#cg-pop-list">
                 <block ref="pop" data-cg-pop style="border: solid 1px #000; background: #FFF; width: 200px; height: 100px; display: flex; justify-content: center; align-items: center;">$refs.pop</block>
             </teleport>
-            <button @click="createParam" style="height: 30px;">create({'layout':'xxx'})</button>
             <button @click="createPath" style="height: 30px;">create('test')</button>
             <button @click="createTop" style="height: 30px;">create({'layout':'xxx','topMost':true})</button>
-            <label>Dialog result: {{dialogResult}}.</label>
+            <label>Dialog result: {{dr}}.</label>
             <button @click="dialog" style="height: 30px;">dialog('Hello world!')</button>
             <button @click="dialogLong">dialog('long...')</button>
             <button @click="dialogTitle" style="height: 30px;">dialog({'title':'Title','content':'Hello world!'})</button>
@@ -49,8 +48,8 @@
             <button @click="confirm(false)" style="height: 30px;">confirm('confirm')</button>
             <button @click="confirm(true)" style="height: 30px;">confirm({'content':'confirm','cancel':true})</button>
             <button @click="setTopMost" style="height: 30px;">setTopMost({{setTopMostValue ? 'false' : 'true'}})</button>
-            <button @click="flash" style="height: 30px;">flash()</button>
-            <button @click="hide" style="height: 30px;">hide() and show()</button>
+            <button @click="flash" style="height: 30px;">flash({{formId}})</button>
+            <button @click="hhide" style="height: 30px;">hide({{formId}}) and show({{formId}})</button>
         </layout>
     </overflow>
 </form>

package/dist/index.ts

@@ -1,5 +1,5 @@
 // npm publish --tag dev --access public
-import * as types from '~/types';
+import * as types from '../types/index';
 
 // --- 以下不会真正加载，最终会在底部进行赋值 ---
 export let clickgo: typeof import('./clickgo');

package/dist/lib/form.js

@@ -58,7 +58,7 @@ class AbstractForm {
         this._firstShow = true;
         this.dialogResult = '';
     }
-    static create(data) {
+    static create(data, layout) {
         return __awaiter(this, void 0, void 0, function* () {
             const frm = new this();
             const code = {
@@ -98,9 +98,12 @@ 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;
@@ -197,6 +200,21 @@ class AbstractForm {
         }
         core.trigger(name, this.taskId, this.formId, param1, param2);
     }
+    createForm(path, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            path = tool.urlResolve(this.filename, path);
+            const taskId = this.taskId;
+            const cls = class extends AbstractForm {
+                get filename() {
+                    return path + '.js';
+                }
+                get taskId() {
+                    return taskId;
+                }
+            };
+            return cls.create(data);
+        });
+    }
     get topMost() {
         return false;
     }
@@ -812,31 +830,31 @@ function changeFocus(formId = 0) {
     }
     const taskId = parseInt((_b = el.getAttribute('data-task-id')) !== null && _b !== void 0 ? _b : '0');
     const t = task.list[taskId];
-    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;
-    }
     if (t.runtime.dialogFormIds.length) {
         const dialogFormId = t.runtime.dialogFormIds[t.runtime.dialogFormIds.length - 1];
+        if (get(dialogFormId).stateMin) {
+            min(dialogFormId);
+        }
+        if (t.forms[dialogFormId].vroot._topMost) {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
+        }
+        else {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
+        }
+        t.forms[dialogFormId].vapp._container.dataset.formFocus = '';
+        t.forms[dialogFormId].vroot._formFocus = true;
+        core.trigger('formFocused', taskId, dialogFormId);
         if (dialogFormId !== formId) {
-            if (get(dialogFormId).stateMin) {
-                min(dialogFormId);
-            }
-            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;
-            }
-            task.list[taskId].forms[dialogFormId].vapp._container.dataset.formFocus = '';
-            task.list[taskId].forms[dialogFormId].vroot._formFocus = true;
-            core.trigger('formFocused', taskId, dialogFormId);
             clickgo.form.flash(dialogFormId, taskId);
         }
     }
     else {
+        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;
+        }
         t.forms[formId].vapp._container.dataset.formFocus = '';
         t.forms[formId].vroot._formFocus = true;
         core.trigger('formFocused', taskId, formId);
@@ -1648,7 +1666,8 @@ function dialog(opt) {
                 'content': opt
             };
         }
-        const taskId = opt.taskId;
+        const nopt = opt;
+        const taskId = nopt.taskId;
         if (!taskId) {
             resolve('');
             return;
@@ -1659,37 +1678,44 @@ function dialog(opt) {
             return;
         }
         const locale = t.locale.lang || core.config.locale;
-        if (opt.buttons === undefined) {
-            opt.buttons = [(_b = (_a = info.locale[locale]) === null || _a === void 0 ? void 0 : _a.ok) !== null && _b !== void 0 ? _b : info.locale['en'].ok];
+        if (nopt.buttons === undefined) {
+            nopt.buttons = [(_b = (_a = info.locale[locale]) === null || _a === void 0 ? void 0 : _a.ok) !== null && _b !== void 0 ? _b : info.locale['en'].ok];
         }
-        create({
-            'code': {
-                data: {
-                    'buttons': opt.buttons
-                },
-                methods: {
-                    select: function (button) {
-                        var _a, _b;
-                        const event = {
-                            'go': true,
-                            preventDefault: function () {
-                                this.go = false;
-                            }
-                        };
-                        (_b = (_a = opt).select) === null || _b === void 0 ? void 0 : _b.call(_a, event, button);
-                        if (event.go) {
-                            this.dialogResult = button;
-                            close(this.formId);
-                        }
+        const cls = class extends AbstractForm {
+            constructor() {
+                super(...arguments);
+                this.buttons = nopt.buttons;
+            }
+            get taskId() {
+                return taskId;
+            }
+            select(button) {
+                var _a;
+                const event = {
+                    'go': true,
+                    preventDefault: function () {
+                        this.go = false;
                     }
+                };
+                (_a = nopt.select) === null || _a === void 0 ? void 0 : _a.call(nopt, event, button);
+                if (event.go) {
+                    this.dialogResult = button;
+                    close(this.formId);
                 }
-            },
-            'layout': `<form title="${(_c = opt.title) !== null && _c !== void 0 ? _c : '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((fid) => __awaiter(this, void 0, void 0, function* () {
-            resolve(yield t.forms[fid].vroot.showDialog());
-        })).catch((e) => {
-            throw e;
+            }
+        };
+        cls.create(undefined, `<form title="${(_c = nopt.title) !== null && _c !== void 0 ? _c : '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/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 {
         // --- 将在初始化时系统自动重写本函数 ---
@@ -1106,40 +1134,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.zIndexData = ++info.topLastZIndex;
+        }
+        else {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++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.zIndexData = ++info.topLastZIndex;
+        }
+        else {
+            t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
+        }
         // --- 正常开启 focus ---
         t.forms[formId].vapp._container.dataset.formFocus = '';
         t.forms[formId].vroot._formFocus = true;
@@ -2118,7 +2145,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 +2157,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/task.js

@@ -736,6 +736,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);
                 },

package/dist/lib/task.ts

@@ -836,6 +836,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             getBoolean: function(param: boolean | string | number): boolean {
                 return clickgo.tool.getBoolean(param);
             },
+            getNumber: function(param: string | number): number {
+                return clickgo.tool.getNumber(param);
+            },
             escapeHTML: function(html: string): string {
                 return clickgo.tool.escapeHTML(html);
             },

package/dist/lib/tool.ts

@@ -631,5 +631,6 @@ export function execCommand(ac: string): void {
     if (!['copy', 'cut'].includes(ac)) {
         return;
     }
+    // eslint-disable-next-line deprecation/deprecation
     document.execCommand(ac);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.1.0-dev9",
+  "version": "3.1.1-dev10",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",

package/types/index.d.ts

@@ -1,13 +1,13 @@
-export let control: typeof import('../dist/lib/control');
-export let core: typeof import('../dist/lib/core');
-export let dom: typeof import('../dist/lib/dom');
-export let form: typeof import('../dist/lib/form');
-export let fs: typeof import('../dist/lib/fs');
-export let native: typeof import('../dist/lib/native');
-export let task: typeof import('../dist/lib/task');
-export let theme: typeof import('../dist/lib/theme');
-export let tool: typeof import('../dist/lib/tool');
-export let zip: typeof import('../dist/lib/zip');
+export * as control from '../dist/lib/control';
+export * as core from '../dist/lib/core';
+export * as dom from '../dist/lib/dom';
+export * as form from '../dist/lib/form';
+export * as fs from '../dist/lib/fs';
+export * as native from '../dist/lib/native';
+export * as task from '../dist/lib/task';
+export * as theme from '../dist/lib/theme';
+export * as tool from '../dist/lib/tool';
+export * as zip from '../dist/lib/zip';
 
 export function getVersion(): string;
 export function getNative(): boolean;