@ibiz-template/model-helper 0.1.28 → 0.1.29

package/out/model/PSSYSAPP.d.ts

@@ -0,0 +1,2 @@
+export declare const PSSysApp: IModel;
+//# sourceMappingURL=PSSYSAPP.d.ts.map

package/out/model/PSSYSAPP.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PSSYSAPP.d.ts","sourceRoot":"","sources":["../../src/model/PSSYSAPP.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,EAAE,MAWtB,CAAC"}

package/out/model/PSSYSAPP.js

@@ -0,0 +1,12 @@
+export const PSSysApp = {
+    getAllPSAppDEUIActions: {
+        New: {
+            refreshMode: 1,
+            reloadData: true,
+            showBusyIndicator: true,
+        },
+        Save: {
+            showBusyIndicator: false,
+        },
+    },
+};

package/out/model-util.d.ts

@@ -58,6 +58,15 @@ export declare class ModelUtil {
      * @return {*}  {Promise<void>}
      */
     init(): Promise<void>;
+    /**
+     * 特殊处理应用模型
+     *
+     * @author chitanda
+     * @date 2023-09-21 15:09:07
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected specialHandling(): Promise<void>;
     /**
      * 获取应用模型
      *

package/out/model-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtD;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IA5C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,GAAG,EAAE,OAAO,EACZ,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD3B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}
+{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,eAAe,EAAE,MAAM,SAAS,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IA5C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,GAAG,EAAE,OAAO,EACZ,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD3B;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}

package/out/model-util.js

@@ -1,5 +1,6 @@
 import { calcUniqueTag } from '@ibiz/rt-model-api';
-import { formatPath, ServicePathUtil } from './utils';
+import { formatPath, mergeModel, ServicePathUtil } from './utils';
+import { PSSysApp } from './model/PSSYSAPP';
 /**
  * 全动模型处理工具类,每个App一个实例
  *
@@ -44,6 +45,7 @@ export class ModelUtil {
      */
     async init() {
         await this.getAppModel();
+        await this.specialHandling();
         // 填充缓存模型
         {
             const { cache } = this.appModel;
@@ -89,6 +91,18 @@ export class ModelUtil {
             ibiz.env.isEnableMultiLan = false;
         }
     }
+    /**
+     * 特殊处理应用模型
+     *
+     * @author chitanda
+     * @date 2023-09-21 15:09:07
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    async specialHandling() {
+        // 特殊处理预置全局界面行为，附加一些特殊的模板预置模型
+        mergeModel(this.appModel.getAllPSAppDEUIActions, PSSysApp.getAllPSAppDEUIActions, 'codeName');
+    }
     /**
      * 获取应用模型
      *

package/out/utils/index.d.ts

@@ -1,4 +1,5 @@
+export { formatPath } from './format-path/format-path';
+export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathDeep, ServicePathItem, ServicePathUtil, } from './service-path-util/service-path-util';
-export { formatPath } from './format-path/format-path';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC"}

package/out/utils/index.js

@@ -1,3 +1,4 @@
+export { formatPath } from './format-path/format-path';
+export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathUtil, } from './service-path-util/service-path-util';
-export { formatPath } from './format-path/format-path';

package/out/utils/merge-model/merge-model.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 将预置的模型合并到当前模型中
+ *
+ * @author chitanda
+ * @date 2023-09-22 10:09:10
+ * @export
+ * @param {IModel[]} models
+ * @param {IModel} m
+ * @param {string} tag
+ */
+export declare function mergeModel(models: IModel[], m: IModel, tag: string): void;
+//# sourceMappingURL=merge-model.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-model.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAOzE"}

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

@@ -0,0 +1,19 @@
+import { mergeDeepLeft } from 'ramda';
+/**
+ * 将预置的模型合并到当前模型中
+ *
+ * @author chitanda
+ * @date 2023-09-22 10:09:10
+ * @export
+ * @param {IModel[]} models
+ * @param {IModel} m
+ * @param {string} tag
+ */
+export function mergeModel(models, m, tag) {
+    models.forEach(model => {
+        const item = m[model[tag]];
+        if (item) {
+            Object.assign(model, mergeDeepLeft(model, item));
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -30,15 +30,18 @@
   "license": "MIT",
   "dependencies": {
     "@ibiz/model-core": "^0.0.18",
-    "@ibiz/rt-model-api": "^0.1.19",
-    "pluralize": "^8.0.0"
+    "@ibiz/rt-model-api": "^0.1.20",
+    "pluralize": "^8.0.0",
+    "ramda": "^0.29.0"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.1.28",
-    "@types/pluralize": "^0.0.30"
+    "@ibiz-template/runtime": "^0.1.29",
+    "@types/pluralize": "^0.0.31",
+    "@types/ramda": "^0.29.4"
   },
   "peerDependencies": {
-    "@ibiz-template/runtime": "^0.1.0"
+    "@ibiz-template/runtime": "^0.1.0",
+    "ramda": "^0.29.0"
   },
-  "gitHead": "143f856b53d9767d9ce655551148ab6d6abd2482"
+  "gitHead": "ad1df38edba37a696e639c986b12087f72ead394"
 }

package/src/model/PSSYSAPP.ts

@@ -0,0 +1,12 @@
+export const PSSysApp: IModel = {
+  getAllPSAppDEUIActions: {
+    New: {
+      refreshMode: 1,
+      reloadData: true,
+      showBusyIndicator: true,
+    },
+    Save: {
+      showBusyIndicator: false,
+    },
+  },
+};

package/src/model-util.ts

@@ -1,6 +1,7 @@
 import { calcUniqueTag } from '@ibiz/rt-model-api';
 import { IAppDERS } from '@ibiz/model-core';
-import { formatPath, ServicePathUtil } from './utils';
+import { formatPath, mergeModel, ServicePathUtil } from './utils';
+import { PSSysApp } from './model/PSSYSAPP';
 
 /**
  * 全动模型处理工具类,每个App一个实例
@@ -67,6 +68,7 @@ export class ModelUtil {
    */
   async init(): Promise<void> {
     await this.getAppModel();
+    await this.specialHandling();
     // 填充缓存模型
     {
       const { cache } = this.appModel;
@@ -116,6 +118,23 @@ export class ModelUtil {
     }
   }
 
+  /**
+   * 特殊处理应用模型
+   *
+   * @author chitanda
+   * @date 2023-09-21 15:09:07
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async specialHandling(): Promise<void> {
+    // 特殊处理预置全局界面行为，附加一些特殊的模板预置模型
+    mergeModel(
+      this.appModel.getAllPSAppDEUIActions,
+      PSSysApp.getAllPSAppDEUIActions,
+      'codeName',
+    );
+  }
+
   /**
    * 获取应用模型
    *

package/src/utils/index.ts

@@ -1,7 +1,8 @@
+export { formatPath } from './format-path/format-path';
+export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export {
   ServicePathDeep,
   ServicePathItem,
   ServicePathUtil,
 } from './service-path-util/service-path-util';
-export { formatPath } from './format-path/format-path';

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

@@ -0,0 +1,20 @@
+import { mergeDeepLeft } from 'ramda';
+
+/**
+ * 将预置的模型合并到当前模型中
+ *
+ * @author chitanda
+ * @date 2023-09-22 10:09:10
+ * @export
+ * @param {IModel[]} models
+ * @param {IModel} m
+ * @param {string} tag
+ */
+export function mergeModel(models: IModel[], m: IModel, tag: string): void {
+  models.forEach(model => {
+    const item = m[model[tag]];
+    if (item) {
+      Object.assign(model, mergeDeepLeft(model, item));
+    }
+  });
+}