@mybricks/to-code-taro 1.1.5 → 1.1.7

package/dist/esm/core/utils/with.js

@@ -1,5 +1,5 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["component", "id", "data", "className", "style"],
@@ -7,14 +7,14 @@ var _excluded = ["component", "id", "data", "className", "style"],
 import React, { useState, useEffect } from 'react';
 // @ts-ignore 运行时由宿主项目提供 @tarojs/components
 import { View } from '@tarojs/components';
-import { useModel, useBindInputs, useBindEvents, subscribePopupRouter, closeActivePopupRouter } from "./index";
+import { useModel, useBindInputs, useBuiltinHandlers, useBindOutputs, subscribePopupRouter, closeActivePopupRouter } from "./index";
 import { useAppCreateContext } from "./useContext";
 import ComContext, { useAppContext } from "./ComContext";
 import { useEnhancedSlots, useResolvedParentSlot } from "./slots";
 // @ts-ignore 运行时由宿主项目提供 @tarojs/taro
 import { useTabItemTap } from '@tarojs/taro';
 export var WithCom = function WithCom(props) {
-  var _comRefs$current, _parentSlot$params;
+  var _parentSlot$params;
   var Component = props.component,
     _props$id = props.id,
     id = _props$id === void 0 ? '' : _props$id,
@@ -39,66 +39,33 @@ export var WithCom = function WithCom(props) {
 
   //数据模型
   var _data = useModel(data || {});
-
-  // 内置通用能力
-  var handlers = {
-    _setStyle: function _setStyle(style) {
-      setDynamicStyle(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), style);
-      });
-    },
-    _setData: function _setData(path, value) {
-      var paths = path.split('.');
-      var current = _data;
-      for (var i = 0; i < paths.length - 1; i++) {
-        if (!current[paths[i]]) current[paths[i]] = {};
-        current = current[paths[i]];
-      }
-      current[paths[paths.length - 1]] = value;
-    }
-  };
-  if (!isPopup) {
-    Object.assign(handlers, {
-      show: function show() {
-        return setShow(true);
-      },
-      hide: function hide() {
-        return setShow(false);
-      },
-      showOrHide: function showOrHide() {
-        return setShow(function (prev) {
-          return !prev;
-        });
-      }
-    });
-  }
-
-  // 绑定输入，传入初始 handlers
-  var inputProxy = useBindInputs(comRefs, id, handlers);
   var _ref = rest,
     rawSlots = _ref.slots,
     parentSlotProp = _ref.parentSlot,
     restProps = _objectWithoutProperties(_ref, _excluded2);
   var parentSlot = useResolvedParentSlot(parentSlotProp);
+  var enhancedSlots = useEnhancedSlots(rawSlots, id);
 
-  // 绑定事件，带上上下文（用于事件流自动封装 id/name）
-  var eventProxy = useBindEvents(restProps, {
+  // ---- inputs ----
+  var handlers = useBuiltinHandlers({
+    data: _data,
+    setDynamicStyle: setDynamicStyle,
+    setShow: setShow,
+    isPopup: isPopup
+  });
+  var inputProxy = useBindInputs(comRefs, id, handlers);
+
+  // ---- outputs ----
+  var outputProxy = useBindOutputs(comRefs, id, restProps, enhancedSlots, {
     id: id,
     name: props.name || id,
     parentSlot: parentSlot
   });
 
-  // 注册 outputs 到注册表（按组件 id）
-  if (comRefs !== null && comRefs !== void 0 && (_comRefs$current = comRefs.current) !== null && _comRefs$current !== void 0 && _comRefs$current.$outputs) {
-    comRefs.current.$outputs[id] = eventProxy;
-  }
-
-  // 鸿蒙规范：确保 comRefs 中挂载的是最新的 inputProxy
-  comRefs.current[id] = inputProxy;
-  var enhancedSlots = useEnhancedSlots(rawSlots, id);
+  // ---- render ----
   var jsx = /*#__PURE__*/React.createElement(Component, _extends({}, restProps, {
     inputs: inputProxy,
-    outputs: eventProxy,
+    outputs: outputProxy,
     slots: enhancedSlots,
     parentSlot: parentSlot,
     data: _data,
@@ -106,8 +73,6 @@ export var WithCom = function WithCom(props) {
     id: id,
     style: style
   }));
-
-  // 鸿蒙化处理：支持 itemWrap 协议
   if (parentSlot !== null && parentSlot !== void 0 && (_parentSlot$params = parentSlot.params) !== null && _parentSlot$params !== void 0 && _parentSlot$params.itemWrap) {
     return parentSlot.params.itemWrap({
       id: id,
@@ -115,11 +80,12 @@ export var WithCom = function WithCom(props) {
       jsx: jsx,
       def: Component.def,
       inputs: inputProxy,
-      outputs: eventProxy,
+      outputs: outputProxy,
       style: style
     });
   }
   return show || isPopup ? /*#__PURE__*/React.createElement(View, {
+    id: id,
     className: className,
     style: _objectSpread(_objectSpread({}, style), dynamicStyle)
   }, jsx, props.children) : null;

package/dist/esm/generate/generateTaroProjectJson.js

@@ -6,6 +6,7 @@ import { handleCommonDir } from "./utils/commonDir";
 import { handleTabBarImages } from "./utils/tabBarImages";
 import { handlePageImages } from "./utils/pageImages";
 import { updateAppConfig } from "./utils/appConfig";
+import { updateCustomTabBar } from "./utils/customTabBar";
 import { genScopedJSModules } from "../utils/logic/genJSModules";
 /**
  * 根据数组生成文件结构 JSON 对象
@@ -143,26 +144,7 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
   handlePageImages(assetsDir, pageImages);
 
   // 替换自定义 Tabbar 配置文件
-  var CUSTOM_TAB_BAR_CONFIG_PATH = "src/custom-tab-bar/mybricks/tabbar-config.ts";
-  var customTabBarItem = files.find(function (item) {
-    return item.type === 'customTabBar';
-  });
-  if (customTabBarItem !== null && customTabBarItem !== void 0 && customTabBarItem.content) {
-    var _mybricksDir$children;
-    var customTabBarDir = ensureDir(srcDir, "src/custom-tab-bar");
-    var mybricksDir = ensureDir(customTabBarDir, "src/custom-tab-bar/mybricks");
-    var tabbarConfigFileIndex = (_mybricksDir$children = mybricksDir.children) === null || _mybricksDir$children === void 0 ? void 0 : _mybricksDir$children.findIndex(function (node) {
-      return node.path === CUSTOM_TAB_BAR_CONFIG_PATH;
-    });
-    if (tabbarConfigFileIndex === -1) {
-      mybricksDir.children.push({
-        path: CUSTOM_TAB_BAR_CONFIG_PATH,
-        content: customTabBarItem.content
-      });
-    } else {
-      mybricksDir.children[tabbarConfigFileIndex].content = customTabBarItem.content;
-    }
-  }
+  updateCustomTabBar(srcDir, files);
 
   // 处理 common 目录下的文件
   handleCommonDir(commonDir, files);

package/dist/esm/generate/utils/appConfig.d.ts

@@ -8,9 +8,9 @@ interface FileNode {
 }
 interface GenerateItem {
     type: string;
-    tabBarConfig?: string;
     meta?: {
         id: string;
+        coms?: Record<string, any>;
     };
     [key: string]: any;
 }

package/dist/esm/generate/utils/appConfig.js

@@ -1,3 +1,5 @@
+import { parseLooseObject } from "./fileNode";
+
 /**
  * app.config.ts 更新工具
  */
@@ -6,25 +8,42 @@
  * 更新 app.config.ts
  */
 export function updateAppConfig(appConfigFile, normalItems, items) {
+  var _appConfigFile$conten;
   if (!appConfigFile.content) {
     return;
   }
-  var content = appConfigFile.content;
+
+  // 提取export default defineAppConfig()里的内容
+  var content = parseLooseObject(((_appConfigFile$conten = appConfigFile.content.match(/defineAppConfig\(([\s\S]*?)\)/)) === null || _appConfigFile$conten === void 0 ? void 0 : _appConfigFile$conten[1]) || '{}');
 
   // 更新 pages 配置（使用 scene id）
   var newPagePaths = normalItems.map(function (item) {
-    return "    'pages/".concat(item.meta.id, "/index'");
-  }).join(',\n');
-  content = content.replace(/pages:\s*\[([\s\S]*?)\]/, "pages: [\n".concat(newPagePaths, "\n  ]"));
+    return "pages/".concat(item.meta.id, "/index");
+  });
+  content.pages = newPagePaths;
+
+  // 提取首页
+  var entryPagePath = '';
+  normalItems.forEach(function (item) {
+    var _Object$values, _item$meta;
+    (_Object$values = Object.values((_item$meta = item.meta) === null || _item$meta === void 0 ? void 0 : _item$meta.coms)) === null || _Object$values === void 0 || _Object$values.forEach(function (com) {
+      var _com$model;
+      if (com !== null && com !== void 0 && com.asRoot && com !== null && com !== void 0 && (_com$model = com.model) !== null && _com$model !== void 0 && (_com$model = _com$model.data) !== null && _com$model !== void 0 && _com$model.isEntryPagePath) {
+        entryPagePath = "pages/".concat(item.meta.id, "/index");
+      }
+    });
+  });
+  if (entryPagePath) {
+    content.entryPagePath = entryPagePath;
+  }
 
   // 添加 TabBar 配置（从 items 中读取）
   var tabBarConfigItem = items.find(function (item) {
     return item.type === 'tabBarConfig';
   });
-  if (tabBarConfigItem !== null && tabBarConfigItem !== void 0 && tabBarConfigItem.tabBarConfig) {
-    content = content.replace(/window:\s*\{([\s\S]*?)\n\s*\}/, function (match) {
-      return "".concat(match, ",\n").concat(tabBarConfigItem.tabBarConfig);
-    });
+  if (tabBarConfigItem !== null && tabBarConfigItem !== void 0 && tabBarConfigItem.content) {
+    var tabBar = parseLooseObject("{".concat(tabBarConfigItem.content, "}"));
+    Object.assign(content, tabBar);
   }
-  appConfigFile.content = content;
+  appConfigFile.content = "export default defineAppConfig(".concat(JSON.stringify(content, null, 2), ")");
 }

package/dist/esm/generate/utils/commonDir.js

@@ -37,4 +37,17 @@ export function handleCommonDir(commonDir, items) {
       content: _fullContent
     });
   }
+
+  // 处理rootConfig
+  var rootConfigItem = items.find(function (item) {
+    return item.type === 'rootConfig';
+  });
+  if (rootConfigItem) {
+    var _fileContent2 = rootConfigItem.content || '{}';
+    var _fullContent2 = "export default ".concat(_fileContent2);
+    commonDir.children.push({
+      path: 'src/common/rootConfig.ts',
+      content: _fullContent2
+    });
+  }
 }

package/dist/esm/generate/utils/customTabBar.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 更新自定义 TabBar 配置文件
+ */
+import { GeneratedFile } from '../../toCodeTaro';
+interface FileNode {
+    path: string;
+    content: string | null;
+    children?: FileNode[];
+}
+export declare function updateCustomTabBar(srcDir: FileNode, files: GeneratedFile[]): void;
+export {};

package/dist/esm/generate/utils/customTabBar.js

@@ -0,0 +1,52 @@
+/**
+ * 更新自定义 TabBar 配置文件
+ */
+
+import { ensureDir } from "./fileNode";
+import { parseLooseObject } from "./fileNode";
+export function updateCustomTabBar(srcDir, files) {
+  var customTabBarDir = ensureDir(srcDir, 'src/custom-tab-bar');
+
+  // 将mybricks的tabbar数据写入/custom-tab-bar/mybricks/tabbar-config.ts
+  var customTabBarItem = files.find(function (item) {
+    return item.type === 'customTabBar';
+  });
+  if (customTabBarItem !== null && customTabBarItem !== void 0 && customTabBarItem.content) {
+    var _mybricksDir$children;
+    var CUSTOM_TAB_BAR_CONFIG_PATH = 'src/custom-tab-bar/mybricks/tabbar-config.ts';
+    var mybricksDir = ensureDir(customTabBarDir, 'src/custom-tab-bar/mybricks');
+    var tabbarConfigFileIndex = (_mybricksDir$children = mybricksDir.children) === null || _mybricksDir$children === void 0 ? void 0 : _mybricksDir$children.findIndex(function (node) {
+      return node.path === CUSTOM_TAB_BAR_CONFIG_PATH;
+    });
+    if (tabbarConfigFileIndex === -1) {
+      mybricksDir.children.push({
+        path: CUSTOM_TAB_BAR_CONFIG_PATH,
+        content: customTabBarItem.content
+      });
+    } else {
+      mybricksDir.children[tabbarConfigFileIndex].content = customTabBarItem.content;
+    }
+  }
+
+  // 将app.config.ts中的tabbar配置写入/custom-tab-bar/tabBar.json
+  // 后续可以用来判断页面是否标签页
+  var tabBarConfigItem = files.find(function (item) {
+    return item.type === 'tabBarConfig';
+  });
+  if (tabBarConfigItem !== null && tabBarConfigItem !== void 0 && tabBarConfigItem.content) {
+    var _customTabBarDir$chil;
+    var contentStr = JSON.stringify(parseLooseObject("{".concat(tabBarConfigItem.content, "}")), null, 2);
+    var tabBarJsonPath = "".concat(customTabBarDir.path, "/tabBar.json");
+    var tabBarJsonIndex = (_customTabBarDir$chil = customTabBarDir.children) === null || _customTabBarDir$chil === void 0 ? void 0 : _customTabBarDir$chil.findIndex(function (node) {
+      return node.path === tabBarJsonPath;
+    });
+    if (tabBarJsonIndex === -1) {
+      customTabBarDir.children.push({
+        path: tabBarJsonPath,
+        content: contentStr
+      });
+    } else {
+      customTabBarDir.children[tabBarJsonIndex].content = contentStr;
+    }
+  }
+}

package/dist/esm/generate/utils/fileNode.d.ts

@@ -14,4 +14,8 @@ export declare function findDir(nodes: FileNode[], targetPath: string): FileNode
  * 确保目录存在，如果不存在则创建
  */
 export declare function ensureDir(parentDir: FileNode, dirPath: string): FileNode;
+/**
+ * 解析宽松格式的对象字符串
+ */
+export declare function parseLooseObject(raw: string): any;
 export {};

package/dist/esm/generate/utils/fileNode.js

@@ -1,4 +1,6 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import { runInNewContext } from 'node:vm';
+
 /**
  * 文件节点相关工具函数
  */
@@ -46,4 +48,15 @@ export function ensureDir(parentDir, dirPath) {
   }
   dir.children = dir.children || [];
   return dir;
+}
+
+/**
+ * 解析宽松格式的对象字符串
+ */
+export function parseLooseObject(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch (_unused) {
+    return runInNewContext("(".concat(raw, ")"), Object.create(null));
+  }
 }

package/dist/esm/handleCom.js

@@ -17,10 +17,9 @@ import { handleProcess } from "./utils/logic/handleProcess";
 var COM_PROTOCOL = {
   "mybricks.taro.formContainer": {
     useWrap: true
-  },
-  "mybricks.taro.formAdditionContainer": {
-    useWrap: true
   }
+  // 移除 FormAdditionContainer 的配置，因为它的 runtime 没有传递 wrap 函数
+  // "mybricks.taro.formAdditionContainer": { useWrap: true },
 };
 
 /**
@@ -127,15 +126,11 @@ var prepareComponent = function prepareComponent(com, config) {
  * 准备样式转换
  */
 var prepareStyles = function prepareStyles(com) {
-  var _props$data, _props$style, _props$style2;
+  var _props$style;
   var meta = com.meta,
     props = com.props;
-  // 鸿蒙化：合并 data.layout 到样式中，确保容器布局生效
-  var styleWithLayout = _objectSpread(_objectSpread({}, props.style || {}), {}, {
-    layout: ((_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.layout) || ((_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.layout)
-  });
-  var resultStyle = convertComponentStyle(styleWithLayout);
-  var cssContent = convertStyleAryToCss((_props$style2 = props.style) === null || _props$style2 === void 0 ? void 0 : _props$style2.styleAry, meta.id);
+  var resultStyle = convertComponentStyle(props.style || {});
+  var cssContent = convertStyleAryToCss((_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.styleAry, meta.id);
   return {
     cssContent: cssContent,
     rootStyle: resultStyle.root || {}
@@ -162,15 +157,23 @@ var processComSlots = function processComSlots(com, config, initialCss) {
   var renderManager = config.renderManager || new RenderManager();
   var slotEntries = Object.entries(slots);
   slotEntries.forEach(function (_ref2, index) {
-    var _com$props$data, _props$data2, _COM_PROTOCOL$meta$de;
+    var _config$getEffectEven, _effectEvent$process, _effectEvent$process2, _com$props$data, _props$data, _COM_PROTOCOL$meta$de;
     var _ref3 = _slicedToArray(_ref2, 2),
       slotId = _ref3[0],
       slot = _ref3[1];
-    // 鸿蒙规范：如果插槽内没有组件，直接渲染空
     var children = slot.comAry || slot.children || [];
     var isLast = index === slotEntries.length - 1;
     var slotIndent = indentation(config.codeStyle.indent * (config.depth + 2));
-    if (children.length === 0) {
+
+    // 检查是否有插槽级别的 effectEvent（即使 children 为空也可能有逻辑代码）
+    var effectEvent = (_config$getEffectEven = config.getEffectEvent) === null || _config$getEffectEven === void 0 ? void 0 : _config$getEffectEven.call(config, {
+      comId: meta.id,
+      slotId: slotId
+    });
+    var hasSlotLogic = effectEvent && (((_effectEvent$process = effectEvent.process) === null || _effectEvent$process === void 0 || (_effectEvent$process = _effectEvent$process.nodesDeclaration) === null || _effectEvent$process === void 0 ? void 0 : _effectEvent$process.length) > 0 || ((_effectEvent$process2 = effectEvent.process) === null || _effectEvent$process2 === void 0 || (_effectEvent$process2 = _effectEvent$process2.nodesInvocation) === null || _effectEvent$process2 === void 0 ? void 0 : _effectEvent$process2.length) > 0);
+
+    // 如果插槽内没有组件且没有逻辑代码，直接渲染空
+    if (children.length === 0 && !hasSlotLogic) {
       slotsCode += "".concat(slotIndent).concat(slotId, ": {\n").concat(slotIndent, "  render: () => null\n").concat(slotIndent, "}").concat(isLast ? '' : ',', "\n");
       return;
     }
@@ -198,9 +201,9 @@ var processComSlots = function processComSlots(com, config, initialCss) {
     var rawContent = result.ui;
 
     // 鸿蒙化处理：针对表单容器进行别名对齐
-    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_props$data2 = props.data) === null || _props$data2 === void 0 ? void 0 : _props$data2.items) && result.directChildren) {
-      var _props$data3;
-      var items = (_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : _props$data3.items;
+    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.items) && result.directChildren) {
+      var _props$data2;
+      var items = (_props$data2 = props.data) === null || _props$data2 === void 0 ? void 0 : _props$data2.items;
       result.directChildren.forEach(function (childRes) {
         var itemConfig = items.find(function (it) {
           return it.id === childRes.id;
@@ -248,7 +251,7 @@ var processComSlots = function processComSlots(com, config, initialCss) {
  * 生成插槽内部的驱动逻辑 (useEffect 监听 inputValues 并调用子组件 inputs)
  */
 var buildSlotLogicCode = function buildSlotLogicCode(args) {
-  var _config$getEffectEven;
+  var _config$getEffectEven2;
   var parentComId = args.parentComId,
     slotKey = args.slotKey,
     config = args.config;
@@ -257,7 +260,7 @@ var buildSlotLogicCode = function buildSlotLogicCode(args) {
 
   // 更直接：用 to-code-react 已经解析好的“effect event”（底层来自 diagrams[].conAry）
   // buildSlotLogicCode 只负责包一层 useEffect，不再自己扫描/猜测 cons/pinValueProxies
-  var effectEvent = (_config$getEffectEven = config.getEffectEvent) === null || _config$getEffectEven === void 0 ? void 0 : _config$getEffectEven.call(config, {
+  var effectEvent = (_config$getEffectEven2 = config.getEffectEvent) === null || _config$getEffectEven2 === void 0 ? void 0 : _config$getEffectEven2.call(config, {
     comId: parentComId,
     slotId: slotKey
   });
@@ -277,7 +280,7 @@ var buildSlotLogicCode = function buildSlotLogicCode(args) {
     getParams: function getParams() {
       return paramsProxy;
     }
-  })).replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
+  })).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
   if (!process.trim()) return "";
   var code = "".concat(indent, "useEffect(() => {\n");
   code += "".concat(indent2, "if (!params?.inputValues) return;\n");
@@ -320,10 +323,10 @@ var generateUiCode = function generateUiCode(com, config, componentName, rootSty
  * JS 计算组件专用处理
  */
 var handleJsCalculation = function handleJsCalculation(com, config) {
-  var _props$data4, _props$data5, _props$data6;
+  var _props$data3, _props$data4, _props$data5;
   var meta = com.meta,
     props = com.props;
-  var transformCode = ((_props$data4 = props.data) === null || _props$data4 === void 0 || (_props$data4 = _props$data4.fns) === null || _props$data4 === void 0 ? void 0 : _props$data4.code) || ((_props$data5 = props.data) === null || _props$data5 === void 0 || (_props$data5 = _props$data5.fns) === null || _props$data5 === void 0 ? void 0 : _props$data5.transformCode) || ((_props$data6 = props.data) === null || _props$data6 === void 0 ? void 0 : _props$data6.fns);
+  var transformCode = ((_props$data3 = props.data) === null || _props$data3 === void 0 || (_props$data3 = _props$data3.fns) === null || _props$data3 === void 0 ? void 0 : _props$data3.code) || ((_props$data4 = props.data) === null || _props$data4 === void 0 || (_props$data4 = _props$data4.fns) === null || _props$data4 === void 0 ? void 0 : _props$data4.transformCode) || ((_props$data5 = props.data) === null || _props$data5 === void 0 ? void 0 : _props$data5.fns);
   if (transformCode && config.addJSModule) {
     var _meta$model, _meta$model2;
     config.addJSModule({

package/dist/esm/handleGlobal.d.ts

@@ -1,5 +1,5 @@
 /**
- * 处理全局变量和全局Fx
+ * 处理全局变量、全局Fx、其他全局配置
  */
 import type { ToTaroCodeConfig, GeneratedFile } from "./toCodeTaro";
 interface HandleGlobalParams {

package/dist/esm/handleGlobal.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
- * 处理全局变量和全局Fx
+ * 处理全局变量、全局Fx、其他全局配置
  */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -124,6 +124,11 @@ var handleGlobal = function handleGlobal(params, config) {
     });
   }
   return [{
+    type: "rootConfig",
+    content: JSON.stringify(tojson.rootConfig, null, 2),
+    importManager: null,
+    name: "rootConfig"
+  }, {
     type: "global",
     content: varCode + "\n\n" + fxCode,
     importManager: globalImportManager,

package/dist/esm/handleSlot.js

@@ -145,12 +145,10 @@ var generateSlotUi = function generateSlotUi(ui, props, childrenUi, childrenResu
     width: "100%",
     height: "100%"
   }, slotStyle), propsStyle);
-
-  // 鸿蒙化：优先使用 config 中传递的 layout（来自父容器 data.layout），否则使用 slot 自身的 layout
-  var layout = config.layout || ui.layout || mergedStyle.layout;
+  var layout = ui.layout || mergedStyle.layout;
   var smart = isSmartLayout(layout);
   var layoutAdjustment = smart ? {
-    position: isHasInSmartLayout(childrenResults) ? "fixed" : "relative"
+    position: "relative"
   } : hasFixedChildren(childrenResults) ? {
     transform: "translateX(0)"
   } : {};
@@ -161,10 +159,13 @@ var generateSlotUi = function generateSlotUi(ui, props, childrenUi, childrenResu
   // 插槽根容器增强：加上可读的标识，便于用户定位/调试
   // - className: slot-<parentComId>
   var parentComId = config === null || config === void 0 ? void 0 : config.parentComId;
-  var slotMarkClass = parentComId ? "slot-".concat(parentComId) : "";
+  var slotMarkClass = parentComId ? "mybricks_slot slot-".concat(parentComId) : "";
   var classNameStr = [rootClassName, slotMarkClass].filter(Boolean).join(" ");
   var classNameAttr = classNameStr ? " className='".concat(classNameStr, "'") : "";
-  return "".concat(indent, "<View").concat(classNameAttr, " style={").concat(styleCode, "}>\n").concat(childrenUi, "\n").concat(indent, "</View>");
+
+  // 支持通过 params.style 传递额外样式
+  var styleAttr = slotMarkClass ? "style={{...params.style || {}, ...".concat(styleCode, "}}") : "style={".concat(styleCode, "}");
+  return "".concat(indent, "<View").concat(classNameAttr, " ").concat(styleAttr, ">\n").concat(childrenUi, "\n").concat(indent, "</View>");
 };
 
 /**
@@ -208,10 +209,4 @@ var hasFixedChildren = function hasFixedChildren(childrenResults) {
 var isSmartLayout = function isSmartLayout(layout) {
   return layout === "smart" || (layout === null || layout === void 0 ? void 0 : layout.position) === "smart";
 };
-var isHasInSmartLayout = function isHasInSmartLayout(childrenResults) {
-  return childrenResults.some(function (item) {
-    var _item$rootStyle2;
-    return (item === null || item === void 0 || (_item$rootStyle2 = item.rootStyle) === null || _item$rootStyle2 === void 0 ? void 0 : _item$rootStyle2.inSmartLayout) === true;
-  });
-};
 export default handleSlot;

package/dist/esm/processors/processScene.js

@@ -10,6 +10,23 @@ import { RenderManager } from "../utils/templates/renderManager";
 import { createProvider, createProviderMap } from "../utils/context/createProvider";
 import { createEventQueries } from "../utils/context/createEventQueries";
 import { collectJSModulesFromScene, extractJSModuleFromCom } from "../utils/context/collectJSModules";
+/**
+ * 获取需要调用的路由方法名
+ */
+var getCallMethodName = function getCallMethodName(com, pinId, isTargetPopup) {
+  var _com$model;
+  // 不是 open 方法，或者是弹窗，直接返回 pinId
+  if (pinId !== 'open' || isTargetPopup) return pinId;
+
+  // 页面跳转类型映射
+  var OPEN_TYPE_MAP = {
+    'blank': 'open',
+    'redirect': 'replace'
+  };
+  var openType = com === null || com === void 0 || (_com$model = com.model) === null || _com$model === void 0 || (_com$model = _com$model.data) === null || _com$model === void 0 ? void 0 : _com$model.openType;
+  return OPEN_TYPE_MAP[openType] || openType || pinId;
+};
+
 /**
  * 处理单个场景
  */
@@ -76,7 +93,7 @@ export var processScene = function processScene(params) {
     var scanComs = function scanComs(coms) {
       if (!Array.isArray(coms)) return;
       coms.forEach(function (com) {
-        var _com$def, _com$model;
+        var _com$def, _com$model2;
         if (com.name) dslComIdToNameMap[com.id] = com.name;
         if (com.slots) {
           var slotList = Array.isArray(com.slots) ? com.slots : Object.values(com.slots);
@@ -86,7 +103,7 @@ export var processScene = function processScene(params) {
           });
         }
         // 特殊处理表单容器
-        if (((_com$def = com.def) === null || _com$def === void 0 ? void 0 : _com$def.namespace) === 'mybricks.taro.formContainer' && (_com$model = com.model) !== null && _com$model !== void 0 && (_com$model = _com$model.data) !== null && _com$model !== void 0 && _com$model.items) {
+        if (((_com$def = com.def) === null || _com$def === void 0 ? void 0 : _com$def.namespace) === 'mybricks.taro.formContainer' && (_com$model2 = com.model) !== null && _com$model2 !== void 0 && (_com$model2 = _com$model2.data) !== null && _com$model2 !== void 0 && _com$model2.items) {
           com.model.data.items.forEach(function (item) {
             if (item.comName) dslComIdToNameMap[item.id] = item.comName;
           });
@@ -123,10 +140,13 @@ export var processScene = function processScene(params) {
         var isOutput = targetScene === null || targetScene === void 0 || (_targetScene$outputs = targetScene.outputs) === null || _targetScene$outputs === void 0 ? void 0 : _targetScene$outputs.some(function (pin) {
           return pin.id === pinId;
         });
+
+        // 调用的方法名
+        var callMethodName = getCallMethodName(com, pinId, isTargetPopup);
         if (isInput || isOutput) {
           var _config$getPageId;
           return {
-            code: "".concat(routerName, ".").concat(pinId, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, sceneId)) || sceneId, "\"").concat(args ? ", ".concat(args) : "", ")"),
+            code: "".concat(routerName, ".").concat(callMethodName, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, sceneId)) || sceneId, "\"").concat(args ? ", ".concat(args) : "", ")"),
             import: {
               packageName: config.getComponentPackageName(),
               dependencyNames: [routerName],

package/dist/esm/processors/processSceneLogic.js

@@ -59,7 +59,7 @@ var processVarEvents = function processVarEvents(currentScene, config, addDepend
   };
   addDependencyImport({
     packageName: config.getUtilsPackageName(importParams),
-    dependencyNames: ["SUBJECT_SUBSCRIBE", "SUBJECT_VALUE"],
+    dependencyNames: ["SUBJECT_SUBSCRIBE"],
     importType: "named"
   });
   varEvents.forEach(function (varEvent) {
@@ -87,11 +87,9 @@ var processVarEvents = function processVarEvents(currentScene, config, addDepend
     })).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
     if (!process.trim()) return;
     code += "\n".concat(indent, "  /** \u53D8\u91CF ").concat(sanitizeBlockComment(com.title || varName), " \u7684 ").concat(pinId, " */");
-    // 统一逻辑函数：changed 触发 + 首次 get() 回放（解决“set 早于订阅”的丢事件）
+    // 订阅变量的 changed 事件
     code += "\n".concat(indent, "  const run_").concat(varName, "_").concat(pinId, " = (value: any) => {\n").concat(process, "\n").concat(indent, "  };");
     code += "\n".concat(indent, "  $vars.current.").concat(varName, ".").concat(pinId, "?.()[SUBJECT_SUBSCRIBE](run_").concat(varName, "_").concat(pinId, ");");
-    code += "\n".concat(indent, "  const init_").concat(varName, "_").concat(pinId, " = $vars.current.").concat(varName, ".get?.();");
-    code += "\n".concat(indent, "  run_").concat(varName, "_").concat(pinId, "(init_").concat(varName, "_").concat(pinId, "?.[SUBJECT_VALUE]);");
   });
   return code;
 };
@@ -239,7 +237,7 @@ var processSceneInputs = function processSceneInputs(currentScene, config, addDe
           importType: "named"
         });
         // 使用 SUBJECT_SUBSCRIBE 订阅，不修改 Subject.js
-        code += "\n".concat(indent, "  ").concat(controllerName, ".getParams(\"").concat(currentScene.id, "\")[SUBJECT_SUBSCRIBE]((val: any) => {\n").concat(indent, "    if (val) inputs.open(val);\n").concat(indent, "  });");
+        code += "\n".concat(indent, "  ").concat(controllerName, ".getParams(\"").concat(currentScene.id, "\")[SUBJECT_SUBSCRIBE]((val: any) => {\n").concat(indent, "    inputs.open(val);\n").concat(indent, "  });");
       }
     }
   });