clickgo 3.1.1-dev10 → 3.1.3-dev12

package/dist/lib/control.js

@@ -20,6 +20,7 @@ const fs = require("./fs");
 class AbstractControl {
     constructor() {
         this.props = {};
+        this.slots = {};
     }
     get filename() {
         return '';
@@ -85,33 +86,32 @@ class AbstractControl {
         }
         core.trigger(name, this.taskId, this.formId, param1, param2);
     }
+    get propBoolean() {
+        return (name) => {
+            return tool.getBoolean(this.props[name]);
+        };
+    }
+    get propNumber() {
+        return (name) => {
+            return tool.getNumber(this.props[name]);
+        };
+    }
+    get propInt() {
+        return (name) => {
+            return Math.round(this.propNumber(name));
+        };
+    }
+    get propArray() {
+        return (name) => {
+            return tool.getArray(this.props[name]);
+        };
+    }
     get element() {
         return this.$el;
     }
     emit(name, ...v) {
         this.$emit(name, ...v);
     }
-    get slots() {
-        return (name = 'default') => {
-            const d = this.$slots[name];
-            if (!d) {
-                return [];
-            }
-            const slots = [];
-            const list = d();
-            for (const item of list) {
-                if (typeof item.type === 'symbol') {
-                    for (const item2 of item.children) {
-                        slots.push(item2);
-                    }
-                }
-                else {
-                    slots.push(item);
-                }
-            }
-            return slots;
-        };
-    }
     get parent() {
         return this.$parent;
     }
@@ -162,92 +162,56 @@ function read(blob) {
             return false;
         }
         const controlPkg = {};
-        let controlProcessed = 0;
-        const controls = z.readDir();
-        yield new Promise(function (resolve) {
-            const controlCb = function () {
-                ++controlProcessed;
-                if (controlProcessed < controls.length) {
-                    return;
-                }
-                resolve();
+        const list = z.readDir('/');
+        for (const sub of list) {
+            if (sub.isFile) {
+                continue;
+            }
+            const configContent = yield z.getContent('/' + sub.name + '/config.json');
+            if (!configContent) {
+                continue;
+            }
+            const config = JSON.parse(configContent);
+            controlPkg[config.name] = {
+                'type': 'control',
+                'config': config,
+                'files': {}
             };
-            for (const control of controls) {
-                if (control.isFile) {
-                    controlCb();
-                    continue;
+            const list = z.readDir('/' + sub.name + '/', {
+                'hasChildren': true
+            });
+            for (const file of list) {
+                const pre = file.path.slice(config.name.length + 1);
+                const mime = tool.getMimeByPath(file.name);
+                if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
+                    const fab = yield z.getContent(file.path + file.name, 'string');
+                    if (!fab) {
+                        continue;
+                    }
+                    controlPkg[config.name].files[pre + file.name] = fab.replace(/^\ufeff/, '');
                 }
-                z.getContent('/' + control.name + '/config.json').then(function (configContent) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        if (!configContent) {
-                            controlCb();
-                            return;
-                        }
-                        const config = JSON.parse(configContent);
-                        const files = {};
-                        const filesLength = Object.keys(config.files).length;
-                        let fileLoadedLength = 0;
-                        yield new Promise(function (resolve) {
-                            const loadedCb = function () {
-                                ++fileLoadedLength;
-                                if (fileLoadedLength < filesLength) {
-                                    return;
-                                }
-                                resolve();
-                            };
-                            for (const file of config.files) {
-                                const mime = tool.getMimeByPath(file);
-                                if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
-                                    z.getContent('/' + control.name + file, 'string').then(function (fab) {
-                                        if (!fab) {
-                                            loadedCb();
-                                            return;
-                                        }
-                                        files[file] = fab.replace(/^\ufeff/, '');
-                                        loadedCb();
-                                    }).catch(function () {
-                                        loadedCb();
-                                    });
-                                }
-                                else {
-                                    z.getContent('/' + control.name + file, 'arraybuffer').then(function (fab) {
-                                        if (!fab) {
-                                            loadedCb();
-                                            return;
-                                        }
-                                        files[file] = new Blob([fab], {
-                                            'type': mime.mime
-                                        });
-                                        loadedCb();
-                                    }).catch(function () {
-                                        loadedCb();
-                                    });
-                                }
-                            }
-                        });
-                        controlPkg[control.name] = {
-                            'type': 'control',
-                            'config': config,
-                            'files': files
-                        };
-                        controlCb();
+                else {
+                    const fab = yield z.getContent(file.path + file.name, 'arraybuffer');
+                    if (!fab) {
+                        continue;
+                    }
+                    controlPkg[config.name].files[pre + file.name] = new Blob([fab], {
+                        'type': mime.mime
                     });
-                }).catch(function () {
-                    controlCb();
-                });
+                }
             }
-        });
+        }
         return controlPkg;
     });
 }
 exports.read = read;
-function init(taskId) {
+function init(taskId, invoke) {
     return __awaiter(this, void 0, void 0, function* () {
         const t = task.list[taskId];
         if (!t) {
-            return false;
+            return -1;
         }
-        for (let path of t.config.controls) {
+        for (let path of t.app.config.controls) {
             if (!path.endsWith('.cgc')) {
                 path += '.cgc';
             }
@@ -276,7 +240,7 @@ function init(taskId) {
                         };
                         t.controls[name].layout = item.files[item.config.layout + '.html'];
                         if (t.controls[name].layout === undefined) {
-                            return false;
+                            return -2;
                         }
                         t.controls[name].layout = t.controls[name].layout.replace(/^(<[a-zA-Z0-9-]+)( |>)/, '$1 data-cg-control-' + name + '$2');
                         const style = item.files[item.config.style + '.css'];
@@ -299,6 +263,9 @@ function init(taskId) {
                             });
                         }
                         t.controls[name].layout = tool.eventsAttrWrap(t.controls[name].layout);
+                        if (t.controls[name].layout.includes('<teleport')) {
+                            t.controls[name].layout = tool.teleportGlue(t.controls[name].layout, '{{{formId}}}');
+                        }
                         let cls;
                         if (item.files[item.config.code + '.js']) {
                             item.files['/invoke/clickgo.js'] = `module.exports = invokeClickgo;`;
@@ -306,7 +273,7 @@ function init(taskId) {
                             try {
                                 expo = loader.require(item.config.code, item.files, {
                                     'dir': '/',
-                                    'invoke': t.invoke,
+                                    'invoke': invoke,
                                     'preprocess': function (code, path) {
                                         const exec = /eval\W/.exec(code);
                                         if (exec) {
@@ -329,12 +296,12 @@ function init(taskId) {
                             }
                             catch (e) {
                                 core.trigger('error', taskId, 0, e, e.message + '(-4)');
-                                return false;
+                                return -3;
                             }
                             if (!(expo === null || expo === void 0 ? void 0 : expo.default)) {
                                 const msg = '"default" not found on "' + item.config.code + '" of "' + name + '" control.';
                                 core.trigger('error', taskId, 0, new Error(msg), msg);
-                                return false;
+                                return -4;
                             }
                             cls = new expo.default();
                         }
@@ -397,13 +364,11 @@ function init(taskId) {
                         'content': 'Control failed to load.\nTask id: ' + t.id.toString() + '\nPath: ' + path,
                         'type': 'danger'
                     });
-                    return false;
+                    return -5;
                 }
             }
         }
-        t.invoke = undefined;
-        delete t.invoke;
-        return true;
+        return 1;
     });
 }
 exports.init = init;
@@ -441,16 +406,21 @@ function buildComponents(taskId, formId, path) {
             }
         };
         components['cg-' + name] = {
-            'template': control.layout,
+            'template': control.layout.replace(/{{{formId}}}/g, formId.toString()),
             'props': control.props,
             'data': function () {
-                return tool.clone(control.data);
+                const data = tool.clone(control.data);
+                if (data.props) {
+                    delete data.props;
+                }
+                return tool.clone(data);
             },
             'methods': control.methods,
             'computed': computed,
             beforeCreate: control.methods.onBeforeCreate,
             created: function () {
                 this.props = this.$props;
+                this.slots = this.$slots;
                 this.access = tool.clone(control.access);
                 this.onCreated();
             },

package/dist/lib/control.ts

@@ -162,6 +162,45 @@ export abstract class AbstractControl {
     /** --- 组件参数，由用户定义重写 --- */
     public readonly props = {};
 
+    /** --- 组件的子插槽 --- */
+    public readonly slots: Record<string, any> = {};
+
+    /**
+     * --- 获取 props 中的 boolean 类型的值 ----
+     */
+    public get propBoolean() {
+        return (name: keyof this['props']): boolean => {
+            return tool.getBoolean((this.props as any)[name]);
+        };
+    }
+
+    /**
+     * --- 获取 props 中的 number 类型的值 ----
+     */
+    public get propNumber() {
+        return (name: keyof this['props']): number => {
+            return tool.getNumber((this.props as any)[name]);
+        };
+    }
+
+    /**
+     * --- 获取 props 中的 int 类型的值 ----
+     */
+    public get propInt() {
+        return (name: keyof this['props']): number => {
+            return Math.round(this.propNumber(name));
+        };
+    }
+
+    /**
+     * --- 获取 props 中的 array 类型的值 ----
+     */
+    public get propArray() {
+        return (name: keyof this['props']): any[] => {
+            return tool.getArray((this.props as any)[name]);
+        };
+    }
+
     /** --- 获取当前的 HTML DOM --- */
     public get element(): HTMLElement {
         return (this as any).$el;
@@ -176,36 +215,10 @@ export abstract class AbstractControl {
         (this as any).$emit(name, ...v);
     }
 
-    /**
-     * --- 获取目前现存的所有子 slots ---
-     */
-    public get slots(): (name?: string) => types.IVNode[] {
-        return (name: string = 'default'): types.IVNode[] => {
-            const d = (this as any).$slots[name];
-            if (!d) {
-                return [];
-            }
-            const slots = [];
-            const list = d();
-            for (const item of list) {
-                if (typeof item.type === 'symbol') {
-                    // --- 动态的 slot，例如 v-for 产生的 slot ---
-                    for (const item2 of item.children) {
-                        slots.push(item2);
-                    }
-                }
-                else {
-                    slots.push(item);
-                }
-            }
-            return slots;
-        };
-    }
-
     /**
      * --- 获取上层控件 ---
      */
-    public get parent(): AbstractControl {
+    public get parent(): AbstractControl & form.AbstractForm {
         return (this as any).$parent;
     }
 
@@ -274,107 +287,65 @@ export async function read(blob: Blob): Promise<false | types.TControlPackage> {
     }
     /** --- 要返回的 control pkg 对象 --- */
     const controlPkg: types.TControlPackage = {};
-    /** --- 已处理的控件 --- */
-    let controlProcessed = 0;
-    /** --- 控件包中的控件根目录列表 --- */
-    const controls = z.readDir();
-    // --- 开始处理 ---
-    await new Promise<void>(function(resolve) {
-        /** --- 一个 control item 处理完后就执行一次 --- */
-        const controlCb = function(): void {
-            ++controlProcessed;
-            if (controlProcessed < controls.length) {
-                return;
-            }
-            // --- 加载完毕 ---
-            resolve();
+
+    // --- 读取包 ---
+    const list = z.readDir('/');
+    for (const sub of list) {
+        if (sub.isFile) {
+            continue;
+        }
+        const configContent = await z.getContent('/' + sub.name + '/config.json');
+        if (!configContent) {
+            continue;
+        }
+        // --- 读取本条控件内容 ---
+        const config: types.IControlConfig = JSON.parse(configContent);
+        controlPkg[config.name] = {
+            'type': 'control',
+            'config': config,
+            'files': {}
         };
-        for (const control of controls) {
-            if (control.isFile) {
-                controlCb();
-                continue;
+        // --- 读取控件包文件 ---
+        const list = z.readDir('/' + sub.name + '/', {
+            'hasChildren': true
+        });
+        for (const file of list) {
+            const pre = file.path.slice(config.name.length + 1);
+            const mime = tool.getMimeByPath(file.name);
+            if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
+                const fab = await z.getContent(file.path + file.name, 'string');
+                if (!fab) {
+                    continue;
+                }
+                controlPkg[config.name].files[pre + file.name] = fab.replace(/^\ufeff/, '');
             }
-            z.getContent('/' + control.name + '/config.json').then(async function(configContent) {
-                if (!configContent) {
-                    controlCb();
-                    return;
+            else {
+                const fab = await z.getContent(file.path + file.name, 'arraybuffer');
+                if (!fab) {
+                    continue;
                 }
-                /** --- 子控件的配置文件 --- */
-                const config: types.IControlConfig = JSON.parse(configContent);
-                // --- 开始读取文件 ---
-                const files: Record<string, Blob | string> = {};
-                /** --- 配置文件中的文件数量总数 --- */
-                const filesLength = Object.keys(config.files).length;
-                /** --- 已处理的文件数 --- */
-                let fileLoadedLength = 0;
-                // --- 开始加载子控件中的文件 ---
-                await new Promise<void>(function(resolve) {
-                    /** --- 一个文件加载完后就执行一次 --- */
-                    const loadedCb = function(): void {
-                        ++fileLoadedLength;
-                        if (fileLoadedLength < filesLength) {
-                            return;
-                        }
-                        // --- 加载完毕 ---
-                        resolve();
-                    };
-                    for (const file of config.files) {
-                        const mime = tool.getMimeByPath(file);
-                        if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
-                            z.getContent('/' + control.name + file, 'string').then(function(fab) {
-                                if (!fab) {
-                                    loadedCb();
-                                    return;
-                                }
-                                // --- 去除 BOM ---
-                                files[file] = fab.replace(/^\ufeff/, '');
-                                loadedCb();
-                            }).catch(function() {
-                                loadedCb();
-                            });
-                        }
-                        else {
-                            z.getContent('/' + control.name + file, 'arraybuffer').then(function(fab) {
-                                if (!fab) {
-                                    loadedCb();
-                                    return;
-                                }
-                                files[file] = new Blob([fab], {
-                                    'type': mime.mime
-                                });
-                                loadedCb();
-                            }).catch(function() {
-                                loadedCb();
-                            });
-                        }
-                    }
+                controlPkg[config.name].files[pre + file.name] = new Blob([fab], {
+                    'type': mime.mime
                 });
-                controlPkg[control.name] = {
-                    'type': 'control',
-                    'config': config,
-                    'files': files
-                };
-                controlCb();
-            }).catch(function() {
-                controlCb();
-            });
+            }
         }
-    });
+    }
     return controlPkg;
 }
 
 /**
- * --- 任务创建过程中，需要对 control 进行先行初始化 ---
+ * --- 任务创建过程中，需要对 control 进行先行初始化，并将样式表插入到实际的任务 DOM 中 ---
  * @param taskId 要处理的任务 ID
  */
 export async function init(
-    taskId: number
-): Promise<boolean> {
+    taskId: number,
+    invoke: Record<string, any>
+): Promise<number> {
     const t = task.list[taskId];
     if (!t) {
-        return false;
+        return -1;
     }
-    for (let path of t.config.controls) {
+    for (let path of t.app.config.controls) {
         if (!path.endsWith('.cgc')) {
             path += '.cgc';
         }
@@ -409,7 +380,7 @@ export async function init(
                     t.controls[name].layout = item.files[item.config.layout + '.html'] as string;
                     if (t.controls[name].layout === undefined) {
                         // --- 控件没有 layout 那肯定不能用 ---
-                        return false;
+                        return -2;
                     }
                     // --- 给 layout 增加 data-cg-control-xxx ---
                     t.controls[name].layout = t.controls[name].layout.replace(/^(<[a-zA-Z0-9-]+)( |>)/, '$1 data-cg-control-' + name + '$2');
@@ -440,6 +411,10 @@ export async function init(
                     }
                     // --- 给 event 增加包裹 ---
                     t.controls[name].layout = tool.eventsAttrWrap(t.controls[name].layout);
+                    // --- 给 teleport 做处理 ---
+                    if (t.controls[name].layout.includes('<teleport')) {
+                        t.controls[name].layout = tool.teleportGlue(t.controls[name].layout, '{{{formId}}}');
+                    }
                     // --- 检测是否有 js ---
                     let cls: any;
                     if (item.files[item.config.code + '.js']) {
@@ -448,7 +423,7 @@ export async function init(
                         try {
                             expo = loader.require(item.config.code, item.files, {
                                 'dir': '/',
-                                'invoke': t.invoke,
+                                'invoke': invoke,
                                 'preprocess': function(code: string, path: string): string {
                                     // --- 屏蔽 eval 函数 ---
                                     const exec = /eval\W/.exec(code);
@@ -473,12 +448,12 @@ export async function init(
                         }
                         catch (e: any) {
                             core.trigger('error', taskId, 0, e, e.message + '(-4)');
-                            return false;
+                            return -3;
                         }
                         if (!expo?.default) {
                             const msg = '"default" not found on "' + item.config.code + '" of "' + name + '" control.';
                             core.trigger('error', taskId, 0, new Error(msg), msg);
-                            return false;
+                            return -4;
                         }
                         cls = new expo.default();
                     }
@@ -501,6 +476,7 @@ export async function init(
                     const cdata = Object.entries(cls);
                     for (const item of cdata) {
                         if (item[0] === 'access') {
+                            // --- access 属性不放在 data 当中 ---
                             t.controls[name].access = item[1] as any;
                             continue;
                         }
@@ -543,13 +519,11 @@ export async function init(
                     'content': 'Control failed to load.\nTask id: ' + t.id.toString() + '\nPath: ' + path,
                     'type': 'danger'
                 });
-                return false;
+                return -5;
             }
         }
     }
-    t.invoke = undefined;
-    delete t.invoke;
-    return true;
+    return 1;
 }
 
 /**
@@ -597,13 +571,16 @@ export function buildComponents(
                 });
             }
         };
-        // --- 为什么要用 ?.(), 因为有些控件是没有 js 文件的，没有 Control 类继承 ---
         components['cg-' + name] = {
-            'template': control.layout,
+            'template': control.layout.replace(/{{{formId}}}/g, formId.toString()),
             'props': control.props,
 
             'data': function() {
-                return tool.clone(control.data);
+                const data = tool.clone(control.data);
+                if (data.props) {
+                    delete data.props;
+                }
+                return tool.clone(data);
             },
             'methods': control.methods,
             'computed': computed,
@@ -611,6 +588,7 @@ export function buildComponents(
             beforeCreate: control.methods.onBeforeCreate,
             created: function() {
                 this.props = this.$props;
+                this.slots = this.$slots;
                 this.access = tool.clone(control.access);
                 this.onCreated();
             },