@cloudbase/lowcode-builder 1.8.97 → 1.8.98

package/lib/builder/core/index.js

@@ -324,7 +324,7 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
 }
 exports.normalizeInputs = normalizeInputs;
 function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWebRootPath }) {
-    var _a, _b;
+    var _a;
     if (!cals.extra) {
         cals.extra = {};
     }
@@ -335,9 +335,7 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
             cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
         }
     }
-    if (!((_a = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _a === void 0 ? void 0 : _a.envId)) {
-        cals.extra.envId = envId;
-    }
+    cals.extra.envId = envId;
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
         // web 构建不处理小程序插件
         if (cals.extra.miniprogramPlugins) {
@@ -352,7 +350,7 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
                 ...window,
                 // Todo: 处理自定义域名逻辑
                 publicPath: (0, common_1.buildAsXPageByBuildType)(buildTypeList)
-                    ? (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.publicPath) || `https://${(_b = cals.extra) === null || _b === void 0 ? void 0 : _b.domain}${path}`
+                    ? (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.publicPath) || `https://${(_a = cals.extra) === null || _a === void 0 ? void 0 : _a.domain}${path}`
                     : path,
                 basename: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList)
                     ? `app/${appId}${(deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) !== types_1.DEPLOY_MODE.UPLOAD ? '-preview' : ''}`

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

@@ -1,16 +1,16 @@
-import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWeAppData, IPlugin, CSSProperties } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
 import { BuildType } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
-export declare function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarConfig, appId, nativeMode, filter, }: {
+export declare function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarMap, appId, nativeMode, filter, }: {
     buildContext: IMpCommonBuildContext & Partial<Pick<IBuildContext, 'enableExpiredTag' | 'domain' | 'runtimeDynamicConfig'>>;
     buildTypeList: BuildType[];
     localWedaRoot: string;
     appId?: string;
     loginConfigVersion?: string;
-    cssVarConfig?: Object;
+    cssVarMap?: Object;
     nativeMode?: boolean;
     filter?: (src: string) => boolean;
 }): Promise<void>;
@@ -37,4 +37,4 @@ export declare function generateConfig(data: {
     isPrivateMode?: boolean;
     endpointType?: IBuildContext['endpointType'] | '';
 }, root: string): Promise<void>;
-export declare function writeLowCodeFiles(ctx: IBuildContext, appData: IWeAppData, outDir: string): Promise<void>;
+export declare function writeLowCodeFiles(ctx: IBuildContext, appData: IWeAppData, outDir: string, cssVarMap?: CSSProperties): Promise<void>;

package/lib/builder/mp/index.js

@@ -66,18 +66,9 @@ function patchBuildContext(ctx, calses) {
     ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => used.component[plugin.name] || used.action[plugin.name]);
     return { used };
 }
-async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarConfig, appId, nativeMode, filter = () => true, }) {
+async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarMap, appId, nativeMode, filter = () => true, }) {
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!buildContext.isProduction);
     const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
-    const cssVarMap = Object.entries((0, theme_1.mergeCssVarConfig)(cssVarConfig, 'MP'))
-        .map(([key, _value]) => {
-        const value = _value || '';
-        return [key, value.replace(/;$/, '')];
-    })
-        .reduce((map, [key, value]) => {
-        map[key] = value;
-        return map;
-    }, {}) || {};
     let customLoginConfig;
     let loginConfigPathname = loginConfigVersion
         ? (0, cals_1.generateCustomLoginConfigPathname)({ appId: appId || '', version: loginConfigVersion })
@@ -205,6 +196,15 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         ..._buildContext,
         wedaRoot: (0, util_3.normalizeWedaRoot)(projectConfigJson.wedaRoot),
     };
+    const cssVarMap = Object.entries((0, theme_1.mergeCssVarConfig)((_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.theme) === null || _d === void 0 ? void 0 : _d.cssVarConfig, 'MP'))
+        .map(([key, _value]) => {
+        const value = _value || '';
+        return [key, value.replace(/;$/, '')];
+    })
+        .reduce((map, [key, value]) => {
+        map[key] = value;
+        return map;
+    }, {}) || {};
     // #1.5 安装依赖库，生成 materials 目录副作用修改了buildContext 因此需要早于页面生成
     if (hasLowcodePkg) {
         await (0, materials_1.installMaterials)(buildContext, localWedaRoot, used);
@@ -213,7 +213,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
     if (mainAppData.mpPkgUrl) {
     }
     else {
-        await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, { cals: calses[0], weapp: mainAppData }, localWedaRoot, pageConfigs[0]);
+        await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, { cals: calses[0], weapp: mainAppData }, localWedaRoot, pageConfigs[0], cssVarMap);
     }
     // #3 生成 wedaRoot 文件
     if (hasLowcodePkg) {
@@ -228,8 +228,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             buildTypeList,
             localWedaRoot,
             appId,
-            loginConfigVersion: (_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.extra) === null || _d === void 0 ? void 0 : _d.loginConfigVersion,
-            cssVarConfig: (_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.theme) === null || _f === void 0 ? void 0 : _f.cssVarConfig,
+            loginConfigVersion: (_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.extra) === null || _f === void 0 ? void 0 : _f.loginConfigVersion,
+            cssVarMap,
         });
         await (0, generateFiles_1.default)({
             'package.json': {
@@ -359,7 +359,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
     // }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
-        if (index == 0) {
+        if (index === 0) {
             return;
         }
         else {
@@ -368,7 +368,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 ...buildContext,
                 rootPath: app.rootPath,
             };
-            await generatePkg(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, pageConfigs[index]);
+            await generatePkg(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, pageConfigs[index], cssVarMap);
             await generateFramework(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, {
                 deployOptions,
             });
@@ -478,7 +478,7 @@ async function generateConfig(data, root) {
     }, templateDir, root);
 }
 exports.generateConfig = generateConfig;
-async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
+async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs, cssVarMap) {
     var _a;
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
@@ -610,7 +610,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
             await (0, generateFiles_1.default)(pageFileData, `${templateDir}/page`, path_1.default.join(appRoot, 'pages', page.id));
         }));
         // #3 writing lowcode files
-        await writeLowCodeFiles(ctx, weapp, appRoot);
+        await writeLowCodeFiles(ctx, weapp, appRoot, cssVarMap);
     }
 }
 async function generateFramework(ctx, { cals, weapp: appData }, outDir, options) {
@@ -703,17 +703,18 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
     console.log('Generate app framework');
     await (0, generateFiles_1.default)(fileData, templateDir, outDir);
 }
-async function writeLowCodeFiles(ctx, appData, outDir) {
+async function writeLowCodeFiles(ctx, appData, outDir, cssVarMap) {
     console.log(`Writing ${em('lowcode')} files:`);
     const lowcodeRootDir = path_1.default.join(outDir, 'lowcode');
     const lowCodes = (0, cals_1.processRuntimeCodeResources)({ id: 'global' }, appData.lowCodes || appData.codeModules, 'app');
     const themeStyle = lowCodes.find((mod) => mod.type === cals_1.ECodeType.THEME);
     // 混合模式，子包不生成顶级（应用级）的 lowcodes
     if (!(ctx.isMixMode && appData.rootPath)) {
+        const globalTheme = `${ctx.enablePageRoot && cssVarMap ? (0, weapps_core_1.toCssText)(cssVarMap || {}, 'page, page .wd-mp-root') : ''}${(themeStyle === null || themeStyle === void 0 ? void 0 : themeStyle.code) || ''}`;
         await Promise.all(lowCodes
             .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
             .map((m) => {
-            (0, lowcode_1.writeCode2file)(ctx, m, lowcodeRootDir, { appDir: outDir }, (themeStyle === null || themeStyle === void 0 ? void 0 : themeStyle.code) || '');
+            (0, lowcode_1.writeCode2file)(ctx, m, lowcodeRootDir, { appDir: outDir }, globalTheme);
         }));
     }
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {

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

@@ -6,6 +6,6 @@ export declare function writeCode2file(ctx: IBuildContext | (IMpCommonBuildConte
     pageId?: string;
     appDir?: string;
     comp?: ICompositedComponent;
-}, themeCode?: '', externalAPIImport?: boolean): Promise<void>;
+}, themeCode?: string, externalAPIImport?: boolean): Promise<void>;
 export declare function handle$page(code: string): string;
 export declare function handle$comp(code: string): string;

package/lib/builder/mp/util.js

@@ -217,7 +217,9 @@ function createTemplateQuery(ctx, query = {}) {
         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)`,
+            handler: item.type === cals_1.EQueryType.GeneralFunc
+                ? `(__data__,__params__) => (${handler['code']})({params:__params__,data:__data__})`
+                : `(...args) => $app.${handler === null || handler === void 0 ? void 0 : handler.name}(...args)`,
             data: staticProps,
             dataBinds: boundProps,
             eventHandlers: getListenersHandlers(ctx, listeners, item.id, 'this'),