@cloudbase/lowcode-builder 1.8.64 → 1.8.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.64",
+  "version": "1.8.65",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -46,8 +46,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.49",
-    "@cloudbase/lowcode-generator": "^1.8.18",
+    "@cloudbase/cals": "^1.0.51",
+    "@cloudbase/lowcode-generator": "^1.8.19",
     "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.66f4e5788cf846be20b3.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3897a073a34a755db5d0.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/common.js

@@ -3,6 +3,10 @@ import * as $$<%= mod %> from '../lowcode/common/<%= mod %>'<%}) %>
 
 const _weapps_app_common = {}
 
+/**
+ * 合并逻辑主要担心之前存在引用
+ * 实际上可以遵照web实现互斥，有 default 则使用 default 否则 module
+ */
 function getDefaultModule(targetModule) {
   if (!targetModule) {
     return
@@ -11,7 +15,29 @@ function getDefaultModule(targetModule) {
   if (keys.length === 1 && keys[0] === 'default') {
     return targetModule.default
   }
-  return targetModule
+
+  try {
+    if (keys.includes('default')) {
+      let module = targetModule.default || {};
+      for (const key in targetModule) {
+        try {
+          if (module[key] !== undefined) {
+            // reportEvent(`${tag}.mergeconflict`);
+          } else if (key !== 'default') {
+            /**
+             * 兼容之前写法进行数据合并
+             */
+            module[key] = targetModule[key];
+          }
+        } catch (e) {
+          // reportEvent(`${tag}.unmergeable`);
+        }
+      }
+      return module;
+    }
+  } catch (e) {}
+
+  return targetModule;
 }
 
 Object.defineProperties(_weapps_app_common, {

package/template/mp/common/util.js

@@ -64,6 +64,27 @@ export function createEventHandlers(
 ) {
   const { looseError = false, isComposite = false, syncCall = false } = options;
   const evtHandlers = {};
+  function proxyWrapper(target, compareTarget, key) {
+    try {
+      return new Proxy(target, {
+        get(target, p) {
+          if (p !== 'id') {
+            if (
+              (key === 'currentTarget' || key === 'target') &&
+              p !== '_userWidget' &&
+              target[p] !== compareTarget?.[p]
+            ) {
+              // console.log(`@deprecated event.${key}.${String(p)}`);
+              reportEvent(`event.${key}.${String(p)}`);
+            }
+          }
+          return target[p];
+        },
+      });
+    } catch (e) {
+      return target;
+    }
+  }
   for (const name in evtListeners) {
     const listeners = evtListeners[name];
     evtHandlers[name] = function (event = {}) {
@@ -71,8 +92,8 @@ export function createEventHandlers(
       const owner = this._getInstance();
       const target = !!event?.target?.id ? getWidget(owner.widgets, event.target.id) : undefined;
       const currentTarget = !!event?.currentTarget?.id ? getWidget(owner.widgets, event.currentTarget.id) : undefined;
-      event.target = target;
-      event.currentTarget = currentTarget;
+      event.target = proxyWrapper(target, target?._userWidget, 'target');
+      event.currentTarget = proxyWrapper(currentTarget, currentTarget?._userWidget, 'currentTarget');
       const [prefix = '', trigger] = name.split('$');
       // The page event handler
       const forContext = (!!currentTarget && generateForContextOfWidget(currentTarget)) || {};
@@ -825,3 +846,15 @@ export function patchWdigetPropsWithEvtListeners(widgetProps, evtListeners) {
   }
   return widgetProps;
 }
+
+
+export function reportEvent(tag) {
+  try {
+    const { envVersion } = app.__internal__?.getConfig?.() || {};
+    // console.log('>>>>>>reportevent:', tag);
+    getApp().globalData._aegis?.reportEvent?.({
+      name: tag,
+      ext2: envVersion,
+    });
+  } catch (e) {}
+}

package/template/mp/datasources/index.js.tpl

@@ -32,6 +32,11 @@ initTcb()
 
 <% if(cdnEndpoints.aegis){ %>
 require.async('../packages/$wd_system/index.js').then(({ Aegis }) => {
-  new Aegis(AEGIS_CONFIG)
+  let _aegis = new Aegis(AEGIS_CONFIG);
+  const app = getApp();
+  if(!app.globalData) {
+    app.globalData = {}
+  }
+  app.globalData._aegis = _aegis;
 })
 <% }%>