clickgo 3.0.7-dev8 → 3.1.1-dev10

package/dist/app/task/app.js

@@ -0,0 +1,46 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const clickgo = require("clickgo");
+const bar_1 = require("./form/bar/bar");
+class default_1 extends clickgo.core.AbstractApp {
+    main() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.config({
+                'name': 'Clickgo Task',
+                'ver': 1,
+                'version': '0.1',
+                'author': 'clickgo',
+                'controls': [
+                    '/clickgo/control/common',
+                    '/clickgo/control/form',
+                    '/clickgo/control/task'
+                ],
+                'locales': {
+                    '/package/locale/sc': 'sc',
+                    '/package/locale/tc': 'tc',
+                    '/package/locale/en': 'en',
+                    '/package/locale/ja': 'ja'
+                },
+                'files': [
+                    '/form/bar/bar.xml',
+                    '/form/desktop/desktop.xml',
+                    '/locale/en.json',
+                    '/locale/ja.json',
+                    '/locale/sc.json',
+                    '/locale/tc.json'
+                ]
+            });
+            this.run(yield bar_1.default.create());
+        });
+    }
+}
+exports.default = default_1;

package/dist/app/task/form/bar/bar.js

@@ -9,25 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mounted = exports.methods = exports.computed = exports.data = void 0;
 const clickgo = require("clickgo");
-exports.data = {
-    'left': 0,
-    'top': 0,
-    'width': undefined,
-    'height': undefined,
-    'apps': []
-};
-exports.computed = {
-    'position': function () {
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.apps = [];
+    }
+    get position() {
         return clickgo.core.config['task.position'];
     }
-};
-exports.methods = {
-    showLauncher: function () {
+    showLauncher() {
         clickgo.form.showLauncher();
-    },
-    itemClick: function (appIndex) {
+    }
+    itemClick(appIndex) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.apps[appIndex].formCount === 0) {
                 try {
@@ -54,8 +48,8 @@ exports.methods = {
             else {
             }
         });
-    },
-    run: function (path) {
+    }
+    run(path) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield clickgo.task.run(path);
@@ -64,8 +58,8 @@ exports.methods = {
                 return;
             }
         });
-    },
-    pin: function (index) {
+    }
+    pin(index) {
         const app = this.apps[index];
         if (!app) {
             return;
@@ -80,8 +74,8 @@ exports.methods = {
                 'icon': app.icon
             };
         }
-    },
-    close: function (index) {
+    }
+    close(index) {
         const app = this.apps[index];
         if (!app) {
             return;
@@ -89,14 +83,14 @@ exports.methods = {
         for (const formId in app.forms) {
             clickgo.form.remove(parseInt(formId));
         }
-    },
-    changeFocus: function (formId) {
+    }
+    changeFocus(formId) {
         clickgo.form.changeFocus(parseInt(formId));
-    },
-    updatePosition: function (position) {
+    }
+    updatePosition(position) {
         clickgo.core.config['task.position'] = position;
-    },
-    getAppIndexByPath: function (path) {
+    }
+    getAppIndexByPath(path) {
         for (let i = 0; i < this.apps.length; ++i) {
             const app = this.apps[i];
             if (app.path !== path) {
@@ -106,56 +100,56 @@ exports.methods = {
         }
         return -1;
     }
-};
-const mounted = function () {
-    clickgo.form.setTopMost(true);
-    clickgo.task.setSystem();
-    for (const path in clickgo.core.config['task.pin']) {
-        this.apps.push({
-            'name': clickgo.core.config['task.pin'][path].name,
-            'path': path,
-            'icon': clickgo.core.config['task.pin'][path].icon,
-            'selected': false,
-            'opened': false,
-            'forms': {},
-            'formCount': 0,
-            'pin': true
-        });
-    }
-    const tasks = clickgo.task.getList();
-    for (const taskId in tasks) {
-        if (parseInt(taskId) === this.taskId) {
-            continue;
-        }
-        const task = tasks[taskId];
-        let appIndex = this.getAppIndexByPath(task.path);
-        if (appIndex >= 0) {
-            this.apps[appIndex].opened = true;
-        }
-        else {
+    onMounted() {
+        this.topMost = true;
+        clickgo.task.setSystem(this.formId);
+        for (const path in clickgo.core.config['task.pin']) {
             this.apps.push({
-                'name': task.name,
-                'path': task.path,
-                'icon': task.icon,
+                'name': clickgo.core.config['task.pin'][path].name,
+                'path': path,
+                'icon': clickgo.core.config['task.pin'][path].icon,
                 'selected': false,
-                'opened': true,
+                'opened': false,
                 'forms': {},
                 'formCount': 0,
-                'pin': false
+                'pin': true
             });
-            appIndex = this.apps.length - 1;
         }
-        const forms = clickgo.form.getList(parseInt(taskId));
-        for (const formId in forms) {
-            const form = forms[formId];
-            this.apps[appIndex].forms[formId] = {
-                'title': form.title,
-                'icon': form.icon || this.apps[appIndex].icon
-            };
+        const tasks = clickgo.task.getList();
+        for (const taskId in tasks) {
+            if (parseInt(taskId) === this.taskId) {
+                continue;
+            }
+            const task = tasks[taskId];
+            let appIndex = this.getAppIndexByPath(task.path);
+            if (appIndex >= 0) {
+                this.apps[appIndex].opened = true;
+            }
+            else {
+                this.apps.push({
+                    'name': task.name,
+                    'path': task.path,
+                    'icon': task.icon,
+                    'selected': false,
+                    'opened': true,
+                    'forms': {},
+                    'formCount': 0,
+                    'pin': false
+                });
+                appIndex = this.apps.length - 1;
+            }
+            const forms = clickgo.form.getList(parseInt(taskId));
+            for (const formId in forms) {
+                const form = forms[formId];
+                this.apps[appIndex].forms[formId] = {
+                    'title': form.title,
+                    'icon': form.icon || this.apps[appIndex].icon
+                };
+            }
+            this.apps[appIndex].formCount = Object.keys(this.apps[appIndex].forms).length;
         }
-        this.apps[appIndex].formCount = Object.keys(this.apps[appIndex].forms).length;
     }
-    clickgo.core.setSystemEventListener('formCreated', (taskId, formId, title, icon) => {
+    onFormCreated(taskId, formId, title, icon) {
         if (taskId === this.taskId) {
             return;
         }
@@ -185,8 +179,8 @@ const mounted = function () {
             'icon': icon || this.apps[appIndex].icon
         };
         ++this.apps[appIndex].formCount;
-    });
-    clickgo.core.setSystemEventListener('formRemoved', (taskId, formId) => {
+    }
+    onFormRemoved(taskId, formId) {
         const task = clickgo.task.get(taskId);
         if (!task) {
             return;
@@ -207,8 +201,8 @@ const mounted = function () {
         else {
             this.apps.splice(appIndex, 1);
         }
-    });
-    clickgo.core.setSystemEventListener('formFocused', (taskId) => {
+    }
+    onFormFocused(taskId) {
         const task = clickgo.task.get(taskId);
         if (!task) {
             return;
@@ -218,8 +212,8 @@ const mounted = function () {
             return;
         }
         this.apps[appIndex].selected = true;
-    });
-    clickgo.core.setSystemEventListener('formBlurred', (taskId) => {
+    }
+    onFormBlurred(taskId) {
         const task = clickgo.task.get(taskId);
         if (!task) {
             return;
@@ -229,8 +223,8 @@ const mounted = function () {
             return;
         }
         this.apps[appIndex].selected = false;
-    });
-    clickgo.core.setSystemEventListener('formTitleChanged', (taskId, formId, title) => {
+    }
+    onFormTitleChanged(taskId, formId, title) {
         const task = clickgo.task.get(taskId);
         if (!task) {
             return;
@@ -243,8 +237,8 @@ const mounted = function () {
             return;
         }
         this.apps[appIndex].forms[formId].title = title;
-    });
-    clickgo.core.setSystemEventListener('formIconChanged', (taskId, formId, icon) => {
+    }
+    onFormIconChanged(taskId, formId, icon) {
         const task = clickgo.task.get(taskId);
         if (!task) {
             return;
@@ -257,18 +251,20 @@ const mounted = function () {
             return;
         }
         this.apps[appIndex].forms[formId].icon = icon || this.apps[appIndex].icon;
-    });
-    clickgo.core.setSystemEventListener('configChanged', (n, v) => {
+    }
+    onConfigChanged(n, v) {
         if (n !== 'task.pin') {
             return;
         }
-        for (const path in v) {
+        const val = v;
+        for (const path in val) {
+            const item = val[path];
             const appIndex = this.getAppIndexByPath(path);
             if (appIndex < 0) {
                 this.apps.unshift({
-                    'name': v[path].name,
+                    'name': item.name,
                     'path': path,
-                    'icon': v[path].icon,
+                    'icon': item.icon,
                     'selected': false,
                     'opened': false,
                     'forms': {},
@@ -287,7 +283,7 @@ const mounted = function () {
             if (!app.pin) {
                 continue;
             }
-            if (v[app.path]) {
+            if (val[app.path]) {
                 continue;
             }
             if (app.formCount === 0) {
@@ -297,6 +293,6 @@ const mounted = function () {
                 app.pin = false;
             }
         }
-    });
-};
-exports.mounted = mounted;
+    }
+}
+exports.default = default_1;

package/dist/app/task/form/bar/bar.xml

@@ -1,22 +1,21 @@
-  
-<form v-model:width="width" v-model:height="height" v-model:left="left" v-model:top="top" title="Bar" border="none" :resize="false" background="transparent">
+  <form title="Bar" border="none" :resize="false" background="transparent">
     <task :position="position">
         <task-item @click="showLauncher">
             <img src="/clickgo/icon.png" style="width: 16px; height: 16px;" />
         </task-item>
         <task-item v-for="(app, appIndex) of apps" :selected="app.selected" :opened="app.opened" :multi="app.formCount > 1" @click="itemClick(appIndex)" @mousedown="$event.stopPropagation()" @touchstart="$event.stopPropagation()">
-            <img :src="app.icon" style="width: 16px; height: 16px;" />
+            <img :src="app.icon || '/clickgo/icon.png'" style="width: 16px; height: 16px;" />
             <template v-if="app.formCount > 1" v-slot:pop>
                 <menulist>
                     <menulist-item v-for="(form, formId) of app.forms" @click="changeFocus(formId)">
-                        <img :src="form.icon" style="width: 16px; height: 16px;" /><label style="margin-left: 10px;">{{form.title}}</label>
+                        <img :src="form.icon || app.icon" style="width: 16px; height: 16px;" /><label style="margin-left: 10px;">{{form.title}}</label>
                     </menulist-item>
                 </menulist>
             </template>
             <template v-slot:contextmenu>
                 <menulist>
                     <menulist-item @click="run(app.path)">
-                        <img :src="app.icon" style="width: 16px; height: 16px;" /><label style="margin-left: 10px;">{{app.name}}</label>
+                        <img :src="app.icon || '/clickgo/icon.png'" style="width: 16px; height: 16px;" /><label style="margin-left: 10px;">{{app.name}}</label>
                     </menulist-item>
                     <menulist-split v-if="app.formCount > 0"></menulist-split>
                     <menulist-item @click="pin(appIndex)">

package/dist/clickgo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = void 0;
+exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getPlatform = exports.getNative = exports.getVersion = void 0;
 const version = '3.0.0';
 function getVersion() {
     return version;
@@ -22,15 +22,6 @@ function getPlatform() {
     return platform;
 }
 exports.getPlatform = getPlatform;
-let safe = true;
-function setSafe(val) {
-    safe = val;
-}
-exports.setSafe = setSafe;
-function getSafe() {
-    return safe;
-}
-exports.getSafe = getSafe;
 exports.vue = window.Vue;
 exports.control = require("./lib/control");
 exports.core = require("./lib/core");

package/dist/clickgo.ts

@@ -34,14 +34,6 @@ export function getPlatform(): NodeJS.Platform | 'web' {
     return platform;
 }
 
-let safe = true;
-export function setSafe(val: boolean): void {
-    safe = val;
-}
-export function getSafe(): boolean {
-    return safe;
-}
-
 export const vue: import('../types/index').IVueObject = (window as any).Vue;
 
 export * as control from './lib/control';

package/dist/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
+exports.launcher = exports.AbstractBoot = exports.getPlatform = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
 function getVersion() {
     return exports.clickgo.getVersion();
 }
@@ -22,62 +22,111 @@ function getPlatform() {
     return exports.clickgo.getPlatform();
 }
 exports.getPlatform = getPlatform;
-function setSafe(val) {
-    exports.clickgo.setSafe(val);
+class AbstractBoot {
+    onError() {
+        return;
+    }
+    onScreenResize() {
+        return;
+    }
+    onConfigChanged() {
+        return;
+    }
+    onFormCreated() {
+        return;
+    }
+    onFormRemoved() {
+        return;
+    }
+    onFormTitleChanged() {
+        return;
+    }
+    onFormIconChanged() {
+        return;
+    }
+    onFormStateMinChanged() {
+        return;
+    }
+    onFormStateMaxChanged() {
+        return;
+    }
+    onFormShowChanged() {
+        return;
+    }
+    onFormFocused() {
+        return;
+    }
+    onFormBlurred() {
+        return;
+    }
+    onFormFlash() {
+        return;
+    }
+    onTaskStarted() {
+        return;
+    }
+    onTaskEnded() {
+        return;
+    }
+    onLauncherFolderNameChanged() {
+        return;
+    }
 }
-exports.setSafe = setSafe;
-function getSafe() {
-    return exports.clickgo.getSafe();
-}
-exports.getSafe = getSafe;
-function init() {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const paths = [
-            loader.cdn + '/npm/vue@3.2.31/dist/vue.global.min.js'
-        ];
-        let ro = true;
-        if (!(window.ResizeObserver)) {
-            ro = false;
-            paths.push(loader.cdn + '/npm/@juggle/resize-observer@3.3.1/lib/exports/resize-observer.umd.min.js');
-        }
-        yield loader.loadScripts(paths);
-        if (!ro) {
-            window.ResizeObserverEntry = window.ResizeObserver.ResizeObserverEntry;
-            window.ResizeObserver = window.ResizeObserver.ResizeObserver;
-        }
-        const map = {
-            'jszip': loader.cdn + '/npm/jszip@3.10.0/dist/jszip.min'
-        };
-        const after = '?' + Math.random().toString();
-        const files = yield loader.sniffFiles('clickgo.js', {
-            'dir': __dirname + '/',
-            'after': after,
-            'afterIgnore': new RegExp('^' + loader.cdn.replace(/\./g, '\\.')),
-            'map': map
+exports.AbstractBoot = AbstractBoot;
+function launcher(boot) {
+    (function () {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const paths = [
+                loader.cdn + '/npm/vue@3.2.40/dist/vue.global.prod.min.js'
+            ];
+            let ro = true;
+            if (!(window.ResizeObserver)) {
+                ro = false;
+                paths.push(loader.cdn + '/npm/@juggle/resize-observer@3.4.0/lib/exports/resize-observer.umd.min.js');
+            }
+            yield loader.loadScripts(paths);
+            if (!ro) {
+                window.ResizeObserverEntry = window.ResizeObserver.ResizeObserverEntry;
+                window.ResizeObserver = window.ResizeObserver.ResizeObserver;
+            }
+            const map = {
+                'jszip': loader.cdn + '/npm/jszip@3.10.0/dist/jszip.min'
+            };
+            const after = '?' + Math.random().toString();
+            const files = yield loader.sniffFiles('clickgo.js', {
+                'dir': __dirname + '/',
+                'after': after,
+                'afterIgnore': new RegExp('^' + loader.cdn.replace(/\./g, '\\.')),
+                'map': map
+            });
+            const cg = loader.require('clickgo', files, {
+                'dir': __dirname + '/',
+                'map': map
+            })[0];
+            try {
+                const style = yield (yield fetch(__dirname + '/global.css' + (!__dirname.startsWith(loader.cdn) ? after : ''))).text();
+                (_a = document.getElementById('cg-global')) === null || _a === void 0 ? void 0 : _a.insertAdjacentHTML('afterbegin', style);
+            }
+            catch (_b) {
+                alert(`ClickGo: "${__dirname}/global.css'" failed.`);
+            }
+            exports.clickgo = cg;
+            exports.control = cg.control;
+            exports.core = cg.core;
+            exports.dom = cg.dom;
+            exports.form = cg.form;
+            exports.fs = cg.fs;
+            exports.native = cg.native;
+            exports.task = cg.task;
+            exports.theme = cg.theme;
+            exports.tool = cg.tool;
+            exports.zip = cg.zip;
+            exports.core.boot = boot;
+            yield boot.main();
         });
-        const cg = loader.require('clickgo', files, {
-            'dir': __dirname + '/',
-            'map': map
-        })[0];
-        try {
-            const style = yield (yield fetch(__dirname + '/global.css' + (!__dirname.startsWith(loader.cdn) ? after : ''))).text();
-            (_a = document.getElementById('cg-global')) === null || _a === void 0 ? void 0 : _a.insertAdjacentHTML('afterbegin', style);
-        }
-        catch (_b) {
-            alert(`ClickGo: "${__dirname}/global.css'" failed.`);
-        }
-        exports.clickgo = cg;
-        exports.control = cg.control;
-        exports.core = cg.core;
-        exports.dom = cg.dom;
-        exports.form = cg.form;
-        exports.fs = cg.fs;
-        exports.native = cg.native;
-        exports.task = cg.task;
-        exports.theme = cg.theme;
-        exports.tool = cg.tool;
-        exports.zip = cg.zip;
+    })().catch(function () {
+        return;
     });
 }
-exports.init = init;
+exports.launcher = launcher;