@cloudbase/framework-plugin-low-code 0.7.6 → 0.7.8-beta.1

package/lib/builder/core/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBA6Gf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBA8Gf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}

package/lib/builder/core/generate.js

@@ -53,6 +53,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
             }
         });
         yield Promise.all(allAppDataList.map((data) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const { pageInstanceList, rootPath = '' } = data;
             const appName = rootPath ? 'Sub app ' + rootPath : 'Main app';
             console.log(chalk_1.default.blue.bold('Generating files for ' + appName));
@@ -68,6 +69,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
                 appConfig: (0, util_1.JsonToStringWithVariableName)({
                     id: appKey,
                     envId: appData.envId,
+                    clientId: (_a = appData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
                     staticResourceDomain: domain || '',
                     envVersion: deployMode === types_1.DEPLOY_MODE.UPLOAD ? 'production' : 'preview',
                     pages: pageInstanceList

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAwSvC;AAqLD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAQzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAgSvC;AAuLD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAkCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}

package/lib/builder/mp/index.js

@@ -55,17 +55,15 @@ const types_1 = require("../../types");
 const common_1 = require("../types/common");
 const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
-const path_2 = __importDefault(require("path"));
 const net_1 = require("../util/net");
-const templateDir = config_1.appTemplateDir + '/mp/';
+const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
-const error = chalk_1.default.redBright;
 function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const operationLabel = em('Wexin MiniProgram Generated');
         console.time(operationLabel);
-        console.log('Generating ' + em('Wexin MiniProgram') + ' to ' + projDir);
+        console.log(`Generating ${em('Wexin MiniProgram')} to ${projDir}`);
         console.log(em('domain') + domain);
         let mainAppData = weapps[0];
         const buildContext = {
@@ -91,7 +89,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             const projectFileData = {
                 'project.config.json': { content: projConfig },
             };
-            console.log('Generating ' + em('project') + ' files');
+            console.log(`Generating ${em('project')} files`);
             yield (0, generateFiles_1.default)(projectFileData, templateDir, projDir, buildContext);
         }
         yield generatePkg(mainAppData, path_1.default.join(projDir, '/'), Object.assign(Object.assign({}, buildContext), { rootPath: mainAppData.rootPath }), pageConfigs[0]);
@@ -126,17 +124,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             yield (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
             let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
             let appJson = yield fs.readJson(appJsonPath);
-            let subpackages = appJson.subpackages || [];
-            for (let item of appConfig.subpackages || []) {
-                let find = subpackages.find((config) => config.root === item.root);
-                if (find) {
-                    find.pages = Array.from(new Set([].concat(find.pages || []).concat(item.pages || [])));
-                }
-                else {
-                    subpackages.push(item);
-                }
-            }
-            appJson.subpackages = subpackages;
+            appJson.subpackages = (0, mp_config_1.mergeSubPackages)(appJson.subpackages, appConfig.subpackages);
             yield (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
         }
         else {
@@ -263,10 +251,12 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                         pageSource: page.data.src || '',
                         eventHanlders: (0, util_2.createEventHanlders)(page.componentInstances, '$page', ctx),
                         dataBinds: (0, util_2.createDataBinds)(page.componentInstances, ctx),
-                        pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage) ? { 'appShareMessage': page.data.appShareMessage.value } : {})),
+                        pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage)
+                            ? { appShareMessage: page.data.appShareMessage.value }
+                            : {})),
                         debug: !ctx.isProduction,
                         stringifyObj: util_1.inspect,
-                        subLevelPath: rootPath ? path_2.default.relative(rootPath, '') + '/' : '',
+                        subLevelPath: rootPath ? path_1.default.relative(rootPath, '') + '/' : '',
                     },
                     [`index.json|${pageFileName}.json`]: {
                         usingComponents,
@@ -277,7 +267,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                     },
                     [`index.wxss|${pageFileName}.wxss`]: {
                         subWxss: rootPath && !((_b = ctx.mainAppData) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
-                            ? `@import "${path_2.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
+                            ? `@import "${path_1.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                             : '',
                         content: (0, weapps_core_1.toCssText)((0, weapps_core_1.toCssStyle)(page.commonStyle, {
                             toRem: false,
@@ -287,7 +277,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                     },
                     'api.js': {},
                 };
-                yield (0, generateFiles_1.default)(pageFileData, templateDir + '/page', path_1.default.join(appRoot, 'pages', page.id), ctx);
+                yield (0, generateFiles_1.default)(pageFileData, `${templateDir}/page`, path_1.default.join(appRoot, 'pages', page.id), ctx);
             })));
             yield writeLowCodeFiles(weapp, appRoot, ctx);
         }
@@ -357,18 +347,19 @@ function generateFramework(appData, outDir, ctx) {
 }
 function writeLowCodeFiles(appData, outDir, ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('Writing ' + em('lowcode') + ' files:');
+        console.log(`Writing ${em('lowcode')} files:`);
         const lowcodeRootDir = path_1.default.join(outDir, 'lowcode');
         const themeStyle = (0, style_1.generateDefaultTheme)(appData);
         if (!(ctx.isMixMode && appData.rootPath)) {
             yield Promise.all(appData.lowCodes
                 .filter((mod) => mod.name !== '____index____')
+                .filter((mod) => mod.type !== 'renderer')
                 .map((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code)));
         }
         yield Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             (0, style_1.generateDefaultStyle)(page);
-            yield ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').forEach((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx)));
+            yield ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').filter((mod) => mod.type !== 'renderer').forEach((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx)));
         })));
     });
 }

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

@@ -1,12 +1,18 @@
 import { IWeAppData } from '../../weapps-core';
 import { IBuildContext } from './BuildContext';
 export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext): {
-    appConfig: {
-        useExtendedLib: {
-            weui: boolean;
-        };
-    };
+    appConfig: any;
     projConfig: any;
     pageConfigs: {}[];
 };
+interface ISubpackage {
+    root: string;
+    pages?: string[];
+    plugins?: Record<string, {
+        version?: string;
+        provider?: string;
+    }>;
+}
+export declare function mergeSubPackages(base?: ISubpackage[], extra?: ISubpackage[]): ISubpackage[];
+export {};
 //# sourceMappingURL=mp_config.d.ts.map

package/lib/builder/mp/mp_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mp_config.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/mp_config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAA8B,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAY/C,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,aAAa;;;;;;;;EA+FxE"}
+{"version":3,"file":"mp_config.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/mp_config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAA8B,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW/C,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,aAAa;;;;EAoGxE;AAyFD,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnE;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,GAAE,WAAW,EAAO,EACxB,KAAK,GAAE,WAAW,EAAO,iBAoB1B"}

package/lib/builder/mp/mp_config.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMpConfig = void 0;
+exports.mergeSubPackages = exports.generateMpConfig = void 0;
 const path = __importStar(require("path"));
 const lodash_1 = require("lodash");
 const mp_1 = require("../config/mp");
@@ -48,7 +48,7 @@ function generateMpConfig(weapps, ctx) {
     };
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
-        projectname: 'WeDa-' + ctx.appId,
+        projectname: `WeDa-${ctx.appId}`,
     });
     const pageConfigs = weapps.map((app) => {
         var _a;
@@ -78,7 +78,9 @@ function generateMpConfig(weapps, ctx) {
         (0, lodash_1.merge)(appConfig, appJson);
     }
     const _b = weapps[0].appConfig || {}, { tradingCapability } = _b, mainAppConfig = __rest(_b, ["tradingCapability"]);
-    (0, lodash_1.merge)(appConfig, mainAppConfig, extractPages(weapps, pageConfigs));
+    const _c = extractPages(weapps, pageConfigs), { subpackages } = _c, extra = __rest(_c, ["subpackages"]);
+    (0, lodash_1.merge)(appConfig, mainAppConfig, extra);
+    appConfig.subpackages = mergeSubPackages(appConfig.subpackages, subpackages);
     if (tradingCapability) {
         const tradePluginKey = `weda-mini-shop-plugin`;
         const pluginMeta = {
@@ -155,7 +157,7 @@ function transformDynamicData(originData) {
     const temp = {};
     for (const key in originData) {
         const target = originData[key];
-        if (target && target.value) {
+        if (target === null || target === void 0 ? void 0 : target.value) {
             temp[key] = target.value;
         }
     }
@@ -183,3 +185,22 @@ function parseTabConfig(tabBar, projDir) {
         return iconPath;
     }
 }
+function mergeSubPackages(base = [], extra = []) {
+    const baseMap = base.reduce((map, item) => {
+        map[item.root] = item;
+        return map;
+    }, {});
+    for (const subpackage of extra) {
+        if (!baseMap[subpackage.root]) {
+            base.push(subpackage);
+            continue;
+        }
+        const current = baseMap[subpackage.root];
+        current.pages = Array.from(new Set([...(current.pages || []), ...(subpackage.pages || [])]));
+        if (current.plugins || subpackage.plugins) {
+            current.plugins = (0, lodash_1.merge)(current.pplugins, subpackage.plugins);
+        }
+    }
+    return base;
+}
+exports.mergeSubPackages = mergeSubPackages;

package/lib/builder/mp/wxml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UA+V7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}
+{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UAiW7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}

package/lib/builder/mp/wxml.js

@@ -216,7 +216,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
                 componentKey === 'gsd-h5-react:Swiper') {
                 node.elements = node.elements.map((item, index) => {
                     var _a, _b;
-                    let _c = item.attributes || {}, { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey } = _c, itemRestKey = __rest(_c, ['wx:for', 'wx:for-index', 'wx:key']);
+                    let _c = item.attributes || {}, { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey, ['wx:if']: wxIf } = _c, itemRestKey = __rest(_c, ['wx:for', 'wx:for-index', 'wx:key', 'wx:if']);
                     if (item.name !== 'swiper-item') {
                         let SwiperItem = {
                             type: 'element',
@@ -226,6 +226,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
                                 'wx:for': wxFor,
                                 'wx:for-index': wxForIndex,
                                 'wx:key': wxKey,
+                                'wx:if': wxIf,
                             },
                             elements: [],
                             _order: index || 0,

package/lib/generate.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleMpPlugins = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const lodash_1 = require("lodash");
 const webpack_1 = require("./builder/service/builder/webpack");
+const mp_config_1 = require("./builder/mp/mp_config");
 function handleMpPlugins(plugins = [], appBuildDir) {
     return __awaiter(this, void 0, void 0, function* () {
         const appBuildMpDir = path_1.default.resolve(appBuildDir, 'dist/mp');
@@ -29,7 +29,7 @@ function handleMpPlugins(plugins = [], appBuildDir) {
             .forEach((plugin) => {
             const mpBuildAppJsonPath = path_1.default.resolve(appBuildMpDir, 'app.json');
             const pluginAppJsonPath = path_1.default.resolve(appBuildNodeModulesDir, plugin.module, 'app.json');
-            mergeSubPackages(mpBuildAppJsonPath, pluginAppJsonPath);
+            mergeSubPackagesApp(mpBuildAppJsonPath, pluginAppJsonPath);
             buildPkgJson.dependencies[plugin.module] =
                 sourcePkgJson.dependencies[plugin.module];
         });
@@ -39,28 +39,12 @@ function handleMpPlugins(plugins = [], appBuildDir) {
     });
 }
 exports.handleMpPlugins = handleMpPlugins;
-function mergeSubPackages(baseAppJsonPath, mergeAppJsonPath) {
+function mergeSubPackagesApp(baseAppJsonPath, mergeAppJsonPath) {
     const baseJson = fs_extra_1.default.readJSONSync(baseAppJsonPath);
     const mergeJson = fs_extra_1.default.readJSONSync(mergeAppJsonPath);
     if (!mergeJson.subpackages)
         return;
     const newJson = Object.assign({}, baseJson);
-    if (!baseJson.subpackages) {
-        newJson.subpackages = mergeJson.subpackages;
-    }
-    else {
-        mergeJson.subpackages.forEach((mergeItem) => {
-            const targetItemIdx = newJson.subpackages.findIndex((item) => {
-                return item.root === mergeItem.root;
-            });
-            if (newJson.subpackages[targetItemIdx]) {
-                const pages = (0, lodash_1.uniq)([].concat(newJson.subpackages[targetItemIdx].pages, mergeItem.pages));
-                newJson.subpackages[targetItemIdx].pages = pages;
-            }
-            else {
-                newJson.subpackages.push(mergeItem);
-            }
-        });
-    }
+    newJson.subpackages = (0, mp_config_1.mergeSubPackages)(baseJson.subpackages, mergeJson.subpackages);
     fs_extra_1.default.writeJSONSync(baseAppJsonPath, newJson, { spaces: 2 });
 }

package/lib/weapps-core/types/code_types.d.ts

@@ -1,4 +1,4 @@
-export declare type CodeType = 'rematch' | 'rematch-action' | 'computed' | 'general-func' | 'general' | 'lifecycle' | 'config' | 'state' | 'handler-fn' | 'normal-module' | 'app-style' | 'style' | 'theme' | 'lib' | 'index' | 'json' | 'app-config' | 'page-config' | 'page';
+export declare type CodeType = 'rematch' | 'rematch-action' | 'computed' | 'general-func' | 'general' | 'lifecycle' | 'config' | 'state' | 'handler-fn' | 'normal-module' | 'app-style' | 'style' | 'theme' | 'lib' | 'index' | 'renderer' | 'json' | 'app-config' | 'page-config' | 'page';
 export declare type RematchModule<State> = (args: {
     sdk: any;
     history: any;

package/lib/weapps-core/types/code_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code_types.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/code_types.ts"],"names":[],"mappings":"AAEA,oBAAY,QAAQ,GAChB,SAAS,GACT,gBAAgB,GAChB,UAAU,GACV,cAAc,GACd,SAAS,GACT,WAAW,GACX,QAAQ,GACR,OAAO,GACP,YAAY,GACZ,eAAe,GACf,WAAW,GACX,OAAO,GACP,OAAO,GACP,KAAK,GACL,OAAO,GAGP,MAAM,GACN,YAAY,GACZ,aAAa,GACb,MAAM,CAAC;AAEX,oBAAY,aAAa,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;IACxC,GAAG,MAAC;IACJ,OAAO,MAAC;CACT,KAAK;IACJ,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,KAAA,KAAK,KAAK,CAAA;KAAE,CAAC;IACnE,OAAO,EAAE,CAAC,QAAQ,KAAA,KAAK;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAAA;KAAE,CAAC;IACjE,QAAQ,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAA;KAAE,CAAC;CAC1D,CAAC;AAEF,oBAAY,aAAa,GAAG,CAAC,QAAQ,KAAA,KAAK,iBAAiB,CAAC;AAE5D,oBAAY,eAAe,GAAG,CAAC,UAAU,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvD,oBAAY,aAAa,GAAG,GAAG,CAAC;AAEhC,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE;IACrC,IAAI,MAAC;IACL,eAAe,MAAC;IAChB,OAAO,MAAC;IACR,WAAW,MAAC;CACb,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC"}
+{"version":3,"file":"code_types.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/code_types.ts"],"names":[],"mappings":"AAEA,oBAAY,QAAQ,GAChB,SAAS,GACT,gBAAgB,GAChB,UAAU,GACV,cAAc,GACd,SAAS,GACT,WAAW,GACX,QAAQ,GACR,OAAO,GACP,YAAY,GACZ,eAAe,GACf,WAAW,GACX,OAAO,GACP,OAAO,GACP,KAAK,GACL,OAAO,GACP,UAAU,GAGV,MAAM,GACN,YAAY,GACZ,aAAa,GACb,MAAM,CAAC;AAEX,oBAAY,aAAa,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;IACxC,GAAG,MAAC;IACJ,OAAO,MAAC;CACT,KAAK;IACJ,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,KAAA,KAAK,KAAK,CAAA;KAAE,CAAC;IACnE,OAAO,EAAE,CAAC,QAAQ,KAAA,KAAK;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAAA;KAAE,CAAC;IACjE,QAAQ,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAA;KAAE,CAAC;CAC1D,CAAC;AAEF,oBAAY,aAAa,GAAG,CAAC,QAAQ,KAAA,KAAK,iBAAiB,CAAC;AAE5D,oBAAY,eAAe,GAAG,CAAC,UAAU,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvD,oBAAY,aAAa,GAAG,GAAG,CAAC;AAEhC,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE;IACrC,IAAI,MAAC;IACL,eAAe,MAAC;IAChB,OAAO,MAAC;IACR,WAAW,MAAC;CACb,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC"}

package/lib/weapps-core/utils/style.js

@@ -214,14 +214,7 @@ function translateStyleByHandler(style = {}, handler) {
             setStyleValue(result, key, value);
         }
         else if (value !== undefined && value !== null) {
-          try {
-
             setStyleValue(result, key, handler(value));
-          }catch(e){
-            console.log(style,key,value)
-            console.log(e)
-            throw e
-          }
         }
         return result;
     }, {});
@@ -264,7 +257,6 @@ function toREM(cssLen) {
         return calPxToREM(cssLen);
     }
     else {
-        console.log(cssLen)
         throw new Error('cssLen type error');
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.6",
+  "version": "0.7.8-beta.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/src/handlers/utils/common.js

@@ -218,29 +218,44 @@ export async function checkAnonymous() {
   return isAnonymous;
 }
 
+let loginConfig;
+export async function getLoginConfig() {
+  if (loginConfig !== undefined) {
+    return loginConfig;
+  }
+  const { staticResourceDomain, id } = app.__internal__.getConfig();
+  const url = `https://${staticResourceDomain}/${id}/login.config.json?t=${Date.now()}`;
+  try {
+    let response = await fetch(url);
+    loginConfig = await response.json();
+  } catch (e) {
+    loginConfig = {};
+    console.error(`加载登录配置${url}失败`, e);
+  }
+  return loginConfig;
+}
+
 /**
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
   <% if (isAdminPortal || isXPage) { %>return true;<% } %>
-  const loginPage = findLoginPage(app);
-  if (loginPage?.id === $page.id) {
-    return true
-  }
-  app.showNavigationBarLoading();
+    app.showNavigationBarLoading();
+  const loginConfig = await getLoginConfig();
   const requestList = [getAccessPermission(app, appId, $page.id)];
-  // 暂时先认为有登录页则自定义登录功能开启且生效
-  if (loginPage) {
+  // 登录配置内有web登录项则认为开启web登录
+  if (loginConfig.web?.length > 0) {
     requestList.push(getAuthConfig(app));
     requestList.push(checkAnonymous());
+    requestList.push(getLoginConfig()); // 提前并行加载
   }
   const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (loginPage && isAnonymous) {
+  if (loginConfig.web?.length > 0 && isAnonymous) {
     if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
-      return isAccess;
+      return false;
     }
   }
 
@@ -253,25 +268,22 @@ export async function checkAuth(app, appId, $page) {
   return isAccess;
 }
 
-export function redirectToLogin(currentPage) {
+export async function redirectToLogin(currentPage) {
   // 去登录则清空权限缓存。
   _AUTH_CACHE_MAP = {};
   const app = window.app;
-  const loginPage = findLoginPage(app);
-  if (!currentPage) {
-    currentPage = app.utils.getCurrentPage() || {};
-  }
-  if (loginPage?.id === currentPage.id) {
-    return true
-  }
-  if (loginPage) {
+
+  const loginConfig = await getLoginConfig();
+  if (loginConfig.web?.length > 0) {
+    const { staticResourceDomain, envId, id, clientId } = app.__internal__.getConfig();
+    const url = `${location.origin}/__auth/?redirect_uri=${encodeURIComponent(
+      location.href,
+    )}&app_id=${id}&env_id=${envId}&client_id=${clientId}`;
     app.redirectTo({
-      pageId: loginPage.id,
-      params: {
-        sourcePageId: currentPage.id,
-        sourcePageParams: currentPage.dataset.params
-      }
-    })
+      mode: 'web',
+      params: {},
+      url,
+    });
   } else {
     app.showToast({
       title: '用户未登录',

package/template/src/index.jsx

@@ -12,7 +12,7 @@ import attachFastClick from 'fastclick'
 import { initWebConfig } from 'handlers/lifecycle'
 const AppConfig = require('../webpack/miniprogram.config')
 import { app } from './app/global-api'
-import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './handlers/utils'
+import { redirectToLogin, getAuthConfig, checkAnonymous, getLoginConfig } from './handlers/utils'
 // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
@@ -26,8 +26,7 @@ setConfig({
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginPage = findLoginPage();
-
+      const loginConfig = await getLoginConfig();
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -39,7 +38,7 @@ setConfig({
       }
 
       // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+      if (!(loginConfig.web?.length > 0) || (params?.data?.mode === 'c' && skip)) {
         return params;
       }
       const { accessToken } = await getAccessToken();
@@ -60,8 +59,8 @@ setConfig({
   },
   async afterCallFunction(params, error, res) {
     if(params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginPage = findLoginPage();
-      if (loginPage) {
+      const loginConfig = await getLoginConfig();
+      if (loginConfig.web?.length > 0) {
         const authConfig = await getAuthConfig();
         const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {

package/template/src/pages/app.tpl

@@ -157,33 +157,38 @@ export default function App() {
           __html: `<%= pageStyleText %>`,
         }}
       />
-      {weDaHasLogin && !isPure && (
-        <AppRender pageListenerInstances={pageListenerInstances}
-          virtualFields={virtualFields}
-          componentSchema={componentSchema}
-          context={dataContextRef.current}
-           /**
-            * 更新数据容器的上下文的方法
-            * 会传递到事件emit的地方，将从组件获取到的数据data赋值给上下文
-            * 当组件卸载时，传过来的data为undefined即可
-            * {
-            *   id1: [{...}],
-            *   id2: {...},
-            *   id3: undefined,
-            *   id4: null,
-            *   ...
-            * }
-            * @param id
-            * @param data
-            */
-          updateContext={(id, data) => {
-            if (id) {
-              dataContextRef.current[id] = { data };
-              // console.log('111', context[id])
-            }
-          }}
-        />
-      )}
+      {weDaHasLogin &&
+        !isPure &&
+        (PageLifeCycle.onPageRender ? (
+          PageLifeCycle.onPageRender()
+        ) : (
+          <AppRender
+            pageListenerInstances={pageListenerInstances}
+            virtualFields={virtualFields}
+            componentSchema={componentSchema}
+            context={dataContextRef.current}
+            /**
+             * 更新数据容器的上下文的方法
+             * 会传递到事件emit的地方，将从组件获取到的数据data赋值给上下文
+             * 当组件卸载时，传过来的data为undefined即可
+             * {
+             *   id1: [{...}],
+             *   id2: {...},
+             *   id3: undefined,
+             *   id4: null,
+             *   ...
+             * }
+             * @param id
+             * @param data
+             */
+            updateContext={(id, data) => {
+              if (id) {
+                dataContextRef.current[id] = { data };
+                // console.log('111', context[id])
+              }
+            }}
+          />
+        ))}
     </div>
   );
 }