@cloudbase/lowcode-builder 1.8.58 → 1.8.60

package/lib/utils/theme.d.ts

@@ -0,0 +1 @@
+export declare function mergeCssVarConfig(cssVarConfig?: {}, platform?: any): Record<string, string>;

package/lib/utils/theme.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeCssVarConfig = void 0;
+function mergeCssVarConfig(cssVarConfig = {}, platform = 'PCWEB') {
+    let merged = { ...cssVarConfig === null || cssVarConfig === void 0 ? void 0 : cssVarConfig._ };
+    let list = [platform];
+    switch (platform) {
+        case 'PCWEB': {
+            list = ['WEB', 'PCWEB'];
+            break;
+        }
+        case 'MOBILEWEB': {
+            list = ['WEB', 'MOBILE', 'MOBILEWEB'];
+            break;
+        }
+        case 'MP': {
+            list = ['MOBILE', 'MP'];
+            break;
+        }
+        case 'WEB':
+        case 'MOBILE': {
+            list = [platform];
+        }
+    }
+    for (let key of list) {
+        if (cssVarConfig[key]) {
+            merged = {
+                ...merged,
+                ...cssVarConfig[key],
+            };
+        }
+    }
+    return merged;
+}
+exports.mergeCssVarConfig = mergeCssVarConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.58",
+  "version": "1.8.60",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -43,8 +43,10 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.40",
-    "@cloudbase/lowcode-generator": "^1.8.15",
+    "@babel/core": "7.21.4",
+    "@babel/preset-env": "7.21.4",
+    "@cloudbase/cals": "^1.0.45",
+    "@cloudbase/lowcode-generator": "^1.8.16",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.c2d4a32f196583b43edf.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.71408c38a7d1415e60ff.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -37,26 +37,12 @@ const mainAppKey = '__weappsMainApp'
   Object.entries(eventHandlers).map(([handlerName, listeners])=>{
     print(`"${handlerName}": [
       ${listeners.map(l=>{
-        let handler = 'undefined'
-        switch(l.type){
-          case 'rematch': {
-            handler = `handlers.${l.handler}`
-            break;
-          }
-          case 'material': {
-            handler = `function(...args) { return require('/materials/${l.handlerModule}/actions/${l.handler}/index').default(...args) }`
-            break;
-          }
-          default: {
-            handler = l.handler
-          }
-        }
         return `{
           key: '${l.key||''}',
           sourceKey: '${ l.sourceKey||"" }',
-          handler: ${handler},
-          data: ${stringifyObj(l.data||{}, {depth: null})},
-          boundData: {${printBoundData(l.boundData)}}
+          handler: ${l.generateHandler(subLevelPath) || 'undefined'},
+          args: ${stringifyObj(l.args||{}, {depth: null})},
+          argsBinds: {${printBoundData(l.argsBinds)}}
         }`
       }).join(',')}
     ],`)

package/template/mp/common/query.js

@@ -171,12 +171,12 @@ export class Query {
     return this.#schema;
   }
 
-  async #innerTrigger(data, options = {}) {
+  async #innerTrigger(args, options = {}) {
     this.#currentRequestKey = Date.now();
     const key = this.#currentRequestKey;
     try {
       this.#observableValue.isFetching = true;
-      const res = await this.#action(data);
+      const res = await this.#action(...args);
       if (key === this.#currentRequestKey) {
         this.#observableValue.isFetching = false;
         this.#observableValue.data = res;
@@ -209,16 +209,13 @@ export class Query {
      * 好像会阻塞其他字段的计算
      * 从而导致 autorun 没有添加依赖
      */
-    return mergeDynamic2StaticData(toJS(this.#paramsRef.current), this.#dataBinds, {
-      codeContext: {
-        /**
-         * $page 或 $comp 实例
-         */
-        instance: this.#context.$page,
-      },
-      $w: this.#context.$w,
-      paramsContext: additionalScope,
-    });
+    let { params = [] } =
+      mergeDynamic2StaticData(toJS(this.#paramsRef.current), this.#dataBinds, {
+        $w: this.#context.$w,
+        paramsContext: additionalScope,
+      }) || {};
+
+    return params;
   }
   async #emit(eventName, data) {
     return this.#eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(

package/template/mp/common/util.js

@@ -113,8 +113,8 @@ export function createEventHandlers(
           return;
         }
 
-        let { data = {}, boundData = {} } = l;
-        data = { ...data };
+        let { args = {}, argsBinds = {} } = l;
+        args = { ...args };
         const nextEventHandles = [
           {
             handlerName: '',
@@ -128,7 +128,7 @@ export function createEventHandlers(
         const isIfAction = l.sourceKey === 'platform:utils.If';
         const isShowModalAction = l.sourceKey === 'platform:showModal';
         try {
-          const resolvedData = mergeDynamic2StaticData(data, boundData, {
+          const resolvedData = mergeDynamic2StaticData(args, argsBinds, {
             $w,
             forContext,
             codeContext: {
@@ -137,7 +137,7 @@ export function createEventHandlers(
             },
             dataContext,
           });
-          let res = await l.handler.call(owner, { event, data: resolvedData, $w });
+          let res = await l.handler.call(owner, { event, data: resolvedData.params?.[0], args: resolvedData.params || [], $w });
           nextEventHandles[0].handlerName =
             prefix && l.key ? `${prefix}$${l.key}${!isIfAction || res ? '_success' : '_fail'}` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : res;

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

@@ -124,7 +124,8 @@ export function createPage({
       _isCheckingAtuh: false,
       _expiredMessage: '',
       weDaHasLogin: null,
-      loginError: null
+      loginError: null,
+      pageStyle: `<%= pageStyle || '' %>`
     },
     lifetimes: {
       attached() {

package/template/mp/component/index.js

@@ -6,25 +6,37 @@ import { app, $app } from '../../../app/weapps-api'
 <%= importor.state? "import stateFn from './lowcode/state'" : "const stateFn = {}" %>
 <%= importor.computed? "import computedFuncs from './lowcode/computed'" : "const computedFuncs = {}" %>
 <% handlers.forEach(h => {%>
-import _handler<%= h %> from './lowcode/handler/<%= h %>' <%}) %>
+import _hanlder<%= h %> from './lowcode/handler/<%= h %>' <%}) %>
 import * as constObj from '../libCommonRes/const'
 import * as toolsObj from '../libCommonRes/tools'
 
+const handlers = {<% handlers.forEach(h => {%>
+  <%= h %>: _hanlder<%= h %>, <%}) %>
+}
+
 const libCode = '<%= materialName %>'
 
 const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
 
+<% function printBoundData(boundData={}) {
+  const list = []
+  Object.entries(boundData).map(([prop, bindMeta])=>{
+    const str = `'${prop}': ($comp, lists, forItems, event, $context, $w) => {${bindMeta.imports} return(
+      ${bindMeta.expression === '' ? 'undefined': bindMeta.expression}
+    )}`
+    list.push(str)
+  })
+  return list.join(',')
+}%>
+
 const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listeners])=>{%>
   <%= 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 (
-        <%= bindMeta.expression === '' ? 'undefined': bindMeta.expression %>
-      )},
-        <%}) %>}
+      handler: <%= l.generateHandler('../') %>,
+      args: <%= stringifyObj(l.args, {depth: null}) %>,
+      argsBinds: { <%= printBoundData(l.argsBinds) %>}
     },<%})%>
   ],<%})%>
 }
@@ -45,19 +57,14 @@ const events = [<% emitEvents.map(evtName => {%>
   {name: "<%= evtName %>", <% if(formEvents && formEvents[evtName]){%>getValueFromEvent: (event)=> <%= formEvents[evtName] %><%}%>},<%}) %>
 ]
 
-const handler = {<% handlers.forEach(h => {%>
-  <%= h %>: _handler<%= h %>, <%}) %>
-}
+
 
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
-  <%= id %>: { <% Object.entries(widgetBinds).map(([prop, bindMeta]) => { %>
-    "<%= prop %>": function ($comp, lists, forItems, event, $context, $w) {<%= bindMeta.imports %> return (
-      <%= bindMeta.expression === '' ? 'undefined': bindMeta.expression %>
-    ); },<% }) %>
+  <%= id %>: { <%= printBoundData(widgetBinds) %>
   },<%}) %>
 }
 
 const config = <%= JSON.stringify(config || {})%>
 
-createComponent('<%= key %>', behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps,
+createComponent('<%= key %>', behaviors, properties, events, handlers, dataBinds, evtListeners, widgetProps,
  {}, lifeCycle, stateFn, computedFuncs, config, { const: constObj, tools: toolsObj }, libCode)

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

package/template/mp/page/index.js

@@ -24,26 +24,12 @@ import { widgetProps } from './data'
   Object.entries(eventHandlers).map(([handlerName, listeners])=>{
     print(`"${handlerName}": [
       ${listeners.map(l=>{
-        let handler = 'undefined'
-        switch(l.type){
-          case 'rematch': {
-            handler = `handlers.${l.handler}`
-            break;
-          }
-          case 'material': {
-            handler = `function(...args) { return require('../../materials/${l.handlerModule}/actions/${l.handler}/index').default(...args) }`
-            break;
-          }
-          default: {
-            handler = l.handler
-          }
-        }
         return `{
           key: '${l.key||''}',
           sourceKey: '${ l.sourceKey||"" }',
-          handler: ${handler},
-          data: ${stringifyObj(l.data||{}, {depth: null})},
-          boundData: {${printBoundData(l.boundData)}}
+          handler: ${l.generateHandler(subLevelPath) || 'undefined'},
+          args: ${stringifyObj(l.args||{}, {depth: null})},
+          argsBinds: {${printBoundData(l.argsBinds)}}
         }`
       }).join(',')}
     ],`)