@cloudbase/lowcode-builder 1.8.32 → 1.8.33

package/lib/utils/transform.js

@@ -4,8 +4,25 @@ exports.BabelTransform = void 0;
 /* eslint-disable no-new-func */
 const core_1 = require("@babel/core");
 function BabelTransform(code, options = {}) {
-    var _a;
+    var _a, _b, _c;
     const { IIFE = false } = options;
+    /**
+     * 如果 trim 完为空
+     * 则原样不用再编译了
+     */
+    if (!((_a = code === null || code === void 0 ? void 0 : code.trim) === null || _a === void 0 ? void 0 : _a.call(code))) {
+        return code;
+    }
+    try {
+        /**
+         * 如果是基础字面量的话
+         * 可以直接使用原值，不用过babel
+         */
+        if (typeof code === 'string' && JSON.parse((_b = code === null || code === void 0 ? void 0 : code.trim) === null || _b === void 0 ? void 0 : _b.call(code))) {
+            return code;
+        }
+    }
+    catch (e) { }
     try {
         const simpleWrapped = `(\n${code || 'undefined'}\n)`;
         const { code: expression } = (0, core_1.transformSync)(IIFE ? `(()=>${simpleWrapped})()` : simpleWrapped, {
@@ -38,7 +55,7 @@ function BabelTransform(code, options = {}) {
                 ],
             ],
         }) || {};
-        const res = ((_a = expression === null || expression === void 0 ? void 0 : expression.replace) === null || _a === void 0 ? void 0 : _a.call(expression, /;$/, '')) || code;
+        const res = ((_c = expression === null || expression === void 0 ? void 0 : expression.replace) === null || _c === void 0 ? void 0 : _c.call(expression, /;$/, '')) || code;
         if (expression) {
             new Function(`return (\n${res}\n)`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.32",
+  "version": "1.8.33",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -41,8 +41,8 @@
   "dependencies": {
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
-    "@cloudbase/cals": "^1.0.20",
-    "@cloudbase/lowcode-generator": "^1.8.11",
+    "@cloudbase/cals": "^1.0.21",
+    "@cloudbase/lowcode-generator": "^1.8.12",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -84,4 +84,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/html/index.html.ejs

@@ -551,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.0348f32f29a480792583.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.6e7ca58f90bb6d1c7831.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/event-emitter.js

@@ -68,6 +68,7 @@ export class Event {
    */
   _isCapturePhase; /* : boolean; */
   origin /* : Event */;
+  originEvent /* ?: React.SyntheticEvent */;
   constructor(
     {
       type = '',
@@ -76,6 +77,7 @@ export class Event {
       target = undefined,
       _isCapturePhase = false,
       origin,
+      originEvent = undefined,
     } /* : IEventProps*/,
   ) {
     function proxyWrapper(target, key) {
@@ -97,6 +99,7 @@ export class Event {
     this.currentTarget = proxyWrapper(currentTarget, 'currentTarget');
     this.target = proxyWrapper(target, 'target');
     this.origin = proxyWrapper(origin, 'origin');
+    this.originEvent = originEvent;
 
     this._isCapturePhase = _isCapturePhase;
     return new Proxy(this, {

package/template/mp/common/flow.js

@@ -41,13 +41,13 @@ export class EventFlow {
         currentTarget: target,
       }),
     );
-    // const emit = (trigger, eventData, originalEvent?) =>
+    // const emit = (trigger, eventData, originEvent?) =>
     //   generateEmit($w, target)(
     //     trigger,
     //     this._listenerInstances,
     //     eventData,
     //     forContext,
-    //     originalEvent,
+    //     originEvent,
     //     scopeContext,
     //     dataContext,
     //     $w.page.id,

package/template/mp/common/{loading → info}/index.js

@@ -3,6 +3,7 @@ Component({
    * 组件的属性列表
    */
   properties: {
+    type: String,
     message: String
   },
 
@@ -23,7 +24,13 @@ Component({
   lifetimes: {
     attached() {
       setTimeout(() => {
-        this.setData({ visible: true, message: '登录鉴权中...' })
+        const data = {
+          visible: true
+        }
+        if(this.data.type === 'loading') {
+          data.message = '登录鉴权中...'
+        }
+        this.setData(data)
       }, 100)
     },
   },

package/template/mp/common/info/index.wxml

@@ -0,0 +1,13 @@
+<view id="loading" class="weda-loading-container" wx:if="{{visible}}">
+  <view class="logo">
+    <image
+      style="width:50px;height:50px"
+      wx:if="{{type !== 'loading'}}"
+      src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PG1hc2sgaWQ9ImEiIHN0eWxlPSJtYXNrLXR5cGU6YWxwaGEiIG1hc2tVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjAiIHk9IjIiIHdpZHRoPSIxMCIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTS42MiAyLjE0M2g5LjMxNFYxNy44MkguNjJWMi4xNDN6IiBmaWxsPSIjZmZmIi8+PC9tYXNrPjxnIG1hc2s9InVybCgjYSkiPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNOS45MzMgMTBsLTQuMzIgNy40ODRhLjY3Mi42NzIgMCAwMS0uOTE4LjI0NmwtMy40MDMtMS45NjRBMS4zNDQgMS4zNDQgMCAwMS42MiAxNC42VjUuNGMwLS40OC4yNTYtLjkyNC42NzItMS4xNjRsMy4zMTItMS45MTJjLjQxNS0uMjQuOTI4LS4yNCAxLjM0NCAwbDMuOTg1IDIuM0wxLjY0MSA5LjQyYS42NzIuNjcyIDAgMDAwIDEuMTYzTDQuNjA3IDEyLjNjLjQxNi4yNDIuOTMuMjQyIDEuMzQ2LjAwMWwzLjk4LTIuM3oiIGZpbGw9IiMwMEE4NzAiLz48L2c+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik05LjkzNCAxMGw0LjMyLTcuNDg0YS42NzIuNjcyIDAgMDEuOTE4LS4yNDZsMy40MDMgMS45NjRjLjQxNi4yNC42NzIuNjg0LjY3MiAxLjE2NVYxNC42YzAgLjQ4LS4yNTYuOTI0LS42NzIgMS4xNjRsLTMuMzEyIDEuOTEyYy0uNDE1LjI0LS45MjguMjQtMS4zNDQgMGwtMy45ODUtMi4zIDguMjkyLTQuNzk2YS42NzIuNjcyIDAgMDAwLTEuMTYzTDE1LjI2IDcuN2ExLjM0NCAxLjM0NCAwIDAwLTEuMzQ2IDBMOS45MzQgMTB6IiBmaWxsPSIjNDc4N0YwIi8+PC9zdmc+"
+    />
+    <view wx:if="{{type === 'loading'}}" class="sp sp-circle"></view>
+  </view>
+  <view class="text" id="message">
+    {{message}}
+  </view>
+</view>

package/template/mp/common/util.js

@@ -120,6 +120,7 @@ export function createEventHandlers(
             handlerName: '',
             event: {
               ...event,
+              originEvent: undefined
             },
           },
         ];
@@ -155,6 +156,7 @@ export function createEventHandlers(
                 event: {
                   ...event,
                   detail: res,
+                  originEvent: undefined
                 },
               });
             }
@@ -478,7 +480,7 @@ export async function checkAuth(app, appId, $page) {
   if (loginPage?.id === $page.id) {
     return true;
   }
-  app.showNavigationBarLoading();
+  wx.showNavigationBarLoading();
   const requestList = [getAccessPermission(app, appId, $page.id)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
   if (loginPage) {
@@ -486,7 +488,6 @@ export async function checkAuth(app, appId, $page) {
   }
   try {
     const [accessData, authConfig] = await Promise.all(requestList);
-    app.hideNavigationBarLoading();
 
     const isAnonymousUser = await checkAnonymous();
 
@@ -519,6 +520,8 @@ export async function checkAuth(app, appId, $page) {
       showCancel: false,
     });
     return false;
+  } finally {
+    wx.hideNavigationBarLoading();
   }
 }
 
@@ -716,3 +719,50 @@ export function processStaticResourceAttribute(data, replacer, property) {
     console.error('处理静态资源失败:', e);
   }
 }
+
+<% if(expirationStartTimesnap){ %>
+function formatLifecycle(time) {
+  let str = '';
+  const times = [time / 1000, 0, 0, 0];
+  const unit = ['秒', '分', '小时', '天'];
+  const delta = [1, 60, 60, 24];
+  for (let i = 1; i < times.length; i++) {
+    if (times[i - 1]) {
+      times[i] = Math.floor(times[i - 1] / delta[i]);
+      times[i - 1] = times[i - 1] % delta[i];
+    }
+  }
+  for (let i = times.length - 1; i >= 0; i--) {
+    if (times[i]) {
+      str += times[i]+unit[i];
+    }
+  }
+  return str;
+}
+
+const PROMISE = new Promise((resolve,reject)=>{
+  wx.request({
+    url: 'https://comp-public-1303824488.file.myqcloud.com/release_config/runtime/exp_runtime.json',
+    success: res => resolve(res.data),
+    fail: reject
+  })
+})
+<% } %>
+
+export async function getExpiredMessage(createdTime = 0) {
+<% if(expirationStartTimesnap){ %>
+  try {
+    if (createdTime) {
+      const json = await PROMISE;
+      const { expLifeime = Infinity } = json;
+      if (Date.now() - createdTime > expLifeime) {
+        return `该版本为体验版，需要再次发布激活，每次发布应用活跃时间为${formatLifecycle(
+          expLifeime,
+        )}。您也可以升级为正式版本，无应用活跃时间限制。`;
+      }
+    }
+  } catch (e) {
+    console.error('检查应用存活周期失败', e);
+  }
+<% } %>
+}

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

@@ -6,6 +6,7 @@ import {
   getMpEventHandlerName,
   generateDatasetQuery,
   generateEventFlows,
+  getExpiredMessage
 } from './util';
 import { createWidgets, createInitData, disposeWidget, getWidget } from './widget';
 import mergeRenderer from './merge-renderer';
@@ -98,6 +99,7 @@ export function createPage({
     data: {
       ...createInitData(widgetProps, dataBinds),
       _isCheckingAtuh: false,
+      _expiredMessage: '',
       weDaHasLogin: false,
     },
     lifetimes: {
@@ -122,6 +124,13 @@ export function createPage({
           widget._methods = {};
         };
         this._disposers.push(...this.initMergeRenderer($page.widgets));
+        getExpiredMessage(<%= expirationStartTimesnap %>).then(message => {
+          if (message) {
+            this.setData({
+              _expiredMessage: message
+            })
+          }
+        })
       },
       detached() {
         const $page = this._getInstance();
@@ -283,7 +292,18 @@ export function createPage({
             app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
           });
         };
-        $page.setParams = (params) => {
+        $page.setParams = (_params) => {
+          const params = Array.isArray(_params)
+            ? _params.reduce((map, meta) => {
+                let { key, value } = meta;
+                if (key.startsWith('$page.')) {
+                  key = key.replace(/^\$page\./, '');
+                }
+                map[key] = value;
+                return map;
+              }, {})
+            : _params;
+
           Object.keys(params).forEach((keyPath) => {
             app.utils.set($page.dataset?.params, keyPath, params[keyPath]);
           });

package/template/mp/common/loading/index.wxml

@@ -1,8 +0,0 @@
-<view id="loading" class="weda-loading-container" wx:if="{{visible}}">
-  <view class="logo">
-    <view class="sp sp-circle"></view>
-  </view>
-  <view class="text" id="message">
-    {{message}}
-  </view>
-</view>