clickgo 3.1.10-beta → 3.1.12

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.12'}"></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/control/panel/panel.js

@@ -32,6 +32,7 @@ class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
         this.selected = ['none'];
+        this.parentData = 'yeah!';
     }
     go() {
         this.refs.panel.go(test1_1.default, {

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

@@ -1,7 +1,8 @@
 <panel direction="v" gutter="10" style="padding: 10px; border: solid 2px #000; border-color: #777 #DDD #DDD #777;">
     <label>Hello, this is test1.</label>
     <label>onShow count: {{scount}}</label>
-    <label>data: {{data}}</label>
+    <label>Data: {{data}}</label>
+    <label>Parent data: {{rootForm.parentData}}</label>
     <button @click="click" style="height: 30px;">Hi</button>
     <layout>
         <button style="padding: 15px 30px;" area="split">

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

@@ -1,3 +1,4 @@
-<panel style="padding: 10px; border: solid 2px #000; border-color: #777 #DDD #DDD #777; background: #FFF;">
+<panel direction="v" gutter="10" style="padding: 10px; border: solid 2px #000; border-color: #777 #DDD #DDD #777; background: #FFF;">
     <label>Hello, test2!</label>
+    <label>Panel ID: {{panelId}}</label>
 </panel>

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/form.js

@@ -99,9 +99,6 @@ class AbstractCommon {
     get formId() {
         return 0;
     }
-    get formFocus() {
-        return this._formFocus;
-    }
     set formFocus(b) {
         notify({
             'title': 'Error',
@@ -192,6 +189,13 @@ class AbstractPanel extends AbstractCommon {
     get panelId() {
         return 0;
     }
+    get rootForm() {
+        return {};
+    }
+    get formFocus() {
+        var _a;
+        return (_a = this.rootForm.formFocus) !== null && _a !== void 0 ? _a : false;
+    }
     onShow() {
         return;
     }
@@ -223,6 +227,9 @@ class AbstractForm extends AbstractCommon {
             task.list[this.taskId].runtime.dialogFormIds[task.list[this.taskId].runtime.dialogFormIds.length - 1]
                 === this.formId ? false : true;
     }
+    get formFocus() {
+        return this._formFocus;
+    }
     show() {
         const v = this;
         if (this._firstShow) {
@@ -1611,7 +1618,6 @@ function createPanel(cls, el, formId, taskId) {
             }
             idata[item[0]] = item[1];
         }
-        idata._formFocus = false;
         const prot = tool.getClassPrototype(panel);
         const methods = prot.method;
         const computed = prot.access;
@@ -1661,7 +1667,20 @@ function createPanel(cls, el, formId, taskId) {
             set: function () {
                 notify({
                     'title': 'Error',
-                    'content': `The software tries to modify the system variable "cgPrep".\nPath: ${this.filename}`,
+                    'content': `The software tries to modify the system variable "prep".\nPath: ${this.filename}`,
+                    'type': 'danger'
+                });
+                return;
+            }
+        };
+        computed.rootForm = {
+            get: function () {
+                return t.forms[formId].vroot;
+            },
+            set: function () {
+                notify({
+                    'title': 'Error',
+                    'content': `The software tries to modify the system variable "rootForm".\nPath: ${this.filename}`,
                     'type': 'danger'
                 });
                 return;
@@ -1920,7 +1939,7 @@ function create(cls, data, opt = {}, taskId) {
             set: function () {
                 notify({
                     'title': 'Error',
-                    'content': `The software tries to modify the system variable "cgPrep".\nPath: ${this.filename}`,
+                    'content': `The software tries to modify the system variable "prep".\nPath: ${this.filename}`,
                     'type': 'danger'
                 });
                 return;

package/dist/lib/form.ts

@@ -116,12 +116,6 @@ abstract class AbstractCommon {
         return 0;
     }
 
-    /** --- 当前窗体是否是焦点 --- */
-    public get formFocus(): boolean {
-        // --- _formFocus 在初始化时由系统设置 ---
-        return (this as any)._formFocus;
-    }
-
     public set formFocus(b: boolean) {
         notify({
             'title': 'Error',
@@ -282,6 +276,16 @@ export abstract class AbstractPanel extends AbstractCommon {
         return 0;
     }
 
+    /** --- 当前 panel 所在窗体的窗体对象，系统会在创建时重写本函数 --- */
+    public get rootForm(): AbstractForm & Record<string, any> {
+        return {} as any;
+    }
+
+    /** --- 当前窗体是否是焦点 --- */
+    public get formFocus(): boolean {
+        return this.rootForm.formFocus ?? false;
+    }
+
     public onShow(data: Record<string, any>): void | Promise<void>;
     public onShow(): void {
         return;
@@ -332,6 +336,12 @@ export abstract class AbstractForm extends AbstractCommon {
             === this.formId ? false : true;
     }
 
+    /** --- 当前窗体是否是焦点 --- */
+    public get formFocus(): boolean {
+        // --- _formFocus 在初始化时由系统设置 ---
+        return (this as any)._formFocus;
+    }
+
     /** --- 当前是不是初次显示 --- */
     private _firstShow: boolean = true;
 
@@ -2115,7 +2125,6 @@ export async function createPanel<T extends AbstractPanel>(
         }
         idata[item[0]] = item[1];
     }
-    idata._formFocus = false;
     /** --- class 对象的方法和 getter/setter 列表 --- */
     const prot = tool.getClassPrototype(panel);
     const methods = prot.method;
@@ -2166,7 +2175,20 @@ export async function createPanel<T extends AbstractPanel>(
         set: function(this: types.IVue): void {
             notify({
                 'title': 'Error',
-                'content': `The software tries to modify the system variable "cgPrep".\nPath: ${this.filename}`,
+                'content': `The software tries to modify the system variable "prep".\nPath: ${this.filename}`,
+                'type': 'danger'
+            });
+            return;
+        }
+    };
+    computed.rootForm = {
+        get: function(): AbstractForm & Record<string, any> {
+            return t.forms[formId].vroot as any;
+        },
+        set: function(this: types.IVue): void {
+            notify({
+                'title': 'Error',
+                'content': `The software tries to modify the system variable "rootForm".\nPath: ${this.filename}`,
                 'type': 'danger'
             });
             return;
@@ -2478,7 +2500,7 @@ export async function create<T extends AbstractForm>(
         set: function(this: types.IVue): void {
             notify({
                 'title': 'Error',
-                'content': `The software tries to modify the system variable "cgPrep".\nPath: ${this.filename}`,
+                'content': `The software tries to modify the system variable "prep".\nPath: ${this.filename}`,
                 'type': 'danger'
             });
             return;

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.12",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",