@mybricks/to-code-taro 1.0.7 → 1.1.0

package/dist/cjs/core/comlib/_Modal.js

@@ -0,0 +1,68 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/core/comlib/_Modal.ts
+var Modal_exports = {};
+__export(Modal_exports, {
+  default: () => Modal_default
+});
+module.exports = __toCommonJS(Modal_exports);
+var import_taro = __toESM(require("@tarojs/taro"));
+var Modal_default = (context) => {
+  var _a;
+  const data = context.data;
+  const inputs = context.inputs;
+  const outputs = context.outputs;
+  (_a = inputs.show) == null ? void 0 : _a.call(inputs, async (val) => {
+    var _a2, _b, _c;
+    try {
+      const cfg = typeof val === "string" ? { content: val } : val || {};
+      const modalConfig = {
+        title: cfg.title ?? data.title ?? "",
+        content: cfg.content ?? data.content ?? "",
+        showCancel: cfg.showCancel ?? data.showCancel ?? true,
+        cancelText: cfg.cancelText ?? data.cancelText ?? "取消",
+        cancelColor: cfg.cancelColor ?? data.cancelColor,
+        confirmText: cfg.confirmText ?? data.confirmText ?? "确认",
+        confirmColor: cfg.confirmColor ?? data.confirmColor
+      };
+      if (cfg.editable !== void 0)
+        modalConfig.editable = cfg.editable;
+      else if (data.editable !== void 0)
+        modalConfig.editable = data.editable;
+      const res = await import_taro.default.showModal(modalConfig);
+      if (res == null ? void 0 : res.confirm)
+        (_a2 = outputs.onConfirm) == null ? void 0 : _a2.call(outputs, res);
+      else
+        (_b = outputs.onCancel) == null ? void 0 : _b.call(outputs, res);
+    } catch (error) {
+      console.error("显示 Modal 失败:", error);
+      (_c = outputs.onCancel) == null ? void 0 : _c.call(outputs, error);
+    }
+  });
+};

package/dist/cjs/core/comlib/_TimerDelay.js

@@ -23,41 +23,66 @@ __export(TimerDelay_exports, {
 });
 module.exports = __toCommonJS(TimerDelay_exports);
 var TimerDelay_default = (context) => {
-  var _a, _b;
+  var _a, _b, _c;
   const data = context.data;
   const inputs = context.inputs;
   const outputs = context.outputs;
   let timeoutId = null;
-  (_a = inputs.delay) == null ? void 0 : _a.call(inputs, (val) => {
-    try {
-      const delay = (val == null ? void 0 : val.delay) || data.delay || 1e3;
-      if (timeoutId) {
-        clearTimeout(timeoutId);
+  const inputPins = new Set(Object.keys(inputs));
+  const outputPins = new Set(Object.keys(outputs));
+  const hasIn = (pin) => inputPins.has(pin);
+  const hasOut = (pin) => outputPins.has(pin);
+  const clear = () => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+      timeoutId = null;
+    }
+  };
+  if (hasIn("trigger"))
+    (_a = inputs.trigger) == null ? void 0 : _a.call(inputs, (payload) => {
+      var _a2;
+      try {
+        const delay = (payload == null ? void 0 : payload.delay) || data.delay || 1e3;
+        clear();
+        (_a2 = outputs.onStart) == null ? void 0 : _a2.call(outputs, { delay, timestamp: Date.now() });
+        timeoutId = setTimeout(() => {
+          var _a3, _b2;
+          if (hasOut("trigger"))
+            (_a3 = outputs.trigger) == null ? void 0 : _a3.call(outputs, payload);
+          (_b2 = outputs.onExecute) == null ? void 0 : _b2.call(outputs, { delay, timestamp: Date.now() });
+          timeoutId = null;
+        }, delay);
+      } catch (error) {
+        console.error("延迟执行失败:", error);
+        clear();
       }
-      outputs.onStart({ delay, timestamp: Date.now() });
-      timeoutId = setTimeout(() => {
-        outputs.onExecute({ delay, timestamp: Date.now() });
-        timeoutId = null;
-      }, delay);
-    } catch (error) {
-      console.error("延迟执行失败:", error);
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-        timeoutId = null;
+    });
+  if (hasIn("delay"))
+    (_b = inputs.delay) == null ? void 0 : _b.call(inputs, (val) => {
+      try {
+        const delay = (val == null ? void 0 : val.delay) || data.delay || 1e3;
+        clear();
+        outputs.onStart({ delay, timestamp: Date.now() });
+        timeoutId = setTimeout(() => {
+          outputs.onExecute({ delay, timestamp: Date.now() });
+          timeoutId = null;
+        }, delay);
+      } catch (error) {
+        console.error("延迟执行失败:", error);
+        clear();
       }
-    }
-  });
-  (_b = inputs.cancel) == null ? void 0 : _b.call(inputs, () => {
-    try {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-        timeoutId = null;
-        outputs.onCancel("延迟任务已取消");
-      } else {
-        outputs.onCancel("没有正在执行的延迟任务");
+    });
+  if (hasIn("cancel"))
+    (_c = inputs.cancel) == null ? void 0 : _c.call(inputs, () => {
+      try {
+        if (timeoutId) {
+          clear();
+          outputs.onCancel("延迟任务已取消");
+        } else {
+          outputs.onCancel("没有正在执行的延迟任务");
+        }
+      } catch (error) {
+        console.error("取消延迟失败:", error);
       }
-    } catch (error) {
-      console.error("取消延迟失败:", error);
-    }
-  });
+    });
 };

package/dist/cjs/core/comlib/index.js

@@ -40,6 +40,7 @@ __export(comlib_exports, {
   mybricks_taro_getLocation: () => import_GetLocation.default,
   mybricks_taro_getStorage: () => import_GetStorage.default,
   mybricks_taro_getSystemInfo: () => import_GetSystemInfo.default,
+  mybricks_taro_modal: () => import_Modal.default,
   mybricks_taro_openCamera: () => import_OpenCamera.default,
   mybricks_taro_openPetalMap: () => import_OpenPetalMap.default,
   mybricks_taro_openUrl: () => import_OpenUrl.default,
@@ -69,6 +70,7 @@ var import_OpenUrl = __toESM(require("./_OpenUrl"));
 var import_Share = __toESM(require("./_Share"));
 var import_GetSystemInfo = __toESM(require("./_GetSystemInfo"));
 var import_AesEncode = __toESM(require("./_AesEncode"));
+var import_Modal = __toESM(require("./_Modal"));
 var import_Format = __toESM(require("./_Format"));
 var import_ChooseFile = __toESM(require("./_ChooseFile"));
 var import_ChooseMedia = __toESM(require("./_ChooseMedia"));
@@ -94,6 +96,7 @@ var import_TimerThrottle = __toESM(require("./_TimerThrottle"));
   mybricks_taro_getLocation,
   mybricks_taro_getStorage,
   mybricks_taro_getSystemInfo,
+  mybricks_taro_modal,
   mybricks_taro_openCamera,
   mybricks_taro_openPetalMap,
   mybricks_taro_openUrl,

package/dist/cjs/core/mybricks/log.js

@@ -24,7 +24,6 @@ __export(log_exports, {
 });
 module.exports = __toCommonJS(log_exports);
 var log = (...args) => {
-  console.log("[MyBricks]", ...args);
 };
 var logger = {
   info: log,

package/dist/cjs/core/utils/hooks.js

@@ -97,10 +97,11 @@ function useBindEvents(props, context) {
   return (0, import_react.useMemo)(() => {
     const _events = {};
     Object.keys(props).forEach((key) => {
-      if (key.startsWith("on") && typeof props[key] === "function") {
+      if (typeof props[key] === "function") {
         const handler = props[key];
         const wrapped = (originalValue) => {
-          const value = context ? {
+          var _a, _b;
+          const value = ((_b = (_a = context == null ? void 0 : context.parentSlot) == null ? void 0 : _a.params) == null ? void 0 : _b.itemWrap) ? {
             id: context.id,
             name: context.name,
             value: originalValue

package/dist/cjs/core/utils/slots.js

@@ -37,6 +37,14 @@ module.exports = __toCommonJS(slots_exports);
 var import_react = __toESM(require("react"));
 var import_ComContext = __toESM(require("./ComContext"));
 var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
+function SlotParamsBridge(props) {
+  var _a, _b;
+  const parentSlot = (0, import_ComContext.useParentSlot)();
+  const mergedParams = ((_a = props.params) == null ? void 0 : _a.inputValues) === void 0 && ((_b = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _b.inputValues) ? { ...props.params || {}, inputValues: parentSlot.params.inputValues } : props.params;
+  const SlotComp = props.render;
+  const content = SlotComp ? /* @__PURE__ */ import_react.default.createElement(SlotComp, { ...mergedParams || {} }) : props.children ?? null;
+  return /* @__PURE__ */ import_react.default.createElement(import_ComContext.SlotProvider, { value: { ...props.state, params: mergedParams } }, content);
+}
 function createChannelProxy(title) {
   const handlersMap = {};
   return new Proxy(
@@ -79,14 +87,12 @@ function useEnhancedSlots(rawSlots, id) {
           var _a, _b, _c, _d;
           const r = state._render;
           const rawScope = (params == null ? void 0 : params.key) ?? ((_a = params == null ? void 0 : params.inputValues) == null ? void 0 : _a.index) ?? ((_c = (_b = params == null ? void 0 : params.inputValues) == null ? void 0 : _b.itemData) == null ? void 0 : _c.id);
-          const SlotComp = r;
-          const content = r ? /* @__PURE__ */ import_react.default.createElement(SlotComp, { ...params || {} }) : null;
           if (rawScope === void 0 || rawScope === null) {
-            return /* @__PURE__ */ import_react.default.createElement(import_ComContext.SlotProvider, { value: { ...state, params } }, content);
+            return /* @__PURE__ */ import_react.default.createElement(SlotParamsBridge, { state, params, render: r });
           }
           const scopeId = `${id}.${slotKey}::${String(rawScope)}`;
-          const scopedComRefs = (_d = state._scopedComRefs)[scopeId] || (_d[scopeId] = { current: { $inputs: {} } });
-          return /* @__PURE__ */ import_react.default.createElement(import_ComContext.SlotProvider, { value: { ...state, params } }, /* @__PURE__ */ import_react.default.createElement(ScopedComContextProvider, { comRefs: scopedComRefs, scopeId }, content));
+          const scopedComRefs = (_d = state._scopedComRefs)[scopeId] || (_d[scopeId] = { current: { $inputs: {}, $outputs: {} } });
+          return /* @__PURE__ */ import_react.default.createElement(import_ComContext.SlotProvider, { value: { ...state, params } }, /* @__PURE__ */ import_react.default.createElement(ScopedComContextProvider, { comRefs: scopedComRefs, scopeId }, /* @__PURE__ */ import_react.default.createElement(SlotParamsBridge, { state, params, render: r })));
         }
       });
       state._render = slotDef == null ? void 0 : slotDef.render;

package/dist/cjs/core/utils/useContext.js

@@ -25,8 +25,9 @@ module.exports = __toCommonJS(useContext_exports);
 var import_react = require("react");
 var import_hooks = require("./hooks");
 function useAppCreateContext() {
-  const comRefs = (0, import_react.useRef)((0, import_hooks.deepProxy)({ $inputs: {} }));
-  const outputs = (0, import_react.useRef)((0, import_hooks.deepProxy)({}));
+  const comRefs = (0, import_react.useRef)((0, import_hooks.deepProxy)({ $inputs: {}, $outputs: {} }));
+  const $vars = (0, import_react.useRef)({});
+  const $fxs = (0, import_react.useRef)({});
   const [popupState, setPopupState] = (0, import_react.useState)({
     visible: false,
     name: "",
@@ -54,7 +55,8 @@ function useAppCreateContext() {
   }).current;
   return (0, import_react.useMemo)(() => ({
     comRefs,
-    outputs,
+    $vars,
+    $fxs,
     appContext,
     popupState,
     setPopupState

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

@@ -41,8 +41,8 @@ var import_ComContext = __toESM(require("./ComContext"));
 var import_slots = require("./slots");
 var import_taro = require("@tarojs/taro");
 var WithCom = (props) => {
-  var _a;
-  const { component: Component, id = "", data, className, style, inputValues, inputValuesMapping, ...rest } = props;
+  var _a, _b;
+  const { component: Component, id = "", data, className, style, ...rest } = props;
   const { comRefs, appContext } = (0, import_ComContext.useAppContext)();
   const env = appContext;
   const isPopup = Component.isPopup;
@@ -73,15 +73,14 @@ var WithCom = (props) => {
   }
   const inputProxy = (0, import_index.useBindInputs)(comRefs, id, handlers);
   const { slots: rawSlots, parentSlot: parentSlotProp, ...restProps } = rest;
-  const { outputs: globalOutputs } = (0, import_ComContext.useAppContext)();
   const parentSlot = (0, import_slots.useResolvedParentSlot)(parentSlotProp);
   const eventProxy = (0, import_index.useBindEvents)(restProps, {
     id,
     name: props.name || id,
     parentSlot
   });
-  if (globalOutputs && globalOutputs.current) {
-    globalOutputs.current[id] = eventProxy;
+  if ((_a = comRefs == null ? void 0 : comRefs.current) == null ? void 0 : _a.$outputs) {
+    comRefs.current.$outputs[id] = eventProxy;
   }
   comRefs.current[id] = inputProxy;
   const enhancedSlots = (0, import_slots.useEnhancedSlots)(rawSlots, id);
@@ -99,7 +98,7 @@ var WithCom = (props) => {
       style
     }
   );
-  if ((_a = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _a.itemWrap) {
+  if ((_b = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _b.itemWrap) {
     return parentSlot.params.itemWrap({
       id,
       name: props.name || id,

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -39,7 +39,7 @@ var import_commonDir = require("./utils/commonDir");
 var import_tabBarImages = require("./utils/tabBarImages");
 var import_appConfig = require("./utils/appConfig");
 var generateTaroProjectJson = (result) => {
-  var _a;
+  var _a, _b;
   const { files = [], assets = {} } = result;
   const templateJsonPath = path.join(__dirname, "../taro-template.json");
   if (!fs.existsSync(templateJsonPath)) {
@@ -121,6 +121,23 @@ ${item.content || ""}`;
     (0, import_appConfig.updateAppConfig)(appConfigFile, normalItems, files);
   }
   (0, import_tabBarImages.handleTabBarImages)(tabbarDir, imageFiles);
+  const CUSTOM_TAB_BAR_CONFIG_PATH = "src/custom-tab-bar/mybricks/tabbar-config.ts";
+  const customTabBarItem = files.find((item) => item.type === "customTabBar");
+  if (customTabBarItem.content) {
+    const customTabBarDir = (0, import_fileNode.ensureDir)(srcDir, "src/custom-tab-bar");
+    const mybricksDir = (0, import_fileNode.ensureDir)(customTabBarDir, "src/custom-tab-bar/mybricks");
+    const tabbarConfigFileIndex = (_b = mybricksDir.children) == null ? void 0 : _b.findIndex(
+      (node) => 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;
+    }
+  }
   (0, import_commonDir.handleCommonDir)(commonDir, files);
   const popupFile = files.find((f) => f.type === "popup" && !f.meta);
   if (popupFile) {

package/dist/cjs/handleCom.js

@@ -39,6 +39,7 @@ var import_component = require("./utils/templates/component");
 var import_renderManager = require("./utils/templates/renderManager");
 var import_handleSlot = __toESM(require("./handleSlot"));
 var import_processComEvents = require("./processors/processComEvents");
+var import_handleProcess = require("./utils/logic/handleProcess");
 var COM_PROTOCOL = {
   "mybricks.taro.formContainer": { useWrap: true },
   "mybricks.taro.formAdditionContainer": { useWrap: true }
@@ -93,10 +94,14 @@ var prepareComponent = (com, config) => {
   };
 };
 var prepareStyles = (com) => {
-  var _a;
+  var _a, _b, _c;
   const { meta, props } = com;
-  const resultStyle = (0, import_converter.convertComponentStyle)(props.style);
-  const cssContent = (0, import_converter.convertStyleAryToCss)((_a = props.style) == null ? void 0 : _a.styleAry, meta.id);
+  const styleWithLayout = {
+    ...props.style || {},
+    layout: ((_a = props.data) == null ? void 0 : _a.layout) || ((_b = props.style) == null ? void 0 : _b.layout)
+  };
+  const resultStyle = (0, import_converter.convertComponentStyle)(styleWithLayout);
+  const cssContent = (0, import_converter.convertStyleAryToCss)((_c = props.style) == null ? void 0 : _c.styleAry, meta.id);
   return { cssContent, rootStyle: resultStyle.root || {} };
 };
 var processComSlots = (com, config, initialCss) => {
@@ -110,17 +115,20 @@ var processComSlots = (com, config, initialCss) => {
   const renderManager = config.renderManager || new import_renderManager.RenderManager();
   const slotEntries = Object.entries(slots);
   slotEntries.forEach(([slotId, slot], index) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const children = slot.comAry || slot.children || [];
     if (children.length === 0) {
       return;
     }
+    const slotLayout = (_a = com.props.data) == null ? void 0 : _a.layout;
     const result = (0, import_handleSlot.default)(slot, {
       ...config,
       checkIsRoot: () => false,
       depth: 1,
       renderManager,
-      slotKey: slotId
+      slotKey: slotId,
+      // 鸿蒙化：传递父容器的布局配置给插槽
+      layout: slotLayout
     });
     eventCode += result.js;
     if (result.cssContent) {
@@ -130,8 +138,8 @@ var processComSlots = (com, config, initialCss) => {
     const baseIndentSize = config.codeStyle.indent;
     const renderBodyIndent = (0, import_templates.indentation)(config.codeStyle.indent * 2);
     const formattedContent = (0, import_templates.formatSlotContent)(result.ui, baseIndentSize, renderBodyIndent);
-    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_a = props.data) == null ? void 0 : _a.items) && result.childrenResults) {
-      const items = (_b = props.data) == null ? void 0 : _b.items;
+    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_b = props.data) == null ? void 0 : _b.items) && result.childrenResults) {
+      const items = (_c = props.data) == null ? void 0 : _c.items;
       result.childrenResults.forEach((childRes) => {
         const itemConfig = items.find((it) => it.id === childRes.id);
         if (itemConfig == null ? void 0 : itemConfig.comName) {
@@ -139,7 +147,12 @@ var processComSlots = (com, config, initialCss) => {
         }
       });
     }
-    const logicCode = buildSlotLogicCode(slotId, result.childrenResults, config);
+    const logicCode = buildSlotLogicCode({
+      parentComId: meta.id,
+      slotKey: slotId,
+      children: result.childrenResults,
+      config
+    });
     const description = `${meta.title || meta.id}的${slot.title || slotId}插槽`;
     renderManager.register(
       renderId,
@@ -147,7 +160,7 @@ var processComSlots = (com, config, initialCss) => {
       result.childrenResults,
       logicCode,
       slot.type,
-      slot.wrap || slot.itemWrap || ((_c = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _c.useWrap),
+      slot.wrap || slot.itemWrap || ((_d = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _d.useWrap),
       description
     );
     if (result.childrenResults) {
@@ -163,40 +176,35 @@ var processComSlots = (com, config, initialCss) => {
   });
   return { slotsCode, accumulatedCssContent, eventCode, childrenResults: allChildrenResults };
 };
-var buildSlotLogicCode = (slotId, children, config) => {
-  const scene = config.getCurrentScene();
+var buildSlotLogicCode = (args) => {
+  var _a;
+  const { parentComId, slotKey, config } = args;
   const indent = (0, import_templates.indentation)(2);
   const indent2 = (0, import_templates.indentation)(4);
-  const indent3 = (0, import_templates.indentation)(6);
-  let bodyCode = "";
-  children == null ? void 0 : children.forEach((child) => {
-    if (child.type !== "com")
-      return;
-    const mapping = collectSlotInputMappingForCom({
-      slotFrameId: slotId,
-      scene,
-      targetComId: child.id
-    });
-    Object.entries(mapping).forEach(([pinId, slotKey]) => {
-      bodyCode += `${indent3}const val_${child.id}_${pinId} = params.inputValues['${slotKey}'];
-`;
-      bodyCode += `${indent3}if (val_${child.id}_${pinId} !== undefined) {
-`;
-      bodyCode += `${indent3}${indent}comRefs.current['${child.id}']?.['${pinId}']?.(val_${child.id}_${pinId});
-`;
-      bodyCode += `${indent3}}
-`;
-    });
-  });
-  if (!bodyCode) {
+  const effectEvent = (_a = config.getEffectEvent) == null ? void 0 : _a.call(config, { comId: parentComId, slotId: slotKey });
+  if (!effectEvent)
+    return "";
+  const paramsProxy = new Proxy(
+    {},
+    {
+      get: (_t, key) => `params?.inputValues?.['${String(key)}']`
+    }
+  );
+  let process = (0, import_handleProcess.handleProcess)(effectEvent, {
+    ...config,
+    target: "comRefs.current",
+    depth: 3,
+    addParentDependencyImport: config.addParentDependencyImport,
+    addConsumer: config.addConsumer,
+    getParams: () => 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.");
+  if (!process.trim())
     return "";
-  }
   let code = `${indent}useEffect(() => {
 `;
-  code += `${indent2}if (params?.inputValues) {
+  code += `${indent2}if (!params?.inputValues) return;
 `;
-  code += bodyCode;
-  code += `${indent2}}
+  code += `${process}
 `;
   code += `${indent}}, [params?.inputValues]);
 `;
@@ -222,7 +230,8 @@ var generateUiCode = (com, config, componentName, rootStyle, comEventCode, slots
     {
       codeStyle: config.codeStyle,
       depth: config.depth + 1,
-      verbose: config.verbose
+      verbose: config.verbose,
+      checkIsRoot: config.checkIsRoot
     }
   );
 };
@@ -242,41 +251,6 @@ var handleJsCalculation = (com, config) => {
   }
   return { slots: [], scopeSlots: [], ui: "", js: "", cssContent: "", outputsConfig: void 0 };
 };
-function collectSlotInputMappingForCom(params) {
-  const { slotFrameId, scene, targetComId } = params;
-  const mapping = {};
-  const cons = (scene == null ? void 0 : scene.cons) || {};
-  const pinValueProxies = (scene == null ? void 0 : scene.pinValueProxies) || {};
-  const coms = (scene == null ? void 0 : scene.coms) || {};
-  const frameInputComIdToKey = {};
-  Object.entries(pinValueProxies).forEach(([key, proxy]) => {
-    var _a, _b;
-    if ((proxy == null ? void 0 : proxy.type) === "frame" && proxy.frameId === slotFrameId && proxy.pinId) {
-      const [comId] = String(key).split("-");
-      if (comId && ((_b = (_a = coms[comId]) == null ? void 0 : _a.def) == null ? void 0 : _b.namespace) === "mybricks.core-comlib.frame-input") {
-        frameInputComIdToKey[comId] = proxy.pinId;
-      }
-    }
-  });
-  if (Object.keys(frameInputComIdToKey).length === 0)
-    return mapping;
-  Object.entries(cons).forEach(([sourceKey, targets]) => {
-    if (!Array.isArray(targets))
-      return;
-    const [sourceComId] = String(sourceKey).split("-");
-    const slotInputKey = frameInputComIdToKey[sourceComId];
-    if (slotInputKey) {
-      targets.forEach((t) => {
-        const targetId = typeof t === "string" ? t.split("-")[0] : t.comId;
-        const targetPin = typeof t === "string" ? t.split("-")[1] : t.pinId;
-        if (targetId === targetComId && targetPin) {
-          mapping[targetPin] = slotInputKey;
-        }
-      });
-    }
-  });
-  return mapping;
-}
 var handleCom_default = handleCom;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/handleSlot.js

@@ -60,9 +60,9 @@ var handleSlot = (ui, config) => {
     // 让插槽内部的组件知道当前处于哪个 slot（用于接收父容器 inputValues）
     currentSlotId: isRoot ? void 0 : config.slotKey || slotId
   });
-  let effectCode = (0, import_processSceneLogic.processSceneLogic)(ui, config, addDependencyImport);
+  const { initCode, effectCode } = (0, import_processSceneLogic.processSceneLogic)(ui, config, addDependencyImport);
   let cssContent = ((0, import_utils.convertStyleAryToCss)((_b = props.style) == null ? void 0 : _b.styleAry, slotId) || "") + (childResults.cssContent ? "\n" + childResults.cssContent : "");
-  const combinedJsCode = `${envDefineCode}${childResults.js}${(0, import_scene.wrapInEffect)(indent2, effectCode)}`;
+  const combinedJsCode = `${envDefineCode}${childResults.js}${initCode}${(0, import_scene.wrapInEffect)(indent2, effectCode)}`;
   const uiResult = generateSlotUi(ui, props, childResults.ui, config);
   if (isRoot) {
     const renderDefinitions = renderManager ? renderManager.toCode("") : "";
@@ -100,7 +100,8 @@ var setupImports = (addImport, config, isRoot) => {
 var generateSlotUi = (ui, props, childrenUi, config) => {
   const indent = (0, import_utils.indentation)(config.codeStyle.indent * config.depth);
   const mergedStyle = { width: "100%", height: "100%", ...ui.style || {}, ...props.style || {} };
-  const styleCode = JSON.stringify((0, import_utils.convertRootStyle)({ ...mergedStyle, layout: ui.layout || mergedStyle.layout }));
+  const layout = config.layout || ui.layout || mergedStyle.layout;
+  const styleCode = JSON.stringify((0, import_utils.convertRootStyle)({ ...mergedStyle, layout }));
   const rootClassName = (0, import_utils.getRootComponentClassName)(config.getCurrentScene(), config.checkIsRoot());
   const classNameAttr = rootClassName ? ` className='${rootClassName}'` : "";
   return `${indent}<View${classNameAttr} style={${styleCode}}>
@@ -113,6 +114,7 @@ var finalizeRootComponent = (ui, config, importManager, combinedJsCode, renderDe
   const componentId = ((_b = ui.meta) == null ? void 0 : _b.id) || ui.id || ((_c = ui.meta) == null ? void 0 : _c.slotId) || "Index";
   const componentName = `I${String(componentId).replace(/[^a-zA-Z0-9]/g, "_")}`;
   const componentCode = (0, import_scene.genComponentTemplate)({
+    componentId,
     componentName,
     combinedJsCode,
     renderDefinitions,

package/dist/cjs/processors/processComEvents.js

@@ -67,7 +67,7 @@ var processComEvents = (com, config) => {
       depth: config.depth + 3,
       addParentDependencyImport: config.addParentDependencyImport,
       getParams: () => ({ [eventId]: paramName })
-    }).replace(/this\./g, "comRefs.current.").replace(
+    }).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.");
@@ -90,8 +90,7 @@ ${handlerIndent}}`;
     if (!outputsConfig[meta.id]) {
       outputsConfig[meta.id] = {};
     }
-    const onEventName = eventId.startsWith("on") ? eventId : `on${eventId.charAt(0).toUpperCase()}${eventId.slice(1)}`;
-    outputsConfig[meta.id][onEventName] = handlerCode;
+    outputsConfig[meta.id][eventId] = handlerCode;
     eventConfig[eventId] = { connected: true };
   });
   if (((_a = meta.def) == null ? void 0 : _a.namespace) === "mybricks.taro.popup") {

package/dist/cjs/processors/processModule.js

@@ -105,6 +105,29 @@ var processModule = (params) => {
       }
       abstractEventTypeDefMap[comId].eventIdMap[eventId] = schema;
     },
+    getCallTemplate: (params2) => {
+      var _a2, _b, _c, _d;
+      const { com, pinId, args } = params2;
+      const targetScene = getSceneById(com.sceneId || com.id);
+      if (targetScene || com.isScene) {
+        const sceneId = (targetScene == null ? void 0 : targetScene.id) || com.sceneId || com.id;
+        const isTargetPopup = (targetScene == null ? void 0 : targetScene.type) === "popup" || ((_a2 = targetScene == null ? void 0 : targetScene.deps) == null ? void 0 : _a2.some((dep) => dep.namespace === "mybricks.taro.popup"));
+        const routerName = isTargetPopup ? "popupRouter" : "pageRouter";
+        const isInput = (_b = targetScene == null ? void 0 : targetScene.inputs) == null ? void 0 : _b.some((pin) => pin.id === pinId);
+        const isOutput = (_c = targetScene == null ? void 0 : targetScene.outputs) == null ? void 0 : _c.some((pin) => pin.id === pinId);
+        if (isInput || isOutput) {
+          return {
+            code: `${routerName}.${pinId}("${((_d = config.getPageId) == null ? void 0 : _d.call(config, sceneId)) || sceneId}"${args ? `, ${args}` : ""})`,
+            import: {
+              packageName: config.getComponentPackageName(),
+              dependencyNames: [routerName],
+              importType: "named"
+            }
+          };
+        }
+      }
+      return void 0;
+    },
     getComponentController: ({ com }) => {
       return com.id;
     }

package/dist/cjs/processors/processScene.js

@@ -101,6 +101,29 @@ var processScene = (params) => {
     // 显式传入 renderManager
     isPopup,
     // 标记当前场景是否为弹窗
+    getCallTemplate: (params2) => {
+      var _a2, _b2, _c2, _d;
+      const { com, pinId, args } = params2;
+      const targetScene = getSceneById(com.sceneId || com.id);
+      if (targetScene || com.isScene) {
+        const sceneId = (targetScene == null ? void 0 : targetScene.id) || com.sceneId || com.id;
+        const isTargetPopup = (targetScene == null ? void 0 : targetScene.type) === "popup" || ((_a2 = targetScene == null ? void 0 : targetScene.deps) == null ? void 0 : _a2.some((dep) => dep.namespace === "mybricks.taro.popup"));
+        const routerName = isTargetPopup ? "popupRouter" : "pageRouter";
+        const isInput = (_b2 = targetScene == null ? void 0 : targetScene.inputs) == null ? void 0 : _b2.some((pin) => pin.id === pinId);
+        const isOutput = (_c2 = targetScene == null ? void 0 : targetScene.outputs) == null ? void 0 : _c2.some((pin) => pin.id === pinId);
+        if (isInput || isOutput) {
+          return {
+            code: `${routerName}.${pinId}("${((_d = config.getPageId) == null ? void 0 : _d.call(config, sceneId)) || sceneId}"${args ? `, ${args}` : ""})`,
+            import: {
+              packageName: config.getComponentPackageName(),
+              dependencyNames: [routerName],
+              importType: "named"
+            }
+          };
+        }
+      }
+      return void 0;
+    },
     getDslComNameById: (id) => dslComIdToNameMap[id],
     getCurrentScene: () => {
       const originalScene2 = getSceneById(scene.id);