@cloudbase/lowcode-builder 1.3.12-alpha.1 → 1.3.12-alpha.4

package/lib/builder/mp/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUsedComponents = exports.writeLowCodeFiles = exports.generateWxMp = void 0;
+exports.handleUsedComponents = exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -54,7 +54,7 @@ const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, ignoreInstall = false, }) {
+async function generateWxMp({ buildContext, weapps, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, }) {
     var _a;
     const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
@@ -76,30 +76,33 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             'project.config.json': { content: projConfig },
         };
         console.log(`Generating ${em('project')} files`);
-        await (0, generateFiles_1.default)(buildContext, projectFileData, templateDir, projDir);
+        await (0, generateFiles_1.default)(projectFileData, templateDir, projDir);
     }
     // #2 生成主包
     await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, mainAppData, path_1.default.join(projDir, '/'), pageConfigs[0]);
     const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
     let projectConfigJson = await fs.readJSON(projectConfigJsonPath);
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
-    await generateFramework(buildContext, mainAppData, miniprogramRoot);
+    await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
     // #3 生成主包根路径文件
     let appFileData = {};
     if (weapps.find((item) => !item.mpPkgUrl)) {
-        await generateFramework(buildContext, mainAppData, miniprogramRoot);
+        await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
         // 有了 framework app 之后，并且是源码的方式,追加 app 引用
         if (mainAppData.mpPkgUrl) {
             let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
             let appJsContent = await fs.readFile(appJsPath);
             await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
         }
+        await generateConfig({
+            domain,
+            isPrivateMode,
+            endpointType,
+        }, miniprogramRoot);
         appFileData = {
             ...appFileData,
             'common/style.js': {},
-            'common/utils.wxs': {
-                domain,
-            },
+            'common/utils.wxs': {},
             'common/util.js': {
                 isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             },
@@ -164,7 +167,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         };
     }
     console.log(`Generating ${em('miniprogramRoot')} files`);
-    await (0, generateFiles_1.default)(buildContext, appFileData, templateDir, miniprogramRoot);
+    await (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot);
     // 若项目目录与小程序根目录不同，则拷贝素材到小程序根目录
     if (miniprogramRoot !== path_1.default.join(projDir, '/') && fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
         console.log(`Move ${em(config_1.materialsDirName)} from` + `${projDir} to ${miniprogramRoot}`);
@@ -178,25 +181,18 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 envID: mainAppData.envId,
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
-                isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
+                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.clientId,
-                isPrivateMode,
-                endpointType,
-                tcbApiOrigin: endpointType === 'tcb-api' && isPrivateMode && domain ? `https://${domain}` : '',
             },
             'datasources/datasource-profiles.js.tpl': {
-                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
-                /**
-                 * 精简文件生成，新 cloud-sdk 不依赖 profile 了
-                 */
-                []), { EOL: false }),
+                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
             },
             'datasources/dataset-profiles.js.tpl': {
                 datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
             },
         };
         console.log(`Generating ${em('datasources')} files`);
-        await (0, generateFiles_1.default)(buildContext, datasourceFileData, templateDir, miniprogramRoot);
+        await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot);
     }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
@@ -210,11 +206,11 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 rootPath: app.rootPath,
             };
             await generatePkg(subpackageBuildCtx, app, subpackageRootPath, pageConfigs[index]);
-            await generateFramework(subpackageBuildCtx, app, subpackageRootPath);
+            await generateFramework(subpackageBuildCtx, app, subpackageRootPath, { deployOptions });
             // 生成package.json
             let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
             if (!fs.existsSync(packageJsonPath)) {
-                await (0, generateFiles_1.default)(buildContext, {
+                await (0, generateFiles_1.default)({
                     'package.json': {
                         appId,
                         importJSSDK: endpointType === 'tcb-api',
@@ -283,6 +279,20 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
     }
 }
 exports.generateWxMp = generateWxMp;
+async function generateConfig(data, root) {
+    const { domain = '', isPrivateMode = false, endpointType = '' } = data;
+    await (0, generateFiles_1.default)({
+        'common/config.js': {
+            domain,
+            isPrivateMode,
+            endpointType,
+        },
+        'common/config.wxs': {
+            domain,
+        },
+    }, templateDir, root);
+}
+exports.generateConfig = generateConfig;
 async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
@@ -301,7 +311,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) => {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
@@ -318,11 +328,12 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     widgetProps: (0, util_2.createWidgetProps)(ctx, componentInstances),
                     pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,
                     pageName: page.id,
+                    pageTitle: ((_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),
                     pageSource: page.data.src || '',
                     eventHanlders: (0, util_2.createEventHanlders)(ctx, componentInstances, 'this', page),
                     dataBinds: (0, util_2.createDataBinds)(ctx, componentInstances),
                     pageAttributes: {
-                        ...(((_a = page.data) === null || _a === void 0 ? void 0 : _a.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,
@@ -338,7 +349,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     content: wxml,
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
-                    subWxss: rootPath && !((_b = ctx.mainAppData) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
+                    subWxss: rootPath && !((_f = ctx.mainAppData) === null || _f === void 0 ? void 0 : _f.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, {
@@ -348,13 +359,14 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 },
             };
             // Generating file by template and data
-            await (0, generateFiles_1.default)(ctx, pageFileData, `${templateDir}/page`, path_1.default.join(appRoot, 'pages', page.id));
+            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);
     }
 }
-async function generateFramework(ctx, appData, outDir) {
+async function generateFramework(ctx, appData, outDir, options) {
+    var _a;
     let fileData = {};
     if (appData.mpPkgUrl) {
         if (!appData.rootPath) {
@@ -366,7 +378,6 @@ async function generateFramework(ctx, appData, outDir) {
                     subLevelPath: '',
                     subPackageName: '',
                     importor: (0, util_3.generateLowcodeImportor)([]),
-                    domain: ctx.domain || '',
                     appConfig: JSON.stringify({}),
                 },
             };
@@ -391,15 +402,14 @@ async function generateFramework(ctx, appData, outDir) {
                 ...fileData,
                 'app/app-global.js': {},
                 'app/weapps-api.js': {
-                    appId: ctx.appId,
-                    domain: ctx.domain || '',
                     subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`${appData.rootPath}`, '')}/` : '',
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
                         id: ctx.appId,
+                        label: (appData === null || appData === void 0 ? void 0 : appData.label) || '',
+                        version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
                         envId: appData.envId,
-                        staticResourceDomain: ctx.domain || '',
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         pages: appData.pageInstanceList
                             .sort((item) => (item.isHome ? -1 : 1))
@@ -411,7 +421,7 @@ async function generateFramework(ctx, appData, outDir) {
                 },
                 'app/common.js': {
                     mods: appData.lowCodes
-                        .filter((m) => m.type === cals_1.ECodeType.NORMAL_MODULE && m.name !== '____index____')
+                        .filter((m) => m.type === cals_1.ECodeType.NORMAL_MODULE && m.name !== cals_1.ECodeName.PLACEHOLDER)
                         .map((m) => m.name)
                         .sort(),
                 },
@@ -419,7 +429,7 @@ async function generateFramework(ctx, appData, outDir) {
         }
     }
     console.log('Generate app framework');
-    await (0, generateFiles_1.default)(ctx, fileData, templateDir, outDir);
+    await (0, generateFiles_1.default)(fileData, templateDir, outDir);
 }
 async function writeLowCodeFiles(ctx, appData, outDir) {
     console.log(`Writing ${em('lowcode')} files:`);

package/lib/builder/mp/materials.js

@@ -146,9 +146,7 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
             comp.materialName = lib.name;
         });
     });
-    // Collection infomation from components to lib meta
-    const compositedLibs = materialLibs.filter((lib) => lib.isComposite && usedComps[lib.name]);
-    compositedLibs.map((lib) => {
+    materialLibs.map((lib) => {
         lib.dependencies = lib.dependencies || {};
         lib.components.map((cmp) => {
             cmp.meta.syncProps = {};
@@ -159,14 +157,18 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
                     cmp.meta.syncProps[prop] = syncProp || inputProp;
                 }
             }
-            cmp.meta.platforms = {
-                mp: {
-                    path: `${cmp.name}/index`,
-                },
-            };
-            lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
+            if (lib.isComposite) {
+                cmp.meta.platforms = {
+                    mp: {
+                        path: `${cmp.name}/index`,
+                    },
+                };
+                lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
+            }
         });
     });
+    // Collection infomation from components to lib meta
+    const compositedLibs = materialLibs.filter((lib) => lib.isComposite && usedComps[lib.name]);
     // #2 Generate composited libs
     await Promise.all(compositedLibs.map(async (lib) => {
         console.log(`Generate composited library ${lib.name}`);
@@ -311,7 +313,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         },
     };
     // Generating file by template and data
-    await (0, generateFiles_1.default)(compositeCtx, pageFileData, `${templateDir}/component`, outDir);
+    await (0, generateFiles_1.default)(pageFileData, `${templateDir}/component`, outDir);
     // #3 writing lowcode files
     /**
      * 低码没有开放 index 类别，直接去掉

package/lib/builder/mp/util.js

@@ -200,8 +200,10 @@ function generateDataContainerListeners() {
         {
             trigger: 'onDataChange',
             jsCode: `({event})=>{
-      app.utils.set(event.currentTarget._scope, 'dataContext.data', event?.detail?.data);
-      app.utils.set(event.currentTarget._scope, 'dataContext.state', event?.detail?.state);
+      if(event.currentTarget) {
+        app.utils.set(event.currentTarget._scope, 'dataContext.data', event?.detail?.data);
+        app.utils.set(event.currentTarget._scope, 'dataContext.state', event?.detail?.state);
+      }
     }`,
             type: weapps_core_1.ActionType.Inline,
             data: {},
@@ -220,7 +222,7 @@ function getListenersHandlers(listeners, id, componentApi) {
         return {};
     const eventHandlers = {};
     listeners.forEach((l) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const handlerName = (0, wxml_1.getMpEventHanlderName)(id, l.trigger, l);
         eventHandlers[handlerName] = eventHandlers[handlerName] || [];
         const params = generatedDynamicData(l.data);
@@ -243,6 +245,7 @@ function getListenersHandlers(listeners, id, componentApi) {
             key: l.key || '',
             handler,
             handlerModule: (_c = l.handler) === null || _c === void 0 ? void 0 : _c.moduleName,
+            sourceKey: `${((_d = l.handler) === null || _d === void 0 ? void 0 : _d.moduleName) || ''}:${((_e = l.handler) === null || _e === void 0 ? void 0 : _e.name) || ''}`,
             data: params.staticProps,
             boundData: params.boundProps,
             type: l.type,
@@ -273,9 +276,21 @@ function createDataBinds(ctx, widgets) {
         const { directives = {} } = xProps;
         setDataBind(dataBinds[id], '_waFor', directives.waFor);
         setDataBind(dataBinds[id], '_waIf', directives.waIf);
+        if (directives.waDisplay) {
+            let { type, value } = directives.waDisplay;
+            if (!type || type === 'static') {
+                type = weapps_core_1.PropBindType.expression;
+                value = `${JSON.stringify(value)}`;
+            }
+            setDataBind(dataBinds[id], '_waDisplay', {
+                ...directives.waDisplay,
+                type,
+                value,
+            });
+        }
         setDataBind(dataBinds[id], 'classList', xProps.classListBind);
         setDataBind(dataBinds[id], 'style', xProps.styleBind);
-        const { classList, style } = dataBinds[id];
+        const { classList, style, _waDisplay } = dataBinds[id];
         if (classList) {
             dataBinds[id].classList = {
                 ...classList,
@@ -283,12 +298,21 @@ function createDataBinds(ctx, widgets) {
             };
         }
         if (style) {
-            const styleExpression = `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n)}`;
+            const styleExpression = _waDisplay
+                ? `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n), display: (()=>{${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.imports}\n return (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)})() ? undefined: 'none' }`
+                : `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n)}`;
             dataBinds[id].style = {
                 ...style,
                 expression: processCssUnit === 'rpx' ? `px2rpx(${styleExpression})` : styleExpression,
             };
         }
+        else if (_waDisplay) {
+            const styleExpression = `{...widgetProps.${id}.style,  display: (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)? undefined: 'none' }`;
+            dataBinds[id].style = {
+                ..._waDisplay,
+                expression: processCssUnit === 'rpx' ? `px2rpx(${styleExpression})` : styleExpression,
+            };
+        }
         if (Object.keys(dataBinds[id]).length === 0) {
             delete dataBinds[id];
         }

package/lib/builder/mp/wxml.js

@@ -32,17 +32,36 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         ].concat(createXml(widgets)),
     };
     if (ctx.isPage) {
+        const { enablePageRoot } = ctx;
         const originElements = xmlJson.elements;
         // 登录校验: 向其最外层包裹一层block
         xmlJson.elements = [
             {
                 type: 'element',
-                name: 'block',
+                name: enablePageRoot ? 'view' : 'block',
                 attributes: {
+                    id: 'wd-page-root',
                     ['wx:if']: '{{weDaHasLogin}}',
                     ['data-weui-theme']: 'light',
                 },
-                elements: originElements,
+                elements: [
+                    ...originElements,
+                    /**
+                     * 可能需要依赖添加逻辑节点的方式
+                     * 来触发 page 的 ready
+                     * 目的是为了让 page 的 ready 在组件的 ready 之后
+                     */
+                    // {
+                    //   type: 'element',
+                    //   name: 'readyPlaceHoler',
+                    //   attributes: {
+                    //     ['bind:ready']: '_onReady',
+                    //   },
+                    //   elements: originElements,
+                    //   _order: Infinity,
+                    //   _parent: null,
+                    // },
+                ],
                 _order: -1,
                 _parent: null,
             },
@@ -164,6 +183,13 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
             if ((_d = directives.waIf) === null || _d === void 0 ? void 0 : _d.value) {
                 node.attributes['wx:if'] = getAttrBind(directives.waIf, `${attrPrefix}._waIf`);
             }
+            /**
+             * 对于 hidden 的支持依赖组件透传对应的属性
+             * 为了兼容，采用 style merge 的方式
+             */
+            // if (directives.waDisplay?.value !== undefined && directives.waDisplay?.value !== true) {
+            //   node.attributes['hidden'] = getAttrBind(directives.waDisplay, `${attrPrefix}._waDisplay`, false, true);
+            // }
             if ((_e = directives.waFor) === null || _e === void 0 ? void 0 : _e.value) {
                 node.attributes['wx:for'] = getAttrBind(directives.waFor, `${wxmlDataPrefix.widgetProp}${id}${parentForNodes
                     .map((forNodeId) => `[${wxmlDataPrefix.forIndex}${forNodeId}]`)
@@ -368,10 +394,12 @@ function getUsedComponents(widgets, usedCmps = {}) {
     return usedCmps;
 }
 exports.getUsedComponents = getUsedComponents;
-function getAttrBind(dVale, widgetBind, isStaticResource) {
+function getAttrBind(dVale, widgetBind, isStaticResource, neg) {
     const { type, value } = dVale;
     const attrVal = type === weapps_core_1.PropBindType.prop ? value : widgetBind;
-    return isStaticResource ? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}` : `{{${attrVal}}}`;
+    return isStaticResource
+        ? `{{${neg ? '!' : ''}wxsUtils._getStaticResourceAttribute(${attrVal})}}`
+        : `{{${neg ? `!(${attrVal})` : `${attrVal}`}}}`;
 }
 function getGenericCompTagName(propName) {
     return `g--${propName}`;

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

@@ -1,7 +1,7 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
 import { IMaterialItem, IWeAppComponentInstance, IWeAppCode } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, deepDealSchema, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
-export declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
+declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {
     name: any;

package/lib/builder/util/common.js

@@ -34,10 +34,6 @@ function promiseWrapper(p) {
     });
 }
 exports.promiseWrapper = promiseWrapper;
-// export function isEmpty(i: any): boolean {
-//   if (typeof i === 'string') return !i.trim()
-//   return R.isEmpty(i) || R.isNil(i) || Number.isNaN(i)
-// }
 function getCurrentPackageJson() {
     try {
         const { name, version } = fs_extra_1.default.readJSONSync(path_1.default.resolve(process.cwd(), 'package.json'));

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

@@ -1,8 +1,7 @@
 /// <reference types="node" />
-import { IBuildContext } from '../mp/BuildContext';
 import { OutputType } from 'jszip';
 export declare const generatedFileContents: {};
-export default function generateFiles(ctx: IBuildContext, appFileData: any, srcDir: string, dstDir: string): Promise<string[]>;
+export default function generateFiles(appFileData: any, srcDir: string, dstDir: string): Promise<string[]>;
 export declare function writeFile(outFile: string, content: string): Promise<boolean>;
 export declare function removeFile(file: string): void;
 /**

package/lib/builder/util/generateFiles.js

@@ -35,7 +35,7 @@ const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
 const buffer_1 = require("buffer");
 exports.generatedFileContents = {}; // generated files for incrmental build
-async function generateFiles(ctx, appFileData, srcDir, dstDir) {
+async function generateFiles(appFileData, srcDir, dstDir) {
     const filesGenerated = [];
     // Generating file by template and data
     for (const file in appFileData) {
@@ -46,18 +46,6 @@ async function generateFiles(ctx, appFileData, srcDir, dstDir) {
             encoding: 'utf8',
         });
         let generatedCode = (0, lodash_1.template)(tplStr, { interpolate: /<%=([\s\S]+?)%>/ })(appFileData[file]);
-        // 混合模式下，引用公共路径要多增加一层，并加多一层命名
-        // 混合子包直接在对应目录上生成，而不采用替换的方式 @royhyang
-        // if (ctx?.isMixMode && ctx?.rootPath) {
-        //   generatedCode = generatedCode.replace(
-        //     /..\/..\/..\/common\//g,
-        //     '../../../../common/'
-        //   )
-        //   generatedCode = generatedCode.replace(
-        //     /..\/..\/..\/app\//g,
-        //     '../../../../app/'
-        //   )
-        // }
         const outFile = path_1.default.resolve(dstDir, outFileName.replace(/\.tpl$/, ''));
         if (await writeFile(outFile, generatedCode)) {
             filesGenerated.push(outFileName);

package/lib/index.d.ts

@@ -11,4 +11,3 @@ export * from './types';
  * cache map
  */
 export { PERSISTENT_DEPENDIENCES_MAP } from './builder/service/webpack';
-export declare const version = "test";

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
+exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
 /**
  * Tencent is pleased to support the open source community by making CloudBaseFramework - 云原生一体化部署工具 available.
  *
@@ -29,4 +29,3 @@ __exportStar(require("./types"), exports);
  */
 var webpack_1 = require("./builder/service/webpack");
 Object.defineProperty(exports, "PERSISTENT_DEPENDIENCES_MAP", { enumerable: true, get: function () { return webpack_1.PERSISTENT_DEPENDIENCES_MAP; } });
-exports.version = 'test';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.3.12-alpha.1",
+  "version": "1.3.12-alpha.4",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.5.11",
-    "@cloudbase/lowcode-generator": "^1.3.6",
+    "@cloudbase/cals": "workspace:^",
+    "@cloudbase/lowcode-generator": "workspace:^",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -19,7 +19,7 @@
     <% cssStyles.forEach(function(styleUrl){%>
     <link type="text/css" rel="stylesheet" href="<%=styleUrl %>" />
     <% })%> <% if(cdnEndpoints.aegis){ %>
-    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
+    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
     <script>
       <% if(!isAdminPortal){ %>
       const _aegis = new Aegis({
@@ -386,7 +386,75 @@
   </head>
 
   <body data-weui-theme="light">
-    <div id="root" class="main-wrap"></div>
+    <div id="root" class="main-wrap">
+      <% if(enableStaticLoading){ %>
+      <style type="text/css">
+        .weda-loading-container {
+          position: fixed;
+          left: 0;
+          top: 0;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+          height: 100%;
+          padding: 0 20px;
+        }
+        .weda-loading-container .logo {
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          text-align: center;
+          margin-bottom: 50px;
+        }
+
+        .weda-loading-container .sp {
+          width: 48px;
+          height: 48px;
+        }
+
+        .weda-loading-container .sp-circle {
+          border: 6px rgba(0, 82, 217, 0.25) solid;
+          border-top: 6px rgba(0, 82, 217, 1) solid;
+          border-radius: 50%;
+          -webkit-animation: spCircRot 0.6s infinite linear;
+          animation: spCircRot 0.6s infinite linear;
+        }
+        @-webkit-keyframes spCircRot {
+          from {
+            -webkit-transform: rotate(0deg);
+          }
+          to {
+            -webkit-transform: rotate(359deg);
+          }
+        }
+        @keyframes spCircRot {
+          from {
+            transform: rotate(0deg);
+          }
+          to {
+            transform: rotate(359deg);
+          }
+        }
+      </style>
+      <div class="weda-loading-container">
+        <div class="logo">
+          <div class="sp sp-circle"></div>
+        </div>
+        <div class="text">初始化中...</div>
+        <script>
+          const ua = navigator.userAgent.toLowerCase();
+          if (ua.indexOf('wxwork') !== -1 && /[?&]code=/.test(location.search) && /[?&]state=/.test(location.search)) {
+            var el = document.querySelector('#root .weda-loading-container>.text');
+            if (el) {
+              el.innerHTML = '数据加载中...';
+            }
+          }
+        </script>
+      </div>
+      <% }%>
+    </div>
     <% jsApis.forEach(function(jsApi){%>
     <script src="<%=jsApi %>"></script>
     <% })%> <% if(canUseVite){ %>
@@ -453,7 +521,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.19/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.27-alpha.0/dist/h5.browser.js"
     ></script>
     <script>
       // zxing polifill
@@ -475,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.2895317effcdaa894b2d.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.051bed8f584a31b92c63.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -4,6 +4,7 @@ import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../c
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
 import lodashGet from 'lodash.get';
+import config from '<%= subLevelPath %>../common/config';
 
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
@@ -25,11 +26,13 @@ export const $w = new Proxy(
 
 function createGlboalApi() {
   const mpApp = createMpApp({
-    appConfig: <%= appConfig %>
+    appConfig: {
+      staticResourceDomain: config.domain,
+      ...(<%= appConfig %>)
+    },
   });
-  const globalAPI = {
-    id: '<%= appId %>',
-    domain: '<%= domain %>',
+  const globalAPI = Object.assign(mpApp, {
+    domain: config.domain,
     pages: {},
     session: {
       //configure: sdk.configure,
@@ -45,7 +48,7 @@ function createGlboalApi() {
       return $page.invokeComponentMethod(params)
     },
     // ... other sdk apis & apis from mp
-  } // The global api exposed to lowcode
+  }) // The global api exposed to lowcode
 
   globalAPI.__internal__.enumOptions = enumOptions
   globalAPI.utils.formatEnum = formatEnum