Skip to content

I
ibizlab-generator
提交 9eca2e48 编写于 作者: sq3536's avatar sq3536
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 e8470471 164a201b
隐藏空白字符变更
内嵌 并排
正在显示 包含 120 行增加 和 48 行删除
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/service/entity/entity-service.ts
浏览文件 @ 9eca2e48
import { Http } from '@ibiz-core'; import { Http, RouteTool } from '@ibiz-core';
/** /**
* 实体服务基类 * 实体服务基类
* @export * @export
...@@ -6,15 +6,39 @@ import { Http } from '@ibiz-core'; ...@@ -6,15 +6,39 @@ import { Http } from '@ibiz-core';
*/ */
export class EntityService{ export class EntityService{
[key: string]: any;
constructor(opts?: any) { constructor(opts?: any) {
} }
/**
* 实体关系路径集合
* @protected
*/
protected deResPaths: any[] = []
/**
* HTTP服务类
* @protected
*/
protected http = Http.getInstance(); protected http = Http.getInstance();
// TODO /**
* 计算请求的实体关系路径
*
* @protected
* @param context 视图上下文
* @param isSelfAppend 是否拼接实体自身的主键值。
*/
protected buildDeResPath(context: any, isSelfAppend: boolean){
let deResPath = RouteTool.buildDeResRequestPath(context,this.deResPaths);
// 不需要自身的主键值的删除末尾/xxxx
if(!isSelfAppend){
deResPath = deResPath.substring(0,deResPath.lastIndexOf("/"))
}
return deResPath;
}
// TODO 预置方法
public GET(){} public GET(){}
} }
\ No newline at end of file
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/utils/route-tool.ts
浏览文件 @ 9eca2e48
...@@ -34,12 +34,13 @@ export class RouteTool { ...@@ -34,12 +34,13 @@ export class RouteTool {
* @memberof RouteTool * @memberof RouteTool
*/ */
public static getIndexRoutePath(route: any): string { public static getIndexRoutePath(route: any): string {
const parameterName = route.meta?.parameters?.[0]?.pathName || "apps"; const parameter = route.meta?.parameters?.[0] || { pathName: "apps", parameterName: "app" };
const {pathName, parameterName} = parameter;
const param = route.params[parameterName]; const param = route.params[parameterName];
if (notEmpty(param)) { if (notEmpty(param)) {
return `/${parameterName}/${param}`; return `/${pathName}/${param}`;
} }
return `/${parameterName}`; return `/${pathName}`;
} }
/** /**
...@@ -47,6 +48,7 @@ export class RouteTool { ...@@ -47,6 +48,7 @@ export class RouteTool {
* - 优先匹配路径节点数多的路径 * - 优先匹配路径节点数多的路径
* - 取最终匹配节点个数最多的组合 * - 取最终匹配节点个数最多的组合
* - 路径节点必须从后往前连续匹配，中间缺失的舍弃前面匹配的节点 * - 路径节点必须从后往前连续匹配，中间缺失的舍弃前面匹配的节点
* - 一个也没匹配返回/{实体自身的pathName}
* *
* @static * @static
* @param {*} [viewParam={}] 视图上下文 * @param {*} [viewParam={}] 视图上下文
...@@ -105,6 +107,7 @@ export class RouteTool { ...@@ -105,6 +107,7 @@ export class RouteTool {
* - 优先匹配路径节点数多的路径 * - 优先匹配路径节点数多的路径
* - 取最终匹配节点个数最多的组合 * - 取最终匹配节点个数最多的组合
* - 路径的每个节点必须全部匹配 * - 路径的每个节点必须全部匹配
* - 一个也没匹配返回/{实体自身的pathName}/undefined
* *
* @static * @static
* @param {*} [viewParam={}] 视图上下文 * @param {*} [viewParam={}] 视图上下文
...@@ -150,6 +153,11 @@ export class RouteTool { ...@@ -150,6 +153,11 @@ export class RouteTool {
} }
}); });
// 如果一个匹配的没有，即没有任何主键匹配上，关系路径为实体自身的/pathName/undefined
if(routePath == ''){
routePath = "/"+deResPaths[deResPaths.length -1][0].pathName+"/undefined";
}
return routePath; return routePath;
} }
......
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/service/entity/{{appEntities}}/{{appEntities}}-service-base.ts.hbs
浏览文件 @ 9eca2e48
...@@ -11,56 +11,96 @@ export class {{pascalCase appEntity.codeName}}ServiceBase extends EntityService ...@@ -11,56 +11,96 @@ export class {{pascalCase appEntity.codeName}}ServiceBase extends EntityService
constructor(opts?: any) { constructor(opts?: any) {
super(opts); super(opts);
// 初始化关系实体路径集合
this.deResPaths = [
{{#each appEntity.appEntityResources as |appEntityResource| }}
{{appEntityResource.deResPaths}}{{#unless @last}},{{/unless}}
{{/each}}
]
} }
protected APPDENAME = "{{pascalCase appEntity.codeName}}"; protected SYSTEMNAME = '{{apps.psSystem.codeName}}';
protected APPNAME = '{{apps.codeName}}';
protected APPDENAME = '{{appEntity.codeName}}';
protected APPDENAMEPLURAL = "{{pascalCase appEntity.codeName}}";
{{#if appEntity.keyPSAppDEField}} {{#if appEntity.keyPSAppDEField}}
protected APPDEKEY = "{{pascalCase appEntity.keyPSAppDEField.codeName}}"; protected APPDEKEY = "{{pascalCase appEntity.keyPSAppDEField.codeName}}";
{{/if}} {{/if}}
{{#if appEntity.majorPSAppDEField}}
protected APPDETEXT = "{{pascalCase appEntity.majorPSAppDEField.codeName}}";
{{/if}}
{{#each appEntity.allPSAppDEMethods as |singleAppMethod| }}
/** {{#each appEntity.allPSAppDEMethods as |singleAppMethod| }}
* {{singleAppMethod.codeName}} {{#if singleAppMethod.psDEServiceAPIMethod}}
* /**
* @param {*} [_context={}] * {{singleAppMethod.codeName}}
* @param {*} [_data = {}] *
* @returns {Promise<any>} * @param {*} [context={}]
* @memberof {{pascalCase appEntity.codeName}}ServiceBase * @param {*} [viewParams = {}]
*/ * @returns {Promise<any>}
async {{singleAppMethod.codeName}}(_context: any = {}, _data: any = {}): Promise<any> { * @memberof {{pascalCase appEntity.codeName}}ServiceBase
//{{singleAppMethod}} */
//{{singleAppMethod.psDEServiceAPIMethod}} async {{singleAppMethod.codeName}}(context: any = {}, viewParams: any = {}): Promise<any> {
//{{singleAppMethod.psDEServiceAPIMethod.requestMethod}} {{#if (eq singleAppMethod.methodType "SELECT")}}
{{#eq singleAppMethod.methodType "SELECT" }} let deResPath = this.buildDeResPath(context, true);
const res = await this.http.post(`/{{pluralize appEntity.codeName}}/${encodeURIComponent(_context.{{lowerCase appEntity.codeName}})}{{singleAppMethod.requestPath}}`, _data); const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
return res; {{else if (eq singleAppMethod.methodType "FETCHTEMP")}}
{{/eq}} let deResPath = this.buildDeResPath(context, false);
{{#eq singleAppMethod.methodType "FETCH" }} const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
const res = await this.http.post(`/{{pluralize appEntity.codeName}}/${encodeURIComponent(_context.{{lowerCase appEntity.codeName}})}{{singleAppMethod.requestPath}}`, _data); {{else if (eq singleAppMethod.methodType "FETCH")}}
return res; let deResPath = this.buildDeResPath(context, false);
{{/eq}} const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
{{#eq singleAppMethod.methodType "GET" }} // TODO @executeafterbatchaction
const res = await this.http.get(`/{{pluralize appEntity.codeName}}/${encodeURIComponent(_context.{{lowerCase appEntity.codeName}})}{{singleAppMethod.requestPath}}`); {{else if (eq singleAppMethod.codeName "GetDraft")}}
return res; viewParams[this.APPDENAME?.toLowerCase()] = undefined;
{{/eq}} viewParams[this.APPDEKEY] = undefined;
{{#eq singleAppMethod.codeName "GetDraft" }} let deResPath = this.buildDeResPath(context, false);
_data[this.APPDENAME?.toLowerCase()] = undefined; const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
_data[this.APPDEKEY] = undefined; // TODO appentityexecuteafteractionlogic
const res = await this.http.post(`/{{pluralize appEntity.codeName}}/${encodeURIComponent(_context.{{lowerCase appEntity.codeName}})}{{singleAppMethod.requestPath}}`, _data); // TODO @appentityexecuteafteractionlogic
return res; // TODO 设置本地缓存 @setStore
{{/eq}} {{!-- 无参数情况 --}}
{{#eq singleAppMethod.codeName "Update" }} {{else if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "NONE") }}
const res = await this.http.post(`/{{pluralize appEntity.codeName}}/${encodeURIComponent(_context.{{lowerCase appEntity.codeName}})}{{singleAppMethod.requestPath}}`, _data); let deResPath = this.buildDeResPath(context, false);
return res; const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
{{/eq}} // TODO 设置本地缓存 @setStore
{{#eq singleAppMethod.codeName "Get" }} {{!-- 指定属性情况 --}}
const res = await this.http.get(`/{{pluralize appEntity.codeName}}/${encodeURIComponent(_context.{{lowerCase appEntity.codeName}})}{{singleAppMethod.requestPath}}`, _data); {{else if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "FIELD") }}
return res; {{#if singleAppMethod.psDEServiceAPIMethod.requestMethod "GET"}}
{{/eq}} let deResPath = this.buildDeResPath(context, true);
const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
// TODO @executeafteraction
// TODO 设置本地缓存 @setStore
{{else}}
let deResPath = this.buildDeResPath(context, true);
const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
{{/if}}
{{else if (and (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "ENTITY") (eq singleAppMethod.codeName "Create") ) }}
// TODO 设置本地缓存 @setStore
// @executebeforeaction
if (!viewParams.srffrontuf || viewParams.srffrontuf != 1) {
viewParams[this.APPDEKEY] = null;
} }
if (viewParams.srffrontuf != null) {
delete viewParams.srffrontuf;
}
let deResPath = this.buildDeResPath(context, false);
const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
{{else}}
// TODO 设置本地缓存 @setStore
// @executebeforeaction
let deResPath = this.buildDeResPath(context, true);
const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(deResPath+'/{{singleAppMethod.psDEServiceAPIMethod.requestPath}}', viewParams);
{{/if}}
return res;
{{!-- TODO主实体的差异部分 --}}
//{{singleAppMethod.psDEServiceAPIMethod.requestPath}}
//{{singleAppMethod.psDEServiceAPIMethod.requestParamType}}
{{!-- TODO 当为非主实体时，避免无主接口方法返回值异常报错(没遇到这种情况) --}}
}
{{/if}}
{{/each}} {{/each}}
} }
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或