clickgo 3.11.16 → 3.11.18

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

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

@@ -3,7 +3,7 @@
         <label>File: {{npath[0]}}, Length: {{files[npath[0]] ? files[npath[0]].length : ''}}</label>
         <label>{{npath}}</label>
         <layout gutter="10" style="flex: 1; height: 0;">
-            <text :modelValue="JSON.stringify(files, null, 4)" style="flex: 1; width: 0;" multi readonly wrap></text>
+            <text :modelValue="JSON.stringify(files, null, 4)" style="flex: 1; width: 0;" type="multi" readonly wrap></text>
             <monaco v-model="npath[0]" v-model:files="files" :readonly="readonly" :language="language" :disabled="disabled" :theme="theme[0]" @jump="jump" style="flex: 1; wdith: 0;" :style="{'font-size': size[0], 'font-family': family ? 'Consolas, \'Courier New\', monospace' : undefined}"></monaco>
         </layout>
         <layout gutter="10">

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

@@ -1,6 +1,6 @@
 <form title="Property" width="520" height="400" min-width="300" min-height="400" padding="10">
     <layout gutter="10" style="flex: 1; width: 0;">
-        <text :modelValue="JSON.stringify(data, null, 4)" style="flex: 1; width: 0;" multi readonly wrap></text>
+        <text :modelValue="JSON.stringify(data, null, 4)" style="flex: 1; width: 0;" type="multi" readonly wrap></text>
         <property v-model="data" style="flex: 1; width: 0;"></property>
     </layout>
 </form>

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

@@ -1,9 +1,9 @@
 <form width="350" height="600" title="Library task" padding="10">
     <layout direction="v" gutter="10" style="flex: 1;">
         <label>config:</label>
-        <text v-model="config" readonly multi style="flex: 1;"></text>
+        <text v-model="config" readonly type="multi" style="flex: 1;"></text>
         <label>global:</label>
-        <text v-model="global" readonly multi style="flex: 1;"></text>
+        <text v-model="global" readonly type="multi" style="flex: 1;"></text>
         <button @click="getCdn">getCdn()</button>
         <button @click="getAvailArea">getAvailArea()</button>
         <layout gutter="10">

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

@@ -25,7 +25,7 @@
             <button @click="watchStyleChange = !watchStyleChange" ref="watchStyle"  :style="{'font-size': watchStyleChange ? 'inherit' : '16px'}">watchStyle(this.refs.watchStyle.$el, 'font-size', (n, v) => { ... })</button>
             <button @click="isWatchStyle" >isWatchStyle(this.refs.watchStyle.$el)</button>
             <!-- getWatchInfo -->
-            <text :model-value="getWatchInfoText" readonly multi style="height: 300px;"></text>
+            <text :model-value="getWatchInfoText" readonly type="multi" style="height: 300px;"></text>
             <button @click="getWatchInfo" :disabled="getWatchInfoDisabled">getWatchInfo 20s</button>
             <block @mousedown="bindGesture" @touchstart="bindGesture" style="height: 50px; display: flex; justify-content: center; align-items: center; font-size: 14px; background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color);">{{bindGestureText ? bindGestureText : 'bindGesture(e: Touch | Mouse, { ... })'}}</block>
             <block @wheel="bindGestureWheel" style="height: 50px; display: flex; justify-content: center; align-items: center; font-size: 14px; background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color);">{{bindGestureWheelText ? bindGestureWheelText : 'bindGesture(e: Wheel, { ... })'}}</block>

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

@@ -240,6 +240,11 @@ class default_1 extends clickgo.form.AbstractForm {
             }
         });
     }
+    prompt() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.dr = yield clickgo.form.prompt('test');
+        });
+    }
     flash() {
         clickgo.form.flash(this.formId);
     }

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

@@ -56,6 +56,7 @@
             <button @click="dialogData">Dialog data</button>
             <button @click="confirm(false)">confirm('confirm')</button>
             <button @click="confirm(true)">confirm({'content':'confirm','cancel':true})</button>
+            <button @click="prompt">prompt('test')</button>
             <button @click="flash">flash({{formId}})</button>
             <button @click="showLauncher">showLauncher()</button>
         </layout>

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

@@ -1,3 +1,3 @@
 <form width="350" height="400" :title="title" padding="10">
-    <text v-model="content" style="flex: 1;" multi readonly></text>
+    <text v-model="content" style="flex: 1;" type="multi" readonly></text>
 </form>

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

@@ -2,7 +2,7 @@
     <flow direction="v" style="flex: 1; padding: 10px;">
         <layout direction="v" gutter="10">
             <button @click="sleep">{{sleeping ? 'Waiting...' : 'sleep(1000)'}}</button>
-            <text v-model="purifyTxt" multi style="height: 100px;"></text>
+            <text v-model="purifyTxt" type="multi" style="height: 100px;"></text>
             <button @click="purify">purify('{{purifyTxt.slice(0, 5).replace("'", "\\'")}}...')</button>
             <layout gutter="10">
                 <text v-model="min" 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.11.16';
+const version = '3.11.18';
 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.16';
+const version = '3.11.18';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/form.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showLauncher = exports.flash = exports.confirm = exports.dialog = exports.create = exports.createPanel = exports.removePanel = exports.remove = exports.doFocusAndPopEvent = exports.hidePop = exports.showPop = exports.removeFromPop = exports.appendToPop = exports.hideNotify = exports.notifyProgress = exports.notify = exports.hideDrag = exports.moveDrag = exports.showDrag = exports.hideRectangle = exports.showRectangle = exports.moveRectangle = exports.showCircular = exports.getRectByBorder = exports.getMaxZIndexID = exports.changeFocus = exports.hashBack = exports.getHash = exports.hash = exports.setActivePanel = exports.removeActivePanel = exports.getActivePanel = exports.activePanels = exports.getFocus = exports.getList = exports.send = exports.get = exports.getTaskId = exports.refreshMaxPosition = exports.bindDrag = exports.bindResize = exports.close = exports.max = exports.min = exports.superConfirm = exports.elements = exports.launcherRoot = exports.simpleSystemTaskRoot = exports.AbstractForm = exports.AbstractPanel = void 0;
-exports.hideLauncher = void 0;
+exports.flash = exports.prompt = exports.confirm = exports.dialog = exports.create = exports.createPanel = exports.removePanel = exports.remove = exports.doFocusAndPopEvent = exports.hidePop = exports.showPop = exports.removeFromPop = exports.appendToPop = exports.hideNotify = exports.notifyProgress = exports.notify = exports.hideDrag = exports.moveDrag = exports.showDrag = exports.hideRectangle = exports.showRectangle = exports.moveRectangle = exports.showCircular = exports.getRectByBorder = exports.getMaxZIndexID = exports.changeFocus = exports.hashBack = exports.getHash = exports.hash = exports.setActivePanel = exports.removeActivePanel = exports.getActivePanel = exports.activePanels = exports.getFocus = exports.getList = exports.send = exports.get = exports.getTaskId = exports.refreshMaxPosition = exports.bindDrag = exports.bindResize = exports.close = exports.max = exports.min = exports.superConfirm = exports.elements = exports.launcherRoot = exports.simpleSystemTaskRoot = exports.AbstractForm = exports.AbstractPanel = void 0;
+exports.hideLauncher = exports.showLauncher = void 0;
 const clickgo = __importStar(require("../clickgo"));
 const core = __importStar(require("./core"));
 const task = __importStar(require("./task"));
@@ -2635,10 +2635,11 @@ function dialog(opt) {
         }
         const cls = class extends AbstractForm {
             constructor() {
-                var _a;
+                var _a, _b;
                 super(...arguments);
                 this.buttons = nopt.buttons;
                 this.data = (_a = nopt.data) !== null && _a !== void 0 ? _a : {};
+                this.methods = (_b = nopt.methods) !== null && _b !== void 0 ? _b : {};
             }
             get filename() {
                 return filename;
@@ -2647,16 +2648,19 @@ function dialog(opt) {
                 return taskId;
             }
             select(button) {
-                var _a;
                 const event = {
                     'go': true,
                     preventDefault: function () {
                         this.go = false;
                     }
                 };
-                (_a = nopt.select) === null || _a === void 0 ? void 0 : _a.call(nopt, event, button);
+                if (nopt.select) {
+                    nopt.select.call(this, event, button);
+                }
                 if (event.go) {
-                    this.dialogResult = button;
+                    if (nopt.autoDialogResult !== false) {
+                        this.dialogResult = button;
+                    }
                     close(this.formId);
                 }
             }
@@ -2703,6 +2707,7 @@ function confirm(opt) {
         }
         const res = yield dialog({
             'taskId': taskId,
+            'title': opt.title,
             'content': opt.content,
             'buttons': buttons
         });
@@ -2716,6 +2721,42 @@ function confirm(opt) {
     });
 }
 exports.confirm = confirm;
+function prompt(opt) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        if (typeof opt === 'string') {
+            opt = {
+                'content': opt
+            };
+        }
+        const taskId = opt.taskId;
+        if (!taskId) {
+            return '';
+        }
+        const t = task.list[taskId];
+        if (!t) {
+            return '';
+        }
+        const locale = t.locale.lang || core.config.locale;
+        const res = yield dialog({
+            'taskId': taskId,
+            'title': opt.title,
+            'direction': 'v',
+            'gutter': 10,
+            'content': '<block>' + opt.content + '</block><text v-model="data.text">',
+            'data': {
+                'text': (_a = opt.text) !== null && _a !== void 0 ? _a : ''
+            },
+            'select': function () {
+                this.dialogResult = this.data.text;
+            },
+            'buttons': [(_c = (_b = info.locale[locale]) === null || _b === void 0 ? void 0 : _b.ok) !== null && _c !== void 0 ? _c : info.locale['en'].ok],
+            'autoDialogResult': false
+        });
+        return res;
+    });
+}
+exports.prompt = prompt;
 function flash(formId, taskId) {
     if (!taskId) {
         return;

package/dist/lib/form.ts

@@ -3350,6 +3350,8 @@ export function dialog(opt: string | types.IFormDialogOptions): Promise<string>
 
             public data = nopt.data ?? {};
 
+            public methods = nopt.methods ?? {};
+
             public get filename(): string {
                 return filename;
             }
@@ -3365,9 +3367,13 @@ export function dialog(opt: string | types.IFormDialogOptions): Promise<string>
                         this.go = false;
                     }
                 };
-                nopt.select?.(event as unknown as Event, button);
+                if (nopt.select) {
+                    nopt.select.call(this, event as unknown as Event, button)
+                }
                 if (event.go) {
-                    this.dialogResult = button;
+                    if (nopt.autoDialogResult !== false) {
+                        this.dialogResult = button;
+                    }
                     close(this.formId);
                 }
             }
@@ -3417,6 +3423,7 @@ export async function confirm(opt: string | types.IFormConfirmOptions): Promise<
     const res = await dialog({
         'taskId': taskId,
 
+        'title': opt.title,
         'content': opt.content,
         'buttons': buttons
     });
@@ -3429,6 +3436,44 @@ export async function confirm(opt: string | types.IFormConfirmOptions): Promise<
     return false;
 }
 
+/**
+ * --- 显示一个输入框 dialog ---
+ * @param opt 选项或者提示文字
+ */
+export async function prompt(opt: string | types.IFormPromptOptions): Promise<string> {
+    if (typeof opt === 'string') {
+        opt = {
+            'content': opt
+        };
+    }
+    const taskId = opt.taskId;
+    if (!taskId) {
+        return '';
+    }
+    const t = task.list[taskId];
+    if (!t) {
+        return '';
+    }
+    const locale = t.locale.lang || core.config.locale;
+    const res = await dialog({
+        'taskId': taskId,
+
+        'title': opt.title,
+        'direction': 'v',
+        'gutter': 10,
+        'content': '<block>' + opt.content + '</block><text v-model="data.text">',
+        'data': {
+            'text': opt.text ?? ''
+        },
+        'select': function(this: any) {
+            this.dialogResult = this.data.text;
+        },
+        'buttons': [info.locale[locale]?.ok ?? info.locale['en'].ok],
+        'autoDialogResult': false
+    });
+    return res;
+}
+
 /**
  * --- 让窗体闪烁 ---
  * @param formId 要闪烁的窗体 id，必填

package/dist/lib/task.js

@@ -707,6 +707,15 @@ function run(url_1) {
                     opt.taskId = taskId;
                     return form.confirm(opt);
                 },
+                prompt: function (opt) {
+                    if (typeof opt === 'string') {
+                        opt = {
+                            'content': opt
+                        };
+                    }
+                    opt.taskId = taskId;
+                    return form.prompt(opt);
+                },
                 flash: function (fid) {
                     form.flash(fid, taskId);
                 },

package/dist/lib/task.ts

@@ -822,6 +822,15 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
                 opt.taskId = taskId;
                 return form.confirm(opt);
             },
+            prompt: function(opt: string | types.IFormPromptOptions): Promise<string> {
+                if (typeof opt === 'string') {
+                    opt = {
+                        'content': opt
+                    };
+                }
+                opt.taskId = taskId;
+                return form.prompt(opt);
+            },
             flash: function(fid: number): void {
                 form.flash(fid, taskId);
             },

package/package.json

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

package/types/index.d.ts

@@ -571,12 +571,15 @@ export interface IFormDialogOptions {
     'title'?: string;
     'content': string;
     'buttons'?: string[];
+    'autoDialogResult'?: boolean;
 
     'direction'?: 'h' | 'v';
     'gutter'?: number | string;
 
     /** --- 传值，需要用 data.x 读取 --- */
     'data'?: Record<string, any>;
+    /** --- 传值，需要用 methods.x 读取 --- */
+    'methods'?: Record<string, () => any>;
     /** --- 样式表 --- */
     'style'?: string;
     /** --- 路径基，以 / 结束或文件路径则以文件的基路径为准，可留空 --- */
@@ -593,10 +596,21 @@ export interface IFormConfirmOptions {
     /** --- 当前的 taskId，App 模式下无效 --- */
     'taskId'?: number;
 
+    'title'?: string;
     'content': string;
     'cancel'?: boolean;
 }
 
+/** --- Prompt 选项 --- */
+export interface IFormPromptOptions {
+    /** --- 当前的 taskId，App 模式下无效 --- */
+    'taskId'?: number;
+
+    'title'?: string;
+    'content': string;
+    'text'?: string;
+}
+
 export interface IFormSetTopMostOptions {
     /** --- 当前 taskId，App 模式下无效 --- */
     'taskId'?: number;