@cloudbase/lowcode-builder 1.6.4 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@cloudbase/cals": "^1.0.3",
-    "@cloudbase/lowcode-generator": "^1.6.4",
+    "@cloudbase/lowcode-generator": "^1.6.5",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -523,6 +523,10 @@
         cdnEndpoints.cdngo
       %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.29/dist/h5.browser.js"
     ></script>
+    <script
+      crossorigin
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/acorn@8.0.4/dist/acorn.js"
+    ></script>
     <script>
       // zxing polifill
       if (!this.globalThis) {
@@ -543,7 +547,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.413fc7788ab27e709449.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.b13197aa3e72385a9cc9.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -68,8 +68,12 @@ setConfig({
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        const isAnonymous = await checkAnonymous();
-        if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
+        if (authConfig.RejectStrategy == 'to_login') {
+          if (['InnerError.AuthFailure'].includes(res?.result?.code)) {
+            const isAnonymous = await checkAnonymous();
+            if (!isAnonymous) return;
+            // 匿名用户越权去登录
+          }
           redirectToLogin();
         } else if (authConfig.RejectStrategy == 'show_warning') {
           app.showToast({

package/template/mp/common/util.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 'use strict';
 import { generateForContextOfWidget, generateWidgetAPIContext, getWidget } from './widget';
 import { observable, untracked } from 'mobx';
@@ -33,7 +34,7 @@ export function generateDataContext(widget) {
   while (widget?._scope) {
     const current = widget;
     // 此处采用代理的方式，是为了可以获取到最新的 _scope.dataContext 防止 dataContext 引用被重新赋值
-    if(current?._scope?.id){
+    if (current?._scope?.id) {
       Object.defineProperty(dataContext, current._scope.id, {
         get() {
           return current?._scope?.dataContext;
@@ -53,9 +54,10 @@ export function createEventHandlers(
   evtListeners,
   options = {
     looseError: false,
+    isComposite: false,
   },
 ) {
-  const { looseError = false } = options;
+  const { looseError = false, isComposite = false } = options;
   const evtHandlers = {};
   for (const name in evtListeners) {
     const listeners = evtListeners[name];
@@ -73,41 +75,103 @@ export function createEventHandlers(
       const dataContext = untracked(() => generateDataContext(currentTarget));
       const $w = untracked(() => generateWidgetAPIContext(owner?.__internal__?.$w, currentTarget, forContext));
 
-      const currentPageId = app.__internal__?.activePage?.id
+      function checkPageActive(pageId, currentPageContext, listener) {
+        /**
+         * 复合组件自身不中断校验
+         */
+        if (isComposite) {
+          return true;
+        }
+        const { id, __internal__ } = currentPageContext || {};
+        if (pageId && id) {
+          if (pageId !== id || (__internal__ && !__internal__.active)) {
+            console.error(`Action error: [${listener.trigger}:${listener.key}] 页面生命周期结束，链式调用中断`);
+            return false;
+          }
+        }
+        return true;
+      }
+
       listeners.forEach(async (l) => {
-        if(currentPageId && owner.id && currentPageId !== owner.id) {
-          console.error(`Action error: [${trigger}:${l.key}] 页面生命周期结束，链式调用中断`);
-          return ;
+        /**
+         * 调用前置校验
+         * 是否仍可调用方法
+         */
+        if (!checkPageActive(owner.id, app.__internal__?.activePage, l)) {
+          return;
         }
+
         let { data = {}, boundData = {} } = l;
         data = { ...data };
+        const nextEventHandles = [
+          {
+            handlerName: '',
+            event: {
+              ...event,
+            },
+          },
+        ];
+        let error = false;
+        const isIfAction = l.sourceKey === 'platform:utils.If';
+        const isShowModalAction = l.sourceKey === 'platform:showModal';
         try {
           for (const k in boundData) {
             set(data, k, boundData[k].call(owner, owner, lists, forItems, event, dataContext, $w));
           }
           let res = await l.handler.call(owner, { event, data });
-          let eventName = prefix && l.key ? `${prefix}$${l.key}${(l.sourceKey !== 'platform:utils.If') ? '_success' : (res ? '_success' : '_fail')}` : '';
-          self[eventName] &&
-            self[eventName]({
-              ...event,
-              detail: l.sourceKey === 'platform:utils.If' ? event.detail : res,
-            });
+          nextEventHandles[0].handlerName =
+            prefix && l.key ? `${prefix}$${l.key}${!isIfAction || res ? '_success' : '_fail'}` : '';
+          nextEventHandles[0].event.detail = isIfAction ? event.detail : res;
+          if (isShowModalAction) {
+            let handlerName = '';
+
+            if (res.cancel) {
+              handlerName = `${prefix}$${l.key}_cancel`;
+            } else if (res.confirm) {
+              handlerName = `${prefix}$${l.key}_confirm`;
+            }
+
+            if (handlerName) {
+              nextEventHandles.push({
+                handlerName,
+                event: {
+                  ...event,
+                  detail: res,
+                },
+              });
+            }
+          }
         } catch (e) {
-          let eventName = l.key ? `${prefix}$${l.key}_fail` : '';
-          if (self[eventName]) {
-            await self[eventName]({
-              ...event,
-              detail: e,
-            });
-          } else {
-            console.error(`Action error: [${trigger}:${l.key}]`, e);
+          nextEventHandles[0].handlerName = l.key ? `${prefix}$${l.key}_fail` : '';
+          nextEventHandles[0].event.detail = isIfAction ? event.detail : e;
+          error = e;
+        }
+
+        /**
+         * 调用后置校验
+         * 是否触发后置事件
+         */
+        if (checkPageActive(owner.id, app.__internal__?.activePage, l)) {
+          const nextHandler = nextEventHandles[0];
+
+          if (!self[nextHandler.handlerName] && error) {
+            console.error(`Action error: [${trigger}:${l.key}]`, error);
             if (!looseError) {
               app.showToast({
                 icon: 'error',
                 title: `事件响应失败`,
               });
             }
-            throw e;
+            throw error;
+          } else {
+            await Promise.all(
+              nextEventHandles.map(async (nextHandler) => {
+                if (self[nextHandler.handlerName]) {
+                  return self[nextHandler.handlerName](nextHandler.event);
+                }
+                return null;
+              }),
+            );
           }
         }
       });
@@ -313,7 +377,11 @@ async function getAccessPermission(app, appId, pageId) {
     const resourceInfo = res.find((i) => i.ResourceId === cacheKey);
     const isAccess = !!resourceInfo?.IsAccess;
     _AUTH_CACHE_MAP[cacheKey] = isAccess;
-    return isAccess;
+
+    return {
+      isAccess,
+      roleId: resourceInfo?.RoleId,
+    };
   } else {
     throw new Error(`鉴权接口返回参数不正确 - ${JSON.stringify(res)}`);
   }
@@ -330,7 +398,7 @@ export async function checkAnonymous() {
       const scope = await loginScope();
       isAnonymous = scope === 'anonymous';
     }
-  } catch (e) { }
+  } catch (e) {}
   return isAnonymous;
 }
 
@@ -359,17 +427,17 @@ export async function checkAuth(app, appId, $page) {
     requestList.push(getAuthConfig(app));
   }
   try {
-    const [isAccess, authConfig] = await Promise.all(requestList);
+    const [accessData, authConfig] = await Promise.all(requestList);
     app.hideNavigationBarLoading();
 
     const isAnonymousUser = await checkAnonymous();
 
-    if (!isAccess) {
+    if (!accessData?.isAccess) {
       if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
         redirectToLogin($page);
       } else {
         app.showToast({
-          title: '页面无访问权限',
+          title: ['-2', '-4'].includes(accessData?.roleId) ? '默认访客无权限' : '页面无访问权限',
           icon: 'error',
         });
       }
@@ -378,14 +446,14 @@ export async function checkAuth(app, appId, $page) {
       try {
         if (isAnonymousUser) {
           redirectToLogin($page);
-          return false
+          return false;
         }
       } catch (e) {
         redirectToLogin($page);
-        return false
+        return false;
       }
     }
-    return isAccess;
+    return accessData?.isAccess;
   } catch (e) {
     app.showModal({
       title: '页面鉴权失败',
@@ -471,8 +539,9 @@ async function getGeneralOptions(optionName) {
 
 export function getMpEventHandlerName(widgetId, evtName, modifier = {}) {
   // Only builtin events have will bubble
-  return `on${widgetId}$${evtName.replace(/\./g, '_')}${modifier.isCapturePhase ? '$cap' : ''}${modifier.noPropagation ? '$cat' : ''
-    }`;
+  return `on${widgetId}$${evtName.replace(/\./g, '_')}${modifier.isCapturePhase ? '$cap' : ''}${
+    modifier.noPropagation ? '$cat' : ''
+  }`;
 }
 
 function isPlainObject(src) {

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

@@ -56,6 +56,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       attached() {
         const $comp = this._getInstance()
         if(!$comp) return
+        $comp.__internal__.active = this._pageActive
 
         $comp.props.events = createPropEvents(events, this)
         const { widgets, rootWidget: virtualRootWidget } = createWidgets(widgetProps, dataBinds, this,  $comp.widgets)
@@ -92,6 +93,8 @@ export function createComponent(key, behaviors, properties, events, handler, dat
       detached() {
         const $comp = this._getInstance()
         if(!$comp) return
+        this._pageActive = false
+        $comp.__internal__.active = this._pageActive
 
         $comp.widgets = null
         $comp.node._eventListeners.clear();
@@ -123,7 +126,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
     },
 
     methods: {
-      ...createEventHandlers(evtListeners, { looseError: true }),
+      ...createEventHandlers(evtListeners, { looseError: true, isComposite: true }),
       ...mergeRenderer,
       _getInstance() {
         if(!this.$WEAPPS_COMP){

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

@@ -112,6 +112,8 @@ export function createPage(
       detached() {
         const $page = this._getInstance();
         this._pageActive = false;
+        $page.__internal__.active = this._pageActive;
+
         disposeWidget($page._rootWidget);
         this._disposers.forEach((dispose) => dispose());
       },
@@ -152,8 +154,9 @@ export function createPage(
       async onLoad(options) {
         const $page = this._getInstance();
         setConfig({ currentPageId: $page.uuid });
-        app.__internal__.activePage = $page;
         this._pageActive = true;
+        $page.__internal__.active = this._pageActive;
+        app.__internal__.activePage = $page;
 
         this._query = decodePageQuery(options || {});
 
@@ -184,8 +187,9 @@ export function createPage(
       async onShow() {
         const $page = this._getInstance();
         setConfig({ currentPageId: $page.uuid });
-        app.__internal__.activePage = $page;
         this._pageActive = true;
+        $page.__internal__.active = this._pageActive;
+        app.__internal__.activePage = $page;
 
         await this.beforePageCustomLaunch?.(this._query)
 
@@ -198,6 +202,7 @@ export function createPage(
         const hook = lifecycle.onHide || lifecycle.onPageHide;
         hook?.call?.($page);
         this._pageActive = false;
+        $page.__internal__.active = this._pageActive;
 
         // 触发页面节点事件
         this.invokeEventHandler(id, 'hide');

package/template/mp/page/api.js

@@ -1,7 +1,9 @@
 import { $w as baseAPI } from '<%= subLevelPath %>../../app/weapps-api'
 
 export const $page = {
-  __internal__: {}
+  __internal__: {
+    active: false
+  }
 };
 
 export const $w = new Proxy(

package/template/webpack/web.prod.js

@@ -180,7 +180,8 @@ module.exports = function (options) {
         },
         {
           test: /\.(js|jsx)$/,
-          exclude: /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core))|gsd-kbone-react/,
+          exclude:
+            /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core)|(@react-spring))|gsd-kbone-react/,
           use: ['happypack/loader?id=babel'],
         },
         {