@mybricks/to-code-taro 1.1.2 → 1.1.4

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

@@ -39,7 +39,7 @@ var PopupRenderer = ({ popupMap }) => {
   const { popupState } = (0, import_ComContext.useAppContext)();
   const ActivePopup = popupState.visible && popupMap[popupState.name] ? popupMap[popupState.name] : null;
   if (!ActivePopup)
-    return null;
+    return /* @__PURE__ */ import_react.default.createElement(import_components.View, null);
   return /* @__PURE__ */ import_react.default.createElement(
     import_components.View,
     {

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

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var hooks_exports = {};
 __export(hooks_exports, {
   deepProxy: () => deepProxy,
+  proxyRefs: () => proxyRefs,
   useBindEvents: () => useBindEvents,
   useBindInputs: () => useBindInputs,
   useModel: () => useModel
@@ -27,17 +28,17 @@ __export(hooks_exports, {
 module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
 var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
+var import_ComContext = require("./ComContext");
 function deepProxy(target, onSet) {
-  if (target === null || typeof target !== "object" || target.__isProxy) {
+  if (target === null || typeof target !== "object" || target.__isProxy)
     return target;
-  }
   return new Proxy(target, {
     get(obj, prop) {
       if (prop === "__isProxy")
         return true;
       if (prop === "toJSON")
         return () => obj;
-      let value = obj[prop];
+      const value = obj[prop];
       if (typeof value === "object" && value !== null && !value.__isProxy) {
         obj[prop] = deepProxy(value, onSet);
       }
@@ -45,8 +46,7 @@ function deepProxy(target, onSet) {
     },
     set(obj, prop, value) {
       const result = Reflect.set(obj, prop, value);
-      if (onSet)
-        onSet();
+      onSet == null ? void 0 : onSet();
       return result;
     }
   });
@@ -54,74 +54,137 @@ function deepProxy(target, onSet) {
 function useModel(rawData) {
   const [, forceUpdate] = (0, import_react.useState)({});
   const dataRef = (0, import_react.useRef)(rawData || {});
-  return (0, import_react.useMemo)(() => {
-    return deepProxy(dataRef.current, () => forceUpdate({}));
-  }, []);
+  return (0, import_react.useMemo)(() => deepProxy(dataRef.current, () => forceUpdate({})), []);
+}
+function proxyRefs(target, parentComRefs, globalTodoPool) {
+  return new Proxy(target, {
+    get(obj, prop) {
+      if (prop === "__isProxy")
+        return true;
+      if (prop === "toJSON")
+        return () => obj;
+      if (typeof prop === "string" && prop.startsWith("u_") && obj[prop] === void 0) {
+        return obj[prop] = new Proxy({ __isShadow: true }, {
+          get(_, method) {
+            if (method === "__isShadow")
+              return true;
+            return (...args) => {
+              if (!(globalTodoPool instanceof Map))
+                return;
+              const instances = globalTodoPool.get(prop) || [];
+              if (!globalTodoPool.has(prop))
+                globalTodoPool.set(prop, instances);
+              const index = obj.$index ?? 0;
+              const todo = instances[index] || (instances[index] = {});
+              todo[method] = args;
+            };
+          }
+        });
+      }
+      return obj[prop];
+    },
+    set(obj, prop, value) {
+      const result = Reflect.set(obj, prop, value);
+      const isRealRef = typeof prop === "string" && !prop.startsWith("$") && (value == null ? void 0 : value.__isShadow) !== true;
+      if (isRealRef && (parentComRefs == null ? void 0 : parentComRefs.current)) {
+        try {
+          parentComRefs.current[prop] = value;
+        } catch {
+        }
+      }
+      return result;
+    },
+    deleteProperty(obj, prop) {
+      const result = Reflect.deleteProperty(obj, prop);
+      const isRealRef = typeof prop === "string" && !prop.startsWith("$");
+      if (isRealRef && (parentComRefs == null ? void 0 : parentComRefs.current)) {
+        try {
+          delete parentComRefs.current[prop];
+        } catch {
+        }
+      }
+      return result;
+    }
+  });
 }
 function useBindInputs(scope, id, initialHandlers) {
+  var _a, _b;
   const handlersRef = (0, import_react.useRef)({ ...initialHandlers });
-  if (initialHandlers) {
-    Object.assign(handlersRef.current, initialHandlers);
-  }
+  const { globalTodoInputs } = (0, import_ComContext.useAppContext)();
+  const parentSlot = (0, import_ComContext.useParentSlot)();
+  const index = ((_b = (_a = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _a.inputValues) == null ? void 0 : _b.index) ?? 0;
+  (0, import_react.useEffect)(() => {
+    return () => {
+      if (scope == null ? void 0 : scope.current) {
+        delete scope.current[id];
+      }
+    };
+  }, [scope, id]);
   return (0, import_react.useMemo)(() => {
     const proxy = new Proxy({}, {
-      get: (_target, pin) => {
+      get: (target, pin) => {
+        if (pin === "__isShadow")
+          return false;
+        if (pin === "toJSON")
+          return () => target;
         return (arg, ...args) => {
           if (typeof arg === "function") {
             handlersRef.current[pin] = arg;
+            const instances = globalTodoInputs == null ? void 0 : globalTodoInputs.get(id);
+            const todo = (instances == null ? void 0 : instances[index]) || (instances == null ? void 0 : instances[0]);
+            if (todo == null ? void 0 : todo[pin]) {
+              const pendingArgs = todo[pin];
+              if (pin === "_setData") {
+                arg(...pendingArgs);
+              } else {
+                (0, import_createReactiveInputHandler.createReactiveInputHandler)({ input: arg, value: pendingArgs[0], rels: {}, title: id });
+              }
+              delete todo[pin];
+              const hasTasks = instances == null ? void 0 : instances.some((inst) => inst && Object.keys(inst).length > 0);
+              if (!hasTasks)
+                globalTodoInputs.delete(id);
+            }
           } else {
             const handler = handlersRef.current[pin];
             if (typeof handler === "function") {
-              if (pin === "_setData") {
-                return handler(arg, ...args);
-              }
-              return (0, import_createReactiveInputHandler.createReactiveInputHandler)({
-                input: handler,
-                value: arg,
-                rels: {},
-                // 这里可以扩展 output 关联
-                title: id
-              });
+              return pin === "_setData" ? handler(arg, ...args) : (0, import_createReactiveInputHandler.createReactiveInputHandler)({ input: handler, value: arg, rels: {}, title: id });
             }
           }
         };
       }
     });
-    if (scope && scope.current) {
+    if (scope == null ? void 0 : scope.current)
       scope.current[id] = proxy;
+    if (initialHandlers) {
+      Object.keys(initialHandlers).forEach((pin) => proxy[pin](initialHandlers[pin]));
     }
     return proxy;
-  }, [scope, id]);
+  }, [scope, id, globalTodoInputs, index]);
 }
 function useBindEvents(props, context) {
   return (0, import_react.useMemo)(() => {
-    const _events = {};
+    const events = {};
     Object.keys(props).forEach((key) => {
       if (typeof props[key] === "function") {
         const handler = props[key];
-        const wrapped = (originalValue) => {
+        const wrapped = (original) => {
           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
-          } : originalValue;
+          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: original } : original;
           return handler(value);
         };
         wrapped.getConnections = () => [{ id: "default" }];
-        _events[key] = wrapped;
+        events[key] = wrapped;
       }
     });
-    return new Proxy(_events, {
+    return new Proxy(events, {
       get(target, key) {
         if (typeof key === "string" && key.startsWith("on")) {
-          if (target[key]) {
+          if (target[key])
             return target[key];
-          }
-          const emptyFn = () => {
+          const fn = () => {
           };
-          emptyFn.getConnections = () => [];
-          return emptyFn;
+          fn.getConnections = () => [];
+          return fn;
         }
         return target[key];
       }
@@ -131,6 +194,7 @@ function useBindEvents(props, context) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   deepProxy,
+  proxyRefs,
   useBindEvents,
   useBindInputs,
   useModel

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

@@ -37,6 +37,11 @@ module.exports = __toCommonJS(slots_exports);
 var import_react = __toESM(require("react"));
 var import_ComContext = __toESM(require("./ComContext"));
 var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
+var import_hooks = require("./hooks");
+function createPenetratingComRefs(parentComRefs, globalTodoPool, index = 0) {
+  const localTarget = { $inputs: {}, $outputs: {}, $index: index };
+  return { current: (0, import_hooks.proxyRefs)(localTarget, parentComRefs, globalTodoPool) };
+}
 function SlotParamsBridge(props) {
   var _a, _b;
   const parentSlot = (0, import_ComContext.useParentSlot)();
@@ -71,6 +76,7 @@ function createChannelProxy(title) {
   );
 }
 function useEnhancedSlots(rawSlots, id) {
+  const { comRefs: parentComRefs, globalTodoInputs } = (0, import_ComContext.useAppContext)();
   const slotStoreRef = (0, import_react.useRef)({});
   return (0, import_react.useMemo)(() => {
     if (!rawSlots)
@@ -84,15 +90,16 @@ function useEnhancedSlots(rawSlots, id) {
         _scopedComRefs: {},
         _render: void 0,
         render: (params) => {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e;
           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);
           if (rawScope === void 0 || rawScope === null) {
             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: {}, $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 })));
+          const index = ((_d = params == null ? void 0 : params.inputValues) == null ? void 0 : _d.index) ?? 0;
+          const scopedComRefs = (_e = state._scopedComRefs)[scopeId] || (_e[scopeId] = createPenetratingComRefs(parentComRefs, globalTodoInputs, index));
+          return /* @__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;
@@ -105,7 +112,7 @@ function useEnhancedSlots(rawSlots, id) {
       };
     });
     return nextSlots;
-  }, [rawSlots, id]);
+  }, [rawSlots, id, parentComRefs, globalTodoInputs]);
 }
 function ScopedComContextProvider(props) {
   const parent = (0, import_ComContext.useAppContext)();

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

@@ -24,8 +24,10 @@ __export(useContext_exports, {
 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: {}, $outputs: {} }));
+var GLOBAL_TODO_POOL = /* @__PURE__ */ new Map();
+function useAppCreateContext(id) {
+  const globalTodoInputs = (0, import_react.useRef)(GLOBAL_TODO_POOL);
+  const comRefs = (0, import_react.useRef)((0, import_hooks.proxyRefs)({ $inputs: {}, $outputs: {} }, void 0, globalTodoInputs.current));
   const $vars = (0, import_react.useRef)({});
   const $fxs = (0, import_react.useRef)({});
   const [popupState, setPopupState] = (0, import_react.useState)({
@@ -36,8 +38,7 @@ function useAppCreateContext() {
   });
   const appContext = (0, import_react.useRef)({
     canvas: {
-      id: "u_7VvVn"
-      // 使用 data 中的 id
+      id
     },
     runtime: {
       debug: false
@@ -57,6 +58,7 @@ function useAppCreateContext() {
     comRefs,
     $vars,
     $fxs,
+    globalTodoInputs: globalTodoInputs.current,
     appContext,
     popupState,
     setPopupState

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

@@ -109,11 +109,11 @@ var WithCom = (props) => {
       style
     });
   }
-  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, jsx) : null;
+  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, jsx, props.children) : null;
 };
-var WithWrapper = (Component) => {
+var WithWrapper = (id, Component) => {
   return function WrappedComponent(props) {
-    const contextStore = (0, import_useContext.useAppCreateContext)();
+    const contextStore = (0, import_useContext.useAppCreateContext)(id);
     const { setPopupState } = contextStore;
     const isPopup = Component.isPopup;
     (0, import_react.useEffect)(() => {

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -37,6 +37,7 @@ var path = __toESM(require("path"));
 var import_fileNode = require("./utils/fileNode");
 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_genJSModules = require("../utils/logic/genJSModules");
 var generateTaroProjectJson = (result) => {
@@ -60,6 +61,7 @@ var generateTaroProjectJson = (result) => {
   const assetsDir = (0, import_fileNode.ensureDir)(srcDir, "src/assets");
   const tabbarDir = (0, import_fileNode.ensureDir)(assetsDir, "src/assets/tabbar");
   const imageFiles = assets.tabBarImages || [];
+  const pageImages = assets.pageImages || [];
   const normalItems = files.filter((item) => item.type === "normal");
   const generatedPages = normalItems.map((item) => {
     var _a2;
@@ -90,8 +92,8 @@ ${fileContent}` : fileContent;
         path: `src/pages/${pageName}/index.jsModules.ts`,
         content: (0, import_genJSModules.genScopedJSModules)(
           item.jsModules,
-          "../../core/mybricks/index",
-          "../../common/jsModulesRuntime"
+          "@/core/mybricks/index",
+          "@/common/jsModulesRuntime"
         )
       });
     }
@@ -125,8 +127,8 @@ ${item.content || ""}`;
         path: `src/popupComponents/${popupId}/index.jsModules.ts`,
         content: (0, import_genJSModules.genScopedJSModules)(
           item.jsModules,
-          "../../core/mybricks/index",
-          "../../common/jsModulesRuntime"
+          "@/core/mybricks/index",
+          "@/common/jsModulesRuntime"
         )
       });
     }
@@ -143,6 +145,7 @@ ${item.content || ""}`;
     (0, import_appConfig.updateAppConfig)(appConfigFile, normalItems, files);
   }
   (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) {

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

@@ -23,7 +23,7 @@ __export(commonDir_exports, {
 });
 module.exports = __toCommonJS(commonDir_exports);
 function handleCommonDir(commonDir, items) {
-  var _a;
+  var _a, _b;
   commonDir.children = commonDir.children || [];
   const jsModulesRuntimeItem = items.find((item) => item.type === "jsModulesRuntime");
   if (jsModulesRuntimeItem) {
@@ -36,6 +36,17 @@ ${fileContent}` : fileContent;
       content: fullContent
     });
   }
+  const globalItem = items.find((item) => item.type === "global");
+  if (globalItem) {
+    const importCode = ((_b = globalItem.importManager) == null ? void 0 : _b.toCode()) || "";
+    const fileContent = globalItem.content || "";
+    const fullContent = importCode ? `${importCode}
+${fileContent}` : fileContent;
+    commonDir.children.push({
+      path: "src/common/global.ts",
+      content: fullContent
+    });
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/generate/utils/pageImages.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 页面图片文件处理工具
+ */
+import type { ImageFileInfo } from '../../utils/config/content';
+interface FileNode {
+    path: string;
+    content: string | null;
+    children?: FileNode[];
+}
+/**
+ * 处理页面 base64 图片文件
+ */
+export declare function handlePageImages(assetsDir: FileNode, imageFiles: ImageFileInfo[]): void;
+export {};

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

@@ -0,0 +1,36 @@
+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/pageImages.ts
+var pageImages_exports = {};
+__export(pageImages_exports, {
+  handlePageImages: () => handlePageImages
+});
+module.exports = __toCommonJS(pageImages_exports);
+function handlePageImages(assetsDir, imageFiles) {
+  imageFiles.forEach((imageFile) => {
+    assetsDir.children.push({
+      path: imageFile.filePath,
+      content: imageFile.fileContent.toString("base64")
+    });
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handlePageImages
+});

package/dist/cjs/handleCom.js

@@ -38,6 +38,7 @@ var import_templates = require("./utils/templates/index");
 var import_component = require("./utils/templates/component");
 var import_renderManager = require("./utils/templates/renderManager");
 var import_handleSlot = __toESM(require("./handleSlot"));
+var import_handleDom = __toESM(require("./handleDom"));
 var import_processComEvents = require("./processors/processComEvents");
 var import_handleProcess = require("./utils/logic/handleProcess");
 var COM_PROTOCOL = {
@@ -56,16 +57,31 @@ var handleCom = (com, config) => {
   const { componentName, eventHandlers, comEventCode } = prepareComponent(com, config);
   const { cssContent, rootStyle } = prepareStyles(com);
   let accumulatedCssContent = cssContent;
+  if (com.child) {
+    rootStyle.position = "relative";
+  }
   const { slotsCode, accumulatedCssContent: slotCss, eventCode, childrenResults } = processComSlots(com, config, accumulatedCssContent);
   accumulatedCssContent = slotCss;
-  const ui = generateUiCode(com, config, componentName, rootStyle, comEventCode, slotsCode, eventHandlers);
+  let childrenUi = "";
+  if (com.child) {
+    const childResult = (0, import_handleDom.default)(com.child, {
+      ...config,
+      depth: config.depth + 1
+    });
+    childrenUi = childResult.ui;
+    if (childResult.cssContent) {
+      accumulatedCssContent += (accumulatedCssContent ? "\n" : "") + childResult.cssContent;
+    }
+  }
+  const ui = generateUiCode(com, config, componentName, rootStyle, comEventCode, slotsCode, eventHandlers, childrenUi);
+  const hasEvents = Object.keys(eventHandlers).length > 0;
   return {
     slots: [],
     scopeSlots: [],
     ui,
     js: eventCode,
     cssContent: accumulatedCssContent,
-    outputsConfig: Object.keys(eventHandlers).length > 0 ? { [meta.id]: eventHandlers } : void 0,
+    outputsConfig: hasEvents ? { [meta.id]: eventHandlers } : void 0,
     childrenResults,
     name: meta.name,
     // 返回解析后的稳定名称
@@ -117,7 +133,13 @@ var processComSlots = (com, config, initialCss) => {
   slotEntries.forEach(([slotId, slot], index) => {
     var _a, _b, _c, _d;
     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) {
+      slotsCode += `${slotIndent}${slotId}: {
+${slotIndent}  render: () => null
+${slotIndent}}${isLast ? "" : ","}
+`;
       return;
     }
     const slotLayout = (_a = com.props.data) == null ? void 0 : _a.layout;
@@ -127,6 +149,8 @@ var processComSlots = (com, config, initialCss) => {
       depth: 1,
       renderManager,
       slotKey: slotId,
+      // 给 slot 根容器打标用（slot wrapper className）
+      parentComId: meta.id,
       // 鸿蒙化：传递父容器的布局配置给插槽
       layout: slotLayout
     });
@@ -135,12 +159,10 @@ var processComSlots = (com, config, initialCss) => {
       accumulatedCssContent += (accumulatedCssContent ? "\n" : "") + result.cssContent;
     }
     const renderId = `${meta.id}_${slotId}`;
-    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((_b = props.data) == null ? void 0 : _b.items) && result.childrenResults) {
+    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;
-      result.childrenResults.forEach((childRes) => {
+      result.directChildren.forEach((childRes) => {
         const itemConfig = items.find((it) => it.id === childRes.id);
         if (itemConfig == null ? void 0 : itemConfig.comName) {
           childRes.name = itemConfig.comName;
@@ -150,14 +172,15 @@ var processComSlots = (com, config, initialCss) => {
     const logicCode = buildSlotLogicCode({
       parentComId: meta.id,
       slotKey: slotId,
-      children: result.childrenResults,
+      children: result.directChildren,
       config
     });
     const description = `${meta.title || meta.id}的${slot.title || slotId}插槽`;
     renderManager.register(
       renderId,
-      formattedContent,
-      result.childrenResults,
+      rawContent,
+      result.directChildren,
+      // 仅传入直接子组件，避免递归替换导致的结构破坏
       logicCode,
       slot.type,
       slot.wrap || slot.itemWrap || ((_d = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _d.useWrap),
@@ -166,12 +189,11 @@ var processComSlots = (com, config, initialCss) => {
     if (result.childrenResults) {
       allChildrenResults = allChildrenResults.concat(result.childrenResults);
     }
-    const slotIndent = (0, import_templates.indentation)(config.codeStyle.indent * (config.depth + 2));
     slotsCode += (0, import_component.genSlotRenderRef)({
       slotId,
       renderId,
       indent: slotIndent,
-      isLast: index === slotEntries.length - 1
+      isLast
     });
   });
   return { slotsCode, accumulatedCssContent, eventCode, childrenResults: allChildrenResults };
@@ -210,7 +232,7 @@ var buildSlotLogicCode = (args) => {
 `;
   return code;
 };
-var generateUiCode = (com, config, componentName, rootStyle, comEventCode, slotsCode, eventHandlers) => {
+var generateUiCode = (com, config, componentName, rootStyle, comEventCode, slotsCode, eventHandlers, childrenUi) => {
   var _a, _b, _c, _d;
   const { meta, props } = com;
   const scene = config.getCurrentScene();
@@ -225,7 +247,8 @@ var generateUiCode = (com, config, componentName, rootStyle, comEventCode, slots
       componentOutputs: (((_c = sceneCom == null ? void 0 : sceneCom.outputs) == null ? void 0 : _c.length) || 0) > 0 ? sceneCom.outputs : (((_d = meta.outputs) == null ? void 0 : _d.length) || 0) > 0 ? meta.outputs : void 0,
       comEventCode,
       slotsCode,
-      eventHandlers
+      eventHandlers,
+      childrenUi
     },
     {
       codeStyle: config.codeStyle,

package/dist/cjs/handleDom.d.ts

@@ -14,6 +14,8 @@ type HandleDomResult = {
     slots: string[];
     scopeSlots: string[];
     cssContent: string;
+    directChildren?: any[];
+    childrenResults?: any[];
 };
 declare const handleDom: (dom: Dom, config: HandleDomConfig) => HandleDomResult;
 export default handleDom;

package/dist/cjs/handleDom.js

@@ -26,8 +26,9 @@ var import_utils = require("./utils");
 var import_processChildren = require("./utils/logic/processChildren");
 var handleDom = (dom, config) => {
   var _a;
-  const { props, children } = dom;
+  const { props } = dom;
   const domProps = props;
+  const children = (0, import_processChildren.normalizeChildren)(dom);
   const childResults = (0, import_processChildren.processChildren)(children, {
     ...config,
     depth: config.depth + 1
@@ -43,7 +44,9 @@ ${indent}</View>`;
     js: childResults.js,
     slots: childResults.slots,
     scopeSlots: childResults.scopeSlots,
-    cssContent
+    cssContent,
+    directChildren: childResults.directChildren,
+    childrenResults: childResults.childrenResults
   };
 };
 var handleDom_default = handleDom;

package/dist/cjs/handleGlobal.js

@@ -24,6 +24,7 @@ __export(handleGlobal_exports, {
 module.exports = __toCommonJS(handleGlobal_exports);
 var import_utils = require("./utils");
 var import_handleProcess = require("./utils/logic/handleProcess");
+var import_string = require("./utils/common/string");
 var handleGlobal = (params, config) => {
   const { tojson, globalFxs, globalVars } = params;
   const globalImportManager = new import_utils.ImportManager(config);
@@ -64,11 +65,12 @@ var handleGlobal = (params, config) => {
         return tojson.global;
       }
     });
+    const varKey = (0, import_string.getSafeVarName)(com);
     globalVarsRegisterChangeCode += `
-${indent2}this.${com.title}.registerChange((value: any) => {
+${indent2}this.${varKey}.registerChange((value: any) => {
 ${res}
 ${indent2}})`;
-    globalVarsInitCode += `${indent}${com.title}: any = createVariable(${JSON.stringify(com.model.data.initValue || {})})
+    globalVarsInitCode += `${indent}${varKey}: any = createVariable(${JSON.stringify(com.model.data.initValue || {})})
 `;
   });
   let globalFxsInitCode = "";

package/dist/cjs/handleSlot.d.ts

@@ -12,6 +12,8 @@ interface HandleSlotConfig extends BaseConfig {
     hasPopups?: boolean;
     /** handleCom 处理 slots 时的 slot key（如 item/content），用于识别 scope 入参 */
     slotKey?: string;
+    /** 父组件 id（用于给插槽根容器打标 className） */
+    parentComId?: string;
 }
 declare const handleSlot: (ui: UI, config: HandleSlotConfig) => {
     js: string;
@@ -20,6 +22,7 @@ declare const handleSlot: (ui: UI, config: HandleSlotConfig) => {
     cssContent: string;
     slots: any[];
     scopeSlots: any[];
+    directChildren: any[];
     childrenResults: any[];
 };
 export default handleSlot;