clickgo 3.1.10-beta → 3.1.11-beta2

package/README.md

@@ -28,7 +28,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.9/dist/loader.min.js?path=index&npm={'clickgo':'3.1.10-beta'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.9/dist/loader.min.js?path=index&npm={'clickgo':'3.1.11-beta2'}"></script>
 ```
 
 **index.js**

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

@@ -37,12 +37,12 @@ class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
         this.layer = false;
-        this.label = '';
+        this.name = '';
         this.isShow = false;
         this.loading = false;
     }
     onMounted() {
-        this.watch('label', () => __awaiter(this, void 0, void 0, function* () {
+        this.watch('name', () => __awaiter(this, void 0, void 0, function* () {
             this.loading = true;
             yield clickgo.tool.sleep(300);
             this.loading = false;

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

@@ -1,5 +1,5 @@
 <form width="600" height="500" title="Nav" :loading="loading">
-    <nav v-model="label" v-model:show="isShow" @layer="layer = $event" style="flex: 1; width: 0;">
+    <nav v-model="name" v-model:show="isShow" @layer="layer = $event" style="flex: 1; width: 0;">
         <nav-item label="Title1">
             <nav-title>group1</nav-title>
             <nav-item label="Sub1">
@@ -29,14 +29,20 @@
                 <nav-item label="Action11"></nav-item>
                 <nav-item label="Action12"></nav-item>
             </nav-item>
+            <nav-item label="中文">
+                <nav-item label="中文1"></nav-item>
+                <nav-item label="中文2"></nav-item>
+                <nav-item label="有 name" name="hasname"></nav-item>
+            </nav-item>
         </nav-item>
         <template v-slot:content>
             <layout direction="v" gutter="10" style="padding: 10px; flex: 1;">
                 <label>Change the size of the form to see the effect.</label>
-                <label>Now select: {{label}}</label>
+                <label>Now select: {{name}}</label>
                 <label>Layer show: {{isShow ? 'true' : 'false'}}</label>
                 <button v-if="layer" @click="isShow = true" style="height: 30px;">Open</button>
-                <button @click="label = 'Action11'" style="height: 30px;">Select "Action11"</button>
+                <button @click="name = 'Action11'" style="height: 30px;">Select "Action11"</button>
+                <button @click="name = 'hasname'" style="height: 30px;">Select "hasname"</button>
             </layout>
         </template>
     </nav>

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

@@ -59,5 +59,10 @@ class default_1 extends clickgo.form.AbstractForm {
             yield clickgo.form.dialog('No permission.');
         });
     }
+    getHash() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield clickgo.form.dialog('Hash is: ' + clickgo.core.getHash());
+        });
+    }
 }
 exports.default = default_1;

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

@@ -8,5 +8,6 @@
             <text v-model="hash" style="flex: 1;" />
             <button @click="hashe" style="height: 30px; padding: 0 10px;">hash('{{hash}}')</button>
         </layout>
+        <button @click="getHash" style="height: 30px;">getHash()</button>
     </layout>
 </form>

package/dist/lib/core.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hash = exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
+exports.getHash = 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 = __importStar(require("../clickgo"));
 const fs = __importStar(require("./fs"));
 const form = __importStar(require("./form"));
@@ -680,6 +680,10 @@ function hash(hash, taskId) {
     return true;
 }
 exports.hash = hash;
+function getHash() {
+    return window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '';
+}
+exports.getHash = getHash;
 window.addEventListener('hashchange', function () {
-    trigger('hashChanged', window.location.hash ? window.location.hash.slice(1) : '');
+    trigger('hashChanged', window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '');
 });

package/dist/lib/core.ts

@@ -786,6 +786,13 @@ export function hash(hash: string, taskId?: number): boolean {
     return true;
 }
 
+/**
+ * --- 获取当前浏览器的 hash ---
+ */
+export function getHash(): string {
+    return window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '';
+}
+
 window.addEventListener('hashchange', function() {
-    trigger('hashChanged', window.location.hash ? window.location.hash.slice(1) : '');
+    trigger('hashChanged', window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '');
 });

package/dist/lib/task.js

@@ -236,7 +236,7 @@ function run(url, opt = {}, ntid) {
         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', 'Object'
+            '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'Object', 'encodeURIComponent', 'decodeURIComponent'
         ];
         for (const name of unblockSys) {
             if (unblock.includes(name)) {
@@ -412,6 +412,9 @@ function run(url, opt = {}, ntid) {
                 },
                 hash: function (hash) {
                     return core.hash(hash, taskId);
+                },
+                getHash: function () {
+                    return core.getHash();
                 }
             },
             'dom': {

package/dist/lib/task.ts

@@ -282,7 +282,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
     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', 'Object'
+        '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'Object', 'encodeURIComponent', 'decodeURIComponent'
     ];
     for (const name of unblockSys) {
         if (unblock.includes(name)) {
@@ -470,6 +470,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
             },
             hash: function(hash: string): boolean {
                 return core.hash(hash, taskId);
+            },
+            getHash: function(): string {
+                return core.getHash();
             }
         },
         'dom': {

package/package.json

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