@ibiz-template/runtime 0.7.41-alpha.13 → 0.7.41-alpha.130

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.d.ts

@@ -1,6 +1,7 @@
 import { IDELogicLinkSingleCond } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
+import { IUILogicLinkSingleCond } from '../../../interface';
 /**
  * 界面逻辑连接条件项
  *
@@ -10,7 +11,7 @@ import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
  * @class UILogicLinkSingleCond
  * @extends {UILogicLinkCond}
  */
-export declare class UILogicLinkSingleCond extends UILogicLinkCond {
+export declare class UILogicLinkSingleCond extends UILogicLinkCond implements IUILogicLinkSingleCond {
     model: IDELogicLinkSingleCond;
     /**
      * 源参数

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAuFnE"}
+{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,eACR,YAAW,sBAAsB;IAoCd,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAuFnE"}

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

@@ -1,7 +1,7 @@
 import { IDEUILogicLink } from '@ibiz/model-core';
 import { UILogicContext } from '../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node/ui-logic-node';
-import { UILogicLinkGroupCond } from './ui-logic-link-group-cond/ui-logic-link-group-cond';
+import { IUILogicLink, IUILogicLinkGroupCond } from '../../interface';
 /**
  * 界面逻辑连接
  *
@@ -10,7 +10,7 @@ import { UILogicLinkGroupCond } from './ui-logic-link-group-cond/ui-logic-link-g
  * @export
  * @class UILogicLink
  */
-export declare class UILogicLink {
+export declare class UILogicLink implements IUILogicLink {
     model: IDEUILogicLink;
     /**
      * 源节点
@@ -29,13 +29,11 @@ export declare class UILogicLink {
      */
     dstNode: UILogicNode | null;
     /**
-     * 连接条件组
-     *
-     * @author chitanda
-     * @date 2023-02-15 17:02:49
-     * @type {(UILogicLinkGroupCond | null)}
+     * @description 连接条件组
+     * @type {(IUILogicLinkGroupCond  | null)}
+     * @memberof UILogicLink
      */
-    groupCond: UILogicLinkGroupCond | null;
+    groupCond: IUILogicLinkGroupCond | null;
     /**
      * Creates an instance of UILogicLink.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-link/ui-logic-link.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAE3F;;;;;;;GAOG;AACH,qBAAa,WAAW;IAmCH,KAAK,EAAE,cAAc;IAlCxC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,SAAS,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAE9C;;;;;;OAMG;gBACgB,KAAK,EAAE,cAAc;IASxC;;;;;;;;;;OAUG;IACG,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;CAuClD"}
+{"version":3,"file":"ui-logic-link.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-link/ui-logic-link.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,YAAY;IAiC3B,KAAK,EAAE,cAAc;IAhCxC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAQ;IAEnC;;;;OAIG;IACH,SAAS,EAAE,qBAAqB,GAAG,IAAI,CAAQ;IAE/C;;;;;;OAMG;gBACgB,KAAK,EAAE,cAAc;IASxC;;;;;;;;;;OAUG;IACG,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;CAuClD"}

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

@@ -35,11 +35,9 @@ export class UILogicLink {
          */
         this.dstNode = null;
         /**
-         * 连接条件组
-         *
-         * @author chitanda
-         * @date 2023-02-15 17:02:49
-         * @type {(UILogicLinkGroupCond | null)}
+         * @description 连接条件组
+         * @type {(IUILogicLinkGroupCond  | null)}
+         * @memberof UILogicLink
          */
         this.groupCond = null;
         const { linkMode, deuilogicLinkGroupCond } = this.model;

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-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,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAwC/C"}
+{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-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,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmD/C"}

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.js

@@ -12,7 +12,7 @@ import { UILogicNode } from '../ui-logic-node';
  */
 export class DEUIActionNode extends UILogicNode {
     async exec(ctx) {
-        const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId } = this.model;
+        const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId, retDEUILogicParamId, } = this.model;
         const { data, parameters } = ctx;
         if (!dstAppDEUIActionId) {
             throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.noConfiguredInterfaceBehavior'));
@@ -27,12 +27,16 @@ export class DEUIActionNode extends UILogicNode {
                 actionData = [param];
             }
         }
+        const res = await UIActionUtil.exec(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }), this.model.appId);
+        if (!res.cancel) {
+            ctx.params[retDEUILogicParamId] = res.data;
+            ctx.setLastReturn(ctx.params[retDEUILogicParamId]);
+        }
         ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.interfaceLogicNodeEntityInterfaceAction', {
             id: this.model.id,
             dstAppDEUIActionId,
             dstAppDataEntityId,
             dstDEUILogicParamId,
-        }));
-        await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }), this.model.appId);
+        }), ctx.params[retDEUILogicParamId]);
     }
 }

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

@@ -1 +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;CAmF/C"}
+{"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;CAuG/C"}

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

@@ -55,6 +55,22 @@ export class MsgBoxNode extends UILogicNode {
                 modalParams.showCancelButton = true;
                 resultTags = ['yes', 'no'];
                 break;
+            case 'YESNOCANCEL':
+                modalParams.confirmButtonText = ibiz.i18n.t('runtime.uiLogic.yes');
+                modalParams.cancelButtonText = ibiz.i18n.t('runtime.uiLogic.no');
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = true;
+                if (ibiz.env.isMob) {
+                    modalParams.options = {
+                        closeOnClickOverlay: true,
+                    };
+                }
+                else {
+                    modalParams.options = {
+                        distinguishCancelAndClose: true,
+                    };
+                }
+                break;
             case 'OK':
                 modalParams.confirmButtonText = ibiz.i18n.t('runtime.uiLogic.determine');
                 modalParams.showConfirmButton = true;
@@ -78,6 +94,11 @@ export class MsgBoxNode extends UILogicNode {
             type,
             message,
         }));
+        if (buttonsType === 'YESNOCANCEL') {
+            const result = await ibiz.modal.extendConfirm(modalParams);
+            ctx.setLastReturn(result);
+            return;
+        }
         const result = await ibiz.modal.confirm(modalParams);
         ctx.setLastReturn(resultTags[result ? 0 : 1]);
     }

package/out/ui-logic/ui-logic-node/pf-plugin-node/pf-plugin-node.js

@@ -1,5 +1,5 @@
 import { UILogicNode } from '../ui-logic-node';
-import { getUILogicNodeProvider } from '../../../register';
+import { getUILogicNodePluginProvider } from '../../../register';
 /**
  * 前端插件节点
  *
@@ -15,9 +15,9 @@ export class PFPluginNode extends UILogicNode {
             id: this.model.id,
             sysPFPluginId: this.model.sysPFPluginId,
         }));
-        const provider = await getUILogicNodeProvider(this.model);
+        const provider = await getUILogicNodePluginProvider(this.model);
         if (provider) {
-            await provider.exec(this.model, ctx);
+            await provider.exec(ctx);
         }
     }
 }

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

@@ -1,6 +1,7 @@
 import { IDEUILogicNode } from '@ibiz/model-core';
 import { UILogicContext } from '../ui-logic-context';
 import { UILogicLink } from '../ui-logic-link/ui-logic-link';
+import { IUILogicNode } from '../../interface';
 /**
  * 逻辑节点
  *
@@ -9,7 +10,7 @@ import { UILogicLink } from '../ui-logic-link/ui-logic-link';
  * @export
  * @class UILogicNode
  */
-export declare abstract class UILogicNode {
+export declare abstract class UILogicNode implements IUILogicNode {
     model: IDEUILogicNode;
     /**
      * 节点连接
@@ -21,22 +22,16 @@ export declare abstract class UILogicNode {
     readonly links: UILogicLink[];
     /**
      * Creates an instance of UILogicNode.
-     *
-     * @author chitanda
-     * @date 2023-02-08 16:02:19
-     * @param {UILogicNodeModel} model
+     * @param {IDEUILogicNode} model
+     * @memberof UILogicNode
      */
     constructor(model: IDEUILogicNode);
     /**
-     * 执行界面行为
-     *
-     * @description 此实现无需关心是否循环后续处理问题
-     * @author chitanda
-     * @date 2023-02-08 22:02:44
-     * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
+     * @description 执行逻辑
+     * @abstract
+     * @param {UILogicContext} ctx 界面逻辑执行上下文
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogicNode
      */
     abstract exec(ctx: UILogicContext): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-node.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/ui-logic-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,8BAAsB,WAAW;IAiBZ,KAAK,EAAE,cAAc;IAhBxC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAE9B;;;;;;OAMG;gBACgB,KAAK,EAAE,cAAc;IAMxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAClD"}
+{"version":3,"file":"ui-logic-node.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/ui-logic-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;;GAOG;AACH,8BAAsB,WAAY,YAAW,YAAY;IAepC,KAAK,EAAE,cAAc;IAdxC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAE9B;;;;OAIG;gBACgB,KAAK,EAAE,cAAc;IAMxC;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAClD"}

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

@@ -10,10 +10,8 @@ import { UILogicLink } from '../ui-logic-link/ui-logic-link';
 export class UILogicNode {
     /**
      * Creates an instance of UILogicNode.
-     *
-     * @author chitanda
-     * @date 2023-02-08 16:02:19
-     * @param {UILogicNodeModel} model
+     * @param {IDEUILogicNode} model
+     * @memberof UILogicNode
      */
     constructor(model) {
         this.model = model;

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

@@ -1,7 +1,6 @@
-import { IDEUILogic } from '@ibiz/model-core';
-import { IUILogicParams } from '../interface';
+import { IAppDataEntity, IDEUILogic } from '@ibiz/model-core';
+import { IUILogic, IUILogicParams, IUILogicNode } from '../interface';
 import { UILogicContext } from './ui-logic-context';
-import { UILogicNode } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -11,17 +10,18 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
  * @export
  * @class UILogic
  */
-export declare class UILogic {
-    protected model: IDEUILogic;
+export declare class UILogic implements IUILogic {
+    model: IDEUILogic;
+    entity: IAppDataEntity;
     /**
      * 所有节点实例
      *
      * @author chitanda
      * @date 2023-02-08 21:02:38
      * @protected
-     * @type {Map<string, UILogicNode>}
+     * @type {Map<string, IUILogicNode>}
      */
-    protected nodes: Map<string, UILogicNode>;
+    protected nodes: Map<string, IUILogicNode>;
     /**
      * 所有参数实例
      *
@@ -33,48 +33,39 @@ export declare class UILogic {
     protected params: Map<string, UILogicParam>;
     /**
      * Creates an instance of UILogic.
-     * @author chitanda
-     * @date 2023-02-08 17:02:26
      * @param {IDEUILogic} model
+     * @param {IAppDataEntity} entity
+     * @memberof UILogic
      */
-    constructor(model: IDEUILogic);
+    constructor(model: IDEUILogic, entity: IAppDataEntity);
     /**
-     * 初始化逻辑参数
-     *
-     * @author chitanda
-     * @date 2023-02-08 21:02:58
+     * @description 初始化
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogic
+     */
+    init(): Promise<void>;
+    /**
+     * @description 初始化逻辑参数
      * @protected
      * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
+     * @memberof UILogic
      */
     protected initLogicParams(ctx: UILogicContext): void;
     /**
-     * 执行视图逻辑
-     *
-     * @author chitanda
-     * @date 2023-02-08 21:02:09
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
-     * @return {*}  {Promise<IData>}
+     * @description 执行逻辑
+     * @param {IUILogicParams} parameters 逻辑参数
+     * @returns {*}  {Promise<unknown>}
+     * @memberof UILogic
      */
     exec(parameters: IUILogicParams): Promise<unknown>;
     /**
-     * 开始根据连线递归执行逻辑
-     *
-     * @author chitanda
-     * @date 2023-02-09 15:02:32
+     * @description 开始根据连线递归执行逻辑
      * @protected
-     * @param {UILogicNode} node
+     * @param {IUILogicNode} node
      * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {(IData[] | null)} data
-     * @param {IParams} params
-     * @param {IParams} [opt]
-     * @return {*}  {(Promise<IData | null>)}
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogic
      */
-    protected deepExec(node: UILogicNode, ctx: UILogicContext): Promise<void>;
+    protected deepExec(node: IUILogicNode, ctx: UILogicContext): Promise<void>;
 }
 //# sourceMappingURL=ui-logic.d.ts.map

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":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAmBL,WAAW,EAGZ,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;IA+FvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBxD;;;;;;;;;;;;;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":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IA4B7B,KAAK,EAAE,UAAU;IACjB,MAAM,EAAE,cAAc;IA5B/B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,cAAc;IAG/B;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+B3B;;;;;OAKG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;OAKG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBxD;;;;;;;OAOG;cACa,QAAQ,CACtB,IAAI,EAAE,YAAY,EAClB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

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

@@ -1,9 +1,9 @@
 /* eslint-disable no-await-in-loop */
-import { IBizContext, ModelError, RuntimeModelError, } from '@ibiz-template/core';
+import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
 import { clone } from 'ramda';
 import { UILogicContext } from './ui-logic-context';
-import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RawJSCodeNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
+import { getUILogicNodeProvider } from '../register';
 /**
  * 界面逻辑
  *
@@ -15,20 +15,20 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
 export class UILogic {
     /**
      * Creates an instance of UILogic.
-     * @author chitanda
-     * @date 2023-02-08 17:02:26
      * @param {IDEUILogic} model
+     * @param {IAppDataEntity} entity
+     * @memberof UILogic
      */
-    constructor(model) {
-        var _a;
+    constructor(model, entity) {
         this.model = model;
+        this.entity = entity;
         /**
          * 所有节点实例
          *
          * @author chitanda
          * @date 2023-02-08 21:02:38
          * @protected
-         * @type {Map<string, UILogicNode>}
+         * @type {Map<string, IUILogicNode>}
          */
         this.nodes = new Map();
         /**
@@ -40,83 +40,22 @@ export class UILogic {
          * @type {Map<string, UILogicParam>}
          */
         this.params = new Map();
-        if (!((_a = model.deuilogicNodes) === null || _a === void 0 ? void 0 : _a.length)) {
-            throw new RuntimeModelError(model, ibiz.i18n.t('runtime.uiLogic.noLogicalNodesConfigured'));
+    }
+    /**
+     * @description 初始化
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogic
+     */
+    async init() {
+        var _a;
+        if (!((_a = this.model.deuilogicNodes) === null || _a === void 0 ? void 0 : _a.length)) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.noLogicalNodesConfigured'));
         }
-        model.deuilogicNodes.forEach(node => {
-            const { logicNodeType } = node;
-            let logicNode;
-            switch (logicNodeType) {
-                case 'BEGIN': // 开始
-                    logicNode = new StartNode(node);
-                    break;
-                case 'END': // 结束
-                    logicNode = new EndNode(node);
-                    break;
-                case 'DEACTION': // 实体行为
-                    logicNode = new DEActionNode(node);
-                    break;
-                case 'DEUIACTION': // 实体界面行为调用
-                    logicNode = new DEUIActionNode(node);
-                    break;
-                case 'PREPAREJSPARAM': // 准备参数
-                    logicNode = new PrepareJSParamNode(node);
-                    break;
-                case 'RESETPARAM': // 重置参数
-                    logicNode = new ResetParamNode(node);
-                    break;
-                case 'COPYPARAM': // 拷贝参数
-                    logicNode = new CopyParamNode(node);
-                    break;
-                case 'BINDPARAM': // 绑定参数
-                    logicNode = new BindParamNode(node);
-                    break;
-                case 'VIEWCTRLINVOKE': // 视图部件调用
-                    logicNode = new ViewCtrlInvokeNode(node);
-                    break;
-                case 'MSGBOX': // 消息弹窗
-                    logicNode = new MsgBoxNode(node);
-                    break;
-                case 'DEBUGPARAM': // 调试逻辑参数
-                    logicNode = new DebugParamNode(node);
-                    break;
-                case 'APPENDPARAM': // 附加到数组参数
-                    logicNode = new AppendParamNode(node);
-                    break;
-                case 'SORTPARAM': // 排序数组参数
-                    logicNode = new SortParamNode(node);
-                    break;
-                case 'RENEWPARAM': // 重新建立参数
-                    logicNode = new RenewParamNode(node);
-                    break;
-                case 'DEDATASET': // 实体数据集
-                    logicNode = new DataSetNode(node);
-                    break;
-                case 'THROWEXCEPTION': // 抛出异常
-                    logicNode = new ThrowExceptionNode(node);
-                    break;
-                case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
-                    logicNode = new ViewCtrlFireEventNode(node);
-                    break;
-                case 'DELOGIC': // 实体逻辑
-                    logicNode = new ExecuteDELogicNode(node);
-                    break;
-                case 'PFPLUGIN': // 前端插件调用
-                    logicNode = new PFPluginNode(node);
-                    break;
-                case 'RAWJSCODE':
-                    logicNode = new RawJSCodeNode(node);
-                    break;
-                default:
-                    throw new ModelError(node, ibiz.i18n.t('runtime.deLogic.deLogicNode.unsupportedLogical', {
-                        logicNodeType,
-                    }));
-            }
-            this.nodes.set(node.id, logicNode);
-        });
-        model.deuilogicParams.forEach(param => {
-            this.params.set(param.id, new UILogicParam(param));
-        });
+        await Promise.all(this.model.deuilogicNodes.map(async (node) => {
+            const provider = await getUILogicNodeProvider(node, this.model, this.entity);
+            if (provider)
+                this.nodes.set(node.id, provider);
+        }));
         // 将已经实例化的逻辑节点挂载到逻辑连接上
         this.nodes.forEach(node => {
             node.links.forEach(link => {
@@ -126,17 +65,15 @@ export class UILogic {
                 }
             });
         });
+        this.model.deuilogicParams.forEach(param => {
+            this.params.set(param.id, new UILogicParam(param));
+        });
     }
     /**
-     * 初始化逻辑参数
-     *
-     * @author chitanda
-     * @date 2023-02-08 21:02:58
+     * @description 初始化逻辑参数
      * @protected
      * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
+     * @memberof UILogic
      */
     initLogicParams(ctx) {
         this.params.forEach(param => {
@@ -147,14 +84,10 @@ export class UILogic {
         });
     }
     /**
-     * 执行视图逻辑
-     *
-     * @author chitanda
-     * @date 2023-02-08 21:02:09
-     * @param {IContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
-     * @return {*}  {Promise<IData>}
+     * @description 执行逻辑
+     * @param {IUILogicParams} parameters 逻辑参数
+     * @returns {*}  {Promise<unknown>}
+     * @memberof UILogic
      */
     async exec(parameters) {
         // 克隆传入应用上下文参数和视图参数
@@ -179,18 +112,12 @@ export class UILogic {
         return null;
     }
     /**
-     * 开始根据连线递归执行逻辑
-     *
-     * @author chitanda
-     * @date 2023-02-09 15:02:32
+     * @description 开始根据连线递归执行逻辑
      * @protected
-     * @param {UILogicNode} node
+     * @param {IUILogicNode} node
      * @param {UILogicContext} ctx
-     * @param {IContext} context
-     * @param {(IData[] | null)} data
-     * @param {IParams} params
-     * @param {IParams} [opt]
-     * @return {*}  {(Promise<IData | null>)}
+     * @returns {*}  {Promise<void>}
+     * @memberof UILogic
      */
     async deepExec(node, ctx) {
         // 执行逻辑节点

package/out/utils/bi-report-util/bi-report-util.d.ts

@@ -95,6 +95,7 @@ export declare class BIReportUtil {
      * @memberof BIReportUtil
      */
     translateDataToAppBIReport(arg: {
+        context: IContext;
         reportTag: string;
         selectChartType: string;
         selectCubeId: string;

package/out/utils/bi-report-util/bi-report-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA+F5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA6GzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;QACb,MAAM,EAAE,KAAK,CAAC;KACf,GAAG,OAAO,CAAC,KAAK,CAAC;IAuElB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBhB;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB5E"}
+{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA+F5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA6GzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,OAAO,EAAE,QAAQ,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;QACb,MAAM,EAAE,KAAK,CAAC;KACf,GAAG,OAAO,CAAC,KAAK,CAAC;IAwElB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBhB;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB5E"}

package/out/utils/bi-report-util/bi-report-util.js

@@ -282,8 +282,8 @@ export class BIReportUtil {
      * @memberof BIReportUtil
      */
     async translateDataToAppBIReport(arg) {
-        const { reportTag, selectChartType, selectCubeId, caption, data, style, extend, } = arg;
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const { context, reportTag, selectChartType, selectCubeId, caption, data, style, extend, } = arg;
+        const app = ibiz.hub.getApp(context.srfappid);
         const tempUIReportModel = {
             selectChartType,
             style,

package/out/utils/change-tracker/change-history-item.d.ts

@@ -0,0 +1,29 @@
+import { IApiChangeHistoryItem } from '../../interface';
+/**
+ * @description 历史项
+ * @export
+ * @class ChangeHistoryItem
+ * @implements {IApiChangeHistoryItem<T>}
+ * @template T
+ */
+export declare class ChangeHistoryItem<T> implements IApiChangeHistoryItem<T> {
+    /**
+     * @description 状态
+     * @type {T}
+     * @memberof ChangeHistoryItem
+     */
+    state: T;
+    /**
+     * @description 时间戳
+     * @type {number}
+     * @memberof ChangeHistoryItem
+     */
+    timestamp: number;
+    /**
+     * Creates an instance of ChangeHistoryItem.
+     * @param {T} state
+     * @memberof ChangeHistoryItem
+     */
+    constructor(state: T);
+}
+//# sourceMappingURL=change-history-item.d.ts.map

package/out/utils/change-tracker/change-history-item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-history-item.d.ts","sourceRoot":"","sources":["../../../src/utils/change-tracker/change-history-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD;;;;;;GAMG;AACH,qBAAa,iBAAiB,CAAC,CAAC,CAAE,YAAW,qBAAqB,CAAC,CAAC,CAAC;IACnE;;;;OAIG;IACH,KAAK,EAAE,CAAC,CAAC;IAET;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;gBACS,KAAK,EAAE,CAAC;CAIrB"}

package/out/utils/change-tracker/change-history-item.js

@@ -0,0 +1,18 @@
+/**
+ * @description 历史项
+ * @export
+ * @class ChangeHistoryItem
+ * @implements {IApiChangeHistoryItem<T>}
+ * @template T
+ */
+export class ChangeHistoryItem {
+    /**
+     * Creates an instance of ChangeHistoryItem.
+     * @param {T} state
+     * @memberof ChangeHistoryItem
+     */
+    constructor(state) {
+        this.state = state;
+        this.timestamp = Date.now();
+    }
+}