@cloudbase/lowcode-builder 1.8.71 → 1.8.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.71",
+  "version": "1.8.73",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -44,7 +44,9 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.57",
+    "@babel/core": "7.21.4",
+    "@babel/preset-env": "7.21.4",
+    "@cloudbase/cals": "^1.0.59",
     "@cloudbase/lowcode-generator": "^1.8.24",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
@@ -78,7 +80,6 @@
     "@types/weixin-app": "^2.9.0",
     "cross-env": "^7.0.3",
     "csstype": "^2.6.10",
-    "jest": "^27.5.1",
     "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
     "tsc-watch": "^6.0.4",

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

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

@@ -1,12 +1,11 @@
 import { observable } from 'mobx'
 import { createMpApp } from '@cloudbase/weda-client';
-import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'
+import { createComputed, formatEnum, enumOptions, generateDatasetQuery } from '<%= subLevelPath %>../common/util'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
 
 import lodashGet from 'lodash.get';
 import config from '<%= subLevelPath %>../common/config';
-import { generateDatasetQuery } from '../common/util';
 
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>

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)
@@ -17,17 +17,20 @@ function patchProp(baseWidget, pendingWidget, patch, prefixes) {
   if (Array.isArray(pendingWidget)) {
     /**
      * 数组长度发生变化，更新整个数组
+     * 当启用 _WaForKey，且可以取到key时，更新整个数组
      * 通过 array[0].xxx 进行更新，id 不会更新，疑似 mp 实现 bug
      */
     if (pendingWidget.length != baseWidget.length) {
       patch[prefixes] = pendingWidget
-      return
-    }
-    for (let i = 0; i < pendingWidget.length; i++) {
-      if (!baseWidget[i]) {
-        patch[prefixes + '[' + i + ']'] = pendingWidget[i]
-      } else {
-        patchProp(baseWidget[i], pendingWidget[i], patch, prefixes + '[' + i + ']')
+    } else if (pendingWidget?.some(item=>item._waForKey) && pendingWidget[0]?._key) {
+      patch[prefixes] = pendingWidget
+    } else {
+      for (let i = 0; i < pendingWidget.length; i++) {
+        if (!baseWidget[i]) {
+          patch[prefixes + '[' + i + ']'] = pendingWidget[i]
+        } else {
+          patchProp(baseWidget[i], pendingWidget[i], patch, prefixes + '[' + i + ']')
+        }
       }
     }
   } else {

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/util.js

@@ -201,7 +201,7 @@ export function createEventHandlers(
           if (!self[nextHandler.handlerName] && error) {
             const message =  generateErrorDebugMessage(error) || error.errMsg || ''
             console.error(`Action error:`, message, error?.stack);
-            if (!looseError) {
+            if (!looseError && !/scanCode:fail cancel/.test(message)) {
               if (app.__internal__?.env?.type !== 'production') {
                 app.showModal({
                   title: `事件响应失败`,

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({

package/template/mp/common/widget.js

@@ -77,7 +77,7 @@ export function resolveWidgetData(props, widgetId) {
   if (!Array.isArray(props)) {
     return resolveWidgetProp(props, widgetId);
   }
-  return props.map(prop => resolveWidgetData(prop, widgetId));
+  return props.map((prop) => resolveWidgetData(prop, widgetId));
 }
 
 export function createWidgets(widgetProps, dataBinds, ownerMpInst, widgetHolder) {
@@ -135,7 +135,8 @@ function createSubWidgetTree(
     (node, parentNode, cache) => {
       const parentForWidgetArr = ownerForWidgetHolder[node.id] || [];
       const { _waForKey } = node.value;
-      const key = forContext.forItems?.[node.id]?.[_waForKey];
+
+      const key = forContext.forItems?.[node.id]?.[_waForKey] || currentIndex;
       let forExistingWidgetMap = {};
       let forExsitWidget;
 
@@ -280,8 +281,8 @@ function runFor(curForNode, dataBinds, ownerMpInst, forContext, ownerForWidgetHo
       // dispose widgets before reused instead
       // disposeWidgets(parentForWidgets[curForNode.id])
       const exsitMap = forList.reduce((map, item, index) => {
-        const cache = item?.[_waForKey];
-        if (map[cache] === undefined) {
+        const cache = item?.[_waForKey] || index;
+        if (cache !== undefined && map[cache] === undefined) {
           map[cache] = index;
         }
         return map;
@@ -291,17 +292,18 @@ function runFor(curForNode, dataBinds, ownerMpInst, forContext, ownerForWidgetHo
       const existingWidgetIndexMap = {};
       const extraWidgetsIndexMap = {};
       forWidgets.forEach((widget, index) => {
-        if (exsitMap[widget._key] !== undefined) {
+        const cecheKey = widget._key || index;
+        if (exsitMap[cecheKey] !== undefined) {
           const nodeId = widget.id?.split(ID_SEPARATOR)[0];
-          existingWidgetMap[widget._key] = { index: exsitMap[widget._key], widgets: { [nodeId]: widget } };
+          existingWidgetMap[cecheKey] = { index: exsitMap[cecheKey], widgets: { [nodeId]: widget } };
           /**
-           * 此处依赖了 existingWidgetMap[widget._key].widgets 的引用，
+           * 此处依赖了 existingWidgetMap[cecheKey].widgets 的引用，
            * 为了直接可以通过 index 访问到 existingWidgetMap 里的值进行编辑
            * 但是依赖引用关系，存在维护风险
            */
-          existingWidgetIndexMap[index] = existingWidgetMap[widget._key].widgets;
+          existingWidgetIndexMap[index] = existingWidgetMap[cecheKey].widgets;
           // need to use uqique key
-          exsitMap[widget._key] = undefined;
+          exsitMap[cecheKey] = undefined;
         } else {
           extraWidgetsIndexMap[index] = widget;
         }