@mybricks/to-code-taro 1.1.5 → 1.1.6

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

@@ -0,0 +1,56 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/core/utils/tabbar.ts
+var tabbar_exports = {};
+__export(tabbar_exports, {
+  tabbarIns: () => tabbarIns
+});
+module.exports = __toCommonJS(tabbar_exports);
+var import_event = require("./event");
+var isDefine = (val) => val !== void 0 && val !== null && val !== "";
+var TabbarInstance = class {
+  constructor() {
+    this.list = [];
+    this.eventEmitter = new import_event.EventEmitter();
+    this.setTabBarBadge = ({ index, text }) => new Promise((resolve, reject) => {
+      if (isDefine(index)) {
+        this.list[index].active = true;
+        this.list[index].activeText = text;
+        console.log("change", this.list);
+        this.eventEmitter.dispatch("change", this.list);
+      }
+    });
+    this.hideTabBarRedDot = ({ index }) => new Promise((resolve, reject) => {
+      if (isDefine(index)) {
+        this.list[index].active = false;
+        this.list[index].activeText = 0;
+        this.eventEmitter.dispatch("change", this.list);
+      }
+    });
+    this.removeTabBarBadge = this.hideTabBarRedDot;
+    this.initWithLength = (len) => {
+      this.list = new Array(len).fill((t) => null).map(() => ({ active: false, activeText: "" }));
+    };
+  }
+};
+var tabbarIns = new TabbarInstance();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tabbarIns
+});

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

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/utils/useContext.ts
@@ -23,9 +33,12 @@ __export(useContext_exports, {
 });
 module.exports = __toCommonJS(useContext_exports);
 var import_react = require("react");
+var Taro = __toESM(require("@tarojs/taro"));
+var import_request = require("@/common/request");
+var import_tabbar = require("@/core/utils/tabbar");
+var import_rootConfig = __toESM(require("@/common/rootConfig"));
 var import_hooks = require("./hooks");
 var import_pool = require("./pool");
-var import_request = require("@/common/request");
 function useAppCreateContext(id) {
   const todoPool = (0, import_react.useMemo)(() => new import_pool.TodoPool(), []);
   const comRefs = (0, import_react.useRef)((0, import_hooks.proxyRefs)({ $inputs: {}, $outputs: {} }, void 0, todoPool));
@@ -41,10 +54,37 @@ function useAppCreateContext(id) {
     canvas: {
       id
     },
+    runtime: {
+      debug: false
+    },
     env: {
       runtime: true,
-      request: (connector, params, config) => (0, import_request.request)(connector, params, config, { $vars })
+      request: (connector, params, config) => (0, import_request.request)(connector, params, config, { $vars }),
+      tabbar: import_tabbar.tabbarIns,
+      uploadFile: (params) => {
+        var _a, _b, _c, _d;
+        let header = {};
+        let mybricksGlobalHeaders = Taro.getStorageSync(
+          "_MYBRICKS_GLOBAL_HEADERS_"
+        );
+        if (mybricksGlobalHeaders) {
+          header = {
+            ...mybricksGlobalHeaders,
+            ...header
+          };
+        }
+        if (!/^(http|https):\/\/.*/.test(params.url) && ((_b = (_a = import_rootConfig.default) == null ? void 0 : _a.status) == null ? void 0 : _b.defaultCallServiceHost)) {
+          params.url = `${(_d = (_c = import_rootConfig.default) == null ? void 0 : _c.status) == null ? void 0 : _d.defaultCallServiceHost}${params.url}`;
+        }
+        const { success, fail, ...rest } = params;
+        Taro.uploadFile({
+          ...rest,
+          success: (res) => success == null ? void 0 : success(res),
+          fail: (err) => fail == null ? void 0 : fail(err)
+        });
+      }
     },
+    rootScroll: {},
     edit: false,
     isH5: false,
     isDesigner: false,

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

@@ -41,7 +41,7 @@ var import_ComContext = __toESM(require("./ComContext"));
 var import_slots = require("./slots");
 var import_taro = require("@tarojs/taro");
 var WithCom = (props) => {
-  var _a, _b;
+  var _a;
   const { component: Component, id = "", data, className, style, ...rest } = props;
   const { comRefs, appContext } = (0, import_ComContext.useAppContext)();
   const env = appContext;
@@ -49,47 +49,22 @@ var WithCom = (props) => {
   const [show, setShow] = (0, import_react.useState)(true);
   const [dynamicStyle, setDynamicStyle] = (0, import_react.useState)({});
   const _data = (0, import_index.useModel)(data || {});
-  const handlers = {
-    _setStyle: (style2) => {
-      setDynamicStyle((prev) => ({ ...prev, ...style2 }));
-    },
-    _setData: (path, value) => {
-      const paths = path.split(".");
-      let current = _data;
-      for (let 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: () => setShow(true),
-      hide: () => setShow(false),
-      showOrHide: () => setShow((prev) => !prev)
-    });
-  }
-  const inputProxy = (0, import_index.useBindInputs)(comRefs, id, handlers);
   const { slots: rawSlots, parentSlot: parentSlotProp, ...restProps } = rest;
   const parentSlot = (0, import_slots.useResolvedParentSlot)(parentSlotProp);
-  const eventProxy = (0, import_index.useBindEvents)(restProps, {
+  const enhancedSlots = (0, import_slots.useEnhancedSlots)(rawSlots, id);
+  const handlers = (0, import_index.useBuiltinHandlers)({ data: _data, setDynamicStyle, setShow, isPopup });
+  const inputProxy = (0, import_index.useBindInputs)(comRefs, id, handlers);
+  const outputProxy = (0, import_index.useBindOutputs)(comRefs, id, restProps, enhancedSlots, {
     id,
     name: props.name || id,
     parentSlot
   });
-  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);
   const jsx = /* @__PURE__ */ import_react.default.createElement(
     Component,
     {
       ...restProps,
       inputs: inputProxy,
-      outputs: eventProxy,
+      outputs: outputProxy,
       slots: enhancedSlots,
       parentSlot,
       data: _data,
@@ -98,18 +73,18 @@ var WithCom = (props) => {
       style
     }
   );
-  if ((_b = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _b.itemWrap) {
+  if ((_a = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _a.itemWrap) {
     return parentSlot.params.itemWrap({
       id,
       name: props.name || id,
       jsx,
       def: Component.def,
       inputs: inputProxy,
-      outputs: eventProxy,
+      outputs: outputProxy,
       style
     });
   }
-  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, jsx, props.children) : null;
+  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { id, className, style: { ...style, ...dynamicStyle } }, jsx, props.children) : null;
 };
 var WithWrapper = (id, Component) => {
   return function WrappedComponent(props) {

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -39,9 +39,10 @@ var import_commonDir = require("./utils/commonDir");
 var import_tabBarImages = require("./utils/tabBarImages");
 var import_pageImages = require("./utils/pageImages");
 var import_appConfig = require("./utils/appConfig");
+var import_customTabBar = require("./utils/customTabBar");
 var import_genJSModules = require("../utils/logic/genJSModules");
 var generateTaroProjectJson = (result) => {
-  var _a, _b;
+  var _a;
   const { files = [], assets = {} } = result;
   const templateJsonPath = path.join(__dirname, "../taro-template.json");
   if (!fs.existsSync(templateJsonPath)) {
@@ -146,23 +147,7 @@ ${item.content || ""}`;
   }
   (0, import_tabBarImages.handleTabBarImages)(tabbarDir, imageFiles);
   (0, import_pageImages.handlePageImages)(assetsDir, pageImages);
-  const CUSTOM_TAB_BAR_CONFIG_PATH = "src/custom-tab-bar/mybricks/tabbar-config.ts";
-  const customTabBarItem = files.find((item) => item.type === "customTabBar");
-  if (customTabBarItem == null ? void 0 : 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_customTabBar.updateCustomTabBar)(srcDir, files);
   (0, import_commonDir.handleCommonDir)(commonDir, files);
   const apiItem = files.find((item) => item.type === "connector-api");
   if (apiItem) {

package/dist/cjs/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/cjs/generate/utils/appConfig.js

@@ -22,24 +22,35 @@ __export(appConfig_exports, {
   updateAppConfig: () => updateAppConfig
 });
 module.exports = __toCommonJS(appConfig_exports);
+var import_fileNode = require("./fileNode");
 function updateAppConfig(appConfigFile, normalItems, items) {
+  var _a;
   if (!appConfigFile.content) {
     return;
   }
-  let content = appConfigFile.content;
-  const newPagePaths = normalItems.map((item) => `    'pages/${item.meta.id}/index'`).join(",\n");
-  content = content.replace(/pages:\s*\[([\s\S]*?)\]/, `pages: [
-${newPagePaths}
-  ]`);
+  const content = (0, import_fileNode.parseLooseObject)(((_a = appConfigFile.content.match(/defineAppConfig\(([\s\S]*?)\)/)) == null ? void 0 : _a[1]) || "{}");
+  const newPagePaths = normalItems.map((item) => `pages/${item.meta.id}/index`);
+  content.pages = newPagePaths;
+  let entryPagePath = "";
+  normalItems.forEach((item) => {
+    var _a2, _b;
+    (_b = Object.values((_a2 = item.meta) == null ? void 0 : _a2.coms)) == null ? void 0 : _b.forEach((com) => {
+      var _a3, _b2;
+      if ((com == null ? void 0 : com.asRoot) && ((_b2 = (_a3 = com == null ? void 0 : com.model) == null ? void 0 : _a3.data) == null ? void 0 : _b2.isEntryPagePath)) {
+        entryPagePath = `pages/${item.meta.id}/index`;
+      }
+    });
+  });
+  if (entryPagePath) {
+    content.entryPagePath = entryPagePath;
+  }
+  content.window = content.window || {};
   const tabBarConfigItem = items.find((item) => item.type === "tabBarConfig");
-  if (tabBarConfigItem == null ? void 0 : tabBarConfigItem.tabBarConfig) {
-    content = content.replace(
-      /window:\s*\{([\s\S]*?)\n\s*\}/,
-      (match) => `${match},
-${tabBarConfigItem.tabBarConfig}`
-    );
+  if (tabBarConfigItem == null ? void 0 : tabBarConfigItem.content) {
+    const tabBar = (0, import_fileNode.parseLooseObject)(`{${tabBarConfigItem.content}}`);
+    Object.assign(content.window, tabBar);
   }
-  appConfigFile.content = content;
+  appConfigFile.content = `export default defineAppConfig(${JSON.stringify(content, null, 2)})`;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -47,6 +47,15 @@ ${fileContent}` : fileContent;
       content: fullContent
     });
   }
+  const rootConfigItem = items.find((item) => item.type === "rootConfig");
+  if (rootConfigItem) {
+    const fileContent = rootConfigItem.content || "{}";
+    const fullContent = `export default ${fileContent}`;
+    commonDir.children.push({
+      path: "src/common/rootConfig.ts",
+      content: fullContent
+    });
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/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/cjs/generate/utils/customTabBar.js

@@ -0,0 +1,73 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/generate/utils/customTabBar.ts
+var customTabBar_exports = {};
+__export(customTabBar_exports, {
+  updateCustomTabBar: () => updateCustomTabBar
+});
+module.exports = __toCommonJS(customTabBar_exports);
+var import_fileNode = require("./fileNode");
+var import_fileNode2 = require("./fileNode");
+function updateCustomTabBar(srcDir, files) {
+  var _a, _b;
+  const customTabBarDir = (0, import_fileNode.ensureDir)(srcDir, "src/custom-tab-bar");
+  const customTabBarItem = files.find((item) => item.type === "customTabBar");
+  if (customTabBarItem == null ? void 0 : customTabBarItem.content) {
+    const CUSTOM_TAB_BAR_CONFIG_PATH = "src/custom-tab-bar/mybricks/tabbar-config.ts";
+    const mybricksDir = (0, import_fileNode.ensureDir)(
+      customTabBarDir,
+      "src/custom-tab-bar/mybricks"
+    );
+    const tabbarConfigFileIndex = (_a = mybricksDir.children) == null ? void 0 : _a.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;
+    }
+  }
+  const tabBarConfigItem = files.find((item) => item.type === "tabBarConfig");
+  if (tabBarConfigItem == null ? void 0 : tabBarConfigItem.content) {
+    const contentStr = JSON.stringify(
+      (0, import_fileNode2.parseLooseObject)(`{${tabBarConfigItem.content}}`),
+      null,
+      2
+    );
+    const tabBarJsonPath = `${customTabBarDir.path}/tabBar.json`;
+    const tabBarJsonIndex = (_b = customTabBarDir.children) == null ? void 0 : _b.findIndex(
+      (node) => node.path === tabBarJsonPath
+    );
+    if (tabBarJsonIndex === -1) {
+      customTabBarDir.children.push({
+        path: tabBarJsonPath,
+        content: contentStr
+      });
+    } else {
+      customTabBarDir.children[tabBarJsonIndex].content = contentStr;
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  updateCustomTabBar
+});

package/dist/cjs/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/cjs/generate/utils/fileNode.js

@@ -20,9 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var fileNode_exports = {};
 __export(fileNode_exports, {
   ensureDir: () => ensureDir,
-  findDir: () => findDir
+  findDir: () => findDir,
+  parseLooseObject: () => parseLooseObject
 });
 module.exports = __toCommonJS(fileNode_exports);
+var import_node_vm = require("node:vm");
 function findDir(nodes, targetPath) {
   for (const node of nodes) {
     if (node.path === targetPath) {
@@ -50,8 +52,16 @@ function ensureDir(parentDir, dirPath) {
   dir.children = dir.children || [];
   return dir;
 }
+function parseLooseObject(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return (0, import_node_vm.runInNewContext)(`(${raw})`, /* @__PURE__ */ Object.create(null));
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ensureDir,
-  findDir
+  findDir,
+  parseLooseObject
 });

package/dist/cjs/handleCom.js

@@ -42,8 +42,9 @@ var import_handleDom = __toESM(require("./handleDom"));
 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 }
+  "mybricks.taro.formContainer": { useWrap: true }
+  // 移除 FormAdditionContainer 的配置，因为它的 runtime 没有传递 wrap 函数
+  // "mybricks.taro.formAdditionContainer": { useWrap: true },
 };
 var handleCom = (com, config) => {
   const { meta, props } = com;
@@ -110,14 +111,10 @@ var prepareComponent = (com, config) => {
   };
 };
 var prepareStyles = (com) => {
-  var _a, _b, _c;
+  var _a;
   const { meta, props } = com;
-  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);
+  const resultStyle = (0, import_converter.convertComponentStyle)(props.style || {});
+  const cssContent = (0, import_converter.convertStyleAryToCss)((_a = props.style) == null ? void 0 : _a.styleAry, meta.id);
   return { cssContent, rootStyle: resultStyle.root || {} };
 };
 var processComSlots = (com, config, initialCss) => {
@@ -131,18 +128,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, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const children = slot.comAry || slot.children || [];
     const isLast = index === slotEntries.length - 1;
     const slotIndent = (0, import_templates.indentation)(config.codeStyle.indent * (config.depth + 2));
-    if (children.length === 0) {
+    const effectEvent = (_a = config.getEffectEvent) == null ? void 0 : _a.call(config, { comId: meta.id, slotId });
+    const hasSlotLogic = effectEvent && (((_c = (_b = effectEvent.process) == null ? void 0 : _b.nodesDeclaration) == null ? void 0 : _c.length) > 0 || ((_e = (_d = effectEvent.process) == null ? void 0 : _d.nodesInvocation) == null ? void 0 : _e.length) > 0);
+    if (children.length === 0 && !hasSlotLogic) {
       slotsCode += `${slotIndent}${slotId}: {
 ${slotIndent}  render: () => null
 ${slotIndent}}${isLast ? "" : ","}
 `;
       return;
     }
-    const slotLayout = (_a = com.props.data) == null ? void 0 : _a.layout;
+    const slotLayout = (_f = com.props.data) == null ? void 0 : _f.layout;
     const result = (0, import_handleSlot.default)(slot, {
       ...config,
       checkIsRoot: () => false,
@@ -160,8 +159,8 @@ ${slotIndent}}${isLast ? "" : ","}
     }
     const renderId = `${meta.id}_${slotId}`;
     const rawContent = result.ui;
-    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_b = props.data) == null ? void 0 : _b.items) && result.directChildren) {
-      const items = (_c = props.data) == null ? void 0 : _c.items;
+    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_g = props.data) == null ? void 0 : _g.items) && result.directChildren) {
+      const items = (_h = props.data) == null ? void 0 : _h.items;
       result.directChildren.forEach((childRes) => {
         const itemConfig = items.find((it) => it.id === childRes.id);
         if (itemConfig == null ? void 0 : itemConfig.comName) {
@@ -183,7 +182,7 @@ ${slotIndent}}${isLast ? "" : ","}
       // 仅传入直接子组件，避免递归替换导致的结构破坏
       logicCode,
       slot.type,
-      slot.wrap || slot.itemWrap || ((_d = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _d.useWrap),
+      slot.wrap || slot.itemWrap || ((_i = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _i.useWrap),
       description
     );
     if (result.childrenResults) {
@@ -219,7 +218,7 @@ var buildSlotLogicCode = (args) => {
     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.");
+  }).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 "";
   let code = `${indent}useEffect(() => {

package/dist/cjs/handleGlobal.d.ts

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

package/dist/cjs/handleGlobal.js

@@ -162,6 +162,12 @@ export const globalFxs = new GlobalFxs()`;
     });
   }
   return [
+    {
+      type: "rootConfig",
+      content: JSON.stringify(tojson.rootConfig, null, 2),
+      importManager: null,
+      name: "rootConfig"
+    },
     {
       type: "global",
       content: varCode + "\n\n" + fxCode,

package/dist/cjs/handleSlot.js

@@ -108,16 +108,17 @@ var generateSlotUi = (ui, props, childrenUi, childrenResults, config) => {
   const slotStyle = ui.style || {};
   const propsStyle = props.style || {};
   const mergedStyle = { width: "100%", height: "100%", ...slotStyle, ...propsStyle };
-  const layout = config.layout || ui.layout || mergedStyle.layout;
+  const layout = ui.layout || mergedStyle.layout;
   const smart = isSmartLayout(layout);
-  const layoutAdjustment = smart ? { position: isHasInSmartLayout(childrenResults) ? "fixed" : "relative" } : hasFixedChildren(childrenResults) ? { transform: "translateX(0)" } : {};
+  const layoutAdjustment = smart ? { position: "relative" } : hasFixedChildren(childrenResults) ? { transform: "translateX(0)" } : {};
   const styleCode = JSON.stringify((0, import_utils.convertRootStyle)({ ...mergedStyle, layout, ...layoutAdjustment }));
   const rootClassName = (0, import_utils.getRootComponentClassName)(config.getCurrentScene(), config.checkIsRoot());
   const parentComId = config == null ? void 0 : config.parentComId;
   const slotMarkClass = parentComId ? `slot-${parentComId}` : "";
   const classNameStr = [rootClassName, slotMarkClass].filter(Boolean).join(" ");
   const classNameAttr = classNameStr ? ` className='${classNameStr}'` : "";
-  return `${indent}<View${classNameAttr} style={${styleCode}}>
+  const styleAttr = slotMarkClass ? `style={{...params.style || {}, ...${styleCode}}}` : `style={${styleCode}}`;
+  return `${indent}<View${classNameAttr} ${styleAttr}>
 ${childrenUi}
 ${indent}</View>`;
 };
@@ -146,10 +147,4 @@ var hasFixedChildren = (childrenResults) => {
 var isSmartLayout = (layout) => {
   return layout === "smart" || (layout == null ? void 0 : layout.position) === "smart";
 };
-var isHasInSmartLayout = (childrenResults) => {
-  return childrenResults.some((item) => {
-    var _a;
-    return ((_a = item == null ? void 0 : item.rootStyle) == null ? void 0 : _a.inSmartLayout) === true;
-  });
-};
 var handleSlot_default = handleSlot;

package/dist/cjs/processors/processScene.js

@@ -38,6 +38,17 @@ var import_renderManager = require("../utils/templates/renderManager");
 var import_createProvider = require("../utils/context/createProvider");
 var import_createEventQueries = require("../utils/context/createEventQueries");
 var import_collectJSModules = require("../utils/context/collectJSModules");
+var getCallMethodName = (com, pinId, isTargetPopup) => {
+  var _a, _b;
+  if (pinId !== "open" || isTargetPopup)
+    return pinId;
+  const OPEN_TYPE_MAP = {
+    "blank": "open",
+    "redirect": "replace"
+  };
+  const openType = (_b = (_a = com == null ? void 0 : com.model) == null ? void 0 : _a.data) == null ? void 0 : _b.openType;
+  return OPEN_TYPE_MAP[openType] || openType || pinId;
+};
 var processScene = (params) => {
   var _a, _b, _c;
   const {
@@ -112,9 +123,10 @@ var processScene = (params) => {
         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);
+        const callMethodName = getCallMethodName(com, pinId, isTargetPopup);
         if (isInput || isOutput) {
           return {
-            code: `${routerName}.${pinId}("${((_d = config.getPageId) == null ? void 0 : _d.call(config, sceneId)) || sceneId}"${args ? `, ${args}` : ""})`,
+            code: `${routerName}.${callMethodName}("${((_d = config.getPageId) == null ? void 0 : _d.call(config, sceneId)) || sceneId}"${args ? `, ${args}` : ""})`,
             import: {
               packageName: config.getComponentPackageName(),
               dependencyNames: [routerName],

package/dist/cjs/processors/processSceneLogic.js

@@ -53,7 +53,7 @@ var processVarEvents = (currentScene, config, addDependencyImport, indent) => {
   const importParams = { isPopup: config.isPopup };
   addDependencyImport({
     packageName: config.getUtilsPackageName(importParams),
-    dependencyNames: ["SUBJECT_SUBSCRIBE", "SUBJECT_VALUE"],
+    dependencyNames: ["SUBJECT_SUBSCRIBE"],
     importType: "named"
   });
   varEvents.forEach((varEvent) => {
@@ -85,10 +85,6 @@ ${process}
 ${indent}  };`;
     code += `
 ${indent}  $vars.current.${varName}.${pinId}?.()[SUBJECT_SUBSCRIBE](run_${varName}_${pinId});`;
-    code += `
-${indent}  const init_${varName}_${pinId} = $vars.current.${varName}.get?.();`;
-    code += `
-${indent}  run_${varName}_${pinId}(init_${varName}_${pinId}?.[SUBJECT_VALUE]);`;
   });
   return code;
 };
@@ -217,7 +213,7 @@ ${indent}  };`;
         });
         code += `
 ${indent}  ${controllerName}.getParams("${currentScene.id}")[SUBJECT_SUBSCRIBE]((val: any) => {
-${indent}    if (val) inputs.open(val);
+${indent}    inputs.open(val);
 ${indent}  });`;
       }
     }