clickgo 3.12.0 → 3.12.2

package/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 MAIYUN.NET
+   Copyright 2024 MAIYUN.NET
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/README.md

@@ -25,7 +25,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.2/dist/loader.min.js?path=index&npm={'clickgo':'3.12.0'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.7/dist/loader.min.js?path=index&npm={'clickgo':'3.12.2'}"></script>
 ```
 
 **index.js**

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

@@ -1,9 +1,9 @@
-<form title="Marquee" width="300" height="300" padding="10">
+<form title="Marquee" width="350" height="300" padding="10">
     <layout gutter="10" direction="v" style="flex: 1; width: 0;">
         <!-- 左右分 -->
         <layout gutter="10" style="flex: 1; height: 0;">
             <layout direction="v" style="flex: 1; width: 0;">
-                <marquee direction="top" :scroll="scroll" style="border: 1px solid rgba(0, 0, 0, .1); background: #FFF;" :style="{'padding': style ? '10px' : undefined, 'line-height': style ? '1.5' : undefined}">
+                <marquee direction="top" style="border: 1px solid rgba(0, 0, 0, .1); background: #FFF;" :style="{'padding': style ? '10px' : undefined, 'line-height': style ? '1.5' : undefined}">
                     <block v-for="(line, index) of lineCount">
                         <button v-if="index > 0 && index % 10 === 0" style="height: 30px;">test</button>
                         <block v-else>Line {{line}}, index: {{index}}.</block>
@@ -11,10 +11,10 @@
                 </marquee>
             </layout>
             <layout direction="v" gutter="10" style="flex: 1; width: 0;">
-                <marquee direction="left" :scroll="scroll" style="background: #000; color: #FFF;" :style="{'padding': style ? '10px' : undefined, 'line-height': style ? '1.5' : undefined}">
+                <marquee direction="left" style="background: #000; color: #FFF;" :style="{'padding': style ? '10px' : undefined, 'line-height': style ? '1.5' : undefined}">
                     <block v-for="(line, index) of lineCount">Line {{line}}, index: {{index}}.</block>
                 </marquee>
-                <marquee :direction="direction" :scroll="scroll" style="flex: 1; height: 0; border: 1px solid rgba(0, 0, 0, .1); background: #FFF;" :style="{'padding': style ? '10px' : undefined, 'line-height': style ? '1.5' : undefined}">
+                <marquee :direction="direction" style="flex: 1; height: 0; border: 1px solid rgba(0, 0, 0, .1); background: #FFF;" :style="{'padding': style ? '10px' : undefined, 'line-height': style ? '1.5' : undefined}">
                     <block v-for="(line, index) of lineCount">
                         <button v-if="index > 0 && index % 10 === 0" style="height: 30px;">test</button>
                         <block v-else>Line {{line}}, index: {{index}}.</block>

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

@@ -32,7 +32,9 @@ class default_1 extends clickgo.form.AbstractForm {
         this.p3 = 30;
         this.p4 = 50;
         this.p5 = 1;
+        this.p6 = 2;
         this.total5 = 0;
+        this.count6 = 20;
         this.control = 2;
     }
 }

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

@@ -1,13 +1,18 @@
-<form width="700" height="400" title="Page">
+<form width="700" height="500" title="Page">
     <layout direction="v" gutter="10" style="flex: 1; padding: 10px;">
+        <label>count6: {{count6}}</label>
         <page max="10" :control="control" />
         <page v-model="p1" max="10" :control="control" />
         <page v-model="p2" max="30" :control="control" />
         <page v-model="p3" total="1282" :control="control" />
         <page v-model="p4" total="1282" count="20" :control="control" />
         <page v-model="p5" :total="total5" count="20" :control="control" />
+        <page v-model="p6" total="1000" v-model:count="count6" :counts="[20,50,100]" :control="control" />
         <layout gutter="10">
             <button @click="total5 = total5 ? 0 : 300" style="flex: 2;">total to {{total5 ? 0 : 300}}</button>
+            <button @click="count6 = count6 === 20 ? 50 : 20" style="flex: 2;">count6 to {{count6 === 20 ? 50 : 20}}</button>
+        </layout>
+        <layout gutter="10">
             <button @click="control=2" style="flex: 2;">control to 2</button>
             <button @click="control=5" style="flex: 1;">to 5</button>
             <button @click="control=0" style="flex: 1;">to 0</button>

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

@@ -44,6 +44,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.must = true;
         this.multi = false;
         this.ctrl = true;
+        this.bottom = false;
         this.selection = false;
         this.gesture = false;
         this.selectionArea = {};
@@ -187,12 +188,14 @@ class default_1 extends clickgo.form.AbstractForm {
             {
                 'check': false,
                 'type': 0,
-                'name': 'Appraise'
+                'name': 'Appraise',
+                'bottom': false
             },
             {
                 'check': false,
                 'type': 0,
                 'name': 'Card',
+                'bottom': false
             },
             {
                 'check': false,
@@ -205,7 +208,8 @@ class default_1 extends clickgo.form.AbstractForm {
             },
             {
                 'check': false,
-                'type': 1
+                'type': 1,
+                'bottom': true
             }
         ];
         this.loadFirst = true;

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

@@ -8,9 +8,12 @@
                 </table-item>
                 <table-item label="name">{{d.row.name ?? 'name'}}</table-item>
                 <table-item label="size" width="80" align-v="center" align-h="center">{{d.row.type ?? '0'}}</table-item>
-                <table-item label="col" width="100" direction="v" gutter="5" sort="false">
+                <table-item label="col" width="120" direction="v" gutter="5" sort="false">
                     <label>line1</label>
-                    <button>line2</button>
+                    <layout gutter="5">
+                        <button>line2</button>
+                        <button v-if="bottom" @click="d.row.bottom = d.row.bottom ? false : true">{{d.row.bottom ? 'close' : 'open'}}</button>
+                    </layout>
                 </table-item>
             </template>
             <template v-slot:pop>
@@ -23,6 +26,27 @@
                     <check :modelValue="checkinfo.selected > 0" @change="onHeaderCheck" :indeterminate="checkinfo.selected > 0 && checkinfo.selected < checkinfo.total">index</check>
                 </layout>
             </template>
+            <!-- bottom -->
+            <template v-if="bottom" v-slot:bottom="d">
+                <desc v-if="d.row.bottom" style="flex: 1; margin: var(--g-padding); margin-top: 0;">
+                    <desc-row>
+                        <desc-head>HEAD1</desc-head>
+                        <desc-head>HEAD2</desc-head>
+                        <desc-head>HEAD3</desc-head>
+                        <desc-head>HEAD4</desc-head>
+                    </desc-row>
+                    <desc-row>
+                        <desc-head>HEAD5</desc-head>
+                        <desc-cell>CELL1</desc-cell>
+                        <desc-head>HEAD6</desc-head>
+                        <desc-cell>CELL2</desc-cell>
+                    </desc-row>
+                    <desc-row>
+                        <desc-head>HEAD7</desc-head>
+                        <desc-cell colspan="3">CELL1</desc-cell>
+                    </desc-row>
+                </desc>
+            </template>
         </table>
         <template v-if="loadFirst">
             <layout gutter="10">
@@ -41,6 +65,7 @@
                 <button style="flex: 1;" @click="disabled = !disabled">{{disabled ? '' : '!'}}disabled</button>
                 <button style="flex: 1;" @click="multi = !multi">{{multi ? '' : '!'}}multi</button>
                 <button style="flex: 1;" @click="ctrl = !ctrl">{{ctrl ? '' : '!'}}ctrl</button>
+                <button style="flex: 1;" @click="bottom = !bottom">{{bottom ? '' : '!'}}bottom</button>
             </layout>
             <layout gutter="10">
                 <button style="flex: 1;" @click="must = !must">{{must ? '' : '!'}}must</button>

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

@@ -102,7 +102,7 @@ long`;
             return;
         }
         if (e.detail.value === '1346') {
-            e.detail.change = '0000';
+            e.detail.change = '000000';
         }
     }
 }

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

@@ -39,6 +39,12 @@
             <select v-model="type" :data="['text', 'password', 'multi', 'number']" style="flex: 1;"></select>
             <button @click="maxlength = maxlength === 0 ? 10 : 0" style="flex: 1;">maxlength to {{maxlength === 0 ? 10 : 0}}</button>
         </layout>
+        <layout gutter="10">
+            <label>max:</label>
+            <label style="flex: 1;">{{max}}</label>
+            <label>min:</label>
+            <label style="flex: 1;">{{min}}</label>
+        </layout>
         <layout gutter="10">
             <button @click="max = '200'; min = '10'" style="flex: 1;">max 200 min 10</button>
             <button @click="max = '20'" style="flex: 1;">max 20</button>

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

@@ -1,4 +1,4 @@
-<form width="350" height="600" title="Library task" padding="10">
+<form width="350" height="600" title="Library core" padding="10">
     <layout direction="v" gutter="10" style="flex: 1;">
         <label>config:</label>
         <text v-model="config" readonly type="multi" style="flex: 1;"></text>

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.12.0';
+const version = '3.12.2';
 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.12.0';
+const version = '3.12.2';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/control.js

@@ -115,6 +115,36 @@ class AbstractControl {
             return `cg-theme-task${this.taskId}-${this.controlName}_${cla}${this.prep ? (' ' + this.prep + cla) : ''}`;
         };
     }
+    get alignHComp() {
+        if (!this.props.alignH) {
+            return undefined;
+        }
+        switch (this.props.alignH) {
+            case 'center': {
+                return 'center';
+            }
+            case 'left':
+            case 'start': {
+                return 'flex-start';
+            }
+        }
+        return 'flex-end';
+    }
+    get alignVComp() {
+        if (!this.props.alignV) {
+            return undefined;
+        }
+        switch (this.props.alignV) {
+            case 'center': {
+                return 'center';
+            }
+            case 'top':
+            case 'start': {
+                return 'flex-start';
+            }
+        }
+        return 'flex-end';
+    }
     watch(name, cb, opt = {}) {
         return this.$watch(name, cb, opt);
     }

package/dist/lib/control.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,6 +130,40 @@ export abstract class AbstractControl {
         };
     }
 
+    /** --- 获取 alignH 的 css 属性模式，请确保 props.alignH 存在 --- */
+    public get alignHComp(): string | undefined {
+        if (!(this.props as any).alignH) {
+            return undefined;
+        }
+        switch ((this.props as any).alignH) {
+            case 'center': {
+                return 'center';
+            }
+            case 'left':
+            case 'start': {
+                return 'flex-start'
+            }
+        }
+        return 'flex-end';
+    }
+
+    /** --- 获取 alignH 的 css 属性模式，请确保 props.alignH 存在 --- */
+    public get alignVComp(): string | undefined {
+        if (!(this.props as any).alignV) {
+            return undefined;
+        }
+        switch ((this.props as any).alignV) {
+            case 'center': {
+                return 'center';
+            }
+            case 'top':
+            case 'start': {
+                return 'flex-start'
+            }
+        }
+        return 'flex-end';
+    }
+
     /**
      * --- 监视变动 ---
      * @param name 监视的属性或 prop 值

package/dist/lib/core.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/dist/lib/dom.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/dist/lib/form.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/dist/lib/native.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/dist/lib/storage.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/dist/lib/task.js

@@ -1055,9 +1055,15 @@ function run(url_1) {
                 fetch: function (url, init) {
                     return tool.fetch(url, init);
                 },
+                get: function (url, opt) {
+                    return tool.get(url, opt);
+                },
                 post: function (url, data, opt) {
                     return tool.post(url, data, opt);
                 },
+                getResponseJson: function (url, opt) {
+                    return tool.getResponseJson(url, opt);
+                },
                 postResponseJson: function (url, data, opt) {
                     return tool.postResponseJson(url, data, opt);
                 },

package/dist/lib/task.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1186,12 +1186,24 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             fetch: function(url: string, init?: RequestInit): Promise<string | Blob | null> {
                 return tool.fetch(url, init);
             },
+            get: function(url: string, opt?: {
+                'credentials'?: 'include' | 'same-origin' | 'omit';
+                'headers'?: HeadersInit;
+            }) {
+                return tool.get(url, opt);
+            },
             post: function(url: string, data: Record<string, any> | FormData, opt?: {
                 'credentials'?: 'include' | 'same-origin' | 'omit';
                 'headers'?: HeadersInit;
             }): Promise<Response | null> {
                 return tool.post(url, data, opt);
             },
+            getResponseJson: function(url: string, opt?: {
+                'credentials'?: 'include' | 'same-origin' | 'omit';
+                'headers'?: HeadersInit;
+            }): Promise<any | null> {
+                return tool.getResponseJson(url, opt);
+            },
             postResponseJson: function(url: string, data: Record<string, any> | FormData, opt?: {
                 'credentials'?: 'include' | 'same-origin' | 'omit';
                 'headers'?: HeadersInit;

package/dist/lib/theme.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/dist/lib/tool.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryParse = exports.queryStringify = exports.formatSecond = exports.compar = exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlAtom = exports.urlResolve = exports.parseUrl = exports.postResponseJson = exports.post = exports.get = exports.fetch = exports.request = exports.rgb2hsl = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.match = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
+exports.queryParse = exports.queryStringify = exports.formatSecond = exports.compar = exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlAtom = exports.urlResolve = exports.parseUrl = exports.postResponseJson = exports.getResponseJson = exports.post = exports.get = exports.fetch = exports.request = exports.rgb2hsl = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.match = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
 function getClassPrototype(obj, over = [], level = 0) {
     if (level === 0) {
         return getClassPrototype(Object.getPrototypeOf(obj), over, level + 1);
@@ -643,6 +643,12 @@ function post(url, data, opt) {
     return loader.post(url, data, opt);
 }
 exports.post = post;
+function getResponseJson(url, opt) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return loader.getResponseJson(url, opt);
+    });
+}
+exports.getResponseJson = getResponseJson;
 function postResponseJson(url, data, opt) {
     return __awaiter(this, void 0, void 0, function* () {
         return loader.postResponseJson(url, data, opt);

package/dist/lib/tool.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Han Guoshuai <zohegs@gmail.com>
+ * Copyright 2024 Han Guoshuai <zohegs@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -820,6 +820,14 @@ export function post(url: string, data: Record<string, any> | FormData, opt?: {
     return loader.post(url, data, opt);
 }
 
+/** --- 发送 get 响应为 json 的网络数据，无需 try，失败返回 null */
+export async function getResponseJson(url: string, opt?: {
+    'credentials'?: 'include' | 'same-origin' | 'omit';
+    'headers'?: HeadersInit;
+}): Promise<any | null> {
+    return loader.getResponseJson(url, opt);
+}
+
 /** --- 发送响应为 json 的网络数据，无需 try，失败返回 null --- */
 export async function postResponseJson(url: string, data: Record<string, any> | FormData, opt?: {
     'credentials'?: 'include' | 'same-origin' | 'omit';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.12.0",
+  "version": "3.12.2",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -19,11 +19,11 @@
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.1.7",
-    "@litert/loader": "^3.5.2",
-    "@types/node": "^20.12.5",
-    "electron": "^29.2.0",
+    "@litert/loader": "^3.5.7",
+    "@types/node": "^20.14.6",
+    "electron": "^31.0.2",
     "jszip": "^3.10.1",
-    "terser": "^5.30.3",
-    "typescript": "^5.4.4"
+    "terser": "^5.31.1",
+    "typescript": "^5.4.5"
   }
 }