openxiangda 1.0.0 → 1.0.2

package/packages/sdk/src/build-source/scripts/build-forms.mjs

@@ -30,6 +30,7 @@ const runtimeDistDir = path.join(rootDir, "dist/form-runtime");
 const tmpDir = path.join(rootDir, ".tmp");
 const runtimeVersionPlaceholder = "__SY_FORM_RUNTIME_VERSION__";
 const runtimeCacheFileName = "build-cache.json";
+const portalContainerResolverGlobal = "__OPENXIANGDA_GET_PORTAL_CONTAINER__";
 
 const runtimePackages = [
   "react",
@@ -164,7 +165,6 @@ function parseArgs(argv) {
     }
     if (arg === "--force") {
       result.force = true;
-      result.runtimeCache = false;
       continue;
     }
     if (arg === "--dry-run") {
@@ -196,7 +196,7 @@ build-forms - 构建表单页面
 选项:
   --form <name>       只构建指定表单（src/forms/ 下的目录名）
   --only <list>       只构建指定模块，如 forms/customer,pages/dashboard
-  --force             忽略增量缓存，强制重建
+  --force             忽略增量缓存，强制重建表单产物
   --dry-run           只打印增量计划，不构建
   --clean-cache       删除 .openxiangda/build-cache.json
   --no-runtime-cache  强制重建共享 runtime
@@ -237,11 +237,16 @@ import { App as AntdApp, ConfigProvider } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
 import * as SyFormComponentsModule from 'openxiangda';
 import { antdTheme } from 'openxiangda/antd-theme';
+import 'antd-mobile/es/global';
 import '../src/index.css';
 
 const runtimeVersion = '${runtimeVersionPlaceholder}';
 const roots = new WeakMap();
+const portalContainerCleanups = new WeakMap();
 const { StandardFormPage, defineFormSchema } = SyFormComponentsModule;
+const NAMESPACE_ROOT_CLASS = 'sy-app-workspace';
+const PORTAL_CONTAINER_STACK_GLOBAL = '__OPENXIANGDA_PORTAL_CONTAINER_STACK__';
+const PORTAL_CONTAINER_RESOLVER_GLOBAL = '${portalContainerResolverGlobal}';
 
 function getStyleContainer(el) {
   const rootNode = el.getRootNode?.();
@@ -250,58 +255,115 @@ function getStyleContainer(el) {
     : document.head;
 }
 
-function getNamespaceRoot(el) {
-  return el.closest?.('.sy-app-workspace') || el;
-}
-
 function isInShadowRoot(el) {
   const rootNode = el.getRootNode?.();
   return typeof ShadowRoot !== 'undefined' && rootNode instanceof ShadowRoot;
 }
 
+function getNamespaceRoot(el, triggerNode) {
+  if (isInShadowRoot(el)) return el;
+  const triggerRoot = triggerNode?.closest?.('.' + NAMESPACE_ROOT_CLASS);
+  return (
+    triggerRoot ||
+    el.closest?.('.' + NAMESPACE_ROOT_CLASS) ||
+    el.querySelector?.('.' + NAMESPACE_ROOT_CLASS) ||
+    el
+  );
+}
+
 function getPopupContainer(el) {
-  const inShadowRoot = isInShadowRoot(el);
-  return (triggerNode) => {
-    if (inShadowRoot) return el;
-    return getNamespaceRoot(el) || triggerNode?.parentElement || document.body;
-  };
+  return (triggerNode) => getNamespaceRoot(el, triggerNode);
 }
 
 function getTargetContainer(el) {
-  return () => (isInShadowRoot(el) ? el : getNamespaceRoot(el) || document.body);
+  return () => getNamespaceRoot(el);
+}
+
+function createAntdConfig(el) {
+  return {
+    locale: zhCN,
+    prefixCls: 'sy-ant',
+    iconPrefixCls: 'sy-anticon',
+    theme: antdTheme,
+    getPopupContainer: getPopupContainer(el),
+    getTargetContainer: getTargetContainer(el),
+  };
+}
+
+function installRuntimePortalContainer(el) {
+  const stack = Array.isArray(globalThis[PORTAL_CONTAINER_STACK_GLOBAL])
+    ? globalThis[PORTAL_CONTAINER_STACK_GLOBAL]
+    : [];
+  stack.push(el);
+  globalThis[PORTAL_CONTAINER_STACK_GLOBAL] = stack;
+  globalThis[PORTAL_CONTAINER_RESOLVER_GLOBAL] = () => {
+    for (let index = stack.length - 1; index >= 0; index -= 1) {
+      const candidate = stack[index];
+      if (candidate?.isConnected) {
+        return getNamespaceRoot(candidate);
+      }
+    }
+    return document.querySelector('.' + NAMESPACE_ROOT_CLASS) || document.body;
+  };
+  return () => {
+    const position = stack.lastIndexOf(el);
+    if (position >= 0) stack.splice(position, 1);
+  };
+}
+
+function installAntdStaticHolder(el) {
+  ConfigProvider.config({
+    prefixCls: 'sy-ant',
+    iconPrefixCls: 'sy-anticon',
+    theme: antdTheme,
+    holderRender: (children) => {
+      if (!el.isConnected) {
+        return (
+          <ConfigProvider prefixCls="sy-ant" iconPrefixCls="sy-anticon" theme={antdTheme}>
+            {children}
+          </ConfigProvider>
+        );
+      }
+      return (
+        <StyleProvider hashPriority="high" container={getStyleContainer(el)}>
+          <ConfigProvider {...createAntdConfig(el)}>{children}</ConfigProvider>
+        </StyleProvider>
+      );
+    },
+  });
 }
 
 function renderStandardForm(el, schemaInput, context = {}) {
   let root = roots.get(el);
+  el.classList.add(NAMESPACE_ROOT_CLASS);
+  if (!portalContainerCleanups.has(el)) {
+    portalContainerCleanups.set(el, installRuntimePortalContainer(el));
+  }
+  installAntdStaticHolder(el);
   if (!root) {
-    if (!isInShadowRoot(el)) el.classList.add('sy-app-workspace');
     root = createRoot(el);
     roots.set(el, root);
   }
 
   const schema = defineFormSchema(schemaInput);
+  const antdConfig = createAntdConfig(el);
   root.render(
     <StyleProvider hashPriority="high" container={getStyleContainer(el)}>
-      <ConfigProvider
-        locale={zhCN}
-        prefixCls="sy-ant"
-        iconPrefixCls="sy-anticon"
-        theme={antdTheme}
-        getPopupContainer={getPopupContainer(el)}
-        getTargetContainer={getTargetContainer(el)}
-      >
+      <ConfigProvider {...antdConfig}>
         <AntdApp>
-          <StandardFormPage
-            schema={schema}
-            mode={context.mode || 'submit'}
-            initialValues={context.initialValues}
-            permissions={context.permissions}
-            formUuid={context.formUuid}
-            appType={context.appType}
-            formInstanceId={context.formInstanceId}
-            onSubmit={context.onSubmit}
-            inDrawer={context.inDrawer}
-          />
+          <div className="sy-app-workspace">
+            <StandardFormPage
+              schema={schema}
+              mode={context.mode || 'submit'}
+              initialValues={context.initialValues}
+              permissions={context.permissions}
+              formUuid={context.formUuid}
+              appType={context.appType}
+              formInstanceId={context.formInstanceId}
+              onSubmit={context.onSubmit}
+              inDrawer={context.inDrawer}
+            />
+          </div>
         </AntdApp>
       </ConfigProvider>
     </StyleProvider>
@@ -314,6 +376,11 @@ function unmountStandardForm(el) {
     root.unmount();
     roots.delete(el);
   }
+  const releasePortalContainer = portalContainerCleanups.get(el);
+  if (releasePortalContainer) {
+    releasePortalContainer();
+    portalContainerCleanups.delete(el);
+  }
 }
 
 export function createStandardFormModule(schemaInput) {
@@ -355,6 +422,24 @@ export default formRuntime;
 `;
 }
 
+function createAntdMobilePortalPatchPlugin() {
+  const resolverExpression = `globalThis.${portalContainerResolverGlobal}?.() || document.body`;
+  return {
+    name: "openxiangda-antd-mobile-portal-container",
+    transform(code, id) {
+      if (!id.includes("/antd-mobile/") && !id.includes("\\\\antd-mobile\\\\")) {
+        return null;
+      }
+      const nextCode = code.replace(
+        /getContainer:\s*\(\)\s*=>\s*document\.body/g,
+        `getContainer: () => ${resolverExpression}`,
+      );
+      if (nextCode === code) return null;
+      return { code: nextCode, map: null };
+    },
+  };
+}
+
 function createFormRuntimeProxyPlugin() {
   return {
     name: "sy-form-runtime-proxy",
@@ -546,7 +631,7 @@ async function buildSharedRuntime(options = {}) {
           },
         },
       },
-      plugins: [reactPlugin],
+      plugins: [createAntdMobilePortalPatchPlugin(), reactPlugin],
       logLevel: "warn",
     });
 
@@ -688,7 +773,11 @@ async function buildForm(form) {
           },
         },
       },
-      plugins: [createFormRuntimeProxyPlugin(), reactPlugin].filter(Boolean),
+      plugins: [
+        createAntdMobilePortalPatchPlugin(),
+        createFormRuntimeProxyPlugin(),
+        reactPlugin,
+      ].filter(Boolean),
       logLevel: "warn",
     });
 
@@ -751,9 +840,14 @@ async function main() {
   const startedAt = Date.now();
   console.log("[build] 构建表单页面");
   console.log("[build] 构建模式: shared runtime");
-  const only = normalizeOnly(args.only).filter((item) => item.startsWith("forms/"));
-  const filterForm = args.form || (only.length === 1 ? only[0].slice("forms/".length) : "");
-  const forms = discoverForms(filterForm);
+  const onlyTargets = normalizeOnly(args.only);
+  const only = onlyTargets.filter((item) => item.startsWith("forms/"));
+  if (onlyTargets.length > 0 && only.length === 0) {
+    console.log("[build] forms: No form targets selected");
+    return;
+  }
+  const requested = args.form ? [`forms/${args.form}`] : only;
+  const forms = discoverForms("");
 
   if (forms.length === 0) {
     if (args.form) {
@@ -763,16 +857,24 @@ async function main() {
     }
     process.exit(1);
   }
+  const formKeys = new Set(forms.map((form) => form.key));
+  const missing = requested.filter((key) => !formKeys.has(key));
+  if (missing.length > 0) {
+    console.error(
+      `错误: 找不到表单 ${missing.map((key) => `"${key.slice("forms/".length)}"`).join(", ")}`,
+    );
+    process.exit(1);
+  }
 
   const plan = planIncrementalBuild(forms, {
     force: args.force,
-    only: only.length ? only : undefined,
+    only: requested.length ? requested : undefined,
   });
   printPlan(plan, "forms");
   if (args.dryRun) return;
   if (plan.changed.length === 0) return;
 
-  if (plan.fullRebuild && !args.form && only.length === 0 && fs.existsSync(distDir)) {
+  if (plan.fullRebuild && requested.length === 0 && fs.existsSync(distDir)) {
     fs.rmSync(distDir, { recursive: true, force: true });
   }
 

package/packages/sdk/src/build-source/scripts/build-pages.mjs

@@ -34,12 +34,14 @@ const tmpDir = path.join(rootDir, ".tmp");
 const runtimeDistDir = path.join(distRoot, "page-runtime");
 const runtimeVersionPlaceholder = "__SY_PAGE_RUNTIME_VERSION__";
 const runtimeCacheFileName = "build-cache.json";
+const portalContainerResolverGlobal = "__OPENXIANGDA_GET_PORTAL_CONTAINER__";
 
 const runtimePackages = [
   "react",
   "react-dom",
   "@ant-design/cssinjs",
   "antd",
+  "antd-mobile",
   "@ant-design/icons",
   "openxiangda",
 ];
@@ -163,7 +165,6 @@ function parseArgs(argv) {
     }
     if (arg === "--force") {
       result.force = true;
-      result.runtimeCache = false;
       continue;
     }
     if (arg === "--dry-run") {
@@ -194,7 +195,7 @@ build-pages - 构建复杂代码页
 选项:
   --page <name>       只构建指定页面目录
   --only <list>       只构建指定模块，如 forms/customer,pages/dashboard
-  --force             忽略增量缓存，强制重建
+  --force             忽略增量缓存，强制重建页面产物
   --dry-run           只打印增量计划，不构建
   --clean-cache       删除 .openxiangda/build-cache.json
   --no-runtime-cache  强制重建共享 runtime
@@ -339,6 +340,24 @@ async function createCssOptions() {
   };
 }
 
+function createAntdMobilePortalPatchPlugin() {
+  const resolverExpression = `globalThis.${portalContainerResolverGlobal}?.() || document.body`;
+  return {
+    name: "openxiangda-antd-mobile-portal-container",
+    transform(code, id) {
+      if (!id.includes("/antd-mobile/") && !id.includes("\\\\antd-mobile\\\\")) {
+        return null;
+      }
+      const nextCode = code.replace(
+        /getContainer:\s*\(\)\s*=>\s*document\.body/g,
+        `getContainer: () => ${resolverExpression}`,
+      );
+      if (nextCode === code) return null;
+      return { code: nextCode, map: null };
+    },
+  };
+}
+
 function createResolveAlias() {
   return [
     {
@@ -373,7 +392,7 @@ async function buildSharedRuntime(options = {}) {
         "process.env.NODE_ENV": JSON.stringify("production"),
         "process.env": JSON.stringify({ NODE_ENV: "production" }),
       },
-      plugins: [react()],
+      plugins: [createAntdMobilePortalPatchPlugin(), react()],
       resolve: {
         alias: createResolveAlias(),
         dedupe: ["react", "react-dom", "antd", "@ant-design/cssinjs"],
@@ -655,7 +674,11 @@ async function buildPage(page) {
       "process.env.NODE_ENV": JSON.stringify("production"),
       "process.env": JSON.stringify({ NODE_ENV: "production" }),
     },
-    plugins: [createSharedRuntimeProxyPlugin(), react()],
+    plugins: [
+      createAntdMobilePortalPatchPlugin(),
+      createSharedRuntimeProxyPlugin(),
+      react(),
+    ],
     resolve: {
       alias: createResolveAlias(),
       dedupe: ["react", "react-dom", "antd", "@ant-design/cssinjs"],
@@ -731,9 +754,14 @@ async function main() {
     return;
   }
 
-  const only = normalizeOnly(args.only).filter((item) => item.startsWith("pages/"));
-  const filterPage = args.page || (only.length === 1 ? only[0].slice("pages/".length) : "");
-  const pages = (await discoverPages(filterPage)).map((page) => ({
+  const onlyTargets = normalizeOnly(args.only);
+  const only = onlyTargets.filter((item) => item.startsWith("pages/"));
+  if (onlyTargets.length > 0 && only.length === 0) {
+    console.log("[build] pages: No page targets selected");
+    return;
+  }
+  const requested = args.page ? [`pages/${args.page}`] : only;
+  const pages = (await discoverPages("")).map((page) => ({
     ...page,
     key: `pages/${page.dirName}`,
     dirPath: page.dirPath,
@@ -745,16 +773,23 @@ async function main() {
     console.log("未发现复杂代码页，跳过 pages 构建");
     return;
   }
+  const pageKeys = new Set(pages.map((page) => page.key));
+  const missing = requested.filter((key) => !pageKeys.has(key));
+  if (missing.length > 0) {
+    throw new Error(
+      `找不到代码页 ${missing.map((key) => `"${key.slice("pages/".length)}"`).join(", ")}`,
+    );
+  }
 
   const plan = planIncrementalBuild(pages, {
     force: args.force,
-    only: only.length ? only : undefined,
+    only: requested.length ? requested : undefined,
   });
   printPlan(plan, "pages");
   if (args.dryRun) return;
   if (plan.changed.length === 0) return;
 
-  if (plan.fullRebuild && !args.page && only.length === 0) {
+  if (plan.fullRebuild && requested.length === 0) {
     await fs.rm(path.join(distRoot, "pages"), { recursive: true, force: true });
   }
   await fs.mkdir(tmpDir, { recursive: true });

package/packages/sdk/src/build-source/scripts/build-workspace.mjs

@@ -3,12 +3,14 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { rootDir } from "./utils/load-config.mjs";
+import { normalizeOnly } from "./utils/incremental.mjs";
 
 const require = createRequire(import.meta.url);
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const tsxCli = require.resolve("tsx/cli");
 const args = process.argv.slice(2).filter((arg) => arg !== "--");
 const forwardedArgs = [];
+const onlyValues = [];
 
 if (args.includes("--help") || args.includes("-h")) {
   console.log(`
@@ -35,13 +37,32 @@ for (let index = 0; index < args.length; index += 1) {
   }
   if (arg === "--only" && args[index + 1]) {
     forwardedArgs.push(arg, args[index + 1]);
+    onlyValues.push(args[index + 1]);
     index += 1;
   }
   if (arg.startsWith("--only=")) {
     forwardedArgs.push(arg);
+    onlyValues.push(arg.slice("--only=".length));
   }
 }
 
+const onlyTargets = normalizeOnly(onlyValues);
+const invalidOnlyTargets = onlyTargets.filter(
+  (item) => !item.startsWith("forms/") && !item.startsWith("pages/"),
+);
+if (invalidOnlyTargets.length > 0) {
+  console.error(
+    `[build] --only 目标必须以 forms/ 或 pages/ 开头: ${invalidOnlyTargets.join(", ")}`,
+  );
+  process.exit(1);
+}
+
+const hasOnlyTargets = onlyTargets.length > 0;
+const shouldBuildForms =
+  !hasOnlyTargets || onlyTargets.some((item) => item.startsWith("forms/"));
+const shouldBuildPages =
+  !hasOnlyTargets || onlyTargets.some((item) => item.startsWith("pages/"));
+
 const runScript = (scriptName, args) =>
   new Promise((resolve, reject) => {
     const child = spawn(process.execPath, [tsxCli, path.join(scriptDir, scriptName), ...args], {
@@ -60,5 +81,9 @@ const runScript = (scriptName, args) =>
     });
   });
 
-await runScript("build-forms.mjs", forwardedArgs);
-await runScript("build-pages.mjs", forwardedArgs);
+if (shouldBuildForms) {
+  await runScript("build-forms.mjs", forwardedArgs);
+}
+if (shouldBuildPages) {
+  await runScript("build-pages.mjs", forwardedArgs);
+}

package/packages/sdk/src/build-source/scripts/utils/incremental.mjs

@@ -172,6 +172,10 @@ export function commitIncrementalBuild(plan, builtModules) {
   const previous = loadBuildCache();
   const entries = { ...(previous?.entries || {}) };
   const now = new Date().toISOString();
+  const isPartialBuild = plan.selected.length !== plan.all.length;
+  const preserveGlobalSnapshot = Boolean(
+    previous && isPartialBuild && plan.fullRebuild,
+  );
   for (const item of builtModules) {
     entries[item.key] = {
       contentHash: plan.snapshot.moduleHashes[item.key],
@@ -185,9 +189,15 @@ export function commitIncrementalBuild(plan, builtModules) {
     `${JSON.stringify(
       {
         version: CACHE_VERSION,
-        lockfileHash: plan.snapshot.lockfileHash,
-        sharedHash: plan.snapshot.sharedHash,
-        configHash: plan.snapshot.configHash,
+        lockfileHash: preserveGlobalSnapshot
+          ? previous.lockfileHash
+          : plan.snapshot.lockfileHash,
+        sharedHash: preserveGlobalSnapshot
+          ? previous.sharedHash
+          : plan.snapshot.sharedHash,
+        configHash: preserveGlobalSnapshot
+          ? previous.configHash
+          : plan.snapshot.configHash,
         entries,
       },
       null,

package/packages/sdk/src/build-source/src/cli.mjs

@@ -63,6 +63,34 @@ const ignoredDirs = new Set([
 const runtimePackages = ["openxiangda"];
 const runtimePackageRegistry =
   process.env.APP_WORKSPACE_NPM_REGISTRY || "https://registry.npmjs.org/";
+const legacyTemplateTiptapOverrideVersion = "3.23.6";
+const legacyTemplateTiptapOverrideKeys = new Set([
+  "@tiptap/core",
+  "@tiptap/pm",
+  "@tiptap/react",
+  "@tiptap/starter-kit",
+  "@tiptap/extensions",
+  "@tiptap/extension-list",
+  "@tiptap/extension-blockquote",
+  "@tiptap/extension-bold",
+  "@tiptap/extension-bubble-menu",
+  "@tiptap/extension-bullet-list",
+  "@tiptap/extension-character-count",
+  "@tiptap/extension-code",
+  "@tiptap/extension-document",
+  "@tiptap/extension-floating-menu",
+  "@tiptap/extension-hard-break",
+  "@tiptap/extension-heading",
+  "@tiptap/extension-horizontal-rule",
+  "@tiptap/extension-italic",
+  "@tiptap/extension-list-item",
+  "@tiptap/extension-list-keymap",
+  "@tiptap/extension-ordered-list",
+  "@tiptap/extension-paragraph",
+  "@tiptap/extension-placeholder",
+  "@tiptap/extension-strike",
+  "@tiptap/extension-text",
+]);
 
 function usage() {
   return `
@@ -150,6 +178,19 @@ function writeJson(path, value) {
   writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`, "utf-8");
 }
 
+function getLegacyTemplateTiptapOverrideKeys(overrides = {}) {
+  const tiptapKeys = Object.keys(overrides).filter((key) =>
+    key.startsWith("@tiptap/"),
+  );
+  if (tiptapKeys.length === 0) return [];
+  const isLegacyTemplateSet = tiptapKeys.every(
+    (key) =>
+      legacyTemplateTiptapOverrideKeys.has(key) &&
+      overrides[key] === legacyTemplateTiptapOverrideVersion,
+  );
+  return isLegacyTemplateSet ? tiptapKeys : [];
+}
+
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -298,10 +339,8 @@ function updatePackageJson(workspaceRoot, channel) {
     }
   }
   if (pkg.pnpm?.overrides) {
-    for (const key of Object.keys(pkg.pnpm.overrides)) {
-      if (key.startsWith("@tiptap/")) {
-        delete pkg.pnpm.overrides[key];
-      }
+    for (const key of getLegacyTemplateTiptapOverrideKeys(pkg.pnpm.overrides)) {
+      delete pkg.pnpm.overrides[key];
     }
     if (Object.keys(pkg.pnpm.overrides).length === 0) {
       delete pkg.pnpm.overrides;