clickgo 3.0.3-dev4 → 3.0.6-dev7

package/README.md

@@ -19,7 +19,7 @@ Load the module loader first, and then load it using the module loader.
 **index.html**
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.2.0/dist/loader.min.js?path=index"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.3.0/dist/loader.min.js?path=index&npm={'clickgo':'3.0.6-dev7'}"></script>
 ```
 
 **index.js**

package/dist/global.css

@@ -1 +1 @@
-#cg-wrap{--cg:hsl(20, 100%, 65%);--success:hsl(150, 100%, 40%);--success-hover:hsl(150, 100%, 45%);--success-active:hsl(150, 100%, 30%);--success-focus:hsl(150, 100%, 35%);--success-disabled:hsl(150, 0%, 40%);--info:hsl(210, 100%, 50%);--info-hover:hsl(210, 100%, 60%);--info-active:hsl(210, 100%, 40%);--info-focus:hsl(210, 100%, 45%);--info-disabled:hsl(210, 0%, 50%);--warning:hsl(20, 100%, 70%);--warning-hover:hsl(20, 100%, 80%);--warning-active:hsl(20, 100%, 60%);--warning-focus:hsl(20, 100%, 65%);--warning-disabled:hsl(20, 0%, 70%);--danger:hsl(350, 100%, 50%);--danger-hover:hsl(350, 100%, 70%);--danger-active:hsl(350, 100%, 40%);--danger-focus:hsl(350, 100%, 45%);--danger-disabled:hsl(350, 0%, 50%);--system-color:hsl(0, 0%, 95%);--system-background:hsla(0, 0%, 0%, .5);--face:hsl(0, 0%, 95%);--g-color:hsl(0, 0%, 20%);--g-color-hover:hsl(0, 0%, 30%);--g-color-active:hsl(0, 0%, 10%);--g-color-focus:hsl(0, 0%, 15%);--g-color-disabled:hsl(0, 0%, 60%);--g-background:hsl(0, 0%, 95%);--g-background-hover:hsl(0, 0%, 100%);--g-background-active:hsl(0, 0%, 85%);--g-background-kp:hsl(0, 0%, 80%);--g-background-opacity:hsl(0, 0%, 50%, .2);--g-background-focus:hsl(0, 0%, 97.5%);--g-background-disabled:hsl(0, 0%, 75%);--g-border-color:hsl(0, 0%, 40%);--g-border-color-hover:hsl(0, 0%, 50%);--g-border-color-active:hsl(0, 0%, 30%);--g-border-color-focus:hsl(0, 0%, 35%);--g-border-color-disabled:hsl(0, 0%, 60%);--g-plain-color:var(--g-color);--g-plain-color-hover:var(--g-color-hover);--g-plain-color-active:var(--g-color-active);--g-plain-color-focus:var(--g-color-focus);--g-plain-color-disabled:var(--g-color-disabled);--g-plain-background:hsl(0, 0%, 100%);--g-plain-background-hover:hsl(0, 0%, 98%);--g-plain-background-active:hsl(0, 0%, 95%);--g-plain-background-focus:var(--g-plain-background);--g-plain-background-disabled:hsl(0, 0%, 95%);--g-plain-border-color:hsl(0, 0%, 70%);--g-plain-border-color-hover:hsl(0, 0%, 80%);--g-plain-border-color-active:hsl(0, 0%, 60%);--g-plain-border-color-focus:hsl(0, 0%, 65%);--g-plain-border-color-disabled:hsl(0, 0%, 60%)}#cg-form-list{z-index:20020000}#cg-pop-list{z-index:20020001}#cg-simpletask{z-index:20020002}#cg-system{z-index:20020003}#cg-rectangle{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:3px;box-shadow:0 0 10px rgba(0,0,0,.25);background:rgba(255,255,255,.05);pointer-events:none;opacity:0}#cg-circular{z-index:20020004;box-sizing:border-box;position:fixed;border:solid 3px var(--cg);border-radius:50%;filter:drop-shadow(0 0 3px var(--cg));pointer-events:none;opacity:0}#cg-gesture{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:50%;pointer-events:none;opacity:0;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);transform:scale(0);width:20px;height:20px}#cg-gesture.done{background:rgba(255,255,255,.3);border:solid 3px rgba(0,0,0,.3)}#cg-drag{box-sizing:border-box;position:fixed;border-radius:3px;z-index:20020004;pointer-events:none;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);opacity:0;display:flex;justify-content:center;align-items:center}[data-cg-pop]{position:fixed;box-shadow:0px 5px 20px rgba(0,0,0,.25);transition:.1s ease-out;transition-property:transform,opacity;transform:translateY(-10px);opacity:0}[data-cg-pop]:not([data-cg-open]){pointer-events:none}[data-cg-pop][data-cg-open]{transform:translateY(0px);opacity:1}.cg-system-notify{background:var(--system-background);position:fixed;padding:15px;border-radius:3px;right:0;top:0;width:280px;font-size:14px;display:flex;transition:.1s ease-out;transition-property:transform,opacity;overflow:hidden;color:#f6f6f6;box-shadow:0 5px 20px rgba(0,0,0,.25);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1)}.cg-system-icon{margin-right:10px;width:16px;height:16px;border-radius:50%}.cg-system-icon.cg-primary{background:var(--success)}.cg-system-icon.cg-info{background:var(--info)}.cg-system-icon.cg-warning{background:var(--warning)}.cg-system-icon.cg-danger{background:var(--danger)}.cg-system-icon.cg-progress{background:var(--cg)}.cg-system-notify-title{font-size:16px;font-weight:bold;padding-bottom:10px}.cg-system-notify-content{line-height:1.5;word-break:break-word}.cg-system-notify-progress{position:absolute;bottom:0;left:0;border-radius:1px;background:var(--cg);transition:width 1s ease-out;width:0%;height:2px}#cg-simpletask{bottom:-46px;width:100%;height:46px;top:initial;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1);padding:5px 0 5px 5px;display:flex;color:var(--system-color);transition:bottom .1s ease-out;overflow-x:auto}#cg-simpletask::-webkit-scrollbar{display:none}.cg-simpletask-item{background:rgba(0,0,0,.05);border-radius:3px;padding:10px;display:flex;align-items:center;margin-right:5px}.cg-simpletask-item:hover{background:rgba(0,0,0,.1)}.cg-simpletask-item:active{background:rgba(0,0,0,.2)}.cg-simpletask-icon{margin-right:5px;background-size:cover;width:16px;height:16px}
+#cg-wrap{--cg:hsl(20, 100%, 65%);--success:hsl(150, 100%, 40%);--success-hover:hsl(150, 100%, 45%);--success-active:hsl(150, 100%, 30%);--success-focus:hsl(150, 100%, 35%);--success-disabled:hsl(150, 0%, 40%);--info:hsl(210, 100%, 50%);--info-hover:hsl(210, 100%, 60%);--info-active:hsl(210, 100%, 40%);--info-focus:hsl(210, 100%, 45%);--info-disabled:hsl(210, 0%, 50%);--warning:hsl(20, 100%, 70%);--warning-hover:hsl(20, 100%, 80%);--warning-active:hsl(20, 100%, 60%);--warning-focus:hsl(20, 100%, 65%);--warning-disabled:hsl(20, 0%, 70%);--danger:hsl(350, 100%, 50%);--danger-hover:hsl(350, 100%, 70%);--danger-active:hsl(350, 100%, 40%);--danger-focus:hsl(350, 100%, 45%);--danger-disabled:hsl(350, 0%, 50%);--system-color:hsl(0, 0%, 95%);--system-background:hsla(0, 0%, 0%, .5);--face:hsl(0, 0%, 95%);--g-color:hsl(0, 0%, 20%);--g-color-hover:hsl(0, 0%, 30%);--g-color-active:hsl(0, 0%, 10%);--g-color-focus:hsl(0, 0%, 15%);--g-color-disabled:hsl(0, 0%, 60%);--g-background:hsl(0, 0%, 95%);--g-background-hover:hsl(0, 0%, 100%);--g-background-active:hsl(0, 0%, 85%);--g-background-kp:hsl(0, 0%, 80%);--g-background-opacity:hsl(0, 0%, 50%, .2);--g-background-focus:hsl(0, 0%, 97.5%);--g-background-disabled:hsl(0, 0%, 75%);--g-border-color:hsl(0, 0%, 40%);--g-border-color-hover:hsl(0, 0%, 50%);--g-border-color-active:hsl(0, 0%, 30%);--g-border-color-focus:hsl(0, 0%, 35%);--g-border-color-disabled:hsl(0, 0%, 60%);--g-plain-color:var(--g-color);--g-plain-color-hover:var(--g-color-hover);--g-plain-color-active:var(--g-color-active);--g-plain-color-focus:var(--g-color-focus);--g-plain-color-disabled:var(--g-color-disabled);--g-plain-background:hsl(0, 0%, 100%);--g-plain-background-hover:hsl(0, 0%, 98%);--g-plain-background-active:hsl(0, 0%, 95%);--g-plain-background-focus:var(--g-plain-background);--g-plain-background-disabled:hsl(0, 0%, 95%);--g-plain-border-color:hsl(0, 0%, 70%);--g-plain-border-color-hover:hsl(0, 0%, 80%);--g-plain-border-color-active:hsl(0, 0%, 60%);--g-plain-border-color-focus:hsl(0, 0%, 65%);--g-plain-border-color-disabled:hsl(0, 0%, 60%)}#cg-form-list{z-index:20020000}#cg-pop-list{z-index:20020001}#cg-simpletask{z-index:20020002}#cg-system{z-index:20020003}#cg-rectangle{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:3px;box-shadow:0 0 10px rgba(0,0,0,.25);background:rgba(255,255,255,.05);pointer-events:none;opacity:0}#cg-circular{z-index:20020004;box-sizing:border-box;position:fixed;border:solid 3px var(--cg);border-radius:50%;filter:drop-shadow(0 0 3px var(--cg));pointer-events:none;opacity:0}#cg-gesture{z-index:20020004;box-sizing:border-box;position:fixed;border-radius:50%;pointer-events:none;opacity:0;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);transform:scale(0);width:20px;height:20px}#cg-gesture.done{background:rgba(255,255,255,.3);border:solid 3px rgba(0,0,0,.3)}#cg-drag{box-sizing:border-box;position:fixed;border-radius:3px;z-index:20020004;pointer-events:none;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);opacity:0;display:flex;justify-content:center;align-items:center}[data-cg-pop]{position:fixed;box-shadow:0px 5px 20px rgba(0,0,0,.25);transition:.1s ease-out;transition-property:transform,opacity;transform:translateY(-10px);opacity:0}[data-cg-pop]:not([data-cg-open]){pointer-events:none}[data-cg-pop][data-cg-open]{transform:translateY(0px);opacity:1}.cg-system-notify{background:var(--system-background);position:fixed;padding:15px;border-radius:3px;right:0;top:0;width:280px;font-size:14px;display:flex;transition:.1s ease-out;transition-property:transform,opacity;overflow:hidden;color:#f6f6f6;box-shadow:0 5px 20px rgba(0,0,0,.25);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1)}.cg-system-icon{margin-right:10px;width:16px;height:16px;border-radius:50%}.cg-system-icon.cg-primary{background:var(--success)}.cg-system-icon.cg-info{background:var(--info)}.cg-system-icon.cg-warning{background:var(--warning)}.cg-system-icon.cg-danger{background:var(--danger)}.cg-system-icon.cg-progress{background:var(--cg)}.cg-system-notify-title{font-size:16px;font-weight:bold;padding-bottom:10px}.cg-system-notify-content{line-height:1.5;word-break:break-word}.cg-system-notify-progress{position:absolute;bottom:0;left:0;border-radius:1px;background:var(--cg);transition:width 1s ease-out;width:0%;height:2px}#cg-simpletask{left:0;bottom:-46px;width:100%;height:46px;top:initial;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.1);backdrop-filter:blur(30px) brightness(1.1);padding:5px 0 5px 5px;display:flex;color:var(--system-color);transition:bottom .1s ease-out;overflow-x:auto}#cg-simpletask::-webkit-scrollbar{display:none}.cg-simpletask-item{background:rgba(0,0,0,.05);border-radius:3px;padding:10px;display:flex;align-items:center;margin-right:5px}.cg-simpletask-item:hover{background:rgba(0,0,0,.1)}.cg-simpletask-item:active{background:rgba(0,0,0,.2)}.cg-simpletask-icon{margin-right:5px;background-size:cover;width:16px;height:16px}

package/dist/lib/core.js

@@ -497,7 +497,6 @@ function fetchApp(url, opt = {}) {
             if (!opt.current.endsWith('/')) {
                 return null;
             }
-            current = opt.current.slice(0, -1);
             if (!url.startsWith('/')) {
                 url = '/current/' + url;
             }
@@ -506,11 +505,10 @@ function fetchApp(url, opt = {}) {
             if (!url.startsWith('/clickgo/') && !url.startsWith('/storage/') && !url.startsWith('/mounted/')) {
                 current = tool.urlResolve(window.location.href, url);
                 if (cga) {
-                    current = current.slice(0, -cga.length - 1);
+                    current = current.slice(0, -cga.length);
                     url = '/current/' + cga;
                 }
                 else {
-                    current = current.slice(0, -1);
                     url = '/current/';
                 }
             }
@@ -557,6 +555,7 @@ function fetchApp(url, opt = {}) {
                     fs.getContent(url + file.slice(1), {
                         'current': current
                     }).then(function (blob) {
+                        var _a;
                         return __awaiter(this, void 0, void 0, function* () {
                             if (blob === null || typeof blob === 'string') {
                                 clickgo.form.notify({
@@ -574,6 +573,7 @@ function fetchApp(url, opt = {}) {
                                 files[file] = blob;
                             }
                             ++loaded;
+                            (_a = opt.progress) === null || _a === void 0 ? void 0 : _a.call(opt, loaded, total);
                             if (opt.notifyId) {
                                 form.notifyProgress(opt.notifyId, loaded / total);
                             }
@@ -583,7 +583,9 @@ function fetchApp(url, opt = {}) {
                             resolve();
                         });
                     }).catch(function () {
+                        var _a;
                         ++loaded;
+                        (_a = opt.progress) === null || _a === void 0 ? void 0 : _a.call(opt, loaded, total);
                         if (opt.notifyId) {
                             form.notifyProgress(opt.notifyId, loaded / total);
                         }
@@ -616,8 +618,8 @@ function getAvailArea() {
         return {
             'left': 0,
             'top': 0,
-            'width': document.body.clientWidth,
-            'height': document.body.clientHeight - 46
+            'width': window.innerWidth,
+            'height': window.innerHeight - 46
         };
     }
     else {
@@ -629,29 +631,29 @@ function getAvailArea() {
             case 'left': {
                 left = task.systemTaskInfo.length;
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
             }
             case 'right': {
                 left = 0;
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
             }
             case 'top': {
                 left = 0;
                 top = task.systemTaskInfo.length;
-                width = document.body.clientWidth;
-                height = document.body.clientHeight - task.systemTaskInfo.length;
+                width = window.innerWidth;
+                height = window.innerHeight - task.systemTaskInfo.length;
                 break;
             }
             case 'bottom': {
                 left = 0;
                 top = 0;
-                width = document.body.clientWidth;
-                height = document.body.clientHeight - task.systemTaskInfo.length;
+                width = window.innerWidth;
+                height = window.innerHeight - task.systemTaskInfo.length;
             }
         }
         return {

package/dist/lib/core.ts

@@ -540,7 +540,7 @@ export async function readApp(blob: Blob): Promise<false | types.IApp> {
 /**
  * --- 从网址下载应用，App 模式下本方法不可用 ---
  * @param url 对于当前网页的相对、绝对路径，以 / 结尾的目录或 .cga 结尾的文件 ---
- * @param opt,notifyId:显示进度条的 notify id,current:设置则以设置的为准，否则以 location 为准 ---
+ * @param opt,notifyId:显示进度条的 notify id,current:设置则以设置的为准，以 / 结尾，否则以 location 为准 ---
  */
 export async function fetchApp(url: string, opt: types.ICoreFetchAppOptions = {}): Promise<null | types.IApp> {
     /** --- 若是 cga 文件，则是 cga 的文件名，含 .cga --- */
@@ -558,7 +558,6 @@ export async function fetchApp(url: string, opt: types.ICoreFetchAppOptions = {}
         if (!opt.current.endsWith('/')) {
             return null;
         }
-        current = opt.current.slice(0, -1);
         if (!url.startsWith('/')) {
             url = '/current/' + url;
         }
@@ -567,11 +566,10 @@ export async function fetchApp(url: string, opt: types.ICoreFetchAppOptions = {}
         if (!url.startsWith('/clickgo/') && !url.startsWith('/storage/') && !url.startsWith('/mounted/')) {
             current = tool.urlResolve(window.location.href, url);
             if (cga) {
-                current = current.slice(0, -cga.length - 1);
+                current = current.slice(0, -cga.length);
                 url = '/current/' + cga;
             }
             else {
-                current = current.slice(0, -1);
                 url = '/current/';
             }
         }
@@ -639,6 +637,7 @@ export async function fetchApp(url: string, opt: types.ICoreFetchAppOptions = {}
                         files[file] = blob;
                     }
                     ++loaded;
+                    opt.progress?.(loaded, total) as unknown;
                     if (opt.notifyId) {
                         form.notifyProgress(opt.notifyId, loaded / total);
                     }
@@ -648,6 +647,7 @@ export async function fetchApp(url: string, opt: types.ICoreFetchAppOptions = {}
                     resolve();
                 }).catch(function() {
                     ++loaded;
+                    opt.progress?.(loaded, total) as unknown;
                     if (opt.notifyId) {
                         form.notifyProgress(opt.notifyId, loaded / total);
                     }
@@ -682,8 +682,8 @@ export function getAvailArea(): types.IAvailArea {
         return {
             'left': 0,
             'top': 0,
-            'width': document.body.clientWidth,
-            'height': document.body.clientHeight - 46
+            'width': window.innerWidth,
+            'height': window.innerHeight - 46
         };
     }
     else {
@@ -695,29 +695,29 @@ export function getAvailArea(): types.IAvailArea {
             case 'left': {
                 left = task.systemTaskInfo.length;
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
             }
             case 'right': {
                 left = 0;
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
             }
             case 'top': {
                 left = 0;
                 top = task.systemTaskInfo.length;
-                width = document.body.clientWidth;
-                height = document.body.clientHeight - task.systemTaskInfo.length;
+                width = window.innerWidth;
+                height = window.innerHeight - task.systemTaskInfo.length;
                 break;
             }
             case 'bottom': {
                 left = 0;
                 top = 0;
-                width = document.body.clientWidth;
-                height = document.body.clientHeight - task.systemTaskInfo.length;
+                width = window.innerWidth;
+                height = window.innerHeight - task.systemTaskInfo.length;
             }
         }
         return {

package/dist/lib/form.js

@@ -781,7 +781,7 @@ function showPop(el, pop, direction, opt = {}) {
             left = bcr.left + bcr.width - 2;
             top = bcr.top - 2;
         }
-        if (width + left > document.body.clientWidth) {
+        if (width + left > window.innerWidth) {
             if (direction === 'v') {
                 left = bcr.left + bcr.width - width;
             }
@@ -789,7 +789,7 @@ function showPop(el, pop, direction, opt = {}) {
                 left = bcr.left - width + 2;
             }
         }
-        if (height + top > document.body.clientHeight) {
+        if (height + top > window.innerHeight) {
             if (direction === 'v') {
                 top = bcr.top - height;
             }
@@ -815,10 +815,10 @@ function showPop(el, pop, direction, opt = {}) {
         }
         left = x + 5;
         top = y + 7;
-        if (width + left > document.body.clientWidth) {
+        if (width + left > window.innerWidth) {
             left = x - width - 5;
         }
-        if (height + top > document.body.clientHeight) {
+        if (height + top > window.innerHeight) {
             top = y - height - 5;
         }
     }

package/dist/lib/form.ts

@@ -1000,7 +1000,7 @@ export function showPop(el: HTMLElement, pop: HTMLElement | undefined, direction
             top = bcr.top - 2;
         }
         // --- 检查水平是否出框 ---
-        if (width + left > document.body.clientWidth) {
+        if (width + left > window.innerWidth) {
             if (direction === 'v') {
                 // --- 垂直弹出 ---
                 left = bcr.left + bcr.width - width;
@@ -1011,7 +1011,7 @@ export function showPop(el: HTMLElement, pop: HTMLElement | undefined, direction
             }
         }
         // --- 检测垂直是否出框 ---
-        if (height + top > document.body.clientHeight) {
+        if (height + top > window.innerHeight) {
             if (direction === 'v') {
                 top = bcr.top - height;
             }
@@ -1038,11 +1038,11 @@ export function showPop(el: HTMLElement, pop: HTMLElement | undefined, direction
         left = x + 5;
         top = y + 7;
         // --- 水平 ---
-        if (width + left > document.body.clientWidth) {
+        if (width + left > window.innerWidth) {
             left = x - width - 5;
         }
         // --- 垂直 ---
-        if (height + top > document.body.clientHeight) {
+        if (height + top > window.innerHeight) {
             top = y - height - 5;
         }
     }

package/dist/lib/fs.js

@@ -27,7 +27,7 @@ function getContent(path, options) {
         const encoding = options.encoding;
         const start = options.start;
         const end = options.end;
-        if (path.startsWith('/clickgo/') || path.startsWith('http:') || path.startsWith('https:')) {
+        if (path.startsWith('/clickgo/') || path.startsWith('http:') || path.startsWith('https:') || path.startsWith('file:')) {
             let ourl = '';
             if (path.startsWith('/clickgo/')) {
                 if (!clickgoFiles.includes(fpath)) {

package/dist/lib/fs.ts

@@ -51,7 +51,7 @@ export async function getContent(path: string, options?: BufferEncoding | {
     const encoding = options.encoding;
     const start = options.start;
     const end = options.end;
-    if (path.startsWith('/clickgo/') || path.startsWith('http:') || path.startsWith('https:')) {
+    if (path.startsWith('/clickgo/') || path.startsWith('http:') || path.startsWith('https:') || path.startsWith('file:')) {
         let ourl: string = '';
         if (path.startsWith('/clickgo/')) {
             if (!clickgoFiles.includes(fpath)) {

package/dist/lib/task.js

@@ -170,7 +170,8 @@ function run(url, opt = {}) {
         }) : undefined;
         const app = yield core.fetchApp(url, {
             'notifyId': notifyId,
-            'current': ntask ? ntask.path : undefined
+            'current': ntask ? ntask.path : undefined,
+            'progress': opt.progress
         });
         if (notifyId) {
             setTimeout(function () {
@@ -276,13 +277,6 @@ function run(url, opt = {}) {
             core.trigger('taskEnded', task.id);
             return f - 100;
         }
-        if (clickgo.getNative() && opt.sync) {
-            f.vroot.$refs.form.isNativeSync = true;
-            window.addEventListener('resize', function () {
-                f.vroot.$refs.form.setPropData('width', window.innerWidth);
-                f.vroot.$refs.form.setPropData('height', window.innerHeight);
-            });
-        }
         if (app.config.style && app.files[app.config.style + '.css']) {
             const style = app.files[app.config.style + '.css'];
             const r = tool.stylePrepend(style, 'cg-task' + task.id.toString() + '_');
@@ -313,6 +307,18 @@ function run(url, opt = {}) {
         if (task.id === 1) {
             clickgo.native.send('cg-init', clickgo.native.getToken());
         }
+        if (clickgo.getNative() && opt.sync) {
+            f.vroot.$refs.form.isNativeSync = true;
+            clickgo.native.send('cg-set-size', JSON.stringify({
+                'token': clickgo.native.getToken(),
+                'width': f.vroot.$refs.form.widthData,
+                'height': f.vroot.$refs.form.heightData
+            }));
+            window.addEventListener('resize', function () {
+                f.vroot.$refs.form.setPropData('width', window.innerWidth);
+                f.vroot.$refs.form.setPropData('height', window.innerHeight);
+            });
+        }
         return task.id;
     });
 }
@@ -656,12 +662,12 @@ function refreshSystemPosition() {
             case 'left':
             case 'right': {
                 form.vroot.$refs.form.setPropData('width', 'auto');
-                form.vroot.$refs.form.setPropData('height', document.body.clientHeight);
+                form.vroot.$refs.form.setPropData('height', window.innerHeight);
                 break;
             }
             case 'top':
             case 'bottom': {
-                form.vroot.$refs.form.setPropData('width', document.body.clientWidth);
+                form.vroot.$refs.form.setPropData('width', window.innerWidth);
                 form.vroot.$refs.form.setPropData('height', 'auto');
                 break;
             }
@@ -676,7 +682,7 @@ function refreshSystemPosition() {
                 }
                 case 'right': {
                     exports.systemTaskInfo.length = form.vroot.$el.offsetWidth;
-                    form.vroot.$refs.form.setPropData('left', document.body.clientWidth - exports.systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('left', window.innerWidth - exports.systemTaskInfo.length);
                     form.vroot.$refs.form.setPropData('top', 0);
                     break;
                 }
@@ -689,7 +695,7 @@ function refreshSystemPosition() {
                 case 'bottom': {
                     exports.systemTaskInfo.length = form.vroot.$el.offsetHeight;
                     form.vroot.$refs.form.setPropData('left', 0);
-                    form.vroot.$refs.form.setPropData('top', document.body.clientHeight - exports.systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('top', window.innerHeight - exports.systemTaskInfo.length);
                     break;
                 }
             }

package/dist/lib/task.ts

@@ -222,7 +222,8 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     }) : undefined;
     const app: types.IApp | null = await core.fetchApp(url, {
         'notifyId': notifyId,
-        'current': ntask ? ntask.path : undefined
+        'current': ntask ? ntask.path : undefined,
+        'progress': opt.progress
     });
     if (notifyId) {
         setTimeout(function(): void {
@@ -339,13 +340,6 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         core.trigger('taskEnded', task.id);
         return f - 100;
     }
-    if (clickgo.getNative() && opt.sync) {
-        f.vroot.$refs.form.isNativeSync = true;
-        window.addEventListener('resize', function(): void {
-            f.vroot.$refs.form.setPropData('width', window.innerWidth);
-            f.vroot.$refs.form.setPropData('height', window.innerHeight);
-        });
-    }
     // --- 设置 global style（如果 form 创建失败，就不设置 global style 了） ---
     if (app.config.style && app.files[app.config.style + '.css']) {
         const style = app.files[app.config.style + '.css'] as string;
@@ -380,6 +374,19 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     if (task.id === 1) {
         clickgo.native.send('cg-init', clickgo.native.getToken());
     }
+    // --- 提交 sync ---
+    if (clickgo.getNative() && opt.sync) {
+        f.vroot.$refs.form.isNativeSync = true;
+        clickgo.native.send('cg-set-size', JSON.stringify({
+            'token': clickgo.native.getToken(),
+            'width': f.vroot.$refs.form.widthData,
+            'height': f.vroot.$refs.form.heightData
+        }));
+        window.addEventListener('resize', function(): void {
+            f.vroot.$refs.form.setPropData('width', window.innerWidth);
+            f.vroot.$refs.form.setPropData('height', window.innerHeight);
+        });
+    }
     return task.id;
 }
 
@@ -815,12 +822,12 @@ export function refreshSystemPosition(): void {
             case 'left':
             case 'right': {
                 form.vroot.$refs.form.setPropData('width', 'auto');
-                form.vroot.$refs.form.setPropData('height', document.body.clientHeight);
+                form.vroot.$refs.form.setPropData('height', window.innerHeight);
                 break;
             }
             case 'top':
             case 'bottom': {
-                form.vroot.$refs.form.setPropData('width', document.body.clientWidth);
+                form.vroot.$refs.form.setPropData('width', window.innerWidth);
                 form.vroot.$refs.form.setPropData('height', 'auto');
                 break;
             }
@@ -835,7 +842,7 @@ export function refreshSystemPosition(): void {
                 }
                 case 'right': {
                     systemTaskInfo.length = form.vroot.$el.offsetWidth;
-                    form.vroot.$refs.form.setPropData('left', document.body.clientWidth - systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('left', window.innerWidth - systemTaskInfo.length);
                     form.vroot.$refs.form.setPropData('top', 0);
                     break;
                 }
@@ -848,7 +855,7 @@ export function refreshSystemPosition(): void {
                 case 'bottom': {
                     systemTaskInfo.length = form.vroot.$el.offsetHeight;
                     form.vroot.$refs.form.setPropData('left', 0);
-                    form.vroot.$refs.form.setPropData('top', document.body.clientHeight - systemTaskInfo.length);
+                    form.vroot.$refs.form.setPropData('top', window.innerHeight - systemTaskInfo.length);
                     break;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.0.3-dev4",
+  "version": "3.0.6-dev7",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",