@cloudbase/framework-plugin-low-code 0.7.15 → 0.7.18-beta.0

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;AAgBnD,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,qBAAQ,EACrB,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBAuEf;AACD,wBAAsB,mBAAmB,CAAC,YAAY,oBAAa,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,KAAA,iBAM/F"}
+{"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;AAgBnD,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,qBAAQ,EACrB,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBAwEf;AACD,wBAAsB,mBAAmB,CAAC,YAAY,oBAAa,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,KAAA,iBAM/F"}

package/lib/builder/core/generate.js

@@ -53,7 +53,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
             }
         });
         yield Promise.all(allAppDataList.map((data) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             const { pageInstanceList, rootPath = '' } = data;
             const appName = rootPath ? `Sub app ${rootPath}` : 'Main app';
             console.log(chalk_1.default.blue.bold(`Generating files for ${appName}`));
@@ -70,6 +70,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
                     id: appKey,
                     envId: appData.envId,
                     clientId: (_a = appData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
+                    loginConfigVersion: (_b = appData.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
                     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;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;AAiBD,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;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAiC,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQrG,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,CA+OvC;AAsJD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,iBAuB9F;AAiBD,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;;;EA6BA"}

package/lib/builder/mp/index.js

@@ -81,7 +81,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             weapps,
             materials,
         });
-        buildContext['miniprogramPlugins'] = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
+        buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
         yield (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
         const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
         const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext);
@@ -105,7 +105,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                 yield (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
             }
             appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
-                    domain: domain,
+                    domain,
                 }, 'common/util.js': {
                     isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
                 }, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
@@ -128,11 +128,9 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             yield (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
         }
         else {
-            appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig: yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
+            appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
                     importStyles: materials.reduce((styles, lib) => {
-                        styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/')
-                            ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}`
-                            : stylePath) || []);
+                        styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/') ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}` : stylePath) || []);
                         return styles;
                     }, []),
                 }, 'package.json': {
@@ -140,14 +138,10 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                     extraDeps: resolveNpmDeps(),
                 } });
         }
-        console.log('Generating ' + em('miniprogramRoot') + ' files');
+        console.log(`Generating ${em('miniprogramRoot')} files`);
         yield (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot, buildContext);
-        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}`);
+        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}`);
             yield fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
         }
         if (weapps.find((item) => !item.mpPkgUrl)) {
@@ -170,7 +164,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                     datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, dataSource_1.getDatasetProfiles)(mainAppData, weapps)),
                 },
             };
-            console.log('Generating ' + em('datasources') + ' files');
+            console.log(`Generating ${em('datasources')} files`);
             yield (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
         }
         yield Promise.all(weapps.map((app, index) => __awaiter(this, void 0, void 0, function* () {
@@ -225,7 +219,7 @@ exports.generateWxMp = generateWxMp;
 function generatePkg(weapp, appRoot, ctx, pageConfigs) {
     return __awaiter(this, void 0, void 0, function* () {
         const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
-        console.log('Generating ' + em(weapp.rootPath ? 'subApp' : 'app') + ' to ' + appRoot);
+        console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
         if (weapp.mpPkgUrl) {
             console.log(`Removing ${appRoot}`);
             yield (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
@@ -235,7 +229,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
             }
         }
         else {
-            console.log('Generating ' + em('page') + ' files');
+            console.log(`Generating ${em('page')} files`);
             (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
             yield Promise.all(weapp.pageInstanceList.map((page) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
@@ -251,12 +245,10 @@ 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_1.default.relative(rootPath, '') + '/' : '',
+                        subLevelPath: rootPath ? `${path_1.default.relative(rootPath, '')}/` : '',
                     },
                     [`index.json|${pageFileName}.json`]: {
                         usingComponents,
@@ -314,9 +306,7 @@ function generateFramework(appData, outDir, ctx) {
                 fileData = Object.assign(Object.assign({}, fileData), { 'app/app-global.js': {}, 'app/weapps-api.js': {
                         appId: ctx.appId,
                         domain: ctx.domain || '',
-                        subLevelPath: appData.rootPath
-                            ? path_1.default.relative(`${appData.rootPath}`, '') + '/'
-                            : '',
+                        subLevelPath: appData.rootPath ? `${path_1.default.relative(`${appData.rootPath}`, '')}/` : '',
                         subPackageName: appData.rootPath || '',
                         isBare: false,
                         appConfig: (0, util_3.JsonToStringWithVariableName)({
@@ -367,12 +357,12 @@ exports.writeLowCodeFiles = writeLowCodeFiles;
 function getAppendableJson(json) {
     const obj = Object.assign({}, json);
     if (obj.reachBottomDistance) {
-        obj.onReachBottomDistance = obj.reachBottomDistance;
+        obj.onReachBottomDistance = parseInt(obj.reachBottomDistance) || 0;
         delete obj.reachBottomDistance;
     }
     if (obj && Object.keys(obj).length > 0) {
         const str = JSON.stringify(obj);
-        return ',\n' + str.substr(1, str.length - 2);
+        return `,\n${str.substr(1, str.length - 2)}`;
     }
     return '';
 }
@@ -388,10 +378,7 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
     });
     let allAppUsedComps = appUsedComps.reduce((comps, item) => {
         Object.keys(item.usedComps).forEach((libName) => {
-            comps[libName] = new Set([
-                ...Array.from(item.usedComps[libName]),
-                ...Array.from(comps[libName] || []),
-            ]);
+            comps[libName] = new Set([...Array.from(item.usedComps[libName]), ...Array.from(comps[libName] || [])]);
         });
         return comps;
     }, {});
@@ -419,9 +406,7 @@ function cleanPkg(pkg, miniprogramRoot) {
         if (pkg.mpPkgUrl) {
             return;
         }
-        const pkgDir = [miniprogramRoot, pkg.rootPath]
-            .filter((p) => !!p)
-            .join(path_1.default.sep);
+        const pkgDir = [miniprogramRoot, pkg.rootPath].filter((p) => !!p).join(path_1.default.sep);
         const pagesDir = path_1.default.join(pkgDir, 'pages');
         const lowcodesDir = path_1.default.join(pkgDir, 'lowcode');
         const existedPages = yield fs.readdir(pagesDir);
@@ -436,13 +421,11 @@ function cleanPkg(pkg, miniprogramRoot) {
             }
             else {
                 const handlersDir = path_1.default.join(lowcodeDir, 'handler');
-                const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => m.name + '.js')) || [];
+                const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => `${m.name}.js`)) || [];
                 (0, generateFiles_1.cleanDir)(handlersDir, handlers);
             }
         });
-        const commonModules = pkg.lowCodes
-            .filter((m) => m.type === 'normal-module')
-            .map((m) => m.name + '.js');
+        const commonModules = pkg.lowCodes.filter((m) => m.type === 'normal-module').map((m) => `${m.name}.js`);
         const commonDir = path_1.default.join(lowcodesDir, 'common');
         (0, generateFiles_1.cleanDir)(commonDir, commonModules);
     });

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

@@ -37,6 +37,7 @@ export interface IWeAppData {
     extra: {
         domain: string;
         clientId?: string;
+        loginConfigVersion?: string;
     };
 }
 export interface IWeAppPage {

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

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/app.ts"],"names":[],"mappings":"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"}

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

@@ -25,6 +25,7 @@ export interface IWebRuntimeAppData extends IAppAndPageVar {
     extra: {
         domain: string;
         clientId?: string;
+        loginConfigVersion?: string;
     };
 }
 export interface IPageInstance extends ICommonInstanceProps, IAppAndPageVar {

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

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/web.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/web.ts"],"names":[],"mappings":"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"}

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.15",
+  "version": "0.7.18-beta.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/html/index.html.ejs

@@ -436,10 +436,10 @@
     ></script>
     <script
       crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.10/dist/h5.browser.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.11/dist/h5.browser.js"
     ></script>
     <script>
-      // zxing polifill 
+      // zxing polifill
       if (!this.globalThis) {
         this.globalThis = this;
       }
@@ -450,7 +450,7 @@
     ></script>
     <script
       crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.10/dist/web.browser.js"
+      src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.11/dist/web.browser.js"
     ></script>
   </body>
 </html>

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

@@ -214,41 +214,23 @@ 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;<% } %>
     app.showNavigationBarLoading();
-  const loginConfig = await getLoginConfig();
+  const { loginConfigVersion } = app.__internal__.getConfig();
   const requestList = [getAccessPermission(app, appId, $page.id)];
-  // 登录配置内有web登录项则认为开启web登录
-  if (loginConfig.web?.length > 0) {
+  // 有登录配置版本号时，才拉取自定义登录配置进行校验
+  if (loginConfigVersion) {
     requestList.push(getAuthConfig(app));
     requestList.push(checkAnonymous());
-    requestList.push(getLoginConfig()); // 提前并行加载
   }
   const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (loginConfig.web?.length > 0 && isAnonymous) {
+  if (loginConfigVersion && isAnonymous) {
     if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
       return false;
@@ -269,12 +251,11 @@ export async function redirectToLogin(currentPage) {
   _AUTH_CACHE_MAP = {};
   const app = window.app;
 
-  const loginConfig = await getLoginConfig();
-  if (loginConfig.web?.length > 0) {
-    const { staticResourceDomain, envId, id, clientId } = app.__internal__.getConfig();
+  const { envId, id, clientId, loginConfigVersion } = app.__internal__.getConfig();
+  if (loginConfigVersion) {
     const url = `${location.origin}/__auth/?redirect_uri=${encodeURIComponent(
       location.href,
-    )}&app_id=${id}&env_id=${envId}&client_id=${clientId}`;
+    )}&app_id=${id}&env_id=${envId}&client_id=${clientId}&config_version=${loginConfigVersion}`;
     app.redirectTo({
       mode: 'web',
       params: {},

package/template/src/index.jsx

@@ -1,3 +1,11 @@
+/**
+ * 当本应用是乾坤子应用是，publicPath需要设置为子应用的相对路径
+ * 这个变量时序重要需要先初始化
+ */
+if (window.__POWERED_BY_QIANKUN__) {
+  __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+}
+
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth } from '@cloudbase/weda-client'
@@ -11,7 +19,7 @@ import '@babel/polyfill/noConflict'
 import { initWebConfig } from 'handlers/lifecycle'
 const AppConfig = require('../webpack/miniprogram.config')
 import { app } from './app/global-api'
-import { redirectToLogin, getAuthConfig, checkAnonymous, getLoginConfig } from './handlers/utils'
+import { redirectToLogin, getAuthConfig, checkAnonymous } from './handlers/utils'
 // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
@@ -25,7 +33,7 @@ WEDA_CLOUD_SDK.setConfig({
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginConfig = await getLoginConfig();
+      const { loginConfigVersion } = app.__internal__.getConfig();
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -37,7 +45,7 @@ WEDA_CLOUD_SDK.setConfig({
       }
 
       // 后续做过滤处理
-      if (!(loginConfig.web?.length > 0) || (params?.data?.mode === 'c' && skip)) {
+      if (!loginConfigVersion || (params?.data?.mode === 'c' && skip)) {
         return params;
       }
       const { accessToken } = await auth.getAccessToken();
@@ -58,8 +66,8 @@ WEDA_CLOUD_SDK.setConfig({
   },
   async afterCallFunction(params, error, res) {
     if(params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginConfig = await getLoginConfig();
-      if (loginConfig.web?.length > 0) {
+      const { loginConfigVersion } = app.__internal__.getConfig();
+      if (loginConfigVersion) {
         const authConfig = await getAuthConfig();
         const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {