@cloudbase/lowcode-builder 1.8.72 → 1.8.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.72",
+  "version": "1.8.73",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.58",
+    "@cloudbase/cals": "^1.0.59",
     "@cloudbase/lowcode-generator": "^1.8.24",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

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.a24a8e628a0ab3a0c8b5.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.72ae321d6810e4fa769a.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/data-patch.js

@@ -4,7 +4,7 @@ export function getDatapatch(base, pendingData) {
   for (const widgetId in pendingData) {
     const baseWidget = base[widgetId]
     const pendingWidget = pendingData[widgetId]
-    if (!baseWidget) {
+    if (!baseWidget || typeof pendingWidget === 'string') {
       patch[widgetId] = pendingWidget
     } else {
       patchProp(baseWidget, pendingWidget, patch, widgetId)

package/template/mp/common/merge-renderer.js

@@ -5,13 +5,9 @@ import { getDatapatch } from './data-patch'
 
 export default {
   // Attention, must be called at the end of attached or page load to make sure user init take effect
-  initMergeRenderer(widgets) {
+  initMergeRenderer(widgets, dataFactory = {}) {
     this.flushPendingData = throttle(this.flushPendingData.bind(this), 18)
 
-    const dataFactory = {
-      // <%= dataPropNames.pageState %>: () => pageState,
-      // <%= dataPropNames.pageComputed %>: () => pageComputed,
-    }
     for (const id in widgets) {
       const props = widgets[id]
       dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props, id)

package/template/mp/common/style.js

@@ -5,7 +5,7 @@ import { toDash } from './util'
 export function styleToCss(style) {
   const styleDeclars = [] // ['color: red;', 'background-color: green']
   for (const key in style) {
-    styleDeclars.push(toDash(key) + ':' + style[key] + ';')
+    styleDeclars.push(`${/^--/.test(key) ? key : toDash(key)}:${style[key]};`)
   }
   return styleDeclars.join('')
 }

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

@@ -22,6 +22,7 @@ import { $w as baseAPI } from '../app/weapps-api';
 import { Event } from './event-emitter';
 import { generatePageUrl } from '@cloudbase/weda-client';
 import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
+import { styleToCss } from './style';
 
 export const PAGE_ROOT_SYMBOL = Symbol('@@page_route@@')
 
@@ -118,6 +119,7 @@ export function createPage({
 
   const evtHandlers = createEventHandlers(evtListeners);
   const {[PAGE_ROOT_SYMBOL]: pageRootDataBinds, ...componentDataBinds} = dataBinds
+  const staticPageStyle = <%= pageStyle || '{}' %>
 
   return Component({
     _componentType: 'page',
@@ -127,7 +129,7 @@ export function createPage({
       _expiredMessage: '',
       weDaHasLogin: null,
       loginError: null,
-      pageStyle: `<%= pageStyle || '' %>`
+      pageStyle: styleToCss(staticPageStyle)
     },
     lifetimes: {
       attached() {
@@ -158,7 +160,33 @@ export function createPage({
           const widget = getWidget($page.widgets, e.target.id);
           widget._methods = {};
         };
-        this._disposers.push(...this.initMergeRenderer($page.widgets));
+        this._disposers.push(...this.initMergeRenderer($page.widgets, {
+          pageStyle: () => {
+            let pageStyle = { ...staticPageStyle }
+            try {
+              if ( pageRootDataBinds.style ) {
+                const { style } = mergeDynamic2StaticData({}, {
+                  style: pageRootDataBinds.style
+                }, {
+                  codeContext: {
+                    /**
+                     * $page 或 $comp 实例
+                     */
+                    instance: $page,
+                  },
+                  $w: $page?.__internal__?.$w,
+                })
+                pageStyle = {
+                  ...pageStyle,
+                  ...style
+                }
+              }
+            } catch(e) {
+              console.warn('页面动态style绑定计算失败：', e)
+            }
+            return styleToCss(pageStyle)
+          }
+        }));
         getExpiredMessage(<%= expirationStartTimesnap %>).then(message => {
           if (message) {
             this.setData({