@cloudbase/lowcode-builder 1.1.4 → 1.1.5

package/lib/builder/mp/util.js

@@ -67,7 +67,7 @@ function generateDataBindMeta(bind) {
             imports += (0, lowcode_generator_1.generateExpressionAlias)(value);
         }
         catch (e) {
-            console.error('parse expression error', value, e);
+            console.error('parse expression error', value, e === null || e === void 0 ? void 0 : e.message);
         }
         expr = value;
     }

package/package.json

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

package/template/mp/common/util.js

@@ -1,6 +1,6 @@
 'use strict';
 import { findForItemsOfWidget, getWidget } from './widget'
-import { observable } from 'mobx';
+import { observable, untracked } from 'mobx';
 import { getAccessToken } from '../datasources/index'
 import { app } from '../app/weapps-api'
 
@@ -31,9 +31,13 @@ export function createComputed(funcs, bindContext = null) {
 export function generateDataContext(widget) {
   const dataContext = {};
   while (widget?._scope) {
-    if (widget._scope.dataContext && !isEmptyObj(widget._scope.dataContext)) {
-      dataContext[widget._scope.id] = widget._scope.dataContext;
-    }
+    const current = widget
+    // 此处采用代理的方式，是为了可以获取到最新的 _scope.dataContext 防止 dataContext 引用被重新赋值
+    Object.defineProperty(dataContext, current._scope.id, {
+      get() {
+        return current._scope.dataContext;
+      },
+    });
     widget = widget.parent;
   }
   return dataContext;
@@ -57,7 +61,7 @@ export function createEventHandlers(evtListeners) {
       const [prefix = ''] = name.split('$');
       // The page event handler
       const { lists = [], itemsById = {} } = !!currentTarget && findForItemsOfWidget(currentTarget) || {}
-      const dataContext = generateDataContext(currentTarget)
+      const dataContext = untracked(()=>generateDataContext(currentTarget))
 
       listeners.forEach(async l => {
         let { data = {}, boundData = {} } = l;

package/template/mp/common/widget.js

@@ -221,7 +221,7 @@ function runFor(
       clearTimeout(_FOR_ERROR_CACHE_MAP[nodeId]);
 
       const $instance = ownerMpInst.getWeAppInst();
-      const dataContext = generateDataContext(defaultParent);
+      const dataContext = untracked(()=>generateDataContext(defaultParent));
 
       forList = dataBinds[nodeId]._waFor.call(
         $instance,
@@ -364,7 +364,7 @@ function setUpWidgetDataBinds(w, dataBinds, forItems, failedBinds, ctx) {
           try {
             clearTimeout(timer);
 
-            const dataContext = generateDataContext(w);
+            const dataContext = untracked(()=>generateDataContext(w));
 
             // Computed data bind in the next tick since data bind may read widgets data
             const value = dataBinds[prop].call(ctx, ctx, forItems.lists, forItems.itemsById, undefined, dataContext);