clickgo 3.1.11-beta2 → 3.1.13

package/README.md

@@ -3,19 +3,19 @@
 <p align="center"><img src="dist/icon.png" width="68" height="68" alt="ClickGo"></p>
 <p align="center">
     <a href="https://github.com/maiyun/clickgo/blob/master/LICENSE">
-        <img alt="License" src="https://img.shields.io/github/license/maiyun/clickgo.svg?color=blue" />
+        <img alt="License" src="https://img.shields.io/github/license/maiyun/clickgo?color=blue" />
     </a>
     <a href="https://www.npmjs.com/package/clickgo">
-        <img alt="NPM stable version" src="https://img.shields.io/npm/v/clickgo.svg?color=brightgreen&logo=npm" />
-        <img alt="NPM beta version" src="https://img.shields.io/npm/v/clickgo/beta.svg?color=yellowgreen&logo=npm" />
-        <img alt="NPM development version" src="https://img.shields.io/npm/v/clickgo/dev.svg?color=yellow&logo=npm" />
+        <img alt="NPM stable version" src="https://img.shields.io/npm/v/clickgo?color=brightgreen&logo=npm" />
+        <img alt="NPM beta version" src="https://img.shields.io/npm/v/clickgo/beta?color=yellowgreen&logo=npm" />
+        <img alt="NPM development version" src="https://img.shields.io/npm/v/clickgo/dev?color=yellow&logo=npm" />
     </a><br>
     <a href="https://github.com/maiyun/clickgo/releases">
-        <img alt="GitHub releases" src="https://img.shields.io/github/release/maiyun/clickgo.svg?color=brightgreen&logo=github" />
-        <img alt="GitHub pre-releases" src="https://img.shields.io/github/release/maiyun/clickgo/all.svg?color=yellow&logo=github" />
+        <img alt="GitHub releases" src="https://img.shields.io/github/v/release/maiyun/clickgo?color=brightgreen&logo=github" />
+        <img alt="GitHub pre-releases" src="https://img.shields.io/github/v/release/maiyun/clickgo?color=yellow&logo=github&include_prereleases" />
     </a>
     <a href="https://github.com/maiyun/clickgo/issues">
-        <img alt="GitHub issues" src="https://img.shields.io/github/issues/maiyun/clickgo.svg?color=blue&logo=github" />
+        <img alt="GitHub issues" src="https://img.shields.io/github/issues/maiyun/clickgo?color=blue&logo=github" />
     </a>
 </p>
 
@@ -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.11-beta2'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.9/dist/loader.min.js?path=index&npm={'clickgo':'3.1.13'}"></script>
 ```
 
 **index.js**

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

@@ -35,6 +35,9 @@
                 <nav-item label="有 name" name="hasname"></nav-item>
             </nav-item>
         </nav-item>
+        <nav-item label="Root1"></nav-item>
+        <nav-item label="Root2"></nav-item>
+        <nav-item label="Root3"></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>

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/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/package.json

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