@cloudbase/lowcode-builder 1.10.34 → 1.10.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.10.34",
+  "version": "1.10.36",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -49,8 +49,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.2.23",
-    "@cloudbase/lowcode-generator": "^1.8.42",
+    "@cloudbase/cals": "^1.2.25",
+    "@cloudbase/lowcode-generator": "^1.8.43",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",
     "compare-versions": "^3.6.0",
@@ -94,4 +94,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/html/index.html.ejs

@@ -557,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.75837ebefb01a0b87b0d.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.0ab216cf8f7a4031dead.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/packages/$wd_system/index.js.tpl

@@ -1,4 +1,5 @@
 import { registerAi, createAi } from "@cloudbase/ai";
+import { registerApis, generateApis } from "@cloudbase/apis";
 import { generateAuthInstance, registerAuth } from "@cloudbase/auth";
 <% if(cdnEndpoints.aegis){ %>import Aegis from 'aegis-mp-sdk';<%} else {%> class Aegis {
   constructor() {
@@ -32,6 +33,10 @@ const loadMap = {
     generateAuthInstance,
     registerAuth,
   },
+  "@cloudbase/apis": {
+    registerApis,
+    generateApis,
+  },
   "@cloudbase/adapter-wx_mp": require('@cloudbase/adapter-wx_mp')
 };
 

package/template/mp/packages/$wd_system/pages/login/methods/errorHandler.js

@@ -164,7 +164,7 @@ export const parseCommonError = (e) => {
       msg = `网络错误，请检查您的网络连接，稍后重试${prefixMsg(e.error_description)}`;
       break;
     case 'resource_exhausted':
-      return '验证码已被使用，或者尝试过于频繁，请稍后重试';
+      return '验证码已过期，或尝试过于频繁，请稍后重试，或选择其他登录方式';
     case 'license_required':
       return '该用户没有产品许可证，请授权后重试';
     default:

package/template/mp/packages/$wd_system/pages/login/methods/loginSuccessCallBack.js

@@ -13,6 +13,16 @@ export default function (instance) {
       pageId: query.sourcePageId,
       packageName: query.sourcePagePackageName || undefined,
       params,
+      fail: (res) => {
+        if (res.errMsg?.includes?.('tabbar page')) {
+          const path = `${
+            query.sourcePagePackageName ? '/packages/' + query.sourcePagePackageName : ''
+          }/pages/${query.sourcePageId}/index`
+          app.switchTab({ url: path })
+        } else {
+          app.relaunchHome()
+        }
+      }
     }) : app.relaunchHome();
   } catch (e) {
     app.relaunchHome();

package/template/webpack/web.prod.js

@@ -100,7 +100,7 @@ module.exports = function (options) {
     }),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
     new webpack.NormalModuleReplacementPlugin(
-      /@\/components\/(?!ui)(.*)|^@\/(lib|hooks|configs|utils)|^@\/components$/, // 使用否定前瞻匹配除ui外的所有路径
+      /@\/components\/(?!ui)(.*)|^@\/(lib|hooks|configs|utils|pages|layouts)|^@\/components$/, // 使用否定前瞻匹配除ui外的所有路径
       function (resource) {
         if (/lowcode\//.test(resource.context)) {
           if (resource.request === '@/components') {
@@ -234,6 +234,7 @@ module.exports = function (options) {
       // 函数
       function (context, request, callback) {
         const ScopeExternalsMap = {
+          'react-router-dom': 'window.ReactRouterDOM',
           recharts: 'window.SHADN.RECHARTS',
           'react-hook-form': 'window.SHADN.ReactHookForm',
           'lucide-react': 'window.SHADN.LUCIDE',
@@ -246,7 +247,7 @@ module.exports = function (options) {
           if (ScopeExternalsMap[request]) {
             callback(null, ScopeExternalsMap[request]);
             return;
-          } else if (request === '@/components/ui') {
+          } else if (request.startsWith('@/components/ui')) {
             callback(null, 'window.SHADN.components');
             return;
           }