update：更新实体行为发布逻辑，支持脚本、实体处理逻辑类型

58356594 · Mosher · c1ca690c · 58356594 · 58356594 · 58356594
--- a/modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/entity/service-delogic-method.hbs
+++ b/modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/entity/service-delogic-method.hbs
+/**
+ * {{singleAppMethod.codeName}}
+ *
+ * @param {IContext} [context={}]
+ * @param {IParam} [data = {}]
+ * @returns {Promise<any>}
+ * @memberof {{pascalCase appEntity.codeName}}ServiceBase
+ */
+public async {{singleAppMethod.codeName}}(context: IContext = {}, data: IParam = {}): Promise<any> {
+	try {
+		//	data = await this.executeAppDELogic('{{singleAppMethod.psDEAction.psDELogic.codeName}}', context, data);
+		const res = {
+			ok: true,
+			status: 200,
+			data: data
+		};
+		return res;
+	} catch (error: any) {
+		const res = {
+			ok: false,
+			status: 500,
+			message: error?.message
+		}
+		return res;
+	}
+}
--- a/modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/entity/service-remote-method.hbs
+++ b/modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/entity/service-remote-method.hbs
-  /**
-    * {{singleAppMethod.codeName}}
-    *
-    * @param {IContext} [context={}]
-    * @param {IParam} [data = {}]
-    * @returns {Promise<any>}
-    * @memberof {{pascalCase appEntity.codeName}}ServiceBase
-    */
-  public async {{singleAppMethod.codeName}}(context: IContext = {}, data: IParam = {}): Promise<any> {
-    {{! 方法路径是否带资源主键 }}
-    const deResPath = this.buildDeResPath(context, {{singleAppMethod.psDEServiceAPIMethod.needResourceKey}});
-    {{#if (eq singleAppMethod.methodType "SELECT")}}
-    {{! 方法类型为SELECT }}
-      {{#if (or (eq singleAppMethod.psDEServiceAPIMethod.requestMethod "PUT") (eq singleAppMethod.psDEServiceAPIMethod.requestMethod "POST") )}}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
-      {{else}}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
-      {{/if}}
-    {{else if (eq singleAppMethod.methodType "FETCHTEMP")}}
-    {{! 方法类型为FETCHTEMP }}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
-    {{else if (eq singleAppMethod.methodType "FETCH")}}
-    {{! 方法类型为FETCH }}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
+/**
+ * {{singleAppMethod.codeName}}
+ *
+ * @param {IContext} [context={}]
+ * @param {IParam} [data = {}]
+ * @returns {Promise<any>}
+ * @memberof {{pascalCase appEntity.codeName}}ServiceBase
+ */
+public async {{singleAppMethod.codeName}}(context: IContext = {}, data: IParam = {}): Promise<any> {
+  {{! 方法路径是否带资源主键 }}
+  const deResPath = this.buildDeResPath(context, {{singleAppMethod.psDEServiceAPIMethod.needResourceKey}});
+  {{#if (eq singleAppMethod.methodType "SELECT")}}
+  {{! 方法类型为SELECT }}
+    {{#if (or (eq singleAppMethod.psDEServiceAPIMethod.requestMethod "PUT") (eq singleAppMethod.psDEServiceAPIMethod.requestMethod "POST") )}}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
    {{else}}
-      {{! 方法类型为DEACTION }}
-    this.beforeExecuteAction(context,data,'{{singleAppMethod.codeName}}');
-      {{#if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "NONE")}}
-      {{! 参数类型为NONE,包含GetDraft }}
-        {{#if (neq singleAppMethod.codeName 'GetDraft')}}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
-        {{else}}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
-        {{/if}}
-      {{else if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "FIELD")}}
-      {{! 参数类型为FIELD,包含Get,Remove }}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
-      {{else if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "ENTITY")}}
-      {{! 参数类型为ENTITY,包含CheckKey,Create,Save,Update }}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
+    {{/if}}
+  {{else if (eq singleAppMethod.methodType "FETCHTEMP")}}
+  {{! 方法类型为FETCHTEMP }}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
+  {{else if (eq singleAppMethod.methodType "FETCH")}}
+  {{! 方法类型为FETCH }}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
+  {{else}}
+    {{! 方法类型为DEACTION }}
+  this.beforeExecuteAction(context,data,'{{singleAppMethod.codeName}}');
+    {{#if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "NONE")}}
+    {{! 参数类型为NONE,包含GetDraft }}
+      {{#if (neq singleAppMethod.codeName 'GetDraft')}}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
      {{else}}
-      {{! 参数类型为URIPARAM }}
-    const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
      {{/if}}
-    this.afterExecuteAction(context,data,'{{singleAppMethod.codeName}}');
+    {{else if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "FIELD")}}
+    {{! 参数类型为FIELD,包含Get,Remove }}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`);
+    {{else if (eq singleAppMethod.psDEServiceAPIMethod.requestParamType "ENTITY")}}
+    {{! 参数类型为ENTITY,包含CheckKey,Create,Save,Update }}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
+    {{else}}
+    {{! 参数类型为URIPARAM }}
+  const res = await this.http.{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestMethod }}(`${deResPath}{{lowerCase singleAppMethod.psDEServiceAPIMethod.requestPath}}`,data);
    {{/if}}
-    return res;
-  }
\ No newline at end of file
+  this.afterExecuteAction(context,data,'{{singleAppMethod.codeName}}');
+  {{/if}}
+  return res;
+}
--- a/modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/entity/service-script-method.hbs
+++ b/modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/entity/service-script-method.hbs
+/**
+ * {{singleAppMethod.codeName}}
+ *
+ * @param {IContext} [context={}]
+ * @param {IParam} [data = {}]
+ * @returns {Promise<any>}
+ * @memberof {{pascalCase appEntity.codeName}}ServiceBase
+ */
+public async {{singleAppMethod.codeName}}(context: IContext = {}, data: IParam = {}): Promise<any> {
+	{{#if singleAppMethod.psDEAction.scriptCode}}
+	eval(`{{singleAppMethod.psDEAction.scriptCode}}`);
+	{{/if}}
+	const res = {
+		ok: true,
+		status: 200,
+		data: data
+	}
+  return res;
+}
--- a/modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/api/{{appEntities}}/{{appEntities}}-service-base.ts.hbs
+++ b/modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/api/{{appEntities}}/{{appEntities}}-service-base.ts.hbs
@@ -43,14 +43,26 @@ export class {{pascalCase appEntity.codeName}}ServiceBase extends EntityService
  }

 {{#each appEntity.allPSAppDEMethods as |singleAppMethod| }}
-  {{! 非内置行为才输出 }}
-  {{#if (eq isBuiltinMethod false)}}
-  {{! 存在接口方法才输出 }}
-  {{#if singleAppMethod.psDEServiceAPIMethod}}
-  {{! 远端接口 }}
+  {{! 非内置行为和非临时数据方法才输出 }}
+  {{#if (and (eq builtinMethod false) (eq tempDataMode 0))}}
+    {{#if (eq appEntity.psDEServiceAPI.nested true)}}
+    {{!-- todo嵌套行为补充 --}}
+    {{else}}
+    {{!-- todo 插件 --}}
+      {{#if (and (eq methodType 'DEACTION') psDEAction (eq psDEAction.actionType 'DELOGIC'))}}
+      {{!-- 实体处理逻辑 --}}
+  {{> @macro/front-end/entity/service-delogic-method.hbs singleAppMethod=singleAppMethod}}

+      {{else if (and (eq methodType 'DEACTION') psDEAction (eq psDEAction.actionType 'SCRIPT'))}}
+      {{!-- 脚本代码 --}}
+  {{> @macro/front-end/entity/service-script-method.hbs singleAppMethod=singleAppMethod}}
+
+      {{else if (and singleAppMethod.psDEServiceAPIMethod appEntity.major)}}
+      {{!-- 远程接口 --}}
  {{> @macro/front-end/entity/service-remote-method.hbs singleAppMethod=singleAppMethod}}
-  {{/if}}
+
+      {{/if}}
+    {{/if}}
  {{/if}}
 {{/each}}
 }
\ No newline at end of file
--- a/modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/logic/app-ui-action/app-sys-action.ts
+++ b/modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/logic/app-ui-action/app-sys-action.ts
@@ -204,7 +204,7 @@ export class AppSysAction {
  public static newRow(params: IUIActionParams) {
    const { actionEnvironment } = params;
    // 视图里获取多数据部件
-    if (hasFunction(actionEnvironment.xDataControl, "newRow")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "newRow")) {
      actionEnvironment.xDataControl.newRow();
    } else if (isExist(actionEnvironment.newRow)) {
      actionEnvironment.newRow();
@@ -220,7 +220,7 @@ export class AppSysAction {
  public static save(params: IUIActionParams) {
    const { actionEnvironment } = params;
    // 视图里获取多数据部件
-    if (hasFunction(actionEnvironment.xDataControl, "save")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "save")) {
      actionEnvironment.xDataControl.save();
    } else if (isExist(actionEnvironment.save)) {
      actionEnvironment.save();
@@ -236,7 +236,7 @@ export class AppSysAction {
  public static saveRow(params: IUIActionParams) {
    const { actionEnvironment } = params;
    // 视图里获取多数据部件
-    if (hasFunction(actionEnvironment.xDataControl, "save")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "save")) {
      actionEnvironment.xDataControl.save();
    } else if (isExist(actionEnvironment.save)) {
      actionEnvironment.save();
@@ -252,10 +252,10 @@ export class AppSysAction {
  public static remove(params: IUIActionParams) {
    const { actionEnvironment, data } = params;
    // 视图里获取多数据部件
-    if (hasFunction(actionEnvironment.xDataControl, "remove")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "remove")) {
      actionEnvironment.xDataControl.remove(data);
    } else if (isExist(actionEnvironment.remove)) {
-      actionEnvironment.remove();
+      actionEnvironment.remove(data);
    }
  }

@@ -268,7 +268,7 @@ export class AppSysAction {
  public static refresh(params: IUIActionParams) {
    const { actionEnvironment } = params;
    // 视图里获取多数据部件
-    if (hasFunction(actionEnvironment.xDataControl, "refresh")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "refresh")) {
      actionEnvironment.xDataControl.refresh();
    } else if (isExist(actionEnvironment.refresh)) {
      actionEnvironment.refresh();
@@ -296,7 +296,7 @@ export class AppSysAction {
   */
  public static async saveAndExit(params: IUIActionParams) {
    const { actionEnvironment } = params;
-    if (hasFunction(actionEnvironment.xDataControl, "save")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "save")) {
      await actionEnvironment.xDataControl.save();
    } else if (isExist(actionEnvironment.save)) {
      await actionEnvironment.save();
@@ -314,7 +314,7 @@ export class AppSysAction {
   */
  public static async saveAndNew(params: IUIActionParams) {
    const { actionEnvironment } = params;
-    if (hasFunction(actionEnvironment.xDataControl, "save")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "save")) {
      await actionEnvironment.xDataControl.save();
    } else if (isExist(actionEnvironment.save)) {
      await actionEnvironment.save();
@@ -338,7 +338,7 @@ export class AppSysAction {
  public static async removeAndExit(params: IUIActionParams) {
    const { actionEnvironment } = params;
    // 视图里获取多数据部件
-    if (hasFunction(actionEnvironment.xDataControl, "remove")) {
+    if (actionEnvironment.xDataControl && hasFunction(actionEnvironment.xDataControl, "remove")) {
      await actionEnvironment.xDataControl.remove();
    } else if (isExist(actionEnvironment.remove)) {
      await actionEnvironment.remove();