@ibiz-template/model-helper 0.6.0 → 0.6.1-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.6.0",
+  "version": "0.6.1-dev.1",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -12,8 +12,7 @@
   },
   "files": [
     "dist",
-    "out",
-    "src"
+    "out"
   ],
   "scripts": {
     "dev": "tsc --watch",
@@ -39,7 +38,7 @@
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.6.0",
+    "@ibiz-template/runtime": "^0.6.1-dev.1",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },
@@ -47,5 +46,5 @@
     "@ibiz-template/runtime": "^0.6.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "fde8aab467f41640a2d9a20bd0237a3d956b69ae"
+  "gitHead": "5f8ce122d58af1b3ae28e3e389c4384780013e12"
 }

package/src/index.ts

@@ -1,12 +0,0 @@
-import '@ibiz/model-core';
-import '@ibiz-template/runtime';
-
-export * from './model-helper';
-export { ModelHelper } from './model-helper';
-
-declare global {
-  interface IObject {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    [key: string | symbol]: any;
-  }
-}

package/src/model/PSSYSAPP.ts

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

package/src/model-helper.ts

@@ -1,360 +0,0 @@
-import {
-  IAppCodeList,
-  IAppDataEntity,
-  IAppView,
-  IApplication,
-  IAppLan,
-  ISubAppRef,
-  IAppMenuModel,
-  IAppMenu,
-} from '@ibiz/model-core';
-import { DSLHelper } from '@ibiz/rt-model-api';
-import { ModelUtil } from './model-util';
-import { ModelLoader } from './model-loader';
-import { mergeAppMenu, plural } from './utils';
-
-/**
- * 模型加载工具类
- *
- * @author chitanda
- * @date 2023-04-16 17:04:46
- * @export
- * @class ModelHelper
- */
-export class ModelHelper {
-  protected dsl = new DSLHelper();
-
-  /**
-   * 当前子应用清单
-   *
-   * @author chitanda
-   * @date 2023-12-06 15:12:30
-   * @protected
-   * @type {ISubAppRef[]}
-   */
-  protected subAppRefs: ISubAppRef[] = [];
-
-  /**
-   * 模型获取工具类缓存
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:56
-   * @protected
-   * @type {Map<string, ModelUtil>}
-   */
-  protected cache: Map<string, ModelUtil> = new Map();
-
-  /**
-   * Creates an instance of ModelHelper.
-   * @author chitanda
-   * @date 2024-01-08 10:01:20
-   * @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
-   * @param {string} defaultAppId 默认应用标识
-   * @param {boolean} [permission=true] 是否启用权限
-   */
-  constructor(
-    protected getModel: (url: string, params?: IParams) => Promise<IModel>,
-    protected defaultAppId: string,
-    protected permission: boolean = true,
-  ) {
-    ibiz.hub.registerModelLoaderProvider(new ModelLoader(this));
-  }
-
-  /**
-   * 初始化应用内容
-   *
-   * @author chitanda
-   * @date 2023-12-06 17:12:51
-   * @param {string} [id]
-   * @return {*}  {Promise<boolean>}
-   */
-  async initApp(id?: string): Promise<boolean> {
-    await this.initToHub(id);
-    return true;
-  }
-
-  /**
-   * 初始化具体应用模型工具类
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:41
-   * @param {string} modelTag
-   * @param {string} [appId=this.defaultAppId]
-   * @return {*}  {Promise<void>}
-   */
-  async initModelUtil(
-    modelTag: string,
-    appId: string = this.defaultAppId,
-  ): Promise<void> {
-    const modelUtil = new ModelUtil(
-      appId,
-      modelTag,
-      this.getModel,
-      this.defaultAppId === appId,
-      this.permission,
-    );
-    await modelUtil.init();
-    this.cache.set(appId, modelUtil);
-  }
-
-  /**
-   * 初始化模型至Hub中
-   *
-   * @author chitanda
-   * @date 2023-04-17 14:04:55
-   * @protected
-   * @param {(string | IObject)} [appId]
-   * @return {*}  {Promise<void>}
-   */
-  protected async initToHub(appId?: string | IObject): Promise<void> {
-    const id: string = this.calcAppId(appId);
-    const app = ibiz.hub.getApp(id);
-    const modelUtil = this.getModelUtil(appId);
-    const appSourceModel = await modelUtil.getAppModel();
-    // 将引用的视图注册到 hub 清单中，只有主应用才会注册。子应用的注册由主应用在初始化子应用时搞定
-    if (appSourceModel.getAllPSAppViews && appId === ibiz.env.appId) {
-      const appViews = appSourceModel.getAllPSAppViews as IModel[];
-      appViews.forEach(appView => {
-        ibiz.hub.setAppView(appView.id, appSourceModel.id, appView.priority);
-      });
-    }
-    if (appSourceModel.getDefaultPSAppIndexView) {
-      const view = appSourceModel.getDefaultPSAppIndexView as IModel;
-      const name = view.path.split('/').pop().replace('.json', '');
-      ibiz.hub.defaultAppIndexViewName = name;
-    }
-    if (appSourceModel.getAllPSAppCodeLists) {
-      const codeLists = appSourceModel.getAllPSAppCodeLists as IAppCodeList[];
-      codeLists.forEach(codeList => {
-        app.codeList.setCodeList(
-          this.dsl.appCodeList(codeList) as IAppCodeList,
-        );
-      });
-    }
-    if (appSourceModel.getAllPSAppDataEntities) {
-      const dataEntities = appSourceModel.getAllPSAppDataEntities as IModel[];
-      dataEntities.forEach(dataEntity => {
-        app.deName2DeCodeName.set(dataEntity.name, dataEntity.codeName);
-      });
-    }
-    // 模型扩展标准视图布局面板
-    const subViewRefs = app.model.appSubViewTypeRefs || [];
-    subViewRefs.forEach(item => {
-      if (item.replaceDefault) {
-        ibiz.util.layoutPanel.register(
-          `${item.viewType}_DEFAULT`,
-          item.viewLayoutPanel!,
-        );
-      }
-    });
-    // 子应用模型相关处理
-    {
-      const { subAppRefs = [] } = app.model;
-      const { getAllPSSubAppRefs = [] } = appSourceModel;
-      for (let i = 0; i < subAppRefs.length; i++) {
-        const subApp = subAppRefs[i];
-        const sourceSubApp = getAllPSSubAppRefs[i];
-        // eslint-disable-next-line no-await-in-loop
-        await this.initSubApp(app, subApp, sourceSubApp);
-      }
-    }
-  }
-
-  /**
-   * 初始化子应用相关内容
-   *
-   * @author chitanda
-   * @date 2023-12-06 15:12:23
-   * @protected
-   * @param {IApplication} app
-   * @param {ISubAppRef} subApp
-   * @return {*}  {Promise<void>}
-   */
-  protected async initSubApp(
-    app: IApplication,
-    subApp: ISubAppRef,
-    sourceSubApp: IModel,
-  ): Promise<void> {
-    this.subAppRefs.push(subApp);
-    const ids = subApp.appViewIds || [];
-    const views = sourceSubApp.getAllPSAppViews || [];
-    ids.forEach((id, index) => {
-      const view = views[index];
-      ibiz.hub.setAppView(id, subApp.id, view.priority);
-    });
-  }
-
-  /**
-   * 获取应用模型
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:13
-   * @param {(string | IObject)} [appId]
-   * @return {*}  {Promise<IApplication>}
-   */
-  async getAppModel(appId?: string | IObject): Promise<IApplication> {
-    const id: string = this.calcAppId(appId);
-    if (!this.cache.has(id)) {
-      const data = ibiz.appData || {};
-      await this.initModelUtil(data.dynamodeltag, id);
-    }
-    const model = await this.getModelUtil(appId).getAppModel();
-    const app = this.dsl.application(model) as IApplication;
-    return app;
-  }
-
-  /**
-   * 获取应用全局样式
-   *
-   * @author chitanda
-   * @date 2023-09-06 10:09:48
-   * @param {(string | IObject)} [appId]
-   * @return {*}  {(Promise<string | null>)}
-   */
-  getAppStyle(appId?: string | IObject): Promise<string | null> {
-    return this.getModelUtil(appId).getAppStyle();
-  }
-
-  /**
-   * 根据应用实体 codeName 获取应用实体模型
-   *
-   * @author chitanda
-   * @date 2023-04-16 18:04:33
-   * @param {string} name
-   * @param {(string | IObject)} [appId]
-   * @param {boolean} [isId]
-   * @return {*}  {Promise<IAppDataEntity>}
-   */
-  async getAppDataEntityModel(
-    name: string,
-    appId?: string | IObject,
-    isId?: boolean,
-  ): Promise<IAppDataEntity> {
-    const util = this.getModelUtil(appId);
-    const model = await util.getAppDataEntityModel(name, isId, true);
-    const dsl = this.dsl.appDataEntity(model) as IAppDataEntity;
-    const list = util.servicePathUtil.calcRequestPaths(dsl.id!);
-    dsl.requestPaths = list;
-    dsl.codeName2 = plural(dsl.codeName!.toLowerCase());
-    return dsl;
-  }
-
-  /**
-   * 计算应用视图需要合并的子应用模型
-   *
-   * @author chitanda
-   * @date 2023-12-06 16:12:25
-   * @protected
-   * @param {IAppView} view
-   */
-  protected calcAppViewSubAppModel(view: IAppView): void {
-    if (view.viewType === 'APPINDEXVIEW') {
-      if (view.controls) {
-        view.controls.forEach((ctrl: IAppMenu) => {
-          if (ctrl.controlType === 'APPMENU') {
-            ctrl = ctrl as IAppMenuModel;
-            mergeAppMenu(ctrl, this.subAppRefs);
-          }
-        });
-      }
-    }
-  }
-
-  /**
-   * 根据应用视图 codeName 获取应用视图模型
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:38
-   * @param {string} name
-   * @param {(string | IObject)} [appId]
-   * @return {*}  {Promise<IAppView>}
-   */
-  async getAppViewModel(
-    name: string,
-    appId?: string | IObject,
-  ): Promise<IAppView> {
-    const model = await this.getModelUtil(appId).getAppViewModel(name);
-    const dsl = this.dsl.appView(model) as IAppView;
-    this.calcAppViewSubAppModel(dsl);
-    return dsl;
-  }
-
-  /**
-   * 根据路径和参数加载应用视图模型，主要用于后台根据运行时参数重新计算视图模型
-   *
-   * @author chitanda
-   * @date 2024-01-08 10:01:43
-   * @param {string} viewId
-   * @param {IParams} [params]
-   * @param {string} [appId]
-   * @return {*}  {Promise<IAppView>}
-   */
-  async loadAppViewModel(
-    viewId: string,
-    params?: IParams,
-    appId?: string,
-  ): Promise<IAppView> {
-    const model = await this.getModelUtil(appId).getAppViewModel(
-      viewId,
-      params,
-      true,
-    );
-    const dsl = this.dsl.appView(model) as IAppView;
-    return dsl;
-  }
-
-  /**
-   * 获取应用多语言模型
-   *
-   * @author chitanda
-   * @date 2023-08-24 21:08:17
-   * @param {string} language
-   * @param {(string | IObject)} [appId]
-   * @return {*}  {Promise<IAppLan>}
-   */
-  async getPSAppLang(
-    language: string,
-    appId?: string | IObject,
-  ): Promise<IAppLan> {
-    const model = await this.getModelUtil(appId).getPSAppLang(language);
-    return this.dsl.appLan(model) as IAppLan;
-  }
-
-  /**
-   * 获取对应模型工具类
-   *
-   * @author chitanda
-   * @date 2023-04-16 18:04:08
-   * @protected
-   * @param {(IObject | string)} context
-   * @return {*}  {ModelUtil}
-   */
-  protected getModelUtil(
-    context: IObject | string = this.defaultAppId,
-  ): ModelUtil {
-    const appId: string = this.calcAppId(context);
-    if (this.cache.has(appId)) {
-      return this.cache.get(appId)!;
-    }
-    throw new Error(`[${appId}]未初始化，请先调用 initModelUtil 方法初始化`);
-  }
-
-  /**
-   * 计算应用标识
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:19
-   * @protected
-   * @param {(IObject | string)} [data=this.defaultAppId]
-   * @return {*}  {string}
-   */
-  protected calcAppId(data: IObject | string = this.defaultAppId): string {
-    let appId: string;
-    if (typeof data === 'string') {
-      appId = data;
-    } else {
-      appId = (data as { appId: string }).appId;
-    }
-    return appId;
-  }
-}

package/src/model-loader.ts

@@ -1,51 +0,0 @@
-import { ModelLoaderProvider } from '@ibiz-template/runtime';
-import { IApplication, IAppView, IAppDataEntity } from '@ibiz/model-core';
-import { ModelHelper } from './model-helper';
-
-/**
- * 模型加载适配器
- *
- * @author chitanda
- * @date 2023-04-17 23:04:44
- * @export
- * @class ModelLoader
- * @implements {ModelLoaderProvider}
- */
-export class ModelLoader implements ModelLoaderProvider {
-  constructor(protected helper: ModelHelper) {}
-
-  initApp(id?: string): Promise<boolean> {
-    return this.helper.initApp(id);
-  }
-
-  getApp(id?: string): Promise<IApplication> {
-    return this.helper.getAppModel(id);
-  }
-
-  getAppView(appId: string, codeName: string): Promise<IAppView> {
-    return this.helper.getAppViewModel(codeName, appId);
-  }
-
-  getAppDataEntity(appId: string, id: string): Promise<IAppDataEntity> {
-    return this.helper.getAppDataEntityModel(id, appId);
-  }
-
-  getAppDataEntityByCodeName(
-    appId: string,
-    codeName: string,
-  ): Promise<IAppDataEntity> {
-    return this.helper.getAppDataEntityModel(codeName, appId, false);
-  }
-
-  getAppStyle(appId: string): Promise<string | null> {
-    return this.helper.getAppStyle(appId);
-  }
-
-  loadAppView(
-    appId: string,
-    viewId: string,
-    params: IParams,
-  ): Promise<IAppView> {
-    return this.helper.loadAppViewModel(viewId, params, appId);
-  }
-}

package/src/model-util.ts

@@ -1,400 +0,0 @@
-import { calcUniqueTag } from '@ibiz/rt-model-api';
-import { IAppDERS } from '@ibiz/model-core';
-import { isEmpty } from 'ramda';
-import { formatPath, mergeModel, ServicePathUtil } from './utils';
-import { PSSysApp } from './model/PSSYSAPP';
-
-/**
- * 全动模型处理工具类,每个App一个实例
- *
- * @author chitanda
- * @date 2023-04-16 17:04:06
- * @export
- * @class ModelUtil
- */
-export class ModelUtil {
-  /**
-   * 模型缓存
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:40
-   * @protected
-   * @type {Map<string, IModel>}
-   */
-  protected modelCache: Map<string, IModel> = new Map();
-
-  /**
-   * 应用模型
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:17
-   * @protected
-   * @type {IModel}
-   */
-  protected appModel!: IModel;
-
-  /**
-   * 服务路径计算工具类
-   *
-   * @author chitanda
-   * @date 2023-04-22 12:04:15
-   * @type {ServicePathUtil}
-   */
-  servicePathUtil!: ServicePathUtil;
-
-  /**
-   * Creates an instance of GlobalModel.
-   *
-   * @author chitanda
-   * @date 2023-04-13 21:04:21
-   * @param {string}appId 应用标识
-   * @param {string} modelTag
-   * @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
-   * @param {boolean} hub 是否为 hub 应用基座
-   */
-  constructor(
-    protected appId: string,
-    protected modelTag: string,
-    protected get: (url: string, params?: IParams) => Promise<IModel>,
-    protected hub: boolean,
-    protected permission: boolean = true,
-  ) {}
-
-  /**
-   * 在使用前需要初始化，来进行异步加载
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:35
-   * @return {*}  {Promise<void>}
-   */
-  async init(): Promise<void> {
-    await this.getAppModel();
-    await this.specialHandling();
-    // 填充缓存模型
-    {
-      const { cache } = this.appModel;
-      if (cache) {
-        const views = cache.getPSAppViews;
-        if (views) {
-          views.forEach((item: IModel) => {
-            item.path = item.dynaModelFilePath;
-            const appPath = this.calcAppPath(item.path);
-            this.modelCache.set(appPath, item);
-          });
-          if (this.appModel.getAllPSAppViews == null) {
-            this.appModel.getAllPSAppViews = views;
-          } else {
-            this.appModel.getAllPSAppViews.push(...views);
-          }
-        }
-      }
-    }
-    const allDataEntities = (this.appModel.getAllPSAppDataEntities ||
-      []) as IModel[];
-    allDataEntities.forEach(item => {
-      item.id = calcUniqueTag(item, false);
-    });
-    const allViews = (this.appModel.getAllPSAppViews || []) as IModel[];
-    allViews.forEach(item => {
-      item.id = calcUniqueTag(item, false);
-    });
-    const allAppDERSs = (this.appModel.getAllPSAppDERSs || []) as IModel[];
-    allAppDERSs.forEach(item => {
-      const major = item.getMajorPSAppDataEntity;
-      const minor = item.getMinorPSAppDataEntity;
-      item.majorAppDataEntityId = calcUniqueTag(major, false);
-      item.minorAppDataEntityId = calcUniqueTag(minor, false);
-    });
-    this.servicePathUtil = new ServicePathUtil(
-      allDataEntities,
-      allAppDERSs as IAppDERS[],
-    );
-    if (
-      this.appModel.getAllPSAppLans &&
-      this.appModel.getAllPSAppLans.length > 0
-    ) {
-      ibiz.env.isEnableMultiLan = true;
-    } else {
-      ibiz.env.isEnableMultiLan = false;
-    }
-  }
-
-  /**
-   * 特殊处理应用模型
-   *
-   * @author chitanda
-   * @date 2023-09-21 15:09:07
-   * @protected
-   * @return {*}  {Promise<void>}
-   */
-  protected async specialHandling(): Promise<void> {
-    // 特殊处理预置全局界面行为，附加一些特殊的模板预置模型
-    if (this.appModel.getAllPSAppDEUIActions) {
-      mergeModel(
-        this.appModel.getAllPSAppDEUIActions,
-        PSSysApp.getAllPSAppDEUIActions,
-        'codeName',
-      );
-    }
-  }
-
-  /**
-   * 获取应用模型
-   *
-   * @author chitanda
-   * @date 2023-04-16 17:04:21
-   * @return {*}  {Promise<IModel>}
-   */
-  async getAppModel(): Promise<IModel> {
-    if (!this.appModel) {
-      let appPath: string = '/PSSYSAPP.json';
-      if (this.hub && ibiz.env.hub) {
-        appPath = `/PSSYSAPP.hub.json`;
-      }
-      if (this.permission === false) {
-        appPath = `/simple/PSSYSAPP.simple.json`;
-      }
-      this.appModel = await this.getModel(appPath);
-      this.appModel.id = this.appId;
-    }
-    return this.appModel;
-  }
-
-  /**
-   * 加载应用模型全局样式
-   *
-   * @author chitanda
-   * @date 2023-09-06 10:09:11
-   * @return {*}  {(Promise<string | null>)}
-   */
-  async getAppStyle(): Promise<string | null> {
-    let style: string = '';
-    try {
-      let stylePath: string = '/PSSYSAPP.json.css';
-      if (this.hub && ibiz.env.hub) {
-        stylePath = `/PSSYSAPP.hubsubapp.json.css`;
-      }
-      if (this.permission === false) {
-        stylePath = `/simple/PSSYSAPP.simple.json.css`;
-      }
-      style = await this.getStyleModel(stylePath);
-      if (style) {
-        return style;
-      }
-    } catch (error) {
-      // 忽略样式加载异常
-      ibiz.log.error(error);
-    }
-    return null;
-  }
-
-  /**
-   * 根据应用实体 codeName 或者 id 获取应用实体模型
-   *
-   * @author chitanda
-   * @date 2023-04-16 18:04:45
-   * @param {string} tag
-   * @param {boolean} [isId=true]
-   * @param {boolean} [ignoreCase=false]
-   * @return {*}  {Promise<IModel>}
-   */
-  async getAppDataEntityModel(
-    tag: string,
-    isId: boolean = true,
-    ignoreCase: boolean = false,
-  ): Promise<IModel> {
-    const allDataEntities = this.appModel.getAllPSAppDataEntities as IModel[];
-    if (allDataEntities && allDataEntities.length > 0) {
-      const lowerTag = tag.toLowerCase();
-      let dataEntity: IModel | undefined;
-      if (isId) {
-        dataEntity = allDataEntities.find(v => {
-          if (ignoreCase) {
-            return v.id.toLowerCase() === lowerTag;
-          }
-          return v.id === tag;
-        });
-      } else {
-        dataEntity = allDataEntities.find(v => {
-          if (ignoreCase) {
-            return v.codeName.toLowerCase() === lowerTag;
-          }
-          return v.codeName === tag;
-        });
-      }
-      if (dataEntity) {
-        return this.getModel(dataEntity.path);
-      }
-    }
-    throw new Error(`应用[${this.appId}]未找到数据实体[${tag}]`);
-  }
-
-  /**
-   * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
-   *
-   * @author chitanda
-   * @date 2024-01-15 12:01:36
-   * @param {string} tag
-   * @param {IParams} [params]
-   * @param {boolean} [isDynamic]
-   * @return {*}  {Promise<IModel>}
-   */
-  async getAppViewModel(
-    tag: string,
-    params?: IParams,
-    isDynamic?: boolean,
-  ): Promise<IModel> {
-    const allViews = this.appModel.getAllPSAppViews as IModel[];
-    if (allViews && allViews.length > 0) {
-      const lowerTag = tag.toLowerCase();
-      const exTag = `.${lowerTag}`;
-      const view = allViews.find(
-        v => v.id.endsWith(exTag) || v.id === lowerTag,
-      );
-      if (view) {
-        return this.getModel(view.path, params, isDynamic);
-      }
-    }
-    throw new Error(`应用[${this.appId}]未找到视图[${tag}]`);
-  }
-
-  /**
-   * 加载应用多语言模型
-   *
-   * @author chitanda
-   * @date 2023-08-24 22:08:23
-   * @param {string} language
-   * @return {*}  {Promise<IModel>}
-   */
-  async getPSAppLang(language: string): Promise<IModel> {
-    const app = await this.getAppModel();
-    if (app.getAllPSAppLans) {
-      const langs = app.getAllPSAppLans as IModel[];
-      const lang = langs.find(item => item.language === language);
-      if (lang) {
-        return this.getModel(lang.path);
-      }
-      ibiz.log.error(`[${language}]语言未支持`);
-    }
-    return {};
-  }
-
-  /**
-   * 加载应用样式字符串
-   *
-   * @author chitanda
-   * @date 2023-09-07 11:09:11
-   * @param {string} modelPath
-   * @return {*}  {Promise<string>}
-   */
-  getStyleModel(modelPath: string): Promise<string> {
-    let url: string;
-    if (this.hub) {
-      url = this.calcAppPath(modelPath);
-    } else {
-      url = this.calcSubAppPath(modelPath);
-    }
-    return this.get(url) as unknown as Promise<string>;
-  }
-
-  /**
-   * 加载模型，如果给了 params 则不会缓存模型
-   *
-   * @author chitanda
-   * @date 2024-01-15 12:01:57
-   * @param {string} modelPath
-   * @param {IParams} [params]
-   * @param {boolean} [isDynamic]
-   * @return {*}  {Promise<IModel>}
-   */
-  async getModel(
-    modelPath: string,
-    params?: IParams,
-    isDynamic?: boolean,
-  ): Promise<IModel> {
-    let url: string;
-    if (this.hub) {
-      url = this.calcAppPath(modelPath, isDynamic);
-    } else {
-      url = this.calcSubAppPath(modelPath, isDynamic);
-    }
-    const isParams = params && !isEmpty(params);
-    if (this.modelCache.has(url) && !isParams) {
-      return this.modelCache.get(url)!;
-    }
-    const model = await this.get(url, params);
-    if (!isParams) {
-      this.modelCache.set(url, model);
-    }
-    this.deepFillAppId(model);
-    return model;
-  }
-
-  /**
-   * 递归填充应用标识
-   *
-   * @author chitanda
-   * @date 2023-08-21 10:08:41
-   * @protected
-   * @param {IModel} model
-   */
-  protected deepFillAppId(model: IModel): void {
-    model.appId = this.appId;
-    const keys = Object.keys(model);
-    keys.forEach(key => {
-      const value = model[key];
-      if (value && typeof value === 'object') {
-        if (Array.isArray(value)) {
-          value.forEach(item => {
-            if (item && typeof item === 'object') {
-              this.deepFillAppId(item);
-            }
-          });
-        } else {
-          this.deepFillAppId(value);
-        }
-      }
-    });
-  }
-
-  /**
-   * 计算应用模型请求路径
-   *
-   * @author chitanda
-   * @date 2024-01-15 12:01:45
-   * @protected
-   * @param {string} modelPath
-   * @param {boolean} [isDynamic=false]
-   * @return {*}  {string}
-   */
-  protected calcAppPath(modelPath: string, isDynamic: boolean = false): string {
-    if (isDynamic) {
-      return formatPath(modelPath);
-    }
-    return `${formatPath(modelPath)}${
-      this.modelTag ? `?dynamodeltag=${this.modelTag}` : ''
-    }`;
-  }
-
-  /**
-   * 计算子应用模型请求路径
-   *
-   * @author chitanda
-   * @date 2024-01-15 12:01:39
-   * @protected
-   * @param {string} modelPath
-   * @param {boolean} [isDynamic=false]
-   * @return {*}  {string}
-   */
-  protected calcSubAppPath(
-    modelPath: string,
-    isDynamic: boolean = false,
-  ): string {
-    if (isDynamic) {
-      return `/subapps/${this.appId}${formatPath(modelPath)}`;
-    }
-    return `/subapps/${this.appId}${formatPath(modelPath)}?dynamodeltag=${
-      this.modelTag
-    }`;
-  }
-}

package/src/utils/format-path/format-path.ts

@@ -1,9 +0,0 @@
-export function formatPath(path: string): string {
-  // 合成路径，需要判断模型路径是否从 PSSYSAPPS 开始
-  if (path?.indexOf('PSSYSAPPS/') === 0) {
-    // 合成路径
-    const pos = path.indexOf('/');
-    return path.substring(path.indexOf('/', pos + 1));
-  }
-  return path;
-}

package/src/utils/index.ts

@@ -1,9 +0,0 @@
-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 { mergeAppMenu } from './merge-model/merge-app-menu';

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

@@ -1,84 +0,0 @@
-import { IAppMenuItem, IAppMenuModel, ISubAppRef } from '@ibiz/model-core';
-
-/**
- * 递归合并主菜单项和子菜单项
- * @author lxm
- * @date 2023-12-07 03:16:13
- * @param {IAppMenuItem} mainItem
- * @param {IAppMenuItem} subItem
- */
-function mergeMenuItem(mainItem: IAppMenuItem, subItem: IAppMenuItem): void {
-  // 主菜单项没有子菜单项直接合并替换
-  if (!mainItem.appMenuItems?.length) {
-    if (subItem.appMenuItems?.length) {
-      // 子菜单有下级菜单的时候只是添加下级菜单
-      mainItem.appMenuItems = subItem.appMenuItems;
-    } else {
-      // 子菜单项也没有下级菜单的时候覆盖
-      Object.assign(mainItem, subItem);
-    }
-  } else {
-    const addItems: IAppMenuItem[] = [];
-    subItem.appMenuItems?.forEach(item => {
-      const sameMenu = mainItem.appMenuItems?.find(x => x.id === item.id);
-      if (sameMenu) {
-        mergeMenuItem(sameMenu, item);
-      } else {
-        addItems.push(item);
-      }
-    });
-    mainItem.appMenuItems.push(...addItems);
-  }
-}
-
-/**
- * 合并主菜单和子菜单
- * @author lxm
- * @date 2023-12-07 03:15:54
- * @param {IAppMenuModel} main
- * @param {IAppMenuModel} sub
- */
-function mergeMenu(main: IAppMenuModel, sub: IAppMenuModel): void {
-  const addItems: IAppMenuItem[] = [];
-  sub.appMenuItems?.forEach(item => {
-    const sameMenu = main.appMenuItems?.find(x => x.id === item.id);
-    if (sameMenu) {
-      mergeMenuItem(sameMenu, item);
-    } else {
-      addItems.push(item);
-    }
-  });
-
-  if (!main.appMenuItems) {
-    main.appMenuItems = [];
-  }
-  main.appMenuItems.push(...addItems);
-}
-
-/**
- * 合并主应用首页菜单
- * @author lxm
- * @date 2023-12-07 02:26:57
- * @export
- * @param {IAppMenuModel} mainMenu
- * @param {ISubAppRef[]} subAppRefs
- */
-export function mergeAppMenu(
-  mainMenu: IAppMenuModel,
-  subAppRefs: ISubAppRef[],
-): void {
-  const subMenus: IAppMenuModel[] = [];
-  subAppRefs.forEach(sub => {
-    if (sub.appMenuModel?.appMenuItems?.length) {
-      subMenus.push(sub.appMenuModel);
-    }
-  });
-  if (subMenus.length === 0) {
-    return;
-  }
-
-  // 依次合并主应用菜单和子应用菜单
-  subMenus.forEach(subMenu => {
-    mergeMenu(mainMenu, subMenu);
-  });
-}

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

@@ -1,20 +0,0 @@
-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));
-    }
-  });
-}

package/src/utils/plural/plural.ts

@@ -1,30 +0,0 @@
-import pluralize from 'pluralize';
-
-// 补充特殊转换规则
-pluralize.addPluralRule(/(matr|vert|ind)ix|ex$/, '$1ices');
-
-/**
- * 英文转复数写法
- *
- * @author chitanda
- * @date 2022-08-25 18:08:41
- * @export
- * @param {string} key
- * @return {*}  {string}
- */
-export function plural(key: string): string {
-  return pluralize(key);
-}
-
-/**
- * 英文转复数写法并转全小写
- *
- * @author chitanda
- * @date 2022-08-25 18:08:23
- * @export
- * @param {string} key
- * @return {*}  {string}
- */
-export function pluralLower(key: string): string {
-  return plural(key).toLowerCase();
-}

package/src/utils/service-path-util/service-path-util.ts

@@ -1,249 +0,0 @@
-import { IAppDERS } from '@ibiz/model-core';
-import { pluralLower } from '../plural/plural';
-
-/**
- * 获取服务拼接递归对象
- */
-export type ServicePathDeep = [IAppDERS, ServicePathDeep[]];
-
-/**
- * 服务路径项
- */
-export type ServicePathItem = {
-  /**
-   * 实体代码名称(标准)
-   *
-   * @author chitanda
-   * @date 2022-08-25 18:08:35
-   * @type {string}
-   */
-  codeName: string;
-  /**
-   * 实体代码名称(小写)
-   *
-   * @author chitanda
-   * @date 2022-08-25 18:08:54
-   * @type {string}
-   */
-  lower: string;
-  /**
-   * 实体代码名称复数(小写)
-   *
-   * @author chitanda
-   * @date 2022-08-25 18:08:13
-   * @type {string}
-   */
-  plural: string;
-};
-
-/**
- * 服务路径拼接工具
- *
- * @author chitanda
- * @date 2022-08-22 21:08:52
- * @export
- * @class ServicePathUtil
- */
-export class ServicePathUtil {
-  /**
-   * 应用实体关系
-   *
-   * @author chitanda
-   * @date 2022-08-22 22:08:18
-   * @protected
-   * @type {Map<string, IAppDERS[]>} <应用实体 id, 应用实体父关系>
-   */
-  protected entityRsMap: Map<string, IAppDERS[]> = new Map();
-
-  /**
-   * 实体资源路径
-   *
-   * @author chitanda
-   * @date 2022-08-22 22:08:58
-   * @protected
-   * @type {Map<string, ServicePathItem[][]>}
-   */
-  protected entityRsPathMap: Map<string, ServicePathItem[][]> = new Map();
-
-  constructor(
-    protected appDataEntities: IModel[],
-    protected allDERss: IAppDERS[],
-  ) {}
-
-  /**
-   * 根据应用主实体过滤从关系集合
-   *
-   * @author chitanda
-   * @date 2023-04-20 17:04:34
-   * @protected
-   * @param {string} id
-   * @return {*}  {IAppDERS[]}
-   */
-  protected filterDERSs(id: string): IAppDERS[] {
-    if (this.entityRsMap.has(id)) {
-      return this.entityRsMap.get(id)!;
-    }
-    const items = this.allDERss.filter(item => {
-      if ((item as IModel).rSMode === 2 && item.minorAppDataEntityId === id) {
-        return item;
-      }
-      return null;
-    });
-    if (items.length > 0) {
-      this.entityRsMap.set(id, items);
-    }
-    return items;
-  }
-
-  /**
-   * 计算指定应用实体所有资源路径
-   *
-   * @author chitanda
-   * @date 2023-04-22 13:04:27
-   * @param {string} id
-   * @return {*}  {string[]}
-   */
-  calcRequestPaths(id: string): string[] {
-    const paths = this.calcPaths(id);
-    return paths.map(path => {
-      return path.map(item => `${item.plural}/\${${item.lower}}`).join('/');
-    });
-  }
-
-  /**
-   * 计算指定实体所有资源路径
-   *
-   * @author chitanda
-   * @date 2023-04-22 13:04:36
-   * @protected
-   * @param {string} id
-   * @return {*}  {ServicePathItem[][]} 返回顺序为 [祖父实体，爷爷实体，父实体，当前实体]
-   */
-  protected calcPaths(id: string): ServicePathItem[][] {
-    const entityRef = this.appDataEntities.find(item => item.id === id);
-    if (!entityRef) {
-      throw new Error(`未找到实体 ${id}`);
-    }
-    const { codeName } = entityRef;
-    if (this.entityRsPathMap.has(codeName)) {
-      return this.entityRsPathMap.get(codeName)!;
-    }
-    const deRss = this.filterDERSs(id);
-    if (deRss) {
-      // 已经计算过的应用实体标识
-      const ids: string[] = [id];
-      const arr = this.calcDeepPath(ids, deRss);
-      this.deepFillPath(codeName, [codeName], arr);
-      let paths = this.entityRsPathMap.get(codeName);
-      if (paths) {
-        paths = this.sortPath(paths);
-        this.entityRsPathMap.set(codeName, paths);
-        return paths;
-      }
-    }
-    return [];
-  }
-
-  /**
-   * 计算递归资源路径
-   *
-   * @author chitanda
-   * @date 2023-08-23 14:08:39
-   * @protected
-   * @param {string[]} ids
-   * @param {IAppDERS[]} deRss
-   * @param {number} [num=0]
-   * @return {*}  {ServicePathDeep[]}
-   */
-  protected calcDeepPath(
-    ids: string[],
-    deRss: IAppDERS[],
-    num: number = 0,
-  ): ServicePathDeep[] {
-    if (num > 10) {
-      throw new Error('服务路径计算超过最大层级 10');
-    }
-    num += 1;
-    const arr: ServicePathDeep[] = [];
-    deRss.forEach(rs => {
-      if (ids.includes(rs.majorAppDataEntityId!)) {
-        ibiz.log.warn(
-          '计算资源关系路径出现循环递归引用，触发实体：',
-          rs.majorAppDataEntityId,
-          '当前已计算过实体清单: ',
-          ids,
-        );
-        return;
-      }
-      const items = this.filterDERSs(rs.majorAppDataEntityId!);
-      arr.push([
-        rs,
-        this.calcDeepPath([...ids, rs.majorAppDataEntityId!], items, num),
-      ]);
-    });
-    return arr;
-  }
-
-  /**
-   * 递归填充计算所有资源路径
-   *
-   * @author chitanda
-   * @date 2022-08-22 22:08:04
-   * @protected
-   * @param {string} deCodeName
-   * @param {string[]} pathNames
-   * @param {ServicePathDeep[]} items
-   */
-  protected deepFillPath(
-    deCodeName: string,
-    pathNames: string[],
-    items: ServicePathDeep[],
-  ): void {
-    items.forEach(item => {
-      const [rs, children] = item;
-      if (children.length > 0) {
-        this.deepFillPath(
-          deCodeName,
-          [...pathNames, rs.majorDECodeName!],
-          children,
-        );
-      }
-      if (!this.entityRsPathMap.has(deCodeName)) {
-        this.entityRsPathMap.set(deCodeName, []);
-      }
-      const arr = this.entityRsPathMap.get(deCodeName)!;
-
-      arr.push(
-        [
-          ...pathNames.map(pathName => {
-            return {
-              codeName: pathName,
-              lower: pathName.toLowerCase(),
-              plural: pluralLower(pathName),
-            };
-          }),
-          {
-            codeName: rs.majorDECodeName!,
-            lower: rs.majorDECodeName!.toLowerCase(),
-            plural: pluralLower(rs.majorDECodeName!),
-          },
-        ].reverse(),
-      );
-    });
-  }
-
-  /**
-   * 排序资源路径顺序
-   *
-   * @author chitanda
-   * @date 2022-08-22 22:08:44
-   * @protected
-   * @param {ServicePathItem[][]} paths
-   * @return {*}  {ServicePathItem[][]}
-   */
-  protected sortPath(paths: ServicePathItem[][]): ServicePathItem[][] {
-    return paths.sort((a, b) => {
-      return b.length - a.length;
-    });
-  }
-}