clickgo 3.1.3-dev12 → 3.1.4-dev13

package/dist/lib/form.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hideLauncher = exports.showLauncher = exports.flash = exports.confirm = exports.dialog = exports.create = exports.remove = exports.doFocusAndPopEvent = exports.hidePop = exports.showPop = exports.removeFromPop = exports.appendToPop = exports.hideNotify = exports.notifyProgress = exports.notify = exports.hideDrag = exports.moveDrag = exports.showDrag = exports.hideRectangle = exports.showRectangle = exports.moveRectangle = exports.showCircular = exports.getRectByBorder = exports.getMaxZIndexID = exports.changeFocus = exports.getFocus = exports.getList = exports.send = exports.get = exports.getTaskId = exports.refreshMaxPosition = exports.bindDrag = exports.bindResize = exports.close = exports.max = exports.min = exports.elements = exports.launcherRoot = exports.simpleSystemTaskRoot = exports.AbstractForm = void 0;
+exports.hideLauncher = exports.showLauncher = exports.flash = exports.confirm = exports.dialog = exports.create = exports.remove = exports.doFocusAndPopEvent = exports.hidePop = exports.showPop = exports.removeFromPop = exports.appendToPop = exports.hideNotify = exports.notifyProgress = exports.notify = exports.hideDrag = exports.moveDrag = exports.showDrag = exports.hideRectangle = exports.showRectangle = exports.moveRectangle = exports.showCircular = exports.getRectByBorder = exports.getMaxZIndexID = exports.changeFocus = exports.getFocus = exports.getList = exports.send = exports.get = exports.getTaskId = exports.refreshMaxPosition = exports.bindDrag = exports.bindResize = exports.close = exports.max = exports.min = exports.superConfirm = exports.elements = exports.launcherRoot = exports.simpleSystemTaskRoot = exports.AbstractForm = void 0;
 const clickgo = require("../clickgo");
 const core = require("./core");
 const task = require("./task");
@@ -255,9 +255,9 @@ class AbstractForm {
     }
     showDialog() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.topMost = true;
-            this.show();
             task.list[this.taskId].runtime.dialogFormIds.push(this.formId);
+            this.show();
+            this.topMost = true;
             return new Promise((resolve) => {
                 this.cgDialogCallback = () => {
                     resolve(this.dialogResult);
@@ -344,6 +344,9 @@ class AbstractForm {
     onLauncherFolderNameChanged() {
         return;
     }
+    onHashChanged() {
+        return;
+    }
 }
 exports.AbstractForm = AbstractForm;
 const popInfo = {
@@ -351,6 +354,7 @@ const popInfo = {
     'elList': [],
     'lastZIndex': 0
 };
+let superConfirmHandler = undefined;
 exports.elements = {
     'wrap': document.createElement('div'),
     'list': document.createElement('div'),
@@ -359,10 +363,10 @@ exports.elements = {
     'rectangle': document.createElement('div'),
     'gesture': document.createElement('div'),
     'drag': document.createElement('div'),
-    'dragIcon': undefined,
-    'system': document.createElement('div'),
-    'simpleSystemtask': document.createElement('div'),
+    'notify': document.createElement('div'),
+    'simpletask': document.createElement('div'),
     'launcher': document.createElement('div'),
+    'confirm': document.createElement('div'),
     'init': function () {
         this.wrap.id = 'cg-wrap';
         document.getElementsByTagName('body')[0].appendChild(this.wrap);
@@ -402,12 +406,11 @@ exports.elements = {
         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.dragIcon = this.drag.childNodes[0];
         this.wrap.appendChild(this.drag);
-        this.system.id = 'cg-system';
-        this.wrap.appendChild(this.system);
-        this.simpleSystemtask.id = 'cg-simpletask';
-        this.wrap.appendChild(this.simpleSystemtask);
+        this.notify.id = 'cg-notify';
+        this.wrap.appendChild(this.notify);
+        this.simpletask.id = 'cg-simpletask';
+        this.wrap.appendChild(this.simpletask);
         const simpletaskApp = clickgo.vue.createApp({
             'template': '<div v-for="(item, formId) of forms" class="cg-simpletask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simpletask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
             'data': function () {
@@ -420,14 +423,14 @@ exports.elements = {
                     handler: function () {
                         const length = Object.keys(this.forms).length;
                         if (length > 0) {
-                            if (exports.elements.simpleSystemtask.style.bottom !== '0px') {
-                                exports.elements.simpleSystemtask.style.bottom = '0px';
+                            if (exports.elements.simpletask.style.bottom !== '0px') {
+                                exports.elements.simpletask.style.bottom = '0px';
                                 core.trigger('screenResize');
                             }
                         }
                         else {
-                            if (exports.elements.simpleSystemtask.style.bottom === '0px') {
-                                exports.elements.simpleSystemtask.style.bottom = '-46px';
+                            if (exports.elements.simpletask.style.bottom === '0px') {
+                                exports.elements.simpletask.style.bottom = '-46px';
                                 core.trigger('screenResize');
                             }
                         }
@@ -482,7 +485,8 @@ exports.elements = {
                 'data': function () {
                     return {
                         'name': '',
-                        'folderName': ''
+                        'folderName': '',
+                        'folderItem': {}
                     };
                 },
                 'computed': {
@@ -614,9 +618,53 @@ exports.elements = {
             launcherApp.mount('#cg-launcher');
         };
         waiting();
+        this.confirm.id = 'cg-confirm';
+        this.wrap.appendChild(this.confirm);
+        this.confirm.innerHTML = `<div class="cg-confirm-box">` +
+            `<div id="cg-confirm-content"></div>` +
+            `<div class="cg-confirm-controls">` +
+            `<div id="cg-confirm-cancel"></div>` +
+            `<div id="cg-confirm-ok"></div>` +
+            `</div>` +
+            `</div>`;
+        this.confirm.style.display = 'none';
+        document.getElementById('cg-confirm-cancel').addEventListener('click', () => {
+            superConfirmHandler === null || superConfirmHandler === void 0 ? void 0 : superConfirmHandler(false);
+            this.confirm.style.display = 'none';
+            const fid = getMaxZIndexID();
+            if (fid) {
+                changeFocus(fid);
+            }
+        });
+        document.getElementById('cg-confirm-ok').addEventListener('click', () => {
+            superConfirmHandler === null || superConfirmHandler === void 0 ? void 0 : superConfirmHandler(true);
+            this.confirm.style.display = 'none';
+            const fid = getMaxZIndexID();
+            if (fid) {
+                changeFocus(fid);
+            }
+        });
     }
 };
 exports.elements.init();
+function superConfirm(html) {
+    return new Promise((resolve) => {
+        var _a, _b, _c, _d;
+        if (superConfirmHandler !== undefined) {
+            resolve(false);
+            return;
+        }
+        exports.elements.confirm.style.display = 'flex';
+        document.getElementById('cg-confirm-content').innerHTML = html;
+        document.getElementById('cg-confirm-cancel').innerHTML = (_b = (_a = info.locale[core.config.locale]) === null || _a === void 0 ? void 0 : _a.cancel) !== null && _b !== void 0 ? _b : info.locale['en'].cancel;
+        document.getElementById('cg-confirm-ok').innerHTML = (_d = (_c = info.locale[core.config.locale]) === null || _c === void 0 ? void 0 : _c.ok) !== null && _d !== void 0 ? _d : info.locale['en'].ok;
+        superConfirmHandler = (result) => {
+            superConfirmHandler = undefined;
+            resolve(result);
+        };
+    });
+}
+exports.superConfirm = superConfirm;
 function changeState(state, formId) {
     const tid = getTaskId(formId);
     const t = task.list[tid];
@@ -1042,14 +1090,10 @@ function moveDrag(opt) {
         exports.elements.drag.style.height = opt.height.toString() + 'px';
     }
     if (opt.icon) {
-        if (exports.elements.dragIcon) {
-            exports.elements.dragIcon.style.display = 'block';
-        }
+        exports.elements.drag.childNodes[0].style.display = 'block';
     }
     else {
-        if (exports.elements.dragIcon) {
-            exports.elements.dragIcon.style.display = 'none';
-        }
+        exports.elements.drag.childNodes[0].style.display = 'none';
     }
 }
 exports.moveDrag = moveDrag;
@@ -1076,21 +1120,21 @@ function notify(opt) {
     }
     const el = document.createElement('div');
     const y = notifyTop;
-    el.classList.add('cg-system-notify');
+    el.classList.add('cg-notify-wrap');
     el.setAttribute('data-notifyid', nid.toString());
     el.style.transform = `translateY(${y}px) translateX(280px)`;
     el.style.opacity = '1';
-    el.innerHTML = `<div class="cg-system-icon cg-${tool.escapeHTML((_a = opt.type) !== null && _a !== void 0 ? _a : 'primary')}"></div>
+    el.innerHTML = `<div class="cg-notify-icon cg-${tool.escapeHTML((_a = opt.type) !== null && _a !== void 0 ? _a : 'primary')}"></div>
 <div style="flex: 1;">
-    <div class="cg-system-notify-title">${tool.escapeHTML(opt.title)}</div>
-    <div class="cg-system-notify-content">${tool.escapeHTML(opt.content).replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '<br>')}</div>
-    ${opt.progress ? '<div class="cg-system-notify-progress"></div>' : ''}
+    <div class="cg-notify-title">${tool.escapeHTML(opt.title)}</div>
+    <div class="cg-notify-content">${tool.escapeHTML(opt.content).replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '<br>')}</div>
+    ${opt.progress ? '<div class="cg-notify-progress"></div>' : ''}
 </div>`;
     if (opt.icon) {
         el.childNodes.item(0).style.background = 'url(' + opt.icon + ')';
         el.childNodes.item(0).style.backgroundSize = '16px';
     }
-    exports.elements.system.appendChild(el);
+    exports.elements.notify.appendChild(el);
     notifyTop += el.offsetHeight + 10;
     requestAnimationFrame(function () {
         el.style.transform = `translateY(${y}px) translateX(-10px)`;
@@ -1103,11 +1147,11 @@ function notify(opt) {
 }
 exports.notify = notify;
 function notifyProgress(notifyId, per) {
-    const el = exports.elements.system.querySelector(`[data-notifyid="${notifyId}"]`);
+    const el = exports.elements.notify.querySelector(`[data-notifyid="${notifyId}"]`);
     if (!el) {
         return;
     }
-    const progress = el.querySelector('.cg-system-notify-progress');
+    const progress = el.querySelector('.cg-notify-progress');
     if (!progress) {
         return;
     }
@@ -1127,7 +1171,7 @@ function notifyProgress(notifyId, per) {
 }
 exports.notifyProgress = notifyProgress;
 function hideNotify(notifyId) {
-    const el = exports.elements.system.querySelector(`[data-notifyid="${notifyId}"]`);
+    const el = exports.elements.notify.querySelector(`[data-notifyid="${notifyId}"]`);
     if (!el) {
         return;
     }
@@ -1136,7 +1180,7 @@ function hideNotify(notifyId) {
     el.style.opacity = '0';
     setTimeout(function () {
         notifyTop -= notifyHeight + 10;
-        const notifyElementList = document.getElementsByClassName('cg-system-notify');
+        const notifyElementList = document.getElementsByClassName('cg-notify-wrap');
         let needSub = false;
         for (const notifyElement of notifyElementList) {
             if (notifyElement === el) {
@@ -1665,7 +1709,7 @@ function create(opt) {
         }
         core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
         if (rtn.vroot.isNativeSync) {
-            native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
+            yield native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
             window.addEventListener('resize', function () {
                 rtn.vroot.$refs.form.setPropData('width', window.innerWidth);
                 rtn.vroot.$refs.form.setPropData('height', window.innerHeight);

package/dist/lib/form.ts

@@ -385,9 +385,9 @@ export abstract class AbstractForm {
      * --- 显示独占的窗体 ---
      */
     public async showDialog(): Promise<string> {
-        this.topMost = true;
-        this.show();
         task.list[this.taskId].runtime.dialogFormIds.push(this.formId);
+        this.show();
+        this.topMost = true;
         return new Promise((resolve) => {
             (this as any).cgDialogCallback = () => {
                 resolve(this.dialogResult);
@@ -548,6 +548,12 @@ export abstract class AbstractForm {
         return;
     }
 
+    /** --- location hash 改变事件 --- */
+    public onHashChanged(hash: string): void | Promise<void>;
+    public onHashChanged(): void {
+        return;
+    }
+
 }
 
 /** --- pop 相关信息 --- */
@@ -567,6 +573,9 @@ const popInfo: {
 export let simpleSystemTaskRoot: types.IVue;
 export let launcherRoot: types.IVue;
 
+/** --- 系统级 confirm 的用户回调函数 --- */
+let superConfirmHandler: undefined | ((result: boolean) => void | Promise<void>) = undefined;
+
 export const elements: {
     'wrap': HTMLDivElement;
     'list': HTMLDivElement;
@@ -575,10 +584,10 @@ export const elements: {
     'rectangle': HTMLDivElement;
     'gesture': HTMLDivElement;
     'drag': HTMLDivElement;
-    'dragIcon'?: HTMLElement;
-    'system': HTMLElement;
-    'simpleSystemtask': HTMLDivElement;
+    'notify': HTMLElement;
+    'simpletask': HTMLDivElement;
     'launcher': HTMLDivElement;
+    'confirm': HTMLDivElement;
     'init': () => void;
 } = {
     'wrap': document.createElement('div'),
@@ -588,10 +597,10 @@ export const elements: {
     'rectangle': document.createElement('div'),
     'gesture': document.createElement('div'),
     'drag': document.createElement('div'),
-    'dragIcon': undefined,
-    'system': document.createElement('div'),
-    'simpleSystemtask': document.createElement('div'),
+    'notify': document.createElement('div'),
+    'simpletask': document.createElement('div'),
     'launcher': document.createElement('div'),
+    'confirm': document.createElement('div'),
     'init': function() {
         /** --- clickgo 所有的 div wrap --- */
         this.wrap.id = 'cg-wrap';
@@ -617,10 +626,10 @@ export const elements: {
         if (clickgo.isImmersion()) {
             // --- 只有沉浸式模式（Windows 下非 frame 的 native）才会绑定这个事件 ---
             this.wrap.addEventListener('mouseenter', function() {
-                native.invoke('cg-mouse-ignore', native.getToken(), false);
+                native.invoke('cg-mouse-ignore', native.getToken(), false) as any;
             });
             this.wrap.addEventListener('mouseleave', function() {
-                native.invoke('cg-mouse-ignore', native.getToken(), true);
+                native.invoke('cg-mouse-ignore', native.getToken(), true) as any;
             });
         }
 
@@ -648,16 +657,15 @@ 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.dragIcon = this.drag.childNodes[0] as HTMLElement;
         this.wrap.appendChild(this.drag);
 
         // --- 添加 cg-system 的 dom ---
-        this.system.id = 'cg-system';
-        this.wrap.appendChild(this.system);
+        this.notify.id = 'cg-notify';
+        this.wrap.appendChild(this.notify);
 
         // --- 添加 cg-simpletask 的 dom ---
-        this.simpleSystemtask.id = 'cg-simpletask';
-        this.wrap.appendChild(this.simpleSystemtask);
+        this.simpletask.id = 'cg-simpletask';
+        this.wrap.appendChild(this.simpletask);
         const simpletaskApp = clickgo.vue.createApp({
             'template': '<div v-for="(item, formId) of forms" class="cg-simpletask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simpletask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
             'data': function() {
@@ -670,14 +678,14 @@ export const elements: {
                     handler: function(this: types.IVue) {
                         const length = Object.keys(this.forms).length;
                         if (length > 0) {
-                            if (elements.simpleSystemtask.style.bottom !== '0px') {
-                                elements.simpleSystemtask.style.bottom = '0px';
+                            if (elements.simpletask.style.bottom !== '0px') {
+                                elements.simpletask.style.bottom = '0px';
                                 core.trigger('screenResize');
                             }
                         }
                         else {
-                            if (elements.simpleSystemtask.style.bottom === '0px') {
-                                elements.simpleSystemtask.style.bottom = '-46px';
+                            if (elements.simpletask.style.bottom === '0px') {
+                                elements.simpletask.style.bottom = '-46px';
                                 core.trigger('screenResize');
                             }
                         }
@@ -736,7 +744,8 @@ export const elements: {
                 'data': function() {
                     return {
                         'name': '',
-                        'folderName': ''
+                        'folderName': '',
+                        'folderItem': {}
                     };
                 },
                 'computed': {
@@ -872,10 +881,58 @@ export const elements: {
             launcherApp.mount('#cg-launcher');
         };
         waiting();
+
+        // --- cg-confirm ---
+        this.confirm.id = 'cg-confirm';
+        this.wrap.appendChild(this.confirm);
+
+        this.confirm.innerHTML = `<div class="cg-confirm-box">` +
+            `<div id="cg-confirm-content"></div>` +
+            `<div class="cg-confirm-controls">` +
+                `<div id="cg-confirm-cancel"></div>` +
+                `<div id="cg-confirm-ok"></div>` +
+            `</div>` +
+        `</div>`;
+        this.confirm.style.display = 'none';
+        document.getElementById('cg-confirm-cancel')!.addEventListener('click', () => {
+            superConfirmHandler?.(false) as any;
+            this.confirm.style.display = 'none';
+            const fid = getMaxZIndexID();
+            if (fid) {
+                changeFocus(fid);
+            }
+        });
+        document.getElementById('cg-confirm-ok')!.addEventListener('click', () => {
+            superConfirmHandler?.(true) as any;
+            this.confirm.style.display = 'none';
+            const fid = getMaxZIndexID();
+            if (fid) {
+                changeFocus(fid);
+            }
+        });
+
     }
 };
 elements.init();
 
+/** --- 显示系统级询问框，App 模式下无效 --- */
+export function superConfirm(html: string): Promise<boolean> {
+    return new Promise((resolve) => {
+        if (superConfirmHandler !== undefined) {
+            resolve(false);
+            return;
+        }
+        elements.confirm.style.display = 'flex';
+        document.getElementById('cg-confirm-content')!.innerHTML = html;
+        document.getElementById('cg-confirm-cancel')!.innerHTML = info.locale[core.config.locale]?.cancel ?? info.locale['en'].cancel;
+        document.getElementById('cg-confirm-ok')!.innerHTML = info.locale[core.config.locale]?.ok ?? info.locale['en'].ok;
+        superConfirmHandler = (result: boolean) => {
+            superConfirmHandler = undefined;
+            resolve(result);
+        };
+    });
+}
+
 /**
  * --- 修改窗体的最大化、最小化状态，外部或不可调整 state 时才调用 ---
  * @param state 最大化、最小化或关闭
@@ -1407,14 +1464,10 @@ export function moveDrag(opt: types.IMoveDragOptions): void {
         elements.drag.style.height = opt.height.toString() + 'px';
     }
     if (opt.icon) {
-        if (elements.dragIcon) {
-            elements.dragIcon.style.display = 'block';
-        }
+        (elements.drag.childNodes[0] as HTMLElement).style.display = 'block';
     }
     else {
-        if (elements.dragIcon) {
-            elements.dragIcon.style.display = 'none';
-        }
+        (elements.drag.childNodes[0] as HTMLElement).style.display = 'none';
     }
 }
 
@@ -1451,21 +1504,21 @@ export function notify(opt: types.INotifyOptions): number {
     // --- 创建 notify element ---
     const el = document.createElement('div');
     const y = notifyTop;
-    el.classList.add('cg-system-notify');
+    el.classList.add('cg-notify-wrap');
     el.setAttribute('data-notifyid', nid.toString());
     el.style.transform = `translateY(${y}px) translateX(280px)`;
     el.style.opacity = '1';
-    el.innerHTML = `<div class="cg-system-icon cg-${tool.escapeHTML(opt.type ?? 'primary')}"></div>
+    el.innerHTML = `<div class="cg-notify-icon cg-${tool.escapeHTML(opt.type ?? 'primary')}"></div>
 <div style="flex: 1;">
-    <div class="cg-system-notify-title">${tool.escapeHTML(opt.title)}</div>
-    <div class="cg-system-notify-content">${tool.escapeHTML(opt.content).replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '<br>')}</div>
-    ${opt.progress ? '<div class="cg-system-notify-progress"></div>' : ''}
+    <div class="cg-notify-title">${tool.escapeHTML(opt.title)}</div>
+    <div class="cg-notify-content">${tool.escapeHTML(opt.content).replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '<br>')}</div>
+    ${opt.progress ? '<div class="cg-notify-progress"></div>' : ''}
 </div>`;
     if (opt.icon) {
         (el.childNodes.item(0) as HTMLElement).style.background = 'url(' + opt.icon + ')';
         (el.childNodes.item(0) as HTMLElement).style.backgroundSize = '16px';
     }
-    elements.system.appendChild(el);
+    elements.notify.appendChild(el);
     notifyTop += el.offsetHeight + 10;
     requestAnimationFrame(function() {
         el.style.transform = `translateY(${y}px) translateX(-10px)`;
@@ -1483,11 +1536,11 @@ export function notify(opt: types.INotifyOptions): number {
  * @param per 进度，0 - 100 或 0% - 100% (0 - 1)
  */
 export function notifyProgress(notifyId: number, per: number): void {
-    const el: HTMLElement = elements.system.querySelector(`[data-notifyid="${notifyId}"]`)!;
+    const el: HTMLElement = elements.notify.querySelector(`[data-notifyid="${notifyId}"]`)!;
     if (!el) {
         return;
     }
-    const progress: HTMLElement = el.querySelector('.cg-system-notify-progress')!;
+    const progress: HTMLElement = el.querySelector('.cg-notify-progress')!;
     if (!progress) {
         return;
     }
@@ -1511,7 +1564,7 @@ export function notifyProgress(notifyId: number, per: number): void {
  * @param notifyId 要隐藏的 notify id
  */
 export function hideNotify(notifyId: number): void {
-    const el: HTMLElement = elements.system.querySelector(`[data-notifyid="${notifyId}"]`)!;
+    const el: HTMLElement = elements.notify.querySelector(`[data-notifyid="${notifyId}"]`)!;
     if (!el) {
         return;
     }
@@ -1520,7 +1573,7 @@ export function hideNotify(notifyId: number): void {
     el.style.opacity = '0';
     setTimeout(function() {
         notifyTop -= notifyHeight + 10;
-        const notifyElementList = document.getElementsByClassName('cg-system-notify') as HTMLCollectionOf<HTMLDivElement>;
+        const notifyElementList = document.getElementsByClassName('cg-notify-wrap') as HTMLCollectionOf<HTMLDivElement>;
         let needSub = false;
         for (const notifyElement of notifyElementList) {
             if (notifyElement === el) {
@@ -2158,7 +2211,7 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
     core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
     // --- 同步的窗体先进行同步一下 ---
     if (rtn.vroot.isNativeSync) {
-        native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
+        await 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);