@cloudbase/lowcode-builder 1.8.105 → 1.8.107

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.getMpEventHandlerName = exports.generateWxml = exports.WD_RUNTIME_TAG = exports.WD_EMPTY_PLACEHOLDER = void 0;
+exports.generateComponentPlaceholder = 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");
@@ -17,7 +17,7 @@ exports.WD_EMPTY_PLACEHOLDER = 'wd-ph';
 const WD_INFO = 'wd-info';
 exports.WD_RUNTIME_TAG = [exports.WD_EMPTY_PLACEHOLDER, WD_INFO];
 const error = chalk_1.default.redBright;
-function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, componentGenerics, nodeTransform) {
+function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, componentGenerics, nodeTransform, mode = 'inline') {
     const nameMangler = ctx.isProduction ? new name_mangler_1.default({ blackList: mp_1.builtinMpTags }) : undefined;
     const xmlJson = {
         elements: createXml(widgets),
@@ -38,8 +38,8 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         xmlJson.elements = [pageMeta];
         // usingComponents['wd-privacy'] = '/common/privacyModal/index';
         usingComponents[WD_INFO] = path_1.default.posix.join('/', ctx.wedaRoot || '', '/common/info/index');
-        if (enableAsyncMaterials) {
-            usingComponents[exports.WD_EMPTY_PLACEHOLDER] = path_1.default.posix.join('/', ctx.wedaRoot || '', '/common/placeholder/index');
+        if (enableAsyncMaterials || mode === 'lib') {
+            usingComponents[exports.WD_EMPTY_PLACEHOLDER] = '@cloudbase/weda-client/mp/runtime/placeholder/index';
         }
         if (disabled && ctx.pageUUID !== ctx.statusPageId) {
             pageMeta.elements = [
@@ -223,7 +223,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     console.error(error(`Component(${xComponent.name}) not found in lib(${xComponent.moduleName}). ${helpMsg}`));
                     continue;
                 }
-                const meta = (0, materials_1.getWxmlTag)(ctx, xComponent, nameMangler);
+                const meta = (0, materials_1.getWxmlTag)(ctx, xComponent, nameMangler, mode);
                 tagName = meta.tagName;
                 path = meta.path;
             }
@@ -313,7 +313,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                         // handle generic component, https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/generics.html
                         const passedComp = data[prop].value;
                         const [libName, compName] = passedComp.split(':');
-                        const { tagName, path } = (0, materials_1.getWxmlTag)(ctx, { moduleName: libName, name: compName }, nameMangler);
+                        const { tagName, path } = (0, materials_1.getWxmlTag)(ctx, { moduleName: libName, name: compName }, nameMangler, mode);
                         node.attributes[`generic:${getGenericCompTagName(prop)}`] = tagName;
                         usingComponents[tagName] = path;
                         continue;
@@ -327,7 +327,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
             /**
              * 来自外部引用的组件，添加系统系别的事件绑定
              */
-            if (componentGenerics[tagName] || usingComponents[tagName]) {
+            if ((componentGenerics[tagName] || usingComponents[tagName]) && !ctx.disablePageComponentInvoke) {
                 node.attributes['bind:attached'] = '__mnt__';
                 node.attributes['bind:detached'] = '__unmnt__';
             }
@@ -507,3 +507,16 @@ function isGlobalAttr(prop = '') {
     ];
     return globalAttrs.indexOf(prop) > -1 || prop.startsWith('data-') || prop.startsWith('aria-');
 }
+function generateComponentPlaceholder(usingComponents) {
+    let componentPlaceholder;
+    if (usingComponents[exports.WD_EMPTY_PLACEHOLDER]) {
+        componentPlaceholder = Object.keys(usingComponents).reduce((map, key) => {
+            if (!exports.WD_RUNTIME_TAG.includes(key)) {
+                map[key] = exports.WD_EMPTY_PLACEHOLDER;
+            }
+            return map;
+        }, {});
+    }
+    return componentPlaceholder;
+}
+exports.generateComponentPlaceholder = generateComponentPlaceholder;