clickgo 3.0.6-dev7 → 3.1.0-dev9

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.3.0/dist/loader.min.js?path=index&npm={'clickgo':'3.0.6-dev7'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.1/dist/loader.min.js?path=index&npm={'clickgo':'3.0.7-dev8'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/app.js

@@ -0,0 +1,93 @@
+"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 main_1 = require("./form/main");
+class default_1 extends clickgo.core.AbstractApp {
+    main() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.config({
+                'name': 'Clickgo Demo',
+                'ver': 1,
+                'version': '0.1',
+                'author': 'clickgo',
+                'controls': [
+                    '/clickgo/control/common',
+                    '/clickgo/control/form',
+                    '/clickgo/control/monaco',
+                    '/clickgo/control/property'
+                ],
+                'style': '/package/global',
+                'files': [
+                    '/form/control/block/block.css',
+                    '/form/control/block/block.xml',
+                    '/form/control/button/button.css',
+                    '/form/control/button/button.xml',
+                    '/form/control/check/check.xml',
+                    '/form/control/dialog/dialog.xml',
+                    '/form/control/file/file.xml',
+                    '/form/control/form/form.css',
+                    '/form/control/form/form.xml',
+                    '/form/control/greatview/greatview.css',
+                    '/form/control/greatview/greatview.xml',
+                    '/form/control/img/img.xml',
+                    '/form/control/label/label.xml',
+                    '/form/control/list/list.css',
+                    '/form/control/list/list.xml',
+                    '/form/control/loading/loading.xml',
+                    '/form/control/marquee/marquee.xml',
+                    '/form/control/menu/menu.xml',
+                    '/form/control/monaco/monaco.xml',
+                    '/form/control/overflow/overflow.css',
+                    '/form/control/overflow/overflow.xml',
+                    '/form/control/property/property.xml',
+                    '/form/control/radio/radio.xml',
+                    '/form/control/scroll/scroll.xml',
+                    '/form/control/select/select.xml',
+                    '/form/control/tab/tab.xml',
+                    '/form/control/text/text.xml',
+                    '/form/control/view/view.css',
+                    '/form/control/view/view.xml',
+                    '/form/event/form/form.css',
+                    '/form/event/form/form.xml',
+                    '/form/event/screen/screen.xml',
+                    '/form/event/task/task.xml',
+                    '/form/method/core/core.xml',
+                    '/form/method/dom/dom.css',
+                    '/form/method/dom/dom.xml',
+                    '/form/method/form/form.css',
+                    '/form/method/form/form.xml',
+                    '/form/method/form/test.xml',
+                    '/form/method/fs/fs.xml',
+                    '/form/method/fs/text.xml',
+                    '/form/method/task/locale1.json',
+                    '/form/method/task/locale2.json',
+                    '/form/method/task/task.xml',
+                    '/form/method/theme/theme.xml',
+                    '/form/method/tool/tool.xml',
+                    '/form/method/zip/zip.xml',
+                    '/form/main.css',
+                    '/form/main.xml',
+                    '/res/icon.svg',
+                    '/res/img.jpg',
+                    '/res/r-1.svg',
+                    '/res/r-2.svg',
+                    '/res/sql.svg',
+                    '/res/txt.svg',
+                    '/res/zip.svg',
+                    '/global.css'
+                ]
+            });
+            this.run(yield main_1.default.create());
+        });
+    }
+}
+exports.default = default_1;

package/dist/app/demo/form/control/form/form.js

@@ -9,30 +9,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.methods = exports.data = void 0;
 const clickgo = require("clickgo");
-exports.data = {
-    'width': 300,
-    'height': 520,
-    'icon': '',
-    'title': 'Form',
-    'min': true,
-    'max': true,
-    'close': true,
-    'stateMax': false,
-    'stateMin': false,
-    'minWidth': 200,
-    'minHeight': 100,
-    'resize': true,
-    'loading': false,
-    'border': 'normal'
-};
-exports.methods = {
-    showLoading: function () {
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.width = 300;
+        this.height = 520;
+        this.icon = '';
+        this.title = 'Form';
+        this.min = true;
+        this.max = true;
+        this.close = true;
+        this.stateMax = false;
+        this.stateMin = false;
+        this.minWidth = 200;
+        this.minHeight = 100;
+        this.resize = true;
+        this.loading = false;
+        this.border = 'normal';
+    }
+    showLoading() {
         return __awaiter(this, void 0, void 0, function* () {
             this.loading = true;
             yield clickgo.tool.sleep(1000);
             this.loading = false;
         });
     }
-};
+}
+exports.default = default_1;

package/dist/app/demo/form/control/form/form.xml

@@ -1,7 +1,7 @@
 <form v-model:width="width" v-model:height="height" :icon="icon" :title="title" :min="min" :max="max" :close="close" v-model:state-max="stateMax" v-model:state-min="stateMin" :min-width="minWidth" :min-height="minHeight" :resize="resize" :loading="loading" :border="border" direction="v">
     <overflow direction="v">
         <layout direction="v" gutter="10" style="padding: 10px;">
-            <label>focus: {{cgFocus}}, width: {{width}}, height: {{height}}, state-max: {{stateMax}}, state-min: {{stateMin}}.</label>
+            <label>focus: {{formFocus}}, width: {{width}}, height: {{height}}, state-max: {{stateMax}}, state-min: {{stateMin}}.</label>
             <button @click="icon = icon ? '' : '/package/res/icon.svg'">Set icon</button>
             <button @click="title = (title === 'Form') ? 'Changed' : 'Form'">Set title</button>
             <button @click="min = min ? false : true">{{min ? 'Hide' : 'Show'}} min button</button>
@@ -13,8 +13,8 @@
             <button @click="minHeight = (minHeight === 100) ? 200 : 100">Set min-height to {{minHeight === 100 ? '200' : '100'}}</button>
             <button @click="width = 350">Set width to 350</button>
             <button @click="height = 400">Set height to 400</button>
-            <button @click="width = 'auto'">Set width to "auto"</button>
-            <button @click="height = 'auto'">Set height to "auto"</button>
+            <button @click="width = 0">Set width auto</button>
+            <button @click="height = 0">Set height auto</button>
             <button @click="resize = resize ? false : true">{{resize ? 'Disabled' : 'Enabled'}} resize</button>
             <button @click="showLoading">Show loading</button>
             <layout class="bottom" gutter="10">

package/dist/app/demo/form/main.js

@@ -9,17 +9,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.methods = exports.data = void 0;
 const clickgo = require("clickgo");
-exports.data = {
-    'ntab': ''
-};
-exports.methods = {
-    openForm: function (type, name) {
+const form_1 = require("./control/form/form");
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.ntab = '';
+    }
+    openForm(name) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield clickgo.form.create({
-                'file': `${type}/${name}/${name}`
-            });
+            let frm = 0;
+            switch (name) {
+                case 'cform': {
+                    frm = yield form_1.default.create();
+                    break;
+                }
+            }
+            if (typeof frm === 'number') {
+                return;
+            }
+            frm.show();
         });
     }
-};
+}
+exports.default = default_1;

package/dist/app/demo/form/main.xml

@@ -2,7 +2,7 @@
     <tab v-model="ntab" :tabs="['control', 'method', 'event']" style="margin: 10px; flex: 1;">
         <overflow v-if="ntab === 'control'" class="inner" direction="v">
             <layout class="buttons" gutter="10" direction="v">
-                <button @click="openForm('control', 'form')">Form</button>
+                <button @click="openForm('cform')">Form</button>
                 <button @click="openForm('control', 'img')">Img</button>
                 <button @click="openForm('control', 'button')">Button</button>
                 <button @click="openForm('control', 'check')">Check</button>

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,22 +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 = {
-    itemClick: function (appIndex) {
+    showLauncher() {
+        clickgo.form.showLauncher();
+    }
+    itemClick(appIndex) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.apps[appIndex].formCount === 0) {
                 try {
@@ -51,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);
@@ -61,8 +58,8 @@ exports.methods = {
                 return;
             }
         });
-    },
-    pin: function (index) {
+    }
+    pin(index) {
         const app = this.apps[index];
         if (!app) {
             return;
@@ -77,8 +74,8 @@ exports.methods = {
                 'icon': app.icon
             };
         }
-    },
-    close: function (index) {
+    }
+    close(index) {
         const app = this.apps[index];
         if (!app) {
             return;
@@ -86,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) {
@@ -103,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;
         }
@@ -182,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;
@@ -204,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;
@@ -215,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;
@@ -226,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;
@@ -240,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;
@@ -254,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': {},
@@ -284,7 +283,7 @@ const mounted = function () {
             if (!app.pin) {
                 continue;
             }
-            if (v[app.path]) {
+            if (val[app.path]) {
                 continue;
             }
             if (app.formCount === 0) {
@@ -294,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>
+        <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';