@ibiz-template/model-helper 0.7.41-alpha.141 → 0.7.41-alpha.142

package/out/utils/model-transformer/model-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-transformer.d.ts","sourceRoot":"","sources":["../../../src/utils/model-transformer/model-transformer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAmB;IAElD;;;;;OAKG;WACW,WAAW,IAAI,gBAAgB;IAO7C;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAA0C;IAE5D;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAoB;IAEvC;;;;;OAKG;IACI,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAYxE;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;OAMG;IACI,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAiDnE"}
+{"version":3,"file":"model-transformer.d.ts","sourceRoot":"","sources":["../../../src/utils/model-transformer/model-transformer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAmB;IAElD;;;;;OAKG;WACW,WAAW,IAAI,gBAAgB;IAO7C;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAA0C;IAE5D;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAoB;IAEvC;;;;;OAKG;IACI,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAiBxE;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;OAMG;IACI,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CA2DnE"}

package/out/utils/model-transformer/model-transformer.js

@@ -42,6 +42,11 @@ export class ModelTransformer {
      * @memberof ModelTransformer
      */
     registerHandler(pathPattern, handler) {
+        // 兼容未传入PSSYSAPPS段的情况，自动补充「PSSYSAPPS/临时应用标识」前缀；
+        // 其中ibiz.__TEMPAPPID__为加载扩展插件期间记录的临时应用标识（始终为小写）
+        if (!pathPattern.startsWith('PSSYSAPPS')) {
+            pathPattern = `PSSYSAPPS/${ibiz.__TEMPAPPID__}/${pathPattern}`;
+        }
         if (!this.validatePattern(pathPattern)) {
             return;
         }
@@ -84,10 +89,19 @@ export class ModelTransformer {
         ibiz.log.debug(ibiz.i18n.t('modelHelper.utils.tryGetModel', {
             dynaModelFilePath,
         }));
-        // 收集所有匹配当前路径的处理器（支持通配符路径）
+        // 归一化匹配路径：dynaModelFilePath始终以PSSYSAPPS开头，其后（下标1）即为应用标识段；
+        // 注册时自动补充的ibiz.__TEMPAPPID__始终为小写，而此处应用标识可能大小写混合，统一转为小写用于匹配
+        const pathSegments = dynaModelFilePath.split('/');
+        pathSegments[1] = pathSegments[1].toLowerCase();
+        const normalizedPath = pathSegments.join('/');
+        // 收集所有匹配当前路径的处理器（支持通配符路径）：
+        // 同时使用原始路径与小写化路径匹配，兼容「未传PSSYSAPPS段自动补充（应用标识为小写）」
+        // 与「显式传入PSSYSAPPS完整路径（应用标识保持原样）」两种注册方式
         const matchedHandlers = [];
         this.handlerMap.forEach((handlers, pattern) => {
-            if (this.pathMatcher.match(pattern, dynaModelFilePath)) {
+            const isMatch = this.pathMatcher.match(pattern, dynaModelFilePath) ||
+                this.pathMatcher.match(pattern, normalizedPath);
+            if (isMatch) {
                 matchedHandlers.push(...handlers);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.7.41-alpha.141",
+  "version": "0.7.41-alpha.142",
   "description": "模型辅助库",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -39,7 +39,7 @@
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.41-alpha.141",
+    "@ibiz-template/runtime": "^0.7.41-alpha.142",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },
@@ -47,5 +47,5 @@
     "@ibiz-template/runtime": "^0.6.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "819aca6fd5a31cfeccd9940a3bb866537bce6026"
+  "gitHead": "16456661afe5fa7de7d3cda608997ea1f78b1646"
 }

package/src/utils/model-transformer/model-transformer.ts

@@ -54,6 +54,11 @@ export class ModelTransformer {
    * @memberof ModelTransformer
    */
   public registerHandler(pathPattern: string, handler: ModelHandler): void {
+    // 兼容未传入PSSYSAPPS段的情况，自动补充「PSSYSAPPS/临时应用标识」前缀；
+    // 其中ibiz.__TEMPAPPID__为加载扩展插件期间记录的临时应用标识（始终为小写）
+    if (!pathPattern.startsWith('PSSYSAPPS')) {
+      pathPattern = `PSSYSAPPS/${ibiz.__TEMPAPPID__}/${pathPattern}`;
+    }
     if (!this.validatePattern(pathPattern)) {
       return;
     }
@@ -101,10 +106,20 @@ export class ModelTransformer {
         dynaModelFilePath,
       }),
     );
-    // 收集所有匹配当前路径的处理器（支持通配符路径）
+    // 归一化匹配路径：dynaModelFilePath始终以PSSYSAPPS开头，其后（下标1）即为应用标识段；
+    // 注册时自动补充的ibiz.__TEMPAPPID__始终为小写，而此处应用标识可能大小写混合，统一转为小写用于匹配
+    const pathSegments = dynaModelFilePath.split('/');
+    pathSegments[1] = pathSegments[1].toLowerCase();
+    const normalizedPath = pathSegments.join('/');
+    // 收集所有匹配当前路径的处理器（支持通配符路径）：
+    // 同时使用原始路径与小写化路径匹配，兼容「未传PSSYSAPPS段自动补充（应用标识为小写）」
+    // 与「显式传入PSSYSAPPS完整路径（应用标识保持原样）」两种注册方式
     const matchedHandlers: ModelHandler[] = [];
     this.handlerMap.forEach((handlers: ModelHandler[], pattern: string) => {
-      if (this.pathMatcher.match(pattern, dynaModelFilePath)) {
+      const isMatch =
+        this.pathMatcher.match(pattern, dynaModelFilePath) ||
+        this.pathMatcher.match(pattern, normalizedPath);
+      if (isMatch) {
         matchedHandlers.push(...handlers);
       }
     });