@cloudbase/framework-plugin-low-code 0.7.12 → 0.7.15

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,iBAsEf;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,iBAuEf;AACD,wBAAsB,mBAAmB,CAAC,YAAY,oBAAa,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,KAAA,iBAM/F"}

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;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"}
+{"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"}

package/lib/builder/mp/index.js

@@ -364,7 +364,12 @@ function writeLowCodeFiles(appData, outDir, ctx) {
     });
 }
 exports.writeLowCodeFiles = writeLowCodeFiles;
-function getAppendableJson(obj) {
+function getAppendableJson(json) {
+    const obj = Object.assign({}, json);
+    if (obj.reachBottomDistance) {
+        obj.onReachBottomDistance = obj.reachBottomDistance;
+        delete obj.reachBottomDistance;
+    }
     if (obj && Object.keys(obj).length > 0) {
         const str = JSON.stringify(obj);
         return ',\n' + str.substr(1, str.length - 2);

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

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

package/lib/builder/service/builder/generate.js

@@ -127,6 +127,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
             isComposite: extraData.isComposite,
             compProps: extraData.compProps,
             title: data.navigationBarTitleText || data.title || '',
+            reachBottomDistance: data.reachBottomDistance || 0
         };
         const dest = path_1.default.resolve(appBuildDir, `./pages/${pageInstance.id}/index.jsx`);
         const template = yield fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './src/pages/app.tpl'), {

package/lib/builder/service/builder/webpack.d.ts.map

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

package/lib/builder/service/builder/webpack.js

@@ -192,7 +192,6 @@ function generateKbonePageConfig(mpConfig, mainAppData, subAppDataList = []) {
             config_1.KBONE_PAGE_KEYS.forEach((key) => {
                 if (item.data[key]) {
                     mpConfig.pages[pageId][key] = item.data[key];
-                    delete item.data[key];
                 }
             });
             mpConfig.pages[pageId].extra = Object.assign(Object.assign({}, item.data), { navigationBarTitleText });
@@ -318,7 +317,10 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
             jsApis = jsApis.concat(assets);
         }
     }
-    const getPublicPath = () => buildTypeList.includes("app") || buildTypeList.includes("adminPortal") ? '' : publicPath;
+    const getPublicPath = () => buildTypeList.includes("app") ||
+        buildTypeList.includes("adminPortal")
+        ? ''
+        : publicPath;
     return {
         context: appBuildDir,
         mode: mode !== "production" ? 'development' : mode,
@@ -508,6 +510,7 @@ function installDependencies(targetDir, options = {}) {
         installProcess.on('exit', () => console.timeEnd(operationTag));
         yield (0, process_1.promisifyProcess)(installProcess);
         try {
+            fixNodeModules(targetDir);
             yield fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'package-lock.json')));
             yield fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'yarn.lock')));
         }
@@ -515,6 +518,16 @@ function installDependencies(targetDir, options = {}) {
     });
 }
 exports.installDependencies = installDependencies;
+function fixNodeModules(projDir) {
+    const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
+    if (fs_extra_1.default.existsSync(mobxPackageFile)) {
+        const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
+        if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
+            mobxPackageFileContent.main = 'lib/mobx.min.js';
+            fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
+        }
+    }
+}
 function getMaterialNodeModulesPathList(dependencies = [], materialsDir) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
     return dependencies.map(({ name, version }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.12",
+  "version": "0.7.15",
   "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

@@ -439,7 +439,7 @@
       src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.10/dist/h5.browser.js"
     ></script>
     <script>
-      // zxing polifill
+      // zxing polifill 
       if (!this.globalThis) {
         this.globalThis = this;
       }

package/template/mp/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {},
   "dependencies": {
-    "@cloudbase/weda-client": "0.2.8",
+    "@cloudbase/weda-client": "0.2.10",
     "@cloudbase/oauth": "0.1.1-alpha.5",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",

package/template/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-alpha.0",
-    "@cloudbase/weda-client": "0.2.8",
+    "@cloudbase/weda-client": "0.2.10",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",

package/template/src/handlers/lifecycle.js

@@ -139,6 +139,7 @@ export function pageLifeCycleMount(
     onTabItemTap,
   },
   app = {},
+  extra = {}
 ) {
   let queryText = location.href.split('?')[1];
   let query = querystring.parse(queryText);
@@ -175,15 +176,15 @@ export function pageLifeCycleMount(
 
         // console.log(scrollTop, windowHeight, scrollTop + windowHeight, scrollHeight, isReachBottom)
         //滚动条到底部
-        if (scrollTop + windowHeight >= scrollHeight && !isReachBottom) {
+        if (scrollTop + windowHeight >= scrollHeight - (extra.reachBottomDistance || 50)) {
           //要进行的操作
-          isReachBottom = true;
-          if (typeof onReachBottom === 'function') {
-            onReachBottom();
+          if (!isReachBottom) {
+            isReachBottom = true;
+            if (typeof onReachBottom === 'function') {
+              onReachBottom();
+            }
           }
-        }
-        // 容许用户回弹50然后执行ReachBottom， 50为测试最佳值
-        if (scrollTop + windowHeight < scrollHeight - 50) {
+        } else {
           isReachBottom = false;
         }
       }, 300);

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

@@ -214,29 +214,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;
     }
   }
 
@@ -249,25 +264,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

@@ -11,7 +11,7 @@ import '@babel/polyfill/noConflict'
 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);
@@ -25,8 +25,7 @@ WEDA_CLOUD_SDK.setConfig({
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginPage = findLoginPage();
-
+      const loginConfig = await getLoginConfig();
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -38,7 +37,7 @@ WEDA_CLOUD_SDK.setConfig({
       }
 
       // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+      if (!(loginConfig.web?.length > 0) || (params?.data?.mode === 'c' && skip)) {
         return params;
       }
       const { accessToken } = await auth.getAccessToken();
@@ -59,8 +58,8 @@ WEDA_CLOUD_SDK.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

@@ -128,7 +128,7 @@ export default function App() {
     React.useEffect(() => {
       document.title = "<%= title %>"
     }, [])
-    pageLifeCycleMount(React.useEffect, PageLifeCycle, app)
+    pageLifeCycleMount(React.useEffect, PageLifeCycle, app, {reachBottomDistance:<%= reachBottomDistance %>})
   }
 
   React.useEffect(() => {