@cloudbase/lowcode-builder 1.8.53 → 1.8.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.53",
+  "version": "1.8.55",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.38",
+    "@cloudbase/cals": "^1.0.40",
     "@cloudbase/lowcode-generator": "^1.8.15",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.24b6f4f560a5d284c4ff.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.7c8c70be6e292a1218fe.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -151,6 +151,22 @@ App({
     return this.globaldata._beforeCustomLaunchPromise;
   },
   async onLaunch(options) {
+    if (wx.onLazyLoadError) {
+      wx.onLazyLoadError(({ type, subpackage, errMsg}) => {
+        console.log('subpackage')
+        if(type === 'subpackage' && subpackage?.find(item=>item === '<%= materialSubPackagePath %>')) {
+          wx.showModal({
+            title: '组件包加载失败',
+            content: `加载组件包超时：${errMsg}，请退出重新进入。`,
+            showCancel: false,
+            success (res) {
+              return
+            }
+          })
+
+        }
+      })
+    }
     this.app = app;
     const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch;
     let { query = {} } = options;

package/template/mp/common/util.js

@@ -245,7 +245,7 @@ export function getDeep(target, key, keySeparator = '.') {
     return target;
   }
   const keys = `${key}`.split(keySeparator);
-  while (keys.length > 0 && target != null) {
+  while (keys.length > 0 && target != null && target !== undefined) {
     target = target[keys.shift()];
   }
   return keys.length === 0 ? target : undefined;
@@ -771,6 +771,9 @@ const PROMISE = new Promise((resolve,reject)=>{
 <% } %>
 
 export async function getExpiredMessage(createdTime = 0) {
+  if (wx.getSystemInfoSync().platform === 'devtools') {
+    return ;
+  }
 <% if(expirationStartTimesnap){ %>
   try {
     if (createdTime) {

package/template/mp/common/weapp-page.js

@@ -263,6 +263,7 @@ export function createPage({
 
         this._disposers.push(...runWatchers(index, this));
 
+        await this.beforePageCustomLaunch?.(this._query);
         const hook = lifecycle.onReady || lifecycle.onPageReady;
         await hook?.call?.($page);
 

package/template/mp/datasources/config.js.tpl

@@ -53,9 +53,14 @@ export const AEGIS_CONFIG = {
     wx.getAccountInfoSync()?.miniProgram?.appId || '',
   ].join('|'),
   version: "0.0.2",
-  env: CLOUD_CONFIG.isProd ? 'production' : 'pre',
-
+  env: wx.getSystemInfoSync().platform === 'devtools' ? 'development' : CLOUD_CONFIG.isProd ? 'production' : 'pre',
   hostUrl: 'https://rumt-zh.com', // 上报域名，中国大陆 rumt-zh.com
   spa: true, // spa 页面需要开启，页面切换的时候上报pv
+  beforeRequest: function(data) {
+    if (data.logType === 'pv') {
+      return false;
+    }
+    return data;
+  }
 }
 <% }%>

package/template/mp/datasources/index.js.tpl

@@ -29,7 +29,9 @@ import { default as config, AEGIS_CONFIG } from './config'
 
 setConfig(config)
 initTcb()
+
 <% if(cdnEndpoints.aegis){ %>
-import Aegis from 'aegis-mp-sdk';
-new Aegis(AEGIS_CONFIG);
+require.async('../packages/$wd_system/index.js').then(({ Aegis }) => {
+  new Aegis(AEGIS_CONFIG)
+})
 <% }%>

package/template/mp/package.json

@@ -6,8 +6,7 @@
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
     "@cloudbase/weda-client": "1.0.14",
-    "@cloudbase/weda-cloud-sdk": "1.0.46",<% if(cdnEndpoints.aegis){ %>
-    "aegis-mp-sdk": "~1.38.1",<% } %>
+    "@cloudbase/weda-cloud-sdk": "1.0.46",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

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

@@ -0,0 +1,11 @@
+<% if(cdnEndpoints.aegis){ %>import Aegis from 'aegis-mp-sdk';<%} else {%> class Aegis {
+  constructor() {
+    return new Proxy({}, {
+      get: (_,prop) => {
+        return () => {}
+      }
+    })
+  }
+}<% } %>
+
+export { Aegis }

package/template/mp/packages/$wd_system/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "wd-system-sub-package",
+  "version": "0.0.1",
+  "scripts": {},
+  "dependencies": {<% if(cdnEndpoints.aegis){ %>
+    "aegis-mp-sdk": "~1.38.1"<% } %>
+  }
+}

package/template/mp/page/index.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": <%= JSON.stringify(usingComponents, undefined, 2)%><%= extra %>
+  "usingComponents": <%= JSON.stringify(usingComponents, undefined, 2)%><%= componentPlaceholder? `, "componentPlaceholder": ${JSON.stringify(componentPlaceholder, undefined, 2)}` : "" %><%= extra %>
 }