@cloudbase/lowcode-builder 1.8.86 → 1.8.88

package/package.json

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

package/template/html/index.html.ejs

@@ -23,17 +23,19 @@
     <% })%> <% if(cdnEndpoints.aegis){ %>
     <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
     <script>
-      const _aegis = new Aegis({
-        id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
-        reportApiSpeed: true, // 接口测速
-        reportAssetSpeed: true, // 静态资源测速
-        spa: true,
-        ext1: '<%=appId%>',
-        ext3: '<%=ext3%>',
-        version: '<%= !isAdminPortal? "0.0.2" : "0.0.3" %>',
-        env: '<%= mode !== "production"? "pre" : "production" %>',
-      });
-      window._aegis = _aegis;
+      if (Aegis) {
+        const _aegis = new Aegis({
+          id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
+          reportApiSpeed: true, // 接口测速
+          reportAssetSpeed: true, // 静态资源测速
+          spa: true,
+          ext1: '<%=appId%>',
+          ext3: '<%=ext3%>',
+          version: '<%= !isAdminPortal? "0.0.2" : "0.0.3" %>',
+          env: '<%= mode !== "production"? "pre" : "production" %>',
+        });
+        window._aegis = _aegis;
+      }
       window._aegis_inited = Date.now();
     </script>
     <% }%>
@@ -543,7 +545,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.e1085a387b7fdbc5b299.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.4b74407996a537f4d5a6.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/query.js

@@ -16,6 +16,11 @@ export class Query {
   #observableValue = observable({ data: null, error: null, isFetching: false });
   #eventHandlerMap = {};
   #action = () => {};
+  #runQueryMap = {
+    sql: { QueryResource: 'mysql-plugin', QueryPath: '/WeDa/Query/V1/RunPluginQuery' },
+    sqlserver: { QueryResource: 'mssql-plugin', QueryPath: '/WeDa/Query/V1/RunPluginQuery' },
+    'cloud-connector': { QueryResource: 'apis-plugin', QueryPath: '/WeDa/Connector/v1/RunApisQuery' },
+  };
   constructor({ schema, context, options = {} }) {
     const { looseError = false } = options;
     this.#schema = schema;
@@ -33,7 +38,7 @@ export class Query {
         autorun(
           (r) => {
             try {
-              const data = this.#resolveParams();
+              const data = this.#resolveParams({}, { combainErrors: true });
               if (this.#triggered) {
                 this.#debounceTrigger(data);
               }
@@ -59,76 +64,85 @@ export class Query {
 
     const { $w } = this.#context;
 
-    this.#action =
-      this.#schema.type === 'sql' || this.#schema.type === 'sqlserver'
-        ? async function (data) {
-            const requestData = {
-              EnvId: $w.env.envId,
-              Name: data.sqlTemplateId,
-              Parameter: JSON.stringify(
-                Object.entries(data.params || {}).reduce((list, [key, value]) => {
-                  if (value !== undefined) {
-                    let type = 'OBJECT';
-                    const typeofValue = typeof value;
-                    switch (typeofValue) {
-                      case 'boolean': {
-                        type = 'BOOLEAN';
-                        break;
-                      }
-                      case 'number': {
-                        type = 'NUMBER';
-                        break;
-                      }
-                      case 'string': {
-                        type = 'STRING';
-                        break;
-                      }
-                      default: {
-                        if (Array.isArray(value)) {
-                          type = 'ARRAY';
-                        } else {
-                          type = 'OBJECT';
-                        }
+    this.#action = this.#isRunQueryType
+      ? async function (data) {
+          const requestData = {
+            EnvId: $w.env.envId,
+            Name: data.sqlTemplateId,
+            Parameter: JSON.stringify(
+              Object.entries(data.params || {}).reduce((list, [key, value]) => {
+                if (value !== undefined) {
+                  let type = 'OBJECT';
+                  const typeofValue = typeof value;
+                  switch (typeofValue) {
+                    case 'boolean': {
+                      type = 'BOOLEAN';
+                      break;
+                    }
+                    case 'number': {
+                      type = 'NUMBER';
+                      break;
+                    }
+                    case 'string': {
+                      type = 'STRING';
+                      break;
+                    }
+                    default: {
+                      if (Array.isArray(value)) {
+                        type = 'ARRAY';
+                      } else {
+                        type = 'OBJECT';
                       }
                     }
-
-                    list.push({
-                      Key: key,
-                      Type: type,
-                      Value: type === 'STRING' ? value : JSON.stringify(value),
-                    });
                   }
 
-                  return list;
-                }, []) || [],
-              ),
-            };
+                  list.push({
+                    Key: key,
+                    Type: type,
+                    Value: type === 'STRING' ? value : JSON.stringify(value),
+                  });
+                }
+
+                return list;
+              }, []) || [],
+            ),
+          };
+
+          const Data = await $w.cloud.callWedaApi({
+            action: 'RunQuery',
+            CallQuery: true,
+            ...(this.#runQueryMap[this.#schema.type] || this.#runQueryMap['sql']),
+            EnvId: requestData.EnvId,
+            QueryName: requestData.Name,
+            data: requestData,
+          });
 
-            const Data = await $w.cloud.callWedaApi({
-              action: 'RunQuery',
-              CallQuery: true,
-              QueryResource: this.#schema.type === 'sql' ? 'mysql-plugin' : 'mssql-plugin',
-              QueryPath: '/WeDa/Query/V1/RunPluginQuery',
-              EnvId: requestData.EnvId,
-              QueryName: requestData.Name,
-              data: requestData,
-            });
+          // const Data = await $w.cloud.callWedaApi({
+          //   action: 'RunPluginQuery',
+          //   data: {
+          //     MainAppId: $w.app.id,
+          //     ...requestData
+          //   },
+          // });
 
-            // const Data = await $w.cloud.callWedaApi({
-            //   action: 'RunPluginQuery',
-            //   data: {
-            //     MainAppId: $w.app.id,
-            //     ...requestData
-            //   },
-            // });
+          const { ExecuteResultList = [], Total, Payload } = Data || {};
 
-            const { ExecuteResultList = [], Total } = Data || {};
-            return {
-              records: ExecuteResultList.map((item) => JSON.parse(item)),
-              total: Total || ExecuteResultList.length,
-            };
-          }
-        : this.#schema.handler;
+          let payload = Payload;
+          try {
+            if (Payload) {
+              payload = JSON.parse(Payload);
+            }
+          } catch (e) {}
+          return {
+            ...(this.#schema.type === 'cloud-connector'
+              ? payload
+              : {
+                  records: ExecuteResultList.map((item) => JSON.parse(item)),
+                  total: Total || ExecuteResultList.length,
+                }),
+          };
+        }
+      : this.#schema.handler;
     this.#eventHandlerMap = Object.entries(
       createEventHandlers(this.#schema.eventHandlers || {}, {
         looseError: looseError,
@@ -164,6 +178,9 @@ export class Query {
   get isFetching() {
     return this.#observableValue.isFetching;
   }
+  get #isRunQueryType() {
+    return !!this.#runQueryMap[this.#schema.type];
+  }
   async trigger(additionalScope, options = {}) {
     this.#triggered = true;
     return this.#innerTrigger(this.#resolveParams(additionalScope), options);
@@ -217,7 +234,7 @@ export class Query {
     }, 300);
   }
 
-  #resolveParams(additionalScope = {}) {
+  #resolveParams(additionalScope = {}, options = {}) {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
@@ -227,7 +244,7 @@ export class Query {
       mergeDynamic2StaticData(toJS(this.#paramsRef.current), this.#dataBinds, {
         $w: this.#context.$w,
         paramsContext: additionalScope,
-      }) || {};
+      }, options?.combainErrors) || {};
 
     return params;
   }

package/template/mp/common/util.js

@@ -714,6 +714,7 @@ export function mergeDynamic2StaticData(
     dataContext?: Record<string,any>;
     paramsContext?: Record<string,any>;
   }*/,
+  combainErrors = false,
 ) {
   const { forContext = {}, codeContext = {}, dataContext = {}, $w, paramsContext = {} } = context;
   const { lists = [], forItems = {} } = forContext;
@@ -721,22 +722,34 @@ export function mergeDynamic2StaticData(
   const resolvedData = {
     ...staticData,
   };
+  let error = null;
 
   for (const key in dataBinds) {
-    set(
-      resolvedData,
-      key,
-      dataBinds[key].call(
-        codeContext.instance,
-        codeContext.instance,
-        lists,
-        forItems,
-        codeContext.event,
-        dataContext,
-        $w,
-        paramsContext,
-      ),
-    );
+    try {
+      set(
+        resolvedData,
+        key,
+        dataBinds[key].call(
+          codeContext.instance,
+          codeContext.instance,
+          lists,
+          forItems,
+          codeContext.event,
+          dataContext,
+          $w,
+          paramsContext,
+        ),
+      );
+    } catch(e) {
+      if(combainErrors) {
+        error = e
+      } else {
+        throw e
+      }
+    }
+  }
+  if(error) {
+    throw error
   }
 
   return resolvedData;

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}`;