clickgo 3.1.4-dev13 → 3.1.6-dev15

package/dist/lib/native.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,7 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMax = exports.ping = exports.maximizable = exports.size = exports.restore = exports.min = exports.max = exports.invoke = exports.getListenerList = exports.clear = exports.off = exports.once = exports.on = exports.getToken = void 0;
-const clickgo = require("../clickgo");
+const clickgo = __importStar(require("../clickgo"));
 const token = (Math.random() * 100000000000000 * (100 + Math.round(Math.random() * (999 - 100)))).toString(32);
 function getToken() {
     return token;

package/dist/lib/task.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,16 +32,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.checkPermission = exports.run = exports.getList = exports.get = exports.offFrame = exports.onFrame = exports.getFocus = exports.setFocus = exports.lastId = exports.list = void 0;
-const clickgo = require("../clickgo");
-const core = require("./core");
-const dom = require("./dom");
-const tool = require("./tool");
-const form = require("./form");
-const control = require("./control");
-const fs = require("./fs");
-const theme = require("./theme");
-const native = require("./native");
+exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.checkPermission = exports.run = exports.getList = exports.getPermissions = exports.get = exports.offFrame = exports.onFrame = exports.getFocus = exports.setFocus = exports.lastId = exports.list = void 0;
+const clickgo = __importStar(require("../clickgo"));
+const core = __importStar(require("./core"));
+const dom = __importStar(require("./dom"));
+const tool = __importStar(require("./tool"));
+const form = __importStar(require("./form"));
+const control = __importStar(require("./control"));
+const fs = __importStar(require("./fs"));
+const theme = __importStar(require("./theme"));
+const native = __importStar(require("./native"));
 exports.list = {};
 exports.lastId = 0;
 let focusId = null;
@@ -84,7 +107,7 @@ function onFrame(fun, opt = {}) {
             else {
                 timer = requestAnimationFrame(function () {
                     timerHandler().catch(function (e) {
-                        console.log(e);
+                        console.log('task.onFrame: -3', e);
                     });
                 });
                 frameMaps[ft] = timer;
@@ -97,7 +120,7 @@ function onFrame(fun, opt = {}) {
         else {
             timer = requestAnimationFrame(function () {
                 timerHandler().catch(function (e) {
-                    console.log(e);
+                    console.log('task.onFrame: -2', e);
                 });
             });
             frameMaps[ft] = timer;
@@ -105,7 +128,7 @@ function onFrame(fun, opt = {}) {
     });
     timer = requestAnimationFrame(function () {
         timerHandler().catch(function (e) {
-            console.log(e);
+            console.log('task.onFrame: -1', e);
         });
     });
     frameMaps[ft] = timer;
@@ -145,6 +168,13 @@ function get(tid) {
     };
 }
 exports.get = get;
+function getPermissions(tid) {
+    if (exports.list[tid] === undefined) {
+        return [];
+    }
+    return tool.clone(exports.list[tid].runtime.permissions);
+}
+exports.getPermissions = getPermissions;
 function getList() {
     const rtn = {};
     for (const tid in exports.list) {
@@ -162,13 +192,9 @@ function getList() {
     return rtn;
 }
 exports.getList = getList;
-function run(url, opt = {}) {
+function run(url, opt = {}, ntid) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        let ntask = null;
-        if (opt.taskId) {
-            ntask = exports.list[opt.taskId];
-        }
         if (!url.endsWith('/') && !url.endsWith('.cga')) {
             return 0;
         }
@@ -186,11 +212,18 @@ function run(url, opt = {}) {
             'timeout': 0,
             'progress': true
         }) : undefined;
+        if (!ntid &&
+            !url.startsWith('/clickgo/') &&
+            !url.startsWith('/storage/') &&
+            !url.startsWith('/mounted/') &&
+            !url.startsWith('/package/') &&
+            !url.startsWith('/current/')) {
+            url = tool.urlResolve(location.href, url);
+        }
         const app = yield core.fetchApp(url, {
             'notifyId': notifyId,
-            'current': ntask ? ntask.current : undefined,
             'progress': opt.progress
-        });
+        }, ntid);
         if (notifyId) {
             setTimeout(function () {
                 form.hideNotify(notifyId);
@@ -203,7 +236,7 @@ function run(url, opt = {}) {
         const unblock = opt.unblock ? tool.clone(opt.unblock) : [];
         const unblockSys = [
             'require',
-            '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number'
+            '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'Object'
         ];
         for (const name of unblockSys) {
             if (unblock.includes(name)) {
@@ -382,6 +415,9 @@ function run(url, opt = {}) {
                 }
             },
             'dom': {
+                inPage: function (el) {
+                    return dom.inPage(el);
+                },
                 setGlobalCursor: function (type) {
                     dom.setGlobalCursor(type);
                 },
@@ -391,15 +427,21 @@ function run(url, opt = {}) {
                 getStyleCount: function (taskId, type) {
                     return dom.getStyleCount(taskId, type);
                 },
+                getWatchSizeCount: function (taskId) {
+                    return dom.getWatchSizeCount(taskId);
+                },
                 watchSize: function (el, cb, immediate = false) {
                     return dom.watchSize(el, cb, immediate, taskId);
                 },
                 unwatchSize: function (el) {
                     dom.unwatchSize(el, taskId);
                 },
-                isWatchSize(el) {
+                isWatchSize: function (el) {
                     return dom.isWatchSize(el);
                 },
+                getWatchCount: function (taskId) {
+                    return dom.getWatchCount(taskId);
+                },
                 watch: function (el, cb, mode = 'default', immediate = false) {
                     dom.watch(el, cb, mode, immediate, taskId);
                 },
@@ -415,13 +457,16 @@ function run(url, opt = {}) {
                 isWatchStyle: function (el) {
                     return dom.isWatchStyle(el);
                 },
-                watchProperty(el, name, cb, immediate = false) {
+                watchProperty: function (el, name, cb, immediate = false) {
                     dom.watchProperty(el, name, cb, immediate);
                 },
                 isWatchProperty(el) {
                     return dom.isWatchProperty(el);
                 },
-                bindClick(e, handler) {
+                getWatchInfo: function () {
+                    return dom.getWatchInfo();
+                },
+                bindClick: function (e, handler) {
                     dom.bindClick(e, handler);
                 },
                 bindDown: function (oe, opt) {
@@ -443,8 +488,8 @@ function run(url, opt = {}) {
                 bindResize: function (e, opt) {
                     dom.bindResize(e, opt);
                 },
-                findParentByData: function (el, name) {
-                    return dom.findParentByData(el, name);
+                findParentByData: function (el, name, value) {
+                    return dom.findParentByData(el, name, value);
                 },
                 findParentByClass: function (el, name) {
                     return dom.findParentByClass(el, name);
@@ -460,6 +505,11 @@ function run(url, opt = {}) {
                 }
             },
             'form': {
+                'AbstractPanel': class extends form.AbstractPanel {
+                    get taskId() {
+                        return taskId;
+                    }
+                },
                 'AbstractForm': class extends form.AbstractForm {
                     get taskId() {
                         return taskId;
@@ -492,6 +542,15 @@ function run(url, opt = {}) {
                 getFocus: function () {
                     return form.getFocus();
                 },
+                getActivePanel: function (formId) {
+                    return form.getActivePanel(formId);
+                },
+                removeActivePanel: function (panelId, formId) {
+                    return form.removeActivePanel(panelId, formId, taskId);
+                },
+                setActivePanel: function (panelId, formId) {
+                    return form.setActivePanel(panelId, formId, taskId);
+                },
                 changeFocus: function (fid = 0) {
                     form.changeFocus(fid);
                 },
@@ -537,6 +596,15 @@ function run(url, opt = {}) {
                 hidePop: function (pop) {
                     form.hidePop(pop);
                 },
+                removePanel(id, vapp, el) {
+                    return form.removePanel(id, vapp, el);
+                },
+                createPanel(cls, el, formId) {
+                    return form.createPanel(cls, el, formId, taskId);
+                },
+                create: function (cls, data, opt) {
+                    return form.create(cls, data, opt, taskId);
+                },
                 dialog: function (opt) {
                     if (typeof opt === 'string') {
                         opt = {
@@ -566,116 +634,59 @@ function run(url, opt = {}) {
                 }
             },
             'fs': {
+                mount: function (name, handler) {
+                    return clickgo.fs.mount(name, handler, taskId);
+                },
+                unmount: function (name) {
+                    return clickgo.fs.unmount(name);
+                },
                 getContent: function (path, options = {}) {
-                    if (!options.files) {
-                        options.files = exports.list[taskId].app.files;
-                    }
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.getContent(path, options);
+                    return fs.getContent(path, options, taskId);
                 },
                 putContent: function (path, data, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.putContent(path, data, options);
+                    return fs.putContent(path, data, options, taskId);
                 },
                 readLink: function (path, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.readLink(path, options);
+                    return fs.readLink(path, options, taskId);
                 },
                 symlink: function (fPath, linkPath, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.symlink(fPath, linkPath, options);
+                    return fs.symlink(fPath, linkPath, options, taskId);
                 },
-                unlink: function (path, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.unlink(path, options);
+                unlink: function (path) {
+                    return fs.unlink(path, taskId);
                 },
-                stats: function (path, options = {}) {
-                    if (!options.files) {
-                        options.files = exports.list[taskId].app.files;
-                    }
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.stats(path, options);
+                stats: function (path) {
+                    return fs.stats(path, taskId);
                 },
-                isDir: function (path, options = {}) {
-                    if (!options.files) {
-                        options.files = exports.list[taskId].app.files;
-                    }
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.isDir(path, options);
+                isDir: function (path) {
+                    return fs.isDir(path, taskId);
                 },
-                isFile: function (path, options = {}) {
-                    if (!options.files) {
-                        options.files = exports.list[taskId].app.files;
-                    }
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.isFile(path, options);
+                isFile: function (path) {
+                    return fs.isFile(path, taskId);
                 },
-                mkdir: function (path, mode, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.mkdir(path, mode, options);
+                mkdir: function (path, mode) {
+                    return fs.mkdir(path, mode, taskId);
                 },
-                rmdir: function (path, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.rmdir(path, options);
+                rmdir: function (path) {
+                    return fs.rmdir(path, taskId);
                 },
-                rmdirDeep: function (path, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.rmdirDeep(path, options);
+                rmdirDeep: function (path) {
+                    return fs.rmdirDeep(path, taskId);
                 },
-                chmod: function (path, mod, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.chmod(path, mod, options);
+                chmod: function (path, mod) {
+                    return fs.chmod(path, mod, taskId);
                 },
-                rename(oldPath, newPath, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.rename(oldPath, newPath, options);
+                rename(oldPath, newPath) {
+                    return fs.rename(oldPath, newPath, taskId);
                 },
-                readDir(path, options = {}) {
-                    if (!options.files) {
-                        options.files = exports.list[taskId].app.files;
-                    }
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.readDir(path, options);
+                readDir(path, encoding) {
+                    return fs.readDir(path, encoding, taskId);
                 },
                 copyFolder(from, to, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.copyFolder(from, to, options);
+                    return fs.copyFolder(from, to, options, taskId);
                 },
-                copyFile(src, dest, options = {}) {
-                    if (!options.current) {
-                        options.current = exports.list[taskId].current;
-                    }
-                    return fs.copyFile(src, dest, options);
+                copyFile(src, dest) {
+                    return fs.copyFile(src, dest, taskId);
                 }
             },
             'native': {
@@ -764,11 +775,14 @@ function run(url, opt = {}) {
                 get: function (tid) {
                     return get(tid);
                 },
+                getPermissions: function (tid) {
+                    return getPermissions(tid);
+                },
                 getList: function () {
                     return getList();
                 },
                 run: function (url, opt = {}) {
-                    opt.taskId = taskId;
+                    var _a;
                     if (opt.unblock) {
                         const inUnblock = [];
                         for (const item of opt.unblock) {
@@ -780,11 +794,11 @@ function run(url, opt = {}) {
                         opt.unblock = inUnblock;
                     }
                     if (opt.permissions) {
-                        if (ntask && !ntask.runtime.permissions.includes('root')) {
+                        if (!((_a = exports.list[taskId]) === null || _a === void 0 ? void 0 : _a.runtime.permissions.includes('root'))) {
                             opt.permissions = undefined;
                         }
                     }
-                    return run(url, opt);
+                    return run(url, opt, taskId);
                 },
                 checkPermission: function (vals, apply = false, applyHandler) {
                     return checkPermission(vals, apply, applyHandler, taskId);
@@ -899,6 +913,9 @@ function run(url, opt = {}) {
                 escapeHTML: function (html) {
                     return tool.escapeHTML(html);
                 },
+                rgb2hsl: function (rgb) {
+                    return tool.rgb2hsl(rgb);
+                },
                 request: function (url, opt) {
                     return tool.request(url, opt);
                 },
@@ -908,6 +925,9 @@ function run(url, opt = {}) {
                 urlResolve: function (from, to) {
                     return tool.urlResolve(from, to);
                 },
+                urlAtom: function (url) {
+                    return tool.urlAtom(url);
+                },
                 blob2Text: function (blob) {
                     return tool.blob2Text(blob);
                 },
@@ -934,7 +954,7 @@ function run(url, opt = {}) {
                 });
                 return '';
             }
-            code = code.replace(/extends[\s\S]+?\.\s*(AbstractApp|AbstractForm)\s*{/, (t) => {
+            code = code.replace(/extends[\s\S]+?\.\s*(AbstractApp|AbstractForm|AbstractPanel)\s*{/, (t) => {
                 return t + 'get filename() {return __filename;}';
             });
             return code;
@@ -969,10 +989,8 @@ function run(url, opt = {}) {
                     path += '.json';
                 }
                 const lcontent = yield fs.getContent(path, {
-                    'encoding': 'utf8',
-                    'files': app.files,
-                    'current': current
-                });
+                    'encoding': 'utf8'
+                }, taskId);
                 if (!lcontent) {
                     continue;
                 }
@@ -986,13 +1004,17 @@ function run(url, opt = {}) {
         }
         let expo = [];
         try {
+            const map = {
+                'clickgo': '/invoke/clickgo'
+            };
+            if (app.config.map) {
+                Object.assign(map, app.config.map);
+            }
             expo = loader.require('/app.js', app.files, {
                 'dir': '/',
                 'invoke': invoke,
                 'preprocess': preprocess,
-                'map': {
-                    'clickgo': '/invoke/clickgo'
-                }
+                'map': map
             })[0];
         }
         catch (e) {
@@ -1015,10 +1037,7 @@ function run(url, opt = {}) {
             for (let path of app.config.themes) {
                 path += '.cgt';
                 path = tool.urlResolve('/', path);
-                const file = yield fs.getContent(path, {
-                    'files': app.files,
-                    'current': current
-                });
+                const file = yield fs.getContent(path, undefined, taskId);
                 if (file && typeof file !== 'string') {
                     const th = yield theme.read(file);
                     if (th) {
@@ -1034,10 +1053,8 @@ function run(url, opt = {}) {
         }
         if (app.config.style) {
             const style = yield fs.getContent(app.config.style + '.css', {
-                'encoding': 'utf8',
-                'files': app.files,
-                'current': current
-            });
+                'encoding': 'utf8'
+            }, taskId);
             if (style) {
                 const r = tool.stylePrepend(style, 'cg-task' + taskId.toString() + '_');
                 dom.pushStyle(taskId, yield tool.styleUrl2DataUrl(app.config.style, r.style, app.files));
@@ -1057,6 +1074,7 @@ exports.run = run;
 const locale = {
     'sc': {
         'unknown': '未知权限',
+        'root': '<b>危险！</b>最高权限！请一定确认是否允许！',
         'apply-permission': '正在申请权限，请您仔细确认',
         'native.form': '实体窗体控制',
         'hash': '可修改地址栏 hash',
@@ -1066,6 +1084,7 @@ const locale = {
     },
     'tc': {
         'unknown': '未知許可權',
+        'root': '<b>危險！</b>最高許可權！請一定確認是否允許！',
         'apply-permission': '正在申請許可權，請您仔細確認',
         'native.form': '實體視窗控制',
         'hash': '可修改位址列 hash',
@@ -1075,6 +1094,7 @@ const locale = {
     },
     'en': {
         'unknown': 'Unknown',
+        'root': '<b>Danger!</b> Highest authorization! Please confirm whether to authorize?',
         'apply-permission': 'is applying for permissions, please check carefully',
         'native.form': 'Native window control',
         'hash': 'Can modify the location hash',
@@ -1084,6 +1104,7 @@ const locale = {
     },
     'ja': {
         'unknown': '不明な許可',
+        'root': '<b>危険！</b>最高の許可！承認するかどうかを確認してください！',
         'apply-permission': '許可申請中、よくご確認ください',
         'native.form': 'ローカルウィンドウを操作する',
         'hash': '網址の hash 変更可能',
@@ -1224,6 +1245,7 @@ function end(taskId) {
         (_a = form.elements.popList.querySelector('[data-form-id="' + f.id.toString() + '"]')) === null || _a === void 0 ? void 0 : _a.remove();
         dom.clearWatchStyle(fid);
         dom.clearWatchProperty(fid);
+        delete form.activePanels[fid];
     }
     const flist = form.elements.list.querySelectorAll('.cg-form-wrap[data-task-id="' + taskId.toString() + '"]');
     for (const f of flist) {
@@ -1278,10 +1300,8 @@ function loadLocale(lang, path, taskId) {
         }
         path = tool.urlResolve(task.current + '/', path) + '.json';
         const fcontent = yield fs.getContent(path, {
-            'encoding': 'utf8',
-            'files': task.app.files,
-            'current': task.current
-        });
+            'encoding': 'utf8'
+        }, taskId);
         if (!fcontent) {
             return false;
         }