clickgo 3.1.3-dev12 → 3.1.4-dev13

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

package/dist/app/demo/config.json

@@ -60,12 +60,16 @@
         "/form/event/form/form.css",
         "/form/event/form/form.js",
         "/form/event/form/form.xml",
+        "/form/event/other/other.js",
+        "/form/event/other/other.xml",
         "/form/event/screen/screen.js",
         "/form/event/screen/screen.xml",
         "/form/event/task/task.js",
         "/form/event/task/task.xml",
         "/form/method/aform/aform.js",
         "/form/method/aform/aform.xml",
+        "/form/method/aform/sd.js",
+        "/form/method/aform/sd.xml",
         "/form/method/aform/test.xml",
         "/form/method/core/core.js",
         "/form/method/core/core.xml",

package/dist/app/demo/form/event/other/other.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const clickgo = require("clickgo");
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.list = [];
+    }
+    onLauncherFolderNameChanged(id, name) {
+        const date = new Date();
+        this.list.unshift({
+            'time': date.getHours().toString() + ':' + date.getMinutes().toString() + ':' + date.getSeconds().toString(),
+            'name': 'launcherFolderNameChanged',
+            'content': JSON.stringify({
+                'id': id,
+                'name': name
+            })
+        });
+    }
+    onHashChanged(hash) {
+        const date = new Date();
+        this.list.unshift({
+            'time': date.getHours().toString() + ':' + date.getMinutes().toString() + ':' + date.getSeconds().toString(),
+            'name': 'hashChanged',
+            'content': hash
+        });
+    }
+}
+exports.default = default_1;

package/dist/app/demo/form/event/other/other.xml

@@ -0,0 +1,5 @@
+<form width="500" height="550" title="About other" padding="10">
+    <vflow v-slot="data" :data="list" direction="v" style="color: #FFF; background: hsl(0, 0%, 20%); line-height: 1.5; padding: 10px; flex: 1;">
+        <label>[{{data.row.time}}] {{data.row.name}}, {{data.row.content}}.</label>
+    </vflow>
+</form>

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

@@ -28,6 +28,7 @@ const tab_1 = require("./control/tab/tab");
 const text_1 = require("./control/text/text");
 const vflow_1 = require("./control/vflow/vflow");
 const form_2 = require("./event/form/form");
+const other_1 = require("./event/other/other");
 const screen_1 = require("./event/screen/screen");
 const task_1 = require("./event/task/task");
 const aform_1 = require("./method/aform/aform");
@@ -147,6 +148,10 @@ class default_1 extends clickgo.form.AbstractForm {
                     frm = yield form_2.default.create();
                     break;
                 }
+                case 'eother': {
+                    frm = yield other_1.default.create();
+                    break;
+                }
                 case 'escreen': {
                     frm = yield screen_1.default.create();
                     break;

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

@@ -45,6 +45,7 @@
                 <button @click="openForm('escreen')">About screen</button>
                 <button @click="openForm('eform')">About form</button>
                 <button @click="openForm('etask')">About task</button>
+                <button @click="openForm('eother')">About other</button>
             </layout>
         </flow>
     </tab>

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const clickgo = require("clickgo");
+const sd_1 = require("./sd");
 class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
@@ -41,7 +42,7 @@ class default_1 extends clickgo.form.AbstractForm {
     }
     sshowDialog() {
         return __awaiter(this, void 0, void 0, function* () {
-            const frm = yield this.createForm('test');
+            const frm = yield sd_1.default.create();
             if (typeof frm === 'number') {
                 return;
             }

package/dist/app/demo/form/method/aform/sd.js

@@ -0,0 +1,28 @@
+"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");
+class Sd extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.dr = '';
+    }
+    newDialog() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const frm = yield Sd.create();
+            if (typeof frm === 'number') {
+                return;
+            }
+            this.dr = yield frm.showDialog();
+        });
+    }
+}
+exports.default = Sd;

package/dist/app/demo/form/method/aform/sd.xml

@@ -0,0 +1,7 @@
+<form width="200" height="200" title="dialog">
+    <layout align-v="center" align-h="center" direction="v" gutter="10" style="flex: 1; width: 0;">
+        <label>Haha! Result: {{dr}}</label>
+        <button @click="dialogResult = dialogResult ? '' : 'Done'" style="padding: 10px;">{{dialogResult ? 'Remove' : 'Set'}} dialogResult</button>
+        <button @click="newDialog"style="padding: 10px;">showDialog()</button>
+    </layout>
+</form>

package/dist/app/demo/form/method/aform/test.xml

@@ -1,6 +1,5 @@
-<form width="200" height="200" title="From path">
-    <layout align-v="center" align-h="center" direction="v" gutter="10" style="flex: 1; width: 0;">
-        <label>Haha!</label>
-        <button @click="dialogResult = dialogResult ? '' : 'Done'" style="padding: 10px;">{{dialogResult ? 'Remove' : 'Set'}} dialogResult</button>
-    </layout>
+<form width="200" height="200" title="From path">
+    <layout align-v="center" align-h="center" style="flex: 1; width: 0;">
+        <label>Create form path</label>
+    </layout>
 </form>

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

@@ -11,6 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const clickgo = require("clickgo");
 class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.hash = 'test';
+    }
     get config() {
         return JSON.stringify(clickgo.core.config, null, 4).replace(/"icon": "([\s\S]+?)"/g, '"icon": "data:image/..."');
     }
@@ -24,5 +28,13 @@ class default_1 extends clickgo.form.AbstractForm {
             yield clickgo.form.dialog(JSON.stringify(clickgo.core.getAvailArea()));
         });
     }
+    hashe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (clickgo.core.hash(this.hash)) {
+                return;
+            }
+            yield clickgo.form.dialog('No permission.');
+        });
+    }
 }
 exports.default = default_1;

package/dist/app/demo/form/method/core/core.xml

@@ -4,5 +4,9 @@
         <text v-model="config" readonly multi style="flex: 1;"></text>
         <button @click="getCdn" style="height: 30px;">getCdn()</button>
         <button @click="getAvailArea" style="height: 30px;">getAvailArea()</button>
+        <layout gutter="10" align-v="center">
+            <text v-model="hash" style="flex: 1;" />
+            <button @click="hashe" style="height: 30px; padding: 0 10px;">hash('{{hash}}')</button>
+        </layout>
     </layout>
 </form>

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

@@ -91,7 +91,9 @@ class default_1 extends clickgo.form.AbstractForm {
         clickgo.form.dialog(r ? JSON.stringify(r) : 'null').catch((e) => { throw e; });
     }
     getList() {
-        clickgo.form.dialog(JSON.stringify(clickgo.task.getList())).catch((e) => { throw e; });
+        let msg = JSON.stringify(clickgo.task.getList());
+        msg = msg.replace(/(data:image\/).+?"/g, '$1..."');
+        clickgo.form.dialog(msg).catch((e) => { throw e; });
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -99,6 +101,12 @@ class default_1 extends clickgo.form.AbstractForm {
             yield clickgo.form.dialog('Task ID: ' + tid.toString());
         });
     }
+    checkPermission() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rtn = yield clickgo.task.checkPermission('hash', true);
+            yield clickgo.form.dialog(rtn[0] ? 'Succeed' : 'Failed');
+        });
+    }
     end() {
         return __awaiter(this, void 0, void 0, function* () {
             yield clickgo.form.dialog('Result: ' + (clickgo.task.end(parseInt(this.tid)) ? 'true' : 'false'));

package/dist/app/demo/form/method/task/task.xml

@@ -30,6 +30,7 @@
             </layout>
             <button @click="getList" style="height: 30px;">getList()</button>
             <button @click="run" style="height: 30px;">run('/clickgo/app/demo/')</button>
+            <button @click="checkPermission" style="height: 30px;">checkPermission('hash')</button>
             <button @click="end" style="height: 30px;">end('{{tid}}')</button>
             <label>Now locale: {{locale}}, Global locale: {{globalLocale}}</label>
             <label>l('File name'): {{l('File name')}}</label>

package/dist/global.css

@@ -1 +1 @@
-#cg-wrap{position:fixed;left:0;top:0;--cg:hsl(20, 100%, 65%);--success:hsl(150, 100%, 40%);--success-hover:hsl(150, 100%, 45%);--success-active:hsl(150, 100%, 30%);--success-focus:hsl(150, 100%, 35%);--success-disabled:hsl(150, 0%, 40%);--info:hsl(210, 100%, 50%);--info-hover:hsl(210, 100%, 60%);--info-active:hsl(210, 100%, 40%);--info-focus:hsl(210, 100%, 45%);--info-disabled:hsl(210, 0%, 50%);--warning:hsl(20, 100%, 70%);--warning-hover:hsl(20, 100%, 80%);--warning-active:hsl(20, 100%, 60%);--warning-focus:hsl(20, 100%, 65%);--warning-disabled:hsl(20, 0%, 70%);--danger:hsl(350, 100%, 50%);--danger-hover:hsl(350, 100%, 70%);--danger-active:hsl(350, 100%, 40%);--danger-focus:hsl(350, 100%, 45%);--danger-disabled:hsl(350, 0%, 50%);--system-color:hsl(0, 0%, 95%);--system-background:hsla(0, 0%, 0%, .5);--system-border-color:hsla(0, 0%, 100%, .2);--face:hsl(0, 0%, 95%);--g-color:hsl(0, 0%, 20%);--g-color-hover:hsl(0, 0%, 30%);--g-color-active:hsl(0, 0%, 10%);--g-color-focus:hsl(0, 0%, 15%);--g-color-disabled:hsl(0, 0%, 60%);--g-background:hsl(0, 0%, 95%);--g-background-hover:hsl(0, 0%, 100%);--g-background-active:hsl(0, 0%, 85%);--g-background-kp:hsl(0, 0%, 80%);--g-background-opacity:hsl(0, 0%, 50%, .2);--g-background-focus:hsl(0, 0%, 97.5%);--g-background-disabled:hsl(0, 0%, 75%);--g-border-color:hsl(0, 0%, 40%);--g-border-color-hover:hsl(0, 0%, 50%);--g-border-color-active:hsl(0, 0%, 30%);--g-border-color-focus:hsl(0, 0%, 35%);--g-border-color-disabled:hsl(0, 0%, 60%);--g-plain-color:var(--g-color);--g-plain-color-hover:var(--g-color-hover);--g-plain-color-active:var(--g-color-active);--g-plain-color-focus:var(--g-color-focus);--g-plain-color-disabled:var(--g-color-disabled);--g-plain-background:hsl(0, 0%, 100%);--g-plain-background-hover:hsl(0, 0%, 98%);--g-plain-background-active:hsl(0, 0%, 95%);--g-plain-background-focus:var(--g-plain-background);--g-plain-background-disabled:hsl(0, 0%, 95%);--g-plain-border-color:hsl(0, 0%, 70%);--g-plain-border-color-hover:hsl(0, 0%, 80%);--g-plain-border-color-active:hsl(0, 0%, 60%);--g-plain-border-color-focus:hsl(0, 0%, 65%);--g-plain-border-color-disabled:hsl(0, 0%, 60%)}#cg-form-list{z-index:20020000}#cg-pop-list{z-index:20020001}#cg-simpletask{z-index:20020002}#cg-rectangle{z-index:20020003;box-sizing:border-box;position:absolute;border-radius:3px;box-shadow:0 0 10px rgba(0,0,0,.25);background:rgba(255,255,255,.05);pointer-events:none;opacity:0}#cg-circular{z-index:20020003;box-sizing:border-box;position:absolute;border:solid 3px var(--cg);border-radius:50%;filter:drop-shadow(0 0 3px var(--cg));pointer-events:none;opacity:0}#cg-gesture{z-index:20020003;box-sizing:border-box;position:absolute;border-radius:50%;pointer-events:none;opacity:0;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);transform:scale(0);width:20px;height:20px}#cg-gesture.done{background:rgba(255,255,255,.3);border:solid 3px rgba(0,0,0,.3)}#cg-gesture.ani{transition:all .1s ease-out;transition-property:left,top,transform}#cg-drag{z-index:20020003;box-sizing:border-box;position:absolute;border-radius:3px;pointer-events:none;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);opacity:0;display:flex;justify-content:center;align-items:center}#cg-launcher{z-index:20020004;box-sizing:border-box;position:fixed;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2);width:100%;height:100%;left:0;top:0;color:var(--system-color);display:none;flex-direction:column;transition:all .1s linear;transform:scale(1.2);opacity:0}#cg-launcher:not(.cg-show){pointer-events:none}#cg-launcher.cg-show{transform:scale(1);opacity:1}.cg-launcher-search{text-align:center;padding:50px}.cg-launcher-sinput{-webkit-appearance:none;appearance:none;padding:10px;height:38px;border:solid 1px var(--system-border-color);background:rgba(0,0,0,0);width:50%;border-radius:3px;color:var(--system-color)}.cg-launcher-sinput::placeholder{color:var(--system-border-color)}.cg-launcher-sinput::selection{background-color:var(--system-color);color:var(--g-color)}.cg-launcher-sinput:focus{outline:none;border-color:var(--system-color)}.cg-launcher-foldername{-webkit-appearance:none;appearance:none;height:38px;font-size:28px !important;border:none;background:rgba(0,0,0,0);width:50%;color:var(--system-color);text-align:center}.cg-launcher-foldername::selection{background-color:var(--system-color);color:var(--g-color)}.cg-launcher-foldername:focus{outline:none}.cg-launcher-item{width:190px;display:inline-flex;vertical-align:middle;margin-bottom:50px}.cg-launcher-inner{flex:1;width:0}.cg-launcher-icon{background-position:center;background-size:80px;height:80px;background-repeat:no-repeat}.cg-launcher-icon:active{filter:brightness(0.6)}.cg-launcher-name{font-size:13px;font-weight:bold;text-shadow:0 0 3px rgba(0,0,0,.6);text-align:center;margin-top:20px}.cg-launcher-icon,.cg-launcher-name{transition:all .1s linear;transition-property:opacity}.cg-launcher-space{width:50px}.cg-launcher-folder{display:flex;justify-content:center;height:80px}.cg-launcher-folder>div{height:80px;width:80px;background:rgba(255,255,255,.3);border-radius:20px;padding:10px 4px 4px 10px;transition:all .1s linear;transition-property:left,top,width,height,opacity;overflow-y:auto}.cg-launcher-folder>div::-webkit-scrollbar{display:none}.cg-launcher-folder>div .cg-launcher-item,.cg-launcher-folder>div .cg-launcher-space{transition:all .1s linear}.cg-launcher-folder>div.cg-show{padding:50px 0 0 50px}.cg-launcher-folder>div:not(.cg-show):active{filter:brightness(0.6)}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-item{width:22px;margin-bottom:6px}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-icon{background-size:16px;height:16px;pointer-events:none}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-name{display:none}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-space{width:6px}.cg-launcher-list{flex:1;height:0;overflow-y:auto;padding:0 0 0 50px}.cg-launcher-list::-webkit-scrollbar{display:none}.cg-launcher-list.cg-folder-open>.cg-launcher-item>.cg-launcher-inner>.cg-launcher-icon,.cg-launcher-list.cg-folder-open>.cg-launcher-item>.cg-launcher-inner>.cg-launcher-name{opacity:0}.cg-launcher-list.cg-folder-open>.cg-launcher-item>.cg-launcher-inner>.cg-launcher-folder>div:not(.cg-show){opacity:0}[data-cg-pop]{position:absolute;box-shadow:0px 5px 20px rgba(0,0,0,.25);transition:.1s ease-out;transition-property:transform,opacity;transform:translateY(-10px);opacity:0}[data-cg-pop]:not([data-cg-open]){pointer-events:none}[data-cg-pop][data-cg-open]{transform:translateY(0px);opacity:1}#cg-system{z-index:20020005}.cg-system-notify{background:var(--system-background);position:fixed;padding:15px;border-radius:3px;right:0;top:0;width:280px;font-size:14px;display:flex;transition:.1s ease-out;transition-property:transform,opacity;overflow:hidden;color:var(--system-color);box-shadow:0 5px 20px rgba(0,0,0,.25);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2)}.cg-system-icon{margin-right:10px;width:16px;height:16px;border-radius:50%}.cg-system-icon.cg-primary{background:var(--success)}.cg-system-icon.cg-info{background:var(--info)}.cg-system-icon.cg-warning{background:var(--warning)}.cg-system-icon.cg-danger{background:var(--danger)}.cg-system-icon.cg-progress{background:var(--cg)}.cg-system-notify-title{font-size:16px;font-weight:bold;padding-bottom:10px}.cg-system-notify-content{line-height:1.5;word-break:break-word}.cg-system-notify-progress{position:absolute;bottom:0;left:0;border-radius:1px;background:var(--cg);transition:width 1s ease-out;width:0%;height:2px}#cg-simpletask{left:0;bottom:-46px;width:100%;height:46px;top:initial;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2);padding:5px 0 5px 5px;display:flex;color:var(--system-color);transition:bottom .1s ease-out;overflow-x:auto;position:fixed}#cg-simpletask::-webkit-scrollbar{display:none}.cg-simpletask-item{background:rgba(0,0,0,.05);border-radius:3px;padding:10px;display:flex;align-items:center;margin-right:5px}.cg-simpletask-item:hover{background:rgba(0,0,0,.1)}.cg-simpletask-item:active{background:rgba(0,0,0,.2)}.cg-simpletask-icon{margin-right:5px;background-size:cover;width:16px;height:16px}
+#cg-wrap{position:fixed;left:0;top:0;--cg:hsl(20, 100%, 65%);--success:hsl(150, 100%, 40%);--success-hover:hsl(150, 100%, 45%);--success-active:hsl(150, 100%, 30%);--success-focus:hsl(150, 100%, 35%);--success-disabled:hsl(150, 0%, 40%);--info:hsl(210, 100%, 50%);--info-hover:hsl(210, 100%, 60%);--info-active:hsl(210, 100%, 40%);--info-focus:hsl(210, 100%, 45%);--info-disabled:hsl(210, 0%, 50%);--warning:hsl(20, 100%, 70%);--warning-hover:hsl(20, 100%, 80%);--warning-active:hsl(20, 100%, 60%);--warning-focus:hsl(20, 100%, 65%);--warning-disabled:hsl(20, 0%, 70%);--danger:hsl(350, 100%, 50%);--danger-hover:hsl(350, 100%, 70%);--danger-active:hsl(350, 100%, 40%);--danger-focus:hsl(350, 100%, 45%);--danger-disabled:hsl(350, 0%, 50%);--system-color:hsl(0, 0%, 95%);--system-background:hsla(0, 0%, 0%, .5);--system-background-hover:hsla(0, 0%, 100%, .05);--system-background-active:hsla(0, 0%, 0%, .2);--system-border-color:hsla(0, 0%, 100%, .2);--face:hsl(0, 0%, 95%);--g-color:hsl(0, 0%, 20%);--g-color-hover:hsl(0, 0%, 30%);--g-color-active:hsl(0, 0%, 10%);--g-color-focus:hsl(0, 0%, 15%);--g-color-disabled:hsl(0, 0%, 60%);--g-background:hsl(0, 0%, 95%);--g-background-hover:hsl(0, 0%, 100%);--g-background-active:hsl(0, 0%, 85%);--g-background-kp:hsl(0, 0%, 80%);--g-background-opacity:hsl(0, 0%, 50%, .2);--g-background-focus:hsl(0, 0%, 97.5%);--g-background-disabled:hsl(0, 0%, 75%);--g-border-color:hsl(0, 0%, 40%);--g-border-color-hover:hsl(0, 0%, 50%);--g-border-color-active:hsl(0, 0%, 30%);--g-border-color-focus:hsl(0, 0%, 35%);--g-border-color-disabled:hsl(0, 0%, 60%);--g-plain-color:var(--g-color);--g-plain-color-hover:var(--g-color-hover);--g-plain-color-active:var(--g-color-active);--g-plain-color-focus:var(--g-color-focus);--g-plain-color-disabled:var(--g-color-disabled);--g-plain-background:hsl(0, 0%, 100%);--g-plain-background-hover:hsl(0, 0%, 98%);--g-plain-background-active:hsl(0, 0%, 95%);--g-plain-background-focus:var(--g-plain-background);--g-plain-background-disabled:hsl(0, 0%, 95%);--g-plain-border-color:hsl(0, 0%, 70%);--g-plain-border-color-hover:hsl(0, 0%, 80%);--g-plain-border-color-active:hsl(0, 0%, 60%);--g-plain-border-color-focus:hsl(0, 0%, 65%);--g-plain-border-color-disabled:hsl(0, 0%, 60%)}#cg-form-list{z-index:20020000}#cg-pop-list{z-index:20020001}#cg-simpletask{z-index:20020002}#cg-rectangle{z-index:20020003;box-sizing:border-box;position:absolute;border-radius:3px;box-shadow:0 0 10px rgba(0,0,0,.25);background:rgba(255,255,255,.05);pointer-events:none;opacity:0}#cg-circular{z-index:20020003;box-sizing:border-box;position:absolute;border:solid 3px var(--cg);border-radius:50%;filter:drop-shadow(0 0 3px var(--cg));pointer-events:none;opacity:0}#cg-gesture{z-index:20020003;box-sizing:border-box;position:absolute;border-radius:50%;pointer-events:none;opacity:0;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);transform:scale(0);width:20px;height:20px}#cg-gesture.done{background:rgba(255,255,255,.3);border:solid 3px rgba(0,0,0,.3)}#cg-gesture.ani{transition:all .1s ease-out;transition-property:left,top,transform}#cg-drag{z-index:20020003;box-sizing:border-box;position:absolute;border-radius:3px;pointer-events:none;background:var(--system-background);box-shadow:0 5px 20px rgba(0,0,0,.25);opacity:0;display:flex;justify-content:center;align-items:center}#cg-launcher{z-index:20020004;box-sizing:border-box;position:fixed;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2);width:100%;height:100%;left:0;top:0;color:var(--system-color);display:none;flex-direction:column;transition:all .1s linear;transform:scale(1.2);opacity:0}#cg-launcher:not(.cg-show){pointer-events:none}#cg-launcher.cg-show{transform:scale(1);opacity:1}.cg-launcher-search{text-align:center;padding:50px}.cg-launcher-sinput{-webkit-appearance:none;appearance:none;padding:10px;height:38px;border:solid 1px var(--system-border-color);background:rgba(0,0,0,0);width:50%;border-radius:3px;color:var(--system-color)}.cg-launcher-sinput::placeholder{color:var(--system-border-color)}.cg-launcher-sinput::selection{background-color:var(--system-color);color:var(--g-color)}.cg-launcher-sinput:focus{outline:none;border-color:var(--system-color)}.cg-launcher-foldername{-webkit-appearance:none;appearance:none;height:38px;font-size:28px !important;border:none;background:rgba(0,0,0,0);width:50%;color:var(--system-color);text-align:center}.cg-launcher-foldername::selection{background-color:var(--system-color);color:var(--g-color)}.cg-launcher-foldername:focus{outline:none}.cg-launcher-item{width:190px;display:inline-flex;vertical-align:middle;margin-bottom:50px}.cg-launcher-inner{flex:1;width:0}.cg-launcher-icon{background-position:center;background-size:80px;height:80px;background-repeat:no-repeat}.cg-launcher-icon:active{filter:brightness(0.6)}.cg-launcher-name{font-size:13px;font-weight:bold;text-shadow:0 0 3px rgba(0,0,0,.6);text-align:center;margin-top:20px}.cg-launcher-icon,.cg-launcher-name{transition:all .1s linear;transition-property:opacity}.cg-launcher-space{width:50px}.cg-launcher-folder{display:flex;justify-content:center;height:80px}.cg-launcher-folder>div{height:80px;width:80px;background:rgba(255,255,255,.3);border-radius:20px;padding:10px 4px 4px 10px;transition:all .1s linear;transition-property:left,top,width,height,opacity;overflow-y:auto}.cg-launcher-folder>div::-webkit-scrollbar{display:none}.cg-launcher-folder>div .cg-launcher-item,.cg-launcher-folder>div .cg-launcher-space{transition:all .1s linear}.cg-launcher-folder>div.cg-show{padding:50px 0 0 50px}.cg-launcher-folder>div:not(.cg-show):active{filter:brightness(0.6)}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-item{width:22px;margin-bottom:6px}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-icon{background-size:16px;height:16px;pointer-events:none}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-name{display:none}.cg-launcher-folder>div:not(.cg-show) .cg-launcher-space{width:6px}.cg-launcher-list{flex:1;height:0;overflow-y:auto;padding:0 0 0 50px}.cg-launcher-list::-webkit-scrollbar{display:none}.cg-launcher-list.cg-folder-open>.cg-launcher-item>.cg-launcher-inner>.cg-launcher-icon,.cg-launcher-list.cg-folder-open>.cg-launcher-item>.cg-launcher-inner>.cg-launcher-name{opacity:0}.cg-launcher-list.cg-folder-open>.cg-launcher-item>.cg-launcher-inner>.cg-launcher-folder>div:not(.cg-show){opacity:0}[data-cg-pop]{position:absolute;box-shadow:0px 5px 20px rgba(0,0,0,.25);transition:.1s ease-out;transition-property:transform,opacity;transform:translateY(-10px);opacity:0}[data-cg-pop]:not([data-cg-open]){pointer-events:none}[data-cg-pop][data-cg-open]{transform:translateY(0px);opacity:1}#cg-notify{z-index:20020005}.cg-notify-wrap{background:var(--system-background);position:fixed;padding:15px;border-radius:3px;right:0;top:0;width:280px;font-size:14px;display:flex;transition:.1s ease-out;transition-property:transform,opacity;overflow:hidden;color:var(--system-color);box-shadow:0 5px 20px rgba(0,0,0,.25);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2)}.cg-notify-icon{margin-right:10px;width:16px;height:16px;border-radius:50%}.cg-notify-icon.cg-primary{background:var(--success)}.cg-notify-icon.cg-info{background:var(--info)}.cg-notify-icon.cg-warning{background:var(--warning)}.cg-notify-icon.cg-danger{background:var(--danger)}.cg-notify-icon.cg-progress{background:var(--cg)}.cg-notify-title{font-size:16px;font-weight:bold;padding-bottom:10px}.cg-notify-content{line-height:1.5;word-break:break-word}.cg-notify-progress{position:absolute;bottom:0;left:0;border-radius:1px;background:var(--cg);transition:width 1s ease-out;width:0%;height:2px}#cg-simpletask{left:0;bottom:-46px;width:100%;height:46px;top:initial;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2);padding:5px 0 5px 5px;display:flex;color:var(--system-color);transition:bottom .1s ease-out;overflow-x:auto;position:fixed}#cg-simpletask::-webkit-scrollbar{display:none}.cg-simpletask-item{background:rgba(0,0,0,.05);border-radius:3px;padding:10px;display:flex;align-items:center;margin-right:5px}.cg-simpletask-item:hover{background:rgba(0,0,0,.1)}.cg-simpletask-item:active{background:rgba(0,0,0,.2)}.cg-simpletask-icon{margin-right:5px;background-size:cover;width:16px;height:16px}#cg-confirm{z-index:20020006;position:fixed;left:0;top:0;width:100%;height:100%;background:var(--system-background);-webkit-backdrop-filter:blur(30px) brightness(1.2);backdrop-filter:blur(30px) brightness(1.2);justify-content:center;align-items:center}#cg-confirm .cg-confirm-box{background:var(--system-background);width:60%;box-shadow:0 5px 20px rgba(0,0,0,.25);font-size:14px;border-radius:3px;overflow:hidden;color:var(--system-color)}#cg-confirm .cg-confirm-box #cg-confirm-content{padding:25px}#cg-confirm .cg-confirm-box .cg-confirm-controls{border-top:solid .5px var(--system-border-color);display:flex}#cg-confirm .cg-confirm-box .cg-confirm-controls>div{padding:20px;flex:1;text-align:center}#cg-confirm .cg-confirm-box .cg-confirm-controls>div:last-child{border-left:solid .5px var(--system-border-color)}#cg-confirm .cg-confirm-box .cg-confirm-controls>div:hover{background:var(--system-background-hover)}#cg-confirm .cg-confirm-box .cg-confirm-controls>div:active{background:var(--system-background-active)}

package/dist/index.js

@@ -79,6 +79,9 @@ class AbstractBoot {
     onLauncherFolderNameChanged() {
         return;
     }
+    onHashChanged() {
+        return;
+    }
     onRuntimeFileLoad() {
         return;
     }

package/dist/index.ts

@@ -137,6 +137,12 @@ export abstract class AbstractBoot {
         return;
     }
 
+    /** --- location hash 改变事件 --- */
+    public onHashChanged(hash: string): void | Promise<void>;
+    public onHashChanged(): void {
+        return;
+    }
+
     /** --- 环境文件准备加载时的事件 --- */
     public onRuntimeFileLoad(url: string): void | Promise<void>;
     public onRuntimeFileLoad(): void {

package/dist/lib/core.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
+exports.hash = exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
 const clickgo = require("../clickgo");
 const fs = require("./fs");
 const form = require("./form");
@@ -106,6 +106,9 @@ class AbstractApp {
     onLauncherFolderNameChanged() {
         return;
     }
+    onHashChanged() {
+        return;
+    }
 }
 exports.AbstractApp = AbstractApp;
 function getCdn() {
@@ -282,7 +285,7 @@ const globalEvents = {
     }
 };
 function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
     const eventName = 'on' + name[0].toUpperCase() + name.slice(1);
     switch (name) {
         case 'error': {
@@ -396,7 +399,7 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
             if (typeof formId !== 'string') {
                 break;
             }
-            if (typeof taskId === 'number') {
+            if (typeof taskId !== 'string') {
                 taskId = taskId.toString();
             }
             exports.boot[eventName](taskId, formId);
@@ -409,6 +412,20 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
             }
             break;
         }
+        case 'hashChanged': {
+            if (typeof taskId !== 'string') {
+                break;
+            }
+            exports.boot[eventName](taskId);
+            for (const tid in task.list) {
+                const t = task.list[tid];
+                (_13 = t.class) === null || _13 === void 0 ? void 0 : _13[eventName](taskId);
+                for (const fid in t.forms) {
+                    (_15 = (_14 = t.forms[fid].vroot)[eventName]) === null || _15 === void 0 ? void 0 : _15.call(_14, taskId);
+                }
+            }
+            break;
+        }
     }
 }
 exports.trigger = trigger;
@@ -525,6 +542,9 @@ function fetchApp(url, opt = {}) {
                 }
                 const total = config.files.length;
                 let loaded = 0;
+                if (opt.progress) {
+                    opt.progress(loaded + 1, total + 1);
+                }
                 for (const file of config.files) {
                     fs.getContent(url + file.slice(1), {
                         'current': current
@@ -549,6 +569,9 @@ function fetchApp(url, opt = {}) {
                             if (opt.notifyId) {
                                 form.notifyProgress(opt.notifyId, loaded / total);
                             }
+                            if (opt.progress) {
+                                opt.progress(loaded + 1, total + 1);
+                            }
                             if (loaded < total) {
                                 return;
                             }
@@ -559,6 +582,9 @@ function fetchApp(url, opt = {}) {
                         if (opt.notifyId) {
                             form.notifyProgress(opt.notifyId, loaded / total);
                         }
+                        if (opt.progress) {
+                            opt.progress(loaded + 1, total + 1);
+                        }
                         if (loaded < total) {
                             return;
                         }
@@ -567,13 +593,23 @@ function fetchApp(url, opt = {}) {
                 }
             });
         }
-        catch (_b) {
+        catch (e) {
+            console.log('core.fetchApp', e);
+            trigger('error', 0, 0, e, e.message);
             return null;
         }
-        let icon = '/clickgo/icon.png';
+        let icon = '';
         if (config.icon && (files[config.icon] instanceof Blob)) {
             icon = yield tool.blob2DataUrl(files[config.icon]);
         }
+        if (icon === '') {
+            const iconBlob = yield fs.getContent('/clickgo/icon.png', {
+                'current': current
+            });
+            if (iconBlob instanceof Blob) {
+                icon = yield tool.blob2DataUrl(iconBlob);
+            }
+        }
         return {
             'type': 'app',
             'config': config,
@@ -635,3 +671,21 @@ function getAvailArea() {
     }
 }
 exports.getAvailArea = getAvailArea;
+function hash(hash, taskId) {
+    if (!taskId) {
+        return false;
+    }
+    const t = task.list[taskId];
+    if (!t) {
+        return false;
+    }
+    if (!t.runtime.permissions.includes('root') && !t.runtime.permissions.includes('hash')) {
+        return false;
+    }
+    window.location.hash = hash;
+    return true;
+}
+exports.hash = hash;
+window.addEventListener('hashchange', function () {
+    trigger('hashChanged', window.location.hash ? window.location.hash.slice(1) : '');
+});

package/dist/lib/core.ts

@@ -179,6 +179,12 @@ export abstract class AbstractApp {
         return;
     }
 
+    /** --- location hash 改变事件 --- */
+    public onHashChanged(hash: string): void | Promise<void>;
+    public onHashChanged(): void {
+        return;
+    }
+
 }
 
 /** --- CDN 地址 --- */
@@ -498,7 +504,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             if (typeof formId !== 'string') {
                 break;
             }
-            if (typeof taskId === 'number') {
+            if (typeof taskId !== 'string') {
                 taskId = taskId.toString();
             }
             (boot as any)[eventName](taskId, formId);
@@ -511,6 +517,20 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             }
             break;
         }
+        case 'hashChanged': {
+            if (typeof taskId !== 'string') {
+                break;
+            }
+            (boot as any)[eventName](taskId);
+            for (const tid in task.list) {
+                const t = task.list[tid];
+                (t.class as any)?.[eventName](taskId);
+                for (const fid in t.forms) {
+                    t.forms[fid].vroot[eventName]?.(taskId);
+                }
+            }
+            break;
+        }
     }
 }
 
@@ -645,6 +665,9 @@ export async function fetchApp(
             }
             const total = config.files.length;
             let loaded = 0;
+            if (opt.progress) {
+                opt.progress(loaded + 1, total + 1) as unknown;
+            }
             for (const file of config.files) {
                 fs.getContent(url + file.slice(1), {
                     'current': current
@@ -668,6 +691,9 @@ export async function fetchApp(
                     if (opt.notifyId) {
                         form.notifyProgress(opt.notifyId, loaded / total);
                     }
+                    if (opt.progress) {
+                        opt.progress(loaded + 1, total + 1) as unknown;
+                    }
                     if (loaded < total) {
                         return;
                     }
@@ -677,6 +703,9 @@ export async function fetchApp(
                     if (opt.notifyId) {
                         form.notifyProgress(opt.notifyId, loaded / total);
                     }
+                    if (opt.progress) {
+                        opt.progress(loaded + 1, total + 1) as unknown;
+                    }
                     if (loaded < total) {
                         return;
                     }
@@ -685,14 +714,24 @@ export async function fetchApp(
             }
         });
     }
-    catch {
+    catch (e: any) {
+        console.log('core.fetchApp', e);
+        trigger('error', 0, 0, e, e.message);
         return null;
     }
 
-    let icon = '/clickgo/icon.png';
+    let icon = '';
     if (config.icon && (files[config.icon] instanceof Blob)) {
         icon = await tool.blob2DataUrl(files[config.icon] as Blob);
     }
+    if (icon === '') {
+        const iconBlob = await fs.getContent('/clickgo/icon.png', {
+            'current': current
+        });
+        if (iconBlob instanceof Blob) {
+            icon = await tool.blob2DataUrl(iconBlob);
+        }
+    }
 
     return {
         'type': 'app',
@@ -756,3 +795,27 @@ export function getAvailArea(): types.IAvailArea {
         };
     }
 }
+
+/**
+ * --- 修改浏览器 hash ---
+ * @param hash 修改的值，不含 #
+ * @param taskId 基任务，App 模式下无效
+ */
+export function hash(hash: string, taskId?: number): boolean {
+    if (!taskId) {
+        return false;
+    }
+    const t = task.list[taskId];
+    if (!t) {
+        return false;
+    }
+    if (!t.runtime.permissions.includes('root') && !t.runtime.permissions.includes('hash')) {
+        return false;
+    }
+    window.location.hash = hash;
+    return true;
+}
+
+window.addEventListener('hashchange', function() {
+    trigger('hashChanged', window.location.hash ? window.location.hash.slice(1) : '');
+});

package/dist/lib/dom.js

@@ -14,7 +14,7 @@ const clickgo = require("../clickgo");
 const form = require("./form");
 const core = require("./core");
 const tool = require("./tool");
-const topClass = ['#cg-form-list', '#cg-pop-list', '#cg-system', '#cg-simpletask', '#cg-launcher'];
+const topClass = ['#cg-form-list', '#cg-pop-list', '#cg-notify', '#cg-simpletask', '#cg-launcher'];
 function classUnfold(after, out = []) {
     const arr = [];
     for (const name of topClass) {
@@ -784,7 +784,7 @@ function bindGesture(oe, before, handler) {
                 if (offset < 90) {
                     return;
                 }
-                handler(dir);
+                handler === null || handler === void 0 ? void 0 : handler(dir);
             }
         });
     }
@@ -911,7 +911,7 @@ function bindGesture(oe, before, handler) {
                 return;
             }
             gestureWheel.done = true;
-            handler(gestureWheel.dir);
+            handler === null || handler === void 0 ? void 0 : handler(gestureWheel.dir);
             yield tool.sleep(500);
             form.elements.gesture.style.opacity = '0';
             form.elements.gesture.classList.remove('ani');

package/dist/lib/dom.ts

@@ -20,7 +20,7 @@ import * as core from './core';
 import * as tool from './tool';
 
 /** --- style list 的 div --- */
-const topClass: string[] = ['#cg-form-list', '#cg-pop-list', '#cg-system', '#cg-simpletask', '#cg-launcher'];
+const topClass: string[] = ['#cg-form-list', '#cg-pop-list', '#cg-notify', '#cg-simpletask', '#cg-launcher'];
 function classUnfold(after?: string, out: string[] = []): string {
     const arr: string[] = [];
     for (const name of topClass) {
@@ -902,7 +902,7 @@ const gestureWheel = {
  * @param before before 事件，返回 true 则显示 gesture
  * @param handler 执行完毕的话才会回调
  */
-export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e: MouseEvent | TouchEvent | WheelEvent, dir: 'top' | 'right' | 'bottom' | 'left') => boolean, handler: (dir: 'top' | 'right' | 'bottom' | 'left') => void | Promise<void>): void {
+export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e: MouseEvent | TouchEvent | WheelEvent, dir: 'top' | 'right' | 'bottom' | 'left') => boolean, handler?: (dir: 'top' | 'right' | 'bottom' | 'left') => void | Promise<void>): void {
     const el = oe.currentTarget as HTMLElement | null;
     if (!el) {
         return;
@@ -1034,7 +1034,7 @@ export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e
                 if (offset < 90) {
                     return;
                 }
-                handler(dir) as any;
+                handler?.(dir) as any;
             }
         });
     }
@@ -1182,7 +1182,7 @@ export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e
                 return;
             }
             gestureWheel.done = true;
-            handler(gestureWheel.dir as any) as any;
+            handler?.(gestureWheel.dir as any) as any;
             await tool.sleep(500);
             form.elements.gesture.style.opacity = '0';
             form.elements.gesture.classList.remove('ani');