@cloudbase/framework-plugin-low-code 0.7.31 → 0.7.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.31",
+  "version": "0.7.32",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/src/handlers/utils/widgets.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { observable, autorun, untracked } from 'mobx';
-import { remove } from 'lodash';
+import { remove, set as lodashSet } from 'lodash';
 import { checkVisible } from '../../utils/index';
 
 export const WidgetsContext = React.createContext({ parent: null });
@@ -191,29 +191,41 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
           parentLevelWidgets && parentLevelWidgets[node.id].push(w);
 
           // Setup data binds
-          Object.keys(dataBinds[node.id] || {}).map((prop) => {
-            if (prop === '_waFor') {
-              return;
-            }
-            function getBindData(options = {}) {
-              let disposeError = false;
-              const dispose = autorun(() => {
-                try {
-                  // Computed data bind in the next tick since data bind may read widgets data
-                  w[prop] = dataBinds[node.id][prop](subForItems, undefined, context, scopeContext);
-                  disposeError = false;
-                } catch (e) {
-                  options.showLog && console.error(e);
-                  retryQueue.push(getBindData);
-                  disposeError = true;
+          Object.keys(dataBinds[node.id] || {})
+            .sort((a, b) => {
+              return a.length - b.length > 0 ? 1 : -1;
+            })
+            .map((prop) => {
+              if (prop === '_waFor') {
+                return;
+              }
+              function getBindData(options = {}) {
+                let disposeError = false;
+                const dispose = autorun(() => {
+                  try {
+                    // Computed data bind in the next tick since data bind may read widgets data
+                    const value = dataBinds[node.id][prop](subForItems, undefined, context, scopeContext);
+                    const paths = prop.split('.').filter((key) => !!key);
+                    if (paths.length > 1) {
+                      // 一定要 untracked 不然爆栈了
+                      untracked(() => lodashSet(w, prop, value));
+                    } else {
+                      // 普通 key 直接赋值
+                      w[prop] = value;
+                    }
+                    disposeError = false;
+                  } catch (e) {
+                    options.showLog && console.error(e);
+                    retryQueue.push(getBindData);
+                    disposeError = true;
+                  }
+                });
+                if (!!disposeError && curForNode.id) {
+                  widgets[curForNode.id]._disposers.push(dispose);
                 }
-              });
-              if (!!disposeError && curForNode.id) {
-                widgets[curForNode.id]._disposers.push(dispose);
               }
-            }
-            getBindData();
-          });
+              getBindData();
+            });
         } else {
           if (parentLevelWidgets) {
             const len = parentLevelWidgets[node.id].push([]);