@cloudbase/lowcode-builder 1.8.63 → 1.8.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.63",
+  "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.48",
-    "@cloudbase/lowcode-generator": "^1.8.17",
+    "@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.3042dc8d6699648318fe.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/app.js

@@ -70,14 +70,26 @@ setConfig({
     app.showToast({ icon: isSuccess ? 'success' : 'error' });
   },
   async afterCallFunction(params, error, res) {
-    const oauthError =
+    let oauthError =
       error?.message?.includes?.('PERMISSION_DENIED') ||
       error?.code === 'unauthenticated' ||
       error?.error === 'unauthenticated' ||
       error?.code === 'invalid_grant' ||
       error?.error === 'invalid_grant' ||
-      error?.code === 'INVALID_ACCESS_TOKEN' ||
-      (error?.code === 'OPERATION_FAIL' && /^\[INVALID_ACCESS_TOKEN\]/.test(error?.message || ''));
+      error?.code === 'INVALID_ACCESS_TOKEN';
+
+    if (!oauthError) {
+      try {
+        /**
+         * js-sdk v2 实现上吞了所有错误
+         * 返回 new Error(JSON.stringify({code: "OPERATION_FAIL", msg:"[INVALID_ACCESS_TOKEN]XXX"}))
+         */
+        let tcbErrorObj = JSON.parse(error.message);
+        if (tcbErrorObj?.code === 'OPERATION_FAIL' && /\[INVALID_ACCESS_TOKEN\]/.test(tcbErrorObj.msg)) {
+          oauthError = true;
+        }
+      } catch (e) {}
+    }
 
     if (
       params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' &&

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)) || {};
@@ -489,7 +510,8 @@ export function formatErrorMsg(e) {
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
-  return true
+  <% if(skipCheckAuth){ %> return true <% } %>
+
   const loginPage = findLoginPage(app);
   if (loginPage?.id === $page.id) {
     return true;
@@ -762,11 +784,13 @@ function formatLifecycle(time) {
   return str;
 }
 
-const PROMISE = new Promise((resolve,reject)=>{
+const PROMISE = new Promise((resolve, reject)=>{
   wx.request({
-    url: 'https://comp-public-1303824488.file.myqcloud.com/release_config/runtime/exp_runtime.json',
+    url: '<%= RUNTIME_CONFIG_URL %>',
     success: res => resolve(res.data),
-    fail: reject
+    fail: e => {
+      resolve(<%= JSON.stringify(runtimeDynamicConfig)%>)
+    }
   })
 })
 <% } %>
@@ -779,10 +803,15 @@ export async function getExpiredMessage(createdTime = 0) {
   try {
     if (createdTime) {
       const json = await PROMISE;
-      const { expLifeime = Infinity } = json;
-      if (Date.now() - createdTime > expLifeime) {
+      const { expLifeTime = Infinity } = json;
+      const releaseTime = wx.getAccountInfoSync()?.miniProgram?.releaseTime;
+      if(releaseTime) {
+        let date = new Date(releaseTime);
+        createdTime = date.getTime()
+      }
+      if (Date.now() - createdTime > expLifeTime) {
         return `该版本为体验版，需要再次发布激活，每次发布应用活跃时间为${formatLifecycle(
-          expLifeime,
+          expLifeTime,
         )}。您也可以升级为正式版本，无应用活跃时间限制。`;
       }
     }
@@ -791,3 +820,41 @@ export async function getExpiredMessage(createdTime = 0) {
   }
 <% } %>
 }
+
+
+export function patchWdigetPropsWithEvtListeners(widgetProps, evtListeners) {
+  const actionMap = Object.keys(evtListeners).reduce((map, evtKey = '') => {
+    const matched = evtKey.match(/^on(.*?)\$(.*)$/);
+    if (matched?.[1] && matched?.[2] && !/[._]/.test(matched?.[2])) {
+      if (!map[matched?.[1]]) {
+        map[matched?.[1]] = new Set([]);
+      }
+      map[matched?.[1]].add(matched?.[2]);
+    }
+    return map;
+  }, {});
+  for (let key in widgetProps) {
+    const props = widgetProps[key];
+    if (actionMap[key]) {
+      if (!props.classList) {
+        props.classList = [];
+      }
+      props.classList = Array.from(
+        new Set([...props.classList, ...Array.from(actionMap[key]).map((trigger) => `wd-event-${trigger}`)]),
+      );
+    }
+  }
+  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/common/weapp-component.js

@@ -1,5 +1,5 @@
 import { observable } from 'mobx'
-import { createEventHandlers, createComputed } from './util'
+import { createEventHandlers, createComputed, patchWdigetPropsWithEvtListeners } from './util'
 import { createWidgets, getWidget, disposeWidget } from './widget'
 import mergeRenderer from './merge-renderer'
 import { runWatchers } from './watch'
@@ -14,7 +14,8 @@ 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) {
-  const initData = createInitData(widgetProps, dataBinds, '');
+  widgetProps = patchWdigetPropsWithEvtListeners(widgetProps, evtListeners)
+
   compLowcodes[key] = {
     index,
     stateFn,
@@ -46,7 +47,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       ...properties,
     },
 
-    data: initData,
+    data: createInitData(widgetProps, dataBinds, ''),
 
     lifetimes: {
       created() {

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

@@ -21,7 +21,7 @@ import { runWatchers } from './watch';
 import { $w as baseAPI } from '../app/weapps-api';
 import { Event } from './event-emitter';
 import { generatePageUrl } from '@cloudbase/weda-client';
-import { mergeDynamic2StaticData } from './util';
+import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
 
 export const PAGE_ROOT_SYMBOL = Symbol('@@page_route@@')
 
@@ -114,6 +114,8 @@ export function createPage({
   pageAttributes = {},
   resetShare = true,
 }) {
+  widgetProps = patchWdigetPropsWithEvtListeners(widgetProps, evtListeners)
+
   const evtHandlers = createEventHandlers(evtListeners);
   const {[PAGE_ROOT_SYMBOL]: pageRootDataBinds, ...componentDataBinds} = dataBinds
 
@@ -415,3 +417,4 @@ function decodePageQuery(query) {
     return decoded;
   }, {});
 }
+

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;
 })
 <% }%>