@cloudbase/lowcode-builder 1.8.52 → 1.8.54

package/lib/builder/mp/materials.js

@@ -296,7 +296,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
                 .map((m) => m.name),
             eventHandlers: (0, util_3.createEventHandlers)(compositeCtx, componentInstances, weapps_core_1.COMPONENT_API_PREFIX),
             // protectEventKeys: builtinMpEvents,
-            emitEvents: compositedComp.emitEvents.map((evt) => evt.eventName),
+            emitEvents: (compositedComp.emitEvents || []).map((evt) => evt.eventName),
             widgetProps: (0, util_3.createWidgetProps)(compositeCtx, componentInstances),
             compApi: weapps_core_1.COMPONENT_API_PREFIX,
             jsonSchemaType2jsClass: mp_1.jsonSchemaType2jsClass,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.52",
+  "version": "1.8.54",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -89,4 +89,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/html/index.html.ejs

@@ -450,9 +450,7 @@
       </div>
       <% }%>
     </div>
-    <% jsApis.forEach(function(jsApi){%>
-    <script src="<%=jsApi %>"></script>
-    <% })%> <% if(canUseVite){ %>
+    <% if(canUseVite){ %>
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="/weda-config/weda-private.js"></script>
@@ -538,11 +536,14 @@
         cdnEndpoints.cdngo
       %>/lcap/lcap-resource-cdngo/-/release/_url/qcloud/lowcode/static/ide/assets/js/babel.min.js"
     ></script>
+    <% jsApis.forEach(function(jsApi){%>
+    <script src="<%=jsApi %>"></script>
+    <% })%>
     <script
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.b91c0084b8c065947b40.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.24b6f4f560a5d284c4ff.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -131,11 +131,17 @@ App({
         } finally {
           for (const queryId in app.dataset?.query || {}) {
             if (app.dataset.query[queryId]?._schema?.trigger === 'auto') {
-              try {
-                app.dataset?.query?.[queryId]?.trigger?.();
-              } catch (e) {
-                console.error(`query ${queryId} 初始化失败：`, e);
-              }
+              /**
+               * query 初始化不阻塞生命周期
+               */
+              Promise.resolve()
+                .then(async () => {
+                  await app.dataset?.query?.[queryId]?.initPromise;
+                  return app.dataset?.query?.[queryId]?.trigger?.();
+                })
+                .catch((e) => {
+                  console.error(`query ${queryId} 初始化失败：`, e);
+                });
             }
           }
           resolve();

package/template/mp/common/query.js

@@ -9,7 +9,8 @@ export class Query {
   #disposes = [];
   #dataBinds = {};
   #triggered = false;
-  #watched = false;
+  initPromise;
+  #initedResolver = (value) => {};
   #paramsRef = observable({ current: null });
   #currentRequestKey = null;
   #observableValue = observable({ data: null, error: null, isFetching: false });
@@ -22,24 +23,31 @@ export class Query {
       trigger: schema.trigger,
     };
     this.#context = context;
+
+    this.initPromise = new Promise((resolve) => {
+      this.#initedResolver = resolve;
+    });
+
     if (this.#schema?.trigger === 'auto') {
       this.#disposes.push(
         autorun(
           (r) => {
             try {
               const data = this.#resolveParams();
-              if (this.#watched && this.#triggered) {
+              if (this.#triggered) {
                 this.#debounceTrigger(data);
               }
             } catch (e) {
               console.error(e);
             } finally {
-              this.#watched = true
+              this.#initedResolver(true);
             }
           },
           { delay: 50 },
         ),
       );
+    } else {
+      this.#initedResolver(true);
     }
     this.#paramsRef.current = this.#schema.data;
     this.#dataBinds = Object.entries(this.#schema.dataBinds || {}).reduce((map, [prop, fn]) => {
@@ -52,7 +60,7 @@ export class Query {
     const { $w } = this.#context;
 
     this.#action =
-      this.#schema.type === 'sql'
+      this.#schema.type === 'sql' || this.#schema.type === 'sqlserver'
         ? async function (data) {
             const Data = await $w.cloud.callWedaApi({
               action: 'RunPluginQuery',

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;

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

@@ -225,12 +225,17 @@ export function createPage({
             // eslint-disable-next-line no-restricted-syntax
             for (const queryId in $page.dataset?.query || {}) {
               if ($page.dataset.query[queryId]?._schema?.trigger === 'auto') {
-                try {
-                  $page.dataset.query[queryId].trigger();
-                  this._disposers.push(() => $page.dataset.query[queryId].destroy());
-                } catch (e) {
-                  console.error(`query ${queryId} 初始化失败：`, e);
-                }
+                /**
+                 * query 初始化不阻塞生命周期
+                 */
+                Promise.resolve()
+                  .then(async () => {
+                    await $page.dataset.query[queryId]?.initPromise;
+                    return $page.dataset.query[queryId].trigger();
+                  })
+                  .catch((e) => {
+                    console.error(`query ${queryId} 初始化失败：`, e);
+                  });
               }
             }
             resolve();