@ibiz-template/runtime 0.1.16 → 0.1.17

package/out/service/service/control/control.service.d.ts

@@ -2,7 +2,6 @@ import { IHttpResponse } from '@ibiz-template/core';
 import { IControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
-import { IAppDEService } from '../../../interface';
 import { Application } from '../../../application';
 export declare class ControlService<T extends IControl = IControl> {
     app: Application;
@@ -14,14 +13,6 @@ export declare class ControlService<T extends IControl = IControl> {
      * @type {T}
      */
     readonly model: T;
-    /**
-     * 实体服务
-     *
-     * @author lxm
-     * @date 2022-08-29 18:08:19
-     * @type {IAppDEService}
-     */
-    entityService: IAppDEService;
     /**
      * UI数据和实体数据的属性名映射
      * key：UI数据属性名

package/out/service/service/control/control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,aAAa,EAAG,aAAa,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

package/out/service/service/entity/method/de-action.d.ts

@@ -13,6 +13,16 @@ import { IDataEntity } from '../../../../interface';
  */
 export declare class DEActionMethod extends Method {
     method: IAppDEAction;
+    /**
+     * 是否为本地模式
+     *
+     * @author chitanda
+     * @date 2023-04-19 16:04:46
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    protected get isLocalMode(): boolean;
     exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IData>>;
     /**
      * 创建数据

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAEvB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -12,6 +12,18 @@ import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
  * @extends {Method}
  */
 export class DEActionMethod extends Method {
+    /**
+     * 是否为本地模式
+     *
+     * @author chitanda
+     * @date 2023-04-19 16:04:46
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    get isLocalMode() {
+        return this.method.actionType === 'BUILTIN';
+    }
     async exec(context, data, params) {
         // 实体逻辑处理
         if (this.method.actionType === 'DELOGIC') {

package/out/service/service/entity/method/fetch.d.ts

@@ -14,6 +14,7 @@ import { IDataEntity } from '../../../../interface';
  */
 export declare class FetchMethod extends Method {
     method: IAppDEDataSet;
+    protected get isLocalMode(): boolean;
     exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IDataEntity[]>>;
     /**
      * 查询本地数据，根据属性

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA6CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA8CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}

package/out/service/service/entity/method/fetch.js

@@ -14,6 +14,9 @@ import { execFieldLogics } from '../../../../de-logic';
  * @extends {Method}
  */
 export class FetchMethod extends Method {
+    get isLocalMode() {
+        return this.method.dataSetType === 'DATAQUERY';
+    }
     async exec(context, data, params) {
         if (this.isLocalMode) {
             // 临时数据
@@ -25,6 +28,7 @@ export class FetchMethod extends Method {
         switch (this.method.dataSetType) {
             case 'INDEXDE':
             case 'CODELIST':
+            case 'MULTIFORM':
                 res = await this.fetchCodeListSet(context, params);
                 break;
             case 'REMOTE':

package/out/service/service/entity/method/method.d.ts

@@ -43,16 +43,6 @@ export declare abstract class Method {
      * @type {IAppDEService}
      */
     protected service?: IAppDEService;
-    /**
-     * 是否为本地模式
-     *
-     * @author chitanda
-     * @date 2023-04-19 16:04:46
-     * @readonly
-     * @protected
-     * @type {boolean}
-     */
-    protected get isLocalMode(): boolean;
     /**
      * Creates an instance of Method.
      *

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAwDxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAxDhC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAuC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAG/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAuC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAG/D"}

package/out/service/service/entity/method/method.js

@@ -14,18 +14,6 @@ import { MethodReturn } from './method-renturn';
  * @class Method
  */
 export class Method {
-    /**
-     * 是否为本地模式
-     *
-     * @author chitanda
-     * @date 2023-04-19 16:04:46
-     * @readonly
-     * @protected
-     * @type {boolean}
-     */
-    get isLocalMode() {
-        return this.entity.storageMode === 1 || this.entity.storageMode === 4;
-    }
     /**
      * Creates an instance of Method.
      *

package/out/ui-logic/ui-logic-context.d.ts

@@ -11,6 +11,13 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
 export declare class UILogicContext {
     private deLogicParams;
     parameters: IUILogicParams;
+    /**
+     * 上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:22:52
+     * @type {unknown}
+     */
+    lastReturn: unknown;
     /**
      * 上下文
      */
@@ -89,5 +96,19 @@ export declare class UILogicContext {
      * @param {string} name
      */
     renewParam(name: string): void;
+    /**
+     * 设置上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:23:52
+     * @param {unknown} value
+     */
+    setLastReturn(value: unknown): void;
+    /**
+     * 初始化上一次返回参数类型的逻辑参数
+     * @author lxm
+     * @date 2023-09-04 09:52:00
+     * @param {string} tag
+     */
+    initLastReturnParam(tag: string): void;
 }
 //# sourceMappingURL=ui-logic-context.d.ts.map

package/out/ui-logic/ui-logic-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAwCvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAxCnC;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;;;OASG;IACH;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAG/B"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAgDvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;;;OASG;IACH;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAOvC"}

package/out/ui-logic/ui-logic-context.js

@@ -101,4 +101,26 @@ export class UILogicContext {
         var _a;
         (_a = this.deLogicParams.get(name)) === null || _a === void 0 ? void 0 : _a.renew(this);
     }
+    /**
+     * 设置上一次返回值
+     * @author lxm
+     * @date 2023-09-04 09:23:52
+     * @param {unknown} value
+     */
+    setLastReturn(value) {
+        this.lastReturn = value;
+    }
+    /**
+     * 初始化上一次返回参数类型的逻辑参数
+     * @author lxm
+     * @date 2023-09-04 09:52:00
+     * @param {string} tag
+     */
+    initLastReturnParam(tag) {
+        Object.defineProperty(this.params, tag, {
+            enumerable: true,
+            configurable: true,
+            get: () => this.lastReturn,
+        });
+    }
 }

package/out/ui-logic/ui-logic-node/debug-param-node/debug-param-node.d.ts

@@ -0,0 +1,17 @@
+import { IDEUIDebugParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 调试逻辑参数节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class DebugParamNode
+ * @extends {UILogicNode}
+ */
+export declare class DebugParamNode extends UILogicNode {
+    model: IDEUIDebugParamLogic;
+    exec(ctx: UILogicContext): Promise<void>;
+}
+//# sourceMappingURL=debug-param-node.d.ts.map

package/out/ui-logic/ui-logic-node/debug-param-node/debug-param-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,oBAAoB,CAAC;IAE9B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ/C"}

package/out/ui-logic/ui-logic-node/debug-param-node/debug-param-node.js

@@ -0,0 +1,21 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 调试逻辑参数节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class DebugParamNode
+ * @extends {UILogicNode}
+ */
+export class DebugParamNode extends UILogicNode {
+    async exec(ctx) {
+        const { dstDEUILogicParamId, name } = this.model;
+        if (!dstDEUILogicParamId) {
+            throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
+        }
+        const param = ctx.params[dstDEUILogicParamId];
+        console.log(`逻辑节点${name}操作参数值:`, param);
+    }
+}

package/out/ui-logic/ui-logic-node/index.d.ts

@@ -6,4 +6,6 @@ export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-nod
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
 export { BindParamNode } from './bind-param-node/bind-param-node';
+export { MsgBoxNode } from './msg-box-node/msg-box-node';
+export { DebugParamNode } from './debug-param-node/debug-param-node';
 //# sourceMappingURL=index.d.ts.map

package/out/ui-logic/ui-logic-node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC"}

package/out/ui-logic/ui-logic-node/index.js

@@ -6,3 +6,5 @@ export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-nod
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
 export { BindParamNode } from './bind-param-node/bind-param-node';
+export { MsgBoxNode } from './msg-box-node/msg-box-node';
+export { DebugParamNode } from './debug-param-node/debug-param-node';

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.d.ts

@@ -0,0 +1,23 @@
+import { IDEUIMsgBoxLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 消息弹窗节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class MsgBoxNode
+ * @extends {UILogicNode}
+ */
+export declare class MsgBoxNode extends UILogicNode {
+    model: IDEUIMsgBoxLogic;
+    protected typeMap: {
+        readonly INFO: "info";
+        readonly QUESTION: "success";
+        readonly WARNING: "warning";
+        readonly ERROR: "error";
+    };
+    exec(ctx: UILogicContext): Promise<void>;
+}
+//# sourceMappingURL=msg-box-node.d.ts.map

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"msg-box-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,OAAO;;;;;MAKN;IAEL,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA6D/C"}

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.js

@@ -0,0 +1,79 @@
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 消息弹窗节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class MsgBoxNode
+ * @extends {UILogicNode}
+ */
+export class MsgBoxNode extends UILogicNode {
+    constructor() {
+        super(...arguments);
+        this.typeMap = {
+            INFO: 'info',
+            QUESTION: 'success',
+            WARNING: 'warning',
+            ERROR: 'error',
+        };
+    }
+    async exec(ctx) {
+        const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
+        if (!msgBoxType) {
+            throw new RuntimeModelError(this.model, '缺少消息类型的配置');
+        }
+        if (!buttonsType) {
+            throw new RuntimeModelError(this.model, '缺少按钮类型的配置');
+        }
+        // 处理标题和内容
+        let { title } = this.model;
+        let { message } = this.model;
+        if (msgBoxParamId) {
+            const param = ctx.params[msgBoxParamId];
+            if (param.title) {
+                title = param.title;
+            }
+            if (param.message) {
+                message = param.message;
+            }
+        }
+        // 处理消息类型
+        const type = this.typeMap[msgBoxType];
+        const modalParams = {
+            type,
+            title: title || '消息',
+            desc: message,
+        };
+        let resultTags = [];
+        // 处理按钮类型
+        switch (buttonsType) {
+            case 'YESNO':
+                modalParams.confirmButtonText = '是';
+                modalParams.cancelButtonText = '否';
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = true;
+                resultTags = ['yes', 'no'];
+                break;
+            case 'OK':
+                modalParams.confirmButtonText = '确定';
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = false;
+                resultTags = ['ok'];
+                break;
+            case 'OKCANCEL':
+                modalParams.confirmButtonText = '确定';
+                modalParams.cancelButtonText = '取消';
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = true;
+                resultTags = ['ok', 'cancel'];
+                break;
+            default:
+                throw new ModelError(this.model, `${buttonsType}暂未支持`);
+        }
+        console.log(this.model, modalParams);
+        const result = await ibiz.modal.confirm(modalParams);
+        ctx.setLastReturn(resultTags[result ? 0 : 1]);
+    }
+}

package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAgE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAiE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -75,7 +75,8 @@ export class UILogicParam {
             ctx.params[tag] = {};
         }
         else if (m.lastReturnParam) {
-            throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+            // 上一次调用返回变量
+            ctx.initLastReturnParam(tag);
         }
         else if (m.navContextParam) {
             // 应用上下文

package/out/ui-logic/ui-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAOL,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IA4DvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EASL,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAgEvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/ui-logic/ui-logic.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { BindParamNode, DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { BindParamNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, MsgBoxNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -67,6 +67,12 @@ export class UILogic {
                 case 'VIEWCTRLINVOKE': // 视图部件调用
                     logicNode = new ViewCtrlInvokeNode(node);
                     break;
+                case 'MSGBOX': // 消息弹窗
+                    logicNode = new MsgBoxNode(node);
+                    break;
+                case 'DEBUGPARAM': // 调试逻辑参数
+                    logicNode = new DebugParamNode(node);
+                    break;
                 case 'RESETPARAM': // 重置参数
                 case 'COPYPARAM': // 拷贝参数
                 case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
@@ -74,11 +80,9 @@ export class UILogic {
                 case 'SORTPARAM': // 排序数组参数
                 case 'RENEWPARAM': // 重新建立参数
                 case 'PFPLUGIN': // 前端插件调用
-                case 'MSGBOX': // 消息弹窗
                 case 'DEDATASET': // 实体数据集
                 case 'DELOGIC': // 实体逻辑
                 case 'THROWEXCEPTION': // 抛出异常
-                case 'DEBUGPARAM': // 调试逻辑参数
                 default:
                     throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "f81037350c49620b4172e520bc4b156d97e9d718"
+  "gitHead": "7f956bdd62e436209f34b16d69a78a73b35842ae"
 }

package/src/controller/common/view/view.controller.ts

@@ -2,7 +2,7 @@
 import { createUUID, notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { IAppView } from '@ibiz/model-core';
-import { isEmpty, isNil } from 'ramda';
+import { isEmpty, isNil, isNotNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import {
   IViewController,
@@ -217,6 +217,10 @@ export class ViewController<
 
     // 给modal的关闭前回调注入视图关闭事件
     this.modal.hooks.beforeDismiss.tapPromise(async modalData => {
+      // 如果视图设置了关闭状态，根据关闭状态返回
+      if (isNotNil(this.state.closeOK)) {
+        modalData.ok = this.state.closeOK;
+      }
       await this._evt.emit('onCloseView', { ...modalData });
     });
 

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -7,7 +7,6 @@ import {
   IDEEditForm,
   IDEEditFormItem,
   IDEFormDetail,
-  IDEFormMDCtrl,
   IDEWizardEditForm,
   IWFEditForm,
 } from '@ibiz/model-core';
@@ -94,10 +93,12 @@ export class EditFormService<
     context: IParams,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
+    const _data = data instanceof ControlVO ? data.getOrigin() : data;
+    const tempData = this.getFilteredData(_data);
     let res = await this.exec(
       this.model.createControlAction?.appDEMethodId || 'create',
       context,
-      data instanceof ControlVO ? data.getOrigin() : data,
+      tempData,
     );
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
@@ -116,10 +117,12 @@ export class EditFormService<
     context: IParams,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
+    const _data = data instanceof ControlVO ? data.getOrigin() : data;
+    const tempData = this.getFilteredData(_data);
     let res = await this.exec(
       this.model.updateControlAction?.appDEMethodId || 'update',
       context,
-      data instanceof ControlVO ? data.getOrigin() : data,
+      tempData,
     );
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
@@ -261,7 +264,7 @@ export class EditFormService<
     recursiveIterate(
       this.model,
       (item: IDEFormDetail) => {
-        if (item.detailType === 'FORMITEM') {
+        if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
           const formItem = item as IDEEditFormItem;
           const uiKey = formItem.fieldName || formItem.id!.toLowerCase();
           const deField =
@@ -279,24 +282,6 @@ export class EditFormService<
           }
           this.dataUIMap.set(uiKey, mapField);
         }
-        if (item.detailType === 'MDCTRL') {
-          const formItem = item as IDEFormMDCtrl;
-          const uiKey = formItem.fieldName || formItem.id!.toLowerCase();
-          const deField =
-            formItem.fieldName || (item as IDEEditFormItem).appDEFieldId!;
-          let mapField: UIMapField;
-          if (deField) {
-            mapField = new UIMapField(uiKey, deField, {
-              isOriginField: true,
-            });
-          } else {
-            // 前台属性和没属性的表单项，或预置属性
-            mapField = new UIMapField(uiKey, uiKey, {
-              isOriginField: true,
-            });
-          }
-          this.dataUIMap.set(uiKey, mapField);
-        }
       },
       {
         childrenFields: ['deformPages', 'deformDetails'],
@@ -319,4 +304,21 @@ export class EditFormService<
     }
     return res as IHttpResponse<ControlVO>;
   }
+
+  /**
+   * 保存时根据表单项过滤出传给后台的数据
+   *
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-01 10:04:25
+   */
+  getFilteredData(data: IData): IData {
+    const tempData: IData = {};
+    this.dataUIMap.forEach(dataUI => {
+      if (data[dataUI.dataKey] !== undefined) {
+        tempData[dataUI.dataKey] = data[dataUI.dataKey];
+      }
+    });
+    return tempData;
+  }
 }

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -162,6 +162,18 @@ export class FormItemController
     return this.model.valueFormat;
   }
 
+  /**
+   * 数据类型
+   *
+   * @author zhanghengfeng
+   * @date 2023-09-01 11:09:00
+   * @readonly
+   * @type {(number | undefined)}
+   */
+  get dataType(): number | undefined {
+    return this.model.dataType;
+  }
+
   /**
    * 初始化
    *

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.ts

@@ -67,7 +67,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
   public initColumns(details: IDEFormDetail[]): void {
     details.forEach(async detail => {
       if (detail.detailType === 'FORMITEM') {
-        const { editor } = detail as IDEFormItem;
+        const { editor, dataType } = detail as IDEFormItem;
         const editorProvider = await getEditorProvider(editor!);
         if (editorProvider) {
           const c = await editorProvider.createController(editor!, {
@@ -75,6 +75,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
             valueFormat: (editor as IDEFormItem).valueFormat,
             context: this.parent.form.context,
             params: this.parent.form.params,
+            dataType,
           });
           this.editorMap[detail.codeName!] = {
             provider: editorProvider,