@mybricks/to-code-taro 1.0.8 → 1.1.0

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

@@ -0,0 +1 @@
+{"version":3,"file":"handleModule.d.ts","sourceRoot":"","sources":["handleModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,aAAa,EAAiG,MAAM,SAAS,CAAC;AAGvI,KAAK,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAE7D,UAAU,kBAAmB,SAAQ,UAAU;IAC7C,yBAAyB,EAAE,CAAC,OAAO,aAAa,CAAC,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC;IAC5E,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,KAAK,IAAI,CAAC;IAC9E,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,QAAA,MAAM,YAAY,WAAY,MAAM,UAAU,kBAAkB;;;CAqG/D,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/esm/handleSlot.js

@@ -49,12 +49,14 @@ var handleSlot = function handleSlot(ui, config) {
     currentSlotId: isRoot ? undefined : config.slotKey || slotId
   }));
 
-  // 3. 处理场景逻辑 (Start, Inputs 等)
-  var effectCode = processSceneLogic(ui, config, addDependencyImport);
+  // 3. 处理场景逻辑 (变量/FX 初始化 + Start/Inputs 等)
+  var _processSceneLogic = processSceneLogic(ui, config, addDependencyImport),
+    initCode = _processSceneLogic.initCode,
+    effectCode = _processSceneLogic.effectCode;
 
   // 4. 合并样式与代码
   var cssContent = (convertStyleAryToCss((_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.styleAry, slotId) || "") + (childResults.cssContent ? "\n" + childResults.cssContent : "");
-  var combinedJsCode = "".concat(envDefineCode).concat(childResults.js).concat(wrapInEffect(indent2, effectCode));
+  var combinedJsCode = "".concat(envDefineCode).concat(childResults.js).concat(initCode).concat(wrapInEffect(indent2, effectCode));
 
   // 5. 生成 UI 结构
   var uiResult = generateSlotUi(ui, props, childResults.ui, config);
@@ -133,8 +135,10 @@ var generateSlotUi = function generateSlotUi(ui, props, childrenUi, config) {
     width: "100%",
     height: "100%"
   }, ui.style || {}), props.style || {});
+  // 鸿蒙化：优先使用 config 中传递的 layout（来自父容器 data.layout），否则使用 slot 自身的 layout
+  var layout = config.layout || ui.layout || mergedStyle.layout;
   var styleCode = JSON.stringify(convertRootStyle(_objectSpread(_objectSpread({}, mergedStyle), {}, {
-    layout: ui.layout || mergedStyle.layout
+    layout: layout
   })));
   var rootClassName = getRootComponentClassName(config.getCurrentScene(), config.checkIsRoot());
   var classNameAttr = rootClassName ? " className='".concat(rootClassName, "'") : "";
@@ -150,6 +154,7 @@ var finalizeRootComponent = function finalizeRootComponent(ui, config, importMan
   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 componentCode = genComponentTemplate({
+    componentId: componentId,
     componentName: componentName,
     combinedJsCode: combinedJsCode,
     renderDefinitions: renderDefinitions,

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,qCAAqC,CAAC"}

package/dist/esm/processors/processComEvents.js

@@ -58,7 +58,7 @@ export var processComEvents = function processComEvents(com, config) {
       getParams: function getParams() {
         return _defineProperty({}, eventId, paramName);
       }
-    })).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.includes("pageParams")) {
       var importParams = {
         isPopup: config.isPopup
@@ -78,8 +78,11 @@ export var processComEvents = function processComEvents(com, config) {
     if (!outputsConfig[meta.id]) {
       outputsConfig[meta.id] = {};
     }
-    var onEventName = eventId.startsWith("on") ? eventId : "on".concat(eventId.charAt(0).toUpperCase()).concat(eventId.slice(1));
-    outputsConfig[meta.id][onEventName] = handlerCode;
+
+    // 事件名必须与组件 runtime 的 outputs pin id 保持一致：
+    // - 例如 tabs2 的输出是 `changeTab`（不是 `onChangeTab`）
+    // - searchBar 的输出是 `onSearch`（本身就以 on 开头）
+    outputsConfig[meta.id][eventId] = handlerCode;
     eventConfig[eventId] = {
       connected: true
     };

package/dist/esm/processors/processModule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"processModule.d.ts","sourceRoot":"","sources":["processModule.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,MAAM,MAAM,yCAAyC,CAAC;AAC7D,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEtE,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;AAC9C,KAAK,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzC,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,gBAAgB,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,qBAAqB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IAC3C,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IAClC,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IACnC,SAAS,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC5C;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,WAAY,mBAAmB,KAAG,IA8G3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,UACT,KAAK,mBAAmB,EAAE,QAAQ,CAAC,KAC1C,IAOF,CAAC"}

package/dist/esm/processors/processModule.js

@@ -107,6 +107,41 @@ export var processModule = function processModule(params) {
       }
       abstractEventTypeDefMap[comId].eventIdMap[eventId] = schema;
     },
+    getCallTemplate: function getCallTemplate(params) {
+      var com = params.com,
+        pinId = params.pinId,
+        args = params.args;
+      // 优先通过 sceneId 查找，如果找不到再通过 id 查找
+      var targetScene = getSceneById(com.sceneId || com.id);
+      if (targetScene || com.isScene) {
+        var _targetScene$deps, _targetScene$inputs, _targetScene$outputs;
+        var sceneId = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.id) || com.sceneId || com.id;
+        var isTargetPopup = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.type) === 'popup' || (targetScene === null || targetScene === void 0 || (_targetScene$deps = targetScene.deps) === null || _targetScene$deps === void 0 ? void 0 : _targetScene$deps.some(function (dep) {
+          return dep.namespace === 'mybricks.taro.popup';
+        }));
+        var routerName = isTargetPopup ? "popupRouter" : "pageRouter";
+
+        // 动态判断 pinId 是否属于该场景的输入或输出
+        var isInput = targetScene === null || targetScene === void 0 || (_targetScene$inputs = targetScene.inputs) === null || _targetScene$inputs === void 0 ? void 0 : _targetScene$inputs.some(function (pin) {
+          return pin.id === pinId;
+        });
+        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;
+        });
+        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) : "", ")"),
+            import: {
+              packageName: config.getComponentPackageName(),
+              dependencyNames: [routerName],
+              importType: "named"
+            }
+          };
+        }
+      }
+      return undefined;
+    },
     getComponentController: function getComponentController(_ref) {
       var com = _ref.com;
       return com.id;

package/dist/esm/processors/processScene.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"processScene.d.ts","sourceRoot":"","sources":["processScene.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,MAAM,MAAM,yCAAyC,CAAC;AAC7D,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEtE,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;AAC9C,KAAK,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvC,UAAU,kBAAkB;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,gBAAgB,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,qBAAqB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IAC3C,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IAClC,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,GAAG,CAAC;IACnC,iBAAiB,EAAE,GAAG,CAAC;IACvB,SAAS,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC5C;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,WAAY,kBAAkB,KAAG,IAkJzD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,WAChB,KAAK,EAAE,UACP,KAAK,kBAAkB,EAAE,OAAO,CAAC,KACxC,IAOF,CAAC"}

package/dist/esm/processors/processScene.js

@@ -93,6 +93,41 @@ export var processScene = function processScene(params) {
     // 显式传入 renderManager
     isPopup: isPopup,
     // 标记当前场景是否为弹窗
+    getCallTemplate: function getCallTemplate(params) {
+      var com = params.com,
+        pinId = params.pinId,
+        args = params.args;
+      // 优先通过 sceneId 查找，如果找不到再通过 id 查找
+      var targetScene = getSceneById(com.sceneId || com.id);
+      if (targetScene || com.isScene) {
+        var _targetScene$deps, _targetScene$inputs, _targetScene$outputs;
+        var sceneId = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.id) || com.sceneId || com.id;
+        var isTargetPopup = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.type) === 'popup' || (targetScene === null || targetScene === void 0 || (_targetScene$deps = targetScene.deps) === null || _targetScene$deps === void 0 ? void 0 : _targetScene$deps.some(function (dep) {
+          return dep.namespace === 'mybricks.taro.popup';
+        }));
+        var routerName = isTargetPopup ? "popupRouter" : "pageRouter";
+
+        // 动态判断 pinId 是否属于该场景的输入或输出
+        var isInput = targetScene === null || targetScene === void 0 || (_targetScene$inputs = targetScene.inputs) === null || _targetScene$inputs === void 0 ? void 0 : _targetScene$inputs.some(function (pin) {
+          return pin.id === pinId;
+        });
+        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;
+        });
+        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) : "", ")"),
+            import: {
+              packageName: config.getComponentPackageName(),
+              dependencyNames: [routerName],
+              importType: "named"
+            }
+          };
+        }
+      }
+      return undefined;
+    },
     getDslComNameById: function getDslComNameById(id) {
       return dslComIdToNameMap[id];
     },

package/dist/esm/processors/processSceneLogic.d.ts

@@ -1,4 +1,7 @@
 /**
  * 处理场景/插槽的逻辑（事件流、输入项等）
  */
-export declare const processSceneLogic: (ui: any, config: any, addDependencyImport: any) => string;
+export declare const processSceneLogic: (ui: any, config: any, addDependencyImport: any) => {
+    initCode: string;
+    effectCode: string;
+};

package/dist/esm/processors/processSceneLogic.js

@@ -1,29 +1,99 @@
 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 } from "../utils";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { indentation, getSafeVarName, getInitValueBySchema } from "../utils";
 import { handleProcess } from "../utils/logic/handleProcess";
+function sanitizeBlockComment(text) {
+  var s = String(text !== null && text !== void 0 ? text : "").trim();
+  if (!s) return "";
+  // 避免 title 中出现 */ 破坏注释
+  return s.replace(/\*\//g, "* /");
+}
+
 /**
  * 处理场景/插槽的逻辑（事件流、输入项等）
  */
 export var processSceneLogic = function processSceneLogic(ui, config, addDependencyImport) {
+  var initCode = "";
   var effectCode = "";
   var indent2 = indentation(config.codeStyle.indent);
   var currentScene = config.getCurrentScene();
   var providerName = config.getCurrentProvider().name;
 
-  // 1. 初始化变量和 FX (非 root 也要初始化，因为子场景也有自己的变量)
-  effectCode += processLogicalInit(currentScene, config, addDependencyImport, indent2, providerName);
+  // 1. 初始化变量和 FX：放在 render 阶段（useEffect 之前），避免用户在首帧触发事件时 $vars/$fxs 仍未初始化
+  initCode += processLogicalInit(currentScene, config, addDependencyImport, indent2, providerName);
 
   // 如果不是 root，目前只处理初始化逻辑
-  if (!config.checkIsRoot()) return effectCode;
+  if (!config.checkIsRoot()) return {
+    initCode: initCode,
+    effectCode: effectCode
+  };
 
   // 2. 处理场景级事件（如 Start 节点）
   effectCode += processSceneEvents(ui, currentScene, config, addDependencyImport, indent2);
 
   // 3. 处理场景级输入（如 open）
   effectCode += processSceneInputs(currentScene, config, addDependencyImport, indent2);
-  return effectCode;
+
+  // 4. 处理变量监听事件（starter.type === 'var'，例如 changed）
+  effectCode += processVarEvents(currentScene, config, addDependencyImport, indent2);
+  return {
+    initCode: initCode,
+    effectCode: effectCode
+  };
+};
+
+/**
+ * 处理变量监听事件（例如变量 changed -> 驱动一条 diagram）
+ * 关键点：更新 UI 不是靠 React state，而是靠 runtime inputs（例如 Text.value）
+ */
+var processVarEvents = function processVarEvents(currentScene, config, addDependencyImport, indent) {
+  var _config$getVarEvents;
+  var code = "";
+  var varEvents = ((_config$getVarEvents = config.getVarEvents) === null || _config$getVarEvents === void 0 ? void 0 : _config$getVarEvents.call(config)) || [];
+  if (!Array.isArray(varEvents) || varEvents.length === 0) return code;
+
+  // 用于订阅 variable.changed() 结果
+  var importParams = {
+    isPopup: config.isPopup
+  };
+  addDependencyImport({
+    packageName: config.getUtilsPackageName(importParams),
+    dependencyNames: ["SUBJECT_SUBSCRIBE", "SUBJECT_VALUE"],
+    importType: "named"
+  });
+  varEvents.forEach(function (varEvent) {
+    if ((varEvent === null || varEvent === void 0 ? void 0 : varEvent.type) !== "var") return;
+    // toCode-react 的 var event 自带 meta（变量组件）+ paramId（输出 pin，如 changed/return）
+    var com = varEvent === null || varEvent === void 0 ? void 0 : varEvent.meta;
+    if (!(com !== null && com !== void 0 && com.id)) return;
+    var pinId = (varEvent === null || varEvent === void 0 ? void 0 : varEvent.paramId) || "changed";
+    var varName = getSafeVarName(com);
+
+    // params 映射：toCode-react 会用 paramSource: [{type:'params', id:'changed'}]
+    // 这里用 Proxy 保证任何 params.xxx 都能落到 value 上（避免强依赖 paramPins）
+    var paramsProxy = new Proxy({}, {
+      get: function get() {
+        return "value";
+      }
+    });
+    var process = handleProcess(varEvent, _objectSpread(_objectSpread({}, config), {}, {
+      target: "comRefs.current",
+      depth: 3,
+      addParentDependencyImport: addDependencyImport,
+      getParams: function getParams() {
+        return paramsProxy;
+      }
+    })).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 早于订阅”的丢事件）
+    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;
 };
 
 /**
@@ -47,14 +117,18 @@ var processLogicalInit = function processLogicalInit(scene, config, addDependenc
       dependencyNames: ["createVariable"],
       importType: "named"
     });
-    code += "\n".concat(indent, "const vars = comRefs.current.").concat(providerName, "_Vars;");
+    // $vars 是页面级共享注册表（与 comRefs 同级）
+    code += "\n".concat(indent, "const vars = ($vars.current ||= {});");
     vars.forEach(function (_ref3) {
-      var _com$model;
+      var _com$model, _com$model2, _com$model3;
       var _ref4 = _slicedToArray(_ref3, 2),
         comId = _ref4[0],
         com = _ref4[1];
-      var initValue = JSON.stringify(((_com$model = com.model) === null || _com$model === void 0 || (_com$model = _com$model.data) === null || _com$model === void 0 ? void 0 : _com$model.initValue) || {});
-      code += "\n".concat(indent, "if (!vars.").concat(com.title, ".get) vars.").concat(com.title, " = createVariable(").concat(initValue, ");");
+      var varName = getSafeVarName(com);
+      var varTitle = sanitizeBlockComment((com === null || com === void 0 ? void 0 : com.title) || (com === null || com === void 0 || (_com$model = com.model) === null || _com$model === void 0 ? void 0 : _com$model.title) || (com === null || com === void 0 || (_com$model2 = com.model) === null || _com$model2 === void 0 || (_com$model2 = _com$model2.data) === null || _com$model2 === void 0 ? void 0 : _com$model2.title) || varName);
+      var initValue = JSON.stringify(getInitValueBySchema(com.schema, (_com$model3 = com.model) === null || _com$model3 === void 0 || (_com$model3 = _com$model3.data) === null || _com$model3 === void 0 ? void 0 : _com$model3.initValue));
+      code += "\n".concat(indent, "/** \u521D\u59CB\u5316 \u53D8\u91CF ").concat(varTitle, " */");
+      code += "\n".concat(indent, "if (!vars.").concat(varName, ") vars.").concat(varName, " = createVariable(").concat(initValue, ");");
     });
   }
 
@@ -69,7 +143,8 @@ var processLogicalInit = function processLogicalInit(scene, config, addDependenc
       dependencyNames: ["createFx"],
       importType: "named"
     });
-    code += "\n".concat(indent, "const fxs = comRefs.current.").concat(providerName, "_Fxs;");
+    // $fxs 是页面级共享注册表（与 comRefs 同级）
+    code += "\n".concat(indent, "const fxs = ($fxs.current ||= {});");
     fxEvents.forEach(function (fxEvent) {
       var res = handleProcess(fxEvent, _objectSpread(_objectSpread({}, config), {}, {
         depth: 3,
@@ -85,7 +160,7 @@ var processLogicalInit = function processLogicalInit(scene, config, addDependenc
             return pre;
           }, {});
         }
-      })).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.");
       var values = (fxEvent.paramPins || []).map(function (paramPin, index) {
         if (paramPin.type === "config") {
           var _fxEvent$initValues;
@@ -93,7 +168,7 @@ var processLogicalInit = function processLogicalInit(scene, config, addDependenc
         }
         return "value".concat(index, ": any");
       }).join(", ");
-      code += "\n".concat(indent, "if (!fxs.").concat(fxEvent.frameId, ".call) fxs.").concat(fxEvent.frameId, " = createFx((").concat(values, ") => {\n").concat(res, "\n").concat(indent, "});");
+      code += "\n".concat(indent, "if (!fxs.").concat(fxEvent.frameId, ") fxs.").concat(fxEvent.frameId, " = createFx((").concat(values, ") => {\n").concat(res, "\n").concat(indent, "});");
     });
   }
   return code;
@@ -120,7 +195,7 @@ var processSceneEvents = function processSceneEvents(ui, currentScene, config, a
           getParams: function getParams() {
             return {};
           }
-        })).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()) {
           code += "\n".concat(indent, "  ").concat(process.trim());
         }
@@ -150,7 +225,7 @@ var processSceneInputs = function processSceneInputs(currentScene, config, addDe
       getParams: function getParams() {
         return _defineProperty({}, input.id, "data");
       }
-    })).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()) {
       code += "\n".concat(indent, "  inputs.").concat(input.id, " = (data: any) => {\n").concat(process, "\n").concat(indent, "  };");
       if (input.id === "open") {