@cloudbase/lowcode-builder 1.8.58 → 1.8.59

package/lib/builder/mp/index.js

@@ -52,6 +52,7 @@ const junk = __importStar(require("../util/junk"));
 const net_1 = require("../util/net");
 const cals_1 = require("@cloudbase/cals");
 const core_1 = require("../core");
+const theme_1 = require("../../utils/theme");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
@@ -69,7 +70,7 @@ function patchBuildContext(ctx, calses, weapps) {
     return { allAppUsedComps };
 }
 async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, }) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${buildContext.projDir}`);
@@ -114,6 +115,12 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             endpointType,
         }, miniprogramRoot);
         const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
+        const cssVarList = Object.entries((0, theme_1.mergeCssVarConfig)((_b = (_a = calses[0]) === null || _a === void 0 ? void 0 : _a.theme) === null || _b === void 0 ? void 0 : _b.cssVarConfig, 'MP'))
+            .map(([key, _value]) => {
+            const value = _value || '';
+            return `${key}: ${value}${/;$/.test(value) ? '' : ';'}`;
+        })
+            .filter((str) => !!str) || [];
         appFileData = {
             ...appFileData,
             'common/style.js': {},
@@ -124,6 +131,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/widget.js': {},
             'common/weapp-page.js': {
                 expirationStartTimesnap,
+                pageStyle: cssVarList.join(''),
             },
             'common/weapp-component.js': {},
             'common/merge-renderer.js': {
@@ -226,9 +234,9 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
-                clientID: ((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.enableLoginStatusShare)
+                clientID: ((_c = mainAppData.extra) === null || _c === void 0 ? void 0 : _c.enableLoginStatusShare)
                     ? mainAppData.envId
-                    : (_b = mainAppData.extra) === null || _b === void 0 ? void 0 : _b.clientId,
+                    : (_d = mainAppData.extra) === null || _d === void 0 ? void 0 : _d.clientId,
                 cdnEndpoints,
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',

package/lib/builder/mp/wxml.js

@@ -24,14 +24,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 +60,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 +111,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 +125,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 +138,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     },
                     elements: [],
                     _order: Infinity,
-                    _parent: null,
+                    _parent: pageMeta,
                 });
             }
         }