@cloudbase/lowcode-builder 1.2.4 → 1.3.1

package/template/mp/component/index.js

@@ -1,7 +1,7 @@
 import { observable } from 'mobx';
 import { createComponent } from '../../../common/weapp-component'
 import { concatClassList, px2rpx } from '../../../common/style'
-import { app } from '../../../app/weapps-api'
+import { app, $app } from '../../../app/weapps-api'
 <%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
 <%= importor.state? "import stateFn from './lowcode/state'" : "const stateFn = {}" %>
 <%= importor.computed? "import computedFuncs from './lowcode/computed'" : "const computedFuncs = {}" %>
@@ -11,7 +11,6 @@ import * as constObj from '../libCommonRes/const'
 import * as toolsObj from '../libCommonRes/tools'
 
 const libCode = '<%= materialName %>'
-const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
 
 const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
 
@@ -19,9 +18,9 @@ const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listen
   <%= handlerName%>: [
     <%listeners.map(l=> { %>{
       key: '<%= l.key %>',
-      handler: <% if (l.type == 'rematch') {%> _handler<%= l.handler %> <%} else if (l.type === 'inline') {%> function({event, lists, forItems, $context}, $comp){ <%= l.handler %> } <%} else {%> <%= l.handler %> <%} %>,
+      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) => {<%= bindMeta.imports %> return (
+      boundData: {<% Object.entries(l.boundData).map(([prop, bindMeta])=>{%>'<%= prop %>':($comp, lists, forItems, event, $context, $w) => {<%= bindMeta.imports %> return (
         <%= bindMeta.expression === '' ? 'undefined': bindMeta.expression %>
       )},
         <%}) %>}
@@ -51,7 +50,7 @@ const handler = {<% handlers.forEach(h => {%>
 
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, bindMeta]) => { %>
-    "<%= prop %>": function ($comp, lists, forItems, event, $context) {<%= bindMeta.imports %> return (
+    "<%= prop %>": function ($comp, lists, forItems, event, $context, $w) {<%= bindMeta.imports %> return (
       <%= bindMeta.expression === '' ? 'undefined': bindMeta.expression %>
     ); },<% }) %>
   },<%}) %>

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.36",
+		"@cloudbase/weda-client": "0.2.39",
 		"@cloudbase/weda-cloud-sdk": "1.0.26",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",

package/template/mp/page/api.js

@@ -1 +1,24 @@
-export const $page = {}
+import { $w as baseAPI } from '<%= subLevelPath %>../../app/weapps-api'
+
+export const $page = {
+  __internal__: {}
+};
+
+export const $w = new Proxy(
+  baseAPI,
+  {
+    get(target, prop) {
+      if(prop === '$page'){
+        return $page
+      }
+      // 尝试代理页面级别组件实例
+      const pageWidget = $page.widgets?.[prop];
+      if (pageWidget) {
+        return pageWidget._userWidget;
+      }
+      return target[prop]
+    },
+  },
+);
+
+$page.__internal__.$w = $w

package/template/mp/page/index.js

@@ -1,24 +1,22 @@
 import { observable } from 'mobx';
 import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
-import { app } from '<%= subLevelPath %>../../app/weapps-api'
+import { app, $app } from '<%= subLevelPath %>../../app/weapps-api'
 import { $$<%= pageName %> as handlers } from '../../app/handlers'
 <%= importor.lifecycle? `import lifecyle from '../../lowcode/${pageName}/lifecycle'` : "const lifecyle = {}" %>
 <%= importor.state? `import state from '../../lowcode/${pageName}/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../../lowcode/${pageName}/computed'` : "const computed = {}" %>
 import { $page } from './api'
 
-const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
-
 const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
 /** widget event listeners **/
 const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listeners])=>{%>
   <%= handlerName%>: [
     <%listeners.map(l=> { %>{
       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 if (l.type == 'inline') {%> function({event, lists, forItems, $context}){const $for = forItems; const $index=lists?.[0]?.currentIndex; return <%= l.handler %> } <%} else {%> <%= l.handler %> <%} %>,
+      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) => {<%= bindMeta.imports %> return (
+      boundData: {<% Object.entries(l.boundData).map(([prop, bindMeta])=>{%>'<%= prop %>':($page, lists, forItems, event, $context, $w) => {<%= bindMeta.imports %> return (
         <%= bindMeta.expression === '' ? 'undefined': bindMeta.expression %>
       )},
         <%}) %>}
@@ -28,7 +26,7 @@ const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listen
 
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, bindMeta]) => { %>
-    "<%= prop %>": function ($page, lists, forItems, event, $context) {<%= bindMeta.imports %>  return (
+    "<%= prop %>": function ($page, lists, forItems, event, $context, $w) {<%= bindMeta.imports %>  return (
       <%= bindMeta.expression === '' ? 'undefined': bindMeta.expression %>
     ); },<% }) %>
   },<%}) %>

package/template/mp/page/index.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": <%= JSON.stringify(usingComponents)%><%= extra %>
+  "usingComponents": <%= JSON.stringify(usingComponents, undefined, 2)%><%= extra %>
 }

package/template/mp/common/process.js

@@ -1 +0,0 @@
-export default { env: { buildType: 'mp' } }