diff --git a/packages/handlebars/src/helpers/eq/eq.ts b/packages/handlebars/src/helpers/eq/eq.ts index c6bcb0dba502688d4c3b498aab4b8b8c003776ce..547019b29aa245690b5dbe72b0ac0c6e007ecc7c 100644 --- a/packages/handlebars/src/helpers/eq/eq.ts +++ b/packages/handlebars/src/helpers/eq/eq.ts @@ -19,12 +19,7 @@ export class HelperEq extends HelperBase { } onExecute(param: unknown, param2: unknown, options: Handlebars.HelperOptions): string | boolean { - let bol = false; - if (typeof param === 'boolean' || typeof param2 === 'boolean') { - bol = eq(!!param, !!param2); - } else { - bol = eq(param, param2); - } + const bol = eq(param, param2); return HelperUtil.handleJudgmentExecute(this, bol, options); } } diff --git a/packages/model/src/model/app/app-model.ts b/packages/model/src/model/app/app-model.ts index 2e6b6bf9776ac323c0eba29b9c9489c35934972e..de30b8d11943f77a6c6a3063676e521cbb26be1c 100644 --- a/packages/model/src/model/app/app-model.ts +++ b/packages/model/src/model/app/app-model.ts @@ -1,4 +1,5 @@ -import { PSApplicationImpl } from '@ibizlab/model'; +import { IPSAppDERS, PSApplicationImpl } from '@ibizlab/model'; +import * as pluralize from 'pluralize'; import { AppEntityModel } from './app-entity-model'; import { AppModuleModel } from './app-module-model'; import { PageModel } from './page-model'; @@ -76,4 +77,43 @@ export class AppModel extends PSApplicationImpl { } return this._pages || []; } + + /** + * 应用实体资源数据 + * + * @protected + * @type {Map} + * @memberof AppModel + */ + protected _appEntityResources: Map = new Map(); + get appEntityResources(): any[] { + const values: any[] = []; + if (this.appEntities.length > 0) { + this.appEntities.forEach((entity: AppEntityModel) => { + if (entity.minorPSAppDERSs && entity.minorPSAppDERSs.length > 0) { + entity.minorPSAppDERSs.forEach((appDERS: IPSAppDERS) => { + const majorCodeName: string = appDERS.majorPSAppDataEntity?.codeName as string; + const minorCodeName: string = appDERS.minorPSAppDataEntity?.codeName as string; + const temp: any = { + path: `${pluralize(majorCodeName).toLowerCase()}/:${majorCodeName.toLowerCase()}?/${pluralize(minorCodeName).toLowerCase()}/:${minorCodeName.toLowerCase()}?`, + majorCodeName: majorCodeName.toLowerCase(), + curCodeName: minorCodeName.toLowerCase(), + appDataEntity: entity, + }; + values.push(temp); + this._appEntityResources.set(`${majorCodeName}:${minorCodeName}`, temp); + }) + } else { + const temp = { + curCodeName: entity.codeName.toLowerCase(), + path: `${pluralize(entity.codeName).toLowerCase()}/:${entity.codeName.toLowerCase()}`, + appDataEntity: entity + } + values.push(temp); + this._appEntityResources.set(entity.codeName, temp); + } + }) + } + return values; + } }