@cloudbase/lowcode-builder 1.8.85 → 1.8.87

package/package.json

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

package/template/html/index.html.ejs

@@ -23,17 +23,19 @@
     <% })%> <% if(cdnEndpoints.aegis){ %>
     <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
     <script>
-      const _aegis = new Aegis({
-        id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
-        reportApiSpeed: true, // 接口测速
-        reportAssetSpeed: true, // 静态资源测速
-        spa: true,
-        ext1: '<%=appId%>',
-        ext3: '<%=ext3%>',
-        version: '<%= !isAdminPortal? "0.0.2" : "0.0.3" %>',
-        env: '<%= mode !== "production"? "pre" : "production" %>',
-      });
-      window._aegis = _aegis;
+      if (Aegis) {
+        const _aegis = new Aegis({
+          id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
+          reportApiSpeed: true, // 接口测速
+          reportAssetSpeed: true, // 静态资源测速
+          spa: true,
+          ext1: '<%=appId%>',
+          ext3: '<%=ext3%>',
+          version: '<%= !isAdminPortal? "0.0.2" : "0.0.3" %>',
+          env: '<%= mode !== "production"? "pre" : "production" %>',
+        });
+        window._aegis = _aegis;
+      }
       window._aegis_inited = Date.now();
     </script>
     <% }%>
@@ -543,7 +545,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.e1085a387b7fdbc5b299.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.4b74407996a537f4d5a6.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/query.js

@@ -16,6 +16,11 @@ export class Query {
   #observableValue = observable({ data: null, error: null, isFetching: false });
   #eventHandlerMap = {};
   #action = () => {};
+  #runQueryMap = {
+    sql: { QueryResource: 'mysql-plugin', QueryPath: '/WeDa/Query/V1/RunPluginQuery' },
+    sqlserver: { QueryResource: 'mssql-plugin', QueryPath: '/WeDa/Query/V1/RunPluginQuery' },
+    'cloud-connector': { QueryResource: 'apis-plugin', QueryPath: '/WeDa/Connector/v1/RunApisQuery' },
+  };
   constructor({ schema, context, options = {} }) {
     const { looseError = false } = options;
     this.#schema = schema;
@@ -33,7 +38,7 @@ export class Query {
         autorun(
           (r) => {
             try {
-              const data = this.#resolveParams();
+              const data = this.#resolveParams({}, { combainErrors: true });
               if (this.#triggered) {
                 this.#debounceTrigger(data);
               }
@@ -59,76 +64,85 @@ export class Query {
 
     const { $w } = this.#context;
 
-    this.#action =
-      this.#schema.type === 'sql' || this.#schema.type === 'sqlserver'
-        ? async function (data) {
-            const requestData = {
-              EnvId: $w.env.envId,
-              Name: data.sqlTemplateId,
-              Parameter: JSON.stringify(
-                Object.entries(data.params || {}).reduce((list, [key, value]) => {
-                  if (value !== undefined) {
-                    let type = 'OBJECT';
-                    const typeofValue = typeof value;
-                    switch (typeofValue) {
-                      case 'boolean': {
-                        type = 'BOOLEAN';
-                        break;
-                      }
-                      case 'number': {
-                        type = 'NUMBER';
-                        break;
-                      }
-                      case 'string': {
-                        type = 'STRING';
-                        break;
-                      }
-                      default: {
-                        if (Array.isArray(value)) {
-                          type = 'ARRAY';
-                        } else {
-                          type = 'OBJECT';
-                        }
+    this.#action = this.#isRunQueryType
+      ? async function (data) {
+          const requestData = {
+            EnvId: $w.env.envId,
+            Name: data.sqlTemplateId,
+            Parameter: JSON.stringify(
+              Object.entries(data.params || {}).reduce((list, [key, value]) => {
+                if (value !== undefined) {
+                  let type = 'OBJECT';
+                  const typeofValue = typeof value;
+                  switch (typeofValue) {
+                    case 'boolean': {
+                      type = 'BOOLEAN';
+                      break;
+                    }
+                    case 'number': {
+                      type = 'NUMBER';
+                      break;
+                    }
+                    case 'string': {
+                      type = 'STRING';
+                      break;
+                    }
+                    default: {
+                      if (Array.isArray(value)) {
+                        type = 'ARRAY';
+                      } else {
+                        type = 'OBJECT';
                       }
                     }
-
-                    list.push({
-                      Key: key,
-                      Type: type,
-                      Value: type === 'STRING' ? value : JSON.stringify(value),
-                    });
                   }
 
-                  return list;
-                }, []) || [],
-              ),
-            };
+                  list.push({
+                    Key: key,
+                    Type: type,
+                    Value: type === 'STRING' ? value : JSON.stringify(value),
+                  });
+                }
+
+                return list;
+              }, []) || [],
+            ),
+          };
+
+          const Data = await $w.cloud.callWedaApi({
+            action: 'RunQuery',
+            CallQuery: true,
+            ...(this.#runQueryMap[this.#schema.type] || this.#runQueryMap['sql']),
+            EnvId: requestData.EnvId,
+            QueryName: requestData.Name,
+            data: requestData,
+          });
 
-            const Data = await $w.cloud.callWedaApi({
-              action: 'RunQuery',
-              CallQuery: true,
-              QueryResource: this.#schema.type === 'sql' ? 'mysql-plugin' : 'mssql-plugin',
-              QueryPath: '/WeDa/Query/V1/RunPluginQuery',
-              EnvId: requestData.EnvId,
-              QueryName: requestData.Name,
-              data: requestData,
-            });
+          // const Data = await $w.cloud.callWedaApi({
+          //   action: 'RunPluginQuery',
+          //   data: {
+          //     MainAppId: $w.app.id,
+          //     ...requestData
+          //   },
+          // });
 
-            // const Data = await $w.cloud.callWedaApi({
-            //   action: 'RunPluginQuery',
-            //   data: {
-            //     MainAppId: $w.app.id,
-            //     ...requestData
-            //   },
-            // });
+          const { ExecuteResultList = [], Total, Payload } = Data || {};
 
-            const { ExecuteResultList = [], Total } = Data || {};
-            return {
-              records: ExecuteResultList.map((item) => JSON.parse(item)),
-              total: Total || ExecuteResultList.length,
-            };
-          }
-        : this.#schema.handler;
+          let payload = Payload;
+          try {
+            if (Payload) {
+              payload = JSON.parse(Payload);
+            }
+          } catch (e) {}
+          return {
+            ...(this.#schema.type === 'cloud-connector'
+              ? payload
+              : {
+                  records: ExecuteResultList.map((item) => JSON.parse(item)),
+                  total: Total || ExecuteResultList.length,
+                }),
+          };
+        }
+      : this.#schema.handler;
     this.#eventHandlerMap = Object.entries(
       createEventHandlers(this.#schema.eventHandlers || {}, {
         looseError: looseError,
@@ -164,6 +178,9 @@ export class Query {
   get isFetching() {
     return this.#observableValue.isFetching;
   }
+  get #isRunQueryType() {
+    return !!this.#runQueryMap[this.#schema.type];
+  }
   async trigger(additionalScope, options = {}) {
     this.#triggered = true;
     return this.#innerTrigger(this.#resolveParams(additionalScope), options);
@@ -217,7 +234,7 @@ export class Query {
     }, 300);
   }
 
-  #resolveParams(additionalScope = {}) {
+  #resolveParams(additionalScope = {}, options = {}) {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
@@ -227,7 +244,7 @@ export class Query {
       mergeDynamic2StaticData(toJS(this.#paramsRef.current), this.#dataBinds, {
         $w: this.#context.$w,
         paramsContext: additionalScope,
-      }) || {};
+      }, options?.combainErrors) || {};
 
     return params;
   }

package/template/mp/common/util.js

@@ -714,6 +714,7 @@ export function mergeDynamic2StaticData(
     dataContext?: Record<string,any>;
     paramsContext?: Record<string,any>;
   }*/,
+  combainErrors = false,
 ) {
   const { forContext = {}, codeContext = {}, dataContext = {}, $w, paramsContext = {} } = context;
   const { lists = [], forItems = {} } = forContext;
@@ -721,22 +722,34 @@ export function mergeDynamic2StaticData(
   const resolvedData = {
     ...staticData,
   };
+  let error = null;
 
   for (const key in dataBinds) {
-    set(
-      resolvedData,
-      key,
-      dataBinds[key].call(
-        codeContext.instance,
-        codeContext.instance,
-        lists,
-        forItems,
-        codeContext.event,
-        dataContext,
-        $w,
-        paramsContext,
-      ),
-    );
+    try {
+      set(
+        resolvedData,
+        key,
+        dataBinds[key].call(
+          codeContext.instance,
+          codeContext.instance,
+          lists,
+          forItems,
+          codeContext.event,
+          dataContext,
+          $w,
+          paramsContext,
+        ),
+      );
+    } catch(e) {
+      if(combainErrors) {
+        error = e
+      } else {
+        throw e
+      }
+    }
+  }
+  if(error) {
+    throw error
   }
 
   return resolvedData;

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

@@ -310,10 +310,12 @@ export function createPage({
         this._disposers.push(...runWatchers(index, this));
 
         await this.beforePageCustomLaunch?.(this._query);
-        const hook = lifecycle.onReady || lifecycle.onPageReady;
-        await hook?.call?.($page);
+        setTimeout(async () => {
+          const hook = lifecycle.onReady || lifecycle.onPageReady;
+          await hook?.call?.($page);
 
-        this._invokeEventHandler('ready');
+          this._invokeEventHandler('ready');
+        }, 100);
       },
       onUnload() {
         const $page = this._getInstance();