clickgo 3.1.1-dev10 → 3.1.3-dev12

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.getList = exports.send = exports.get = exports.getTaskId = exports.refreshMaxPosition = exports.bindDrag = exports.bindResize = exports.close = exports.max = exports.min = 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.elements = exports.launcherRoot = exports.simpleSystemTaskRoot = exports.AbstractForm = void 0;
 const clickgo = require("../clickgo");
 const core = require("./core");
 const task = require("./task");
@@ -18,6 +18,7 @@ const dom = require("./dom");
 const control = require("./control");
 const fs = require("./fs");
 const native = require("./native");
+let focusId = null;
 const info = {
     'lastId': 0,
     'lastZIndex': 999,
@@ -55,6 +56,7 @@ const info = {
 };
 class AbstractForm {
     constructor() {
+        this.isNativeSync = false;
         this._firstShow = true;
         this.dialogResult = '';
     }
@@ -96,6 +98,9 @@ class AbstractForm {
             };
             const cdata = Object.entries(frm);
             for (const item of cdata) {
+                if (item[0] === 'access') {
+                    continue;
+                }
                 code.data[item[0]] = item[1];
             }
             if (!layout) {
@@ -174,7 +179,7 @@ class AbstractForm {
             return (_d = (_b = (_a = task.list[this.taskId].locale.data[this.locale]) === null || _a === void 0 ? void 0 : _a[key]) !== null && _b !== void 0 ? _b : (_c = task.list[this.taskId].locale.data['en']) === null || _c === void 0 ? void 0 : _c[key]) !== null && _d !== void 0 ? _d : 'LocaleError';
         };
     }
-    classPrepend() {
+    get classPrepend() {
         return (cla) => {
             if (typeof cla !== 'string') {
                 return cla;
@@ -232,7 +237,7 @@ class AbstractForm {
     }
     show() {
         const v = this;
-        v.$refs.form.$data.showData = true;
+        v.$refs.form.$data.isShow = true;
         if (this._firstShow) {
             this._firstShow = false;
             const area = core.getAvailArea();
@@ -244,12 +249,13 @@ 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);
         }
     }
     showDialog() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.topMost = true;
             this.show();
             task.list[this.taskId].runtime.dialogFormIds.push(this.formId);
             return new Promise((resolve) => {
@@ -261,7 +267,10 @@ class AbstractForm {
     }
     hide() {
         const v = this;
-        v.$refs.form.$data.showData = false;
+        v.$refs.form.$data.isShow = false;
+    }
+    close() {
+        close(this.formId);
     }
     onBeforeCreate() {
         return;
@@ -342,7 +351,7 @@ const popInfo = {
     'elList': [],
     'lastZIndex': 0
 };
-const elements = {
+exports.elements = {
     'wrap': document.createElement('div'),
     'list': document.createElement('div'),
     'popList': document.createElement('div'),
@@ -357,41 +366,33 @@ const elements = {
     'init': function () {
         this.wrap.id = 'cg-wrap';
         document.getElementsByTagName('body')[0].appendChild(this.wrap);
-        if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) {
-            this.wrap.addEventListener('mouseenter', function () {
-                native.invoke('cg-mouse-ignore', native.getToken(), false);
-            });
-            this.wrap.addEventListener('mouseleave', function () {
-                native.invoke('cg-mouse-ignore', native.getToken(), true);
-            });
-        }
-        this.list.id = 'cg-form-list';
-        this.wrap.appendChild(this.list);
-        this.list.addEventListener('touchmove', function (e) {
+        this.wrap.addEventListener('touchmove', function (e) {
             if (e.cancelable) {
                 e.preventDefault();
             }
         }, {
             'passive': false
         });
-        this.list.addEventListener('wheel', function (e) {
+        this.wrap.addEventListener('wheel', function (e) {
             e.preventDefault();
         }, {
             'passive': false
         });
-        this.list.addEventListener('contextmenu', function (e) {
+        this.wrap.addEventListener('contextmenu', function (e) {
             e.preventDefault();
         });
+        if (clickgo.isImmersion()) {
+            this.wrap.addEventListener('mouseenter', function () {
+                native.invoke('cg-mouse-ignore', native.getToken(), false);
+            });
+            this.wrap.addEventListener('mouseleave', function () {
+                native.invoke('cg-mouse-ignore', native.getToken(), true);
+            });
+        }
+        this.list.id = 'cg-form-list';
+        this.wrap.appendChild(this.list);
         this.popList.id = 'cg-pop-list';
-        this.popList.addEventListener('contextmenu', function (e) {
-            e.preventDefault();
-        });
         this.wrap.appendChild(this.popList);
-        this.popList.addEventListener('touchmove', function (e) {
-            e.preventDefault();
-        }, {
-            'passive': false
-        });
         this.circular.id = 'cg-circular';
         this.wrap.appendChild(this.circular);
         this.rectangle.setAttribute('data-pos', '');
@@ -404,25 +405,9 @@ const elements = {
         this.dragIcon = this.drag.childNodes[0];
         this.wrap.appendChild(this.drag);
         this.system.id = 'cg-system';
-        this.system.addEventListener('contextmenu', function (e) {
-            e.preventDefault();
-        });
         this.wrap.appendChild(this.system);
-        this.system.addEventListener('touchmove', function (e) {
-            e.preventDefault();
-        }, {
-            'passive': false
-        });
         this.simpleSystemtask.id = 'cg-simpletask';
-        this.simpleSystemtask.addEventListener('contextmenu', function (e) {
-            e.preventDefault();
-        });
         this.wrap.appendChild(this.simpleSystemtask);
-        this.simpleSystemtask.addEventListener('touchmove', function (e) {
-            e.preventDefault();
-        }, {
-            'passive': false
-        });
         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 () {
@@ -435,14 +420,14 @@ const elements = {
                     handler: function () {
                         const length = Object.keys(this.forms).length;
                         if (length > 0) {
-                            if (elements.simpleSystemtask.style.bottom !== '0px') {
-                                elements.simpleSystemtask.style.bottom = '0px';
+                            if (exports.elements.simpleSystemtask.style.bottom !== '0px') {
+                                exports.elements.simpleSystemtask.style.bottom = '0px';
                                 core.trigger('screenResize');
                             }
                         }
                         else {
-                            if (elements.simpleSystemtask.style.bottom === '0px') {
-                                elements.simpleSystemtask.style.bottom = '-46px';
+                            if (exports.elements.simpleSystemtask.style.bottom === '0px') {
+                                exports.elements.simpleSystemtask.style.bottom = '-46px';
                                 core.trigger('screenResize');
                             }
                         }
@@ -461,20 +446,12 @@ const elements = {
         });
         simpletaskApp.mount('#cg-simpletask');
         this.launcher.id = 'cg-launcher';
-        this.launcher.addEventListener('contextmenu', function (e) {
-            e.preventDefault();
-        });
         this.wrap.appendChild(this.launcher);
-        this.launcher.addEventListener('touchmove', function (e) {
-            e.preventDefault();
-        }, {
-            'passive': false
-        });
         const waiting = function () {
             if (!core.config) {
                 setTimeout(function () {
                     waiting();
-                }, 2000);
+                }, 150);
                 return;
             }
             const launcherApp = clickgo.vue.createApp({
@@ -639,7 +616,7 @@ const elements = {
         waiting();
     }
 };
-elements.init();
+exports.elements.init();
 function changeState(state, formId) {
     const tid = getTaskId(formId);
     const t = task.list[tid];
@@ -711,8 +688,8 @@ function bindDrag(e) {
 exports.bindDrag = bindDrag;
 function refreshMaxPosition() {
     const area = core.getAvailArea();
-    for (let i = 0; i < elements.list.children.length; ++i) {
-        const el = elements.list.children.item(i);
+    for (let i = 0; i < exports.elements.list.children.length; ++i) {
+        const el = exports.elements.list.children.item(i);
         const ef = el.children.item(0);
         if (ef.dataset.cgMax === undefined) {
             continue;
@@ -731,7 +708,7 @@ function refreshMaxPosition() {
 }
 exports.refreshMaxPosition = refreshMaxPosition;
 function getTaskId(formId) {
-    const formElement = elements.list.querySelector(`[data-form-id='${formId}']`);
+    const formElement = exports.elements.list.querySelector(`[data-form-id='${formId}']`);
     if (!formElement) {
         return 0;
     }
@@ -751,10 +728,10 @@ function get(formId) {
     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
     };
 }
@@ -778,18 +755,22 @@ function getList(taskId) {
         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
         };
     }
     return list;
 }
 exports.getList = getList;
+function getFocus() {
+    return focusId;
+}
+exports.getFocus = getFocus;
 function changeFocus(formId = 0) {
-    var _a, _b;
+    var _a;
     if (typeof formId !== 'number') {
         notify({
             'title': 'Warning',
@@ -798,37 +779,31 @@ function changeFocus(formId = 0) {
         });
         return;
     }
-    const focusElement = document.querySelector('#cg-form-list > [data-form-focus]');
-    if (focusElement) {
-        const dataFormId = focusElement.getAttribute('data-form-id');
-        if (dataFormId) {
-            const dataFormIdNumber = parseInt(dataFormId);
-            if (dataFormIdNumber === formId) {
-                return;
-            }
-            else {
-                const taskId = parseInt((_a = focusElement.getAttribute('data-task-id')) !== null && _a !== void 0 ? _a : '0');
-                const t = task.list[taskId];
-                t.forms[dataFormIdNumber].vapp._container.removeAttribute('data-form-focus');
-                t.forms[dataFormIdNumber].vroot._formFocus = false;
-                core.trigger('formBlurred', taskId, dataFormIdNumber);
-            }
+    const dataFormId = getFocus();
+    if (dataFormId) {
+        if (dataFormId === formId) {
+            return;
         }
         else {
-            return;
+            const t = task.list[task.getFocus()];
+            t.forms[dataFormId].vapp._container.removeAttribute('data-form-focus');
+            t.forms[dataFormId].vroot._formFocus = false;
+            core.trigger('formBlurred', t.id, dataFormId);
         }
     }
+    focusId = null;
+    task.setFocus();
     if (formId === 0) {
         return;
     }
-    const el = document.querySelector(`#cg-form-list > [data-form-id='${formId}']`);
+    const el = exports.elements.list.querySelector(`.cg-form-wrap[data-form-id='${formId}']`);
     if (!el) {
         return;
     }
     if (el.children.item(0).dataset.cgMin !== undefined) {
         min(formId);
     }
-    const taskId = parseInt((_b = el.getAttribute('data-task-id')) !== null && _b !== void 0 ? _b : '0');
+    const taskId = parseInt((_a = el.getAttribute('data-task-id')) !== null && _a !== void 0 ? _a : '0');
     const t = task.list[taskId];
     if (t.runtime.dialogFormIds.length) {
         const dialogFormId = t.runtime.dialogFormIds[t.runtime.dialogFormIds.length - 1];
@@ -836,13 +811,15 @@ function changeFocus(formId = 0) {
             min(dialogFormId);
         }
         if (t.forms[dialogFormId].vroot._topMost) {
-            t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
         }
         else {
-            t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
+            t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
         }
         t.forms[dialogFormId].vapp._container.dataset.formFocus = '';
         t.forms[dialogFormId].vroot._formFocus = true;
+        focusId = dialogFormId;
+        task.setFocus(t.id);
         core.trigger('formFocused', taskId, dialogFormId);
         if (dialogFormId !== formId) {
             clickgo.form.flash(dialogFormId, taskId);
@@ -850,13 +827,15 @@ function changeFocus(formId = 0) {
     }
     else {
         if (t.forms[formId].vroot._topMost) {
-            t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
+            t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
         }
         else {
-            t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
+            t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
         }
         t.forms[formId].vapp._container.dataset.formFocus = '';
         t.forms[formId].vroot._formFocus = true;
+        focusId = formId;
+        task.setFocus(t.id);
         core.trigger('formFocused', taskId, formId);
     }
 }
@@ -865,8 +844,8 @@ function getMaxZIndexID(out = {}) {
     var _a, _b;
     let zIndex = 0;
     let formId = null;
-    for (let i = 0; i < elements.list.children.length; ++i) {
-        const formWrap = elements.list.children.item(i);
+    for (let i = 0; i < exports.elements.list.children.length; ++i) {
+        const formWrap = exports.elements.list.children.item(i);
         const formInner = formWrap.children.item(0);
         if (!formInner) {
             continue;
@@ -976,21 +955,21 @@ function getRectByBorder(border) {
 }
 exports.getRectByBorder = getRectByBorder;
 function showCircular(x, y) {
-    elements.circular.style.transition = 'none';
+    exports.elements.circular.style.transition = 'none';
     requestAnimationFrame(function () {
-        elements.circular.style.width = '6px';
-        elements.circular.style.height = '6px';
-        elements.circular.style.left = (x - 3).toString() + 'px';
-        elements.circular.style.top = (y - 3).toString() + 'px';
-        elements.circular.style.opacity = '1';
+        exports.elements.circular.style.width = '6px';
+        exports.elements.circular.style.height = '6px';
+        exports.elements.circular.style.left = (x - 3).toString() + 'px';
+        exports.elements.circular.style.top = (y - 3).toString() + 'px';
+        exports.elements.circular.style.opacity = '1';
         requestAnimationFrame(function () {
-            elements.circular.style.transition = 'all .3s ease-out';
+            exports.elements.circular.style.transition = 'all .3s ease-out';
             requestAnimationFrame(function () {
-                elements.circular.style.width = '60px';
-                elements.circular.style.height = '60px';
-                elements.circular.style.left = (x - 30).toString() + 'px';
-                elements.circular.style.top = (y - 30).toString() + 'px';
-                elements.circular.style.opacity = '0';
+                exports.elements.circular.style.width = '60px';
+                exports.elements.circular.style.height = '60px';
+                exports.elements.circular.style.left = (x - 30).toString() + 'px';
+                exports.elements.circular.style.top = (y - 30).toString() + 'px';
+                exports.elements.circular.style.opacity = '0';
             });
         });
     });
@@ -998,43 +977,43 @@ function showCircular(x, y) {
 exports.showCircular = showCircular;
 function moveRectangle(border) {
     var _a, _b, _c, _d;
-    const dataReady = (_a = elements.rectangle.getAttribute('data-ready')) !== null && _a !== void 0 ? _a : '0';
+    const dataReady = (_a = exports.elements.rectangle.getAttribute('data-ready')) !== null && _a !== void 0 ? _a : '0';
     if (dataReady === '0') {
         return;
     }
-    const dataBorder = (_b = elements.rectangle.getAttribute('data-border')) !== null && _b !== void 0 ? _b : '';
+    const dataBorder = (_b = exports.elements.rectangle.getAttribute('data-border')) !== null && _b !== void 0 ? _b : '';
     const setDataBorder = typeof border === 'string' ? border : `o-${border.left}-${(_c = border.top) !== null && _c !== void 0 ? _c : 'n'}-${border.width}-${(_d = border.height) !== null && _d !== void 0 ? _d : 'n'}`;
     if (dataBorder === setDataBorder) {
         return;
     }
-    elements.rectangle.setAttribute('data-dir', setDataBorder);
+    exports.elements.rectangle.setAttribute('data-dir', setDataBorder);
     const pos = getRectByBorder(border);
     const width = pos.width - 20;
     const height = pos.height - 20;
     const left = pos.left + 10;
     const top = pos.top + 10;
     if (width !== undefined && height !== undefined && left !== undefined && top !== undefined) {
-        elements.rectangle.style.width = width.toString() + 'px';
-        elements.rectangle.style.height = height.toString() + 'px';
-        elements.rectangle.style.left = left.toString() + 'px';
-        elements.rectangle.style.top = top.toString() + 'px';
+        exports.elements.rectangle.style.width = width.toString() + 'px';
+        exports.elements.rectangle.style.height = height.toString() + 'px';
+        exports.elements.rectangle.style.left = left.toString() + 'px';
+        exports.elements.rectangle.style.top = top.toString() + 'px';
     }
 }
 exports.moveRectangle = moveRectangle;
 function showRectangle(x, y, border) {
-    elements.rectangle.style.transition = 'none';
+    exports.elements.rectangle.style.transition = 'none';
     requestAnimationFrame(function () {
-        elements.rectangle.style.width = '5px';
-        elements.rectangle.style.height = '5px';
-        elements.rectangle.style.left = (x - 10).toString() + 'px';
-        elements.rectangle.style.top = (y - 10).toString() + 'px';
-        elements.rectangle.style.opacity = '1';
-        elements.rectangle.setAttribute('data-ready', '0');
-        elements.rectangle.setAttribute('data-dir', '');
+        exports.elements.rectangle.style.width = '5px';
+        exports.elements.rectangle.style.height = '5px';
+        exports.elements.rectangle.style.left = (x - 10).toString() + 'px';
+        exports.elements.rectangle.style.top = (y - 10).toString() + 'px';
+        exports.elements.rectangle.style.opacity = '1';
+        exports.elements.rectangle.setAttribute('data-ready', '0');
+        exports.elements.rectangle.setAttribute('data-dir', '');
         requestAnimationFrame(function () {
-            elements.rectangle.style.transition = 'all .2s ease-out';
+            exports.elements.rectangle.style.transition = 'all .2s ease-out';
             requestAnimationFrame(function () {
-                elements.rectangle.setAttribute('data-ready', '1');
+                exports.elements.rectangle.setAttribute('data-ready', '1');
                 moveRectangle(border);
             });
         });
@@ -1042,40 +1021,40 @@ function showRectangle(x, y, border) {
 }
 exports.showRectangle = showRectangle;
 function hideRectangle() {
-    elements.rectangle.style.opacity = '0';
+    exports.elements.rectangle.style.opacity = '0';
 }
 exports.hideRectangle = hideRectangle;
 function showDrag() {
-    elements.drag.style.opacity = '1';
+    exports.elements.drag.style.opacity = '1';
 }
 exports.showDrag = showDrag;
 function moveDrag(opt) {
     if (opt.top) {
-        elements.drag.style.top = opt.top.toString() + 'px';
+        exports.elements.drag.style.top = opt.top.toString() + 'px';
     }
     if (opt.left) {
-        elements.drag.style.left = opt.left.toString() + 'px';
+        exports.elements.drag.style.left = opt.left.toString() + 'px';
     }
     if (opt.width) {
-        elements.drag.style.width = opt.width.toString() + 'px';
+        exports.elements.drag.style.width = opt.width.toString() + 'px';
     }
     if (opt.height) {
-        elements.drag.style.height = opt.height.toString() + 'px';
+        exports.elements.drag.style.height = opt.height.toString() + 'px';
     }
     if (opt.icon) {
-        if (elements.dragIcon) {
-            elements.dragIcon.style.display = 'block';
+        if (exports.elements.dragIcon) {
+            exports.elements.dragIcon.style.display = 'block';
         }
     }
     else {
-        if (elements.dragIcon) {
-            elements.dragIcon.style.display = 'none';
+        if (exports.elements.dragIcon) {
+            exports.elements.dragIcon.style.display = 'none';
         }
     }
 }
 exports.moveDrag = moveDrag;
 function hideDrag() {
-    elements.drag.style.opacity = '0';
+    exports.elements.drag.style.opacity = '0';
 }
 exports.hideDrag = hideDrag;
 let notifyTop = 10;
@@ -1111,7 +1090,7 @@ function notify(opt) {
         el.childNodes.item(0).style.background = 'url(' + opt.icon + ')';
         el.childNodes.item(0).style.backgroundSize = '16px';
     }
-    elements.system.appendChild(el);
+    exports.elements.system.appendChild(el);
     notifyTop += el.offsetHeight + 10;
     requestAnimationFrame(function () {
         el.style.transform = `translateY(${y}px) translateX(-10px)`;
@@ -1124,7 +1103,7 @@ function notify(opt) {
 }
 exports.notify = notify;
 function notifyProgress(notifyId, per) {
-    const el = elements.system.querySelector(`[data-notifyid="${notifyId}"]`);
+    const el = exports.elements.system.querySelector(`[data-notifyid="${notifyId}"]`);
     if (!el) {
         return;
     }
@@ -1148,7 +1127,7 @@ function notifyProgress(notifyId, per) {
 }
 exports.notifyProgress = notifyProgress;
 function hideNotify(notifyId) {
-    const el = elements.system.querySelector(`[data-notifyid="${notifyId}"]`);
+    const el = exports.elements.system.querySelector(`[data-notifyid="${notifyId}"]`);
     if (!el) {
         return;
     }
@@ -1175,11 +1154,11 @@ function hideNotify(notifyId) {
 }
 exports.hideNotify = hideNotify;
 function appendToPop(el) {
-    elements.popList.appendChild(el);
+    exports.elements.popList.appendChild(el);
 }
 exports.appendToPop = appendToPop;
 function removeFromPop(el) {
-    elements.popList.removeChild(el);
+    exports.elements.popList.removeChild(el);
 }
 exports.removeFromPop = removeFromPop;
 let lastShowPopTime = 0;
@@ -1399,13 +1378,14 @@ function remove(formId) {
     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) {
             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 () {
+            var _a;
             const fid = getMaxZIndexID({
                 'formIds': [formId]
             });
@@ -1420,12 +1400,16 @@ function remove(formId) {
             }
             task.list[taskId].forms[formId].vapp.unmount();
             task.list[taskId].forms[formId].vapp._container.remove();
+            (_a = exports.elements.popList.querySelector('[data-form-id="' + formId.toString() + '"]')) === null || _a === void 0 ? void 0 : _a.remove();
             if (io > -1) {
                 task.list[taskId].forms[formId].vroot.cgDialogCallback();
             }
             delete task.list[taskId].forms[formId];
             dom.removeStyle(taskId, 'form', formId);
             core.trigger('formRemoved', taskId, formId, title, icon);
+            dom.clearWatchStyle(formId);
+            dom.clearWatchProperty(formId);
+            native.clear(formId, taskId);
             if (Object.keys(task.list[taskId].forms).length === 0) {
                 task.end(taskId);
             }
@@ -1449,7 +1433,7 @@ function getForm(taskId, formId) {
     return form;
 }
 function create(opt) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
         if (!opt.taskId) {
             return -1;
@@ -1464,6 +1448,7 @@ function create(opt) {
             return -3;
         }
         let data = {};
+        let access = {};
         let methods = undefined;
         let computed = {};
         let beforeCreate = undefined;
@@ -1476,8 +1461,9 @@ function create(opt) {
         let unmounted = undefined;
         if (opt.code) {
             data = (_b = opt.code.data) !== null && _b !== void 0 ? _b : {};
+            access = (_c = opt.code.access) !== null && _c !== void 0 ? _c : {};
             methods = opt.code.methods;
-            computed = (_c = opt.code.computed) !== null && _c !== void 0 ? _c : {};
+            computed = (_d = opt.code.computed) !== null && _d !== void 0 ? _d : {};
             beforeCreate = opt.code.beforeCreate;
             created = opt.code.created;
             beforeMount = opt.code.beforeMount;
@@ -1492,7 +1478,7 @@ function create(opt) {
         if (opt.style) {
             const r = tool.stylePrepend(opt.style);
             prep = r.prep;
-            style = yield tool.styleUrl2DataUrl((_d = opt.path) !== null && _d !== void 0 ? _d : '/', r.style, t.app.files);
+            style = yield tool.styleUrl2DataUrl((_e = opt.path) !== null && _e !== void 0 ? _e : '/', r.style, t.app.files);
         }
         let layout = tool.purify(opt.layout);
         layout = tool.layoutAddTagClassAndReTagName(layout, true);
@@ -1505,8 +1491,12 @@ function create(opt) {
         }
         layout = tool.layoutClassPrepend(layout, prepList);
         layout = tool.eventsAttrWrap(layout);
-        elements.list.insertAdjacentHTML('beforeend', `<div class="cg-form-wrap" data-form-id="${formId.toString()}" data-task-id="${opt.taskId.toString()}"></div>`);
-        const el = elements.list.children.item(elements.list.children.length - 1);
+        if (layout.includes('<teleport')) {
+            layout = tool.teleportGlue(layout, formId);
+        }
+        exports.elements.list.insertAdjacentHTML('beforeend', `<div class="cg-form-wrap" data-form-id="${formId.toString()}" data-task-id="${opt.taskId.toString()}"></div>`);
+        exports.elements.popList.insertAdjacentHTML('beforeend', `<div data-form-id="${formId.toString()}" data-task-id="${opt.taskId.toString()}"></div>`);
+        const el = exports.elements.list.children.item(exports.elements.list.children.length - 1);
         computed.formId = {
             get: function () {
                 return formId;
@@ -1564,16 +1554,19 @@ function create(opt) {
                         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;
             }
         };
+        if (clickgo.isNative() && (formId === 1) && !clickgo.isImmersion() && !clickgo.hasFrame()) {
+            data.isNativeSync = true;
+        }
         if (style) {
             dom.pushStyle(opt.taskId, style, 'form', formId);
         }
@@ -1586,7 +1579,10 @@ function create(opt) {
                 'methods': methods,
                 'computed': computed,
                 'beforeCreate': beforeCreate,
-                'created': created,
+                'created': function () {
+                    this.access = tool.clone(access);
+                    created === null || created === void 0 ? void 0 : created.call(this);
+                },
                 'beforeMount': beforeMount,
                 'mounted': function () {
                     return __awaiter(this, void 0, void 0, function* () {
@@ -1596,7 +1592,7 @@ function create(opt) {
                                 'current': t.current,
                                 'files': t.app.files
                             });
-                            this.$refs.form.iconData = (icon instanceof Blob) ? yield tool.blob2DataUrl(icon) : '';
+                            this.$refs.form.iconDataUrl = (icon instanceof Blob) ? yield tool.blob2DataUrl(icon) : '';
                         }
                         resolve({
                             'vapp': vapp,
@@ -1645,15 +1641,36 @@ function create(opt) {
             }
             catch (err) {
                 core.trigger('error', rtn.vroot.taskId, rtn.vroot.formId, err, 'Create form mounted error.');
-                t.forms[formId] = undefined;
                 delete t.forms[formId];
-                rtn.vapp.unmount();
+                try {
+                    rtn.vapp.unmount();
+                }
+                catch (err) {
+                    const msg = `Message: ${err.message}\nTask id: ${opt.taskId}\nForm id: ${formId}\nFunction: form.create, unmount.`;
+                    notify({
+                        'title': 'Form Unmount Error',
+                        'content': msg,
+                        'type': 'danger'
+                    });
+                    console.log('Form Unmount Error', msg, err);
+                }
                 rtn.vapp._container.remove();
+                (_f = exports.elements.popList.querySelector('[data-form-id="' + rtn.vroot.formId + '"]')) === null || _f === void 0 ? void 0 : _f.remove();
+                dom.clearWatchStyle(rtn.vroot.formId);
+                dom.clearWatchProperty(rtn.vroot.formId);
+                native.clear(formId, t.id);
                 dom.removeStyle(rtn.vroot.taskId, 'form', rtn.vroot.formId);
                 return -8;
             }
         }
-        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);
+        if (rtn.vroot.isNativeSync) {
+            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);
+            });
+        }
         return formId;
     });
 }
@@ -1704,7 +1721,7 @@ function dialog(opt) {
                 }
             }
         };
-        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) => {
+        cls.create(undefined, `<form title="${(_c = nopt.title) !== null && _c !== void 0 ? _c : 'dialog'}" min="false" max="false" resize="false" height="0" width="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;
@@ -1780,20 +1797,20 @@ function flash(formId, taskId) {
 }
 exports.flash = flash;
 function showLauncher() {
-    elements.launcher.style.display = 'flex';
+    exports.elements.launcher.style.display = 'flex';
     requestAnimationFrame(function () {
-        elements.launcher.classList.add('cg-show');
+        exports.elements.launcher.classList.add('cg-show');
     });
 }
 exports.showLauncher = showLauncher;
 function hideLauncher() {
-    elements.launcher.classList.remove('cg-show');
+    exports.elements.launcher.classList.remove('cg-show');
     setTimeout(function () {
         if (exports.launcherRoot.folderName !== '') {
             exports.launcherRoot.closeFolder();
         }
         exports.launcherRoot.name = '';
-        elements.launcher.style.display = 'none';
+        exports.elements.launcher.style.display = 'none';
     }, 300);
 }
 exports.hideLauncher = hideLauncher;