@cloudbase/lowcode-builder 1.8.17 → 1.8.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.17",
+  "version": "1.8.18",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.12",
-    "@cloudbase/lowcode-generator": "^1.8.7",
+    "@cloudbase/cals": "^1.0.14",
+    "@cloudbase/lowcode-generator": "^1.8.8",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -525,7 +525,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.37/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.39/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -551,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.f686224dbca5407ae4d2.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.8bdf2bc04fec833b06b7.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -99,7 +99,7 @@ App({
       this.globaldata._beforeCustomLaunchPromise = new Promise(async (resolve)=>{
         try {
           EXTRA_API.setParams('$global', query || {})
-          await createStateDataSourceVar('$global', generateParamsParser({ app, $page: {} }));
+          await createStateDataSourceVar('$global', generateParamsParser({ app, $page: {}, $w: app.__internal__?.$w }));
         } catch (e) {
           throw e;
         } finally {

package/template/mp/common/flow.js

@@ -1,13 +1,15 @@
 import { createEventHandlers, getMpEventHandlerName } from './util';
 import { Event } from './event-emitter';
 export class EventFlow {
+  #eventHandlerMap = {};
+  #context = {}
   constructor({ schema, context, options }) {
-    this._eventHandlerMap = {};
-    this._context = context;
+    this.#eventHandlerMap = {};
+    this.#context = context;
     const { id, description, eventHandlers = {} } = schema || {};
     this.id = id || '';
     this.description = description || '';
-    this._eventHandlerMap = Object.entries(
+    this.#eventHandlerMap = Object.entries(
       createEventHandlers(eventHandlers, {
         looseError: true,
         isComposite: options?.isComposite || false,
@@ -19,19 +21,19 @@ export class EventFlow {
         return map;
       },
       {
-        _getInstance: () => this._context.$page || this._context.$app,
+        _getInstance: () => this.#context.$page || this.#context.$app,
       },
     );
     return this;
   }
   trigger(additionalScope, options = {}) {
     const mergedContext = {
-      ...this._context,
+      ...this.#context,
       ...options,
     };
     const { target } = mergedContext;
     const eventName = `${this.id}.start`;
-    return this._eventHandlerMap[getMpEventHandlerName(this.id, eventName)](
+    return this.#eventHandlerMap[getMpEventHandlerName(this.id, eventName)](
       new Event({
         type: eventName,
         detail: additionalScope,

package/template/mp/common/query.js

@@ -3,25 +3,32 @@ import { createEventHandlers, getMpEventHandlerName, mergeDynamic2StaticData } f
 import { Event } from './event-emitter';
 
 export class Query {
+  _schema = {}
+  #schema
+  #context = {};
+  #disposes = [];
+  #dataBinds = {};
+  #triggered = false;
+  #paramsRef = observable({ current: null });
+  #currentRequestKey = null;
+  #observableValue = observable({ data: null, error: null });
+  #eventHandlerMap = {};
+  #action = () => {};
   constructor({ schema, context, options = {} }) {
-    this._disposes = [];
-    this._dataBinds = {};
-    this._triggered = false;
-    this._paramsRef = observable({ current: null });
-    this._currentRequestKey = null;
-    this._observableValue = observable({ data: null, error: null });
-    this._eventHandlerMap = {};
     const { looseError = false } = options;
-    this._schema = schema;
-    this._context = context;
-    if (this._schema?.trigger === 'auto') {
-      this._disposes.push(
+    this.#schema = schema;
+    this._schema = {
+      trigger: schema.trigger
+    }
+    this.#context = context;
+    if (this.#schema?.trigger === 'auto') {
+      this.#disposes.push(
         autorun(
           (r) => {
             try {
-              const data = this._resolveParams();
-              if (this._triggered) {
-                this._debounceTrigger(data);
+              const data = this.#resolveParams();
+              if (this.#triggered) {
+                this.#debounceTrigger(data);
               }
             } catch (e) {
               console.error(e);
@@ -31,18 +38,18 @@ export class Query {
         ),
       );
     }
-    this._paramsRef.current = this._schema.data;
-    this._dataBinds = Object.entries(this._schema.dataBinds || {}).reduce((map, [prop, fn]) => {
+    this.#paramsRef.current = this.#schema.data;
+    this.#dataBinds = Object.entries(this.#schema.dataBinds || {}).reduce((map, [prop, fn]) => {
       if (!/[\s+\-*/!&|%]*?SERVER\./.test(prop)) {
         map[prop] = fn;
       }
       return map;
     }, {});
 
-    const { $w } = this._context;
+    const { $w } = this.#context;
 
-    this._action =
-      this._schema.type === 'sql'
+    this.#action =
+      this.#schema.type === 'sql'
         ? async function (data) {
             const Data = await $w.cloud.callWedaApi({
               action: 'RunPluginQuery',
@@ -96,9 +103,9 @@ export class Query {
               total: Total || ExecuteResultList.length,
             };
           }
-        : this._schema.handler;
-    this._eventHandlerMap = Object.entries(
-      createEventHandlers(this._schema.eventHandlers || {}, {
+        : this.#schema.handler;
+    this.#eventHandlerMap = Object.entries(
+      createEventHandlers(this.#schema.eventHandlers || {}, {
         looseError: looseError,
         isComposite: false,
       }),
@@ -109,84 +116,94 @@ export class Query {
         return map;
       },
       {
-        _getInstance: () => this._context.$page || this._context.$app,
+        _getInstance: () => this.#context.$page || this.#context.$app,
       },
     );
     return this;
   }
   get id() {
-    return this._schema?.id || '';
+    return this.#schema?.id || '';
   }
   get label() {
-    return this._schema?.label || '';
+    return this.#schema?.label || '';
   }
   get description() {
-    return this._schema?.description || '';
+    return this.#schema?.description || '';
   }
   get data() {
-    return this._observableValue.data;
+    return this.#observableValue.data;
   }
   get error() {
-    return this._observableValue.error;
+    return this.#observableValue.error;
   }
   async trigger(additionalScope, options = {}) {
-    this._triggered = true;
-    return this._innerTrigger(this._resolveParams(), additionalScope, options);
+    this.#triggered = true;
+    return this.#innerTrigger(this.#resolveParams(), additionalScope, options);
   }
   reset() {
-    this._observableValue.data = null;
-    this._observableValue.error = null;
+    this.#observableValue.data = null;
+    this.#observableValue.error = null;
+  }
+  destroy() {
+    this.#disposes.forEach((dispose) => dispose());
+  }
+
+  /**
+   * 用于调试
+   */
+  _toSchema() {
+    console.warn('调试使用，结构可能发生更改，请不要用于生产环境');
+    return this.#schema;
   }
-  async _innerTrigger(data, additionalScope, options = {}) {
-    this._currentRequestKey = Date.now();
-    const key = this._currentRequestKey;
+
+  async #innerTrigger(data, additionalScope, options = {}) {
+    this.#currentRequestKey = Date.now();
+    const key = this.#currentRequestKey;
     try {
-      const res = await this._action(data);
-      if (key === this._currentRequestKey) {
-        this._observableValue.data = res;
-        this._observableValue.error = null;
-        this._emit(`success`, res);
+      const res = await this.#action(data);
+      if (key === this.#currentRequestKey) {
+        this.#observableValue.data = res;
+        this.#observableValue.error = null;
+        this.#emit(`success`, res);
       }
       return res;
     } catch (e) {
-      if (key === this._currentRequestKey) {
-        this._observableValue.data = null;
-        this._observableValue.error = e;
-        this._emit(`fail`, e);
+      if (key === this.#currentRequestKey) {
+        this.#observableValue.data = null;
+        this.#observableValue.error = e;
+        this.#emit(`fail`, e);
       }
       throw e;
     }
   }
-  _debounceTrigger(...args) {
+  #debounceTrigger(...args) {
     if (this._timer) {
       clearTimeout(this._timer);
     }
     this._timer = setTimeout(() => {
-      this._innerTrigger(...args);
+      this.#innerTrigger(...args);
     }, 300);
   }
-  destroy() {
-    this._disposes.forEach((dispose) => dispose());
-  }
-  _resolveParams() {
+
+  #resolveParams() {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
      * 从而导致 autorun 没有添加依赖
      */
-    return mergeDynamic2StaticData(toJS(this._paramsRef.current), this._dataBinds, {
+    return mergeDynamic2StaticData(toJS(this.#paramsRef.current), this.#dataBinds, {
       codeContext: {
         /**
          * $page 或 $comp 实例
          */
-        instance: this._context.$page,
+        instance: this.#context.$page,
       },
-      $w: this._context.$w,
+      $w: this.#context.$w,
       // may be additional scope
     });
   }
-  async _emit(eventName, data) {
-    return this._eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(
+  async #emit(eventName, data) {
+    return this.#eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(
       new Event({
         type: eventName,
         detail: data,

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

@@ -53,7 +53,7 @@ export function createPage({
             (params ? '?' + params.map((pair) => pair.key + '=' + pair.value).join('&') : '');
           return {
             path: realPath,
-            imageUrl,
+            imageUrl: app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || imageUrl,
             title,
           };
         }
@@ -153,7 +153,7 @@ export function createPage({
                 this.setData({
                   weDaHasLogin: true,
                 });
-                createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+                createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page, $w: $page.__internal__?.$w }));
               }
             } finally {
               this.setData({ _isCheckingAtuh: false })
@@ -198,7 +198,7 @@ export function createPage({
         const hook = lifecycle.onReady || lifecycle.onPageReady;
         await hook?.call?.($page);
 
-        this._invokeEventHandler(id, 'ready');
+        this._invokeEventHandler('ready');
       },
       onUnload() {
         const $page = this._getInstance();
@@ -253,7 +253,11 @@ export function createPage({
         $page = pageContext;
         this.$WEAPPS_PAGE = $page;
         $page.handler = Object.keys(handlers).reduce((result, key) => {
-          result[key] = handlers[key].bind($page);
+          try {
+            result[key] = handlers[key].bind($page);
+          } catch(e) {
+            console.error('添加页面handler失败', e)
+          }
           return result;
         }, {});
         $page.computed = createComputed(computed, $page);

package/template/mp/package.json

@@ -6,8 +6,8 @@
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.4",
-    "@cloudbase/weda-cloud-sdk": "1.0.37",
+    "@cloudbase/weda-client": "1.0.5",
+    "@cloudbase/weda-cloud-sdk": "1.0.40",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",