@cloudbase/lowcode-builder 1.8.49 → 1.8.50

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

@@ -41,6 +41,9 @@ export interface IBuildWedaApp extends IBaseAppProps {
     isPrivateMode?: boolean;
     endpointType?: 'tcb-api' | 'wechat-service';
     enableExpiredTag?: boolean;
+    account?: {
+        uin?: string;
+    };
 }
 export declare function buildWedaConfig({ output, domain, isPrivateMode, endpointType, buildTypeList, }: {
     output: Required<IBuildWedaApp['output']>;
@@ -49,7 +52,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, account, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -60,7 +60,7 @@ exports.buildWedaConfig = buildWedaConfig;
 async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, account = {}, }, cb) {
     var _a, _b, _c, _d, _e;
     if (!cals) {
         console.error('无效的应用配置');
@@ -80,6 +80,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     });
     let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || (runtime === types_1.RUNTIME.CI ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
     const buildContext = {
+        uin: account === null || account === void 0 ? void 0 : account.uin,
         projDir: appBuildDir,
         appId: appKey,
         isProduction: mode === common_1.WebpackModeType.PRODUCTION,

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

@@ -2,16 +2,18 @@ import { BuildAppProps } from '@cloudbase/lowcode-generator';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { BuildType } from '../types/common';
+import { IBuildContext } from '../mp/BuildContext';
 /**
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateHTML({ appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
+export declare function generateHTML({ buildContext, appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
 /**
  * 由于存量兜底逻辑存在
  * 默认值为 undefined 否则应为 false
  */
 enableLoading, }: {
+    buildContext: Omit<IBuildContext, 'mainAppData'>;
     appId: string;
     envId: string;
     description?: string;

package/lib/builder/h5/generate.js

@@ -15,6 +15,7 @@ const config_1 = require("../config");
 const lodash_1 = require("lodash");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const common_2 = require("../types/common");
+const index_1 = require("../core/index");
 /**
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
@@ -25,12 +26,14 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
-async function generateHTML({ appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
+async function generateHTML({ buildContext, appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
 /**
  * 由于存量兜底逻辑存在
  * 默认值为 undefined 否则应为 false
  */
 enableLoading = undefined, }) {
+    const { materialLibs, uin } = buildContext;
+    const officialLib = materialLibs.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
     const dstFilePath = path_1.default.join(appBuildDir, 'index.html');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
@@ -59,6 +62,7 @@ enableLoading = undefined, }) {
         isBuildApp,
         isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
         cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+        ext3: [envId, uin, index_1.version, officialLib === null || officialLib === void 0 ? void 0 : officialLib.version, '' /* mpappId */].join('|'),
         /**
          * @deprecated
          * 此次临时保留白名单兜底逻辑

package/lib/builder/h5/index.js

@@ -139,6 +139,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
         await (0, generate_1.generateThemeVarsFile)(mainAppData.themeVars, h5BuildDir);
         // 生成 webpack 配置
         const webpackConfigPath = await (0, webpack_1.runWebpackCore)({
+            buildContext,
             cals,
             appKey,
             mainAppData,

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

@@ -2,7 +2,9 @@ import { IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core
 import { BuildAppProps } from '../core/index';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
+import { IBuildContext } from '../mp/BuildContext';
 interface IWebpackCoreProps extends BuildAppProps {
+    buildContext: Omit<IBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     appBuildDir: string;
     mainAppData: IWebRuntimeAppData;
@@ -10,5 +12,5 @@ interface IWebpackCoreProps extends BuildAppProps {
     assets: string[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }
-export declare function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -5,7 +5,7 @@ const common_1 = require("../types/common");
 const webpack_1 = require("../service/webpack");
 const generate_1 = require("./generate");
 const cals_1 = require("@cloudbase/cals");
-async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
+async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
     var _a;
     console.time('runWebpackCore');
     console.time('webpackGenerate');
@@ -21,6 +21,7 @@ async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir,
     });
     console.timeEnd('webpackGenerate');
     await (0, generate_1.generateHTML)({
+        buildContext,
         appId: mainAppData.id || appKey,
         envId: mainAppData.envId || '',
         description: cals.description || cals.label || '',

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

@@ -3,6 +3,10 @@ import { IMaterialItem, IWeAppData, IMiniprogramPlugin } from '@cloudbase/lowcod
  * All build parameters and intermediate data to be share across processes
  */
 export interface IBuildContext {
+    /**
+     * 账号信息
+     */
+    uin?: string;
     /**
      * 应用id
      */

package/lib/builder/mp/index.js

@@ -349,6 +349,12 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
             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}`, '')}/` : '';
+            const pageDataBinds = {};
+            Object.entries(page.data || {}).forEach(([prop, val]) => {
+                if (prop === null || prop === void 0 ? void 0 : prop.startsWith('appShareMessage')) {
+                    (0, util_2.setDataBind)(pageDataBinds, prop, val);
+                }
+            });
             const pageFileData = {
                 [`api.js|api.js`]: {
                     subLevelPath,
@@ -368,6 +374,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     pageAttributes: {
                         ...(((_e = page.data) === null || _e === void 0 ? void 0 : _e.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {}),
                     },
+                    pageDataBinds,
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
                     subLevelPath,

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

@@ -26,6 +26,7 @@ export declare function createTemplateEventFlows(ctx: IBuildContext, eventFlows?
 export declare function createDataBinds(ctx: IBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }): {};
+export declare function setDataBind(target: any, prop: string, val: IDynamicValue): void;
 export declare function processRepeaterSchema(ctx: any, componentInstanceMap: {
     [key: string]: IWeAppComponentInstance;
 }): {

package/lib/builder/mp/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComponentInfo = exports.processRepeaterSchema = exports.createDataBinds = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
@@ -390,6 +390,7 @@ function setDataBind(target, prop, val) {
         // }
     }
 }
+exports.setDataBind = setDataBind;
 function processRepeaterSchema(ctx, componentInstanceMap) {
     (0, weapp_1.walkThroughWidgets)(componentInstanceMap, (id, component, parentId) => {
         var _a, _b;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.49",
+  "version": "1.8.50",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -42,7 +42,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.35",
+    "@cloudbase/cals": "^1.0.37",
     "@cloudbase/lowcode-generator": "^1.8.14",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -29,6 +29,7 @@
         reportAssetSpeed: true, // 静态资源测速
         spa: true,
         ext1: '<%=appId%>',
+        ext3: '<%=ext3%>',
         version: '<%= !isAdminPortal? "0.0.2" : "0.0.3" %>',
       });
       window._aegis = _aegis;
@@ -540,7 +541,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.8d5af6de1f01bbd759cc.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.0c7ed7985795b51590f8.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -21,10 +21,13 @@ 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';
+
+export const PAGE_ROOT_SYMBOL = Symbol('@@page_route@@')
 
 const wxApp = getApp();
 
-function extractLifecycles(ctx, lifecycle, appShareMessage, resetShare = true) {
+function extractLifecycles(ctx, lifecycle, appShareMessage, dataBinds, resetShare = true) {
   const result = {};
   Object.keys(lifecycle).map((name) => {
     result[name] = function () {
@@ -37,13 +40,32 @@ function extractLifecycles(ctx, lifecycle, appShareMessage, resetShare = true) {
       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 || {};
+        let mergedData = { appShareMessage }
+        try {
+          mergedData = mergeDynamic2StaticData({ appShareMessage }, dataBinds, {
+            codeContext: {
+              /**
+               * $page 或 $comp 实例
+               */
+              instance: ctx.app?.__internal__?.activePage,
+            },
+            $w: ctx.app?.__internal__?.activePage?.__internal__?.$w,
+          })
+        } catch(e) {
+          console.warn('分享设置绑定计算错误：', e)
+        }
+
+        let { pageId, params, imageUrl, title, packageName } = mergedData.appShareMessage || {};
+        const url = generatePageUrl({
+          pageId,
+          packageName,
+          params: Array.isArray(params) ? params.reduce((map, { key, value }) => {
+            map[key] = value
+            return map
+          }, {}) : params,
+        })
         return {
-          path: generatePageUrl({
-            pageId,
-            packageName,
-            params,
-          }),
+          path: url,
           imageUrl: ctx.app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || imageUrl,
           title,
         };
@@ -84,7 +106,7 @@ export function createPage({
   state,
   computed,
   evtListeners,
-  dataBinds,
+  dataBinds = {},
   handlers,
   query: datasetQuery = {},
   eventFlows = [],
@@ -93,11 +115,12 @@ export function createPage({
   resetShare = true,
 }) {
   const evtHandlers = createEventHandlers(evtListeners);
+  const {[PAGE_ROOT_SYMBOL]: pageRootDataBinds, ...componentDataBinds} = dataBinds
 
   return Component({
     _componentType: 'page',
     data: {
-      ...createInitData(widgetProps, dataBinds),
+      ...createInitData(widgetProps, componentDataBinds),
       _isCheckingAtuh: false,
       _expiredMessage: '',
       weDaHasLogin: null,
@@ -166,7 +189,7 @@ export function createPage({
       _disposers: [],
 
       /** page lifecycles **/
-      ...extractLifecycles({ app }, lifecycle, pageAttributes?.appShareMessage, resetShare),
+      ...extractLifecycles({ app }, lifecycle, pageAttributes?.appShareMessage, pageRootDataBinds, resetShare),
       ...evtHandlers,
       ...mergeRenderer,
       async beforePageCustomLaunch(query) {
@@ -333,7 +356,7 @@ export function createPage({
           });
         }
 
-        const { widgets, rootWidget } = createWidgets(widgetProps, dataBinds, this, $page.widgets);
+        const { widgets, rootWidget } = createWidgets(widgetProps, componentDataBinds, this, $page.widgets);
         $page.widgets = widgets;
         $page._rootWidget = rootWidget;
 

package/template/mp/page/index.js

@@ -1,5 +1,5 @@
 import { observable } from 'mobx';
-import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
+import { createPage, PAGE_ROOT_SYMBOL } from '<%= subLevelPath %>../../common/weapp-page'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
 import { app, $app } from '<%= subLevelPath %>../../app/weapps-api'
 import { <%= pageNameVar %> as handlers } from '../../app/handlers'
@@ -53,7 +53,10 @@ import { widgetProps } from './data'
 /** widget event listeners **/
 const evtListeners = {<% printEventHandler(eventHandlers) %>}
 
-const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
+const dataBinds = {
+  [PAGE_ROOT_SYMBOL]: {
+    <%= printBoundData(pageDataBinds) %>
+  },<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <%= printBoundData(widgetBinds) %>
   },<%}) %>
 }