@cloudbase/lowcode-builder 1.8.72 → 1.8.74

package/lib/builder/core/index.d.ts

@@ -44,6 +44,7 @@ export interface IBuildWedaApp extends IBaseAppProps {
     isPrivateMode?: boolean;
     endpointType?: 'tcb-api' | 'wechat-service';
     enableExpiredTag?: boolean;
+    enableAd?: boolean;
     account?: {
         uin?: string;
     };
@@ -59,7 +60,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -61,7 +61,7 @@ exports.buildWedaConfig = buildWedaConfig;
 async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, account = {}, mpConfig = {}, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, }, cb) {
     var _a, _b, _c, _d, _e, _f;
     if (!cals) {
         console.error('无效的应用配置');
@@ -100,6 +100,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         isPrivateMode,
         endpointType,
         enableExpiredTag,
+        enableAd,
         runtimeDynamicConfig,
         disabled: (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.disabled,
         statusPageId: (_d = cals.extra) === null || _d === void 0 ? void 0 : _d.statusPageId,

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

@@ -42,6 +42,10 @@ export interface ICommonBuildContext {
      * 是否启用过期
      */
     enableExpiredTag?: boolean;
+    /**
+     * 显示微信云模板toast
+     */
+    enableAd?: boolean;
     /**
      * 应用运行态动态全局配置
      */

package/lib/builder/mp/index.js

@@ -119,12 +119,15 @@ 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'))
+        const cssVarMap = 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) ? '' : ';'}`;
+            return [key, value.replace(/;$/, '')];
         })
-            .filter((str) => !!str) || [];
+            .reduce((map, [key, value]) => {
+            map[key] = value;
+            return map;
+        }, {}) || {};
         appFileData = {
             ...appFileData,
             'common/style.js': {},
@@ -138,7 +141,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/widget.js': {},
             'common/weapp-page.js': {
                 expirationStartTimesnap,
-                pageStyle: cssVarList.join(''),
+                pageStyle: JSON.stringify(cssVarMap || {}, undefined, 2),
             },
             'common/weapp-component.js': {},
             'common/merge-renderer.js': {
@@ -417,10 +420,16 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
             const subLevelPath = rootPath ? `${path_1.default.posix.relative(`packages/${rootPath}`, '')}/` : '';
             const pageDataBinds = {};
             Object.entries(page.data || {}).forEach(([prop, val]) => {
-                if (prop === null || prop === void 0 ? void 0 : prop.startsWith('appShareMessage')) {
+                if (/^(appShareMessage)/.test(prop)) {
                     (0, util_2.setDataBind)(pageDataBinds, prop, val);
                 }
             });
+            if (page.styleBindPath) {
+                (0, util_2.setDataBind)(pageDataBinds, 'style', {
+                    type: cals_1.PropBindType.expression,
+                    value: page.styleBindPath,
+                });
+            }
             /**
              * 使用最终的 usingComponents 生成一份 componentPlaceholder
              */

package/lib/builder/mp/materials.js

@@ -288,6 +288,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         },
         'index.wxss': {
             importStyles: importor.styles.map((mod) => path.posix.join(LOWCODE_DIR_NAME, (0, weapps_core_1.getCodeModuleFilePath)('global', mod, { style: '.wxss' }))),
+            content: (0, util_3.generateScopedStyleText)(componentInstances),
         },
     };
     // Generating file by template and data

package/lib/builder/mp/mp_config.js

@@ -41,7 +41,7 @@ const chalk_1 = __importDefault(require("chalk"));
  * @param appConfigs app config from prop edit panel
  */
 function generateMpConfig(ctx, weapps, options) {
-    var _a, _b;
+    var _a;
     const appConfig = {
         useExtendedLib: { weui: true },
     };
@@ -105,7 +105,7 @@ function generateMpConfig(ctx, weapps, options) {
             pages: [],
         },
     ]
-        .concat(ctx.enableAsyncMaterials && !((_b = weapps[0]) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
+        .concat(ctx.enableAsyncMaterials
         ? [
             {
                 root: config_1.materialsDirName,

package/lib/builder/mp/wxml.js

@@ -127,6 +127,22 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     _parent: pageMeta,
                 });
             }
+            if (ctx.enableAd) {
+                const textNode = {
+                    type: 'text',
+                    text: '当前小程序正使用云开发免费版云模板，升级后即可免广告。',
+                };
+                pageMeta.elements.unshift({
+                    type: 'element',
+                    name: 'view',
+                    attributes: {
+                        style: 'position: fixed;top: 0;left: 0;right: 0;z-index:10000; background: rgba(255, 103, 112, 0.95); font-size: 12px; color: white; line-height: 2.5em;padding-left: .5em;',
+                    },
+                    elements: [textNode],
+                    _order: -Infinity,
+                    _parent: pageMeta,
+                });
+            }
             if (ctx.enableLoading) {
                 pageMeta.elements.push({
                     type: 'element',

package/lib/builder/service/webpack.js

@@ -127,7 +127,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         entry: path_1.default.resolve(appBuildDir, 'src/index.jsx'),
         output: {
             path: path_1.default.resolve(appBuildDir, exports.OUTPUT_DIR),
-            filename: '[name].[contenthash].bundle.js',
+            filename: '[name].[hash].bundle.js',
             chunkFilename: '[name].[contenthash].chunk.js',
             publicPath: buildTypeList.includes(common_1.BuildType.APP) || buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL) ? '' : publicPath,
             pathinfo: false,