clickgo 3.5.2 → 3.5.4

package/dist/lib/core.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLocation = exports.location = exports.getHash = exports.hash = exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
+exports.back = exports.getLocation = exports.location = exports.getHash = exports.hash = exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
 const clickgo = __importStar(require("../clickgo"));
 const fs = __importStar(require("./fs"));
 const form = __importStar(require("./form"));
@@ -115,6 +115,9 @@ class AbstractApp {
     onFormFlash() {
         return;
     }
+    onFormShowInSystemTaskChange() {
+        return;
+    }
     onTaskStarted() {
         return;
     }
@@ -338,8 +341,8 @@ const globalEvents = {
         }
     }
 };
-function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
+function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '', param3 = true) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20;
     const eventName = 'on' + name[0].toUpperCase() + name.slice(1);
     switch (name) {
         case 'error': {
@@ -384,13 +387,13 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
         }
         case 'formCreated':
         case 'formRemoved': {
-            (_l = (_k = globalEvents)[name]) === null || _l === void 0 ? void 0 : _l.call(_k, taskId, formId, param1, param2);
-            exports.boot === null || exports.boot === void 0 ? void 0 : exports.boot[eventName](taskId, formId, param1, param2);
+            (_l = (_k = globalEvents)[name]) === null || _l === void 0 ? void 0 : _l.call(_k, taskId, formId, param1, param2, param3);
+            exports.boot === null || exports.boot === void 0 ? void 0 : exports.boot[eventName](taskId, formId, param1, param2, param3);
             for (const tid in task.list) {
                 const t = task.list[tid];
-                (_m = t.class) === null || _m === void 0 ? void 0 : _m[eventName](taskId, formId, param1, param2);
+                (_m = t.class) === null || _m === void 0 ? void 0 : _m[eventName](taskId, formId, param1, param2, param3);
                 for (const fid in t.forms) {
-                    (_p = (_o = t.forms[fid].vroot)[eventName]) === null || _p === void 0 ? void 0 : _p.call(_o, taskId, formId, param1, param2);
+                    (_p = (_o = t.forms[fid].vroot)[eventName]) === null || _p === void 0 ? void 0 : _p.call(_o, taskId, formId, param1, param2, param3);
                 }
             }
             break;
@@ -436,15 +439,27 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
             }
             break;
         }
+        case 'formShowInSystemTaskChange': {
+            (_6 = (_5 = globalEvents)[name]) === null || _6 === void 0 ? void 0 : _6.call(_5, taskId, formId, param1);
+            exports.boot === null || exports.boot === void 0 ? void 0 : exports.boot[eventName](taskId, formId, param1);
+            for (const tid in task.list) {
+                const t = task.list[tid];
+                (_7 = t.class) === null || _7 === void 0 ? void 0 : _7[eventName](taskId, formId, param1);
+                for (const fid in t.forms) {
+                    (_9 = (_8 = t.forms[fid].vroot)[eventName]) === null || _9 === void 0 ? void 0 : _9.call(_8, taskId, formId, param1);
+                }
+            }
+            break;
+        }
         case 'taskStarted':
         case 'taskEnded': {
-            (_6 = (_5 = globalEvents)[name]) === null || _6 === void 0 ? void 0 : _6.call(_5, taskId, formId);
+            (_11 = (_10 = globalEvents)[name]) === null || _11 === void 0 ? void 0 : _11.call(_10, taskId, formId);
             exports.boot === null || exports.boot === void 0 ? void 0 : exports.boot[eventName](taskId, formId);
             for (const tid in task.list) {
                 const t = task.list[tid];
-                (_7 = t.class) === null || _7 === void 0 ? void 0 : _7[eventName](taskId);
+                (_12 = t.class) === null || _12 === void 0 ? void 0 : _12[eventName](taskId);
                 for (const fid in t.forms) {
-                    (_9 = (_8 = t.forms[fid].vroot)[eventName]) === null || _9 === void 0 ? void 0 : _9.call(_8, taskId);
+                    (_14 = (_13 = t.forms[fid].vroot)[eventName]) === null || _14 === void 0 ? void 0 : _14.call(_13, taskId);
                 }
             }
             break;
@@ -459,9 +474,9 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
             exports.boot === null || exports.boot === void 0 ? void 0 : exports.boot[eventName](taskId, formId);
             for (const tid in task.list) {
                 const t = task.list[tid];
-                (_10 = t.class) === null || _10 === void 0 ? void 0 : _10[eventName](taskId, formId);
+                (_15 = t.class) === null || _15 === void 0 ? void 0 : _15[eventName](taskId, formId);
                 for (const fid in t.forms) {
-                    (_12 = (_11 = t.forms[fid].vroot)[eventName]) === null || _12 === void 0 ? void 0 : _12.call(_11, taskId, formId);
+                    (_17 = (_16 = t.forms[fid].vroot)[eventName]) === null || _17 === void 0 ? void 0 : _17.call(_16, taskId, formId);
                 }
             }
             break;
@@ -473,9 +488,9 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
             exports.boot === null || exports.boot === void 0 ? void 0 : exports.boot[eventName](taskId);
             for (const tid in task.list) {
                 const t = task.list[tid];
-                (_13 = t.class) === null || _13 === void 0 ? void 0 : _13[eventName](taskId);
+                (_18 = t.class) === null || _18 === void 0 ? void 0 : _18[eventName](taskId);
                 for (const fid in t.forms) {
-                    (_15 = (_14 = t.forms[fid].vroot)[eventName]) === null || _15 === void 0 ? void 0 : _15.call(_14, taskId);
+                    (_20 = (_19 = t.forms[fid].vroot)[eventName]) === null || _20 === void 0 ? void 0 : _20.call(_19, taskId);
                 }
             }
             break;
@@ -676,7 +691,9 @@ function getAvailArea() {
             'left': 0,
             'top': 0,
             'width': window.innerWidth,
-            'height': window.innerHeight - 46
+            'height': window.innerHeight - 46,
+            'owidth': window.innerWidth,
+            'oheight': window.innerHeight
         };
     }
     else {
@@ -717,7 +734,9 @@ function getAvailArea() {
             'left': left,
             'top': top,
             'width': width,
-            'height': height
+            'height': height,
+            'owidth': window.innerWidth,
+            'oheight': window.innerHeight
         };
     }
 }
@@ -760,6 +779,21 @@ function getLocation() {
     return window.location.href;
 }
 exports.getLocation = getLocation;
+function back(taskId) {
+    if (!taskId) {
+        return false;
+    }
+    const t = task.list[taskId];
+    if (!t) {
+        return false;
+    }
+    if (!t.runtime.permissions.includes('root') && !t.runtime.permissions.includes('location')) {
+        return false;
+    }
+    window.history.back();
+    return true;
+}
+exports.back = back;
 window.addEventListener('hashchange', function () {
     trigger('hashChanged', window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '');
 });

package/dist/lib/core.ts

@@ -96,7 +96,9 @@ export abstract class AbstractApp {
     }
 
     /** --- 窗体创建事件 --- */
-    public onFormCreated(taskId: number, formId: number, title: string, icon: string): void | Promise<void>;
+    public onFormCreated(
+        taskId: number, formId: number, title: string, icon: string, showInSystemTask: boolean
+    ): void | Promise<void>;
     public onFormCreated(): void {
         return;
     }
@@ -155,6 +157,12 @@ export abstract class AbstractApp {
         return;
     }
 
+    /** --- 窗体是否显示在任务栏属性改变事件 --- */
+    public onFormShowInSystemTaskChange(taskId: number, formId: number, value: boolean): void | Promise<void>;
+    public onFormShowInSystemTaskChange(): void {
+        return;
+    }
+
     /** --- 任务开始事件 --- */
     public onTaskStarted(taskId: number): void | Promise<void>;
     public onTaskStarted(): void | Promise<void> {
@@ -416,7 +424,7 @@ const globalEvents = {
 /**
  * --- 主动触发系统级事件，App 中无效，用 this.trigger 替代 ---
  */
-export function trigger(name: types.TGlobalEvent, taskId: number | string | boolean = 0, formId: number | string | boolean | Record<string, any> | null = 0, param1: boolean | Error | string = '', param2: string = ''): void {
+export function trigger(name: types.TGlobalEvent, taskId: number | string | boolean = 0, formId: number | string | boolean | Record<string, any> | null = 0, param1: boolean | Error | string = '', param2: string = '', param3: boolean = true): void {
     const eventName = 'on' + name[0].toUpperCase() + name.slice(1);
     switch (name) {
         case 'error': {
@@ -461,13 +469,13 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         }
         case 'formCreated':
         case 'formRemoved': {
-            (globalEvents as any)[name]?.(taskId, formId, param1, param2);
-            (boot as any)?.[eventName](taskId, formId, param1, param2);
+            (globalEvents as any)[name]?.(taskId, formId, param1, param2, param3);
+            (boot as any)?.[eventName](taskId, formId, param1, param2, param3);
             for (const tid in task.list) {
                 const t = task.list[tid];
-                (t.class as any)?.[eventName](taskId, formId, param1, param2);
+                (t.class as any)?.[eventName](taskId, formId, param1, param2, param3);
                 for (const fid in t.forms) {
-                    t.forms[fid].vroot[eventName]?.(taskId, formId, param1, param2);
+                    t.forms[fid].vroot[eventName]?.(taskId, formId, param1, param2, param3);
                 }
             }
             break;
@@ -513,6 +521,18 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             }
             break;
         }
+        case 'formShowInSystemTaskChange': {
+            (globalEvents as any)[name]?.(taskId, formId, param1);
+            (boot as any)?.[eventName](taskId, formId, param1);
+            for (const tid in task.list) {
+                const t = task.list[tid];
+                (t.class as any)?.[eventName](taskId, formId, param1);
+                for (const fid in t.forms) {
+                    t.forms[fid].vroot[eventName]?.(taskId, formId, param1);
+                }
+            }
+            break;
+        }
         case 'taskStarted':
         case 'taskEnded': {
             (globalEvents as any)[name]?.(taskId, formId);
@@ -775,7 +795,9 @@ export function getAvailArea(): types.IAvailArea {
             'left': 0,
             'top': 0,
             'width': window.innerWidth,
-            'height': window.innerHeight - 46
+            'height': window.innerHeight - 46,
+            'owidth': window.innerWidth,
+            'oheight': window.innerHeight
         };
     }
     else {
@@ -816,7 +838,9 @@ export function getAvailArea(): types.IAvailArea {
             'left': left,
             'top': top,
             'width': width,
-            'height': height
+            'height': height,
+            'owidth': window.innerWidth,
+            'oheight': window.innerHeight
         };
     }
 }
@@ -875,6 +899,25 @@ export function getLocation(): string {
     return window.location.href;
 }
 
+/**
+ * --- 对浏览器做返回操作 ---
+ * @param taskId 基任务，App 模式下无效
+ */
+export function back(taskId?: number): boolean {
+    if (!taskId) {
+        return false;
+    }
+    const t = task.list[taskId];
+    if (!t) {
+        return false;
+    }
+    if (!t.runtime.permissions.includes('root') && !t.runtime.permissions.includes('location')) {
+        return false;
+    }
+    window.history.back();
+    return true;
+}
+
 window.addEventListener('hashchange', function() {
     trigger('hashChanged', window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '');
 });

package/dist/lib/form.js

@@ -45,8 +45,9 @@ let focusId = null;
 const info = {
     'lastId': 0,
     'lastPanelId': 0,
-    'lastZIndex': 999,
-    'topLastZIndex': 9999999,
+    'bottomLastZIndex': 999,
+    'lastZIndex': 999999,
+    'topLastZIndex': 99999999,
     'locale': {
         'en': {
             'ok': 'OK',
@@ -278,6 +279,11 @@ class AbstractForm extends AbstractCommon {
     }
     set topMost(v) {
     }
+    get bottomMost() {
+        return false;
+    }
+    set bottomMost(v) {
+    }
     get isMask() {
         return !task.list[this.taskId].runtime.dialogFormIds.length ||
             task.list[this.taskId].runtime.dialogFormIds[task.list[this.taskId].runtime.dialogFormIds.length - 1]
@@ -286,6 +292,11 @@ class AbstractForm extends AbstractCommon {
     get formFocus() {
         return this._formFocus;
     }
+    get showInSystemTask() {
+        return false;
+    }
+    set showInSystemTask(v) {
+    }
     show() {
         const v = this;
         if (this._firstShow) {
@@ -367,6 +378,9 @@ class AbstractForm extends AbstractCommon {
     onFormFlash() {
         return;
     }
+    onFormShowInSystemTaskChange() {
+        return;
+    }
     onTaskStarted() {
         return;
     }
@@ -437,7 +451,7 @@ exports.elements = {
         this.gesture.id = 'cg-gesture';
         this.wrap.appendChild(this.gesture);
         this.drag.id = 'cg-drag';
-        this.drag.innerHTML = '<svg width="16" height="16" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8 8L40 40" stroke="#FFF" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/><path d="M8 40L40 8" stroke="#FFF" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/></svg>';
+        this.drag.innerHTML = '<svg width="16" height="16" viewBox="0 0 48 48" fill="none" stroke="#FFF" xmlns="http://www.w3.org/2000/svg"><path d="M8 8L40 40" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/><path d="M8 40L40 8" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/></svg>';
         this.wrap.appendChild(this.drag);
         this.notify.id = 'cg-notify';
         this.wrap.appendChild(this.notify);
@@ -780,10 +794,16 @@ function refreshMaxPosition() {
             continue;
         }
         const vroot = task.list[taskId].forms[formId].vroot;
-        vroot.$refs.form.setPropData('left', area.left);
-        vroot.$refs.form.setPropData('top', area.top);
-        vroot.$refs.form.setPropData('width', area.width);
-        vroot.$refs.form.setPropData('height', area.height);
+        if (ef.dataset.cgBottomMost === undefined) {
+            vroot.$refs.form.setPropData('left', area.left);
+            vroot.$refs.form.setPropData('top', area.top);
+            vroot.$refs.form.setPropData('width', area.width);
+            vroot.$refs.form.setPropData('height', area.height);
+        }
+        else {
+            vroot.$refs.form.setPropData('width', area.owidth);
+            vroot.$refs.form.setPropData('height', area.oheight);
+        }
     }
 }
 exports.refreshMaxPosition = refreshMaxPosition;
@@ -812,7 +832,8 @@ function get(formId) {
         'stateMax': item.vroot.$refs.form.stateMaxData,
         'stateMin': item.vroot.$refs.form.stateMinData,
         'show': item.vroot.$refs.form.isShow,
-        'focus': item.vroot.formFocus
+        'focus': item.vroot.formFocus,
+        'showInSystemTask': item.vroot.showInSystemTask
     };
 }
 exports.get = get;
@@ -839,7 +860,8 @@ function getList(taskId) {
             'stateMax': item.vroot.$refs.form.stateMaxData,
             'stateMin': item.vroot.$refs.form.stateMinData,
             'show': item.vroot.$refs.form.isShow,
-            'focus': item.vroot.formFocus
+            'focus': item.vroot.formFocus,
+            'showInSystemTask': item.vroot.showInSystemTask
         };
     }
     return list;
@@ -944,6 +966,9 @@ function changeFocus(formId = 0) {
         if (t.forms[dialogFormId].vroot._topMost) {
             t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
         }
+        else if (t.forms[dialogFormId].vroot._bottomMost) {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.bottomLastZIndex;
+        }
         else {
             t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
         }
@@ -960,6 +985,9 @@ function changeFocus(formId = 0) {
         if (t.forms[formId].vroot._topMost) {
             t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
         }
+        else if (t.forms[formId].vroot._bottomMost) {
+            t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.bottomLastZIndex;
+        }
         else {
             t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
         }
@@ -2001,6 +2029,32 @@ function create(cls, data, opt = {}, taskId) {
                 return;
             }
         };
+        idata._bottomMost = false;
+        computed.bottomMost = {
+            get: function () {
+                return this._bottomMost;
+            },
+            set: function (v) {
+                const form = t.forms[formId];
+                if (!form) {
+                    return;
+                }
+                if (v) {
+                    form.vroot.$data._bottomMost = true;
+                    form.vroot.$el.dataset.cgBottomMost = '';
+                    if (form.vroot.$data._topMost) {
+                        form.vroot.$data._topMost = false;
+                    }
+                    form.vroot.$refs.form.$data.zIndex = ++info.bottomLastZIndex;
+                }
+                else {
+                    form.vroot.$data._bottomMost = false;
+                    form.vroot.$el.removeAttribute('data-cg-bottom-most');
+                    form.vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
+                }
+                return;
+            }
+        };
         idata._topMost = false;
         computed.topMost = {
             get: function () {
@@ -2013,6 +2067,10 @@ function create(cls, data, opt = {}, taskId) {
                 }
                 if (v) {
                     form.vroot.$data._topMost = true;
+                    if (form.vroot.$data._bottomMost) {
+                        form.vroot.$data._bottomMost = false;
+                        form.vroot.$el.removeAttribute('data-cg-bottom-most');
+                    }
                     if (!form.vroot._formFocus) {
                         changeFocus(form.id);
                     }
@@ -2027,6 +2085,20 @@ function create(cls, data, opt = {}, taskId) {
                 return;
             }
         };
+        idata._showInSystemTask = true;
+        computed.showInSystemTask = {
+            get: function () {
+                return this._showInSystemTask;
+            },
+            set: function (v) {
+                const form = t.forms[formId];
+                if (!form) {
+                    return;
+                }
+                form.vroot.$data._showInSystemTask = v;
+                core.trigger('formShowInSystemTaskChange', t.id, formId, v);
+            }
+        };
         exports.elements.list.insertAdjacentHTML('beforeend', `<div class="cg-form-wrap" data-form-id="${formId.toString()}" data-task-id="${t.id.toString()}"></div>`);
         exports.elements.popList.insertAdjacentHTML('beforeend', `<div data-form-id="${formId.toString()}" data-task-id="${t.id.toString()}"></div>`);
         if (style) {
@@ -2139,7 +2211,7 @@ function create(cls, data, opt = {}, taskId) {
             dom.removeStyle(rtn.vroot.taskId, 'form', rtn.vroot.formId);
             throw err;
         }
-        core.trigger('formCreated', t.id, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
+        core.trigger('formCreated', t.id, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl, rtn.vroot.showInSystemTask);
         if (rtn.vroot.isNativeSync) {
             yield native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
             window.addEventListener('resize', function () {

package/dist/lib/form.ts

@@ -32,9 +32,11 @@ const info: {
     lastId: number;
     /** --- 最后一个 panel id --- */
     lastPanelId: number;
-    /** --- 最后一个窗体层级，1000（一千）开始 --- */
+    /** --- 最后一个置底窗体层级，1000（一千）开始 --- */
+    bottomLastZIndex: number;
+    /** --- 最后一个窗体层级，1000000（百万）开始 --- */
     lastZIndex: number;
-    /** --- 最后一个置顶窗体层级，10000000（一千万）开始 --- */
+    /** --- 最后一个置顶窗体层级，100000000（一亿）开始 --- */
     topLastZIndex: number;
     /** --- 用到的语言包 --- */
     locale: Record<string, {
@@ -47,8 +49,9 @@ const info: {
 } = {
     'lastId': 0,
     'lastPanelId': 0,
-    'lastZIndex': 999,
-    'topLastZIndex': 9999999,
+    'bottomLastZIndex': 999,
+    'lastZIndex': 999999,
+    'topLastZIndex': 99999999,
     'locale': {
         'en': {
             'ok': 'OK',
@@ -383,6 +386,16 @@ export abstract class AbstractForm extends AbstractCommon {
         // --- 会进行重写 ---
     }
 
+    /** --- 是否是置底 --- */
+    public get bottomMost(): boolean {
+        // --- 将在初始化时系统自动重写本函数 ---
+        return false;
+    }
+
+    public set bottomMost(v: boolean) {
+        // --- 会进行重写 ---
+    }
+
     /**
      * --- 是否在本窗体上显示遮罩层 ---
      */
@@ -398,6 +411,16 @@ export abstract class AbstractForm extends AbstractCommon {
         return (this as any)._formFocus;
     }
 
+    /** --- 当前窗体是否显示在任务栏 --- */
+    public get showInSystemTask(): boolean {
+        // --- 将在初始化时系统自动重写本函数 ---
+        return false;
+    }
+
+    public set showInSystemTask(v: boolean) {
+        // --- 会进行重写 ---
+    }
+
     /** --- 当前是不是初次显示 --- */
     private _firstShow: boolean = true;
 
@@ -487,7 +510,9 @@ export abstract class AbstractForm extends AbstractCommon {
     }
 
     /** --- 窗体创建事件 --- */
-    public onFormCreated(taskId: number, formId: number, title: string, icon: string): void | Promise<void>;
+    public onFormCreated(
+        taskId: number, formId: number, title: string, icon: string, showInSystemTask: boolean
+    ): void | Promise<void>;
     public onFormCreated(): void {
         return;
     }
@@ -546,6 +571,12 @@ export abstract class AbstractForm extends AbstractCommon {
         return;
     }
 
+    /** --- 窗体是否显示在任务栏属性改变事件 --- */
+    public onFormShowInSystemTaskChange(taskId: number, formId: number, value: boolean): void | Promise<void>;
+    public onFormShowInSystemTaskChange(): void {
+        return;
+    }
+
     /** --- 任务开始事件 --- */
     public onTaskStarted(taskId: number): void | Promise<void>;
     public onTaskStarted(): void {
@@ -672,7 +703,7 @@ export const elements: {
 
         // --- drag drop 的拖动占位符 ---
         this.drag.id = 'cg-drag';
-        this.drag.innerHTML = '<svg width="16" height="16" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8 8L40 40" stroke="#FFF" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/><path d="M8 40L40 8" stroke="#FFF" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/></svg>';
+        this.drag.innerHTML = '<svg width="16" height="16" viewBox="0 0 48 48" fill="none" stroke="#FFF" xmlns="http://www.w3.org/2000/svg"><path d="M8 8L40 40" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/><path d="M8 40L40 8" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter"/></svg>';
         this.wrap.appendChild(this.drag);
 
         // --- 添加 cg-system 的 dom ---
@@ -1062,10 +1093,18 @@ export function refreshMaxPosition(): void {
             continue;
         }
         const vroot = task.list[taskId].forms[formId].vroot;
-        vroot.$refs.form.setPropData('left', area.left);
-        vroot.$refs.form.setPropData('top', area.top);
-        vroot.$refs.form.setPropData('width', area.width);
-        vroot.$refs.form.setPropData('height', area.height);
+        if (ef.dataset.cgBottomMost === undefined) {
+            // --- 不是置底窗体 ---
+            vroot.$refs.form.setPropData('left', area.left);
+            vroot.$refs.form.setPropData('top', area.top);
+            vroot.$refs.form.setPropData('width', area.width);
+            vroot.$refs.form.setPropData('height', area.height);
+        }
+        else {
+            // --- 是置底窗体 ---
+            vroot.$refs.form.setPropData('width', area.owidth);
+            vroot.$refs.form.setPropData('height', area.oheight);
+        }
     }
 }
 
@@ -1103,7 +1142,8 @@ export function get(formId: number): types.IFormInfo | null {
         'stateMax': item.vroot.$refs.form.stateMaxData,
         'stateMin': item.vroot.$refs.form.stateMinData,
         'show': item.vroot.$refs.form.isShow,
-        'focus': item.vroot.formFocus
+        'focus': item.vroot.formFocus,
+        'showInSystemTask': item.vroot.showInSystemTask
     };
 }
 
@@ -1139,7 +1179,8 @@ export function getList(taskId: number): Record<string, types.IFormInfo> {
             'stateMax': item.vroot.$refs.form.stateMaxData,
             'stateMin': item.vroot.$refs.form.stateMinData,
             'show': item.vroot.$refs.form.isShow,
-            'focus': item.vroot.formFocus
+            'focus': item.vroot.formFocus,
+            'showInSystemTask': item.vroot.showInSystemTask
         };
     }
     return list;
@@ -1275,6 +1316,9 @@ export function changeFocus(formId: number = 0): void {
         if (t.forms[dialogFormId].vroot._topMost) {
             t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
         }
+        else if (t.forms[dialogFormId].vroot._bottomMost) {
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.bottomLastZIndex;
+        }
         else {
             t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
         }
@@ -1296,6 +1340,9 @@ export function changeFocus(formId: number = 0): void {
         if (t.forms[formId].vroot._topMost) {
             t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
         }
+        else if (t.forms[formId].vroot._bottomMost) {
+            t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.bottomLastZIndex;
+        }
         else {
             t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
         }
@@ -2562,6 +2609,35 @@ export async function create<T extends AbstractForm>(
             return;
         }
     };
+    // --- 是否在底层的窗体 ---
+    idata._bottomMost = false;
+    computed.bottomMost = {
+        get: function(this: types.IVue): number {
+            return this._bottomMost;
+        },
+        set: function(v: boolean): void {
+            const form = t.forms[formId];
+            if (!form) {
+                return;
+            }
+            if (v) {
+                // --- 置底 ---
+                form.vroot.$data._bottomMost = true;
+                form.vroot.$el.dataset.cgBottomMost = '';
+                if (form.vroot.$data._topMost) {
+                    form.vroot.$data._topMost = false;
+                }
+                form.vroot.$refs.form.$data.zIndex = ++info.bottomLastZIndex;
+            }
+            else {
+                // --- 取消置底 ---
+                form.vroot.$data._bottomMost = false;
+                form.vroot.$el.removeAttribute('data-cg-bottom-most');
+                form.vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
+            }
+            return;
+        }
+    };
     // --- 是否在顶层的窗体 ---
     idata._topMost = false;
     computed.topMost = {
@@ -2576,6 +2652,10 @@ export async function create<T extends AbstractForm>(
             if (v) {
                 // --- 置顶 ---
                 form.vroot.$data._topMost = true;
+                if (form.vroot.$data._bottomMost) {
+                    form.vroot.$data._bottomMost = false;
+                    form.vroot.$el.removeAttribute('data-cg-bottom-most');
+                }
                 if (!form.vroot._formFocus) {
                     changeFocus(form.id);
                 }
@@ -2591,6 +2671,21 @@ export async function create<T extends AbstractForm>(
             return;
         }
     };
+    // --- 当前窗体是否显示在任务栏 ---
+    idata._showInSystemTask = true;
+    computed.showInSystemTask = {
+        get: function(this: types.IVue): number {
+            return this._showInSystemTask;
+        },
+        set: function(v: boolean): void {
+            const form = t.forms[formId];
+            if (!form) {
+                return;
+            }
+            form.vroot.$data._showInSystemTask = v;
+            core.trigger('formShowInSystemTaskChange', t.id, formId, v);
+        }
+    };
 
     // --- 插入 dom ---
     elements.list.insertAdjacentHTML('beforeend', `<div class="cg-form-wrap" data-form-id="${formId.toString()}" data-task-id="${t.id.toString()}"></div>`);
@@ -2717,7 +2812,7 @@ export async function create<T extends AbstractForm>(
         throw err;
     }
     // --- 触发 formCreated 事件 ---
-    core.trigger('formCreated', t.id, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
+    core.trigger('formCreated', t.id, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl, rtn.vroot.showInSystemTask);
     // --- 同步的窗体先进行同步一下 ---
     if (rtn.vroot.isNativeSync) {
         await native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);