clickgo 3.15.7 → 3.15.8

package/README.md

@@ -25,7 +25,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.5.7/dist/loader.min.js?path=index&npm={'clickgo':'3.15.7'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.7/dist/loader.min.js?path=index&npm={'clickgo':'3.15.8'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/form/method/zip/zip.js

@@ -75,7 +75,7 @@ class default_1 extends clickgo.form.AbstractForm {
         const ls = this.access.zip.readDir(path);
         for (const item of ls) {
             this.list.push({
-                'label': (item.isDirectory ? '[FOLD]' : '[FILE]') + ' ' + item.name,
+                'label': (item.isDirectory ? '[FOLD]' : '[FILE]') + ' ' + item.name + ' (' + clickgo.tool.sizeFormat(item.uncompressedSize) + ')',
                 'value': path + item.name
             });
         }

package/dist/clickgo.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.storage = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0;
-const version = '3.15.7';
+const version = '3.15.8';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.15.7';
+const version = '3.15.8';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/fs.js

@@ -149,8 +149,8 @@ function getContent(path, options, taskId) {
                 const rand = '?' + ((_a = options.cache) !== null && _a !== void 0 ? _a : Math.random().toString());
                 let blob = null;
                 const headers = {};
-                if (start || end) {
-                    headers['range'] = `bytes=${start === undefined ? '0' : start}-${end === undefined ? '' : end}`;
+                if (start !== null && start !== void 0 ? start : end) {
+                    headers['range'] = `bytes=${start !== null && start !== void 0 ? start : '0'}-${end !== null && end !== void 0 ? end : ''}`;
                 }
                 if (options.progress) {
                     blob = yield tool.request(ourl + (!ourl.startsWith(loader.cdn) ? rand : ''), {

package/dist/lib/fs.ts

@@ -164,8 +164,8 @@ export async function getContent(path: string, options?: BufferEncoding | {
             const rand = '?' + (options.cache ?? Math.random().toString());
             let blob: Blob | null = null;
             const headers: Record<string, string> = {};
-            if (start || end) {
-                headers['range'] = `bytes=${start === undefined ? '0' : start}-${end === undefined ? '' : end}`;
+            if (start ?? end) {
+                headers['range'] = `bytes=${start ?? '0'}-${end ?? ''}`;
             }
             if (options.progress) {
                 blob = await tool.request(ourl + (!ourl.startsWith(loader.cdn) ? rand : ''), {
@@ -190,7 +190,7 @@ export async function getContent(path: string, options?: BufferEncoding | {
                 fr.addEventListener('load', function() {
                     resolve(fr.result as string | null);
                 });
-                fr.readAsText(blob!, encoding);
+                fr.readAsText(blob, encoding);
             });
         }
         catch {

package/dist/lib/task.js

@@ -992,6 +992,9 @@ function run(url_1) {
                 blob2ArrayBuffer: function (blob) {
                     return tool.blob2ArrayBuffer(blob);
                 },
+                sizeFormat: function (size, spliter = ' ') {
+                    return tool.sizeFormat(size, spliter);
+                },
                 clone: function (obj) {
                     return tool.clone(obj);
                 },

package/dist/lib/task.ts

@@ -1123,6 +1123,9 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             blob2ArrayBuffer: function(blob: Blob): Promise<ArrayBuffer> {
                 return tool.blob2ArrayBuffer(blob);
             },
+            sizeFormat: function(size: number, spliter: string = ' '): string {
+                return tool.sizeFormat(size, spliter);
+            },
             clone: function(obj: Record<string, any> | any[]): any[] | any {
                 return tool.clone(obj);
             },

package/dist/lib/tool.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryParse = exports.queryStringify = exports.formatTime = exports.formatSecond = exports.compar = exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlAtom = exports.urlResolve = exports.parseUrl = exports.postResponseJson = exports.getResponseJson = exports.post = exports.get = exports.fetch = exports.request = exports.rgb2hsl = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.match = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
+exports.queryParse = exports.queryStringify = exports.formatTime = exports.formatSecond = exports.compar = exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlAtom = exports.urlResolve = exports.parseUrl = exports.postResponseJson = exports.getResponseJson = exports.post = exports.get = exports.fetch = exports.request = exports.rgb2hsl = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.match = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.sizeFormat = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
 function getClassPrototype(obj, over = [], level = 0) {
     var _a;
     if (level === 0) {
@@ -66,6 +66,15 @@ function blob2ArrayBuffer(blob) {
     });
 }
 exports.blob2ArrayBuffer = blob2ArrayBuffer;
+function sizeFormat(size, spliter = ' ') {
+    const units = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    let i = 0;
+    for (; i < 6 && size >= 1024.0; ++i) {
+        size /= 1024.0;
+    }
+    return (Math.round(size * 100) / 100).toString() + spliter + units[i];
+}
+exports.sizeFormat = sizeFormat;
 function clone(obj) {
     let newObj = {};
     if (obj instanceof Array) {

package/dist/lib/tool.ts

@@ -90,6 +90,20 @@ export function blob2ArrayBuffer(blob: Blob): Promise<ArrayBuffer> {
     });
 }
 
+/**
+ * --- 将文件大小格式化为带单位的字符串 ---
+ * @param size 文件大小
+ * @param spliter 分隔符
+ */
+export function sizeFormat(size: number, spliter: string = ' '): string {
+    const units = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    let i = 0;
+    for (; i < 6 && size >= 1024.0; ++i) {
+        size /= 1024.0;
+    }
+    return (Math.round(size * 100) / 100).toString() + spliter + units[i];
+}
+
 /**
  * --- 完整的克隆一份数组/对象 ---
  * @param obj 要克隆的对象

package/dist/lib/zip.js

@@ -92,6 +92,8 @@ class Zip {
                 return null;
             }
             return {
+                'compressedSize': file.compressedSize,
+                'uncompressedSize': file.uncompressedSize,
                 'date': file.date,
                 'isFile': true,
                 'isDirectory': false
@@ -100,6 +102,8 @@ class Zip {
         else {
             if (dirpath === '/') {
                 return {
+                    'compressedSize': 0,
+                    'uncompressedSize': 0,
                     'date': new Date(),
                     'isFile': false,
                     'isDirectory': true
@@ -112,6 +116,8 @@ class Zip {
             const pfolder = this._list[dpath];
             const folder = pfolder[fname];
             return {
+                'compressedSize': 0,
+                'uncompressedSize': 0,
                 'date': folder.date,
                 'isFile': false,
                 'isDirectory': true
@@ -244,6 +250,7 @@ class Zip {
     _refreshList() {
         const list = {};
         this._zip.forEach(function (relativePath, item) {
+            var _a, _b;
             if (relativePath.startsWith('/')) {
                 relativePath = relativePath.slice(1);
             }
@@ -271,6 +278,8 @@ class Zip {
             }
             list[parentPath][name] = {
                 'name': name,
+                'compressedSize': (_a = item._data.compressedSize) !== null && _a !== void 0 ? _a : 0,
+                'uncompressedSize': (_b = item._data.uncompressedSize) !== null && _b !== void 0 ? _b : 0,
                 'date': item.date,
                 'isFile': !item.dir,
                 'isDirectory': item.dir,

package/dist/lib/zip.ts

@@ -90,6 +90,8 @@ export class Zip {
                 return null;
             }
             return {
+                'compressedSize': file.compressedSize,
+                'uncompressedSize': file.uncompressedSize,
                 'date': file.date,
                 'isFile': true,
                 'isDirectory': false
@@ -99,6 +101,8 @@ export class Zip {
             // --- 文件夹 ---
             if (dirpath === '/') {
                 return {
+                    'compressedSize': 0,
+                    'uncompressedSize': 0,
                     'date': new Date(),
                     'isFile': false,
                     'isDirectory': true
@@ -111,6 +115,8 @@ export class Zip {
             const pfolder = this._list[dpath];
             const folder = pfolder[fname];
             return {
+                'compressedSize': 0,
+                'uncompressedSize': 0,
                 'date': folder.date,
                 'isFile': false,
                 'isDirectory': true
@@ -308,6 +314,8 @@ export class Zip {
             }
             list[parentPath][name] = {
                 'name': name,
+                'compressedSize': (item as any)._data.compressedSize ?? 0,
+                'uncompressedSize': (item as any)._data.uncompressedSize ?? 0,
                 'date': item.date,
                 'isFile': !item.dir,
                 'isDirectory': item.dir,

package/package.json

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

package/types/index.d.ts

@@ -539,6 +539,8 @@ export type TZip = import('../dist/lib/zip').Zip;
 
 export interface IZipItem {
     'name': string;
+    'compressedSize': number;
+    'uncompressedSize': number;
     'date': Date;
     'isFile': boolean;
     'isDirectory': boolean;
@@ -546,6 +548,8 @@ export interface IZipItem {
 }
 
 export interface IZipStats {
+    'compressedSize': number;
+    'uncompressedSize': number;
     'date': Date;
     'isFile': boolean;
     'isDirectory': boolean;