From b422e9c742d7c96e467e83480022947a4ec98f43 Mon Sep 17 00:00:00 2001 From: Mosher Date: Thu, 10 Feb 2022 11:09:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=AE=9E=E4=BD=93=E8=B5=84=E6=BA=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/handlebars/src/helpers/eq/eq.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/handlebars/src/helpers/eq/eq.ts b/packages/handlebars/src/helpers/eq/eq.ts index c6bcb0d..50d0165 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); - } + let bol = eq(param, param2); return HelperUtil.handleJudgmentExecute(this, bol, options); } } -- Gitee From ea67f001e1bb1b6ff80c4dc0ef68caad09091344 Mon Sep 17 00:00:00 2001 From: Mosher Date: Thu, 10 Feb 2022 11:09:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"fix=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=AE=9E=E4=BD=93=E8=B5=84=E6=BA=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b422e9c742d7c96e467e83480022947a4ec98f43. --- packages/handlebars/src/helpers/eq/eq.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/handlebars/src/helpers/eq/eq.ts b/packages/handlebars/src/helpers/eq/eq.ts index 50d0165..c6bcb0d 100644 --- a/packages/handlebars/src/helpers/eq/eq.ts +++ b/packages/handlebars/src/helpers/eq/eq.ts @@ -19,7 +19,12 @@ export class HelperEq extends HelperBase { } onExecute(param: unknown, param2: unknown, options: Handlebars.HelperOptions): string | boolean { - let bol = eq(param, param2); + let bol = false; + if (typeof param === 'boolean' || typeof param2 === 'boolean') { + bol = eq(!!param, !!param2); + } else { + bol = eq(param, param2); + } return HelperUtil.handleJudgmentExecute(this, bol, options); } } -- Gitee From 80e287292260bdca5cb00fa25f85bb872fa5e204 Mon Sep 17 00:00:00 2001 From: Mosher Date: Thu, 10 Feb 2022 11:10:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=AE=9E=E4=BD=93=E8=B5=84=E6=BA=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/model/src/model/app/app-model.ts | 42 ++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/packages/model/src/model/app/app-model.ts b/packages/model/src/model/app/app-model.ts index 2e6b6bf..09a2b29 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 pluralize = require('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; + } } -- Gitee From fd1b0f3066ec4870b95a7d2d0c272a064d985e19 Mon Sep 17 00:00:00 2001 From: Mosher Date: Thu, 10 Feb 2022 11:10:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dhandlerbas?= =?UTF-8?q?=E5=8A=A9=E6=89=8Beq=E6=AF=94=E5=AF=B9boolean=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=80=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/handlebars/src/helpers/eq/eq.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/handlebars/src/helpers/eq/eq.ts b/packages/handlebars/src/helpers/eq/eq.ts index c6bcb0d..50d0165 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); - } + let bol = eq(param, param2); return HelperUtil.handleJudgmentExecute(this, bol, options); } } -- Gitee From 9787c374cdbfe81d36cb1011f738bfbf5da042a2 Mon Sep 17 00:00:00 2001 From: Mosher Date: Thu, 10 Feb 2022 11:30:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?update=EF=BC=9A=E6=A0=BC=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/handlebars/src/helpers/eq/eq.ts | 2 +- packages/model/src/model/app/app-model.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/handlebars/src/helpers/eq/eq.ts b/packages/handlebars/src/helpers/eq/eq.ts index 50d0165..547019b 100644 --- a/packages/handlebars/src/helpers/eq/eq.ts +++ b/packages/handlebars/src/helpers/eq/eq.ts @@ -19,7 +19,7 @@ export class HelperEq extends HelperBase { } onExecute(param: unknown, param2: unknown, options: Handlebars.HelperOptions): string | boolean { - let 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 09a2b29..de30b8d 100644 --- a/packages/model/src/model/app/app-model.ts +++ b/packages/model/src/model/app/app-model.ts @@ -1,5 +1,5 @@ import { IPSAppDERS, PSApplicationImpl } from '@ibizlab/model'; -import pluralize = require('pluralize'); +import * as pluralize from 'pluralize'; import { AppEntityModel } from './app-entity-model'; import { AppModuleModel } from './app-module-model'; import { PageModel } from './page-model'; -- Gitee