@ibiz-template/model-helper 0.6.0 → 0.6.1-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.6.0",
+  "version": "0.6.1-alpha.2",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -12,12 +12,11 @@
   },
   "files": [
     "dist",
-    "out",
-    "src"
+    "out"
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run lint && node ./scripts/build.js && npm run build:rollup && tsc --build",
+    "build": "npm run test:run && npm run lint && node ./scripts/build.js && npm run build:rollup && tsc --build",
     "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
@@ -33,13 +32,13 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz/model-core": "^0.1.11",
-    "@ibiz/rt-model-api": "^0.1.48",
+    "@ibiz/model-core": "^0.1.12",
+    "@ibiz/rt-model-api": "^0.2.1",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.6.0",
+    "@ibiz-template/runtime": "^0.6.1-alpha.2",
     "@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": "a41c806c321ea5ec6a9b3be23405aeaaba900f98"
 }

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);
-  }
-}