@mybricks/to-code-taro 1.0.7 → 1.1.0

package/dist/cjs/toCodeTaro.d.ts

@@ -62,7 +62,7 @@ export interface GeneratedFile {
     cssContent?: string;
     pageConfigContent?: string;
     importManager: ImportManager;
-    type: "normal" | "popup" | "module" | "global" | "extension-config" | "extension-api" | "extension-bus" | "abstractEventTypeDef" | "fx" | "api" | "extension-event" | "jsModules" | "commonIndex" | "tabBarConfig";
+    type: "normal" | "popup" | "module" | "global" | "extension-config" | "extension-api" | "extension-bus" | "abstractEventTypeDef" | "fx" | "api" | "extension-event" | "jsModules" | "commonIndex" | "tabBarConfig" | "customTabBar";
     meta?: ReturnType<typeof toCode>["scenes"][0]["scene"];
     name: string;
     tabBarConfig?: string;
@@ -147,6 +147,19 @@ export interface BaseConfig extends ToTaroCodeConfig {
         typeDef: any;
         schema: any;
     }) => void;
+    /** 获取组件/场景调用的代码模板（解耦核心） */
+    getCallTemplate?: (params: {
+        com: any;
+        pinId: string;
+        args: string;
+    }) => {
+        code: string;
+        import?: {
+            packageName: string;
+            dependencyNames: string[];
+            importType: "default" | "named";
+        };
+    } | undefined;
     /** 根据 ID 获取 DSL 中的稳定组件名（参考鸿蒙实现） */
     getDslComNameById?: (id: string) => string | undefined;
 }

package/dist/cjs/toCodeTaro.js

@@ -134,6 +134,7 @@ var getCode = (params, config) => {
     jsModulesMap: jsModulesCollector.getMap(),
     globalTabBarConfig: pageConfigHandler.getTabBarConfig(),
     tabBarImageFiles: pageConfigHandler.getTabBarImageFiles(),
+    customTabBarFileContent: pageConfigHandler.getCustomTabBarFileContent(),
     popupIds: Array.from(popupIds),
     config
   });

package/dist/cjs/utils/builder/buildResult.d.ts

@@ -11,6 +11,7 @@ interface BuildResultParams {
     tabBarImageFiles: any[];
     popupIds: string[];
     config: ToTaroCodeConfig;
+    customTabBarFileContent: string | null;
 }
 /**
  * 构建最终结果

package/dist/cjs/utils/builder/buildResult.js

@@ -42,7 +42,8 @@ var buildFinalResults = (params) => {
     globalTabBarConfig,
     tabBarImageFiles,
     popupIds,
-    config
+    config,
+    customTabBarFileContent
   } = params;
   const files = [];
   files.push({
@@ -105,6 +106,12 @@ export const POPUP_MAP: Record<string, any> = {
       name: "tabBarConfig",
       tabBarConfig: globalTabBarConfig
     });
+    files.push({
+      type: "customTabBar",
+      content: customTabBarFileContent,
+      importManager: new import_ImportManager.ImportManager(config),
+      name: "customTabBar"
+    });
   }
   return {
     files,

package/dist/cjs/utils/common/helper.d.ts

@@ -1,2 +1,12 @@
 /** 缩进 */
 export declare const indentation: (level: number) => string;
+/**
+ * 根据 schema.type 推导变量默认 initValue
+ * - string: ''（未提供 initValue）
+ * - number: 0
+ * - boolean: false
+ * - array: []
+ * - object: {}
+ * - 其他/未知: 优先使用 initValue，否则 {}
+ */
+export declare const getInitValueBySchema: (schema: any, initValue: any) => any;

package/dist/cjs/utils/common/helper.js

@@ -19,13 +19,34 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/utils/common/helper.ts
 var helper_exports = {};
 __export(helper_exports, {
+  getInitValueBySchema: () => getInitValueBySchema,
   indentation: () => indentation
 });
 module.exports = __toCommonJS(helper_exports);
 var indentation = (level) => {
   return " ".repeat(level);
 };
+var getInitValueBySchema = (schema, initValue) => {
+  if (initValue !== void 0)
+    return initValue;
+  const type = schema == null ? void 0 : schema.type;
+  switch (type) {
+    case "string":
+      return "";
+    case "number":
+      return 0;
+    case "boolean":
+      return false;
+    case "array":
+      return [];
+    case "object":
+      return {};
+    default:
+      return {};
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getInitValueBySchema,
   indentation
 });

package/dist/cjs/utils/common/string.d.ts

@@ -6,3 +6,13 @@ export declare const firstCharToLowerCase: (str: string) => string;
 export declare const camelToKebab: (str: string) => string;
 /** 中划线转驼峰 */
 export declare const kebabToCamel: (str: string) => string;
+/** 检查字符串是否包含中文 */
+export declare const hasChinese: (str: string) => boolean;
+/**
+ * 获取安全的变量名
+ * 优先使用 title，如果 title 包含中文则使用 id
+ */
+export declare const getSafeVarName: (com: {
+    title?: string;
+    id: string;
+}) => string;

package/dist/cjs/utils/common/string.js

@@ -22,6 +22,8 @@ __export(string_exports, {
   camelToKebab: () => camelToKebab,
   firstCharToLowerCase: () => firstCharToLowerCase,
   firstCharToUpperCase: () => firstCharToUpperCase,
+  getSafeVarName: () => getSafeVarName,
+  hasChinese: () => hasChinese,
   kebabToCamel: () => kebabToCamel
 });
 module.exports = __toCommonJS(string_exports);
@@ -37,10 +39,21 @@ var camelToKebab = (str) => {
 var kebabToCamel = (str) => {
   return str.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
 };
+var hasChinese = (str) => {
+  return /[\u4e00-\u9fa5]/.test(str);
+};
+var getSafeVarName = (com) => {
+  if (com.title && !hasChinese(com.title)) {
+    return com.title;
+  }
+  return com.id;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   camelToKebab,
   firstCharToLowerCase,
   firstCharToUpperCase,
+  getSafeVarName,
+  hasChinese,
   kebabToCamel
 });

package/dist/cjs/utils/config/content/converter.js

@@ -54,6 +54,7 @@ function convertToTaroTabBarConfig(tabBar, pageIdToPath = (pageId) => `pages/${p
     (item, index) => convertTabBarItem(item, pageIdToPath, index, processIcon)
   );
   const config = {
+    custom: true,
     list
   };
   const firstItem = validation.validItems[0];

package/dist/cjs/utils/config/content/tabBarConfig.d.ts

@@ -2,12 +2,27 @@
  * TabBar 配置工具
  * 负责从 tabBar 数据生成 app.config.ts 中的 tabBar 配置字符串
  */
-import type { ImageFileInfo } from './types';
+import type { TaroTabBarConfig, ImageFileInfo } from './types';
 /**
- * 从 tabBar 数据生成 TabBar 配置字符串（用于 app.config.ts）
+ * 从 tabBar 数据生成 TabBar 配置JSON（用于 app.config.ts）
  * @param tabBar tabBar 数据数组（来自 scenes[x].coms[id].model.data.tabBar）
  * @param pageIdToPath 页面 ID 到路径的映射函数（默认使用 pages/${pageId}/index）
  * @param imageFiles 用于收集需要保存的图片文件的数组（可选）
- * @returns TabBar 配置字符串，如果验证失败则返回 null
+ * @returns TabBar 配置JSON，如果验证失败则返回 null
  */
-export declare function generateTabBarConfigContent(tabBar: any[] | undefined, pageIdToPath?: (pageId: string) => string, imageFiles?: ImageFileInfo[]): string | null;
+export declare function generateTabBarConfigContent(tabBar: any[] | undefined, pageIdToPath?: (pageId: string) => string, imageFiles?: ImageFileInfo[]): TaroTabBarConfig | null;
+/**
+ * 将 TabBar 配置转换为 app.config.ts 中的字符串格式
+ * @param config TabBar 配置
+ * @param indent 缩进字符串，默认为 2 个空格
+ * @returns 配置字符串
+ */
+export declare function formatTabBarConfigForAppConfig(config: TaroTabBarConfig, indent?: string): string;
+/**
+ * 生成转换后的自定义Tabbar项配置文件内容
+ * 增加页面路径pagePath
+ * normalIconPath/selectedIconPath替换成本地图片路径
+ * @param tabBar tabBar 数据数组（来自 scenes[x].coms[id].model.data.tabBar）
+ * @param config TabBar 配置
+ */
+export declare function generateCustomTabBarFileContent(tabBar: any[] | undefined, config: TaroTabBarConfig): string;

package/dist/cjs/utils/config/content/tabBarConfig.js

@@ -19,6 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/utils/config/content/tabBarConfig.ts
 var tabBarConfig_exports = {};
 __export(tabBarConfig_exports, {
+  formatTabBarConfigForAppConfig: () => formatTabBarConfigForAppConfig,
+  generateCustomTabBarFileContent: () => generateCustomTabBarFileContent,
   generateTabBarConfigContent: () => generateTabBarConfigContent
 });
 module.exports = __toCommonJS(tabBarConfig_exports);
@@ -33,7 +35,7 @@ function generateTabBarConfigContent(tabBar, pageIdToPath = (pageId) => `pages/$
   if (!config) {
     return null;
   }
-  return formatTabBarConfigForAppConfig(config);
+  return config;
 }
 function formatTabBarConfigForAppConfig(config, indent = "  ") {
   const tabBarJson = JSON.stringify(config, null, 2);
@@ -45,7 +47,22 @@ function formatTabBarConfigForAppConfig(config, indent = "  ") {
     return `${indent}${line}`;
   }).join("\n");
 }
+function generateCustomTabBarFileContent(tabBar, config) {
+  const customTabbarConfig = tabBar.map((item, index) => {
+    const { iconPath, selectedIconPath } = config.list[index];
+    return {
+      ...item,
+      pagePath: config.list[index].pagePath,
+      normalIconPath: iconPath ? `/${iconPath}` : void 0,
+      selectedIconPath: selectedIconPath ? `/${selectedIconPath}` : void 0
+    };
+  });
+  const tabBarJson = JSON.stringify(customTabbarConfig, null, 2);
+  return `export default ${tabBarJson} as any`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  formatTabBarConfigForAppConfig,
+  generateCustomTabBarFileContent,
   generateTabBarConfigContent
 });

package/dist/cjs/utils/config/content/types.d.ts

@@ -13,6 +13,12 @@ export interface TabBarItemSource {
     };
     text?: string;
     type?: string;
+    normalIconUseImg?: boolean;
+    selectedIconUseImg?: boolean;
+    normalIcon?: string;
+    selectedIcon?: string;
+    normalFontIconStyle?: Record<string, any>;
+    selectedFontIconStyle?: Record<string, any>;
     normalIconPath?: string;
     selectedIconPath?: string;
     normalTextStyle?: Record<string, any>;
@@ -21,16 +27,14 @@ export interface TabBarItemSource {
     selectedIconStyle?: Record<string, any>;
     normalBackgroundStyle?: Record<string, any>;
     selectedBackgroundStyle?: Record<string, any>;
-    subMenu?: Array<{
-        scene: {
-            id: string;
-            title?: string;
-        };
-        normalIconPath?: string;
-        normalTextStyle?: Record<string, any>;
-        normalIconStyle?: Record<string, any>;
-        normalBackgroundStyle?: Record<string, any>;
-    }>;
+}
+/**
+ * 转换后的自定义Tabbar项配置
+ * 增加页面路径pagePath
+ * normalIconPath/selectedIconPath替换成本地图片路径
+ */
+export interface CustomTabbarConfig extends TabBarItemSource {
+    pagePath: string;
 }
 /**
  * Taro TabBar 项配置
@@ -45,6 +49,7 @@ export interface TaroTabBarItem {
  * Taro TabBar 配置
  */
 export interface TaroTabBarConfig {
+    custom?: boolean;
     color?: string;
     selectedColor?: string;
     backgroundColor?: string;

package/dist/cjs/utils/config/handlePageConfig.d.ts

@@ -7,6 +7,7 @@ import { type ImageFileInfo } from "./content";
 export declare class HandlePageConfig {
     private globalTabBarConfig;
     private tabBarImageFiles;
+    private customTabbarFileContent;
     /**
      * 处理页面配置（提取 systemPage 组件数据）
      * @param scene 场景数据
@@ -22,4 +23,9 @@ export declare class HandlePageConfig {
      * 获取 TabBar 图片文件数组
      */
     getTabBarImageFiles(): ImageFileInfo[];
+    /**
+     * 获取自定义 TabBar 配置文件数据
+     * 用于生成文件/src/custom-tab-bar/mybricks/tabbar-config.ts
+     */
+    getCustomTabBarFileContent(): string | null;
 }

package/dist/cjs/utils/config/handlePageConfig.js

@@ -27,6 +27,7 @@ var HandlePageConfig = class {
   constructor() {
     this.globalTabBarConfig = null;
     this.tabBarImageFiles = [];
+    this.customTabbarFileContent = null;
   }
   /**
    * 处理页面配置（提取 systemPage 组件数据）
@@ -46,11 +47,15 @@ var HandlePageConfig = class {
       pageConfigContent = (0, import_content.generatePageConfigContent)(systemPageData);
       if (!this.globalTabBarConfig && systemPageData.tabBar && Array.isArray(systemPageData.tabBar)) {
         const pageIdToPath = (pageId) => `pages/${pageId}/index`;
-        this.globalTabBarConfig = (0, import_content.generateTabBarConfigContent)(
+        const globalTabBarConfigJson = (0, import_content.generateTabBarConfigContent)(
           systemPageData.tabBar,
           pageIdToPath,
           this.tabBarImageFiles
         );
+        this.globalTabBarConfig = (0, import_content.formatTabBarConfigForAppConfig)(globalTabBarConfigJson);
+        if (this.globalTabBarConfig) {
+          this.customTabbarFileContent = (0, import_content.generateCustomTabBarFileContent)(systemPageData.tabBar, globalTabBarConfigJson);
+        }
       }
     }
     return pageConfigContent;
@@ -67,6 +72,13 @@ var HandlePageConfig = class {
   getTabBarImageFiles() {
     return this.tabBarImageFiles;
   }
+  /**
+   * 获取自定义 TabBar 配置文件数据
+   * 用于生成文件/src/custom-tab-bar/mybricks/tabbar-config.ts
+   */
+  getCustomTabBarFileContent() {
+    return this.customTabbarFileContent;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/utils/logic/handleProcess.js

@@ -23,6 +23,7 @@ __export(handleProcess_exports, {
 });
 module.exports = __toCommonJS(handleProcess_exports);
 var import_helper = require("../common/helper");
+var import_string = require("../common/string");
 var import_object = require("../common/object");
 var isJsCalculationComponent = (namespace) => {
   return namespace === "mybricks.taro._muilt-inputJs" || namespace === "mybricks.core-comlib.js-ai";
@@ -109,7 +110,7 @@ ${indent}}, appContext)
 `;
   });
   process.nodesInvocation.forEach((props) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const { componentType, category, runType } = props;
     let nextValue = getNextValue(props, config, event);
     const isSameScope = checkIsSameScope(event, props);
@@ -117,43 +118,42 @@ ${indent}}, appContext)
     if (code) {
       code += "\n";
     }
+    const callTemplate = (_c = config.getCallTemplate) == null ? void 0 : _c.call(config, {
+      com: {
+        ...props.meta,
+        // 鸿蒙化：透传可能的场景 ID，增强识别能力
+        sceneId: ((_b = (_a = props.meta.model) == null ? void 0 : _a.data) == null ? void 0 : _b._sceneId) || props.meta.id
+      },
+      pinId: props.id,
+      args: nextValue
+    });
+    if (callTemplate) {
+      if (callTemplate.import) {
+        config.addParentDependencyImport(callTemplate.import);
+      }
+      code += `${indent}/** ${props.meta.title} */
+${indent}${nextCode}${callTemplate.code}`;
+      return;
+    }
     if (componentType === "js") {
       if (category === "scene") {
         const _sceneId = props.meta.model.data._sceneId;
-        const targetScene = config.getSceneById(_sceneId);
-        const isPopup = (targetScene == null ? void 0 : targetScene.type) === "popup" || ((_a = targetScene == null ? void 0 : targetScene.deps) == null ? void 0 : _a.some((dep) => dep.namespace === "mybricks.taro.popup"));
-        const controllerName = isPopup ? "popupRouter" : "pageRouter";
-        config.addParentDependencyImport({
-          packageName: config.getComponentPackageName(),
-          dependencyNames: [controllerName],
-          importType: "named"
-        });
         const operateName = props.meta.model.data.openType === "redirect" ? "replace" : "open";
         code += `${indent}/** 打开 ${props.meta.title} */
-${indent}${nextCode}${controllerName}.${operateName}("${((_b = config.getPageId) == null ? void 0 : _b.call(config, _sceneId)) || _sceneId}", ${nextValue})`;
+${indent}${nextCode}this.${_sceneId}.${operateName}(${nextValue})`;
       } else if (category === "frameOutput") {
         const currentScene = config.getCurrentScene();
-        const pinProxy = (_c = currentScene == null ? void 0 : currentScene.pinProxies) == null ? void 0 : _c[`${props.meta.id}-${props.id}`];
-        if ((pinProxy == null ? void 0 : pinProxy.frameId) && (pinProxy == null ? void 0 : pinProxy.pinId)) {
-          const method = pinProxy.pinId;
-          const controllerName = config.isPopup ? "popupRouter" : "pageRouter";
-          config.addParentDependencyImport({
-            packageName: config.getComponentPackageName(),
-            dependencyNames: [controllerName],
-            importType: "named"
-          });
-          if (["commit", "cancel", "apply", "close"].includes(method)) {
-            const sceneId = pinProxy.frameId || (currentScene == null ? void 0 : currentScene.id);
-            const argCode = nextValue ? `, ${nextValue}` : "";
-            code += `${indent}/** ${props.meta.title} 输出 ${method} */
-${indent}${nextCode}${controllerName}.${method}("${sceneId}"${argCode})`;
-          }
-        }
+        const pinProxy = (_d = currentScene == null ? void 0 : currentScene.pinProxies) == null ? void 0 : _d[`${props.meta.id}-${props.id}`];
+        const method = (pinProxy == null ? void 0 : pinProxy.pinId) || props.id;
+        const sceneId = (pinProxy == null ? void 0 : pinProxy.frameId) || (currentScene == null ? void 0 : currentScene.id);
+        code += `${indent}/** ${props.meta.title} 输出 ${method} */
+${indent}${nextCode}this.${sceneId}.${method}(${nextValue})`;
       } else if (category === "normal") {
         let componentNameWithId = getComponentNameWithId(props, config, event);
         code += `${indent}/** 调用 ${props.meta.title} */
 ${indent}${nextCode}${componentNameWithId}(${runType === "input" ? nextValue : ""})`;
       } else if (category === "var") {
+        const varKey = (0, import_string.getSafeVarName)(props.meta);
         if (props.meta.global) {
           config.addParentDependencyImport({
             packageName: config.getComponentPackageName(),
@@ -161,14 +161,14 @@ ${indent}${nextCode}${componentNameWithId}(${runType === "input" ? nextValue : "
             importType: "named"
           });
           code += `${indent}/** ${props.title} 全局变量 ${props.meta.title} */
-${indent}${nextCode}globalVars.${props.meta.title}.${props.id}(${nextValue})`;
+${indent}${nextCode}globalVars.${varKey}.${props.id}(${nextValue})`;
         } else {
           const currentProvider = getCurrentProvider(
             { isSameScope, props },
             config
           );
           code += `${indent}/** ${props.title} 变量 ${props.meta.title} */
-${indent}${nextCode}this.${currentProvider.name}_Vars.${props.meta.title}.${props.id}(${nextValue})`;
+${indent}${nextCode}this.$vars.${varKey}.${props.id}(${nextValue})`;
         }
       } else if (category === "fx") {
         if (props.meta.global) {
@@ -185,7 +185,7 @@ ${indent}${nextCode}globalFxs.${props.meta.ioProxy.id}(${nextValue})`;
             config
           );
           code += `${indent}/** 调用Fx ${props.meta.title} */
-${indent}${nextCode}this.${currentProvider.name}_Fxs.${props.meta.ioProxy.id}(${nextValue})`;
+${indent}${nextCode}this.$fxs.${props.meta.ioProxy.id}(${nextValue})`;
         }
       }
     } else {
@@ -265,18 +265,32 @@ var getNextCode = (props, config, isSameScope, event) => {
   const componentNameWithId = getComponentNameWithId(props, config, event);
   return `const ${componentNameWithId}_result = `;
 };
+function getFrameInputValueExpr(meta, config, event) {
+  var _a, _b, _c;
+  const scene = (_a = config.getCurrentScene) == null ? void 0 : _a.call(config);
+  const inputPinId = ((_b = meta == null ? void 0 : meta.inputs) == null ? void 0 : _b[0]) || "getCurValue";
+  const proxyKey = `${meta == null ? void 0 : meta.id}-${inputPinId}`;
+  const pinProxy = (_c = scene == null ? void 0 : scene.pinValueProxies) == null ? void 0 : _c[proxyKey];
+  const pinId = pinProxy == null ? void 0 : pinProxy.pinId;
+  if (typeof pinId === "string" && pinId) {
+    return `params?.inputValues?.[${JSON.stringify(pinId)}]`;
+  }
+}
 var getNextValue = (props, config, event) => {
   const { paramSource } = props;
   const nextValue = paramSource.map((param) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     if (param.type === "params") {
       const params = config.getParams();
       return params[param.id];
     } else if (param.type === "constant") {
       return JSON.stringify(param.value);
     }
+    if (((_b = (_a = param.meta) == null ? void 0 : _a.def) == null ? void 0 : _b.namespace) === "mybricks.core-comlib.frame-input" && param.id === "return") {
+      return getFrameInputValueExpr(param.meta, config, event);
+    }
     const componentNameWithId = getComponentNameWithId(param, config, event);
-    if ((_c = (_b = (_a = param.meta) == null ? void 0 : _a.def) == null ? void 0 : _b.namespace) == null ? void 0 : _c.includes(".var")) {
+    if ((_e = (_d = (_c = param.meta) == null ? void 0 : _c.def) == null ? void 0 : _d.namespace) == null ? void 0 : _e.includes(".var")) {
       return `${componentNameWithId}_result`;
     }
     return `${componentNameWithId}_result.${param.id}`;
@@ -284,13 +298,16 @@ var getNextValue = (props, config, event) => {
   return nextValue.join(", ");
 };
 var getNextValueWithParam = (param, config, event) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   if (param.type === "params") {
     const params = config.getParams();
     return params[param.id];
   }
+  if (((_b = (_a = param.meta) == null ? void 0 : _a.def) == null ? void 0 : _b.namespace) === "mybricks.core-comlib.frame-input" && param.id === "return") {
+    return getFrameInputValueExpr(param.meta, config, event);
+  }
   const componentNameWithId = getComponentNameWithId(param, config, event);
-  if ((_c = (_b = (_a = param.meta) == null ? void 0 : _a.def) == null ? void 0 : _b.namespace) == null ? void 0 : _c.includes(".var")) {
+  if ((_e = (_d = (_c = param.meta) == null ? void 0 : _c.def) == null ? void 0 : _d.namespace) == null ? void 0 : _e.includes(".var")) {
     return `${componentNameWithId}_result`;
   }
   return `${componentNameWithId}_result.${param.id}`;

package/dist/cjs/utils/style/converter.js

@@ -154,12 +154,7 @@ var convertStyleAryToCss = (styleAry, parentSelector) => {
     let finalSelector = selector.trim();
     if (parentSelector) {
       const prefix2 = `.${parentSelector}`;
-      if (finalSelector.startsWith(">")) {
-        const subSelector = finalSelector.substring(1).trim();
-        finalSelector = `${prefix2} ${subSelector}, ${prefix2}${subSelector}`;
-      } else {
-        finalSelector = `${prefix2} ${finalSelector}, ${prefix2}${finalSelector}`;
-      }
+      finalSelector = `${prefix2} ${finalSelector}, ${prefix2}${finalSelector}`;
     }
     const transformedCss = {};
     Object.entries(css).forEach(([key, value]) => {

package/dist/cjs/utils/templates/index.d.ts

@@ -25,4 +25,5 @@ export declare const getUiComponentCode: (params: {
     };
     depth: number;
     verbose?: boolean;
+    checkIsRoot: () => boolean;
 }) => string;

package/dist/cjs/utils/templates/index.js

@@ -38,6 +38,14 @@ var formatSlotContent = (uiContent, baseIndentSize, renderBodyIndent) => {
 var toPascalCase = (str) => {
   return str.split(/[_-]/).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
 };
+var formatData = (data, isRoot) => {
+  if (!data)
+    return {};
+  if (!isRoot)
+    return data;
+  const delKeys = ["tabBar", "navigationStyle", "navigationBarBackgroundColor", "navigationBarTextStyle", "navigationBarTitleText", "backgroundColorTop", "backgroundColorBottom"];
+  return Object.fromEntries(Object.entries(data).filter(([key]) => !delKeys.includes(key)));
+};
 var getUiComponentCode = (params, config) => {
   const {
     componentName,
@@ -48,6 +56,7 @@ var getUiComponentCode = (params, config) => {
     slotsCode,
     eventHandlers = {}
   } = params;
+  const isRoot = config.checkIsRoot();
   const indent = (0, import__.indentation)(config.codeStyle.indent * config.depth);
   const indent2 = (0, import__.indentation)(config.codeStyle.indent * (config.depth + 1));
   let ui = `${indent}<WithCom`;
@@ -56,7 +65,7 @@ ${indent2}component={${componentName}}`;
   ui += `
 ${indent2}id='${meta.id}'`;
   ui += `
-${indent2}className='${meta.id}'`;
+${indent2}className='${meta.id} mybricks_com'`;
   if (meta.name) {
     ui += `
 ${indent2}name='${meta.name}'`;
@@ -66,7 +75,7 @@ ${indent2}name='${meta.name}'`;
     ui += `
 ${indent2}style={${styleCode}}`;
   }
-  const initialDataCode = dataCode ?? JSON.stringify(props.data || {});
+  const initialDataCode = dataCode ?? JSON.stringify(formatData(props.data, isRoot));
   ui += `
 ${indent2}data={${initialDataCode}}`;
   Object.entries(eventHandlers).forEach(([eventName, handlerCode]) => {
@@ -74,12 +83,10 @@ ${indent2}data={${initialDataCode}}`;
 ${indent2}${eventName}={${handlerCode}}`;
   });
   if (slotsCode) {
-    console.log(`[getUiComponentCode] Component ${meta.id} has slotsCode, length: ${slotsCode.length}`);
     ui += `
 ${indent2}slots={{
 ${slotsCode}${indent2}}}`;
   } else {
-    console.log(`[getUiComponentCode] Component ${meta.id} has NO slotsCode`);
   }
   ui += `
 ${indent}/>`;

package/dist/cjs/utils/templates/renderManager.js

@@ -56,7 +56,9 @@ var RenderManager = class {
       }
       code += `${indent}function ${renderFunctionName}(params: any) {
 `;
-      code += `${indent}${indent2}const { comRefs, outputs } = useAppContext();
+      code += `${indent}${indent2}const { comRefs, $vars, $fxs, appContext } = useAppContext();
+`;
+      code += `${indent}${indent2}const outputs = comRefs.current.$outputs;
 `;
       if (logicCode) {
         code += logicCode.split("\n").map((line) => `${indent}${line}`).join("\n") + "\n";
@@ -99,7 +101,7 @@ var RenderManager = class {
 `;
             code += `${indent}${indent4}get inputs() { return comRefs.current['${child.id}'] },
 `;
-            code += `${indent}${indent4}get outputs() { return outputs.current['${child.id}'] },
+            code += `${indent}${indent4}get outputs() { return outputs['${child.id}'] },
 `;
             code += `${indent}${indent4}jsx: ${varName},
 `;

package/dist/cjs/utils/templates/scene.d.ts

@@ -7,7 +7,8 @@ export declare const genSlotDefineCode: (indent: string) => string;
 /** 生成控制器初始化代码 */
 export declare const genControllerInitCode: (indent: string, providerName: string) => string;
 /** 生成完整的函数组件模板 */
-export declare const genComponentTemplate: ({ componentName, combinedJsCode, renderDefinitions, uiResult, outputsConfig, scopeName, utilsPackageName, isPopup, hasPopups, }: {
+export declare const genComponentTemplate: ({ componentId, componentName, combinedJsCode, renderDefinitions, uiResult, outputsConfig, scopeName, utilsPackageName, isPopup, hasPopups, }: {
+    componentId: string;
     componentName: string;
     combinedJsCode: string;
     renderDefinitions?: string;

package/dist/cjs/utils/templates/scene.js

@@ -31,7 +31,7 @@ var genReactiveDataManager = (indent, utilsPackageName) => {
   return ``;
 };
 var genRootDefineCode = (indent, utilsPackageName, hasJsModules = false) => {
-  let code = `${indent}const {comRefs, appContext} = useAppContext();
+  let code = `${indent}const {comRefs, $vars, $fxs, appContext} = useAppContext();
 `;
   if (hasJsModules) {
     code += `${indent}const comModules = jsModules({ createJSHandle });
@@ -40,7 +40,7 @@ var genRootDefineCode = (indent, utilsPackageName, hasJsModules = false) => {
   return code;
 };
 var genSlotDefineCode = (indent) => {
-  return `${indent}const {comRefs, appContext} = useAppContext();
+  return `${indent}const {comRefs, $vars, $fxs, appContext} = useAppContext();
 `;
 };
 var genControllerInitCode = (indent, providerName) => {
@@ -48,6 +48,7 @@ var genControllerInitCode = (indent, providerName) => {
 `;
 };
 var genComponentTemplate = ({
+  componentId,
   componentName,
   combinedJsCode,
   renderDefinitions = "",
@@ -76,7 +77,7 @@ ${uiResult.split("\n").map((line) => `      ${line}`).join("\n")}
 
 `;
   }
-  code += `export default WithWrapper(${componentName})`;
+  code += `export default WithWrapper("${componentId}", ${componentName})`;
   return code;
 };
 var wrapInEffect = (indent, effectCode) => {

package/dist/esm/abstractEventTypeDef.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstractEventTypeDef.d.ts","sourceRoot":"","sources":["abstractEventTypeDef.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,KAAK,uBAAuB,GAAG,MAAM,CACnC,MAAM,EACN;IACE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAC7B,CAAC;CACH,CACF,CAAC;AAEF,QAAA,MAAM,oBAAoB,4BACC,uBAAuB,UACxC,gBAAgB,WA6EzB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}