@mybricks/to-code-taro 1.1.4 → 1.1.6

package/dist/esm/handleSlot.js

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

package/dist/esm/processors/processScene.js

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

package/dist/esm/processors/processSceneLogic.js

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