@cloudbase/framework-plugin-low-code 0.6.17 → 0.6.19

package/lib/index.js

@@ -292,7 +292,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
         return __awaiter(this, void 0, void 0, function* () { });
     }
     build() {
-        var _a;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             let { logger } = this.api;
             const staticDir = path_1.default.resolve(__dirname, '../../../static');
@@ -326,13 +326,53 @@ class LowCodePlugin extends framework_core_1.Plugin {
                 this.api.logger.error('获取静态托管失败: ', e);
                 throw e;
             }
+            const domain = ((_b = this._website) === null || _b === void 0 ? void 0 : _b.cdnDomain) || ((_c = mainAppSerializeData.extra) === null || _c === void 0 ? void 0 : _c.domain);
+            if (common_2.buildAsWebByBuildType(buildTypeList) &&
+                this._resolvedInputs.deployOptions.mode === types_1.DEPLOY_MODE.UPLOAD) {
+                let { appConfig = {} } = mainAppSerializeData;
+                let { window = {} } = appConfig;
+                try {
+                    const { Data = {} } = yield this.api.cloudbaseManager
+                        .commonService('lowcode', '2021-01-08')
+                        .call({
+                        Action: 'DescribeAppCustomUrls',
+                        Param: {
+                            EnvId: this.api.envId,
+                            IgnorePublished: true,
+                            WeAppId: appId,
+                        },
+                    });
+                    this.api.logger.debug('DescribeAppCustomUrls', Data, {
+                        EnvId: this.api.envId,
+                        IgnorePublished: true,
+                        WeAppId: appId,
+                    });
+                    this._gatewayConfig = (_d = Data === null || Data === void 0 ? void 0 : Data.Items) === null || _d === void 0 ? void 0 : _d[0];
+                    if (this._gatewayConfig) {
+                        const path = this._gatewayConfig.Path;
+                        window.publicPath = `https://${domain}${this._getWebRootPath()}`;
+                        if (!common_2.buildAsAdminPortalByBuildType(buildTypeList)) {
+                            window.basename = path;
+                        }
+                        appConfig.window = window;
+                        this._resolvedInputs.mainAppSerializeData.appConfig = appConfig;
+                    }
+                }
+                catch (e) {
+                    this.api.logger.error('路由失败', e, {
+                        EnvId: this.api.envId,
+                        IgnorePublished: true,
+                        WeAppId: appId,
+                    });
+                }
+            }
             try {
                 if (!debug) {
                     pauseConsoleOutput();
                 }
                 this._time("build process");
                 this._appPath = yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    var _b, _c, _d, _e;
+                    var _e, _f;
                     try {
                         yield core_1.default({
                             mainAppSerializeData,
@@ -345,16 +385,16 @@ class LowCodePlugin extends framework_core_1.Plugin {
                             runtime: this._resolvedInputs.runtime,
                             ignoreInstall: this._resolvedInputs.ignoreInstall,
                             mode: webpackMode,
-                            deployMode: (_b = this._resolvedInputs.deployOptions) === null || _b === void 0 ? void 0 : _b.mode,
+                            deployMode: (_e = this._resolvedInputs.deployOptions) === null || _e === void 0 ? void 0 : _e.mode,
                             watch: false,
                             generateMpType,
                             generateMpPath,
                             isCleanDistDir: false,
                             plugins,
                             extraData,
-                            isCrossAccount: this._resolvedInputs.mpAppId !== ((_c = this._resolvedInputs.deployOptions) === null || _c === void 0 ? void 0 : _c.targetMpAppId),
+                            isCrossAccount: this._resolvedInputs.mpAppId !== ((_f = this._resolvedInputs.deployOptions) === null || _f === void 0 ? void 0 : _f.targetMpAppId),
                             resourceAppid: this._resolvedInputs.mpAppId,
-                            domain: ((_d = this._website) === null || _d === void 0 ? void 0 : _d.cdnDomain) || ((_e = mainAppSerializeData.extra) === null || _e === void 0 ? void 0 : _e.domain),
+                            domain,
                         }, (err, result) => __awaiter(this, void 0, void 0, function* () {
                             if (!err) {
                                 try {
@@ -556,8 +596,10 @@ class LowCodePlugin extends framework_core_1.Plugin {
                         const isPreview = (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.PREVIEW;
                         const link = common_2.buildAsAdminPortalByBuildType(this._resolvedInputs.buildTypeList)
                             ? `https://${this._website.cdnDomain}/adminportal/#/app/${isPreview ? `${appId}-preview` : appId}?envType=${isPreview ? 'preivew' : 'prod'}`
-                            : `https://${this._website.cdnDomain +
-                                this._webPlugin.resolvedInputs.cloudPath}`;
+                            : this._gatewayConfig
+                                ? `https://${this._gatewayConfig.Domain + this._gatewayConfig.Path}`
+                                : `https://${this._website.cdnDomain +
+                                    this._webPlugin.resolvedInputs.cloudPath}`;
                         const qrcodeOutputPath = path_1.default.resolve(this.api.projectPath, QRCODE_PATH);
                         yield qrcode_1.default.toFile(path_1.default.resolve(this.api.projectPath, QRCODE_PATH), link, {
                             errorCorrectionLevel: 'M',
@@ -916,12 +958,14 @@ class LowCodePlugin extends framework_core_1.Plugin {
                             }
                             return arr;
                         }, []);
-                        (_b = this._resolvedInputs.mainAppSerializeData.pageInstanceList) === null || _b === void 0 ? void 0 : _b.forEach((page) => {
-                            rules.push({
-                                keyPrefixEquals: `${path.slice(1)}${page.id}`,
-                                replaceKeyWith: path,
+                        if (!this._gatewayConfig) {
+                            (_b = this._resolvedInputs.mainAppSerializeData.pageInstanceList) === null || _b === void 0 ? void 0 : _b.forEach((page) => {
+                                rules.push({
+                                    keyPrefixEquals: `${path.slice(1)}${page.id}`,
+                                    replaceKeyWith: path,
+                                });
                             });
-                        });
+                        }
                         this._rules = rules;
                     }
                 }
@@ -936,6 +980,18 @@ class LowCodePlugin extends framework_core_1.Plugin {
                     domainConfig: { FollowRedirect: 'on' },
                 }));
                 yield Promise.all(modifyDomainConfigPromises);
+                if (this._gatewayConfig) {
+                    yield this.api.cloudbaseManager
+                        .commonService('lowcode', '2021-01-08')
+                        .call({
+                        Action: 'PublishAppCustomUrl',
+                        Param: {
+                            EnvId: this.api.envId,
+                            WeAppId: this._resolvedInputs.appId,
+                            IndexPath: this._getWebRootPath(),
+                        },
+                    });
+                }
                 yield hostingService.setWebsiteDocument({
                     indexDocument: 'index.html',
                     routingRules: this._rules,

package/lib/weapps-core/utils/lowcdoe.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.receiveDataByLowcodeDiff = exports.evalExpression = void 0;
 function evalExpression(code, runtime) {
     try {
-        return runtime.eval(`(function(forItems){const $for = forItems; return ${code};})`);
+        return runtime.eval(`(function(forItems, $context){const $for = forItems; return ${code};})`);
     }
     catch (e) {
         runtime.console.error(`Error in expression:\t${code}\n\n`, e);

package/package.json

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

package/template/generator/handlers/NodeRenderer.jsx

@@ -24,6 +24,8 @@ export const CompRenderer = observer(function (props) {
     genericComp = {},
     emitEvents = [],
     componentSchema = {},
+    context = {},
+    updateContext,
   } = props;
 
   const [blockIndex, setBlockIndex] = useState();
@@ -63,6 +65,14 @@ export const CompRenderer = observer(function (props) {
   // 组件最终用于执行的事件函数
   const emit = useCallback(
     (trigger, eventData, forItems, domEvent, scopeContext) => {
+      // 如果是数据容器，则将传过来的data，赋值给容器上下文context
+      if (
+        trigger === 'onDataChange' &&
+        componentSchema?.compConfig?.isDataContainer
+      ) {
+        updateContext(compId, eventData?.data);
+      }
+
       const listeners = listenerInstances;
       const event = {
         detail: eventData,
@@ -156,7 +166,7 @@ export const CompRenderer = observer(function (props) {
   // For循环渲染
   let forList;
   try {
-    forList = dataBinds && dataBinds._waFor && dataBinds._waFor(parentForItems);
+    forList = dataBinds && dataBinds._waFor && dataBinds._waFor(parentForItems, undefined, context);
   } catch (e) {
     forList = [];
     console.error('_waFor data', e);
@@ -211,6 +221,15 @@ export const CompRenderer = observer(function (props) {
         ? get(widgetsData, forItemsIndexes)
         : widgetsData;
       const domRef = setGetDomApi(currentWidget, props);
+
+      // 判断为容器组件，则增加一个onDataChange事件
+      if (
+        componentSchema?.compConfig?.isDataContainer &&
+        !emitEvents?.includes('onDataChange')
+      ) {
+        emitEvents.push('onDataChange');
+      }
+
       return (
         <ForContext.Provider key={index} value={forItems}>
           <Field
@@ -283,6 +302,14 @@ export const CompRenderer = observer(function (props) {
     : widgetsData;
   const domRef = setGetDomApi(currentWidget, props);
 
+  // 判断为容器组件，则增加一个onDataChange事件
+  if (
+    componentSchema?.compConfig?.isDataContainer &&
+    !emitEvents?.includes('onDataChange')
+  ) {
+    emitEvents.push('onDataChange');
+  }
+
   return (
     <Field
       data={{

package/template/generator/handlers/RenderWrapper.jsx

@@ -24,6 +24,8 @@ export function AppRender(props) {
     rootNode = true,
     codeContext,
     scopeContext = {},
+    context = {},
+    updateContext,
   } = props;
   const {
     'x-props': xProps,
@@ -91,6 +93,8 @@ export function AppRender(props) {
               virtualFields={virtualFields}
               codeContext={codeContext}
               scopeContext={clonedScopeContext}
+              context={context}
+              updateContext={updateContext}
             />
           );
         }
@@ -102,6 +106,8 @@ export function AppRender(props) {
           virtualFields={virtualFields}
           codeContext={codeContext}
           scopeContext={scopeContext}
+          context={context}
+          updateContext={updateContext}
         />
       );
     }
@@ -118,6 +124,8 @@ export function AppRender(props) {
       codeContext={codeContext}
       scopeContext={scopeContext}
       genericComp={genericComp}
+      context={context}
+      updateContext={updateContext}
     >
       {children.map((comp) => (
         <AppRender
@@ -128,6 +136,8 @@ export function AppRender(props) {
           virtualFields={virtualFields}
           codeContext={codeContext}
           scopeContext={scopeContext}
+          context={context}
+          updateContext={updateContext}
         />
       ))}
     </CompRenderer>

package/template/generator/pages/app.tpl

@@ -48,7 +48,7 @@ const virtualFields = {
 export default function App() {
   // 检查权限
   // const [weDaHasLogin, setWeDaHasLogin] = React.useState(false);
-
+  const [context, setContext] = React.useState({});
   // 兼容 this.state / $page.state 两种模式
   const pageCodeContext = createPageApi()
   const $page = pageCodeContext
@@ -62,6 +62,27 @@ export default function App() {
   const dataBinds = $page._dataBinds = <%= dataBinds %>;
   const componentSchema = <%= componentSchema %>;
 
+  /**
+   * 更新数据容器的上下文的方法
+   * 会传递到事件emit的地方，将从组件获取到的数据data赋值给上下文
+   * 当组件卸载时，传过来的data为undefined即可
+   * {
+   *   id1: [{...}],
+   *   id2: {...},
+   *   id3: undefined,
+   *   id4: null,
+   *   ...
+   * }
+   * @param id
+   * @param data
+   */
+  const updateContext = (id, data) => {
+    if(id) {
+      context[id] = { data };
+    }
+    setContext({ ...context });
+  }
+
   Object.assign($page, {
     id:'<%= pageName %>',
     state: observable(initPageState),
@@ -77,7 +98,7 @@ export default function App() {
     });
   };
 
-  $page.widgets = createWidgets(widgetsContext, dataBinds)
+  $page.widgets = createWidgets(widgetsContext, dataBinds, context)
   // widgets 内的 dataBinds 可能需要关联 widgets，需要重新执行 dataBinds
   retryDataBinds()
 
@@ -116,6 +137,8 @@ export default function App() {
         virtualFields={virtualFields}
         componentSchema={componentSchema}
         codeContext={pageCodeContext}
+        context={context}
+        updateContext={updateContext}
       />
     </div>
   );

package/template/generator/utils/widgets.js

@@ -117,9 +117,9 @@ export function retryDataBinds(tryTime = 10) {
   }
   retryDataBinds(tryTime - 1);
 }
-export function createWidgets(widgetProps, dataBinds) {
+export function createWidgets(widgetProps, dataBinds, context) {
   const nodeTree = createWidgetTree(widgetProps, dataBinds);
-  const widgets = runFor(nodeTree, {}, null, null);
+  const widgets = runFor(nodeTree, {}, null, null, context);
   return widgets;
 
   /**
@@ -128,9 +128,10 @@ export function createWidgets(widgetProps, dataBinds) {
    * @param {*} forItems
    * @param {*} parentLevelWidgets
    * @param {*} parentWidget
+   * @param {*} context
    * @returns top level widgets or for dispose
    */
-  function runFor(curForNode, forItems, parentLevelWidgets, parentWidget) {
+  function runFor(curForNode, forItems, parentLevelWidgets, parentWidget, context) {
     const nodeId = curForNode.id;
     if (!curForNode.value) {
       return createSubTree(curForNode, {});
@@ -138,7 +139,7 @@ export function createWidgets(widgetProps, dataBinds) {
     const dispose = autorun(() => {
       let forList = [];
       try {
-        forList = dataBinds[nodeId]._waFor(forItems);
+        forList = dataBinds[nodeId]._waFor(forItems, undefined, context);
       } catch (e) {
         console.error('waFor error', e);
       }
@@ -268,7 +269,8 @@ export function createWidgets(widgetProps, dataBinds) {
             node,
             subForItems,
             widgets,
-            node.parent && widgets[node.parent.id]
+            node.parent && widgets[node.parent.id],
+            context
           );
           curForNode.id && widgets[curForNode.id]._disposers.push(dispose);
         }

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

@@ -9,7 +9,7 @@ import sdk from './weapp-sdk'
  */
 export const compLowcodes = {}
 
-export function createComponent(key, behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps, index, lifeCycle, stateFn, computedFuncs, config, libCommonRes) {
+export function createComponent(key, behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps, index, lifeCycle, stateFn, computedFuncs, config, libCommonRes, undefined, context) {
 
   compLowcodes[key] = {
     index,
@@ -41,9 +41,6 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       },
       ...properties,
     },
-
-    data: {},
-
     lifetimes: {
       created() {
         this._pageActive = true
@@ -55,7 +52,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
 
         $comp.props.events = createPropEvents(events, this)
         $comp.widgets = {}
-        const { widgets, rootWidget: virtualRootWidget } = createWidgets(widgetProps, dataBindsBindContext(dataBinds, $comp), $comp.widgets, this)
+        const { widgets, rootWidget: virtualRootWidget } = createWidgets(widgetProps, dataBindsBindContext(dataBinds, $comp), $comp.widgets, context, this)
         this._virtualRootWidget = virtualRootWidget
 
         try {

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

@@ -13,6 +13,7 @@ export function createPage(
   dataBinds,
   app,
   $page,
+  context,
 ) {
   $page.state = observable(pageState);
   let dataset = createDataset($page.uuid);
@@ -47,7 +48,7 @@ export function createPage(
       attached() {
         // createWidgets 从上面移到这里是为了 i18n 切换语言的时候页面能生效
         $page.widgets = {};
-        const { rootWidget, widgets } = createWidgets(widgetProps, dataBinds, $page.widgets);
+        const { rootWidget, widgets } = createWidgets(widgetProps, dataBinds, $page.widgets, context);
         this._rootWidget = rootWidget;
         this._widgets = widgets;
         this._pageActive = true;

package/template/mp/common/widget.js

@@ -34,9 +34,9 @@ export function resolveWidgetData(props) {
 }
 
 
-export function createWidgets(widgetProps, dataBinds, widgetHolder, ownerMpInst) {
+export function createWidgets(widgetProps, dataBinds, widgetHolder, context, ownerMpInst) {
   const rootNode = createWidgetDataTree(widgetProps, dataBinds)
-  return createSubWidgetTree(rootNode, widgetProps, dataBinds, ownerMpInst, widgetHolder)
+  return createSubWidgetTree(rootNode, widgetProps, dataBinds, ownerMpInst, widgetHolder, undefined, undefined, undefined, undefined, undefined, context)
 }
 
 /**
@@ -47,7 +47,7 @@ export function createWidgets(widgetProps, dataBinds, widgetHolder, ownerMpInst)
  */
 function createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, widgetHolder = {},
   index = 0, forItems = {}, ownerForWidgetHolder = null,
-  failedBinds = [], defaultParent = { children: observable([]), _disposers: [] }) {
+  failedBinds = [], defaultParent = { children: observable([]), _disposers: [] }, context = {}) {
   const indexPostfix = (forItems.lists || []).slice().reverse().map(list => idSeparator + list.currentIndex).join('')
 
   // traverse down the tree to set up all widgets
@@ -87,7 +87,7 @@ function createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, wi
     if (node.forCount === curForNode.forCount + 1 && dataBinds[node.id] && dataBinds[node.id]._waFor) {
       // find the node bound with next level for
       const parent = node.parent ? widgetHolder[node.parent.id] : defaultParent
-      const dispose = runFor(node, widgetProps, dataBinds, ownerMpInst, forItems, widgetHolder, failedBinds, parent)
+      const dispose = runFor(node, widgetProps, dataBinds, ownerMpInst, forItems, widgetHolder, failedBinds, parent, context)
       parent._disposers.push(dispose)  // Add the for bind dispose to the parent node of forNode
     }
   })
@@ -110,12 +110,12 @@ function createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, wi
  * @param {*} parentWidget
  * @returns top level widgets or for dispose
  */
-function runFor(curForNode, widgetProps, dataBinds, ownerMpInst, forItems, ownerForWidgetHolder, failedBinds, defaultParent) {
+function runFor(curForNode, widgetProps, dataBinds, ownerMpInst, forItems, ownerForWidgetHolder, failedBinds, defaultParent, context) {
   const nodeId = curForNode.id
   const dispose = autorun(() => {
     let forList = []
     try {
-      forList = dataBinds[nodeId]._waFor(forItems.lists, forItems.itemsById)
+      forList = dataBinds[nodeId]._waFor(forItems.lists, forItems.itemsById, undefined, context)
       if (!Array.isArray(forList)) {
         forList = []
       }
@@ -153,7 +153,7 @@ function runFor(curForNode, widgetProps, dataBinds, ownerMpInst, forItems, owner
           lists: [{ currentItem: item, currentIndex: index }, ...lists],
           itemsById: { ...itemsById, [nodeId]: item },
         }
-        const { rootWidget } = createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, {}, index, _forItems, ownerForWidgetHolder, failedBinds, defaultParent)
+        const { rootWidget } = createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, {}, index, _forItems, ownerForWidgetHolder, failedBinds, defaultParent, context)
         rootWidget._forItems = _forItems
       })
     })

package/template/mp/component/index.js

@@ -1,3 +1,4 @@
+import { observable } from 'mobx';
 import { createComponent } from '../../../common/weapp-component'
 import { mpCompToWidget } from '../../../common/widget'
 import { concatClassList, px2rpx } from '../../../common/style'
@@ -11,6 +12,8 @@ import _handler<%= h %> from './lowcode/handler/<%= h %>' <%}) %>
 import * as constObj from '../libCommonRes/const'
 import * as toolsObj from '../libCommonRes/tools'
 
+const context = observable({});
+
 const libCode = '<%= materialName %>'
 
 const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
@@ -21,7 +24,7 @@ const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listen
       key: '<%= l.key %>',
       handler: <% if (l.type == 'rematch') {%> _handler<%= l.handler %> <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
-      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':(lists, forItems, event) => {const $for=forItems;return <%= expr %>},
+      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':(lists, forItems, event, $context) => {const $for=forItems; return <%= expr %>},
         <%}) %>}
     },<%})%>
   ],<%})%>
@@ -49,11 +52,11 @@ const handler = {<% handlers.forEach(h => {%>
 
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, expr]) => { %>
-    <%= prop %>: function (lists, forItems, event) {const $for=forItems; return <%= expr %>; },<% }) %>
+    <%= prop %>: function (lists, forItems, event, $context) {const $for=forItems; return <%= expr %>; },<% }) %>
   },<%}) %>
 }
 
 const config = <%= JSON.stringify(config || {})%>
 
 createComponent('<%= key %>', behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps,
- index, lifeCycle, stateFn, computedFuncs, config, { const: constObj, tools: toolsObj }, libCode)
+ index, lifeCycle, stateFn, computedFuncs, config, { const: constObj, tools: toolsObj }, libCode, context)

package/template/mp/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.0",
 	"scripts": {	},
 	"dependencies": {
-		"@cloudbase/weda-cloud-sdk": "1.0.1",
+    "@cloudbase/weda-cloud-sdk": "1.0.1",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/mp/page/index.js

@@ -1,3 +1,4 @@
+import { observable } from 'mobx';
 import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
 import { mpCompToWidget } from '<%= subLevelPath %>../../common/widget'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
@@ -8,6 +9,7 @@ import lifecyle from '../../lowcode/<%= pageName %>/lifecycle'
 import state from '../../lowcode/<%= pageName %>/state'
 import computed from '../../lowcode/<%= pageName %>/computed'
 
+const context = observable({});
 
 const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
 /** widget event listeners **/
@@ -17,18 +19,18 @@ const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listen
       key: '<%= l.key %>',
       handler: <% if (l.type === 'rematch') {%> handlers.<%= l.handler %> <%} else if (l.type == 'material') {%> function(...args) { return require('../../materials/<%= l.handlerModule %>/actions/<%= l.handler %>/index').default(...args) } <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
-      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':(lists, forItems, event) => {const $for = forItems; return <%= expr %>},
+      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':(lists, forItems, event, $context) => {const $for = forItems; return <%= expr %>},
         <%}) %>}
     },<%})%>
   ],<%})%>
 }
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, expr]) => { %>
-    <%= prop %>: function (lists, forItems, event) {const $for = forItems; return <%= expr %>; },<% }) %>
+    <%= prop %>: function (lists, forItems, event, $context) {const $for = forItems; return <%= expr %>; },<% }) %>
   },<%}) %>
 }
 
 $page.id = '<%= pageName %>'
 $page.uuid = '<%= pageUUID %>'
 $page.handler = handlers
-createPage(lifecyle, widgetProps, state, computed, evtListeners, dataBinds, app, $page)
+createPage(lifecyle, widgetProps, state, computed, evtListeners, dataBinds, app, $page, context)

package/template/src/handlers/FieldMiddleware/renderer.jsx

@@ -24,6 +24,8 @@ export const CompRenderer = observer(function (props) {
     slots = {},
     codeContext,
     scopeContext,
+    context = {},
+    updateContext,
     emitEvents = [],
     componentSchema = {},
   } = props;
@@ -62,6 +64,13 @@ export const CompRenderer = observer(function (props) {
   // 组件最终用于执行的事件函数
   const emit = useCallback(
     (trigger, event, forItems, scopeContext) => {
+      // 如果是数据容器，则将传过来的data，赋值给容器上下文context
+      if (
+        trigger === 'onDataChange' &&
+        componentSchema?.compConfig?.isDataContainer
+      ) {
+        updateContext(compId, event?.data);
+      }
       const listeners = listenerInstances;
       event = { detail: event, name: trigger };
       forItems = {
@@ -142,7 +151,7 @@ export const CompRenderer = observer(function (props) {
   try {
     // 绑定了 for 变量，但计算值错误时，应当空数组兜底
     forList =
-      dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems) || []);
+      dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems, undefined, context) || []);
   } catch (e) {
     // 计算值出错则使用空数组兜底
     forList = [];
@@ -197,6 +206,15 @@ export const CompRenderer = observer(function (props) {
         classNameList: forItemClassNameList,
         staticResourceAttribute,
       });
+
+      // 判断为容器组件，则增加一个onDataChange事件
+      if (
+        componentSchema?.compConfig?.isDataContainer &&
+        !emitEvents?.includes('onDataChange')
+      ) {
+        emitEvents.push('onDataChange');
+      }
+
       return (
         <ForContext.Provider key={index} value={forItems}>
           <Field
@@ -263,6 +281,15 @@ export const CompRenderer = observer(function (props) {
     classNameList: finalClassNameList,
     staticResourceAttribute,
   });
+
+  // 判断为容器组件，则增加一个onDataChange事件
+  if (
+    componentSchema?.compConfig?.isDataContainer &&
+    !emitEvents?.includes('onDataChange')
+  ) {
+    emitEvents.push('onDataChange');
+  }
+
   return (
     <Field
       data={{ ...fieldData, _selectableBlockEvents: _selectableBlockEventsWithItem }}

package/template/src/handlers/render.jsx

@@ -23,6 +23,8 @@ export function AppRender(props) {
     rootNode = true,
     codeContext,
     scopeContext = {},
+    context = {},
+    updateContext,
   } = props;
 
   const { 'x-props': xProps, properties = {} } = componentSchema;
@@ -89,6 +91,8 @@ export function AppRender(props) {
               virtualFields={virtualFields}
               codeContext={codeContext}
               scopeContext={clonedScopeContext}
+              context={context}
+              updateContext={updateContext}
             />
           );
         }
@@ -100,6 +104,8 @@ export function AppRender(props) {
           virtualFields={virtualFields}
           codeContext={codeContext}
           scopeContext={scopeContext}
+          context={context}
+          updateContext={updateContext}
         />
       );
     }
@@ -115,6 +121,8 @@ export function AppRender(props) {
       slots={slots}
       codeContext={codeContext}
       scopeContext={scopeContext}
+      context={context}
+      updateContext={updateContext}
     >
       {children.map((comp) => (
         <AppRender
@@ -125,6 +133,8 @@ export function AppRender(props) {
           virtualFields={virtualFields}
           codeContext={codeContext}
           scopeContext={scopeContext}
+          context={context}
+          updateContext={updateContext}
         />
       ))}
     </CompRenderer>