@cloudbase/lowcode-builder 1.8.47 → 1.8.49

package/lib/builder/core/index.js

@@ -61,7 +61,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     isComposite: false,
     compProps: {},
 }, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, }, cb) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     if (!cals) {
         console.error('无效的应用配置');
         return;
@@ -91,6 +91,8 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         isPrivateMode,
         endpointType,
         enableExpiredTag,
+        disabled: (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.disabled,
+        statusPageId: (_d = cals.extra) === null || _d === void 0 ? void 0 : _d.statusPageId,
     };
     console.log('domain', domain);
     console.log('应用名', appKey);
@@ -150,7 +152,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     ? 'px'
                     : 'rpx'),
                 enablePageRoot,
-                enableLoading: (_c = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _c === void 0 ? void 0 : _c.enableLoading,
+                enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,

package/lib/builder/mp/BuildContext.d.ts

@@ -43,4 +43,12 @@ export interface IBuildContext {
      * 是否启用过期
      */
     enableExpiredTag?: boolean;
+    /**
+     * 是否禁用应用
+     */
+    disabled?: boolean;
+    /**
+     * 自定义状态页Id
+     */
+    statusPageId?: string;
 }

package/lib/builder/mp/index.js

@@ -345,7 +345,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     },
                 ],
             });
-            const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, isPage: true }, componentInstances, `Page ${rootPath ? path_1.default.join('packages', rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
+            const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id }, componentInstances, `Page ${rootPath ? path_1.default.join('packages', rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
             const importor = (0, util_3.generateLowcodeImportor)(page.lowCodes);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
             const subLevelPath = rootPath ? `${path_1.default.posix.relative(`packages/${rootPath}`, '')}/` : '';
@@ -456,10 +456,17 @@ async function generateFramework(ctx, appData, outDir, options) {
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         pages: appData.pageInstanceList
                             .sort((item) => (item.isHome ? -1 : 1))
-                            .map((item) => ({
-                            id: item.id,
-                            type: item.data.isCustomLoginPage ? 'login' : '',
-                        })),
+                            .map((item) => {
+                            var _a;
+                            return ({
+                                id: item.id,
+                                type: item.data.isCustomLoginPage
+                                    ? 'login'
+                                    : ((_a = appData.extra) === null || _a === void 0 ? void 0 : _a.statusPageId) === item.id
+                                        ? 'status'
+                                        : '',
+                            });
+                        }),
                     }),
                     appQuery: (0, util_2.createTemplateQuery)(ctx, (_b = appData.dataset) === null || _b === void 0 ? void 0 : _b.query),
                     stringifyObj: util_1.inspect,
@@ -500,8 +507,9 @@ async function writeLowCodeFiles(ctx, appData, outDir) {
 }
 exports.writeLowCodeFiles = writeLowCodeFiles;
 // {a: 1} -> , "a": 1
-function getAppendableJson(json) {
-    const obj = { ...json };
+function getAppendableJson(json = {}) {
+    const { namespace, appShareMessage, ...restJson } = json;
+    const obj = { ...restJson };
     if (obj.reachBottomDistance) {
         obj.onReachBottomDistance = parseInt(obj.reachBottomDistance, 10) || 0;
         delete obj.reachBottomDistance;

package/lib/builder/mp/mp_config.js

@@ -135,7 +135,6 @@ function extractPages(weapps, pageConfigs) {
     const pages = [];
     const subpackages = [];
     let homePage = '';
-    let homePageId = '';
     weapps.forEach((weapp, index) => {
         const { rootPath } = weapp;
         const subPackage = { root: rootPath ? `packages/${rootPath}` : '', pages: [] };
@@ -153,14 +152,13 @@ function extractPages(weapps, pageConfigs) {
             }
             else {
                 homePage = `pages/${page.id}/${pageFileName}`;
-                homePageId = page.id;
             }
         });
     });
     if (homePage) {
         pages.unshift(homePage);
     }
-    return { pages, subpackages, homePageId };
+    return { pages, subpackages };
 }
 function getAppPagesConfig(pages) {
     const pagesConfig = {};

package/lib/builder/mp/wxml.d.ts

@@ -1,7 +1,7 @@
 import { IWeAppComponentInstance, IEventModifiers } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 export declare function generateWxml(ctx: IBuildContext & {
-    isPage: boolean;
+    pageUUID?: string;
 }, widgets: {
     [key: string]: IWeAppComponentInstance;
 }, docTag: string, wxmlDataPrefix: any, usingComponents: any, componentGenerics: any, nodeTransform?: (cmp: IWeAppComponentInstance, node: any) => void): string;

package/lib/builder/mp/wxml.js

@@ -19,91 +19,113 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
     const xmlJson = {
         elements: createXml(widgets),
     };
-    if (ctx.isPage) {
-        const { enablePageRoot } = ctx;
+    if (ctx.pageUUID) {
+        const { enablePageRoot, disabled } = ctx;
         const originElements = xmlJson.elements;
         // usingComponents['wd-privacy'] = '/common/privacyModal/index';
         usingComponents['wd-info'] = '/common/info/index';
-        // 登录校验: 向其最外层包裹一层block
-        xmlJson.elements = [
-            // {
-            //   type: 'element',
-            //   name: 'wd-privacy',
-            //   attributes: {},
-            //   elements: [],
-            //   _order: -Infinity,
-            //   _parent: null,
-            // },
-            {
-                type: 'element',
-                name: enablePageRoot ? 'view' : 'block',
-                attributes: {
-                    id: 'wd-page-root',
-                    ['wx:if']: '{{weDaHasLogin && !_expiredMessage}}',
-                    ['data-weui-theme']: 'light',
-                },
-                elements: [
-                    ...originElements,
-                    /**
-                     * 可能需要依赖添加逻辑节点的方式
-                     * 来触发 page 的 ready
-                     * 目的是为了让 page 的 ready 在组件的 ready 之后
-                     */
-                    // {
-                    //   type: 'element',
-                    //   name: 'readyPlaceHoler',
-                    //   attributes: {
-                    //     ['bind:ready']: '_onReady',
-                    //   },
-                    //   elements: originElements,
-                    //   _order: Infinity,
-                    //   _parent: null,
-                    // },
-                ],
-                _order: -1,
-                _parent: null,
-            },
-            {
-                type: 'element',
-                name: 'wd-info',
-                attributes: {
-                    ['wx:if']: '{{weDaHasLogin === false && !_expiredMessage}}',
-                    message: '无权限访问',
-                    type: 'auth',
-                },
-                elements: [],
-                _order: Infinity,
-                _parent: null,
-            },
-        ];
-        if (ctx.enableExpiredTag) {
-            usingComponents['wd-info'] = '/common/info/index';
-            xmlJson.elements.push({
-                type: 'element',
-                name: 'wd-info',
-                attributes: {
-                    ['wx:if']: '{{_expiredMessage}}',
-                    message: '{{_expiredMessage}}',
-                    type: 'info',
+        if (disabled && ctx.pageUUID !== ctx.statusPageId) {
+            xmlJson.elements = [
+                {
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        message: '当前页面无法访问',
+                        type: 'notfound',
+                        enableCustom: true,
+                        pageUUID: ctx.pageUUID,
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _parent: null,
                 },
-                elements: [],
-                _order: Infinity,
-                _parent: null,
-            });
+            ];
         }
-        if (ctx.enableLoading) {
-            usingComponents['wd-info'] = '/common/info/index';
-            xmlJson.elements.push({
-                type: 'element',
-                name: 'wd-info',
-                attributes: {
-                    ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
-                    type: 'loading',
+        else {
+            // 登录校验: 向其最外层包裹一层block
+            xmlJson.elements = [
+                // {
+                //   type: 'element',
+                //   name: 'wd-privacy',
+                //   attributes: {},
+                //   elements: [],
+                //   _order: -Infinity,
+                //   _parent: null,
+                // },
+                {
+                    type: 'element',
+                    name: enablePageRoot ? 'view' : 'block',
+                    attributes: {
+                        id: 'wd-page-root',
+                        ['wx:if']: '{{weDaHasLogin && !_expiredMessage}}',
+                        ['data-weui-theme']: 'light',
+                    },
+                    elements: [
+                        ...originElements,
+                        /**
+                         * 可能需要依赖添加逻辑节点的方式
+                         * 来触发 page 的 ready
+                         * 目的是为了让 page 的 ready 在组件的 ready 之后
+                         */
+                        // {
+                        //   type: 'element',
+                        //   name: 'readyPlaceHoler',
+                        //   attributes: {
+                        //     ['bind:ready']: '_onReady',
+                        //   },
+                        //   elements: originElements,
+                        //   _order: Infinity,
+                        //   _parent: null,
+                        // },
+                    ],
+                    _order: -1,
+                    _parent: null,
                 },
-                elements: [],
-                _order: Infinity,
-                _parent: null,
-            });
+                {
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        ['wx:if']: '{{weDaHasLogin === false && !_expiredMessage}}',
+                        message: '无权限访问',
+                        type: 'auth',
+                        enableCustom: true,
+                        pageUUID: ctx.pageUUID,
+                        error: '{{loginError}}',
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _parent: null,
+                },
+            ];
+            if (ctx.enableExpiredTag) {
+                usingComponents['wd-info'] = '/common/info/index';
+                xmlJson.elements.push({
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        ['wx:if']: '{{_expiredMessage}}',
+                        message: '{{_expiredMessage}}',
+                        type: 'info',
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _parent: null,
+                });
+            }
+            if (ctx.enableLoading) {
+                usingComponents['wd-info'] = '/common/info/index';
+                xmlJson.elements.push({
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
+                        type: 'loading',
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _parent: null,
+                });
+            }
         }
     }
     function createXml(widgets, parent = null, parentForNodes = []) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.47",
+  "version": "1.8.49",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/html/index.html.ejs

@@ -514,7 +514,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.46/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.47/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -540,7 +540,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.528a6b9f6d8dfaa16066.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.8d5af6de1f01bbd759cc.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -1,4 +1,4 @@
-import { redirectToLogin, findLoginPage } from '../util';
+import { redirectToLogin, findStatusPage } from '../util';
 
 Component({
   /**
@@ -7,7 +7,17 @@ Component({
   properties: {
     type: String,
     message: String,
-    toLogin: Boolean
+    toLogin: Boolean,
+    enableCustom: {
+      type: Boolean,
+      value: false
+    },
+    pageCodeContext: Object,
+    pageUUID: String,
+    error: {
+      type: Object,
+      value: null
+    }
   },
 
   /**
@@ -15,7 +25,7 @@ Component({
    */
   data: {
     message: '',
-    visible: false
+    visible: false,
   },
 
   /**
@@ -23,7 +33,7 @@ Component({
    */
   methods: {
     login() {
-      if(this.data.toLogin) {
+      if (this.data.toLogin) {
         redirectToLogin()
       } else {
         getApp()?.app?.relaunchHome()
@@ -32,14 +42,48 @@ Component({
   },
   lifetimes: {
     attached() {
-      this.setData({
-        toLogin: findLoginPage()
-      })
+      if (this.data.enableCustom) {
+        const status = findStatusPage();
+        const $page = this.data.pageCodeContext || getApp()?.app?.utils.getCurrentPage();
+        const uuid = this.data.pageUUID || $page.uuid;
+        if (status && status.id !== uuid) {
+          switch (this.data.type) {
+            case 'auth': {
+              getApp().app?.redirectTo({
+                pageId: status.id,
+                params: {
+                  statusCode: "403",
+                  sourcePageId: $page?.id,
+                  sourcePageParams: $page?.dataset?.params,
+                }
+              })
+              return;
+            }
+            case 'notfound': {
+              getApp().app?.redirectTo({
+                pageId: status.id,
+                params: {
+                  statusCode: "404",
+                  // path,
+                  // sourcePageParams: query,
+                }
+              })
+              return;
+            }
+          }
+        }
+      }
+      /**
+       * 暂不启用 redirto login
+       */
+      // this.setData({
+      //   toLogin: findLoginPage()
+      // })
       setTimeout(() => {
         const data = {
           visible: true
         }
-        if(this.data.type === 'loading') {
+        if (this.data.type === 'loading') {
           data.message = '登录鉴权中...'
         }
         this.setData(data)

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

@@ -1,14 +1,31 @@
-<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 class="wd-status" wx:if="{{visible}}">
+  <view style="transform: translateY(-20px);">
+    <view class="wd-status__img {{type === 'notfound'?'wd-status--notfound':''}}">
+      <view
+        class="icon"
+        wx:if="{{type !== 'loading'}}"
+      />
+      <view wx:if="{{type === 'loading'}}" class="sp sp-circle"></view>
+    </view>
+    <view class="wd-status__content">
+      <view class="wd-status__title" style="text-align: center; margin-bottom: 5px; font-size: 28rpx; font-weight: 600;">
+        {{message}}
+      </view>
+      <view class="tea-status__detail" wx:if="{{error}}">
+        <view class="stack">
+          <view>
+            <text style="font-weight: 600; font-size:14px;">错误信息：</text>
+            <text user-select="true">{{error.message}}</text>
+          </view>
+          <!-- <view wx:if="{{error.stack}}">
+            <text style="font-weight: 600;">错误堆栈：</text>
+            <text>{{error.stack}}</text>
+          </view> -->
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{type == 'auth'}}" class="wd-status__operate" style="display: flex;">
+      <button style="margin-top: 10px; width: 200rpx; border: 1px solid #DCDCDC; border-radius: 3px;" variant="outline" type="default" size="mini" plain="true" bind:tap="login">{{toLogin?'登录':'返回首页'}}</button>
+    </view>
   </view>
-  <view class="text" id="message">
-    {{message}}
-  </view>
-  <button wx:if="{{type == 'auth' && toLogin}}" style="margin-top: 10px; width: 200rpx;" variant="outline" type="default" size="mini" plain="true" bind:tap="login">{{toLogin?'登录':'刷新'}}</button>
 </view>

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

@@ -1,34 +1,39 @@
-.weda-loading-container {
+.wd-status {
   position: fixed;
   left:0;
-  top:0;
+  top: 0;
   width: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
   flex-direction: column;
   height:100%;
-  padding: 0 20px;
+  padding: 40rpx;
 }
-.weda-loading-container .logo {
+.wd-status .wd-status__img {
   width: 100%;
   display: flex;
   justify-content: center;
   text-align: center;
-  margin-top: -200rpx;
-  margin-bottom: 50rpx;
+  margin-bottom: 10px;
 }
 
-.weda-loading-container .text {
-  font-size: 14px;
+.wd-status .wd-status__img > view.icon {
+  width: 120px;
+  height: 80px;
+  background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIwIiBoZWlnaHQ9IjgwIiB2aWV3Qm94PSIwIDAgMTIwIDgwIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMTkgOEg5OVYyM0gxMTNWMjVIMTA2VjI3VjMzVjQySDk5VjU4SDI1VjI1SDMzVjIzSDE5VjhaIiBmaWxsPSIjRUVFRUVFIi8+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2JfNTQ2Ml84MjkyMikiPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTU2LjE2MTcgNDQuNzI3Nkw1OS4wMDE0IDM0LjEyOTRINTQuMDA5NFYzMy4xMjk0SDU5LjI2OTRINjAuMDA5NEg2MC4zMDQ3TDU3LjEyNzYgNDQuOTg2NEw1Ni4xNjE3IDQ0LjcyNzZaTTYwLjU3MjYgMzIuMTI5NEg1OS41MzczTDYwLjkxMTggMjdMNjEuODc3NyAyNy4yNTg4TDYwLjU3MjYgMzIuMTI5NFpNNzAuMzEyNSAzNS45OTI5TDY3LjQ0OSAzMy4xMjk0SDY4LjUwOTRINjguODYzMkg3Ny4wMDk0VjM0LjEyOTRINjkuODYzMkw3MS43MjY3IDM1Ljk5MjlMNjYuNDMyIDQxLjI4NzdMNjUuNzI0OSA0MC41ODA1TDcwLjMxMjUgMzUuOTkyOVpNNjYuNDQ5IDMyLjEyOTRINjcuODYzMkw2Ni40MzIgMzAuNjk4Mkw2NS43MjQ5IDMxLjQwNTNMNjYuNDQ5IDMyLjEyOTRaTTUyLjMxNDMgMzEuNDA1M0w1MS42MDcyIDMwLjY5ODJMNDYuMzEyNSAzNS45OTI5TDQ4LjQ0OSAzOC4xMjk0SDQ5Ljg2MzJMNDcuNzI2NyAzNS45OTI5TDUyLjMxNDMgMzEuNDA1M1pNNTIuMzE0MyA0MC41ODA1TDUwLjg2MzIgMzkuMTI5NEg0OS40NDlMNTEuNjA3MiA0MS4yODc3TDUyLjMxNDMgNDAuNTgwNVoiIGZpbGw9ImJsYWNrIiBmaWxsLW9wYWNpdHk9IjAuOSIvPgo8L2c+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIxX2JfNTQ2Ml84MjkyMikiPgo8cGF0aCBkPSJNMTkgOEg5OVYxNEgxOVY4WiIgZmlsbD0iYmxhY2siIGZpbGwtb3BhY2l0eT0iMC45Ii8+CjwvZz4KPHBhdGggZD0iTTI0IDExSDIzIiBzdHJva2U9IndoaXRlIi8+CjxwYXRoIGQ9Ik0yOCAxMUgyNyIgc3Ryb2tlPSJ3aGl0ZSIvPgo8cGF0aCBkPSJNMzIgMTFIMzEiIHN0cm9rZT0id2hpdGUiLz4KPGcgZmlsdGVyPSJ1cmwoI2ZpbHRlcjJfYl81NDYyXzgyOTIyKSI+CjxjaXJjbGUgY3g9Ijk5IiBjeT0iNTQiIHI9IjE1IiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfNTQ2Ml84MjkyMikiIGZpbGwtb3BhY2l0eT0iMC45Ii8+CjwvZz4KPHBhdGggZD0iTTk5IDQ3LjVWNTciIHN0cm9rZT0iYmxhY2siIHN0cm9rZS1vcGFjaXR5PSIwLjkiLz4KPHBhdGggZD0iTTk5IDU5VjYwLjUiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS1vcGFjaXR5PSIwLjkiIHN0cm9rZS13aWR0aD0iMS41Ii8+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIzX2JfNTQ2Ml84MjkyMikiPgo8ZyBmaWx0ZXI9InVybCgjZmlsdGVyNF9iXzU0NjJfODI5MjIpIj4KPHBhdGggZD0iTTM3LjcxMDIgNjhMNDAuMjgxMiA1NC4yODU3TDAuMDAxNDgzOTIgMzhMMzcuNzEwMiA2OFoiIGZpbGw9IiNDNUM1QzUiLz4KPC9nPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTM1LjE0NzcgNTcuNzE0M0wzNy43MTg4IDY4TDI4LjYzOTkgNjAuNzc3MUwzNS4xNDY3IDU3LjcxNDdMMC4wMTQxMDY4IDM4LjAwMzJMMC4wMTIwNzM1IDM4LjAwMTZMMC4wMTUxMjUzIDM4LjAwMjlMMzUuMTQ3NyA1Ny43MTQzWk0wLjAxMjA2MjEgMzguMDAxMUwwLjAxMTE5NjEgMzguMDAwOUwwLjAxMDAzNjUgMzhMMC4wMTIwNjIxIDM4LjAwMTFaIiBmaWxsPSIjRUVFRUVFIi8+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXI1X2JfNTQ2Ml84MjkyMikiPgo8cGF0aCBkPSJNMC4wMDk0NDUxOSAzOEwyMC41Nzc4IDY0LjU3MTRMMzUuMTQ3MSA1Ny43MTQzTDAuMDA5NDQ1MTkgMzhMNDAuMjg5MiA1NC4yODU3TDQ4Ljg1OTQgNTBMMC4wMDk0NDUxOSAzOFoiIGZpbGw9IiNEQ0RDREMiLz4KPC9nPgo8L2c+CjxkZWZzPgo8ZmlsdGVyIGlkPSJmaWx0ZXIwX2JfNTQ2Ml84MjkyMiIgeD0iNDIuMzEyNSIgeT0iMjMiIHdpZHRoPSIzOC42OTUzIiBoZWlnaHQ9IjI1Ljk4NjUiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlR2F1c3NpYW5CbHVyIGluPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHN0ZERldmlhdGlvbj0iMiIvPgo8ZmVDb21wb3NpdGUgaW4yPSJTb3VyY2VBbHBoYSIgb3BlcmF0b3I9ImluIiByZXN1bHQ9ImVmZmVjdDFfYmFja2dyb3VuZEJsdXJfNTQ2Ml84MjkyMiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfYmFja2dyb3VuZEJsdXJfNTQ2Ml84MjkyMiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPGZpbHRlciBpZD0iZmlsdGVyMV9iXzU0NjJfODI5MjIiIHg9IjE1IiB5PSI0IiB3aWR0aD0iODgiIGhlaWdodD0iMTQiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlR2F1c3NpYW5CbHVyIGluPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHN0ZERldmlhdGlvbj0iMiIvPgo8ZmVDb21wb3NpdGUgaW4yPSJTb3VyY2VBbHBoYSIgb3BlcmF0b3I9ImluIiByZXN1bHQ9ImVmZmVjdDFfYmFja2dyb3VuZEJsdXJfNTQ2Ml84MjkyMiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfYmFja2dyb3VuZEJsdXJfNTQ2Ml84MjkyMiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPGZpbHRlciBpZD0iZmlsdGVyMl9iXzU0NjJfODI5MjIiIHg9Ijc4LjY2NjciIHk9IjMzLjY2NjciIHdpZHRoPSI0MC42NjY3IiBoZWlnaHQ9IjQwLjY2NjciIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlR2F1c3NpYW5CbHVyIGluPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHN0ZERldmlhdGlvbj0iMi42NjY2NyIvPgo8ZmVDb21wb3NpdGUgaW4yPSJTb3VyY2VBbHBoYSIgb3BlcmF0b3I9ImluIiByZXN1bHQ9ImVmZmVjdDFfYmFja2dyb3VuZEJsdXJfNTQ2Ml84MjkyMiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfYmFja2dyb3VuZEJsdXJfNTQ2Ml84MjkyMiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPGZpbHRlciBpZD0iZmlsdGVyM19iXzU0NjJfODI5MjIiIHg9Ii0yLjMyMzYzIiB5PSIzNS42NzY0IiB3aWR0aD0iNTMuNTA2NiIgaGVpZ2h0PSIzNC42NDczIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUdhdXNzaWFuQmx1ciBpbj0iQmFja2dyb3VuZEltYWdlRml4IiBzdGREZXZpYXRpb249IjEuMTYxODIiLz4KPGZlQ29tcG9zaXRlIGluMj0iU291cmNlQWxwaGEiIG9wZXJhdG9yPSJpbiIgcmVzdWx0PSJlZmZlY3QxX2JhY2tncm91bmRCbHVyXzU0NjJfODI5MjIiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJlZmZlY3QxX2JhY2tncm91bmRCbHVyXzU0NjJfODI5MjIiIHJlc3VsdD0ic2hhcGUiLz4KPC9maWx0ZXI+CjxmaWx0ZXIgaWQ9ImZpbHRlcjRfYl81NDYyXzgyOTIyIiB4PSItMi4zMjM2MyIgeT0iMzUuNjc2NCIgd2lkdGg9IjQ0LjkyODUiIGhlaWdodD0iMzQuNjQ3MyIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPgo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPgo8ZmVHYXVzc2lhbkJsdXIgaW49IkJhY2tncm91bmRJbWFnZUZpeCIgc3RkRGV2aWF0aW9uPSIxLjE2MTgyIi8+CjxmZUNvbXBvc2l0ZSBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0iaW4iIHJlc3VsdD0iZWZmZWN0MV9iYWNrZ3JvdW5kQmx1cl81NDYyXzgyOTIyIi8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW49IlNvdXJjZUdyYXBoaWMiIGluMj0iZWZmZWN0MV9iYWNrZ3JvdW5kQmx1cl81NDYyXzgyOTIyIiByZXN1bHQ9InNoYXBlIi8+CjwvZmlsdGVyPgo8ZmlsdGVyIGlkPSJmaWx0ZXI1X2JfNTQ2Ml84MjkyMiIgeD0iLTYuNjU4MzkiIHk9IjMxLjMzMzgiIHdpZHRoPSI2Mi4xODQiIGhlaWdodD0iMzkuOTAzOCIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPgo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPgo8ZmVHYXVzc2lhbkJsdXIgaW49IkJhY2tncm91bmRJbWFnZUZpeCIgc3RkRGV2aWF0aW9uPSIzLjMzMzEiLz4KPGZlQ29tcG9zaXRlIGluMj0iU291cmNlQWxwaGEiIG9wZXJhdG9yPSJpbiIgcmVzdWx0PSJlZmZlY3QxX2JhY2tncm91bmRCbHVyXzU0NjJfODI5MjIiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJlZmZlY3QxX2JhY2tncm91bmRCbHVyXzU0NjJfODI5MjIiIHJlc3VsdD0ic2hhcGUiLz4KPC9maWx0ZXI+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl81NDYyXzgyOTIyIiB4MT0iOTcuNTQ4NCIgeTE9IjQyLjkxMyIgeDI9Ijk3LjU0ODQiIHkyPSI2Ny43NTc4IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNDNUM1QzUiIHN0b3Atb3BhY2l0eT0iMC43Ii8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI0U3RTdFNyIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=")
 }
 
-.weda-loading-container .sp{
+.wd-status .wd-status__img.wd-status--notfound > view.icon {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAABQCAMAAADlRUG7AAAA21BMVEUAAAARFhsTGB0SFhwTFhwRGBvHx8cSFxvExMTFxcUYGyARFhvFxcXFxcXFxcUTGBwUFhzFxcXFxcXFxcURFxy/v78SFh3GxsbDw8PGxsbPz8/GxsbFxcUSFh0SFh4RGhrKysru7u4YGBj////i4uLQ0NBZWVnf39/4+PjMzMzJyck8PDweHh7T09QAAADp6enx8fH7+/vb29vm5uZ3d3fFxcXBwcG3uLmysrKUlJTt7e0tLS3X19eLi4tKTFD19fWgoKEvMTVydXcQEhWpq6yBgoRYWl2GhoZoaGjBHIikAAAAIXRSTlMA3yCgYDAgv+9gEIKAv0BAz6CQcHAQ79+AUBDvz69QUDCqAbKDAAAC3ElEQVRo3uzTsQpCMQwFUH8lQpKhIVMoLUUQHPT/v8hG6ur0XlBfLjTDXU5pySmTyfxlzhvnN+DL+xwGPtYfw8ZJOOGEDwR/yTXCYdhJTDjhT3CtPrlfeRWthsBdy5woQwTBc1eKgFmKw2Vio3iBQ0Lgh9H0WK+AqjwL6iUCRgGHm1YYNgd0gRBY+oKxF9QGKBgCG8GCm6DDRBACK5kNMa5aDKo29kKG7Q7TjAgxq/hiMXtxE9oZXvhrnQby8jZ66mf7dbbcJgyFARgDYTF4ydJsXW3QaEk0IJiUqcdjx87y/o9UBCoUTwVFSXzFfyHB1Yd0BBK3P1zf92/SDhjcPz3dgfeDpxMHEJwQgAmNFq35CRZ90sHSlCGMgogGKMFSWk2UxydREAQJzBsaBwEKSXgU+BSgIA/mbZrwyxjDI8BngBUY5S0jAQ/C8MPhc8wKK4RFB7ZFt8XRB8OWg4Ii61XRJWl5mwJ1Mtu/bjavpt5e4JAz9VBTKO5pqMpudi/PWfZsLI0W2iJIQA9lt1qL+1hxyL/uH8VU68ZILruJcBCuehGiVOWXHa1rfCGXJyvBxFTA5A+cJAou5a6AuWzLYIdVcDXlIhFVgO8em6vaNv/tfqrGt1rXsHqRs92iCc9s2doKRdZAXDyEIpD0h/f7A1i71I8Cb7JD+Ov3jqmOkrapVocN8xiLSw7LX6ctKHtWv06u1iMyxp5JtghYfUCqBxDBVn/4wtCa0Zdj2fvEqiluTnk00fpnPDpwTKNzk8CouUlgV1OI5zUHLP9mWp8l2+IXBZYPuVHluddyEADs76GCuCy507/CYoy1NbaXJ/979EGkdPGNAirk+axkvUvvZNQuI44RVn1HYuJq6jHnI9sw8iZ/gHb5Gke5Bvkyw3mlGbyaam+K/s00Z3x9d8nWFY5QcaDH/FR9dqu9T7plbXrKf2Egodi5tpQAuWx3/T65vn/uWtqQIUOGDGnkN1enWD6JI9eiAAAAAElFTkSuQmCC")
+}
+
+.wd-status .sp{
   width: 48px;
   height:48px;
 }
 
-.weda-loading-container .sp-circle {
+.wd-status .sp-circle {
   border: 6px rgba(0,82,217,0.25) solid;
   border-top: 6px rgba(0,82,217,1) solid;
   border-radius: 50%;
@@ -43,3 +48,15 @@
   from { transform: rotate(0deg); }
   to { transform: rotate(359deg); }
 }
+
+.stack {
+  display: block;
+  padding: 12px;
+  width: 100%;
+  white-space: pre-line;
+  word-break: break-all;
+  border-radius: 6px;
+  border: 1px solid #dcdcdc;
+  max-height: 350px;
+  overflow: scroll;
+}

package/template/mp/common/util.js

@@ -387,6 +387,12 @@ export function findLoginPage() {
   return pages.find((item) => item.type === 'login');
 }
 
+export function findStatusPage() {
+  const { app } = getApp();
+  const { pages = [] } = app.__internal__.getConfig();
+  return pages.find((item) => item.type === 'status');
+}
+
 let _AUTH_CONFIG_CACHE = null;
 
 export async function getAuthConfig() {
@@ -481,6 +487,10 @@ export async function checkAuth(app, appId, $page) {
   if (loginPage?.id === $page.id) {
     return true;
   }
+  const status = findStatusPage(app);
+  if (status?.id === $page.id) {
+    return true;
+  }
   wx.showNavigationBarLoading();
   const requestList = [getAccessPermission(app, appId, $page.id)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
@@ -515,11 +525,14 @@ export async function checkAuth(app, appId, $page) {
     }
     return accessData?.isAccess;
   } catch (e) {
-    app.showModal({
-      title: '页面鉴权失败',
-      content: formatErrorMsg(e),
-      showCancel: false,
-    });
+    if(app.__internal__?.activePage?.id === $page.id) {
+      throw new Error(formatErrorMsg(e))
+      app.showModal({
+        title: '页面鉴权失败',
+        content: formatErrorMsg(e),
+        showCancel: false,
+      });
+    }
     return false;
   } finally {
     wx.hideNavigationBarLoading();

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

@@ -101,11 +101,20 @@ export function createPage({
       _isCheckingAtuh: false,
       _expiredMessage: '',
       weDaHasLogin: null,
+      loginError: null
     },
     lifetimes: {
       attached() {
         this._disposers = [];
         const $page = this._getInstance();
+        const instance = $page.__internal__.mpInstance?.()
+        if( instance !== this ){
+          const currentMpInstance = this
+          $page.__internal__.mpInstance = () => {
+            console.warn('debug 获取当前 mp page 实例，禁止在生产环境使用');
+            return currentMpInstance
+          }
+        }
         this._pageActive = true;
         /**
          * @deprecated
@@ -134,6 +143,10 @@ export function createPage({
       },
       detached() {
         const $page = this._getInstance();
+        const instance = $page.__internal__.mpInstance?.()
+        if( instance === this ){
+          $page.__internal__.mpInstance = () => null
+        }
         this._pageActive = false;
         $page.__internal__.active = this._pageActive;
 
@@ -172,11 +185,16 @@ export function createPage({
                   weDaHasLogin: true,
                 });
                 createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page, $w: $page.__internal__?.$w }));
-              }else {
+              } else {
                 this.setData({
                   weDaHasLogin: false,
                 });
               }
+            } catch(e) {
+              this.setData({
+                weDaHasLogin: false,
+                loginError: { message: e.message }
+              });
             } finally {
               this.setData({ _isCheckingAtuh: false });
             }

package/template/mp/package.json

@@ -6,7 +6,7 @@
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.11",
+    "@cloudbase/weda-client": "1.0.12",
     "@cloudbase/weda-cloud-sdk": "1.0.46",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",