clickgo 3.11.3 → 3.11.4

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.5.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.3'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.4'}"></script>
 ```
 
 **index.js**

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

@@ -50,6 +50,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.resize = true;
         this.floading = false;
         this.border = 'normal';
+        this.banClose = false;
     }
     showLoading() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -58,5 +59,10 @@ class default_1 extends clickgo.form.AbstractForm {
             this.floading = false;
         });
     }
+    onClose(e) {
+        if (this.banClose) {
+            e.preventDefault();
+        }
+    }
 }
 exports.default = default_1;

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

@@ -1,4 +1,4 @@
-<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="floading" :border="border" direction="v">
+<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="floading" :border="border" direction="v" @close="onClose">
     <flow direction="v">
         <layout direction="v" gutter="10" style="padding: 10px;">
             <label>focus: {{formFocus}}, width: {{width}}, height: {{height}}, state-max: {{stateMax}}, state-min: {{stateMin}}.</label>
@@ -17,6 +17,7 @@
             <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>
+            <button @click="banClose = !banClose">{{banClose ? '' : '!'}}banClose</button>
             <layout class="bottom" gutter="10">
                 <button @click="border = 'normal'">Normal</button>
                 <button @click="border = 'thin'">Thin</button>

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

@@ -40,11 +40,11 @@ class default_1 extends clickgo.form.AbstractPanel {
         this.data = {};
         this.rootMountData = 'none';
     }
-    onShow(d) {
+    onShow(e) {
         return __awaiter(this, void 0, void 0, function* () {
             yield clickgo.tool.sleep(1000);
             ++this.scount;
-            this.data = d;
+            this.data = e;
         });
     }
     onHide() {
@@ -69,6 +69,12 @@ class default_1 extends clickgo.form.AbstractPanel {
             yield clickgo.form.dialog('Hello panel!');
         });
     }
+    clearQss() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.clearQs();
+            yield clickgo.form.dialog('cleard.');
+        });
+    }
     onMounted() {
         this.rootMountData = this.rootForm.mountData;
     }

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

@@ -7,6 +7,7 @@
     <label>rootMountData: {{rootMountData}}</label>
     <button @click="click">Hi</button>
     <button @click="sendToRootPanel({'a':1})" style="height: 30px;">sendToRootPanel({'a':1})</button>
+    <button @click="clearQss">clearQs()</button>
     <layout>
         <button style="padding: 15px 30px;" area="split">
             Padding 10px 20px with pop

package/dist/app/demo/form/solution/backpanel/backpanel.xml

@@ -4,6 +4,7 @@
             <label>formHash:</label>
             <text v-model="fh" style="flex: 1;" />
             <button @click="formHash = fh">Change</button>
+            <button @click="formHashBack">Back</button>
         </layout>
         <nav v-model="name" default="list" hash style="flex: 1;">
             <nav-item label="User">

package/dist/clickgo.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.storage = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0;
-const version = '3.11.3';
+const version = '3.11.4';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.11.3';
+const version = '3.11.4';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/control.ts

@@ -128,9 +128,9 @@ export abstract class AbstractControl {
      * @param cb 回调
      * @param opt 参数
      */
-    public watch<T extends this & this['props'], TK extends keyof T>(
-        name: TK,
-        cb: (val: T[TK], old: T[TK]) => void | Promise<void>,
+    public watch<T extends this & this['props'], TK extends keyof T, TR>(
+        name: TK | (() => TR),
+        cb: (val: T[TK] & TR, old: T[TK] & TR) => void | Promise<void>,
         opt: {
             'immediate'?: boolean;
             'deep'?: boolean;

package/dist/lib/form.js

@@ -275,6 +275,11 @@ class AbstractPanel extends AbstractCommon {
     set formHash(fh) {
         this.rootForm.formHash = fh;
     }
+    formHashBack() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.rootForm.formHashBack();
+        });
+    }
     sendToRootPanel(data) {
         this.rootPanel.send(data);
     }
@@ -288,6 +293,9 @@ class AbstractPanel extends AbstractCommon {
             yield this.rootForm.doneStep();
         });
     }
+    clearQs() {
+        this.qs = {};
+    }
     get formFocus() {
         var _a;
         return (_a = this.rootForm.formFocus) !== null && _a !== void 0 ? _a : false;
@@ -295,6 +303,9 @@ class AbstractPanel extends AbstractCommon {
     onShow() {
         return;
     }
+    onShowed() {
+        return;
+    }
     onHide() {
         return;
     }

package/dist/lib/form.ts

@@ -368,6 +368,11 @@ export abstract class AbstractPanel extends AbstractCommon {
         this.rootForm.formHash = fh;
     }
 
+    /** --- 将母窗体的 form hash 回退 --- */
+    public async formHashBack(): Promise<void> {
+        await this.rootForm.formHashBack();
+    }
+
     /** --- 发送一段数据到自己这个 panel 控件，本质上也是调用的 panel 控件的 send 方法，主要用来实现发送给跳转后的 panel --- */
     public sendToRootPanel(data: Record<string, any>): void {
         this.rootPanel.send(data);
@@ -392,16 +397,27 @@ export abstract class AbstractPanel extends AbstractCommon {
     /** --- 当前的 nav（若有）传递过来的 qs --- */
     public qs: Record<string, string> = {};
 
+    /** --- 确定不再使用 qs 时可调用此方法清空，这样再次通过相同 qs 进入本 panel 依然会响应 qschange 事件 --- */
+    public clearQs() {
+        this.qs = {};
+    }
+
     /** --- 当前窗体是否是焦点 --- */
     public get formFocus(): boolean {
         return this.rootForm.formFocus ?? false;
     }
 
-    public onShow(data: Record<string, any>): void | Promise<void>;
+    public onShow(e: types.IAbstractPanelShowEvent): void | Promise<void>;
     public onShow(): void {
         return;
     }
 
+    public onShowed(): void | Promise<void>;
+    /** --- panel 已经完全显示后所要执行的 --- */
+    public onShowed() {
+        return;
+    }
+
     public onHide(): void | Promise<void>;
     public onHide(): void {
         return;

package/package.json

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

package/types/index.d.ts

@@ -623,6 +623,62 @@ interface ICustomEvent {
     preventDefault: () => void;
 }
 
+// --- AbstractPanel ---
+
+export interface IAbstractPanelShowEvent {
+    'detail': {
+        'data': Record<string, any>;
+        /** --- 是否是 nav 模式 --- */
+        'nav': boolean;
+        /** --- 仅 nav 联动时有效，代表是前进还是回退 --- */
+        'action': 'forword' | 'back';
+        /** --- 仅 nav 联动时有效，代表上一个的 formHash 的值 --- */
+        'previous': string;
+        /** --- 仅 nav 联动时有效，代表本次 show 的时候 qs 是否发生了变化 --- */
+        'qsChange': boolean;
+    }
+}
+
+// --- Form Control ---
+
+export interface IFormCloseEvent extends ICustomEvent {
+    'detail': {
+        'event': MouseEvent;
+    }
+}
+
+export interface IFormMaxEvent {
+    'detail': {
+        'event': MouseEvent | TouchEvent | null;
+        'action': 'click' | 'move';
+        /** --- 当前是否时最大化状态 --- */
+        'max': boolean;
+        /** --- 最大化之前的窗体位置 --- */
+        'history': {
+            'width': number;
+            'height': number;
+            'left': number;
+            'top': number;
+        } | null
+    }
+}
+
+export interface IFormMinEvent {
+    'detail': {
+        'event': MouseEvent | TouchEvent | null;
+        'action': 'click' | 'method';
+        /** --- 当前是否时最小化状态 --- */
+        'min': boolean;
+        /** --- 最小化之前的窗体位置 --- */
+        'history': {
+            'width': number;
+            'height': number;
+            'left': number;
+            'top': number;
+        } | null
+    }
+}
+
 // --- Greatlist Control ---
 
 export interface IGreatlistRemoveEvent extends ICustomEvent {