clickgo 3.1.4-dev13 → 3.1.5-dev14

package/README.md

@@ -19,7 +19,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.3/dist/loader.min.js?path=index&npm={'clickgo':'3.1.4-dev13'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.4/dist/loader.min.js?path=index&npm={'clickgo':'3.1.5-dev14'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/app.js

@@ -14,7 +14,7 @@ const main_1 = require("./form/main");
 class default_1 extends clickgo.core.AbstractApp {
     main() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.run(yield main_1.default.create());
+            this.run(yield clickgo.form.create(main_1.default));
         });
     }
 }

package/dist/app/demo/config.json

@@ -70,7 +70,6 @@
         "/form/method/aform/aform.xml",
         "/form/method/aform/sd.js",
         "/form/method/aform/sd.xml",
-        "/form/method/aform/test.xml",
         "/form/method/core/core.js",
         "/form/method/core/core.xml",
         "/form/method/dom/dom.css",
@@ -79,6 +78,7 @@
         "/form/method/form/form.css",
         "/form/method/form/form.js",
         "/form/method/form/form.xml",
+        "/form/method/form/test.xml",
         "/form/method/fs/fs.js",
         "/form/method/fs/fs.xml",
         "/form/method/fs/text.js",
@@ -109,5 +109,8 @@
         "/res/zip.svg",
         "/app.js",
         "/global.css"
-    ]
+    ],
+    "map": {
+        "~c/": "/form/control/"
+    }
 }

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

@@ -35,6 +35,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.fontSize = 12;
         this.border = 'solid';
         this.background = undefined;
+        this.phcolor = undefined;
     }
     get textBorder() {
         switch (this.border) {

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

@@ -2,7 +2,7 @@
     <layout direction="v" gutter="10" style="padding: 10px; flex: 1; width: 0;">
         <label>Text Length: {{value.length}}, Selection Start: {{selectionStart}}, Selection End: {{selectionEnd}}, Focus: {{isFocus}}</label>
         <label>Scroll Left: {{scrollLeft}}, Scroll Top: {{scrollTop}}, Scroll Height: {{scrollHeight}}, Scroll Width: {{scrollWidth}}, Client Height: {{clientHeight}}, Client Width: {{clientWidth}}</label>
-        <text v-model="value" :multi="multi" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :disabled="disabled" :readonly="readonly" :password="password" :wrap="wrap" v-model:scroll-left="scrollLeft" v-model:scroll-top="scrollTop" v-model:selection-start="selectionStart" v-model:selection-end="selectionEnd" @clientheight="clientHeight = $event" @clientwidth="clientWidth = $event" @scrollheight="scrollHeight = $event" @scrollwidth="scrollWidth = $event" @focus="isFocus = true" @blur="isFocus = false" :style="{'flex': multi ? '1' : undefined, 'line-height': lineHeight, 'font-size': fontSize + 'px', 'background': background, 'color': background ? '#FFF' : undefined, 'height': multi ? undefined : '30px', 'border-width': textBorder}">
+        <text v-model="value" placeholder="placeholder" :multi="multi" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :disabled="disabled" :readonly="readonly" :password="password" :wrap="wrap" v-model:scroll-left="scrollLeft" v-model:scroll-top="scrollTop" v-model:selection-start="selectionStart" v-model:selection-end="selectionEnd" @clientheight="clientHeight = $event" @clientwidth="clientWidth = $event" @scrollheight="scrollHeight = $event" @scrollwidth="scrollWidth = $event" @focus="isFocus = true" @blur="isFocus = false" :style="{'flex': multi ? '1' : undefined, 'line-height': lineHeight, 'font-size': fontSize + 'px', 'background': background, 'color': background ? '#FFF' : undefined, 'height': multi ? undefined : '30px', 'border-width': textBorder}" :class="[phcolor && ('ph-' + phcolor)]">
             <menulist v-if="menu">
                 <menulist-item>Custom</menulist-item>
             </menulist>

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const clickgo = require("clickgo");
-const button_1 = require("./control/button/button");
+const button_1 = require("~c/button/button");
 const check_1 = require("./control/check/check");
 const dialog_1 = require("./control/dialog/dialog");
 const file_1 = require("./control/file/file");
@@ -46,168 +46,163 @@ class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
         this.ntab = '';
-        this.test = 0;
-    }
-    onMounted() {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (true) {
-                yield clickgo.tool.sleep(2000);
-                this.test += 1;
-            }
-        });
     }
     openForm(name) {
         return __awaiter(this, void 0, void 0, function* () {
-            let frm = 0;
+            let frm;
             switch (name) {
                 case 'cblock': {
-                    frm = yield this.createForm('control/block/block');
+                    frm = yield clickgo.form.create('control/block/block', undefined, {
+                        'path': this.filename
+                    });
                     break;
                 }
                 case 'cbutton': {
-                    frm = yield button_1.default.create();
+                    frm = yield clickgo.form.create(button_1.default);
                     break;
                 }
                 case 'ccheck': {
-                    frm = yield check_1.default.create();
+                    frm = yield clickgo.form.create(check_1.default);
                     break;
                 }
                 case 'cdialog': {
-                    frm = yield dialog_1.default.create();
+                    frm = yield clickgo.form.create(dialog_1.default);
                     break;
                 }
                 case 'cfile': {
-                    frm = yield file_1.default.create();
+                    frm = yield clickgo.form.create(file_1.default);
                     break;
                 }
                 case 'cform': {
-                    frm = yield form_1.default.create();
+                    frm = yield clickgo.form.create(form_1.default);
                     break;
                 }
                 case 'cvflow': {
-                    frm = yield vflow_1.default.create();
+                    frm = yield clickgo.form.create(vflow_1.default);
                     break;
                 }
                 case 'cimg': {
-                    frm = yield this.createForm('control/img/img');
+                    frm = yield clickgo.form.create('control/img/img', undefined, {
+                        'path': this.filename
+                    });
                     break;
                 }
                 case 'clabel': {
-                    frm = yield this.createForm('control/label/label');
+                    frm = yield clickgo.form.create('control/label/label', undefined, {
+                        'path': this.filename
+                    });
                     break;
                 }
                 case 'clist': {
-                    frm = yield list_1.default.create();
+                    frm = yield clickgo.form.create(list_1.default);
                     break;
                 }
                 case 'cloading': {
-                    frm = yield this.createForm('control/loading/loading');
+                    frm = yield clickgo.form.create('control/loading/loading', undefined, {
+                        'path': this.filename
+                    });
                     break;
                 }
                 case 'cmarquee': {
-                    frm = yield marquee_1.default.create();
+                    frm = yield clickgo.form.create(marquee_1.default);
                     break;
                 }
                 case 'cmenu': {
-                    frm = yield menu_1.default.create();
+                    frm = yield clickgo.form.create(menu_1.default);
                     break;
                 }
                 case 'cmonaco': {
-                    frm = yield monaco_1.default.create();
+                    frm = yield clickgo.form.create(monaco_1.default);
                     break;
                 }
                 case 'cflow': {
-                    frm = yield flow_1.default.create();
+                    frm = yield clickgo.form.create(flow_1.default);
                     break;
                 }
                 case 'cproperty': {
-                    frm = yield property_1.default.create();
+                    frm = yield clickgo.form.create(property_1.default);
                     break;
                 }
                 case 'cradio': {
-                    frm = yield radio_1.default.create();
+                    frm = yield clickgo.form.create(radio_1.default);
                     break;
                 }
                 case 'cscroll': {
-                    frm = yield scroll_1.default.create();
+                    frm = yield clickgo.form.create(scroll_1.default);
                     break;
                 }
                 case 'cselect': {
-                    frm = yield select_1.default.create();
+                    frm = yield clickgo.form.create(select_1.default);
                     break;
                 }
                 case 'ctab': {
-                    frm = yield tab_1.default.create();
+                    frm = yield clickgo.form.create(tab_1.default);
                     break;
                 }
                 case 'ctext': {
-                    frm = yield text_1.default.create();
+                    frm = yield clickgo.form.create(text_1.default);
                     break;
                 }
                 case 'eform': {
-                    frm = yield form_2.default.create();
+                    frm = yield clickgo.form.create(form_2.default);
                     break;
                 }
                 case 'eother': {
-                    frm = yield other_1.default.create();
+                    frm = yield clickgo.form.create(other_1.default);
                     break;
                 }
                 case 'escreen': {
-                    frm = yield screen_1.default.create();
+                    frm = yield clickgo.form.create(screen_1.default);
                     break;
                 }
                 case 'etask': {
-                    frm = yield task_1.default.create();
+                    frm = yield clickgo.form.create(task_1.default);
                     break;
                 }
                 case 'aform': {
-                    frm = yield aform_1.default.create();
+                    frm = yield clickgo.form.create(aform_1.default);
                     break;
                 }
                 case 'mcore': {
-                    frm = yield core_1.default.create();
+                    frm = yield clickgo.form.create(core_1.default);
                     break;
                 }
                 case 'mdom': {
-                    frm = yield dom_1.default.create();
+                    frm = yield clickgo.form.create(dom_1.default);
                     break;
                 }
                 case 'mform': {
-                    frm = yield form_3.default.create();
+                    frm = yield clickgo.form.create(form_3.default);
                     break;
                 }
                 case 'mfs': {
-                    frm = yield fs_1.default.create();
+                    frm = yield clickgo.form.create(fs_1.default);
                     break;
                 }
                 case 'mnative': {
-                    frm = yield native_1.default.create();
+                    frm = yield clickgo.form.create(native_1.default);
                     break;
                 }
                 case 'msystem': {
-                    frm = yield system_1.default.create();
+                    frm = yield clickgo.form.create(system_1.default);
                     break;
                 }
                 case 'mtask': {
-                    frm = yield task_2.default.create();
+                    frm = yield clickgo.form.create(task_2.default);
                     break;
                 }
                 case 'mtheme': {
-                    frm = yield theme_1.default.create();
+                    frm = yield clickgo.form.create(theme_1.default);
                     break;
                 }
                 case 'mtool': {
-                    frm = yield tool_1.default.create();
+                    frm = yield clickgo.form.create(tool_1.default);
                     break;
                 }
-                case 'mzip': {
-                    frm = yield zip_1.default.create();
-                    break;
+                default: {
+                    frm = yield clickgo.form.create(zip_1.default);
                 }
             }
-            if (typeof frm === 'number') {
-                return;
-            }
             frm.show();
         });
     }

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

@@ -19,15 +19,6 @@ class default_1 extends clickgo.form.AbstractForm {
         this.test = 'A';
         this.dr = '';
     }
-    ccreateForm() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const frm = yield this.createForm('test');
-            if (typeof frm === 'number') {
-                return;
-            }
-            frm.show();
-        });
-    }
     ssend() {
         this.send(parseInt(this.fid), {
             'key': this.sendValue
@@ -42,10 +33,7 @@ class default_1 extends clickgo.form.AbstractForm {
     }
     sshowDialog() {
         return __awaiter(this, void 0, void 0, function* () {
-            const frm = yield sd_1.default.create();
-            if (typeof frm === 'number') {
-                return;
-            }
+            const frm = yield clickgo.form.create(sd_1.default);
             this.dr = yield frm.showDialog();
         });
     }

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

@@ -13,7 +13,6 @@
                 <label>test: {{test}}</label>
                 <button @click="test = test === 'A' ? 'B' : 'A'" style="height: 30px; flex: 1;">watch('test', () => { dialog })</button>
             </layout>
-            <button @click="ccreateForm" style="height: 30px;">createForm('test')</button>
             <button @click="topMost = !topMost" style="height: 30px;">topMost: {{topMost ? 'true' : 'false'}}</button>
             <layout gutter="10" align-v="center">
                 <label>Form ID:</label>

package/dist/app/demo/form/method/aform/sd.js

@@ -17,10 +17,7 @@ class Sd extends clickgo.form.AbstractForm {
     }
     newDialog() {
         return __awaiter(this, void 0, void 0, function* () {
-            const frm = yield Sd.create();
-            if (typeof frm === 'number') {
-                return;
-            }
+            const frm = yield clickgo.form.create(Sd);
             this.dr = yield frm.showDialog();
         });
     }

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

@@ -118,13 +118,12 @@ class default_1 extends clickgo.form.AbstractForm {
         }
         clickgo.form.showPop(e.currentTarget, this.refs.pop, 'v');
     }
-    createTop() {
+    create() {
         return __awaiter(this, void 0, void 0, function* () {
-            const frm = yield this.createForm('test');
-            if (typeof frm === 'number') {
-                return;
-            }
-            frm.topMost = true;
+            const frm = yield clickgo.form.create('test', undefined, {
+                'path': this.filename
+            });
+            frm.show();
         });
     }
     dialog() {

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

@@ -33,6 +33,7 @@
             <teleport to="system">
                 <block ref="pop" style="border: solid 1px #000; background: #FFF; width: 200px; height: 100px; display: flex; justify-content: center; align-items: center;">refs.pop</block>
             </teleport>
+            <button @click="create" style="height: 30px;">create('test', undefined, { 'path': this.filename })</button>
             <label>Dialog result: {{dr}}.</label>
             <button @click="dialog" style="height: 30px;">dialog('Hello world!')</button>
             <button @click="dialogLong">dialog('long...')</button>

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

@@ -53,13 +53,10 @@ class default_1 extends clickgo.form.AbstractForm {
                     if (content instanceof Blob) {
                         content = yield clickgo.tool.blob2Text(content);
                     }
-                    const f = yield text_1.default.create({
+                    const f = yield clickgo.form.create(text_1.default, {
                         'title': this.val[0].slice(this.val[0].lastIndexOf('/') + 1),
                         'content': content
                     });
-                    if (typeof f === 'number') {
-                        return;
-                    }
                     f.show();
                     return;
                 }

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

@@ -55,6 +55,9 @@ class default_1 extends clickgo.form.AbstractForm {
     escapeHTML() {
         clickgo.form.dialog(clickgo.tool.escapeHTML(this.purifyTxt)).catch((e) => { throw e; });
     }
+    rgb2hsl() {
+        clickgo.form.dialog(JSON.stringify(clickgo.tool.rgb2hsl('9,105,218'))).catch((e) => { throw e; });
+    }
     parseUrl() {
         clickgo.form.dialog(JSON.stringify(clickgo.tool.parseUrl(this.url))).catch((e) => { throw e; });
     }

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

@@ -15,6 +15,7 @@
                 <button @click="random" style="height: 30px; padding: 0 10px;">random({{length}}, RANDOM_LN, '{{block}}')</button>
             </layout>
             <button @click="escapeHTML" style="height: 30px;">escapeHTML('{{purifyTxt.slice(0, 5).replace("'", "\\'")}}...')</button>
+            <button @click="rgb2hsl" style="height: 30px;">rgb2hsl('9,105,218')</button>
             <text v-model="url" style="height: 30px;"></text>
             <button @click="parseUrl" style="height: 30px;">parseUrl('{{url.slice(0, 5).replace("'","\\'")}}...')</button>
             <label>urlResolve:</label>

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

@@ -74,10 +74,7 @@ class default_1 extends clickgo.form.AbstractForm {
                         yield clickgo.form.dialog('This file cannot be opened.');
                         return;
                     }
-                    const f = yield text_1.default.create();
-                    if (typeof f === 'number') {
-                        return;
-                    }
+                    const f = yield clickgo.form.create(text_1.default);
                     f.show();
                     this.send(f.formId, {
                         'title': this.val[0].slice(this.val[0].lastIndexOf('/') + 1),

package/dist/app/task/app.js

@@ -14,7 +14,7 @@ const bar_1 = require("./form/bar/bar");
 class default_1 extends clickgo.core.AbstractApp {
     main() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.run(yield bar_1.default.create());
+            this.run(yield clickgo.form.create(bar_1.default));
         });
     }
 }

package/dist/lib/core.js

@@ -51,11 +51,6 @@ class AbstractApp {
         });
     }
     run(form) {
-        if (typeof form === 'number') {
-            const msg = 'Application run error, Form creation failed (' + form.toString() + ').';
-            trigger('error', this.taskId, 0, new Error(msg), msg);
-            return;
-        }
         form.show();
     }
     onError() {

package/dist/lib/core.ts

@@ -73,13 +73,7 @@ export abstract class AbstractApp {
      * --- 以某个窗体进行正式启动这个 app（入口 form），不启动则任务也启动失败 ---
      * @param form 窗体对象
      */
-    public run(form: form.AbstractForm | number): void {
-        if (typeof form === 'number') {
-            // --- 报错 ---
-            const msg = 'Application run error, Form creation failed (' + form.toString() + ').';
-            trigger('error', this.taskId, 0, new Error(msg), msg);
-            return;
-        }
+    public run(form: form.AbstractForm): void {
         form.show();
     }