@testid/antd-testid-runtime 1.0.3 → 1.0.5

package/dist/index.d.mts

@@ -33,10 +33,12 @@ interface TestIdMarkConfig {
     /**
      * Ant Design Vue CSS 类名前缀 (对应 ConfigProvider 的 prefixCls)
      *
-     * 默认: 'ant' → 匹配 .ant-modal, .ant-picker-dropdown 等
-     * 若项目使用 <a-config-provider prefixCls="my-ui"> 则设为 'my-ui'
+     * 支持数组，可同时匹配多个前缀体系:
+     *   默认: ['ant'] → 匹配 .ant-modal, .ant-picker-dropdown 等
+     *   若项目使用 <a-config-provider prefixCls="my-ui"> 则设为 ['my-ui']
+     *   混合使用: ['ant', 'my-ui'] → 同时匹配两个体系的所有浮层组件
      */
-    antdClassPrefix: string;
+    antdClassPrefix: string[];
     /** 忽略不打标的 HTML 标签名 */
     ignoreTags: string[];
     /** 包含此 class 的 DOM 跳过打标 */
@@ -176,11 +178,13 @@ declare function resetPopupCounter(type: PopupType): void;
  */
 declare function getPopupCounterSnapshot(): Record<PopupType, number>;
 /**
- * 生成浮层节点 testid
+ * 生成浮层根节点 testid
  *
- * 格式: ${prefix}${tag}_${counterId}
+ * 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counterId}
+ * 例: hall_dynamic_modal_div_0, hall_dynamic_select_div_2
  *
- * 例: modal_button_0, select_div_2
+ * 浮层均为运行时注入，因此统一使用 runtimePagePrefix 作为前缀，
+ * 与页面内动态节点保持一致。
  *
  * @param type - 浮层类型
  * @param tag - HTML 标签名 (简化后)
@@ -297,6 +301,8 @@ declare class TestIdObserver {
     private reachesBody;
     /**
      * 检测节点 class 是否匹配某个浮层类型
+     *
+     * 遍历 popupClassMap 中的所有 class 组合，任一组合全部命中即匹配。
      */
     private matchPopupClass;
     /**
@@ -308,8 +314,10 @@ declare class TestIdObserver {
     /**
      * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
      *
-     * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-     * 例: hall_modal_button_0, hall_select_div_2
+     * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+     * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+     *
+     * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
      */
     private handlePopupChildNode;
     /**

package/dist/index.d.ts

@@ -33,10 +33,12 @@ interface TestIdMarkConfig {
     /**
      * Ant Design Vue CSS 类名前缀 (对应 ConfigProvider 的 prefixCls)
      *
-     * 默认: 'ant' → 匹配 .ant-modal, .ant-picker-dropdown 等
-     * 若项目使用 <a-config-provider prefixCls="my-ui"> 则设为 'my-ui'
+     * 支持数组，可同时匹配多个前缀体系:
+     *   默认: ['ant'] → 匹配 .ant-modal, .ant-picker-dropdown 等
+     *   若项目使用 <a-config-provider prefixCls="my-ui"> 则设为 ['my-ui']
+     *   混合使用: ['ant', 'my-ui'] → 同时匹配两个体系的所有浮层组件
      */
-    antdClassPrefix: string;
+    antdClassPrefix: string[];
     /** 忽略不打标的 HTML 标签名 */
     ignoreTags: string[];
     /** 包含此 class 的 DOM 跳过打标 */
@@ -176,11 +178,13 @@ declare function resetPopupCounter(type: PopupType): void;
  */
 declare function getPopupCounterSnapshot(): Record<PopupType, number>;
 /**
- * 生成浮层节点 testid
+ * 生成浮层根节点 testid
  *
- * 格式: ${prefix}${tag}_${counterId}
+ * 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counterId}
+ * 例: hall_dynamic_modal_div_0, hall_dynamic_select_div_2
  *
- * 例: modal_button_0, select_div_2
+ * 浮层均为运行时注入，因此统一使用 runtimePagePrefix 作为前缀，
+ * 与页面内动态节点保持一致。
  *
  * @param type - 浮层类型
  * @param tag - HTML 标签名 (简化后)
@@ -297,6 +301,8 @@ declare class TestIdObserver {
     private reachesBody;
     /**
      * 检测节点 class 是否匹配某个浮层类型
+     *
+     * 遍历 popupClassMap 中的所有 class 组合，任一组合全部命中即匹配。
      */
     private matchPopupClass;
     /**
@@ -308,8 +314,10 @@ declare class TestIdObserver {
     /**
      * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
      *
-     * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-     * 例: hall_modal_button_0, hall_select_div_2
+     * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+     * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+     *
+     * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
      */
     private handlePopupChildNode;
     /**

package/dist/index.js

@@ -60,7 +60,7 @@ var defaultConfig = {
   globalPrefix: "",
   compilePrefix: "static_",
   runtimePagePrefix: "dynamic_",
-  antdClassPrefix: "ant",
+  antdClassPrefix: ["ant"],
   popupPrefixMap: {
     modal: "modal_",
     drawer: "drawer_",
@@ -101,9 +101,10 @@ function applyGlobalPrefix(cfg) {
     ...cfg,
     compilePrefix: prepend(cfg.compilePrefix),
     runtimePagePrefix: prepend(cfg.runtimePagePrefix),
-    popupPrefixMap: Object.fromEntries(
-      Object.entries(cfg.popupPrefixMap).map(([k, v]) => [k, prepend(v)])
-    )
+    // 注意: popupPrefixMap 不拼接 globalPrefix
+    // 浮层 testid 格式为 ${runtimePagePrefix}${popupPrefixMap[type]}...，
+    // runtimePagePrefix 已携带 globalPrefix，避免重复
+    popupPrefixMap: { ...cfg.popupPrefixMap }
   };
 }
 var globalConfig = { ...defaultConfig };
@@ -177,25 +178,27 @@ function getPopupCounterSnapshot() {
 }
 function buildPopupTestId(type, tag, counterId) {
   const config = getConfig();
-  const prefix = config.popupPrefixMap[type] || `${type}_`;
-  return `${prefix}${tag}_${counterId}`;
+  const popupPrefix = config.popupPrefixMap[type] || `${type}_`;
+  return `${config.runtimePagePrefix}${popupPrefix}${tag}_${counterId}`;
 }
 
 // src/utils/testIdObserver.ts
 var POPUP_CLASS_SUFFIX_MAP = {
-  modal: ".{prefix}-modal",
-  drawer: ".{prefix}-drawer",
-  select: ".{prefix}-select-dropdown",
-  datePicker: ".{prefix}-picker-dropdown",
-  popconfirm: ".{prefix}-popover.{prefix}-popconfirm",
-  dropdown: ".{prefix}-dropdown",
-  tooltip: ".{prefix}-tooltip"
+  modal: ["-modal"],
+  drawer: ["-drawer"],
+  select: ["-select-dropdown"],
+  datePicker: ["-picker-dropdown"],
+  popconfirm: ["-popover", "-popconfirm"],
+  dropdown: ["-dropdown"],
+  tooltip: ["-tooltip"]
 };
-function buildPopupClassMap(prefix) {
+function buildPopupClassMap(prefixes) {
   const result = {};
   const entries = Object.entries(POPUP_CLASS_SUFFIX_MAP);
-  for (const [type, template] of entries) {
-    result[type] = template.replace(/\{prefix\}/g, prefix);
+  for (const [type, suffixClasses] of entries) {
+    result[type] = prefixes.map(
+      (prefix) => suffixClasses.map((suffix) => `${prefix}${suffix}`)
+    );
   }
   return result;
 }
@@ -448,18 +451,19 @@ var TestIdObserver = class {
   }
   /**
    * 检测节点 class 是否匹配某个浮层类型
+   *
+   * 遍历 popupClassMap 中的所有 class 组合，任一组合全部命中即匹配。
    */
   matchPopupClass(node) {
     const classStr = node.className || "";
     if (typeof classStr !== "string") return null;
+    const classList = classStr.split(/\s+/);
     const entries = Object.entries(this.popupClassMap);
-    for (const [type, selector] of entries) {
-      const classes = selector.replace(/^\./, "").split(".");
-      const allMatch = classes.every(
-        (cls) => classStr.split(/\s+/).includes(cls)
-      );
-      if (allMatch) {
-        return type;
+    for (const [type, selectorSets] of entries) {
+      for (const requiredClasses of selectorSets) {
+        if (requiredClasses.every((cls) => classList.includes(cls))) {
+          return type;
+        }
       }
     }
     return null;
@@ -485,8 +489,10 @@ var TestIdObserver = class {
   /**
    * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
    *
-   * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-   * 例: hall_modal_button_0, hall_select_div_2
+   * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+   * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+   *
+   * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
    */
   handlePopupChildNode(node, popupType, config) {
     if (config.onlyInteractive && !this.isInteractive(node)) return;
@@ -494,8 +500,8 @@ var TestIdObserver = class {
     const key = `${popupType}_${tag}`;
     const current = this.state.popupChildCounter.get(key) ?? 0;
     this.state.popupChildCounter.set(key, current + 1);
-    const prefix = config.popupPrefixMap[popupType] || `${popupType}_`;
-    const testId = `${prefix}${tag}_${current}`;
+    const popupPrefix = config.popupPrefixMap[popupType] || `${popupType}_`;
+    const testId = `${config.runtimePagePrefix}${popupPrefix}${tag}_${current}`;
     node.setAttribute("data-testid", testId);
   }
   // ==========================================================

package/dist/index.mjs

@@ -18,7 +18,7 @@ var defaultConfig = {
   globalPrefix: "",
   compilePrefix: "static_",
   runtimePagePrefix: "dynamic_",
-  antdClassPrefix: "ant",
+  antdClassPrefix: ["ant"],
   popupPrefixMap: {
     modal: "modal_",
     drawer: "drawer_",
@@ -59,9 +59,10 @@ function applyGlobalPrefix(cfg) {
     ...cfg,
     compilePrefix: prepend(cfg.compilePrefix),
     runtimePagePrefix: prepend(cfg.runtimePagePrefix),
-    popupPrefixMap: Object.fromEntries(
-      Object.entries(cfg.popupPrefixMap).map(([k, v]) => [k, prepend(v)])
-    )
+    // 注意: popupPrefixMap 不拼接 globalPrefix
+    // 浮层 testid 格式为 ${runtimePagePrefix}${popupPrefixMap[type]}...，
+    // runtimePagePrefix 已携带 globalPrefix，避免重复
+    popupPrefixMap: { ...cfg.popupPrefixMap }
   };
 }
 var globalConfig = { ...defaultConfig };
@@ -135,25 +136,27 @@ function getPopupCounterSnapshot() {
 }
 function buildPopupTestId(type, tag, counterId) {
   const config = getConfig();
-  const prefix = config.popupPrefixMap[type] || `${type}_`;
-  return `${prefix}${tag}_${counterId}`;
+  const popupPrefix = config.popupPrefixMap[type] || `${type}_`;
+  return `${config.runtimePagePrefix}${popupPrefix}${tag}_${counterId}`;
 }
 
 // src/utils/testIdObserver.ts
 var POPUP_CLASS_SUFFIX_MAP = {
-  modal: ".{prefix}-modal",
-  drawer: ".{prefix}-drawer",
-  select: ".{prefix}-select-dropdown",
-  datePicker: ".{prefix}-picker-dropdown",
-  popconfirm: ".{prefix}-popover.{prefix}-popconfirm",
-  dropdown: ".{prefix}-dropdown",
-  tooltip: ".{prefix}-tooltip"
+  modal: ["-modal"],
+  drawer: ["-drawer"],
+  select: ["-select-dropdown"],
+  datePicker: ["-picker-dropdown"],
+  popconfirm: ["-popover", "-popconfirm"],
+  dropdown: ["-dropdown"],
+  tooltip: ["-tooltip"]
 };
-function buildPopupClassMap(prefix) {
+function buildPopupClassMap(prefixes) {
   const result = {};
   const entries = Object.entries(POPUP_CLASS_SUFFIX_MAP);
-  for (const [type, template] of entries) {
-    result[type] = template.replace(/\{prefix\}/g, prefix);
+  for (const [type, suffixClasses] of entries) {
+    result[type] = prefixes.map(
+      (prefix) => suffixClasses.map((suffix) => `${prefix}${suffix}`)
+    );
   }
   return result;
 }
@@ -406,18 +409,19 @@ var TestIdObserver = class {
   }
   /**
    * 检测节点 class 是否匹配某个浮层类型
+   *
+   * 遍历 popupClassMap 中的所有 class 组合，任一组合全部命中即匹配。
    */
   matchPopupClass(node) {
     const classStr = node.className || "";
     if (typeof classStr !== "string") return null;
+    const classList = classStr.split(/\s+/);
     const entries = Object.entries(this.popupClassMap);
-    for (const [type, selector] of entries) {
-      const classes = selector.replace(/^\./, "").split(".");
-      const allMatch = classes.every(
-        (cls) => classStr.split(/\s+/).includes(cls)
-      );
-      if (allMatch) {
-        return type;
+    for (const [type, selectorSets] of entries) {
+      for (const requiredClasses of selectorSets) {
+        if (requiredClasses.every((cls) => classList.includes(cls))) {
+          return type;
+        }
       }
     }
     return null;
@@ -443,8 +447,10 @@ var TestIdObserver = class {
   /**
    * 处理浮层内部子节点 (Modal/Drawer/Dropdown 内的按钮、输入框等)
    *
-   * ID 格式: ${popupPrefix}${popupType}_${tag}_${counter}
-   * 例: hall_modal_button_0, hall_select_div_2
+   * ID 格式: ${runtimePagePrefix}${popupPrefix}${tag}_${counter}
+   * 例: hall_dynamic_modal_button_0, hall_dynamic_select_div_2
+   *
+   * 浮层子元素均为运行时注入，统一使用 runtimePagePrefix 前缀。
    */
   handlePopupChildNode(node, popupType, config) {
     if (config.onlyInteractive && !this.isInteractive(node)) return;
@@ -452,8 +458,8 @@ var TestIdObserver = class {
     const key = `${popupType}_${tag}`;
     const current = this.state.popupChildCounter.get(key) ?? 0;
     this.state.popupChildCounter.set(key, current + 1);
-    const prefix = config.popupPrefixMap[popupType] || `${popupType}_`;
-    const testId = `${prefix}${tag}_${current}`;
+    const popupPrefix = config.popupPrefixMap[popupType] || `${popupType}_`;
+    const testId = `${config.runtimePagePrefix}${popupPrefix}${tag}_${current}`;
     node.setAttribute("data-testid", testId);
   }
   // ==========================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testid/antd-testid-runtime",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "运行时兜底打标模块 — MutationObserver + 锚点计数器 + 浮层计数器 + ID 重复检测",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",