@cloudbase/lowcode-builder 1.8.18 → 1.8.20

package/lib/builder/config/index.d.ts

@@ -6,12 +6,12 @@ export declare const materialsDirName = "materials";
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.13.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.19.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip";
+export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.1.8.19.zip";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/config/index.js

@@ -45,12 +45,12 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.13.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.19.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.1.8.19.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/h5/index.d.ts

@@ -5,7 +5,7 @@ import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IBuildContext } from '../mp/BuildContext';
 import { IBuildWedaApp } from '../core';
-export declare function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
+export declare function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
     buildContext: Omit<IBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];

package/lib/builder/h5/index.js

@@ -45,7 +45,8 @@ const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
-async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
+const transform_1 = require("../../utils/transform");
+async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
     if (!deployOptions.mode) {
@@ -57,11 +58,12 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
         if (buildTypeList.includes(common_1.BuildType.APP) ||
             buildTypeList.includes(common_1.BuildType.XPAGE_PC) ||
             buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL)) {
-            if (!cals.extra) {
-                cals.extra = {};
+            if (!_cals.extra) {
+                _cals.extra = {};
             }
-            cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
+            _cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
         }
+        const cals = processCals(_cals);
         const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
         const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
         const { allAppUsedComps } = (0, mp_1.handleUsedComponents)({
@@ -199,3 +201,39 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
     }
 }
 exports.buildH5App = buildH5App;
+function processCals(cals) {
+    return walkThroughJson(cals, (key, value, prefix) => {
+        if (/^:(.*)$/.test(key)) {
+            try {
+                return (0, transform_1.BabelTransform)(value, { IIFE: true });
+            }
+            catch (e) {
+                return value;
+            }
+        }
+        return value;
+    });
+}
+function _isPlainObj(obj) {
+    return typeof obj === 'object' && obj !== null;
+}
+function walkThroughJson(obj, callback, path = '') {
+    /**
+     * 跳过数据源 state 的处理
+     */
+    if (/dataset\.state$/.test(path)) {
+        return obj;
+    }
+    if (typeof obj === 'object' && Array.isArray(obj)) {
+        return obj.map((item, index) => {
+            const prefix = path ? `${path}.${index}` : String(index);
+            return _isPlainObj(item) ? walkThroughJson(item, callback, prefix) : callback(index, item, prefix);
+        });
+    }
+    for (const key in obj) {
+        const value = obj[key];
+        const prefix = path ? `${path}.${key}` : key;
+        obj[key] = _isPlainObj(value) ? walkThroughJson(value, callback, prefix) : callback(key, value, prefix);
+    }
+    return obj;
+}

package/lib/builder/mp/index.js

@@ -106,11 +106,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
                 isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             },
             'common/widget.js': {},
-            'common/url.js': {},
-            'common/weapp-page.js': {
-                dataPropNames: wxmlDataPrefix,
-                debug: buildContext.debugMode,
-            },
+            'common/weapp-page.js': {},
             'common/weapp-component.js': {},
             'common/merge-renderer.js': {
                 dataPropNames: wxmlDataPrefix,
@@ -310,12 +306,21 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
         console.log(`Generating ${em('page')} files`);
         (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
         await Promise.all(weapp.pageInstanceList.map(async (page) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
             const componentGenerics = {};
             const componentInstances = (0, util_2.processRepeaterSchema)(ctx, page.componentInstances);
+            const { allAppUsedComps = [] } = handleUsedComponents({
+                buildContext: ctx,
+                weapps: [
+                    {
+                        ...weapp,
+                        pageInstanceList: [page],
+                    },
+                ],
+            });
             const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, isPage: true }, componentInstances, `Page ${rootPath ? path_1.default.join(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');
@@ -343,6 +348,11 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     importor,
                     query: (0, util_2.createTemplateQuery)(ctx, (_f = page.dataset) === null || _f === void 0 ? void 0 : _f.query),
                     eventFlows: (0, util_2.createTemplateEventFlows)(ctx, page.eventFlows),
+                    resetShare: ((_j = (_h = (_g = page === null || page === void 0 ? void 0 : page.data) === null || _g === void 0 ? void 0 : _g.appShareMessage) === null || _h === void 0 ? void 0 : _h.value) === null || _j === void 0 ? void 0 : _j.enable) ||
+                        ((_k = allAppUsedComps === null || allAppUsedComps === void 0 ? void 0 : allAppUsedComps[cals_1.OFFICIAL_LIB_KEY]) === null || _k === void 0 ? void 0 : _k.has('Share')) ||
+                        /* 从 enablePageRoot 的版本开始支持按需reset share
+                         * 否则默认都开启
+                         */ !ctx.enablePageRoot,
                 },
                 [`index.json|${pageFileName}.json`]: {
                     usingComponents,
@@ -353,7 +363,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     content: wxml,
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
-                    subWxss: rootPath && !((_g = ctx.mainAppData) === null || _g === void 0 ? void 0 : _g.mpPkgUrl)
+                    subWxss: rootPath && !((_l = ctx.mainAppData) === null || _l === void 0 ? void 0 : _l.mpPkgUrl)
                         ? `@import "${path_1.default.posix.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {

package/lib/builder/mp/util.js

@@ -9,21 +9,24 @@ const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const cals_1 = require("@cloudbase/cals");
 const config_1 = require("../config");
 function extractWidgetProps(props, compInfo, processCssUnit = 'rpx') {
-    var _a, _b;
-    const { classList, staticResourceAttribute = [] } = props;
+    var _a, _b, _c;
+    const { classList, staticResourceAttribute = [], data = {}, style } = props;
     const staticProps = {
-        style: (0, cals_1.processCommonStyle2CSSProperties)(props.commonStyle, {
-            defaultUnit: processCssUnit,
-        }),
+        style: style && ((_a = Object.keys(style || {})) === null || _a === void 0 ? void 0 : _a.length)
+            ? (0, cals_1.processCSSPropertiesUnit)(style || {}, processCssUnit)
+            : {
+                ...(0, cals_1.processCommonStyle2CSSProperties)(props.commonStyle || {}, {
+                    defaultUnit: processCssUnit,
+                }),
+            },
         classList: classList || [],
     };
     if (staticResourceAttribute === null || staticResourceAttribute === void 0 ? void 0 : staticResourceAttribute.length) {
         staticProps._staticResourceAttribute = staticResourceAttribute;
     }
-    const { data = {} } = props;
     Object.assign(staticProps, generatedDynamicData(data, compInfo).staticProps);
-    if ((_a = props.directives) === null || _a === void 0 ? void 0 : _a.waForKey) {
-        staticProps._waForKey = (_b = props.directives) === null || _b === void 0 ? void 0 : _b.waForKey.value;
+    if ((_b = props.directives) === null || _b === void 0 ? void 0 : _b.waForKey) {
+        staticProps._waForKey = (_c = props.directives) === null || _c === void 0 ? void 0 : _c.waForKey.value;
     }
     return staticProps;
 }

package/lib/builder/util/process.js

@@ -3,25 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.promisifyProcess = void 0;
 function promisifyProcess(p, opts = {}) {
     return new Promise((resolve, reject) => {
+        var _a, _b, _c, _d;
         let stdout = '';
         let stderr = '';
-        p.stdout &&
-            p.stdout.on('data', opts.onStdout ||
-                ((data) => {
-                    console.log(data + '');
-                    stdout += data;
-                }));
-        p.stderr &&
-            p.stderr.on('data', opts.onStderr ||
-                ((data) => {
-                    console.error(data + '');
-                    stderr += data;
-                }));
+        (_b = (_a = p.stdout) === null || _a === void 0 ? void 0 : _a.on) === null || _b === void 0 ? void 0 : _b.call(_a, 'data', opts.onStdout ||
+            ((data) => {
+                console.log(`${data}`);
+                stdout += data;
+            }));
+        (_d = (_c = p.stderr) === null || _c === void 0 ? void 0 : _c.on) === null || _d === void 0 ? void 0 : _d.call(_c, 'data', opts.onStderr ||
+            ((data) => {
+                console.error(`${data}`);
+                stderr += data;
+            }));
         p.on('error', reject);
         p.on('exit', (exitCode) => {
-            exitCode === 0
-                ? resolve(exitCode)
-                : reject(new Error(stderr || String(exitCode)));
+            exitCode === 0 ? resolve(exitCode) : reject(new Error(stderr || String(exitCode)));
         });
     });
 }

package/lib/utils/transform.d.ts

@@ -0,0 +1,3 @@
+export declare function BabelTransform(code: any, options?: {
+    IIFE?: boolean;
+}): any;

package/lib/utils/transform.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BabelTransform = void 0;
+const core_1 = require("@babel/core");
+function BabelTransform(code, options = {}) {
+    var _a;
+    const { IIFE = false } = options;
+    try {
+        const simpleWrapped = `(\n${code || 'undefined'}\n)`;
+        const { code: expression } = (0, core_1.transformSync)(IIFE ? `(()=>${simpleWrapped})()` : simpleWrapped, {
+            // plugins: ['transform-modules-commonjs', 'transform-react-jsx'],
+            cwd: __dirname,
+            sourceType: 'script',
+            comments: false,
+            // minified: true,
+            presets: [
+                [
+                    '@babel/preset-env',
+                    {
+                        targets: {
+                            // esmodules: true,
+                            browsers: ['defaults', 'iOS >= 10', 'safari >= 10'],
+                        },
+                    },
+                ],
+            ],
+        }) || {};
+        return ((_a = expression === null || expression === void 0 ? void 0 : expression.replace) === null || _a === void 0 ? void 0 : _a.call(expression, /;$/, '')) || code;
+    }
+    catch (e) {
+        console.error(`transform [${code}] fail:`, e === null || e === void 0 ? void 0 : e.message);
+        return code;
+    }
+}
+exports.BabelTransform = BabelTransform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.18",
+  "version": "1.8.20",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -32,14 +32,17 @@
     "test": "jest",
     "test:build": "ts-node ./__tests__/build.ts",
     "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
-    "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js"
+    "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
+    "build:template": "./scripts/buildTemplate.sh"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.14",
-    "@cloudbase/lowcode-generator": "^1.8.8",
+    "@babel/core": "^7.11.6",
+    "@babel/preset-env": "^7.4.4",
+    "@cloudbase/cals": "^1.0.15",
+    "@cloudbase/lowcode-generator": "^1.8.9",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -525,7 +525,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.39/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.42/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -551,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.8bdf2bc04fec833b06b7.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.f12ad33da9108405a333.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -96,7 +96,9 @@ export function createEventHandlers(
            * 取消判断待兼容
            */
           if (pageId !== id /* || (__internal__ && !__internal__.active)*/) {
-            console.error(`Action error: [${name}] 页面生命周期结束，链式调用中断`);
+            if (!name?.includes?.('onDataChange')) {
+              console.error(`Action error: [${name}] 页面生命周期结束，链式调用中断`);
+            }
             return false;
           }
         }
@@ -160,7 +162,7 @@ export function createEventHandlers(
           }
         } catch (e) {
           if (e.message) {
-            e.message = `${currentTarget?.id || ''}[${trigger}:${l.key}]: ${e.message}`;
+            e._target = `${currentTarget?.id || ''}[${trigger}:${l.key}]`
           }
           nextEventHandles[0].handlerName = l.key ? `${prefix}$${l.key}_fail` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : e;
@@ -175,12 +177,12 @@ export function createEventHandlers(
           const nextHandler = nextEventHandles[0];
 
           if (!self[nextHandler.handlerName] && error) {
-            console.error(`Action error:`, error);
+            console.error(`Action error:`, generateErrorDebugMessage(error), error?.stack);
             if (!looseError) {
               if (app.__internal__?.env?.type !== 'production') {
                 app.showModal({
                   title: `事件响应失败`,
-                  content: error.message || error.errMsg || '',
+                  content: generateErrorDebugMessage(error) || error.errMsg || '',
                   showCancel: false,
                 });
               } else {
@@ -231,6 +233,12 @@ export function createEventHandlers(
 
   return evtHandlers;
 }
+
+function generateErrorDebugMessage(error) {
+  return `${error?._target ? `${error?._target}:` : ''}${error?.message || ''}`;
+}
+
+
 export function getDeep(target, key, keySeparator = '.') {
   if (key == null) {
     return target;

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

@@ -1,6 +1,13 @@
 import { observable } from 'mobx';
-import { createComputed, createEventHandlers, checkAuth, getMpEventHandlerName, generateDatasetQuery, generateEventFlows } from './util';
-import { createWidgets, createInitData, disposeWidget, ID_SEPARATOR, getWidget } from './widget';
+import {
+  createComputed,
+  createEventHandlers,
+  checkAuth,
+  getMpEventHandlerName,
+  generateDatasetQuery,
+  generateEventFlows,
+} from './util';
+import { createWidgets, createInitData, disposeWidget, getWidget } from './widget';
 import mergeRenderer from './merge-renderer';
 import {
   createDataset,
@@ -10,10 +17,62 @@ import {
   setConfig,
 } from '../datasources/index';
 import { runWatchers } from './watch';
-import { $w as baseAPI } from '../app/weapps-api'
-import { Event } from './event-emitter'
+import { $w as baseAPI } from '../app/weapps-api';
+import { Event } from './event-emitter';
+import { generatePageUrl } from '@cloudbase/weda-client';
+
+const wxApp = getApp();
 
-const wxApp = getApp()
+function extractLifecycles(ctx, lifecycle, appShareMessage, resetShare = true) {
+  const result = {};
+  Object.keys(lifecycle).map((name) => {
+    result[name] = function () {
+      return lifecycle[name].apply(this._getInstance(), arguments);
+    };
+  });
+
+  if (resetShare) {
+    result['onShareAppMessage'] = (res) => {
+      if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
+        return res?.target?.dataset?.weda_share_info;
+      } else if (res?.from === 'menu' && appShareMessage?.enable) {
+        let { pageId, params, imageUrl, title, packageName } = appShareMessage || {};
+        return {
+          path: generatePageUrl({
+            pageId,
+            packageName,
+            params,
+          }),
+          imageUrl: ctx.app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || imageUrl,
+          title,
+        };
+      }
+      try {
+        return lifecycle?.['onShareAppMessage']?.() || {};
+      } catch (error) {
+        console.log(error);
+        return {};
+      }
+    };
+  }
+
+  // 更新设备信息 窗口信息
+  result['onResize'] = (res) => {
+    let device = baseAPI.device;
+    if (!device) {
+      return;
+    }
+    const width = res?.size?.windowWidth;
+    const height = res?.size?.windowHeight;
+    if (width !== device?.viewport?.width || height !== device?.viewport?.height) {
+      device.viewport = {
+        width,
+        height,
+      };
+    }
+  };
+  return result;
+}
 
 export function createPage({
   app,
@@ -30,70 +89,20 @@ export function createPage({
   eventFlows = [],
   pageContext = {},
   pageAttributes = {},
+  resetShare = true,
 }) {
   const evtHandlers = createEventHandlers(evtListeners);
 
-  function extractLifecycles() {
-    const result = {};
-    Object.keys(lifecycle).map((name) => {
-      result[name] = function () {
-        return lifecycle[name].apply(this._getInstance(), arguments);
-      };
-    });
-
-    result['onShareAppMessage'] = (res) => {
-      if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
-        return res?.target?.dataset?.weda_share_info;
-      } else if (res?.from === 'menu' && pageAttributes?.appShareMessage) {
-        let { enable, pageId, params, imageUrl, title } = pageAttributes.appShareMessage;
-        if (enable) {
-          pageId = pageId ? pageId.replace(/^(\.)?\//, '') : pageId;
-          let realPath =
-            `/pages/${pageId}/index` +
-            (params ? '?' + params.map((pair) => pair.key + '=' + pair.value).join('&') : '');
-          return {
-            path: realPath,
-            imageUrl: app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || imageUrl,
-            title,
-          };
-        }
-      }
-      try {
-        return lifecycle?.['onShareAppMessage']?.() || {};
-      } catch (error) {
-        console.log(error);
-        return {};
-      }
-    };
-
-    // 更新设备信息 窗口信息
-    result['onResize'] = (res) => {
-      let device = baseAPI.device;
-      if (!device) {
-        return
-      }
-      const width = res?.size?.windowWidth;
-      const height = res?.size?.windowHeight;
-      if (width !== device?.viewport?.width || height !== device?.viewport?.height) {
-        device.viewport = {
-          width,
-          height
-        };
-      }
-    };
-    return result;
-  }
-
   return Component({
     _componentType: 'page',
     data: {
       ...createInitData(widgetProps, dataBinds),
       _isCheckingAtuh: false,
-      weDaHasLogin: false
+      weDaHasLogin: false,
     },
     lifetimes: {
       attached() {
-        this._disposers = []
+        this._disposers = [];
         const $page = this._getInstance();
         this._pageActive = true;
         /**
@@ -125,8 +134,8 @@ export function createPage({
     },
     pageLifetimes: {
       // 组件所在页面的生命周期函数，定义下给运营平台上报用
-      show: function () { },
-      hide: function () { },
+      show: function () {},
+      hide: function () {},
     },
     methods: {
       _pageActive: true,
@@ -135,28 +144,28 @@ export function createPage({
       _disposers: [],
 
       /** page lifecycles **/
-      ...extractLifecycles(),
+      ...extractLifecycles({ app }, lifecycle, pageAttributes?.appShareMessage, resetShare),
       ...evtHandlers,
       ...mergeRenderer,
       async beforePageCustomLaunch(query) {
         if (!this._beforePageCustomLaunchPromise) {
           this._beforePageCustomLaunchPromise = new Promise(async (resolve) => {
-            await wxApp.globaldata?._beforePageCustomLaunchPromise
+            await wxApp.globaldata?._beforePageCustomLaunchPromise;
             const $page = this._getInstance();
             if (query) {
               EXTRA_API.setParams($page.uuid, query);
             }
             try {
-              this.setData({ _isCheckingAtuh: true })
+              this.setData({ _isCheckingAtuh: true });
               const auth = await checkAuth(app, app.id, $page);
-              if(auth) {
+              if (auth) {
                 this.setData({
                   weDaHasLogin: true,
                 });
                 createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page, $w: $page.__internal__?.$w }));
               }
             } finally {
-              this.setData({ _isCheckingAtuh: false })
+              this.setData({ _isCheckingAtuh: false });
             }
 
             // eslint-disable-next-line no-restricted-syntax
@@ -164,16 +173,16 @@ export function createPage({
               if ($page.dataset.query[queryId]?._schema?.trigger === 'auto') {
                 try {
                   $page.dataset.query[queryId].trigger();
-                  this._disposers.push(() => $page.dataset.query[queryId].destroy())
+                  this._disposers.push(() => $page.dataset.query[queryId].destroy());
                 } catch (e) {
                   console.error(`query ${queryId} 初始化失败：`, e);
                 }
               }
             }
-            resolve()
-          })
+            resolve();
+          });
         }
-        return this._beforePageCustomLaunchPromise
+        return this._beforePageCustomLaunchPromise;
       },
       async onLoad(options) {
         const $page = this._getInstance();
@@ -184,7 +193,7 @@ export function createPage({
 
         this._query = decodePageQuery(options || {});
 
-        await this.beforePageCustomLaunch?.(this._query)
+        await this.beforePageCustomLaunch?.(this._query);
 
         const hook = lifecycle.onLoad || lifecycle.onPageLoad;
         await hook?.call?.($page, this._query);
@@ -215,7 +224,7 @@ export function createPage({
         $page.__internal__.active = this._pageActive;
         app.__internal__.activePage = $page;
 
-        await this.beforePageCustomLaunch?.(this._query)
+        await this.beforePageCustomLaunch?.(this._query);
 
         const hook = lifecycle.onShow || lifecycle.onPageShow;
         await hook?.call?.($page);
@@ -235,9 +244,9 @@ export function createPage({
         const keyName = getMpEventHandlerName(id, triggerName);
         const event = new Event({
           type: triggerName,
-          detail: params
-        })
-        return this[keyName]?.call?.(this, event)
+          detail: params,
+        });
+        return this[keyName]?.call?.(this, event);
       },
       _getInstance() {
         let $page = this.$WEAPPS_PAGE;
@@ -255,8 +264,8 @@ export function createPage({
         $page.handler = Object.keys(handlers).reduce((result, key) => {
           try {
             result[key] = handlers[key].bind($page);
-          } catch(e) {
-            console.error('添加页面handler失败', e)
+          } catch (e) {
+            console.error('添加页面handler失败', e);
           }
           return result;
         }, {});
@@ -266,7 +275,7 @@ export function createPage({
           $w: $page.__internal__.$w,
           $app: app,
           $page,
-        })
+        });
         $page.dataset = dataset;
         $page.state.dataset = dataset;
         $page.setState = (userSetState) => {
@@ -276,7 +285,7 @@ export function createPage({
         };
 
         const { widgets, rootWidget } = createWidgets(widgetProps, dataBinds, this, $page.widgets);
-        $page.widgets = widgets
+        $page.widgets = widgets;
         $page._rootWidget = rootWidget;
 
         $page.invokeComponentMethod = ({ component, method, params }) => {