@mybricks/to-code-taro 1.1.6 → 1.1.8

package/dist/cjs/toCodeTaro.js

@@ -45,6 +45,14 @@ var import_buildResult = require("./utils/builder/buildResult");
 var import_processScene = require("./processors/processScene");
 var import_processModule = require("./processors/processModule");
 var toCodeTaro = (tojson, config) => {
+  if (tojson.modules) {
+    Object.values(tojson.modules).forEach((mod) => {
+      if (mod.json) {
+        tojson.scenes.push(mod.json);
+      }
+    });
+    rebuildModuleFrames(tojson);
+  }
   return getCode({ tojson, toCodejson: (0, import_toCode.default)(tojson) }, config);
 };
 var getCode = (params, config) => {
@@ -55,6 +63,14 @@ var getCode = (params, config) => {
   const frameMap = (0, import_buildFrameMap.buildFrameMap)(tojson);
   const getFrameById = (0, import_buildContext.createGetFrameById)(frameMap);
   const sceneMap = (0, import_buildContext.buildSceneMap)(tojson.scenes);
+  if (tojson.modules) {
+    Object.values(tojson.modules).forEach((mod) => {
+      var _a;
+      if ((_a = mod.json) == null ? void 0 : _a.id) {
+        sceneMap[mod.json.id] = mod.json;
+      }
+    });
+  }
   const eventsMap = (0, import_buildContext.buildEventsMap)(tojson.frames);
   const getSceneById = (0, import_buildContext.createGetSceneById)(sceneMap);
   const getExtensionEventById = (0, import_buildContext.createGetExtensionEventById)(eventsMap);
@@ -227,6 +243,79 @@ var getCode = (params, config) => {
     }
   };
 };
+var rebuildModuleFrames = (tojson) => {
+  const modules = tojson.modules;
+  if (!modules)
+    return;
+  Object.values(modules).forEach((mod) => {
+    const moduleJson = mod.json;
+    if (!moduleJson)
+      return;
+    const frame = tojson.frames.find((f) => f.id === moduleJson.id);
+    if (!frame || Object.keys(frame.coms).length > 0)
+      return;
+    const coms = moduleJson.coms || {};
+    const cons = moduleJson.cons || {};
+    Object.values(coms).forEach((com) => {
+      var _a;
+      const outputEvents = (_a = com.model) == null ? void 0 : _a.outputEvents;
+      if (!outputEvents || Object.keys(outputEvents).length === 0)
+        return;
+      const comFrames = [];
+      Object.entries(outputEvents).forEach(([pinId, events]) => {
+        var _a2;
+        const activeEvent = Array.isArray(events) ? events.find((e) => e.active) : null;
+        if (!((_a2 = activeEvent == null ? void 0 : activeEvent.options) == null ? void 0 : _a2.id))
+          return;
+        const diagramId = activeEvent.options.id;
+        const consKey = `${com.id}-${pinId}`;
+        const connections = cons[consKey] || [];
+        const conAry = connections.map((con) => ({
+          id: con.id,
+          from: {
+            id: pinId,
+            title: activeEvent.options.title || pinId,
+            parent: { id: com.id, type: "com" }
+          },
+          to: {
+            id: con.pinId,
+            title: con.pinId,
+            parent: { id: con.comId, type: "com" }
+          },
+          startPinParentKey: con.startPinParentKey || con.frameKey,
+          finishPinParentKey: con.finishPinParentKey || con.targetFrameKey
+        }));
+        if (conAry.length === 0)
+          return;
+        comFrames.push({
+          id: `${com.id}_${pinId}_frame`,
+          title: activeEvent.options.title || `${com.title} > ${pinId}`,
+          type: "com",
+          coms: {},
+          autoRunComs: {},
+          inputs: [],
+          outputs: [],
+          frames: [],
+          diagrams: [{
+            id: diagramId,
+            title: activeEvent.options.title || `${com.title} > ${pinId}`,
+            starter: {
+              type: "com",
+              comId: com.id,
+              pinId
+            },
+            conAry,
+            runtimeBefore: [],
+            runtimeAfter: []
+          }]
+        });
+      });
+      if (comFrames.length > 0) {
+        frame.coms[com.id] = { id: com.id, frames: comFrames };
+      }
+    });
+  });
+};
 var transformConfig = (config) => {
   if (!config.codeStyle) {
     config.codeStyle = {

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

@@ -111,15 +111,15 @@ ${indent}}, appContext)
 `;
   });
   const outputToInputPinMap = /* @__PURE__ */ new Map();
+  const declaredVarCount = /* @__PURE__ */ new Map();
   process.nodesInvocation.forEach((props) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const { componentType, category, runType } = props;
     const nextValue = getNextValue(props, config, event, outputToInputPinMap);
     const isSameScope = checkIsSameScope(event, props);
-    const nextCode = getNextCode(props, config, isSameScope, event);
-    const inputPinId = props.id.replace(/[^a-zA-Z0-9_]/g, "_");
+    const { code: nextCode, varName: declaredVarName } = getNextCode(props, config, isSameScope, event, declaredVarCount);
     (_a = props.nextParam) == null ? void 0 : _a.forEach((np) => {
-      outputToInputPinMap.set(`${props.meta.id}_${np.id}`, inputPinId);
+      outputToInputPinMap.set(`${props.meta.id}_${np.id}`, declaredVarName);
     });
     if (code) {
       code += "\n";
@@ -160,6 +160,8 @@ ${indent}${nextCode}this.${sceneId}.${method}(${nextValue})`;
 ${indent}${nextCode}${componentNameWithId}(${runType === "input" ? nextValue : ""})`;
       } else if (category === "var") {
         const varKey = (0, import_string.getSafeVarName)(props.meta);
+        const xpath = (_f = props.extData) == null ? void 0 : _f.xpath;
+        const xpathArg = xpath ? `, "${xpath.replace(/^\//, "").replace(/\//g, ".")}"` : "";
         if (props.meta.global) {
           config.addParentDependencyImport({
             packageName: "../../common/global",
@@ -167,14 +169,14 @@ ${indent}${nextCode}${componentNameWithId}(${runType === "input" ? nextValue : "
             importType: "named"
           });
           code += `${indent}/** ${props.title} 全局变量 ${props.meta.title} */
-${indent}${nextCode}globalVars.${varKey}.${props.id}(${nextValue})`;
+${indent}${nextCode}globalVars.${varKey}.${props.id}(${nextValue}${xpathArg})`;
         } else {
           const currentProvider = getCurrentProvider(
             { isSameScope, props },
             config
           );
           code += `${indent}/** ${props.title} 变量 ${props.meta.title} */
-${indent}${nextCode}this.$vars.${varKey}.${props.id}(${nextValue})`;
+${indent}${nextCode}this.$vars.${varKey}.${props.id}(${nextValue}${xpathArg})`;
         }
       } else if (category === "fx") {
         if (props.meta.global) {
@@ -197,7 +199,7 @@ ${indent}${nextCode}this.$fxs.${props.meta.ioProxy.id}(${nextValue})`;
     } else {
       if (props.type === "frameOutput") {
         const currentScene = config.getCurrentScene();
-        const parentComId = event.comId || ((_f = event.meta) == null ? void 0 : _f.parentComId);
+        const parentComId = event.comId || ((_g = event.meta) == null ? void 0 : _g.parentComId);
         const frameConEntry = Object.values(currentScene.cons || {}).flat().find((con) => {
           if (con.type !== "frame" || con.pinId !== props.id)
             return false;
@@ -206,7 +208,7 @@ ${indent}${nextCode}this.$fxs.${props.meta.ioProxy.id}(${nextValue})`;
           return true;
         });
         const comId = (frameConEntry == null ? void 0 : frameConEntry.comId) || props.meta.id;
-        const comTitle = ((_h = (_g = currentScene.coms) == null ? void 0 : _g[comId]) == null ? void 0 : _h.title) || props.meta.title || comId;
+        const comTitle = ((_i = (_h = currentScene.coms) == null ? void 0 : _h[comId]) == null ? void 0 : _i.title) || props.meta.title || comId;
         code += `${indent}/** 调用 ${comTitle} 的 ${props.title} */
 ${indent}${nextCode}$outputs['${comId}'].${props.id}(${nextValue})`;
       } else {
@@ -279,24 +281,34 @@ var getComponentNameWithId = (props, config, event) => {
   const sanitizedName = name.replace(/-/g, "_");
   return `${sanitizedName}_${props.meta.id}`;
 };
-var getNextCode = (props, config, isSameScope, event) => {
+var getNextCode = (props, config, isSameScope, event, declaredVarCount) => {
   const { nextParam } = props;
   if (!nextParam.length) {
-    return "";
+    return { code: "", varName: "" };
   }
   const componentNameWithId = getComponentNameWithId(props, config, event);
   const pinId = props.id;
   const sanitizedPinId = pinId.replace(/[^a-zA-Z0-9_]/g, "_");
-  return `const ${componentNameWithId}_${sanitizedPinId}_result: any = `;
+  let varName = `${componentNameWithId}_${sanitizedPinId}_result`;
+  const count = declaredVarCount.get(varName) || 0;
+  declaredVarCount.set(varName, count + 1);
+  if (count > 0) {
+    varName = `${varName}_${count}`;
+  }
+  return { code: `const ${varName}: any = `, varName };
 };
 function getFrameInputValueExpr(meta, config, event) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   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) {
+    const paramsMap = (_d = config.getParams) == null ? void 0 : _d.call(config);
+    if (paramsMap == null ? void 0 : paramsMap[pinId]) {
+      return paramsMap[pinId];
+    }
     return `params?.inputValues?.[${JSON.stringify(pinId)}]`;
   }
 }
@@ -316,16 +328,16 @@ var getNextValue = (props, config, event, outputToInputPinMap) => {
     const componentNameWithId = getComponentNameWithId(param, config, event);
     if ((_e = (_d = (_c = param.meta) == null ? void 0 : _c.def) == null ? void 0 : _d.namespace) == null ? void 0 : _e.includes(".var")) {
       const key2 = `${(_f = param.meta) == null ? void 0 : _f.id}_${param.id}`;
-      const inputPinId2 = outputToInputPinMap == null ? void 0 : outputToInputPinMap.get(key2);
-      if (inputPinId2) {
-        return `${componentNameWithId}_${inputPinId2}_result`;
+      const fullVarName2 = outputToInputPinMap == null ? void 0 : outputToInputPinMap.get(key2);
+      if (fullVarName2) {
+        return fullVarName2;
       }
       return `${componentNameWithId}_result`;
     }
     const key = `${(_g = param.meta) == null ? void 0 : _g.id}_${param.id}`;
-    const inputPinId = outputToInputPinMap == null ? void 0 : outputToInputPinMap.get(key);
-    if (inputPinId) {
-      return `${componentNameWithId}_${inputPinId}_result.${param.id}`;
+    const fullVarName = outputToInputPinMap == null ? void 0 : outputToInputPinMap.get(key);
+    if (fullVarName) {
+      return `${fullVarName}.${param.id}`;
     }
     return `${componentNameWithId}_result.${param.id}`;
   });

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

@@ -50,7 +50,7 @@ var genSlotRenderRef = ({
   indent,
   isLast
 }) => {
-  const renderFunctionName = (0, import_index.toPascalCase)(`${renderId}_Render`);
+  const renderFunctionName = (0, import_index.toSlotFunctionName)(renderId);
   return `${indent}${slotId}: {
 ${indent}  render: ${renderFunctionName},
 ${indent}}${isLast ? "" : ","}

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

@@ -6,6 +6,8 @@ export declare const firstCharToUpperCase: (str: string) => string;
 export declare const formatSlotContent: (uiContent: string, baseIndentSize: number, renderBodyIndent: string) => string;
 /** 将字符串转为大驼峰 */
 export declare const toPascalCase: (str: string) => string;
+/** 生成插槽渲染函数名：S${ID} (SCREAMING_SNAKE_CASE) */
+export declare const toSlotFunctionName: (renderId: string) => string;
 /** Taro/React UI 组件代码生成 */
 export declare const getUiComponentCode: (params: {
     componentName: string;

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

@@ -23,7 +23,8 @@ __export(templates_exports, {
   formatSlotContent: () => formatSlotContent,
   getUiComponentCode: () => getUiComponentCode,
   indentation: () => import__.indentation,
-  toPascalCase: () => toPascalCase
+  toPascalCase: () => toPascalCase,
+  toSlotFunctionName: () => toSlotFunctionName
 });
 module.exports = __toCommonJS(templates_exports);
 var import__ = require("../index");
@@ -38,6 +39,9 @@ var formatSlotContent = (uiContent, baseIndentSize, renderBodyIndent) => {
 var toPascalCase = (str) => {
   return str.split(/[_-]/).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
 };
+var toSlotFunctionName = (renderId) => {
+  return `S${renderId.replace(/[^a-zA-Z0-9]/g, "_").toUpperCase()}`;
+};
 var formatData = (data, isRoot) => {
   if (!data)
     return {};
@@ -66,7 +70,7 @@ ${indent2}component={${componentName}}`;
   ui += `
 ${indent2}id='${meta.id}'`;
   ui += `
-${indent2}className='${meta.id} mybricks_com'`;
+${indent2}className='mybricks_com ${meta.id}'`;
   if (meta.name) {
     ui += `
 ${indent2}name='${meta.name}'`;
@@ -107,5 +111,6 @@ ${indent}/>`;
   formatSlotContent,
   getUiComponentCode,
   indentation,
-  toPascalCase
+  toPascalCase,
+  toSlotFunctionName
 });

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

@@ -49,7 +49,7 @@ var RenderManager = class {
     const indent5 = (0, import_index.indentation)(indentSize * 4);
     const indent6 = (0, import_index.indentation)(indentSize * 5);
     this._renders.forEach(({ renderCode, children, logicCode, useWrap, description }, renderId) => {
-      const renderFunctionName = (0, import_index.toPascalCase)(`${renderId}_Render`);
+      const renderFunctionName = (0, import_index.toSlotFunctionName)(renderId);
       if (description) {
         code += `${indent}/** ${description} */
 `;
@@ -121,11 +121,7 @@ var RenderManager = class {
         code += `${indent}${indent3}params?.wrap?.(descriptors)
 `;
       } else {
-        code += `${indent}${indent3}<>
-`;
         code += modifiedRenderCode.split("\n").map((line) => `${indent}${indent2}${line}`).join("\n") + "\n";
-        code += `${indent}${indent3}</>
-`;
       }
       code += `${indent}${indent2});
 `;
@@ -143,7 +139,7 @@ var RenderManager = class {
     return new RegExp(escaped, "g");
   }
   genRenderRef(slotId, renderId, indent) {
-    const renderFunctionName = (0, import_index.toPascalCase)(`${renderId}_Render`);
+    const renderFunctionName = (0, import_index.toSlotFunctionName)(renderId);
     return `${indent}${slotId}: {
 ${indent}  render: ${renderFunctionName},
 ${indent}},

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

@@ -1,7 +1,7 @@
 /** 生成响应式 data 管理器 */
 export declare const genReactiveDataManager: (indent: string, utilsPackageName: string) => string;
 /** 生成根组件定义代码 (useAppContext) */
-export declare const genRootDefineCode: (indent: string, utilsPackageName: string, hasJsModules?: boolean) => string;
+export declare const genRootDefineCode: (indent: string, utilsPackageName: string, hasJsModules?: boolean, isModule?: boolean) => string;
 /** 生成普通插槽定义代码 */
 export declare const genSlotDefineCode: (indent: string) => string;
 /** 生成控制器初始化代码 */

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

@@ -30,11 +30,13 @@ module.exports = __toCommonJS(scene_exports);
 var genReactiveDataManager = (indent, utilsPackageName) => {
   return ``;
 };
-var genRootDefineCode = (indent, utilsPackageName, hasJsModules = false) => {
+var genRootDefineCode = (indent, utilsPackageName, hasJsModules = false, isModule = false) => {
   let code = `${indent}const {comRefs, $vars, $fxs, appContext} = useAppContext();
 `;
-  code += `${indent}usePageLife();
+  if (!isModule) {
+    code += `${indent}usePageLife();
 `;
+  }
   if (hasJsModules) {
     code += `${indent}const comModules = jsModules({ createJSHandle });
 `;
@@ -75,11 +77,11 @@ function ${componentName}() {
 ${combinedJsCode}
   return (
     <PageScopeContext.Provider value={pageScopeRef}>
-    <>
-${uiResult.split("\n").map((line) => `      ${line}`).join("\n")}
+` + (hasPopups ? `    <>
+` : "") + `${uiResult.split("\n").map((line) => `      ${line}`).join("\n")}
 ` + (hasPopups ? `      <PopupRenderer popupMap={POPUP_MAP} />
-` : "") + `    </>
-    </PageScopeContext.Provider>
+` : "") + (hasPopups ? `    </>
+` : "") + `    </PageScopeContext.Provider>
   );
 }
 

package/dist/esm/generate/generateTaroProjectJson.js

@@ -129,6 +129,47 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
     });
   });
 
+  // --- 处理模块/区块场景 (module) ---
+  var compsDir = ensureDir(srcDir, "src/comps");
+  var moduleScenes = files.filter(function (item) {
+    return item.type === "module" && item.meta;
+  });
+  var moduleExports = [];
+  moduleScenes.forEach(function (item) {
+    var _item$importManager3;
+    var moduleId = item.meta.id;
+    var exportName = "C".concat(String(moduleId).replace(/[^a-zA-Z0-9]/g, "_").toUpperCase());
+    var importCode = ((_item$importManager3 = item.importManager) === null || _item$importManager3 === void 0 ? void 0 : _item$importManager3.toCode()) || "";
+    var fullContent = "".concat(importCode, "\n").concat(item.content || "");
+    var moduleChildren = [{
+      path: "src/comps/".concat(moduleId, "/index.tsx"),
+      content: fullContent
+    }, {
+      path: "src/comps/".concat(moduleId, "/index.global.less"),
+      content: item.cssContent || ""
+    }];
+    if (item.jsModules && item.jsModules.length > 0) {
+      moduleChildren.push({
+        path: "src/comps/".concat(moduleId, "/index.jsModules.ts"),
+        content: genScopedJSModules(item.jsModules, "@/core/mybricks/index", "@/common/jsModulesRuntime")
+      });
+    }
+    compsDir.children.push({
+      path: "src/comps/".concat(moduleId),
+      content: null,
+      children: moduleChildren
+    });
+    moduleExports.push("export { default as ".concat(exportName, " } from \"./").concat(moduleId, "/index\";"));
+  });
+
+  // 生成 comps/Index.ts 汇总导出
+  if (moduleExports.length > 0) {
+    compsDir.children.push({
+      path: "src/comps/Index.ts",
+      content: moduleExports.join("\n") + "\n"
+    });
+  }
+
   // 更新 app.config.ts (只传入 normalItems 作为真正的页面)
   var appConfigFile = (_srcDir$children = srcDir.children) === null || _srcDir$children === void 0 ? void 0 : _srcDir$children.find(function (node) {
     return node.path === "src/app.config.ts";

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

@@ -36,7 +36,6 @@ export function updateAppConfig(appConfigFile, normalItems, items) {
   if (entryPagePath) {
     content.entryPagePath = entryPagePath;
   }
-  content.window = content.window || {};
 
   // 添加 TabBar 配置（从 items 中读取）
   var tabBarConfigItem = items.find(function (item) {
@@ -44,7 +43,7 @@ export function updateAppConfig(appConfigFile, normalItems, items) {
   });
   if (tabBarConfigItem !== null && tabBarConfigItem !== void 0 && tabBarConfigItem.content) {
     var tabBar = parseLooseObject("{".concat(tabBarConfigItem.content, "}"));
-    Object.assign(content.window, tabBar);
+    Object.assign(content, tabBar);
   }
   appConfigFile.content = "export default defineAppConfig(".concat(JSON.stringify(content, null, 2), ")");
 }

package/dist/esm/handleCom.js

@@ -194,7 +194,7 @@ var processComSlots = function processComSlots(com, config, initialCss) {
     if (result.cssContent) {
       accumulatedCssContent += (accumulatedCssContent ? "\n" : "") + result.cssContent;
     }
-    var renderId = "".concat(meta.id, "_").concat(slotId);
+    var renderId = slotEntries.length > 1 ? "".concat(meta.id, "_").concat(slotId) : meta.id;
 
     // 关键：不再预先 formatSlotContent，而是将原始 ui 传给 renderManager
     // 这样 RenderManager 在内部进行精确字符串替换时才能匹配成功

package/dist/esm/handleModule.js

@@ -1,16 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { indentation, genObjectCode, convertComponentStyle, convertStyleAryToCss, firstCharToUpperCase } from "./utils";
+import { indentation, genObjectCode, convertComponentStyle, convertStyleAryToCss } from "./utils";
 import { handleProcess } from "./utils/logic/handleProcess";
 var handleModule = function handleModule(module, config) {
-  var _config$getFileName, _props$style, _config$getComponentC;
+  var _props$style, _config$getComponentC;
   var events = module.events,
     moduleId = module.moduleId,
     props = module.props;
-  var moduleScene = config.getSceneById(moduleId);
-  var rawName = ((_config$getFileName = config.getFileName) === null || _config$getFileName === void 0 ? void 0 : _config$getFileName.call(config, moduleId)) || moduleScene.title;
-  var name = firstCharToUpperCase(rawName);
+  var name = "C".concat(String(moduleId).replace(/[^a-zA-Z0-9]/g, "_").toUpperCase());
   var comEventCode = "";
   var indent = indentation(config.codeStyle.indent * (config.depth + 1));
   Object.entries(events).forEach(function (_ref) {
@@ -43,7 +41,7 @@ var handleModule = function handleModule(module, config) {
     comEventCode += "".concat(indent).concat(eventId, ": (").concat(defaultValue, ": any) => {\n") + process + "\n".concat(indent, "},\n");
   });
   config.addParentDependencyImport({
-    packageName: "../sections/Index",
+    packageName: "@/comps/Index",
     dependencyNames: [name],
     importType: "named"
   });
@@ -64,7 +62,7 @@ var handleModule = function handleModule(module, config) {
   var moduleCode = "".concat(indent2, "<").concat(name) + (config.verbose ? "\n".concat(indent3, "title=\"").concat(module.meta.title, "\"") : "") + (configs ? "\n".concat(indent3, "data={").concat(genObjectCode(configs, {
     initialIndent: initialIndent + config.codeStyle.indent * 2,
     indentSize: config.codeStyle.indent
-  }), "}") : "") + "\n".concat(indent3, "controller={this.").concat(currentProvider.name, ".").concat(componentController, "}") + (comEventCode ? "\n".concat(indent3, "onEvents={{").concat(comEventCode.replace(/\n/g, "\n" + indent3), "}}") : "") + "\n".concat(indent2, "/>");
+  }), "}") : "") + "\n".concat(indent3, "controller={comRefs.current.").concat(componentController, "}") + (comEventCode ? "\n".concat(indent3, "onEvents={{").concat(comEventCode.replace(/\n/g, "\n" + indent3), "}}") : "") + "\n".concat(indent2, "/>");
   var ui = "".concat(indentView, "<View id=\"").concat(module.meta.id, "\" className=\"").concat(module.meta.id, "\" style={").concat(JSON.stringify(resultStyle.root), "}>\n").concat(moduleCode, "\n").concat(indentView, "</View>");
   return {
     ui: ui,

package/dist/esm/handleSlot.d.ts

@@ -9,6 +9,7 @@ interface HandleSlotConfig extends BaseConfig {
     renderManager?: RenderManager;
     addJSModule?: (module: any) => void;
     isPopup?: boolean;
+    isModule?: boolean;
     hasPopups?: boolean;
     /** handleCom 处理 slots 时的 slot key（如 item/content），用于识别 scope 入参 */
     slotKey?: string;

package/dist/esm/handleSlot.js

@@ -37,7 +37,7 @@ var handleSlot = function handleSlot(ui, config) {
     });
   }
   var indent2 = indentation(config.codeStyle.indent);
-  var envDefineCode = isRoot ? genRootDefineCode(indent2, config.getUtilsPackageName()) : genSlotDefineCode(indent2);
+  var envDefineCode = isRoot ? genRootDefineCode(indent2, config.getUtilsPackageName(), false, config.isModule) : genSlotDefineCode(indent2);
 
   // 2. 处理子节点
   var renderManager = isRoot ? new RenderManager() : config.renderManager || new RenderManager();
@@ -114,11 +114,13 @@ var setupImports = function setupImports(addImport, config, isRoot) {
     importType: "named"
   });
   if (isRoot) {
-    addImport({
-      packageName: "@/common/pageLife",
-      dependencyNames: ["usePageLife"],
-      importType: "named"
-    });
+    if (!config.isModule) {
+      addImport({
+        packageName: "@/common/pageLife",
+        dependencyNames: ["usePageLife"],
+        importType: "named"
+      });
+    }
     if (config.hasPopups) {
       addImport({
         packageName: "@/common/popup",
@@ -159,7 +161,7 @@ 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, "'") : "";
 
@@ -175,7 +177,8 @@ var finalizeRootComponent = function finalizeRootComponent(ui, config, importMan
   var _config$getFileName, _ui$meta, _ui$meta2;
   var fileName = ((_config$getFileName = config.getFileName) === null || _config$getFileName === void 0 ? void 0 : _config$getFileName.call(config, ui.meta.slotId)) || ui.meta.title || "index";
   var componentId = ((_ui$meta = ui.meta) === null || _ui$meta === void 0 ? void 0 : _ui$meta.id) || ui.id || ((_ui$meta2 = ui.meta) === null || _ui$meta2 === void 0 ? void 0 : _ui$meta2.slotId) || "Index";
-  var componentName = "I".concat(String(componentId).replace(/[^a-zA-Z0-9]/g, "_"));
+  var prefix = config.isModule ? "C" : "P";
+  var componentName = "".concat(prefix).concat(String(componentId).replace(/[^a-zA-Z0-9]/g, "_").toUpperCase());
   var componentCode = genComponentTemplate({
     componentId: componentId,
     componentName: componentName,

package/dist/esm/processors/processModule.js

@@ -50,6 +50,7 @@ export var processModule = function processModule(params) {
 
   // 处理 Slot
   handleSlot(ui, _objectSpread(_objectSpread({}, config), {}, {
+    isModule: true,
     getCurrentScene: function getCurrentScene() {
       var originalScene = getSceneById(scene.id);
       return _objectSpread(_objectSpread(_objectSpread({}, scene), originalScene), {}, {

package/dist/esm/processors/processSceneLogic.js

@@ -87,9 +87,11 @@ 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 事件
+    // 使用 registerChange 订阅变量事件，确保有初始值时也能触发
     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, "  $vars.current.").concat(varName, ".registerChange((changeValue: any) => {");
+    code += "\n".concat(indent, "    changeValue[SUBJECT_SUBSCRIBE](run_").concat(varName, "_").concat(pinId, ");");
+    code += "\n".concat(indent, "  });");
   });
   return code;
 };