@cloudbase/lowcode-builder 1.7.1 → 1.8.1

package/lib/builder/h5/generate.d.ts

@@ -6,9 +6,10 @@ import { BuildType } from '../types/common';
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateHTML({ appId, envId, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
+export declare function generateHTML({ appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
     appId: string;
     envId: string;
+    description?: string;
     externalResources: Required<IPlatformApp>['externalResources'];
     appBuildDir: string;
     mode: string;

package/lib/builder/h5/generate.js

@@ -25,7 +25,7 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
-async function generateHTML({ appId, envId, appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
+async function generateHTML({ appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
     const dstFilePath = path_1.default.join(appBuildDir, 'index.html');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
@@ -46,7 +46,7 @@ async function generateHTML({ appId, envId, appBuildDir, externalResources = [],
     await fs_extra_1.default.writeFile(dstFilePath, (0, lodash_1.template)(packageTpl)({
         appId,
         title: '',
-        desc: 'WeDa构建的应用',
+        desc: description,
         canUseVite: (0, util_1.canUseVite)(mode, devTool),
         jsApis: Array.from(new Set(jsApis.filter((item) => !!item))),
         cssStyles: Array.from(new Set(cssStyles.filter((item) => !!item))),

package/lib/builder/h5/webpack.js

@@ -29,6 +29,7 @@ async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir,
     await (0, generate_1.generateHTML)({
         appId: mainAppData.id || appKey,
         envId: mainAppData.envId || '',
+        description: cals.description || '',
         appBuildDir,
         externalResources: (cals.externalResources || []).concat(assets.map((url) => ({
             type: cals_1.EExternalResourceType.CSSUrl,

package/lib/builder/mp/index.js

@@ -118,11 +118,13 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
                 debug: buildContext.debugMode,
             },
             'common/data-patch.js': {},
-            'common/event-emitter.js': {},
+            'common/event-emitter.ts': {},
             'common/watch.js': {},
             'common/constant.js': {
                 REPEATER: JSON.stringify(config_1.REPEATER, undefined, 2),
             },
+            'common/query.ts': {},
+            'common/flow.ts': {},
             /**
              * 调试用
              */
@@ -311,7 +313,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
         console.log(`Generating ${em('page')} files`);
         (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
         await Promise.all(weapp.pageInstanceList.map(async (page) => {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
@@ -323,17 +325,17 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
             const pageFileData = {
                 [`api.js|api.js`]: {
                     subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
+                    uuid: rootPath ? `${rootPath}/${page.id}` : page.id,
+                    label: ((_b = (_a = page === null || page === void 0 ? void 0 : page.data) === null || _a === void 0 ? void 0 : _a.navigationBarTitleText) === null || _b === void 0 ? void 0 : _b.value) || ((_d = (_c = page === null || page === void 0 ? void 0 : page.data) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.value),
                 },
                 [`data.js|data.js`]: {
                     widgetProps: (0, util_2.createWidgetProps)(ctx, componentInstances),
                     stringifyObj: util_1.inspect,
                 },
                 [`index.js|${pageFileName}.js`]: {
-                    pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,
                     pageName: page.id,
-                    pageTitle: ((_b = (_a = page === null || page === void 0 ? void 0 : page.data) === null || _a === void 0 ? void 0 : _a.navigationBarTitleText) === null || _b === void 0 ? void 0 : _b.value) || ((_d = (_c = page === null || page === void 0 ? void 0 : page.data) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.value),
                     pageSource: page.data.src || '',
-                    eventHanlders: (0, util_2.createEventHanlders)(ctx, componentInstances, 'this', page),
+                    eventHandlers: (0, util_2.createEventHandlers)(ctx, componentInstances, 'this', page),
                     dataBinds: (0, util_2.createDataBinds)(ctx, componentInstances),
                     pageAttributes: {
                         ...(((_e = page.data) === null || _e === void 0 ? void 0 : _e.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {}),
@@ -342,6 +344,8 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     stringifyObj: util_1.inspect,
                     subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
                     importor,
+                    query: (0, util_2.createTemplateQuery)(ctx, (_f = page.dataset) === null || _f === void 0 ? void 0 : _f.query),
+                    eventFlows: (0, util_2.createTemplateEventFlows)(ctx, page.eventFlows),
                 },
                 [`index.json|${pageFileName}.json`]: {
                     usingComponents,
@@ -352,7 +356,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     content: wxml,
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
-                    subWxss: rootPath && !((_f = ctx.mainAppData) === null || _f === void 0 ? void 0 : _f.mpPkgUrl)
+                    subWxss: rootPath && !((_g = ctx.mainAppData) === null || _g === void 0 ? void 0 : _g.mpPkgUrl)
                         ? `@import "${path_1.default.posix.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
@@ -369,7 +373,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
     }
 }
 async function generateFramework(ctx, appData, outDir, options) {
-    var _a;
+    var _a, _b;
     let fileData = {};
     if (appData.mpPkgUrl) {
         if (!appData.rootPath) {
@@ -382,6 +386,8 @@ async function generateFramework(ctx, appData, outDir, options) {
                     subPackageName: '',
                     importor: (0, util_3.generateLowcodeImportor)([]),
                     appConfig: JSON.stringify({}),
+                    appQuery: {},
+                    stringifyObj: util_1.inspect,
                 },
             };
         }
@@ -421,6 +427,8 @@ async function generateFramework(ctx, appData, outDir, options) {
                             type: item.data.isCustomLoginPage ? 'login' : '',
                         })),
                     }),
+                    appQuery: (0, util_2.createTemplateQuery)(ctx, (_b = appData.dataset) === null || _b === void 0 ? void 0 : _b.query),
+                    stringifyObj: util_1.inspect,
                 },
                 'app/common.js': {
                     mods: appData.lowCodes
@@ -535,12 +543,12 @@ async function cleanPkg(pkg, miniprogramRoot) {
         else {
             // #2 clean deleted handlers
             const handlersDir = path_1.default.join(lowcodeDir, 'handler');
-            const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => `${m.name}.js`)) || [];
+            const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === cals_1.ECodeType.HANDLER_FN)) === null || _d === void 0 ? void 0 : _d.map((m) => `${m.name}.js`)) || [];
             (0, generateFiles_1.cleanDir)(handlersDir, handlers);
         }
     });
     // #3 clean deleted common modules
-    const commonModules = pkg.lowCodes.filter((m) => m.type === 'normal-module').map((m) => `${m.name}.js`);
+    const commonModules = pkg.lowCodes.filter((m) => m.type === cals_1.ECodeType.NORMAL_MODULE).map((m) => `${m.name}.js`);
     const commonDir = path_1.default.join(lowcodesDir, 'common');
     (0, generateFiles_1.cleanDir)(commonDir, commonModules);
 }

package/lib/builder/mp/materials.js

@@ -287,7 +287,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
             handlers: compositedComp.lowCodes
                 .filter((m) => m.type === cals_1.ECodeType.HANDLER_FN && m.name !== cals_1.ECodeName.PLACEHOLDER)
                 .map((m) => m.name),
-            eventHandlers: (0, util_3.createEventHanlders)(compositeCtx, componentInstances, weapps_core_1.COMPONENT_API_PREFIX),
+            eventHandlers: (0, util_3.createEventHandlers)(compositeCtx, componentInstances, weapps_core_1.COMPONENT_API_PREFIX),
             // protectEventKeys: builtinMpEvents,
             emitEvents: compositedComp.emitEvents.map((evt) => evt.eventName),
             widgetProps: (0, util_3.createWidgetProps)(compositeCtx, componentInstances),
@@ -304,8 +304,6 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         },
         'index.json': { usingComponents, componentGenerics },
         'index.wxml': {
-            // raw: JSON.stringify(page.componentInstances),
-            // wrapperClass: getCompositedComponentClass(compositedComp),
             content: wxml,
         },
         'index.wxss': {

package/lib/builder/mp/util.d.ts

@@ -1,15 +1,15 @@
-import { IDynamicValue, IWeAppComponentInstance, ActionType, ICompositedComponent, IWeAppPage, IEventListener } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IDynamicValue, IWeAppComponentInstance, ActionType, ICompositedComponent, IWeAppPage, IEventListener, IQueryData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 export declare function generatedDynamicData(data: {
     [key: string]: IDynamicValue;
-}, compInfo?: ICompositedComponent): {
+}, compInfo?: ICompositedComponent, filterBuiltInProps?: boolean): {
     staticProps: {};
     boundProps: {};
 };
 export declare function createWidgetProps(ctx: IBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }): {};
-export declare function createEventHanlders(ctx: IBuildContext, widgets: {
+export declare function createEventHandlers(ctx: IBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }, componentApi: string, page?: IWeAppPage): {};
 export declare function generateSyncListeners(syncConfigs: any): IEventListener[];
@@ -19,6 +19,10 @@ export declare function generateDataContainerListeners(): {
     type: ActionType;
     data: {};
 }[];
+export declare function createTemplateQuery(ctx: IBuildContext, query?: {
+    [key: string]: IQueryData;
+}): {};
+export declare function createTemplateEventFlows(ctx: IBuildContext, eventFlows?: any[]): any[];
 export declare function createDataBinds(ctx: IBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }): {};

package/lib/builder/mp/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComponentInfo = exports.processRepeaterSchema = exports.createDataBinds = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHanlders = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.findComponentInfo = exports.processRepeaterSchema = exports.createDataBinds = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
@@ -24,11 +24,11 @@ function extractWidgetProps(props, compInfo, processCssUnit = 'rpx') {
     }
     return staticProps;
 }
-function generatedDynamicData(data, compInfo) {
+function generatedDynamicData(data, compInfo, filterBuiltInProps = true) {
     const staticProps = {};
     const boundProps = {};
     for (const key of Object.keys(data)) {
-        if (mp_1.builtinWigetProps.indexOf(key) > -1)
+        if (filterBuiltInProps && mp_1.builtinWigetProps.indexOf(key) > -1)
             continue;
         const { type, value } = data[key];
         if (!type || type === 'static') {
@@ -138,7 +138,7 @@ function createWidgetProps(ctx, widgets) {
     return widgetProps;
 }
 exports.createWidgetProps = createWidgetProps;
-function createEventHanlders(ctx, widgets, componentApi, page) {
+function createEventHandlers(ctx, widgets, componentApi, page) {
     let eventHandlers = {};
     const { listeners: pageListeners = [], id: pageId = '' } = page || {};
     (0, weapp_1.walkThroughWidgets)(widgets, (id, widget, parentId) => {
@@ -177,7 +177,7 @@ function createEventHanlders(ctx, widgets, componentApi, page) {
     eventHandlers = Object.assign(eventHandlers, getListenersHandlers(pageListeners, pageId, componentApi));
     return eventHandlers;
 }
-exports.createEventHanlders = createEventHanlders;
+exports.createEventHandlers = createEventHandlers;
 function generateSyncListeners(syncConfigs) {
     const listeners = [];
     for (const valuProp in syncConfigs) {
@@ -201,8 +201,8 @@ function generateDataContainerListeners() {
             trigger: 'onDataChange',
             jsCode: `({event})=>{
       if(event.currentTarget) {
-        app.utils.set(event.currentTarget._scope, 'dataContext.data', event?.detail?.data);
-        app.utils.set(event.currentTarget._scope, 'dataContext.state', event?.detail?.state);
+        $app.utils.set(event.currentTarget._scope, 'dataContext.data', event?.detail?.data);
+        $app.utils.set(event.currentTarget._scope, 'dataContext.state', event?.detail?.state);
       }
     }`,
             type: weapps_core_1.ActionType.Inline,
@@ -211,6 +211,31 @@ function generateDataContainerListeners() {
     ];
 }
 exports.generateDataContainerListeners = generateDataContainerListeners;
+function createTemplateQuery(ctx, query = {}) {
+    return Object.entries(query).reduce((map, [key, item]) => {
+        const { method, listeners, ...rest } = item;
+        const { staticProps, boundProps } = generatedDynamicData(method.params || {}, undefined, false);
+        map[key] = {
+            ...rest,
+            methodName: method.name,
+            data: staticProps,
+            dataBinds: boundProps,
+            eventHandlers: getListenersHandlers(listeners, item.id, 'this'),
+        };
+        return map;
+    }, {});
+}
+exports.createTemplateQuery = createTemplateQuery;
+function createTemplateEventFlows(ctx, eventFlows = []) {
+    return eventFlows.map((item) => {
+        const { listeners = [], ...rest } = item;
+        return {
+            ...rest,
+            eventHandlers: getListenersHandlers(listeners, item.id, 'this'),
+        };
+    });
+}
+exports.createTemplateEventFlows = createTemplateEventFlows;
 /**
  * 根据 listeners 创建 handlers
  * @param listeners {IEventListener[]}
@@ -223,31 +248,46 @@ function getListenersHandlers(listeners, id, componentApi) {
     const eventHandlers = {};
     listeners.forEach((l) => {
         var _a, _b, _c, _d, _e;
-        const handlerName = (0, wxml_1.getMpEventHanlderName)(id, l.trigger, l);
+        const handlerName = (0, wxml_1.getMpEventHandlerName)(id, l.trigger, l);
+        const sourceKey = `${((_a = l.handler) === null || _a === void 0 ? void 0 : _a.moduleName) || ''}:${((_b = l.handler) === null || _b === void 0 ? void 0 : _b.name) || ''}`;
         eventHandlers[handlerName] = eventHandlers[handlerName] || [];
-        const params = generatedDynamicData(l.data);
+        const { staticProps, boundProps } = generatedDynamicData(l.data, undefined, false);
         let handler = l.handler ? l.handler.name : l.jsCode;
         switch (l.type) {
             case weapps_core_1.ActionType.Platform: {
-                handler = `function({data}){ return app.${(_a = l.handler) === null || _a === void 0 ? void 0 : _a.name}(data)}`;
+                handler = '';
+                switch (sourceKey) {
+                    case `${weapps_core_1.ActionType.Platform}:callNanoFlow`: {
+                        handler = `function({data}){ return $w[data.id]?.trigger?.(data.data)}`;
+                        break;
+                    }
+                    case `${weapps_core_1.ActionType.Platform}:callQuery`: {
+                        handler = `function({data}){ return $w[data.id]?.trigger?.()}`;
+                        break;
+                    }
+                    default: {
+                        handler = `function({data}){ return $app.${(_c = l.handler) === null || _c === void 0 ? void 0 : _c.name}(data)}`;
+                        break;
+                    }
+                }
                 break;
             }
             case weapps_core_1.ActionType.DataSource: {
-                handler = `function({data}){ return app.cloud.callDataSource(data)}`;
+                handler = `function({data}){ return $app.cloud.callDataSource(data)}`;
                 break;
             }
             case weapps_core_1.ActionType.PropEvent: {
-                handler = `function({event, data = {}}){ return ${componentApi}.props.events.${(_b = l.handler) === null || _b === void 0 ? void 0 : _b.name}({...event.detail, ...data}) }`;
+                handler = `function({event, data = {}}){ return ${componentApi}.props.events.${(_d = l.handler) === null || _d === void 0 ? void 0 : _d.name}({...event.detail, ...data}) }`;
                 break;
             }
         }
         eventHandlers[handlerName].push({
             key: l.key || '',
             handler,
-            handlerModule: (_c = l.handler) === null || _c === void 0 ? void 0 : _c.moduleName,
-            sourceKey: `${((_d = l.handler) === null || _d === void 0 ? void 0 : _d.moduleName) || ''}:${((_e = l.handler) === null || _e === void 0 ? void 0 : _e.name) || ''}`,
-            data: params.staticProps,
-            boundData: params.boundProps,
+            handlerModule: (_e = l.handler) === null || _e === void 0 ? void 0 : _e.moduleName,
+            sourceKey,
+            data: staticProps,
+            boundData: boundProps,
             type: l.type,
         });
     });

package/lib/builder/mp/wxml.d.ts

@@ -5,7 +5,7 @@ export declare function generateWxml(ctx: IBuildContext & {
 }, widgets: {
     [key: string]: IWeAppComponentInstance;
 }, docTag: string, wxmlDataPrefix: any, usingComponents: any, componentGenerics: any, nodeTransform?: (cmp: IWeAppComponentInstance, node: any) => void): string;
-export declare function getMpEventHanlderName(widgetId: string, evtName: string, modifier?: IEventModifiers): string;
+export declare function getMpEventHandlerName(widgetId: string, evtName: string, modifier?: IEventModifiers): string;
 export declare function getUsedComponents(widgets: {
     [key: string]: IWeAppComponentInstance;
 }, usedCmps?: {

package/lib/builder/mp/wxml.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsedComponents = exports.getMpEventHanlderName = exports.generateWxml = void 0;
+exports.getUsedComponents = exports.getMpEventHandlerName = exports.generateWxml = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const xml_js_1 = require("xml-js");
@@ -249,7 +249,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
             processedListeners.forEach((l) => {
                 const evtName = getMpEventName(l.trigger);
                 const modifiers = l;
-                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
+                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHandlerName(id, evtName, modifiers);
             });
             if (compConfig === null || compConfig === void 0 ? void 0 : compConfig.pluginConfig) {
                 if (compConfig.pluginConfig.attributes) {
@@ -345,14 +345,14 @@ function getMpEventName(originalName) {
     // 模板中也有部分依赖保持相同的连字符(_)，更改时注意同步修改
     return evtNameMap[originalName] || originalName.replace(/\./g, '_');
 }
-function getMpEventHanlderName(widgetId, evtName, modifier = {}) {
+function getMpEventHandlerName(widgetId, evtName, modifier = {}) {
     // Only builtin events have will bubble
     if (mp_1.builtinMpEvents.indexOf(evtName) === -1) {
         modifier = {};
     }
     return `on${widgetId}$${getMpEventName(evtName)}${modifier.isCapturePhase ? '$cap' : ''}${modifier.noPropagation ? '$cat' : ''}`;
 }
-exports.getMpEventHanlderName = getMpEventHanlderName;
+exports.getMpEventHandlerName = getMpEventHandlerName;
 /* onid3click,  */
 function getMpEventAttr(evtName, modifier, tagName) {
     // Only builtin events have will bubble

package/lib/flow.d.ts

@@ -19,12 +19,14 @@ export declare class EventFlow {
             /**
              * 预处理后 event handler listeners
              */
-            listeners?: any[];
+            eventHandlers?: Record<string, any>;
         };
         context: IEventFlowContext;
         options?: IMPEventFlowGenerateOptions;
     });
     trigger(additionalScope: any, options?: Partial<IEventFlowContext>): any;
 }
-export declare function generateEventFlows(flows: never[] | undefined, context: IEventFlowContext, options?: IMPEventFlowGenerateOptions): {};
+export declare function generateEventFlows(flows: {
+    id: string;
+}[] | undefined, context: IEventFlowContext, options?: IMPEventFlowGenerateOptions): {};
 export {};

package/lib/flow.js

@@ -7,12 +7,10 @@ class EventFlow {
     constructor({ schema, context, options, }) {
         this._eventHandlerMap = {};
         this._context = context;
-        const { id, description, listeners = [] } = schema || {};
-        const startNode = listeners[0];
-        const [_, eventFlowId] = (startNode === null || startNode === void 0 ? void 0 : startNode.eventName.match(/(.*?)\.start/)) || [];
-        this.id = id || eventFlowId;
-        this.description = description || (startNode === null || startNode === void 0 ? void 0 : startNode.description) || '';
-        const handlers = (0, util_1.createEventHandlers)(listeners, {
+        const { id, description, eventHandlers = {} } = schema || {};
+        this.id = id || '';
+        this.description = description || '';
+        const handlers = (0, util_1.createEventHandlers)(eventHandlers, {
             looseError: (options === null || options === void 0 ? void 0 : options.looseError) || false,
             isComposite: (options === null || options === void 0 ? void 0 : options.isComposite) || false,
         });
@@ -54,7 +52,6 @@ class EventFlow {
 exports.EventFlow = EventFlow;
 function generateEventFlows(flows = [], context, options) {
     const result = {};
-    return result;
     for (let flow of flows) {
         result[flow.id] = new EventFlow({ schema: flow, context, options });
     }

package/lib/query.d.ts

@@ -11,7 +11,7 @@ interface IMPDataSourceQuery {
     /**
      * 预处理后 event handler listeners
      */
-    listeners?: any[];
+    eventHandlers?: Record<string, any>;
 }
 declare type IQueryContext = any;
 declare type IGenerateOptions = any;
@@ -26,6 +26,7 @@ export declare class Query {
     private _currentRequestKey;
     private _observableValue;
     private _eventHandlerMap;
+    private _timer;
     constructor({ schema, context, options, }: {
         schema: IMPDataSourceQuery;
         context: IQueryContext;

package/lib/query.js

@@ -5,7 +5,7 @@ const mobx_1 = require("mobx");
 const util_1 = require("./util");
 const event_emitter_1 = require("./event-emitter");
 class Query {
-    constructor({ schema, context, options, }) {
+    constructor({ schema, context, options = {}, }) {
         var _a, _b;
         this._disposes = [];
         this._dataBinds = {};
@@ -14,17 +14,6 @@ class Query {
         this._currentRequestKey = null;
         this._observableValue = (0, mobx_1.observable)({ data: null, error: null });
         this._eventHandlerMap = {};
-        this._debounceTrigger = (function () {
-            let timer = null;
-            return function (...args) {
-                if (timer) {
-                    clearTimeout(timer);
-                }
-                timer = setTimeout(() => {
-                    this._innerTrigger(...args);
-                }, 300);
-            };
-        })();
         const { looseError = false, useScopeWidgetData = false } = options;
         const { $w, $app, $page } = context;
         this._schema = schema;
@@ -59,7 +48,7 @@ class Query {
                 params: data,
             });
         };
-        this._eventHandlerMap = Object.entries((0, util_1.createEventHandlers)(this._schema.listeners || [], {
+        this._eventHandlerMap = Object.entries((0, util_1.createEventHandlers)(this._schema.eventHandlers || {}, {
             looseError: looseError,
             isComposite: false,
         })).reduce((map, [key, fn]) => {
@@ -132,6 +121,14 @@ class Query {
             throw e;
         }
     }
+    _debounceTrigger(...args) {
+        if (this._timer) {
+            clearTimeout(this._timer);
+        }
+        this._timer = setTimeout(() => {
+            this._innerTrigger(...args);
+        }, 300);
+    }
     destroy() {
         this._disposes.forEach((dispose) => dispose());
     }
@@ -166,7 +163,6 @@ class Query {
 exports.Query = Query;
 function generateDatasetQuery(schema, context, options) {
     const result = {};
-    return result;
     for (const key in schema) {
         result[key] = new Query({ schema: schema[key], context, options });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.5",
-    "@cloudbase/lowcode-generator": "^1.7.1",
+    "@cloudbase/cals": "^1.0.6",
+    "@cloudbase/lowcode-generator": "^1.8.0",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -549,7 +549,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.bd132ac7897700329255.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.ca44c59c8e73e409892e.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -3,8 +3,10 @@ import { createMpApp } from '@cloudbase/weda-client';
 import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
+
 import lodashGet from 'lodash.get';
 import config from '<%= subLevelPath %>../common/config';
+import { generateDatasetQuery } from '../common/util';
 
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
@@ -13,6 +15,54 @@ import config from '<%= subLevelPath %>../common/config';
 
 const mainAppKey = '__weappsMainApp'
 
+<% function printBoundData(boundData={}) {
+  /**
+   * TODO: copy 过来的代码
+   * 一些模板层面的工具应该如何复用？
+   */
+  const list = []
+  Object.entries(boundData).map(([prop, bindMeta])=>{
+    const str = `'${prop}': ($app, lists, forItems, event, $context, $w) => {${bindMeta.imports} return(
+      ${bindMeta.expression === '' ? 'undefined': bindMeta.expression}
+    )}`
+    list.push(str)
+  })
+  return list.join(',')
+}%>
+<% function printEventHandler(eventHandlers) {
+  /**
+   * TODO: copy 过来的代码
+   * 一些模板层面的工具应该如何复用？
+   */
+  Object.entries(eventHandlers).map(([handlerName, listeners])=>{
+    print(`"${handlerName}": [
+      ${listeners.map(l=>{
+        let handler = 'undefined'
+        switch(l.type){
+          case 'rematch': {
+            handler = `handlers.${l.handler}`
+            break;
+          }
+          case 'material': {
+            handler = `function(...args) { return require('/materials/${l.handlerModule}/actions/${l.handler}/index').default(...args) }`
+            break;
+          }
+          default: {
+            handler = l.handler
+          }
+        }
+        return `{
+          key: '${l.key||''}',
+          sourceKey: '${ l.sourceKey||"" }',
+          handler: ${handler},
+          data: ${stringifyObj(l.data||{}, {depth: null})},
+          boundData: {${printBoundData(l.boundData)}}
+        }`
+      }).join(',')}
+    ],`)
+  })
+}%>
+
 export const app = createGlboalApi()
 export const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
 export const $w = new Proxy(
@@ -60,6 +110,16 @@ function createGlboalApi() {
   }
 
   let dataset = createDataset('$global')
+  dataset.query = generateDatasetQuery({<% Object.entries(appQuery).map(([id, item])=>{%>
+    <%= id %>: { <% const { dataBinds, eventHandlers, ...rest } = item %>
+      ...(<%= stringifyObj(rest, {depth: null}) %>),
+      dataBinds: {<%= printBoundData(dataBinds) %>},
+      eventHandlers: {<% printEventHandler(eventHandlers) %>}
+    },<%}) %>
+  }, {
+    $app: globalAPI,
+    $w: globalAPI.__internal__.$w,
+  })
   globalAPI.dataset = dataset
   globalAPI.state.dataset = dataset
   globalAPI.setState = (userSetState) => {

package/template/mp/app.js

@@ -103,6 +103,15 @@ App({
         } catch (e) {
           throw e;
         } finally {
+          for (const queryId in app.dataset?.query||{}) {
+            if (app.dataset.query[queryId]?._schema?.trigger === 'auto') {
+              try {
+                app.dataset?.query?.[queryId]?.trigger?.();
+              } catch (e) {
+                console.error(`query ${queryId} 初始化失败：`, e);
+              }
+            }
+          }
           resolve()
         }
       })