clickgo - npm Package Compare versions

Comparing version 3.0.4-dev5 to 3.0.5-dev6

dist/lib/core.js

@@ -558,2 +558,3 @@ "use strict";
                     }).then(function (blob) {
+                        var _a;
                         return __awaiter(this, void 0, void 0, function* () {
@@ -576,2 +577,3 @@ if (blob === null || typeof blob === 'string') {
                             ++loaded;
+                            (_a = opt.progress) === null || _a === void 0 ? void 0 : _a.call(opt, loaded, total);
                             if (opt.notifyId) {
@@ -586,3 +588,5 @@ form.notifyProgress(opt.notifyId, loaded / total);
                     }).catch(function () {
+                        var _a;
                         ++loaded;
+                        (_a = opt.progress) === null || _a === void 0 ? void 0 : _a.call(opt, loaded, total);
                         if (opt.notifyId) {
@@ -620,4 +624,4 @@ form.notifyProgress(opt.notifyId, loaded / total);
             'top': 0,
-            'width': document.body.clientWidth,
-            'height': document.body.clientHeight - 46
+            'width': window.innerWidth,
+            'height': window.innerHeight - 46
         };
@@ -634,4 +638,4 @@ }
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
@@ -642,4 +646,4 @@ }
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
@@ -650,4 +654,4 @@ }
                 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;
@@ -658,4 +662,4 @@ }
                 top = 0;
-                width = document.body.clientWidth;
-                height = document.body.clientHeight - task.systemTaskInfo.length;
+                width = window.innerWidth;
+                height = window.innerHeight - task.systemTaskInfo.length;
             }
@@ -662,0 +666,0 @@ }

dist/lib/core.ts

@@ -640,2 +640,3 @@ /**
                     ++loaded;
+                    opt.progress?.(loaded, total) as unknown;
                     if (opt.notifyId) {
@@ -650,2 +651,3 @@ form.notifyProgress(opt.notifyId, loaded / total);
                     ++loaded;
+                    opt.progress?.(loaded, total) as unknown;
                     if (opt.notifyId) {
@@ -685,4 +687,4 @@ form.notifyProgress(opt.notifyId, loaded / total);
             'top': 0,
-            'width': document.body.clientWidth,
-            'height': document.body.clientHeight - 46
+            'width': window.innerWidth,
+            'height': window.innerHeight - 46
         };
@@ -699,4 +701,4 @@ }
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
@@ -707,4 +709,4 @@ }
                 top = 0;
-                width = document.body.clientWidth - task.systemTaskInfo.length;
-                height = document.body.clientHeight;
+                width = window.innerWidth - task.systemTaskInfo.length;
+                height = window.innerHeight;
                 break;
@@ -715,4 +717,4 @@ }
                 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;
@@ -723,4 +725,4 @@ }
                 top = 0;
-                width = document.body.clientWidth;
-                height = document.body.clientHeight - task.systemTaskInfo.length;
+                width = window.innerWidth;
+                height = window.innerHeight - task.systemTaskInfo.length;
             }
@@ -727,0 +729,0 @@ }

dist/lib/task.js

@@ -173,3 +173,4 @@ "use strict";
             'notifyId': notifyId,
-            'current': ntask ? ntask.path : undefined
+            'current': ntask ? ntask.path : undefined,
+            'progress': opt.progress
         });
@@ -280,9 +281,2 @@ if (notifyId) {
         }
-        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']) {
@@ -318,2 +312,14 @@ const style = app.files[app.config.style + '.css'];
         }
+        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;
@@ -662,3 +668,3 @@ });
                 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;
@@ -668,3 +674,3 @@ }
             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');
@@ -684,3 +690,3 @@ break;
                     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);
@@ -698,3 +704,3 @@ break;
                     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;
@@ -701,0 +707,0 @@ }

dist/lib/task.ts

@@ -225,3 +225,4 @@ /**
         'notifyId': notifyId,
-        'current': ntask ? ntask.path : undefined
+        'current': ntask ? ntask.path : undefined,
+        'progress': opt.progress
     });
@@ -343,9 +344,2 @@ if (notifyId) {
     }
-    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 了） ---
@@ -385,2 +379,15 @@ if (app.config.style && app.files[app.config.style + '.css']) {
     }
+    // --- 提交 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;
@@ -821,3 +828,3 @@ }
                 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;
@@ -827,3 +834,3 @@ }
             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');
@@ -843,3 +850,3 @@ break;
                     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);
@@ -857,3 +864,3 @@ break;
                     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;
@@ -860,0 +867,0 @@ }

package.json

 {
   "name": "clickgo",
-  "version": "3.0.4-dev5",
+  "version": "3.0.5-dev6",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
@@ -5,0 +5,0 @@ "keywords": [

README.md

@@ -22,3 +22,3 @@ # ClickGo
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.3.0/dist/loader.min.js?path=index&npm={'clickgo':'3.0.4-dev5'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.3.0/dist/loader.min.js?path=index&npm={'clickgo':'3.0.5-dev6'}"></script>
 ```
@@ -25,0 +25,0 @@

No alert changes

Improved metrics

Total package byte prevSize

944569

increased by0.07%

Lines of code

19621

increased by0.1%

No dependency changes