@cloudbase/lowcode-builder 1.8.89 → 1.8.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.89",
+  "version": "1.8.91",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/html/index.html.ejs

@@ -545,7 +545,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.4b74407996a537f4d5a6.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.7b502f20fb4429d008f11.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -4,7 +4,7 @@ import { createWidgets, getWidget, disposeWidget } from './widget'
 import mergeRenderer from './merge-renderer'
 import { runWatchers } from './watch'
 import lodashGet from 'lodash.get';
-import { createInitData } from './widget';
+import { createInitData, createWidget } from './widget';
 import { commonCompBehavior } from '@cloudbase/weda-client';
 import { $w as baseAPI } from '../app/weapps-api'
 
@@ -13,7 +13,7 @@ import { $w as baseAPI } from '../app/weapps-api'
  */
 export const compLowcodes = {}
 
-export function createComponent(key, behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps, index, lifeCycle, stateFn, computedFuncs, config, libCommonRes, libCode) {
+export function createComponent(key, behaviors, properties={}, events, handler, dataBinds, evtListeners, widgetProps, index, lifeCycle, stateFn, computedFuncs, config, libCommonRes, libCode) {
   widgetProps = patchWdigetPropsWithEvtListeners(widgetProps, evtListeners)
 
   compLowcodes[key] = {
@@ -53,6 +53,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       created() {
         this._pageActive = true
         this._disposers = []
+        this._nativeObserver = false
       },
       attached() {
         const $comp = this._getInstance()
@@ -60,7 +61,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
         $comp.__internal__.active = this._pageActive
 
         $comp.props.events = createPropEvents(events, this)
-        const { widgets, rootWidget: virtualRootWidget } = createWidgets(widgetProps, dataBinds, this,  $comp.widgets)
+        const { widgets, rootWidget: virtualRootWidget } = createWidgets(widgetProps, dataBinds, this, $comp.widgets)
         $comp.widgets = widgets
         this._virtualRootWidget = virtualRootWidget
 
@@ -98,7 +99,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
         $comp.__internal__.active = this._pageActive
 
         $comp.widgets = null
-        $comp.node._eventListeners.clear();
+        $comp.node._eventListeners?.clear?.();
         disposeWidget(this._virtualRootWidget)
         this._disposers.forEach(dispose => dispose())
         lifeCycle.onDetached && lifeCycle.onDetached.call($comp)
@@ -130,19 +131,34 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       ...createEventHandlers(evtListeners, { looseError: true, isComposite: true }),
       ...mergeRenderer,
       _getInstance() {
-        if(!this.$WEAPPS_COMP){
-          const widget = this.$node
+        if (!this.$WEAPPS_COMP) {
+          let widget = this.$node
           if (!widget) {
-            console.error('Fatal error: weapps component instance not created', this.is, this.id)
-          }else {
-            widget.getDom = (fields) => this._virtualRootWidget.children[0].getDom(fields)
-            this.$WEAPPS_COMP = create$comp(widget)
+            if(this.selectOwnerComponent && !this.selectOwnerComponent?.()) {
+              const widgetValue = {}
+              for (const key in properties) {
+                if (properties[key]?.value !== undefined) {
+                  widgetValue[key] = properties[key]?.value
+                }
+                if (this.data[key] !== undefined) {
+                  widgetValue[key] = this.data[key]
+                }
+              }
+              this.$node = createWidget({ widgetType: key, ...widgetValue }, this.id || `id${Date.now()}`, '', undefined, {})
+              widget = this.$node
+              this._nativeObserver = true;
+            } else {
+              console.error('Fatal error: weapps component instance not created', this.is, this.id);
+              return
+            }
           }
+          widget.getDom = (fields) => this._virtualRootWidget.children[0].getDom(fields)
+          this.$WEAPPS_COMP = create$comp(widget)
         }
         return this.$WEAPPS_COMP
       },
     },
-    // observers: createObservers(Object.keys(properties))
+    observers: createObservers(Object.keys(properties))
   })
 }
 
@@ -152,7 +168,6 @@ export function create$comp(w) {
   if (!lowcode) {
     return
   }
-  const libCode = w.widgetType.split(':')[0]
   const { stateFn, computedFuncs, handler, lib } = lowcode
 
   const $comp = {
@@ -161,21 +176,15 @@ export function create$comp(w) {
     state: {},
     computed: {},
     widgets: {},
-    node: w,
+    node: w || {},
     props: {
-      data: w,
+      data: w || {},
       events: {},
       get style() { return w.style },
       get classList() { return w.classList },
     },
     handler: {},
-    lib,
-    // i18n: {
-    //   t(key, data) {
-    //     const ns = libCode;
-    //     return sdk.i18n.t(`${ns}:${key}`, data)
-    //   },
-    // }
+    lib
   }
   $comp.$WEAPPS_COMP = $comp  // TODO $comp will replaced to this.$WEAPPS_COMP
   $comp.computed = createComputed(computedFuncs, $comp)
@@ -190,7 +199,7 @@ export function create$comp(w) {
     baseAPI,
     {
       get(target, prop) {
-        if(prop === '$comp'){
+        if (prop === '$comp') {
           return $comp
         }
         // 尝试代理组件级别组件实例
@@ -207,13 +216,29 @@ export function create$comp(w) {
 }
 
 function createObservers(props) {
+  const MAP = {
+    className: {
+      alias: 'classList',
+      format: function(value='') {
+        return Array.from(new Set(value.split(' ').filter(item=>!!item)))
+      }
+    },
+  }
   return props.reduce((observers, prop) => {
-    observers[prop] = function (newVal) {
-      const data = this._getInstance().props.data
-      if (!deepEqual(data[prop], newVal)) {
-        data[prop] = newVal
-      } else {
-        // console.log('Same comp prop will not trigger observer', prop, newVal)
+    observers[prop] = function (value) {
+      if (!this._nativeObserver) {
+        return;
+      }
+      const $comp = this._getInstance()
+      if ($comp) {
+        const data = $comp.props.data || {}
+        const dataKey = MAP[prop]?.alias || prop;
+        const formatValue = MAP[prop]?.format ? MAP[prop].format(value) : value;
+        // if (!deepEqual(data[prop], formatValue)) {
+          data[dataKey] = formatValue
+        // } else {
+        //   // console.log(`Same comp prop will not trigger observer. ${prop}->${dataKey}`, formatValue)
+        // }
       }
     }
     return observers
@@ -256,7 +281,7 @@ function createPropEvents(events, mpInst) {
           mpInst.setData({ value: evt.getValueFromEvent({ detail: evtDetail }) })
         }
         mpInst.triggerEvent(evt.name, evtDetail)
-        mpInst._getInstance().node._eventListeners.emit(evt.name, evtDetail)
+        mpInst._getInstance().node?._eventListeners?.emit?.(evt.name, evtDetail)
       }
     }
   })

package/template/mp/common/widget.js

@@ -377,7 +377,7 @@ function runFor(curForNode, dataBinds, ownerMpInst, forContext, ownerForWidgetHo
   return dispose;
 }
 
-function createWidget(props, nodeId, indexPostfix, parent, ownerMpInst, forContext) {
+export function createWidget(props, nodeId, indexPostfix, parent, ownerMpInst, forContext) {
   const { widgetType, _parentId, ...restProps } = props;
   const w = observable(restProps);
   const id = `${nodeId}${indexPostfix}`;

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

package/template/mp/packages/$wd_system/pages/login/methods/loginByWXPhone.js

@@ -25,7 +25,7 @@ export default async function (instance, { event }) {
       });
       const token = tokenRes?.token || tokenRes;
       if (!token) {
-        throw new Error('invalid empty mp user ticket');
+        throw new Error('请在控制台检查小程序相关配置');
       }
       providerInfo.provider_id = 'weda';
       providerInfo.provider_access_token = `${