@cloudbase/lowcode-builder 1.8.58 → 1.8.60

package/lib/builder/mp/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateScopedStyleText = exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.generateScopedStyleText = exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.generateArgsDynamicValueFromData = 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");
@@ -8,6 +8,7 @@ const wxml_1 = require("./wxml");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const cals_1 = require("@cloudbase/cals");
 const config_1 = require("../config");
+const lodash_1 = require("lodash");
 function extractWidgetProps(props, compInfo, processCssUnit = 'rpx') {
     var _a, _b, _c;
     const { classList, staticResourceAttribute = [], data = {}, style } = props;
@@ -177,10 +178,10 @@ function createEventHandlers(ctx, widgets, componentApi, page) {
         if ((_a = compProto === null || compProto === void 0 ? void 0 : compProto.compConfig) === null || _a === void 0 ? void 0 : _a.isDataContainer) {
             listeners.unshift(...generateDataContainerListeners());
         }
-        eventHandlers = Object.assign(eventHandlers, getListenersHandlers(listeners, id, componentApi));
+        eventHandlers = Object.assign(eventHandlers, getListenersHandlers(ctx, listeners, id, componentApi));
     });
     // 增加页面事件节点 handlers
-    eventHandlers = Object.assign(eventHandlers, getListenersHandlers(pageListeners, pageId, componentApi));
+    eventHandlers = Object.assign(eventHandlers, getListenersHandlers(ctx, pageListeners, pageId, componentApi));
     return eventHandlers;
 }
 exports.createEventHandlers = createEventHandlers;
@@ -219,14 +220,14 @@ function generateDataContainerListeners() {
 exports.generateDataContainerListeners = generateDataContainerListeners;
 function createTemplateQuery(ctx, query = {}) {
     return Object.entries(query).reduce((map, [key, item]) => {
-        const { listeners = [], handler, data, ...rest } = item;
-        const { staticProps, boundProps } = generatedDynamicData(data || {}, undefined, false);
+        const { listeners = [], handler, data, args, ...rest } = item;
+        const { staticProps, boundProps } = generatedDynamicData(generateArgsDynamicValueFromData(args, data) || {}, undefined, false);
         map[key] = {
             ...rest,
             handler: `(...args) => $app.${handler === null || handler === void 0 ? void 0 : handler.name}(...args)`,
             data: staticProps,
             dataBinds: boundProps,
-            eventHandlers: getListenersHandlers(listeners, item.id, 'this'),
+            eventHandlers: getListenersHandlers(ctx, listeners, item.id, 'this'),
         };
         return map;
     }, {});
@@ -237,7 +238,7 @@ function createTemplateEventFlows(ctx, eventFlows = []) {
         const { listeners = [], ...rest } = item;
         return {
             ...rest,
-            eventHandlers: getListenersHandlers(listeners, item.id, 'this'),
+            eventHandlers: getListenersHandlers(ctx, listeners, item.id, 'this'),
         };
     });
 }
@@ -248,16 +249,17 @@ exports.createTemplateEventFlows = createTemplateEventFlows;
  * @param id {string}
  * @param componentApi {string}
  */
-function getListenersHandlers(listeners = [], id, componentApi) {
+function getListenersHandlers(ctx, listeners = [], id, componentApi) {
     if (!id)
         return {};
+    const { enableAsyncMaterials = false } = ctx;
     const eventHandlers = {};
     listeners.forEach((l) => {
         var _a, _b, _c, _d, _e;
         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 { staticProps, boundProps } = generatedDynamicData(l.data, undefined, false);
+        const { staticProps, boundProps } = generatedDynamicData(generateArgsDynamicValueFromData(l.args, l.data) || {}, undefined, false);
         let handler = l.handler ? l.handler.name : l.jsCode;
         switch (l.type) {
             case weapps_core_1.ActionType.Platform: {
@@ -280,33 +282,71 @@ function getListenersHandlers(listeners = [], id, componentApi) {
                         break;
                     }
                     default: {
-                        handler = `function({data}){ return $app.${(_c = l.handler) === null || _c === void 0 ? void 0 : _c.name}(data)}`;
+                        handler = `function({args}){ return $app.${(_c = l.handler) === null || _c === void 0 ? void 0 : _c.name}(...args)}`;
                         break;
                     }
                 }
                 break;
             }
             case weapps_core_1.ActionType.DataSource: {
-                handler = `function({data}){ return $app.cloud.callDataSource(data)}`;
+                handler = `function({args}){ return $app.cloud.callDataSource(...args)}`;
                 break;
             }
             case weapps_core_1.ActionType.PropEvent: {
                 handler = `function({event, data = {}}){ return ${componentApi}.props.events.${(_d = l.handler) === null || _d === void 0 ? void 0 : _d.name}({...event.detail, ...data}) }`;
                 break;
             }
+            case weapps_core_1.ActionType.Rematch: {
+                handler = `handlers.${handler}`;
+                break;
+            }
+            case weapps_core_1.ActionType.GeneralFunc: {
+                handler = `function({args}) { return (\n${((_e = l.handler) === null || _e === void 0 ? void 0 : _e.code) || '()=>{}'}\n)(...args) }`;
+                break;
+            }
         }
+        let generateHandler = l.type === weapps_core_1.ActionType.Material
+            ? (subLevelPath) => {
+                var _a, _b;
+                const path = `${subLevelPath}../../${config_1.materialsDirName}/${(_a = l.handler) === null || _a === void 0 ? void 0 : _a.moduleName}/actions/${(_b = l.handler) === null || _b === void 0 ? void 0 : _b.name}/index`;
+                return enableAsyncMaterials
+                    ? `function(...args) { return require.async('${path}').then(mod=>mod.default(...args)) }`
+                    : `function(...args) { return require('${path}').default(...args) }`;
+            }
+            : (subLevelPath) => handler || 'undefined';
         eventHandlers[handlerName].push({
             key: l.key || '',
-            handler,
-            handlerModule: (_e = l.handler) === null || _e === void 0 ? void 0 : _e.moduleName,
+            generateHandler,
             sourceKey,
-            data: staticProps,
-            boundData: boundProps,
+            args: staticProps,
+            argsBinds: boundProps,
             type: l.type,
         });
     });
     return eventHandlers;
 }
+function generateArgsDynamicValueFromData(args, data) {
+    if (!args && data) {
+        const arg0 = {};
+        args = {};
+        Object.entries(data || {}).forEach(([key, value]) => {
+            if (!value.type || value.type === 'static') {
+                (0, lodash_1.set)(arg0, key, value.value);
+            }
+            else {
+                args[`params.0.${key}`] = value;
+            }
+        });
+        if (Object.keys(data || {})) {
+            args.params = {
+                type: 'static',
+                value: [arg0],
+            };
+        }
+    }
+    return args;
+}
+exports.generateArgsDynamicValueFromData = generateArgsDynamicValueFromData;
 function createDataBinds(ctx, widgets) {
     const dataBinds = {};
     const { processCssUnit = 'rpx' } = ctx;
@@ -495,9 +535,9 @@ function generateScopedStyleText(widgets) {
                     // 移除换行及其前后的空白符
                     .replace(/\s*\n\s*/g, '')
                     // 添加 `#wd-page-root` 前缀以增加样式权重
-                    .replace(/(:root.*?{)/g, '\n#wd-page-root $1')
-                    // 替换 `:root`
-                    .replace(/:root/g, `.wd-comp-id-${id}`)
+                    .replace(/(:scope.*?{)/g, '\n#wd-page-root $1')
+                    // 替换 `:scope`
+                    .replace(/:scope/g, `.wd-comp-id-${id}`)
                     // `: ` => `:`
                     .replace(/\s*:\s*/g, ':')
                     // ` {` => `{`

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

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

package/lib/builder/mp/wxml.js

@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsedComponents = exports.getMpEventHandlerName = exports.generateWxml = exports.WD_RUNTIME_TAG = exports.WD_EMPTY_PLACEHOLDER = void 0;
+exports.getMpEventHandlerName = exports.generateWxml = exports.WD_RUNTIME_TAG = exports.WD_EMPTY_PLACEHOLDER = 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");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const materials_1 = require("./materials");
-const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
 const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib/generator/util/name-mangler"));
 const config_1 = require("../config");
 const util_1 = require("./util");
@@ -24,14 +23,25 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
     };
     if (ctx.pageUUID) {
         const { enablePageRoot, disabled, enableAsyncMaterials } = ctx;
+        const pageMeta = {
+            name: 'page-meta',
+            type: 'element',
+            attributes: {
+                ['page-style']: '{{pageStyle}}',
+            },
+            elements: [],
+            _order: Infinity,
+            _parent: null,
+        };
         const originElements = xmlJson.elements;
+        xmlJson.elements = [pageMeta];
         // usingComponents['wd-privacy'] = '/common/privacyModal/index';
         usingComponents[WD_INFO] = '/common/info/index';
         if (enableAsyncMaterials) {
             usingComponents[exports.WD_EMPTY_PLACEHOLDER] = '/common/placeholder/index';
         }
         if (disabled && ctx.pageUUID !== ctx.statusPageId) {
-            xmlJson.elements = [
+            pageMeta.elements = [
                 {
                     type: 'element',
                     name: WD_INFO,
@@ -49,14 +59,14 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         }
         else {
             // 登录校验: 向其最外层包裹一层block
-            xmlJson.elements = [
+            pageMeta.elements = [
                 // {
                 //   type: 'element',
                 //   name: 'wd-privacy',
                 //   attributes: {},
                 //   elements: [],
                 //   _order: -Infinity,
-                //   _parent: null,
+                //   _parent: pageMeta,
                 // },
                 {
                     type: 'element',
@@ -100,11 +110,11 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     },
                     elements: [],
                     _order: Infinity,
-                    _parent: null,
+                    _parent: pageMeta,
                 },
             ];
             if (ctx.enableExpiredTag) {
-                xmlJson.elements.push({
+                pageMeta.elements.push({
                     type: 'element',
                     name: WD_INFO,
                     attributes: {
@@ -114,11 +124,11 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     },
                     elements: [],
                     _order: Infinity,
-                    _parent: null,
+                    _parent: pageMeta,
                 });
             }
             if (ctx.enableLoading) {
-                xmlJson.elements.push({
+                pageMeta.elements.push({
                     type: 'element',
                     name: WD_INFO,
                     attributes: {
@@ -127,7 +137,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     },
                     elements: [],
                     _order: Infinity,
-                    _parent: null,
+                    _parent: pageMeta,
                 });
             }
         }
@@ -433,32 +443,6 @@ function getEventBindSep(tagName) {
     // bind:input => bindinput 兼容微信 7.0.13 安卓版本 textarea 组件，bind:input 写法会导致事件失效
     return mp_1.nativeCompWhiteList.includes(tagName.toLowerCase()) ? '' : ':';
 }
-function getUsedComponents(widgets, usedCmps = {}) {
-    (0, weapp_1.walkThroughWidgets)(widgets, (id, widget) => {
-        const { xComponent, xProps = { data: null } } = widget;
-        if (!xComponent)
-            return;
-        const { moduleName, name } = xComponent;
-        if (!usedCmps[moduleName]) {
-            usedCmps[moduleName] = new Set();
-        }
-        usedCmps[moduleName].add(name);
-        // Handle generic component props
-        Object.keys(xProps.data || {}).map((p) => {
-            var _a;
-            const { value } = (_a = xProps.data) === null || _a === void 0 ? void 0 : _a[p];
-            if (/^\w+:\w+$/.test(value)) {
-                const [libName, name] = value.split(':');
-                if (!usedCmps[libName]) {
-                    usedCmps[libName] = new Set();
-                }
-                usedCmps[libName].add(name);
-            }
-        });
-    });
-    return usedCmps;
-}
-exports.getUsedComponents = getUsedComponents;
 function getAttrBind(dVale, widgetBind, isStaticResource, neg) {
     const { type, value } = dVale;
     const attrVal = type === weapps_core_1.PropBindType.prop ? value : widgetBind;