@cloudbase/lowcode-builder 1.3.12-alpha.3 → 1.3.12-alpha.4

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

@@ -11,10 +11,14 @@ import {
 } from '../datasources/index';
 import { runWatchers } from './watch';
 import { getMpEventHandlerName } from './util';
+import { $w as baseAPI } from '../app/app-global';
+
+const wxApp = getApp()
 
 export function createPage(
   id,
   uuid,
+  title,
   widgetProps,
   index = {},
   lifecycle,
@@ -61,6 +65,22 @@ export function createPage(
         return {};
       }
     };
+
+    // 更新设备信息 窗口信息
+    result['onResize'] = (res) => {
+      let device = baseAPI.device;
+      if(!device) {
+        return
+      }
+      const width = res?.size?.windowWidth;
+      const height = res?.size?.windowHeight;
+      if (width !== device?.window?.width || height !== device?.window?.height) {
+        device.window = {
+          width,
+          height
+        };
+      }
+    };
     return result;
   }
 
@@ -103,32 +123,53 @@ export function createPage(
     },
     methods: {
       _pageActive: true,
+      _beforePageCustomLaunchPromise: null,
+      _query: {},
+
       /** page lifecycles **/
       ...extractLifecycles(),
       ...evtHandlers,
       ...mergeRenderer,
-      onLoad(options) {
+      async beforePageCustomLaunch(query) {
+        if(!this._beforePageCustomLaunchPromise){
+          this._beforePageCustomLaunchPromise = new Promise(async (resolve)=>{
+            await wxApp.globaldata?._beforePageCustomLaunchPromise
+            const $page = this._getInstance();
+            if(query){
+              EXTRA_API.setParams($page.uuid, query);
+            }
+            if(await checkAuth(app, app.id, $page)){
+              this.setData({
+                weDaHasLogin: true,
+              });
+              createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+              resolve()
+            }
+          })
+        }
+        return this._beforePageCustomLaunchPromise
+      },
+      async onLoad(options) {
         const $page = this._getInstance();
         setConfig({ currentPageId: $page.uuid });
         app.__internal__.activePage = $page;
         this._pageActive = true;
 
-        let query = decodePageQuery(options || {});
-        EXTRA_API.setParams($page.uuid, query);
-        createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+        this._query = decodePageQuery(options || {});
 
-        const hook = lifecycle.onLoad || lifecycle.onPageLoad;
-        hook?.call?.($page, query);
+        await this.beforePageCustomLaunch?.(this._query)
 
-        this.invokeEventHandler(id, 'load', { detail: { query } });
+        const hook = lifecycle.onLoad || lifecycle.onPageLoad;
+        await hook?.call?.($page, this._query);
+        this.invokeEventHandler(id, 'load', { detail: { query: this._query } });
       },
-      onReady() {
+      async onReady() {
         const $page = this._getInstance();
 
         this._disposers.push(...runWatchers(index, this));
 
         const hook = lifecycle.onReady || lifecycle.onPageReady;
-        hook?.call?.($page);
+        await hook?.call?.($page);
 
         this.invokeEventHandler(id, 'ready');
       },
@@ -146,15 +187,11 @@ export function createPage(
         app.__internal__.activePage = $page;
         this._pageActive = true;
 
-        // 权限检查
-        if (await checkAuth(app, app.id, $page)) {
-          this.setData({
-            weDaHasLogin: true,
-          });
-          const hook = lifecycle.onShow || lifecycle.onPageShow;
-          hook?.call?.($page);
-          this.invokeEventHandler(id, 'show');
-        }
+        await this.beforePageCustomLaunch?.(this._query)
+
+        const hook = lifecycle.onShow || lifecycle.onPageShow;
+        await hook?.call?.($page);
+        this.invokeEventHandler(id, 'show');
       },
       onHide() {
         const $page = this._getInstance();
@@ -178,6 +215,8 @@ export function createPage(
           id,
           uuid,
           state: observable(pageState),
+          url: this.route,
+          name: title,
           widgets: {},
         });
         $page = pageContext;

package/template/mp/common/widget.js

@@ -651,13 +651,22 @@ function mountBuiltinWigetsAPI(widget, owner) {
 
   switch (widget.widgetType) {
     case `${REPEATER.MODULE_NAME}:${REPEATER.REPEATER_NAME}`: {
-      const currentRef = observable({ current: undefined });
+      const currentRef = observable({ current: {} });
       widget._getInstanceRef = () => {
         return currentRef;
       }; // 默认初始值
       widget._disposers.push(
         autorun((r) => {
-          currentRef.current = { data: widget.data };
+          currentRef.current = {
+            data: widget.data,
+            items: (widget.children || []).map((item) => {
+              const descendants = {};
+              Object.keys(item?._descendants || {}).forEach((key) => {
+                descendants[key] = item._descendants[key]._userWidget;
+              });
+              return descendants;
+            })
+          }
         }),
       );
       break;
@@ -707,18 +716,23 @@ class UserWidget {
         }
 
         // 优先 custom
-        if (target.custom[prop]) {
+        if (prop in target.custom) {
           return target.custom[prop];
         }
 
         // 再尝试内置的方法和属性
-        const buildinMember = target.sys[prop];
-        if (buildinMember) return buildinMember;
+        if (prop in target.sys) {
+          return target.sys[prop];
+        }
 
         // 兼容原来的 widget。最后直接代理到 widget 上，主要是访问组件的属性
         // return target._widget[prop];
         return undefined;
       },
+      /**
+       * userwidget 不可写
+       */
+      set() {},
     });
   }
 
@@ -776,14 +790,29 @@ class UserWidget {
   }
 
   get custom() {
-    const { methods = {}, ...restInstance } = this._widget._getInstanceRef?.()?.current || {};
-
-    const userCustomMember = {
-      ...this._widget._methods,
-      ...restInstance,
-      ...methods,
-    };
-
+    const widget = this._widget;
+    const instance = widget?._getInstanceRef?.()?.current || {};
+    const userCustomMember = untracked(() => {
+      const { methods = {}, ...restInstance } = instance;
+      return new Proxy(
+        {
+          ...widget?._methods,
+          ...restInstance,
+          ...methods,
+        },
+        {
+          get(_, prop) {
+            if (prop in methods) {
+              return methods[prop];
+            }
+            if (prop !== 'methods' && prop in instance) {
+              return instance[prop];
+            }
+            return widget?._methods?.[prop];
+          },
+        },
+      );
+    });
     return userCustomMember;
   }
 }

package/template/mp/component/index.js

@@ -18,6 +18,7 @@ const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listen
   <%= handlerName%>: [
     <%listeners.map(l=> { %>{
       key: '<%= l.key %>',
+      sourceKey: '<%= l.sourceKey %>',
       handler: <% if (l.type == 'rematch') {%> _handler<%= l.handler %> <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
       boundData: {<% Object.entries(l.boundData).map(([prop, bindMeta])=>{%>'<%= prop %>':($comp, lists, forItems, event, $context, $w) => {<%= bindMeta.imports %> return (

package/template/mp/datasources/config.js.tpl

@@ -1,5 +1,6 @@
 import datasetProfiles from './dataset-profiles'
 const dataSourceProfiles = require('./datasource-profiles.js')
+import config from '../common/config'
 
 /**
  * 数据源基本配置
@@ -25,14 +26,14 @@ export default {
   /**
    * 确定调用链路
    */
-  endpointType: '<%= endpointType %>',
+  endpointType: config.endpointType,
   /**
    * 调用链路为 tcb-api 时有效
    * 私有化需要设置
    */
-  tcbApiOrigin: '<%= tcbApiOrigin %>',
+  tcbApiOrigin: config.tcbApiOrigin,
   /**
    * 是否是处于私有化版本
    */
-  isPrivate: <%= isPrivateMode %>
+  isPrivate: config.isPrivate
 }

package/template/mp/package.json

@@ -5,7 +5,7 @@
 	"dependencies": {<% if(importJSSDK) {%>
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-		"@cloudbase/weda-client": "0.2.45",
+		"@cloudbase/weda-client": "0.2.56-alpha.2",
 		"@cloudbase/weda-cloud-sdk": "1.0.26",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",

package/template/mp/page/api.js

@@ -8,8 +8,11 @@ export const $w = new Proxy(
   baseAPI,
   {
     get(target, prop) {
-      if(prop === '$page'){
-        return $page
+      /**
+       * 使用当前实例进行覆盖
+       */
+      if (prop === '$page' || prop === 'page') {
+        return $page;
       }
       // 尝试代理页面级别组件实例
       const pageWidget = $page.widgets?.[prop];

package/template/mp/page/index.js

@@ -14,6 +14,7 @@ const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listen
   <%= handlerName%>: [
     <%listeners.map(l=> { %>{
       key: '<%= l.key %>',
+      sourceKey: '<%= l.sourceKey %>',
       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, bindMeta])=>{%>'<%= prop %>':($page, lists, forItems, event, $context, $w) => {<%= bindMeta.imports %> return (
@@ -32,4 +33,4 @@ const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   },<%}) %>
 }
 
-createPage('<%= pageName %>', '<%= pageUUID %>', widgetProps, {}, lifecyle, state, computed, evtListeners, dataBinds, app, handlers, $page, <%= pageAttributes?JSON.stringify(pageAttributes):'{}' %>)
+createPage('<%= pageName %>', '<%= pageUUID %>','<%= pageTitle %>', widgetProps, {}, lifecyle, state, computed, evtListeners, dataBinds, app, handlers, $page, <%= pageAttributes?JSON.stringify(pageAttributes):'{}' %>)