@cloudbase/lowcode-builder 1.8.44-alpha.0 → 1.8.45-beta.1

package/lib/builder/mp/index.js

@@ -138,6 +138,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/flow.js': {},
             'common/info': {},
             'common/privacyModal': {},
+            'common/modal': {},
             /**
              * 调试用
              */
@@ -325,7 +326,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, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
@@ -346,10 +347,8 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
             const pageFileData = {
                 [`api.js|api.js`]: {
                     subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
-                    packageName: rootPath || '',
-                    subAppId: rootPath ? ((_a = weapp.extra) === null || _a === void 0 ? void 0 : _a.id) || weapp.id || '' : '',
                     uuid: rootPath ? `${rootPath}/${page.id}` : page.id,
-                    label: ((_c = (_b = page === null || page === void 0 ? void 0 : page.data) === null || _b === void 0 ? void 0 : _b.navigationBarTitleText) === null || _c === void 0 ? void 0 : _c.value) || ((_e = (_d = page === null || page === void 0 ? void 0 : page.data) === null || _d === void 0 ? void 0 : _d.title) === null || _e === void 0 ? void 0 : _e.value),
+                    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),
@@ -362,16 +361,16 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     eventHandlers: (0, util_2.createEventHandlers)(ctx, componentInstances, 'this', page),
                     dataBinds: (0, util_2.createDataBinds)(ctx, componentInstances),
                     pageAttributes: {
-                        ...(((_f = page.data) === null || _f === void 0 ? void 0 : _f.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {}),
+                        ...(((_e = page.data) === null || _e === void 0 ? void 0 : _e.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {}),
                     },
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
                     subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
                     importor,
-                    query: (0, util_2.createTemplateQuery)(ctx, (_g = page.dataset) === null || _g === void 0 ? void 0 : _g.query),
+                    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),
-                    resetShare: ((_k = (_j = (_h = page === null || page === void 0 ? void 0 : page.data) === null || _h === void 0 ? void 0 : _h.appShareMessage) === null || _j === void 0 ? void 0 : _j.value) === null || _k === void 0 ? void 0 : _k.enable) ||
-                        ((_l = allAppUsedComps === null || allAppUsedComps === void 0 ? void 0 : allAppUsedComps[cals_1.OFFICIAL_LIB_KEY]) === null || _l === void 0 ? void 0 : _l.has('Share')) ||
+                    resetShare: ((_j = (_h = (_g = page === null || page === void 0 ? void 0 : page.data) === null || _g === void 0 ? void 0 : _g.appShareMessage) === null || _h === void 0 ? void 0 : _h.value) === null || _j === void 0 ? void 0 : _j.enable) ||
+                        ((_k = allAppUsedComps === null || allAppUsedComps === void 0 ? void 0 : allAppUsedComps[cals_1.OFFICIAL_LIB_KEY]) === null || _k === void 0 ? void 0 : _k.has('Share')) ||
                         /* 从 enablePageRoot 的版本开始支持按需reset share
                          * 否则默认都开启
                          */ !ctx.enablePageRoot,
@@ -385,12 +384,15 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     content: wxml,
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
-                    subWxss: rootPath && !((_m = ctx.mainAppData) === null || _m === void 0 ? void 0 : _m.mpPkgUrl)
+                    subWxss: rootPath && !((_l = ctx.mainAppData) === null || _l === void 0 ? void 0 : _l.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, {
-                        defaultUnit: processCssUnit,
-                    }), 'page'),
+                    content: [
+                        (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
+                            defaultUnit: processCssUnit,
+                        }), 'page'),
+                        (0, util_2.generateScopedStyleText)(componentInstances),
+                    ].join('\n'),
                     pageWxss: importor.styles.length ? `@import "../../lowcode/${page.id}/style.wxss"` : '',
                 },
             };

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

@@ -41,3 +41,4 @@ export declare function findComponentInfo(xComponent: {
     materialLibs: any;
     miniprogramPlugins: any;
 }): any;
+export declare function generateScopedStyleText(widgets: Record<string, IWeAppComponentInstance>): string;

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.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.generateScopedStyleText = 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");
@@ -481,3 +481,36 @@ function findComponentInfo(xComponent, { materialLibs, miniprogramPlugins }) {
     return compProto;
 }
 exports.findComponentInfo = findComponentInfo;
+function generateScopedStyleText(widgets) {
+    const cssTextList = [];
+    function traverse(target) {
+        var _a;
+        for (const [id, widget] of Object.entries(target)) {
+            const scopedStyle = (_a = widget.xProps) === null || _a === void 0 ? void 0 : _a.scopedStyle;
+            if (scopedStyle) {
+                let cssText = scopedStyle
+                    // 移除 `/* ... */` 注释
+                    .replace(/\/\*(?:[\s\S]*?)\*\//g, '')
+                    // 移除换行及其前后的空白符
+                    .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(/\s*:\s*/g, ':')
+                    // ` {` => `{`
+                    .replace(/\s*{\s*/g, '{')
+                    // `;}` => `}`
+                    .replace(/;\s*}/g, '}');
+                cssTextList.push(cssText.trim());
+            }
+            if (widget.properties) {
+                traverse(widget.properties);
+            }
+        }
+    }
+    traverse(widgets);
+    return cssTextList.join('\n');
+}
+exports.generateScopedStyleText = generateScopedStyleText;