@cloudbase/lowcode-builder 1.8.51 → 1.8.53

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

@@ -6,7 +6,7 @@ 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.file.myqcloud.com/lcap-builder/template.1.8.47.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.52.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/config/index.js

@@ -45,7 +45,7 @@ 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.file.myqcloud.com/lcap-builder/template.1.8.47.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.52.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/core/index.js

@@ -168,6 +168,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 },
                 buildTypeList,
                 ignoreInstall,
+                cdnEndpoints: { ...(0, config_1.generateCdnEndpoints)(cdnEndpoints), aegis: '' },
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
@@ -216,7 +217,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     runtime,
                     deployOptions,
                     ignoreInstall,
-                    cdnEndpoints,
+                    cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
                 });
                 await (cb === null || cb === void 0 ? void 0 : cb(null, {
                     outDir: h5BuildDir,

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

@@ -1,9 +1,10 @@
 import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IBuildContext } from './BuildContext';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
-export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, }: {
+export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
     calses: IPlatformApp[];
@@ -16,6 +17,7 @@ export declare function generateWxMp({ buildContext, weapps, calses, plugins, de
     };
     buildTypeList: BuildType[];
     ignoreInstall: boolean;
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<{
     miniprogramRoot: string;
 }>;

package/lib/builder/mp/index.js

@@ -51,6 +51,7 @@ const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
 const net_1 = require("../util/net");
 const cals_1 = require("@cloudbase/cals");
+const core_1 = require("../core");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
@@ -67,7 +68,7 @@ function patchBuildContext(ctx, calses, weapps) {
     ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
     return { allAppUsedComps };
 }
-async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, }) {
+async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, }) {
     var _a, _b;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
@@ -77,7 +78,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
      * 注意一定在入口进行处理，应当尽可能提前，后续逻辑不应该更新buildContext
      */
     const { allAppUsedComps } = patchBuildContext(buildContext, calses, weapps);
-    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
+    const { uin = '', appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
     // 安装依赖库，生成 materials 目录
     await (0, materials_1.installMaterials)(buildContext, projDir, allAppUsedComps, weapps);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
@@ -183,6 +184,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 appId,
                 importJSSDK: endpointType === 'tcb-api',
                 extraDeps: resolveNpmDeps(weapps, materials),
+                cdnEndpoints,
             },
         };
     }
@@ -195,8 +197,11 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
     }
     // 生成数据源
     if (weapps.find((item) => !item.mpPkgUrl)) {
+        const officialLib = materials.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
         const datasourceFileData = {
-            'datasources/index.js': {},
+            'datasources/index.js.tpl': {
+                cdnEndpoints,
+            },
             'datasources/config.js.tpl': {
                 envID: mainAppData.envId,
                 appID: appId,
@@ -205,6 +210,10 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 clientID: ((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.enableLoginStatusShare)
                     ? mainAppData.envId
                     : (_b = mainAppData.extra) === null || _b === void 0 ? void 0 : _b.clientId,
+                cdnEndpoints,
+                builderVersion: core_1.version || '',
+                officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
+                uin,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
@@ -237,6 +246,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                         appId,
                         importJSSDK: endpointType === 'tcb-api',
                         extraDeps: resolveNpmDeps(weapps, materials),
+                        cdnEndpoints,
                     },
                 }, templateDir, subpackageRootPath);
             }
@@ -358,6 +368,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
             const pageFileData = {
                 [`api.js|api.js`]: {
                     subLevelPath,
+                    packageName: rootPath || '',
                     uuid: rootPath ? `${rootPath}/${page.id}` : page.id,
                     label: ((_b = (_a = page === null || page === void 0 ? void 0 : page.data) === null || _a === void 0 ? void 0 : _a.navigationBarTitleText) === null || _b === void 0 ? void 0 : _b.value) || ((_d = (_c = page === null || page === void 0 ? void 0 : page.data) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.value),
                 },
@@ -399,9 +410,12 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     subWxss: rootPath && !((_l = ctx.mainAppData) === null || _l === void 0 ? void 0 : _l.mpPkgUrl)
                         ? `@import "${path_1.default.posix.relative(`/packages/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
-                    content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
-                        defaultUnit: processCssUnit,
-                    }), 'page'),
+                    content: [
+                        (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
+                            defaultUnit: processCssUnit,
+                        }), 'page'),
+                        (0, util_2.generateScopedStyleText)(componentInstances),
+                    ].join('\n'),
                     pageWxss: importor.styles.length ? `@import "../../lowcode/${page.id}/style.wxss"` : '',
                 },
             };

package/lib/builder/mp/materials.js

@@ -296,7 +296,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
                 .map((m) => m.name),
             eventHandlers: (0, util_3.createEventHandlers)(compositeCtx, componentInstances, weapps_core_1.COMPONENT_API_PREFIX),
             // protectEventKeys: builtinMpEvents,
-            emitEvents: compositedComp.emitEvents.map((evt) => evt.eventName),
+            emitEvents: (compositedComp.emitEvents || []).map((evt) => evt.eventName),
             widgetProps: (0, util_3.createWidgetProps)(compositeCtx, componentInstances),
             compApi: weapps_core_1.COMPONENT_API_PREFIX,
             jsonSchemaType2jsClass: mp_1.jsonSchemaType2jsClass,

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

@@ -42,3 +42,4 @@ export declare function findComponentInfo(xComponent: {
     materialLibs: any;
     miniprogramPlugins: any;
 }): any;
+export declare function generateScopedStyleText(widgets: Record<string, IWeAppComponentInstance>): string;

package/lib/builder/mp/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.generateScopedStyleText = 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");
@@ -482,3 +482,36 @@ function findComponentInfo(xComponent, { materialLibs, miniprogramPlugins }) {
     return compProto;
 }
 exports.findComponentInfo = findComponentInfo;
+function generateScopedStyleText(widgets) {
+    const cssTextList = [];
+    function traverse(target) {
+        var _a;
+        for (const [id, widget] of Object.entries(target)) {
+            const scopedStyle = (_a = widget.xProps) === null || _a === void 0 ? void 0 : _a.scopedStyle;
+            if (scopedStyle) {
+                let cssText = scopedStyle
+                    // 移除 `/* ... */` 注释
+                    .replace(/\/\*(?:[\s\S]*?)\*\//g, '')
+                    // 移除换行及其前后的空白符
+                    .replace(/\s*\n\s*/g, '')
+                    // 添加 `#wd-page-root` 前缀以增加样式权重
+                    .replace(/(:root.*?{)/g, '\n#wd-page-root $1')
+                    // 替换 `:root`
+                    .replace(/:root/g, `.wd-comp-id-${id}`)
+                    // `: ` => `:`
+                    .replace(/\s*:\s*/g, ':')
+                    // ` {` => `{`
+                    .replace(/\s*{\s*/g, '{')
+                    // `;}` => `}`
+                    .replace(/;\s*}/g, '}');
+                cssTextList.push(cssText.trim());
+            }
+            if (widget.properties) {
+                traverse(widget.properties);
+            }
+        }
+    }
+    traverse(widgets);
+    return cssTextList.join('\n');
+}
+exports.generateScopedStyleText = generateScopedStyleText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.51",
+  "version": "1.8.53",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -31,9 +31,12 @@
     "build": "tsc",
     "test:build": "ts-node ./__tests__/build.ts",
     "dev:web:serve": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
-    "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development 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",
+    "dev:web": "rm -rf dist && cross-env NODE_ENV=development webpack --config ./webpack/web.config.js",
+    "build:web": "rm -rf dist && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && cp -Rf dist/ lib/",
     "build:template": "./scripts/buildTemplate.sh",
+    "dev:debug": "tsc-watch --onSuccess 'npm run build-dev-web-and-push'",
+    "build-dev-web-and-push": "npm run dev:web && clear && yalc publish --push",
+    "release": "yarn npm whoami --publish && npm run build && npm run build:web && yarn set version 1.22.19 && yarn config set version-tag-prefix '@cloudbase/lowcode-builder@' && yarn version --no-commit-hooks --message 'chore(builder): v%s' && yarn config set version-tag-prefix v && yarn set version 3.6.2 && yarn npm publish",
     "publish:web": "node ./scripts/publish.ide.js"
   },
   "bugs": {
@@ -42,8 +45,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.37",
-    "@cloudbase/lowcode-generator": "^1.8.14",
+    "@cloudbase/cals": "^1.0.38",
+    "@cloudbase/lowcode-generator": "^1.8.15",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -79,6 +82,7 @@
     "jest": "^27.5.1",
     "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
+    "tsc-watch": "^6.0.4",
     "typescript": "^4.7.4",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "webpack-cli": "^4.9.1",

package/template/html/index.html.ejs

@@ -31,6 +31,7 @@
         ext1: '<%=appId%>',
         ext3: '<%=ext3%>',
         version: '<%= !isAdminPortal? "0.0.2" : "0.0.3" %>',
+        env: '<%= mode !== "production"? "pre" : "production" %>',
       });
       window._aegis = _aegis;
       window._aegis_inited = Date.now();
@@ -449,9 +450,7 @@
       </div>
       <% }%>
     </div>
-    <% jsApis.forEach(function(jsApi){%>
-    <script src="<%=jsApi %>"></script>
-    <% })%> <% if(canUseVite){ %>
+    <% if(canUseVite){ %>
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="/weda-config/weda-private.js"></script>
@@ -537,11 +536,14 @@
         cdnEndpoints.cdngo
       %>/lcap/lcap-resource-cdngo/-/release/_url/qcloud/lowcode/static/ide/assets/js/babel.min.js"
     ></script>
+    <% jsApis.forEach(function(jsApi){%>
+    <script src="<%=jsApi %>"></script>
+    <% })%>
     <script
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.0c7ed7985795b51590f8.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.24b6f4f560a5d284c4ff.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -131,11 +131,17 @@ App({
         } finally {
           for (const queryId in app.dataset?.query || {}) {
             if (app.dataset.query[queryId]?._schema?.trigger === 'auto') {
-              try {
-                app.dataset?.query?.[queryId]?.trigger?.();
-              } catch (e) {
-                console.error(`query ${queryId} 初始化失败：`, e);
-              }
+              /**
+               * query 初始化不阻塞生命周期
+               */
+              Promise.resolve()
+                .then(async () => {
+                  await app.dataset?.query?.[queryId]?.initPromise;
+                  return app.dataset?.query?.[queryId]?.trigger?.();
+                })
+                .catch((e) => {
+                  console.error(`query ${queryId} 初始化失败：`, e);
+                });
             }
           }
           resolve();

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

@@ -49,15 +49,18 @@ Component({
         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;
+              if( $page?.id){
+                getApp().app?.redirectTo({
+                  pageId: status.id,
+                  params: {
+                    statusCode: "403",
+                    sourcePagePackageName: $page?.__internal__.packageName,
+                    sourcePageId: $page?.id,
+                    sourcePageParams: $page?.dataset?.params,
+                  }
+                })
+                return;
+              }
             }
             case 'notfound': {
               getApp().app?.redirectTo({

package/template/mp/common/merge-renderer.js

@@ -14,7 +14,7 @@ export default {
     }
     for (const id in widgets) {
       const props = widgets[id]
-      dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props)
+      dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props, id)
     }
     const disposers = []
     for (const k in dataFactory) {

package/template/mp/common/placeholder/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

package/template/mp/common/placeholder/index.ts

@@ -0,0 +1 @@
+Component({})

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

@@ -0,0 +1 @@
+<block></block>

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

@@ -0,0 +1 @@
+/* common/placeholder/index.wxss */

package/template/mp/common/query.js

@@ -9,6 +9,8 @@ export class Query {
   #disposes = [];
   #dataBinds = {};
   #triggered = false;
+  initPromise;
+  #initedResolver = (value) => {};
   #paramsRef = observable({ current: null });
   #currentRequestKey = null;
   #observableValue = observable({ data: null, error: null, isFetching: false });
@@ -21,6 +23,11 @@ export class Query {
       trigger: schema.trigger,
     };
     this.#context = context;
+
+    this.initPromise = new Promise((resolve) => {
+      this.#initedResolver = resolve;
+    });
+
     if (this.#schema?.trigger === 'auto') {
       this.#disposes.push(
         autorun(
@@ -32,11 +39,15 @@ export class Query {
               }
             } catch (e) {
               console.error(e);
+            } finally {
+              this.#initedResolver(true);
             }
           },
           { delay: 50 },
         ),
       );
+    } else {
+      this.#initedResolver(true);
     }
     this.#paramsRef.current = this.#schema.data;
     this.#dataBinds = Object.entries(this.#schema.dataBinds || {}).reduce((map, [prop, fn]) => {
@@ -49,7 +60,7 @@ export class Query {
     const { $w } = this.#context;
 
     this.#action =
-      this.#schema.type === 'sql'
+      this.#schema.type === 'sql' || this.#schema.type === 'sqlserver'
         ? async function (data) {
             const Data = await $w.cloud.callWedaApi({
               action: 'RunPluginQuery',

package/template/mp/common/util.js

@@ -425,8 +425,14 @@ export async function getAuthConfig() {
 
 let _AUTH_CACHE_MAP = {};
 
-async function getAccessPermission(app, appId, pageId) {
-  const cacheKey = `${appId}-${pageId}`;
+async function getAccessPermission(app, appId, packageName = "", pageId) {
+  let cacheKey = `${appId}-${pageId}`;
+  if (packageName) {
+    const matched = packageName.match(/packages\/(.*)$/);
+    const subKey = matched?.[1] || packageName
+    cacheKey = `${appId}-${subKey}-${pageId}`
+  }
+
   if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
     return _AUTH_CACHE_MAP[cacheKey];
   }
@@ -492,7 +498,7 @@ export async function checkAuth(app, appId, $page) {
     return true;
   }
   wx.showNavigationBarLoading();
-  const requestList = [getAccessPermission(app, appId, $page.id)];
+  const requestList = [getAccessPermission(app, appId, $page.__internal__.packageName, $page.id)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
   if (loginPage) {
     requestList.push(getAuthConfig(app));
@@ -554,6 +560,7 @@ export function redirectToLogin(currentPage) {
     app.redirectTo({
       pageId: loginPage.id,
       params: {
+        sourcePagePackageName: currentPage.__internal__.packageName || undefined,
         sourcePageId: currentPage.id,
         sourcePageParams: currentPage.params || currentPage.dataset?.params,
       },

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

@@ -225,12 +225,17 @@ export function createPage({
             // eslint-disable-next-line no-restricted-syntax
             for (const queryId in $page.dataset?.query || {}) {
               if ($page.dataset.query[queryId]?._schema?.trigger === 'auto') {
-                try {
-                  $page.dataset.query[queryId].trigger();
-                  this._disposers.push(() => $page.dataset.query[queryId].destroy());
-                } catch (e) {
-                  console.error(`query ${queryId} 初始化失败：`, e);
-                }
+                /**
+                 * query 初始化不阻塞生命周期
+                 */
+                Promise.resolve()
+                  .then(async () => {
+                    await $page.dataset.query[queryId]?.initPromise;
+                    return $page.dataset.query[queryId].trigger();
+                  })
+                  .catch((e) => {
+                    console.error(`query ${queryId} 初始化失败：`, e);
+                  });
               }
             }
             resolve();
@@ -386,7 +391,7 @@ export function createPage({
           };
 
           if (typeof readonlyMap[method] !== 'function') {
-            throw new Error(`调用方法失败：未找到id为${component}下的方法${method}`);
+            throw new Error(`调用方法失败：未找到id为${componentInstance?.id}下的方法${method}`);
           }
           return readonlyMap[method](params);
         };

package/template/mp/common/widget.js

@@ -51,7 +51,7 @@ const EXTRA_PROPS_MAP = [
   return map;
 }, {});
 
-function resolveWidgetProp(props) {
+function resolveWidgetProp(props, widgetId) {
   let { classList = [], _staticResourceAttribute = ['src'], ...restProps } = props;
   const data = {};
   Object.keys(restProps).forEach((key) => {
@@ -64,7 +64,7 @@ function resolveWidgetProp(props) {
     data[key] = restProps[key];
   });
   data.style = styleToCss(restProps.style);
-  data.className = classList.join ? classList.join(' ') : classList;
+  data.className = `${widgetId ? `wd-comp-id-${widgetId}` : ''} ${classList.join ? classList.join(' ') : classList}`;
 
   _staticResourceAttribute?.forEach?.((property) => {
     processStaticResourceAttribute(data, undefined, property);
@@ -73,11 +73,11 @@ function resolveWidgetProp(props) {
 }
 
 // widget prop -> wxml data
-export function resolveWidgetData(props) {
+export function resolveWidgetData(props, widgetId) {
   if (!Array.isArray(props)) {
-    return resolveWidgetProp(props);
+    return resolveWidgetProp(props, widgetId);
   }
-  return props.map(resolveWidgetData);
+  return props.map(prop => resolveWidgetData(prop, widgetId));
 }
 
 export function createWidgets(widgetProps, dataBinds, ownerMpInst, widgetHolder) {
@@ -591,7 +591,7 @@ export function disposeWidget(widget, noRecursive = false) {
 export function createInitData(widgets, dataBinds, keyPrefix = '') {
   return Object.keys(widgets).reduce((result, id) => {
     if (!isWidgetInFor(id, widgets, dataBinds)) {
-      result[keyPrefix + id] = resolveWidgetData(widgets[id]);
+      result[keyPrefix + id] = resolveWidgetData(widgets[id], id);
     } else {
       result[keyPrefix + id] = [];
     }

package/template/mp/datasources/config.js.tpl

@@ -5,7 +5,7 @@ import config from '../common/config'
 /**
  * 数据源基本配置
  */
-export default {
+const CLOUD_CONFIG =  {
   /** 当前是否处于正式发布模式 */
   isProd: <%= isProd %>,
   /** 低码应用ID */
@@ -37,3 +37,25 @@ export default {
    */
   isPrivate: config.isPrivate
 }
+
+export default CLOUD_CONFIG
+<% if(cdnEndpoints.aegis){ %>
+export const AEGIS_CONFIG = {
+  id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
+  reportApiSpeed: true, // 接口测速
+  reportAssetSpeed: true, // 静态资源测速
+  ext1: CLOUD_CONFIG.appID,
+  ext3: [
+    CLOUD_CONFIG.envID,
+    '<%= uin %>',
+    '<%= builderVersion %>',
+    '<%= officialLibVersion %>',
+    wx.getAccountInfoSync()?.miniProgram?.appId || '',
+  ].join('|'),
+  version: "0.0.2",
+  env: CLOUD_CONFIG.isProd ? 'production' : 'pre',
+
+  hostUrl: 'https://rumt-zh.com', // 上报域名，中国大陆 rumt-zh.com
+  spa: true, // spa 页面需要开启，页面切换的时候上报pv
+}
+<% }%>

package/template/mp/datasources/{index.js → index.js.tpl}

@@ -25,7 +25,11 @@ export {
   initTcb,
 }
 
-import config from './config'
+import { default as config, AEGIS_CONFIG } from './config'
 
 setConfig(config)
 initTcb()
+<% if(cdnEndpoints.aegis){ %>
+import Aegis from 'aegis-mp-sdk';
+new Aegis(AEGIS_CONFIG);
+<% }%>

package/template/mp/package.json

@@ -3,11 +3,11 @@
   "version": "1.0.8",
   "scripts": {},
   "dependencies": {<% if(importJSSDK) {%>
-		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
-    } %>
+		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.12",
-    "@cloudbase/weda-cloud-sdk": "1.0.46",
+    "@cloudbase/weda-client": "1.0.14",
+    "@cloudbase/weda-cloud-sdk": "1.0.46",<% if(cdnEndpoints.aegis){ %>
+    "aegis-mp-sdk": "~1.38.1",<% } %>
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/mp/page/api.js

@@ -2,7 +2,8 @@ import { $w as baseAPI } from '<%= subLevelPath %>../../app/weapps-api'
 
 export const $page = {
   __internal__: {
-    active: false
+    active: false,
+    packageName: '<%= packageName %>',
   },
   uuid: '<%= uuid %>',
   label: '<%= label %>',